Overview
Comment: | get math parser working |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
d1b7d2fd5f86585c3ffac19191559cb7 |
User & Date: | lexi on 2021-12-26 17:49:50 |
Other Links: | manifest | tags |
Context
2021-12-26
| ||
20:01 | add C wrapper to generate true standalone binary embedding cortav bytecode check-in: a4a0570841 user: lexi tags: trunk | |
17:49 | get math parser working check-in: d1b7d2fd5f user: lexi tags: trunk | |
04:08 | all kindsa shit check-in: 52b9bce7dd user: lexi tags: trunk | |
Changes
Modified cortav.lua from [028f351fed] to [5feb0b86b1].
394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 ... 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 .... 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 .... 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 |
table.insert(ret, (hookfn(me:delegate(ext),...))) end return ret end; }; } -- renderer engines function ct.render.html(doc, opts) local doctitle = opts['title'] local f = string.format local ids = {} local canonicalID = {} local function getSafeID(obj,pfx) pfx = pfx or '' if canonicalID[obj] then return canonicalID[obj] elseif obj.id and ids[pfx .. obj.id] then local objid = pfx .. obj.id local newid local i = 1 ................................................................................ i = i + 1 until not ids[cid] end ids[cid] = obj canonicalID[obj] = cid return cid end end local footnotes = {} local footnotecount = 0 local langsused = {} local langpairs = { lua = { color = 0x9377ff }; terra = { color = 0xff77c8 }; c = { name = 'C', color = 0x77ffe8 }; html = { color = 0xfff877 }; scheme = { color = 0x77ff88 }; lisp = { color = 0x77ff88 }; fortran = { color = 0xff779a }; python = { color = 0xffd277 }; ruby = { color = 0xcdd6ff }; } local stylesets = { footnote = [[ div.footnote { font-family: 90%; display: none; grid-template-columns: 1em 1fr min-content; grid-template-rows: 1fr min-content; position: fixed; padding: 1em; background: @tone(0.05); border: black; margin:auto; } div.footnote:target { display:grid; } @media screen { div.footnote { left: 10em; right: 10em; max-width: calc(@width + 2em); max-height: 30vw; bottom: 1em; } } @media print { div.footnote { position: relative; } div.footnote:first-of-type { border-top: 1px solid black; } } div.footnote > a[href="#0"]{ grid-row: 2/3; grid-column: 3/4; display: block; padding: 0.2em 0.7em; text-align: center; text-decoration: none; background: @tone(0.2); color: @tone(1); border: 1px solid black; margin-top: 0.6em; -webkit-user-select: none; -ms-user-select: none; user-select: none; -webkit-user-drag: none; user-drag: none; } div.footnote > a[href="#0"]:hover { background: @tone(0.3); color: @tone(2); } div.footnote > a[href="#0"]:active { background: @tone(0.05); color: @tone(0.4); } @media print { div.footnote > a[href="#0"]{ display:none; } } div.footnote > div.number { text-align:right; grid-row: 1/2; grid-column: 1/2; } div.footnote > div.text { grid-row: 1/2; grid-column: 2/4; padding-left: 1em; overflow-y: scroll; } ]]; header = [[ body { padding: 0 2.5em !important } h1,h2,h3,h4,h5,h6 { border-bottom: 1px solid @tone(0.7); } h1 { font-size: 200%; border-bottom-style: double !important; border-bottom-width: 3px !important; margin: 0em -1em; } h2 { font-size: 130%; margin: 0em -0.7em; } h3 { font-size: 110%; margin: 0em -0.5em; } h4 { font-size: 100%; font-weight: normal; margin: 0em -0.2em; } h5 { font-size: 90%; font-weight: normal; } h6 { font-size: 80%; font-weight: normal; } h3, h4, h5, h6 { border-bottom-style: dotted !important; } h1,h2,h3,h4,h5,h6 { margin-top: 0; margin-bottom: 0; } :is(h1,h2,h3,h4,h5,h6) + p { margin-top: 0.4em; } ]]; headingAnchors = [[ :is(h1,h2,h3,h4,h5,h6) > a[href].anchor { text-decoration: none; font-size: 1.2em; padding: 0.3em; opacity: 0%; transition: 0.3s; font-weight: 100; } :is(h1,h2,h3,h4,h5,h6):hover > a[href].anchor { opacity: 50%; } :is(h1,h2,h3,h4,h5,h6) > a[href].anchor:hover { opacity: 100%; } ]] .. -- this is necessary to avoid the sections jumping around -- when focus changes from one to another [[ section { border: 1px solid transparent; } section:target { margin-left: -2em; margin-right: -2em; padding: 0 2em; background: @tone(0.04); border: 1px dotted @tone(0.3); } section:target > :is(h1,h2,h3,h4,h5,h6) { } ]]; paragraph = [[ p { margin: 0.7em 0; text-align: justify; } section { margin: 1.2em 0; } section:first-child { margin-top: 0; } ]]; accent = [[ @media screen { body { background: @bg; color: @fg } a[href] { color: @tone(0.7 30); text-decoration-color: @tone/0.4(0.7 30); } a[href]:hover { color: @tone(0.9 30); text-decoration-color: @tone/0.7(0.7 30); } h1 { color: @tone(2); } h2 { color: @tone(1.5); } h3 { color: @tone(1.2); } h4 { color: @tone(1); } h5,h6 { color: @tone(0.8); } } @media print { a[href] { text-decoration: none; color: black; font-weight: bold; } h1,h2,h3,h4,h5,h6 { border-bottom: 1px black; } } ]]; aside = [[ section > aside { text-align: justify; margin: 0 1.5em; padding: 0.5em 0.8em; background: @tone(0.05); font-size: 90%; border-left: 5px solid @tone(0.2 15); border-right: 5px solid @tone(0.2 15); } section > aside p { margin: 0; margin-top: 0.6em; } section > aside p:first-child { margin: 0; } ]]; code = [[ code { display: inline-block; background: @tone(0.9); color: @bg; font-family: monospace; font-size: 90%; padding: 3px 5px; } ]]; var = [[ var { font-style: italic; font-family: monospace; color: @tone(0.7); } code var { color: @tone(0.25); } ]]; math = [[ span.equation { display: inline-block; background: @tone(0.08); color: @tone(2); padding: 0.1em 0.3em; border: 1px solid @tone(0.5); } ]]; abbr = [[ abbr[title] { cursor: help; } ]]; editors_markup = [[]]; block_code_listing = [[ figure.listing { font-family: monospace; background: @tone(0.05); color: @fg; padding: 0; margin: 0.3em 0; counter-reset: line-number; position: relative; border: 1px solid @fg; } figure.listing>div { white-space: pre-wrap; tab-size: 3; -moz-tab-size: 3; counter-increment: line-number; text-indent: -2.3em; margin-left: 2.3em; } figure.listing>:is(div,hr)::before { width: 1.0em; padding: 0.2em 0.4em; text-align: right; display: inline-block; background-color: @tone(0.2); border-right: 1px solid @fg; content: counter(line-number); margin-right: 0.3em; } figure.listing>hr::before { color: transparent; padding-top: 0; padding-bottom: 0; } figure.listing>div::before { color: @fg; } figure.listing>div:last-child::before { padding-bottom: 0.5em; } figure.listing>figcaption:first-child { border: none; border-bottom: 1px solid @fg; } figure.listing>figcaption::after { display: block; float: right; font-weight: normal; font-style: italic; font-size: 70%; padding-top: 0.3em; } figure.listing>figcaption { font-family: sans-serif; font-size: 120%; padding: 0.2em 0.4em; border: none; color: @tone(2); } figure.listing > hr { border: none; margin: 0; height: 0.7em; counter-increment: line-number; } ]]; } local stylesNeeded = {} local render_state_handle = { doc = doc; opts = opts; style_rules = styles; -- use stylesneeded if at all possible stylesets = stylesets; stylesets_active = stylesNeeded; obj_htmlid = getSafeID; -- remaining fields added later } local renderJob = doc:job('render_html', nil, render_state_handle) doc.stage.job = renderJob; local runhook = function(h, ...) return renderJob:hook(h, render_state_handle, ...) end local tagproc do local elt = function(t,attrs) return f('<%s%s>', t, attrs and ss.reduce(function(a,b) return a..b end, '', ss.map(function(v,k) if v == true then return ' '..k elseif v then return f(' %s="%s"', k, v) end end, attrs)) or '') end tagproc = { toTXT = { tag = function(t,a,v) return v end; elt = function(t,a) return '' end; catenate = table.concat; }; toIR = { tag = function(t,a,v,o) return { tag = t, attrs = a; nodes = type(v) == 'string' and {v} or v, src = o } end; elt = function(t,a,o) return { tag = t, attrs = a, src = o } end; catenate = function(...) return ... end; }; toHTML = { elt = elt; tag = function(t,attrs,body) return f('%s%s</%s>', elt(t,attrs), body, t) end; catenate = table.concat; }; } end local function getBaseRenderers(procs, span_renderers) local tag, elt, catenate = procs.tag, procs.elt, procs.catenate local htmlDoc = function(title, head, body) return [[<!doctype html>]] .. tag('html',nil, tag('head', nil, elt('meta',{charset = 'utf-8'}) .. (title and tag('title', nil, title) or '') .. (head or '')) .. tag('body', nil, body or '')) end local function htmlSpan(spans, block, sec) local text = {} for k,v in pairs(spans) do if type(v) == 'string' then v=v:gsub('[<>&"]', function(x) return string.format('&#%02u;', string.byte(x)) end) for fn, ext in renderJob:each('hook','render_html_sanitize') do v = fn(renderJob:delegate(ext), v) end table.insert(text,v) else table.insert(text, (span_renderers[v.kind](v, block, sec))) end end return table.concat(text) end return {htmlDoc=htmlDoc, htmlSpan=htmlSpan} end local spanparse = function(...) local s = ct.parse_span(...) doc.docjob:hook('meddle_span', s) return s end local cssRulesFor = {} local function getSpanRenderers(procs) local tag, elt, catenate = procs.tag, procs.elt, procs.catenate local span_renderers = {} local plainrdr = getBaseRenderers(tagproc.toTXT, span_renderers) local htmlSpan = getBaseRenderers(procs, span_renderers).htmlSpan function span_renderers.format(sp,...) local tags = { strong = 'strong', emph = 'em', strike = 'del', insert = 'ins', literal = 'code', variable = 'var'} if sp.style == 'literal' and not opts['fossil-uv'] then stylesNeeded.code = true elseif sp.style == 'strike' or sp.style == 'insert' then stylesNeeded.editors_markup = true elseif sp.style == 'variable' then stylesNeeded.var = true end return tag(tags[sp.style],nil,htmlSpan(sp.spans,...)) end function span_renderers.deref(t,b,s) local r = b.origin:ref(t.ref) local name = t.ref if name:find'%.' then name = name:match '^[^.]*%.(.+)$' end if type(r) == 'string' then stylesNeeded.abbr = true return tag('abbr',{title=r},next(t.spans) and htmlSpan(t.spans,b,s) or name) end if r.kind == 'resource' then local rid = getSafeID(r, 'res-') if r.class == 'image' then if not cssRulesFor[r] then local css = prepcss(string.format([[ section p > .%s { } ]], rid)) stylesets[r] = css cssRulesFor[r] = css stylesNeeded[r] = true end return tag('div',{class=rid},catenate{'blaah'}) elseif r.class == 'video' then local vid = {} return tag('video',nil,vid) elseif r.class == 'font' then b.origin:fail('fonts cannot be instantiated, use %font directive instead') end else b.origin:fail('%s is not an object that can be embedded', t.ref) end end function span_renderers.var(v,b,s) local val if v.pos then if not v.origin.invocation then v.origin:fail 'positional arguments can only be used in a macro invocation' elseif not v.origin.invocation.args[v.pos] then v.origin.invocation.origin:fail('macro invocation %s missing positional argument #%u', v.origin.invocation.macro, v.pos) end val = v.origin.invocation.args[v.pos] else val = v.origin.doc:context_var(v.var, v.origin) end if v.raw then return val else return htmlSpan(ct.parse_span(val, v.origin), b, s) end end function span_renderers.raw(v,b,s) return htmlSpan(v.spans, b, s) end function span_renderers.link(sp,b,s) local href if b.origin.doc.sections[sp.ref] then href = '#' .. sp.ref else if sp.addr then href = sp.addr else local r = b.origin:ref(sp.ref) if type(r) == 'table' then href = '#' .. getSafeID(r) else href = r end end end return tag('a',{href=href},next(sp.spans) and htmlSpan(sp.spans,b,s) or href) end span_renderers['line-break'] = function(sp,b,s) return elt('br') end function span_renderers.macro(m,b,s) local macroname = plainrdr.htmlSpan( ct.parse_span(m.macro, b.origin), b,s) local r = b.origin:ref(macroname) if type(r) ~= 'string' then b.origin:fail('%s is an object, not a reference', t.ref) end local mctx = b.origin:clone() mctx.invocation = m return htmlSpan(ct.parse_span(r, mctx),b,s) end function span_renderers.math(m,b,s) stylesNeeded.math = true return tag('span',{class='equation'},htmlSpan(m.spans, b, s)) end; function span_renderers.directive(d,b,s) if d.ext == 'html' then elseif b.origin.doc:allow_ext(d.ext) then elseif d.crit then b.origin:fail('critical extension %s unavailable', d.ext) elseif d.failthru then return htmlSpan(d.spans, b, s) end end function span_renderers.footnote(f,b,s) stylesNeeded.footnote = true local source, sid, ssec = b.origin:ref(f.ref) local cnc = getSafeID(ssec) .. ' ' .. sid local fn if footnotes[cnc] then fn = footnotes[cnc] else footnotecount = footnotecount + 1 fn = {num = footnotecount, origin = b.origin, fnid=cnc, source = source} fn.id = getSafeID(fn) footnotes[cnc] = fn end return tag('a', {href='#'..fn.id}, htmlSpan(f.spans) .. tag('sup',nil, fn.num)) end return span_renderers end local function getBlockRenderers(procs, sr) local tag, elt, catenate = procs.tag, procs.elt, procs.catenate local null = function() return catenate{} end local block_renderers = { anchor = function(b,s) return tag('a',{id = getSafeID(b)},null()) end; paragraph = function(b,s) stylesNeeded.paragraph = true; return tag('p', nil, sr.htmlSpan(b.spans, b, s), b) end; directive = function(b,s) -- deal with renderer directives local _, cmd, args = b.words(2) if cmd == 'page-title' then if not opts.title then doctitle = args end elseif b.critical then b.origin:fail('critical HTML renderer directive ā%sā not supported', cmd) end end; label = function(b,s) if ct.sec.is(b.captions) then if not (opts['fossil-uv'] or opts.snippet) then stylesNeeded.header = true end local h = math.min(6,math.max(1,b.captions.depth)) return tag(f('h%u',h), nil, sr.htmlSpan(b.spans, b, s), b) else -- handle other uses of labels here end end; ['list-item'] = function(b,s) return tag('li', nil, sr.htmlSpan(b.spans, b, s), b) end; table = function(b,s) local tb = {} for i, r in ipairs(b.rows) do local row = {} for i, c in ipairs(r) do table.insert(row, tag(c.header and 'th' or 'td', {align=c.align}, sr.htmlSpan(c.spans, b))) end table.insert(tb, tag('tr',nil,catenate(row))) end return tag('table',nil,catenate(tb)) end; listing = function(b,s) stylesNeeded.block_code_listing = true local nodes = ss.map(function(l) if #l > 0 then return tag('div',nil,sr.htmlSpan(l, b, s)) else return elt('hr') end end, b.lines) if b.title then table.insert(nodes,1, tag('figcaption',nil,sr.htmlSpan(b.title))) end if b.lang then langsused[b.lang] = true end return tag('figure', {class='listing', lang=b.lang, id=b.id and getSafeID(b)}, catenate(nodes)) end; aside = function(b,s) local bn = {} stylesNeeded.aside = true if #b.lines == 1 then bn[1] = sr.htmlSpan(b.lines[1], b, s) else for _,v in pairs(b.lines) do table.insert(bn, tag('p', {}, sr.htmlSpan(v, b, s))) end end return tag('aside', {}, bn) end; ['break'] = function() -- HACK -- lists need to be rewritten to work like asides return ''; end; } return block_renderers; end local function getRenderers(procs) local span_renderers = getSpanRenderers(procs) local r = getBaseRenderers(procs,span_renderers) r.block_renderers = getBlockRenderers(procs, r) return r end local astproc = { toHTML = getRenderers(tagproc.toHTML); toTXT = getRenderers(tagproc.toTXT); toIR = { }; } astproc.toIR.span_renderers = ss.clone(astproc.toHTML); astproc.toIR.block_renderers = getBlockRenderers(tagproc.toIR,astproc.toHTML); -- note we use HTML here instead of IR span renderers, because as things -- currently stand we don't need that level of resolution. if we ever -- get to the point where we want to be able to twiddle spans around -- we'll need to introduce an IR span renderer render_state_handle.astproc = astproc; render_state_handle.tagproc = tagproc; -- bind to legacy names -- yikes this needs to be cleaned up so badly local ir = {} local dr = astproc.toHTML -- default renderers local plainr = astproc.toTXT local irBlockRdrs = astproc.toIR.block_renderers; render_state_handle.ir = ir; local function renderBlocks(blocks, irs) for i, block in ipairs(blocks) do local rd if irBlockRdrs[block.kind] then rd = irBlockRdrs[block.kind](block,sec) else local rdr = renderJob:proc('render',block.kind,'html') if rdr then rd = rdr({ state = render_state_handle; tagproc = tagproc.toIR; astproc = astproc.toIR; }, block, sec) end end if rd then if opts['heading-anchors'] and block == sec.heading_node then stylesNeeded.headingAnchors = true table.insert(rd.nodes, ' ') table.insert(rd.nodes, { tag = 'a'; attrs = {href = '#' .. irs.attrs.id, class='anchor'}; nodes = {type(opts['heading-anchors'])=='string' and opts['heading-anchors'] or '§'}; }) end if rd.src and rd.src.origin.lang then if not rd.attrs then rd.attrs = {} end rd.attrs.lang = rd.src.origin.lang end table.insert(irs.nodes, rd) runhook('ir_section_node_insert', rd, irs, sec) end end end runhook('ir_assemble', ir) for i, sec in ipairs(doc.secorder) do if doctitle == nil and sec.depth == 1 and sec.heading_node then doctitle = astproc.toTXT.htmlSpan(sec.heading_node.spans, sec.heading_node, sec) end local irs if sec.kind == 'ordinary' then if #(sec.blocks) > 0 then irs = {tag='section',attrs={id = getSafeID(sec)},nodes={}} runhook('ir_section_build', irs, sec) renderBlocks(sec.blocks, irs) end elseif sec.kind == 'blockquote' then elseif sec.kind == 'listing' then elseif sec.kind == 'embed' then end if irs then table.insert(ir, irs) end end for _, fn in pairs(footnotes) do local tag = tagproc.toIR.tag local body = {nodes={}} local ftir = {} for l in fn.source:gmatch('([^\n]*)') do ct.parse_line(l, fn.origin, ftir) end renderBlocks(ftir,body) local note = tag('div',{class='footnote',id=fn.id}, { tag('div',{class='number'}, tostring(fn.num)), tag('div',{class='text'}, body.nodes), tag('a',{href='#0'},'close') }) table.insert(ir, note) end -- restructure passes runhook('ir_restructure_pre', ir) ---- list insertion pass local lists = {} for _, sec in pairs(ir) do if sec.tag == 'section' then local i = 1 while i <= #sec.nodes do local v = sec.nodes[i] if v.tag == 'li' then local ltag if v.src.ordered then ltag = 'ol' else ltag = 'ul' end local last = i>1 and sec.nodes[i-1] if last and last.embed == 'list' and not ( last.ref[#last.ref].src.depth == v.src.depth and last.ref[#last.ref].src.ordered ~= v.src.ordered ) then -- add to existing list table.insert(last.ref, v) table.remove(sec.nodes, i) i = i - 1 else -- wrap in list local newls = {v} sec.nodes[i] = {embed = 'list', ref = newls} table.insert(lists,newls) end end i = i + 1 end end end for _, sec in pairs(ir) do if sec.tag == 'section' then for i, elt in pairs(sec.nodes) do if elt.embed == 'list' then local function fail_nest() elt.ref[1].src.origin:fail('improper list nesting') end local struc = {attrs={}, nodes={}} if elt.ref[1].src.ordered then struc.tag = 'ol' else struc.tag = 'ul' end if elt.ref[1].src.depth ~= 1 then fail_nest() end local stack = {struc} local copyNodes = function(old,new) for i,v in ipairs(old) do new[#new + i] = v end end for i,e in ipairs(elt.ref) do if e.src.depth > #stack then if e.src.depth - #stack > 1 then fail_nest() end local newls = {attrs={}, nodes={e}} copyNodes(e.nodes,newls) if e.src.ordered then newls.tag = 'ol' else newls.tag='ul' end table.insert(stack[#stack].nodes[#stack[#stack].nodes].nodes, newls) table.insert(stack, newls) else if e.src.depth < #stack then -- pop entries off the stack for i=#stack, e.src.depth+1, -1 do stack[i] = nil end end table.insert(stack[#stack].nodes, e) end end sec.nodes[i] = struc end end end end runhook('ir_restructure_post', ir) -- collection pass local function collect_nodes(t) local ts = '' for i,v in ipairs(t) do if type(v) == 'string' then ts = ts .. v elseif v.nodes then ts = ts .. tagproc.toHTML.tag(v.tag, v.attrs, collect_nodes(v.nodes)) elseif v.text then ts = ts .. tagproc.toHTML.tag(v.tag,v.attrs,v.text) else ts = ts .. tagproc.toHTML.elt(v.tag,v.attrs) end end return ts end local body = collect_nodes(ir) for k in pairs(langsused) do local spec = langpairs[k] or {color=0xaaaaaa} stylesets.block_code_listing = stylesets.block_code_listing .. string.format( [[section > figure.listing[lang="%s"]>figcaption::after { content: '%s'; color: #%06x }]], k, spec.name or k, spec.color) end local prepcss = function(css) local tone = function(fac, sat, sep, alpha) local hsl = function(h,s,l,a) local v = string.format('%s, %u%%, %u%%', h,s,l) if a then return string.format('hsla(%s, %s)', v,a) else return string.format('hsl(%s)', v) end end sat = sat or 1 fac = math.max(math.min(fac, 1), 0) sat = math.max(math.min(sat, 1), 0) if opts.accent then local hue = 'var(--accent)' local hsep = tonumber(opts['hue-spread']) if hsep and sep and sep ~= 0 then hue = string.format('calc(%s - %s)', hue, sep * hsep) end return hsl(hue, math.floor(100*sat), math.floor(100*fac), alpha) else local g = math.floor(0xFF * fac) return string.format('#' .. string.rep('%02x',alpha and 4 or 3), g,g,g,alpha and math.floor(0xFF*alpha)) end end local replace = function(var,alpha,param) local tonespan = opts.accent and .1 or 0 local tbg = opts['dark-on-light'] and 1.0 - tonespan or tonespan local tfg = opts['dark-on-light'] and tonespan or 1.0 - tonespan if var == 'bg' then return tone(tbg,nil,nil,tonumber(alpha)) elseif var == 'fg' then return tone(tfg,nil,nil,tonumber(alpha)) elseif var == 'width' then return opts['width'] or '100vw' elseif var == 'tone' then local l, sep, sat for i=1,3 do -- š l,sep,sat = param:match('^%('..string.rep('([^%s]*)%s*',i)..'%)$') if l then break end end l = ss.math.lerp(tonumber(l), tbg, tfg) return tone(l, tonumber(sat), tonumber(sep), tonumber(alpha)) end end css = css:gsub('@(%b[]):(%b[])', function(v,d) return opts[v:sub(2,-2)] or v:sub(2,-2) end) css = css:gsub('@(%w+)/([0-9.]+)(%b())', replace) css = css:gsub('@(%w+)(%b())', function(a,b) return replace(a,nil,b) end) css = css:gsub('@(%w+)/([0-9.]+)', replace) css = css:gsub('@(%w+)', function(a,b) return replace(a,nil,b) end) return (css:gsub('%s+',' ')) end local styles = {} if opts.width then table.insert(styles, string.format([[body {padding:0 1em;margin:auto;max-width:%s}]], opts.width)) end if opts.accent then table.insert(styles, string.format(':root {--accent:%s}', opts.accent)) end if opts.accent or (not opts['dark-on-light']) and (not opts['fossil-uv']) then stylesNeeded.accent = true end for k in pairs(stylesNeeded) do if not stylesets[k] then ct.exns.unimpl('styleset %s not implemented (!)', k):throw() end table.insert(styles, prepcss(stylesets[k])) end local head = {} local styletag = '' if opts['link-css'] then local css = opts['link-css'] if type(css) ~= 'string' then ct.exns.mode('must be a string', 'html:link-css'):throw() end styletag = styletag .. tagproc.toHTML.elt('link',{rel='stylesheet',type='text/css',href=opts['link-css']}) end if next(styles) then if opts['gen-styles'] then styletag = styletag .. tagproc.toHTML.tag('style',{type='text/css'},table.concat(styles)) end table.insert(head, styletag) end if opts['fossil-uv'] then return tagproc.toHTML.tag('div',{class='fossil-doc',['data-title']=doctitle},styletag .. body) elseif opts.snippet then return styletag .. body else return dr.htmlDoc(doctitle, next(head) and table.concat(head), body) end end do -- define span control sequences local function formatter(sty) return function(s,c) return { kind = 'format'; style = sty; ................................................................................ end return r end) local m = {s} --TODO return { kind = 'math'; original = s; spans = m; origin = c:clone(); }; end}; {seq = '&', parse = function(s, c) local r, t = s:match '^([^%s]+)%s*(.-)$' return { kind = 'deref'; spans = (t and t ~= "") and ct.parse_span(t, c) or {}; ref = r; origin = c:clone(); } end}; {seq = '^', parse = function(s, c) local fn, t = s:match '^([^%s]+)%s*(.-)$' return { kind = 'footnote'; ................................................................................ table.insert(spans,o) elseif c == '[' then flush() local substr, following = delimited('[',']',str:sub(p.byte)) p.next.byte = following + p.byte local found = false for _,i in pairs(ct.spanctls) do if startswith(substr, i.seq) then found = true table.insert(spans, i.parse(substr:sub(1+#i.seq), ctx)) break end end if not found then ctx:fail('no recognized control sequence in [%s]', substr) |
| | < > > > > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > < > < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | | |
394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 ... 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 ... 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 ... 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 |
table.insert(ret, (hookfn(me:delegate(ext),...))) end return ret end; }; } -- common renderer utility functions ct.tool = {} function ct.tool.mathfmt(ctx, eqn) local buf = '' local m = ss.enum {'num','var','op'} local lsc = 0 local spans = {} local flush = function() local o if buf ~= '' then if lsc == 0 then o = buf elseif lsc == m.num then o = { kind = 'format'; style = 'literal'; spans = {buf}; } elseif lsc == m.var then o = { kind = 'format'; style = 'variable'; spans = {buf}; } elseif lsc == m.op then o = { kind = 'format'; style = 'strong'; spans = {buf}; } end if o then table.insert(spans, o) end end buf = '' lsc = 0 end for c, p in ss.str.each(ctx.doc.enc, eqn) do local cl = ss.str.classify(ctx.doc.enc, c) local nc = 0 if not cl.space then if cl.numeral then nc = m.num elseif cl.mathop or cl.symbol then nc = m.op elseif cl.letter then nc = m.var end if nc ~= lsc then flush() lsc = nc end buf = buf .. c end end flush() return spans end function ct.tool.namespace() -- some renderers need to be able to generate unique IDs for -- objects, including ones that users have not assigned IDs -- to, and objects with the same name in different unlabeled -- sections. to handle this, we provide a "namespace" mechanism, -- where some lua table (really its address in memory) is used -- as a handle for the object and a unique ID is attached to it. -- if the object has an ID of its own, it is guaranteed to be -- unique and returned; otherwise, a generic id of the form -- `x-%u` is generated, where %u is an integer that increments -- for every new object local ids = {} local canonicalID = {} return function(obj,pfx) pfx = pfx or '' if canonicalID[obj] then return canonicalID[obj] elseif obj.id and ids[pfx .. obj.id] then local objid = pfx .. obj.id local newid local i = 1 ................................................................................ i = i + 1 until not ids[cid] end ids[cid] = obj canonicalID[obj] = cid return cid end end end -- renderer engines do -- define span control sequences local function formatter(sty) return function(s,c) return { kind = 'format'; style = sty; ................................................................................ end return r end) local m = {s} --TODO return { kind = 'math'; original = s; spans = {s}; origin = c:clone(); }; end}; {seq = '&', parse = function(s, c) local r, t = s:match '^([^%s]+)%s*(.-)$' return { kind = 'deref'; spans = (t and t ~= "") and ct.parse_span(t, c) or {}; ref = r; origin = c:clone(); } end}; {seq = '^', parse = function(s, c) local fn, t = s:match '^([^%s]+)%s*(.-)$' return { kind = 'footnote'; ................................................................................ table.insert(spans,o) elseif c == '[' then flush() local substr, following = delimited('[',']',str:sub(p.byte)) p.next.byte = following + p.byte local found = false for _,i in pairs(ct.spanctls) do if ss.str.begins(substr, i.seq) then found = true table.insert(spans, i.parse(substr:sub(1+#i.seq), ctx)) break end end if not found then ctx:fail('no recognized control sequence in [%s]', substr) |
Modified makefile from [4482353657] to [ac8c1379b3].
1 2 3 4 5 6 7 8 9 10 11 12 13 .. 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 .. 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 |
lua != which lua luac != which luac sh != which sh extens = $(wildcard ext/*.lua) extens-names ?= $(basename $(notdir $(extens))) build = build executable = cortav default-format-flags = -m html:width 40em prefix = $(HOME)/.local bin-prefix = $(prefix)/bin share-prefix = $(prefix)/share/$(executable) ................................................................................ # this is not necessary for parsing the format, and can be # disabled by blanking the encoding-data list when building # ($ make encoding-data=) encoding-data = ucstbls encoding-files = $(patsubst %,$(build)/%.lc,$(encoding-data)) encoding-data-ucs = https://www.unicode.org/Public/UCD/latest/ucd/UnicodeData.txt $(build)/$(executable): sirsem.lua $(encoding-files) cortav.lua $(extens) cli.lua | $(build)/ @echo ' Ā» building with extensions $(extens-names)' echo '#!$(lua)' > $@ luac -o - $^ >> $@ chmod +x $@ $(build)/cortav.html: cortav.ct $(build)/$(executable) | $(build)/ $(build)/$(executable) $< -o $@ -m render:format html -y html:fossil-uv ................................................................................ echo "Exec=$(bin-prefix)/cortav-view.sh" >>$@ %/: mkdir -p $@ $(build)/unicode.txt: | $(build)/ curl $(encoding-data-ucs) > $@ $(build)/ucstbls.lc: $(build)/unicode.txt | $(build)/ $(lua) tools/ucs.lua $< | $(luac) -o $@ - .PHONY: install install: $(build)/cortav $(build)/cortav-view.sh $(build)/velartrill-cortav-view.desktop | $(bin-prefix)/ install $(build)/$(executable) $(bin-prefix) install $(build)/cortav-view.sh $(bin-prefix) xdg-mime install desk/velartrill-cortav.xml |
> > > > > > > > > > > > > > > > > > > > > > > > | > | |
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 .. 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 .. 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 |
# [Ź] makefile # ~ lexi hale <lexi@hale.su> # šÆ AGPLv3 # ? this script performs the tasks necessary to produce a mostly # standalone cortav executable from the source files in the # repository. it assumes the presence of the following tools # in $SHELL or in $PATH: # # * which * cat # * mkdir * echo # * install * lua # * luac * sh # # if any are not present, the build will fail, although a missing # `which` can be worked around by specifying the paths to lua, luac, # and `sh` directly # # eventually you will be able to set a "standalone" variable to # create a truly standalone binary, by embedding the binary in a # C program and statically linking it to lua. lua != which lua luac != which luac sh != which sh extens = $(wildcard ext/*.lua) extens-names ?= $(basename $(notdir $(extens))) rendrs = $(wildcard render/*.lua) rendrs-names ?= $(basename $(notdir $(rendrs))) build = build executable = cortav default-format-flags = -m html:width 40em prefix = $(HOME)/.local bin-prefix = $(prefix)/bin share-prefix = $(prefix)/share/$(executable) ................................................................................ # this is not necessary for parsing the format, and can be # disabled by blanking the encoding-data list when building # ($ make encoding-data=) encoding-data = ucstbls encoding-files = $(patsubst %,$(build)/%.lc,$(encoding-data)) encoding-data-ucs = https://www.unicode.org/Public/UCD/latest/ucd/UnicodeData.txt $(build)/$(executable): sirsem.lua $(encoding-files) cortav.lua $(rendrs) $(extens) cli.lua | $(build)/ @echo ' Ā» building with extensions $(extens-names)' @echo ' Ā» building with renderers $(rendrs-names)' echo '#!$(lua)' > $@ luac -o - $^ >> $@ chmod +x $@ $(build)/cortav.html: cortav.ct $(build)/$(executable) | $(build)/ $(build)/$(executable) $< -o $@ -m render:format html -y html:fossil-uv ................................................................................ echo "Exec=$(bin-prefix)/cortav-view.sh" >>$@ %/: mkdir -p $@ $(build)/unicode.txt: | $(build)/ curl $(encoding-data-ucs) > $@ $(build)/ucstbls.lc: $(build)/unicode.txt tools/ucs.lua | $(build)/ $(lua) tools/ucs.lua $< | $(luac) -o $@ - .PHONY: install install: $(build)/cortav $(build)/cortav-view.sh $(build)/velartrill-cortav-view.desktop | $(bin-prefix)/ install $(build)/$(executable) $(bin-prefix) install $(build)/cortav-view.sh $(bin-prefix) xdg-mime install desk/velartrill-cortav.xml |
Added render/html.lua version [1e64ee70c7].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > |
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 |
local ct = require 'cortav' local ss = require 'sirsem' -- install rendering function for html function ct.render.html(doc, opts) local doctitle = opts['title'] local f = string.format local getSafeID = ct.tool.namespace() local footnotes = {} local footnotecount = 0 local langsused = {} local langpairs = { lua = { color = 0x9377ff }; terra = { color = 0xff77c8 }; c = { name = 'C', color = 0x77ffe8 }; html = { color = 0xfff877 }; scheme = { color = 0x77ff88 }; lisp = { color = 0x77ff88 }; fortran = { color = 0xff779a }; python = { color = 0xffd277 }; ruby = { color = 0xcdd6ff }; } local stylesets = { footnote = [[ div.footnote { font-family: 90%; display: none; grid-template-columns: 1em 1fr min-content; grid-template-rows: 1fr min-content; position: fixed; padding: 1em; background: @tone(0.05); border: black; margin:auto; } div.footnote:target { display:grid; } @media screen { div.footnote { left: 10em; right: 10em; max-width: calc(@width + 2em); max-height: 30vw; bottom: 1em; } } @media print { div.footnote { position: relative; } div.footnote:first-of-type { border-top: 1px solid black; } } div.footnote > a[href="#0"]{ grid-row: 2/3; grid-column: 3/4; display: block; padding: 0.2em 0.7em; text-align: center; text-decoration: none; background: @tone(0.2); color: @tone(1); border: 1px solid black; margin-top: 0.6em; -webkit-user-select: none; -ms-user-select: none; user-select: none; -webkit-user-drag: none; user-drag: none; } div.footnote > a[href="#0"]:hover { background: @tone(0.3); color: @tone(2); } div.footnote > a[href="#0"]:active { background: @tone(0.05); color: @tone(0.4); } @media print { div.footnote > a[href="#0"]{ display:none; } } div.footnote > div.number { text-align:right; grid-row: 1/2; grid-column: 1/2; } div.footnote > div.text { grid-row: 1/2; grid-column: 2/4; padding-left: 1em; overflow-y: scroll; } ]]; header = [[ body { padding: 0 2.5em !important } h1,h2,h3,h4,h5,h6 { border-bottom: 1px solid @tone(0.7); } h1 { font-size: 200%; border-bottom-style: double !important; border-bottom-width: 3px !important; margin: 0em -1em; } h2 { font-size: 130%; margin: 0em -0.7em; } h3 { font-size: 110%; margin: 0em -0.5em; } h4 { font-size: 100%; font-weight: normal; margin: 0em -0.2em; } h5 { font-size: 90%; font-weight: normal; } h6 { font-size: 80%; font-weight: normal; } h3, h4, h5, h6 { border-bottom-style: dotted !important; } h1,h2,h3,h4,h5,h6 { margin-top: 0; margin-bottom: 0; } :is(h1,h2,h3,h4,h5,h6) + p { margin-top: 0.4em; } ]]; headingAnchors = [[ :is(h1,h2,h3,h4,h5,h6) > a[href].anchor { text-decoration: none; font-size: 1.2em; padding: 0.3em; opacity: 0%; transition: 0.3s; font-weight: 100; } :is(h1,h2,h3,h4,h5,h6):hover > a[href].anchor { opacity: 50%; } :is(h1,h2,h3,h4,h5,h6) > a[href].anchor:hover { opacity: 100%; } ]] .. -- this is necessary to avoid the sections jumping around -- when focus changes from one to another [[ section { border: 1px solid transparent; } section:target { margin-left: -2em; margin-right: -2em; padding: 0 2em; background: @tone(0.04); border: 1px dotted @tone(0.3); } section:target > :is(h1,h2,h3,h4,h5,h6) { } ]]; paragraph = [[ p { margin: 0.7em 0; text-align: justify; } section { margin: 1.2em 0; } section:first-child { margin-top: 0; } ]]; accent = [[ @media screen { body { background: @bg; color: @fg } a[href] { color: @tone(0.7 30); text-decoration-color: @tone/0.4(0.7 30); } a[href]:hover { color: @tone(0.9 30); text-decoration-color: @tone/0.7(0.7 30); } h1 { color: @tone(2); } h2 { color: @tone(1.5); } h3 { color: @tone(1.2); } h4 { color: @tone(1); } h5,h6 { color: @tone(0.8); } } @media print { a[href] { text-decoration: none; color: black; font-weight: bold; } h1,h2,h3,h4,h5,h6 { border-bottom: 1px black; } } ]]; aside = [[ section > aside { text-align: justify; margin: 0 1.5em; padding: 0.5em 0.8em; background: @tone(0.05); font-size: 90%; border-left: 5px solid @tone(0.2 15); border-right: 5px solid @tone(0.2 15); } section > aside p { margin: 0; margin-top: 0.6em; } section > aside p:first-child { margin: 0; } ]]; code = [[ code { display: inline-block; background: @tone(0.9); color: @bg; font-family: monospace; font-size: 90%; padding: 3px 5px; } ]]; var = [[ var { font-style: italic; font-family: monospace; color: @tone(0.7); } code var { color: @tone(0.25); } ]]; math = [[ span.equation { display: inline-block; background: @tone(0.08); color: @tone(2); padding: 0.1em 0.3em; border: 1px solid @tone(0.5); } ]]; abbr = [[ abbr[title] { cursor: help; } ]]; editors_markup = [[]]; block_code_listing = [[ figure.listing { font-family: monospace; background: @tone(0.05); color: @fg; padding: 0; margin: 0.3em 0; counter-reset: line-number; position: relative; border: 1px solid @fg; } figure.listing>div { white-space: pre-wrap; tab-size: 3; -moz-tab-size: 3; counter-increment: line-number; text-indent: -2.3em; margin-left: 2.3em; } figure.listing>:is(div,hr)::before { width: 1.0em; padding: 0.2em 0.4em; text-align: right; display: inline-block; background-color: @tone(0.2); border-right: 1px solid @fg; content: counter(line-number); margin-right: 0.3em; } figure.listing>hr::before { color: transparent; padding-top: 0; padding-bottom: 0; } figure.listing>div::before { color: @fg; } figure.listing>div:last-child::before { padding-bottom: 0.5em; } figure.listing>figcaption:first-child { border: none; border-bottom: 1px solid @fg; } figure.listing>figcaption::after { display: block; float: right; font-weight: normal; font-style: italic; font-size: 70%; padding-top: 0.3em; } figure.listing>figcaption { font-family: sans-serif; font-size: 120%; padding: 0.2em 0.4em; border: none; color: @tone(2); } figure.listing > hr { border: none; margin: 0; height: 0.7em; counter-increment: line-number; } ]]; } local stylesNeeded = {} local render_state_handle = { doc = doc; opts = opts; style_rules = styles; -- use stylesneeded if at all possible stylesets = stylesets; stylesets_active = stylesNeeded; obj_htmlid = getSafeID; -- remaining fields added later } local renderJob = doc:job('render_html', nil, render_state_handle) doc.stage.job = renderJob; local runhook = function(h, ...) return renderJob:hook(h, render_state_handle, ...) end local tagproc do local elt = function(t,attrs) return f('<%s%s>', t, attrs and ss.reduce(function(a,b) return a..b end, '', ss.map(function(v,k) if v == true then return ' '..k elseif v then return f(' %s="%s"', k, v) end end, attrs)) or '') end tagproc = { toTXT = { tag = function(t,a,v) return v end; elt = function(t,a) return '' end; catenate = table.concat; }; toIR = { tag = function(t,a,v,o) return { tag = t, attrs = a; nodes = type(v) == 'string' and {v} or v, src = o } end; elt = function(t,a,o) return { tag = t, attrs = a, src = o } end; catenate = function(...) return ... end; }; toHTML = { elt = elt; tag = function(t,attrs,body) return f('%s%s</%s>', elt(t,attrs), body, t) end; catenate = table.concat; }; } end local function getBaseRenderers(procs, span_renderers) local tag, elt, catenate = procs.tag, procs.elt, procs.catenate local htmlDoc = function(title, head, body) return [[<!doctype html>]] .. tag('html',nil, tag('head', nil, elt('meta',{charset = 'utf-8'}) .. (title and tag('title', nil, title) or '') .. (head or '')) .. tag('body', nil, body or '')) end local function htmlSpan(spans, block, sec) local text = {} for k,v in pairs(spans) do if type(v) == 'string' then v=v:gsub('[<>&"]', function(x) return string.format('&#%02u;', string.byte(x)) end) for fn, ext in renderJob:each('hook','render_html_sanitize') do v = fn(renderJob:delegate(ext), v) end table.insert(text,v) else table.insert(text, (span_renderers[v.kind](v, block, sec))) end end return table.concat(text) end return {htmlDoc=htmlDoc, htmlSpan=htmlSpan} end local spanparse = function(...) local s = ct.parse_span(...) doc.docjob:hook('meddle_span', s) return s end local cssRulesFor = {} local function getSpanRenderers(procs) local tag, elt, catenate = procs.tag, procs.elt, procs.catenate local span_renderers = {} local plainrdr = getBaseRenderers(tagproc.toTXT, span_renderers) local htmlSpan = getBaseRenderers(procs, span_renderers).htmlSpan function span_renderers.format(sp,...) local tags = { strong = 'strong', emph = 'em', strike = 'del', insert = 'ins', literal = 'code', variable = 'var'} if sp.style == 'literal' and not opts['fossil-uv'] then stylesNeeded.code = true elseif sp.style == 'strike' or sp.style == 'insert' then stylesNeeded.editors_markup = true elseif sp.style == 'variable' then stylesNeeded.var = true end return tag(tags[sp.style],nil,htmlSpan(sp.spans,...)) end function span_renderers.deref(t,b,s) local r = b.origin:ref(t.ref) local name = t.ref if name:find'%.' then name = name:match '^[^.]*%.(.+)$' end if type(r) == 'string' then stylesNeeded.abbr = true return tag('abbr',{title=r},next(t.spans) and htmlSpan(t.spans,b,s) or name) end if r.kind == 'resource' then local rid = getSafeID(r, 'res-') if r.class == 'image' then if not cssRulesFor[r] then local css = prepcss(string.format([[ section p > .%s { } ]], rid)) stylesets[r] = css cssRulesFor[r] = css stylesNeeded[r] = true end return tag('div',{class=rid},catenate{'blaah'}) elseif r.class == 'video' then local vid = {} return tag('video',nil,vid) elseif r.class == 'font' then b.origin:fail('fonts cannot be instantiated, use %font directive instead') end else b.origin:fail('%s is not an object that can be embedded', t.ref) end end function span_renderers.var(v,b,s) local val if v.pos then if not v.origin.invocation then v.origin:fail 'positional arguments can only be used in a macro invocation' elseif not v.origin.invocation.args[v.pos] then v.origin.invocation.origin:fail('macro invocation %s missing positional argument #%u', v.origin.invocation.macro, v.pos) end val = v.origin.invocation.args[v.pos] else val = v.origin.doc:context_var(v.var, v.origin) end if v.raw then return val else return htmlSpan(ct.parse_span(val, v.origin), b, s) end end function span_renderers.raw(v,b,s) return htmlSpan(v.spans, b, s) end function span_renderers.link(sp,b,s) local href if b.origin.doc.sections[sp.ref] then href = '#' .. sp.ref else if sp.addr then href = sp.addr else local r = b.origin:ref(sp.ref) if type(r) == 'table' then href = '#' .. getSafeID(r) else href = r end end end return tag('a',{href=href},next(sp.spans) and htmlSpan(sp.spans,b,s) or href) end span_renderers['line-break'] = function(sp,b,s) return elt('br') end function span_renderers.macro(m,b,s) local macroname = plainrdr.htmlSpan( ct.parse_span(m.macro, b.origin), b,s) local r = b.origin:ref(macroname) if type(r) ~= 'string' then b.origin:fail('%s is an object, not a reference', t.ref) end local mctx = b.origin:clone() mctx.invocation = m return htmlSpan(ct.parse_span(r, mctx),b,s) end function span_renderers.math(m,b,s) stylesNeeded.math = true local spans = {} local function fmt(sp, target) for i,v in ipairs(sp) do if type(v) == 'string' then local x = ct.tool.mathfmt(b.origin, v) for _,v in ipairs(x) do table.insert(target, v) end elseif type(v) == 'table' then if v.spans then local tbl = ss.delegate(v) tbl.spans = {} fmt(v.spans, tbl.spans) table.insert(target, tbl) else table.insert(target, v) end end end end fmt(m.spans,spans) return tag('span',{class='equation'},htmlSpan(spans, b, s)) end; function span_renderers.directive(d,b,s) if d.ext == 'html' then elseif b.origin.doc:allow_ext(d.ext) then elseif d.crit then b.origin:fail('critical extension %s unavailable', d.ext) elseif d.failthru then return htmlSpan(d.spans, b, s) end end function span_renderers.footnote(f,b,s) stylesNeeded.footnote = true local source, sid, ssec = b.origin:ref(f.ref) local cnc = getSafeID(ssec) .. ' ' .. sid local fn if footnotes[cnc] then fn = footnotes[cnc] else footnotecount = footnotecount + 1 fn = {num = footnotecount, origin = b.origin, fnid=cnc, source = source} fn.id = getSafeID(fn) footnotes[cnc] = fn end return tag('a', {href='#'..fn.id}, htmlSpan(f.spans) .. tag('sup',nil, fn.num)) end return span_renderers end local function getBlockRenderers(procs, sr) local tag, elt, catenate = procs.tag, procs.elt, procs.catenate local null = function() return catenate{} end local block_renderers = { anchor = function(b,s) return tag('a',{id = getSafeID(b)},null()) end; paragraph = function(b,s) stylesNeeded.paragraph = true; return tag('p', nil, sr.htmlSpan(b.spans, b, s), b) end; directive = function(b,s) -- deal with renderer directives local _, cmd, args = b.words(2) if cmd == 'page-title' then if not opts.title then doctitle = args end elseif b.critical then b.origin:fail('critical HTML renderer directive ā%sā not supported', cmd) end end; label = function(b,s) if ct.sec.is(b.captions) then if not (opts['fossil-uv'] or opts.snippet) then stylesNeeded.header = true end local h = math.min(6,math.max(1,b.captions.depth)) return tag(f('h%u',h), nil, sr.htmlSpan(b.spans, b, s), b) else -- handle other uses of labels here end end; ['list-item'] = function(b,s) return tag('li', nil, sr.htmlSpan(b.spans, b, s), b) end; table = function(b,s) local tb = {} for i, r in ipairs(b.rows) do local row = {} for i, c in ipairs(r) do table.insert(row, tag(c.header and 'th' or 'td', {align=c.align}, sr.htmlSpan(c.spans, b))) end table.insert(tb, tag('tr',nil,catenate(row))) end return tag('table',nil,catenate(tb)) end; listing = function(b,s) stylesNeeded.block_code_listing = true local nodes = ss.map(function(l) if #l > 0 then return tag('div',nil,sr.htmlSpan(l, b, s)) else return elt('hr') end end, b.lines) if b.title then table.insert(nodes,1, tag('figcaption',nil,sr.htmlSpan(b.title))) end if b.lang then langsused[b.lang] = true end return tag('figure', {class='listing', lang=b.lang, id=b.id and getSafeID(b)}, catenate(nodes)) end; aside = function(b,s) local bn = {} stylesNeeded.aside = true if #b.lines == 1 then bn[1] = sr.htmlSpan(b.lines[1], b, s) else for _,v in pairs(b.lines) do table.insert(bn, tag('p', {}, sr.htmlSpan(v, b, s))) end end return tag('aside', {}, bn) end; ['break'] = function() -- HACK -- lists need to be rewritten to work like asides return ''; end; } return block_renderers; end local function getRenderers(procs) local span_renderers = getSpanRenderers(procs) local r = getBaseRenderers(procs,span_renderers) r.block_renderers = getBlockRenderers(procs, r) return r end local astproc = { toHTML = getRenderers(tagproc.toHTML); toTXT = getRenderers(tagproc.toTXT); toIR = { }; } astproc.toIR.span_renderers = ss.clone(astproc.toHTML); astproc.toIR.block_renderers = getBlockRenderers(tagproc.toIR,astproc.toHTML); -- note we use HTML here instead of IR span renderers, because as things -- currently stand we don't need that level of resolution. if we ever -- get to the point where we want to be able to twiddle spans around -- we'll need to introduce an IR span renderer render_state_handle.astproc = astproc; render_state_handle.tagproc = tagproc; -- bind to legacy names -- yikes this needs to be cleaned up so badly local ir = {} local dr = astproc.toHTML -- default renderers local plainr = astproc.toTXT local irBlockRdrs = astproc.toIR.block_renderers; render_state_handle.ir = ir; local function renderBlocks(blocks, irs) for i, block in ipairs(blocks) do local rd if irBlockRdrs[block.kind] then rd = irBlockRdrs[block.kind](block,sec) else local rdr = renderJob:proc('render',block.kind,'html') if rdr then rd = rdr({ state = render_state_handle; tagproc = tagproc.toIR; astproc = astproc.toIR; }, block, sec) end end if rd then if opts['heading-anchors'] and block == sec.heading_node then stylesNeeded.headingAnchors = true table.insert(rd.nodes, ' ') table.insert(rd.nodes, { tag = 'a'; attrs = {href = '#' .. irs.attrs.id, class='anchor'}; nodes = {type(opts['heading-anchors'])=='string' and opts['heading-anchors'] or '§'}; }) end if rd.src and rd.src.origin.lang then if not rd.attrs then rd.attrs = {} end rd.attrs.lang = rd.src.origin.lang end table.insert(irs.nodes, rd) runhook('ir_section_node_insert', rd, irs, sec) end end end runhook('ir_assemble', ir) for i, sec in ipairs(doc.secorder) do if doctitle == nil and sec.depth == 1 and sec.heading_node then doctitle = astproc.toTXT.htmlSpan(sec.heading_node.spans, sec.heading_node, sec) end local irs if sec.kind == 'ordinary' then if #(sec.blocks) > 0 then irs = {tag='section',attrs={id = getSafeID(sec)},nodes={}} runhook('ir_section_build', irs, sec) renderBlocks(sec.blocks, irs) end elseif sec.kind == 'blockquote' then elseif sec.kind == 'listing' then elseif sec.kind == 'embed' then end if irs then table.insert(ir, irs) end end for _, fn in pairs(footnotes) do local tag = tagproc.toIR.tag local body = {nodes={}} local ftir = {} for l in fn.source:gmatch('([^\n]*)') do ct.parse_line(l, fn.origin, ftir) end renderBlocks(ftir,body) local note = tag('div',{class='footnote',id=fn.id}, { tag('div',{class='number'}, tostring(fn.num)), tag('div',{class='text'}, body.nodes), tag('a',{href='#0'},'close') }) table.insert(ir, note) end -- restructure passes runhook('ir_restructure_pre', ir) ---- list insertion pass local lists = {} for _, sec in pairs(ir) do if sec.tag == 'section' then local i = 1 while i <= #sec.nodes do local v = sec.nodes[i] if v.tag == 'li' then local ltag if v.src.ordered then ltag = 'ol' else ltag = 'ul' end local last = i>1 and sec.nodes[i-1] if last and last.embed == 'list' and not ( last.ref[#last.ref].src.depth == v.src.depth and last.ref[#last.ref].src.ordered ~= v.src.ordered ) then -- add to existing list table.insert(last.ref, v) table.remove(sec.nodes, i) i = i - 1 else -- wrap in list local newls = {v} sec.nodes[i] = {embed = 'list', ref = newls} table.insert(lists,newls) end end i = i + 1 end end end for _, sec in pairs(ir) do if sec.tag == 'section' then for i, elt in pairs(sec.nodes) do if elt.embed == 'list' then local function fail_nest() elt.ref[1].src.origin:fail('improper list nesting') end local struc = {attrs={}, nodes={}} if elt.ref[1].src.ordered then struc.tag = 'ol' else struc.tag = 'ul' end if elt.ref[1].src.depth ~= 1 then fail_nest() end local stack = {struc} local copyNodes = function(old,new) for i,v in ipairs(old) do new[#new + i] = v end end for i,e in ipairs(elt.ref) do if e.src.depth > #stack then if e.src.depth - #stack > 1 then fail_nest() end local newls = {attrs={}, nodes={e}} copyNodes(e.nodes,newls) if e.src.ordered then newls.tag = 'ol' else newls.tag='ul' end table.insert(stack[#stack].nodes[#stack[#stack].nodes].nodes, newls) table.insert(stack, newls) else if e.src.depth < #stack then -- pop entries off the stack for i=#stack, e.src.depth+1, -1 do stack[i] = nil end end table.insert(stack[#stack].nodes, e) end end sec.nodes[i] = struc end end end end runhook('ir_restructure_post', ir) -- collection pass local function collect_nodes(t) local ts = '' for i,v in ipairs(t) do if type(v) == 'string' then ts = ts .. v elseif v.nodes then ts = ts .. tagproc.toHTML.tag(v.tag, v.attrs, collect_nodes(v.nodes)) elseif v.text then ts = ts .. tagproc.toHTML.tag(v.tag,v.attrs,v.text) else ts = ts .. tagproc.toHTML.elt(v.tag,v.attrs) end end return ts end local body = collect_nodes(ir) for k in pairs(langsused) do local spec = langpairs[k] or {color=0xaaaaaa} stylesets.block_code_listing = stylesets.block_code_listing .. string.format( [[section > figure.listing[lang="%s"]>figcaption::after { content: '%s'; color: #%06x }]], k, spec.name or k, spec.color) end local prepcss = function(css) local tone = function(fac, sat, sep, alpha) local hsl = function(h,s,l,a) local v = string.format('%s, %u%%, %u%%', h,s,l) if a then return string.format('hsla(%s, %s)', v,a) else return string.format('hsl(%s)', v) end end sat = sat or 1 fac = math.max(math.min(fac, 1), 0) sat = math.max(math.min(sat, 1), 0) if opts.accent then local hue = 'var(--accent)' local hsep = tonumber(opts['hue-spread']) if hsep and sep and sep ~= 0 then hue = string.format('calc(%s - %s)', hue, sep * hsep) end return hsl(hue, math.floor(100*sat), math.floor(100*fac), alpha) else local g = math.floor(0xFF * fac) return string.format('#' .. string.rep('%02x',alpha and 4 or 3), g,g,g,alpha and math.floor(0xFF*alpha)) end end local replace = function(var,alpha,param) local tonespan = opts.accent and .1 or 0 local tbg = opts['dark-on-light'] and 1.0 - tonespan or tonespan local tfg = opts['dark-on-light'] and tonespan or 1.0 - tonespan if var == 'bg' then return tone(tbg,nil,nil,tonumber(alpha)) elseif var == 'fg' then return tone(tfg,nil,nil,tonumber(alpha)) elseif var == 'width' then return opts['width'] or '100vw' elseif var == 'tone' then local l, sep, sat for i=1,3 do -- š l,sep,sat = param:match('^%('..string.rep('([^%s]*)%s*',i)..'%)$') if l then break end end l = ss.math.lerp(tonumber(l), tbg, tfg) return tone(l, tonumber(sat), tonumber(sep), tonumber(alpha)) end end css = css:gsub('@(%b[]):(%b[])', function(v,d) return opts[v:sub(2,-2)] or v:sub(2,-2) end) css = css:gsub('@(%w+)/([0-9.]+)(%b())', replace) css = css:gsub('@(%w+)(%b())', function(a,b) return replace(a,nil,b) end) css = css:gsub('@(%w+)/([0-9.]+)', replace) css = css:gsub('@(%w+)', function(a,b) return replace(a,nil,b) end) return (css:gsub('%s+',' ')) end local styles = {} if opts.width then table.insert(styles, string.format([[body {padding:0 1em;margin:auto;max-width:%s}]], opts.width)) end if opts.accent then table.insert(styles, string.format(':root {--accent:%s}', opts.accent)) end if opts.accent or (not opts['dark-on-light']) and (not opts['fossil-uv']) then stylesNeeded.accent = true end for k in pairs(stylesNeeded) do if not stylesets[k] then ct.exns.unimpl('styleset %s not implemented (!)', k):throw() end table.insert(styles, prepcss(stylesets[k])) end local head = {} local styletag = '' if opts['link-css'] then local css = opts['link-css'] if type(css) ~= 'string' then ct.exns.mode('must be a string', 'html:link-css'):throw() end styletag = styletag .. tagproc.toHTML.elt('link',{rel='stylesheet',type='text/css',href=opts['link-css']}) end if next(styles) then if opts['gen-styles'] then styletag = styletag .. tagproc.toHTML.tag('style',{type='text/css'},table.concat(styles)) end table.insert(head, styletag) end if opts['fossil-uv'] then return tagproc.toHTML.tag('div',{class='fossil-doc',['data-title']=doctitle},styletag .. body) elseif opts.snippet then return styletag .. body else return dr.htmlDoc(doctitle, next(head) and table.concat(head), body) end end |
Modified sirsem.lua from [581e1b0127] to [dc1f0ae1fb].
212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 ... 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 ... 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 |
ascii = { len = string.len; char = string.char; codepoint = string.byte; iswhitespace = function(c) return (c == ' ') or (c == '\t') or (c == '\n') end; ranges = { {0x00,0x1a, cc.ctl}; {0x1b,0x1b, cc.ctl, cp.disallow}; {0x1c,0x1f, cc.ctl}; {0x20,0x20, cc.space}; {0x21,0x22, cc.punct}; {0x23,0x26, cc.symbol}; {0x27,0x29, cc.punct}; {0x2a,0x2b, cc.symbol}; {0x2c,0x2f, cc.punct}; {0x30,0x39, cc.numeral, cp.hexnumeral}; {0x3a,0x3b, cc.punct}; {0x3c,0x3e, cc.symbol, cp.mathop}; {0x3f,0x3f, cc.punct}; {0x40,0x40, cc.symbol}; {0x41,0x46, cc.letter, cp.ucase, cp.hexnumeral}; {0x47,0x5a, cc.letter, cp.ucase}; {0x5b,0x5d, cc.symbol, cp.mathop}; {0x5e,0x5e, cc.symbol, mathop}; {0x5f,0x60, cc.symbol}; {0x61,0x66, cc.letter, cp.lcase, cp.hexnumeral}; {0x67,0x7a, cc.letter, cp.lcase}; {0x7b,0x7e, cc.symbol}; {0x7f,0x7f, cc.ctl, cp.disallow}; } }; raw = {len = string.len; char = string.char; codepoint = string.byte; encodeUCS = function(str) return str end; iswhitespace = function(c) ................................................................................ -- unicode ranges are optionally generated from consortium data -- files and injected through a generated source file. if this -- part of the build process is disabled (e.g. due to lack of -- internet access, or to keep the size of the executable as -- small as possible), we still at least can make the ascii -- ranges available to UTF8 (UTF8 being a superset of ascii) ss.str.enc.utf8.ranges = ss.delegate(ss.str.enc.ascii.ranges) function ss.str.enc.ascii.encodeUCS(str) local newstr = '' for c,p in ss.str.each(ss.str.enc.utf8, str, true) do if c > 0x7F then newstr = newstr .. '?' else ................................................................................ end end end for _, v in pairs{'utf8','ascii','raw'} do ss.str.enc[v].parse_escape = ss.str.enc_generics.pfxescape('\\',ss.str.enc[v]) end function ss.str.classify(enc, ch) if not enc.ranges then return {} end if type(ch)=='string' then ch = enc.codepoint(ch) end -- TODO end function ss.str.each(enc, str, ascode) if enc.each then return enc.each(enc,str,ascode) end local pm = { __index = { |
| | | | | | | | | | > > > > > > > > > > > > > > > < > > > > > > > > > > |
212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 ... 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 ... 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 |
ascii = { len = string.len; char = string.char; codepoint = string.byte; iswhitespace = function(c) return (c == ' ') or (c == '\t') or (c == '\n') end; ranges = { {0x00,0x1a, cc.ctl}; {0x1b,0x1b, cc.ctl | cp.disallow}; {0x1c,0x1f, cc.ctl}; {0x20,0x20, cc.space}; {0x21,0x22, cc.punct}; {0x23,0x26, cc.symbol}; {0x27,0x29, cc.punct}; {0x2a,0x2b, cc.symbol}; {0x2c,0x2f, cc.punct}; {0x30,0x39, cc.numeral | cp.hexnumeral}; {0x3a,0x3b, cc.punct}; {0x3c,0x3e, cc.symbol | cp.mathop}; {0x3f,0x3f, cc.punct}; {0x40,0x40, cc.symbol}; {0x41,0x46, cc.letter | cp.upper | cp.hexnumeral}; {0x47,0x5a, cc.letter | cp.upper}; {0x5b,0x5d, cc.symbol | cp.mathop}; {0x5e,0x5e, cc.symbol | cp.mathop}; {0x5f,0x60, cc.symbol}; {0x61,0x66, cc.letter | cp.lower | cp.hexnumeral}; {0x67,0x7a, cc.letter | cp.lower}; {0x7b,0x7e, cc.symbol}; {0x7f,0x7f, cc.ctl, cp.disallow}; } }; raw = {len = string.len; char = string.char; codepoint = string.byte; encodeUCS = function(str) return str end; iswhitespace = function(c) ................................................................................ -- unicode ranges are optionally generated from consortium data -- files and injected through a generated source file. if this -- part of the build process is disabled (e.g. due to lack of -- internet access, or to keep the size of the executable as -- small as possible), we still at least can make the ascii -- ranges available to UTF8 (UTF8 being a superset of ascii) ss.str.enc.utf8.ranges = ss.str.enc.ascii.ranges function ss.str.enc.ascii.encodeUCS(str) local newstr = '' for c,p in ss.str.each(ss.str.enc.utf8, str, true) do if c > 0x7F then newstr = newstr .. '?' else ................................................................................ end end end for _, v in pairs{'utf8','ascii','raw'} do ss.str.enc[v].parse_escape = ss.str.enc_generics.pfxescape('\\',ss.str.enc[v]) end function ss.bitmask_expand(ty, v) local bitrange = ty[true] local fb if bitrange[1] ~= 0 then fb = v & ((1<<bitrange[1]) - 1) -- first N bits end local tbl = {} for j=bitrange[1], bitrange[2] do if (fb & (1<<j)) ~= 0 then tbl[ty[1<<j]] = true end end return tbl, fb end function ss.str.classify(enc, ch) if not enc.ranges then return {} end if type(ch)=='string' then ch = enc.codepoint(ch) end for _, r in pairs(enc.ranges) do if ch >= r[1] and ch <= r[2] then local p,b = ss.bitmask_expand(ss.str.charprop, r[3]) if b then p[ss.str.charclass[b]] = true end return p end end return {} end function ss.str.each(enc, str, ascode) if enc.each then return enc.each(enc,str,ascode) end local pm = { __index = { |
Modified tools/ucs.lua from [3976f4bc78] to [cf6aee3c65].
21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 .. 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 ... 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 ... 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 ... 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 |
local file = io.stdin local path if arg[1] then path = arg[1] file = io.open(path, 'rb') end local bitmask_raw = function(n,ofs) ofs = ofs or 0 local function rec(i) if i > n then return end return 1<<(i+ofs), rec(i+1) end return 1<<ofs, rec(1) end local bitmask = function(tbl,ofs) local codes = {bitmask_raw(#tbl,ofs)} local m = {} local maxbit for i, s in ipairs(tbl) do m[s] = codes[i] m[codes[i]] = s maxbit = i end m[true] = {ofs or 0,maxbit} return m end local basictype = enum { 'numeral'; 'alpha'; 'symbol'; 'punct'; 'space'; 'ctl'; 'glyph'; -- hanji } local props = bitmask({ 'hex', 'upper', 'lower', 'diac', 'wordbreak', 'wordsep', 'disallow', 'brack', 'right', 'left', 'noprint', 'superimpose' }, 3) local overrides = { [0x200B] = basictype.space | props.wordsep; -- database entry is wrong } local mask = ~0 -- mask out irrelevant properties to compactify database local function parsecat(tbl) ................................................................................ elseif tbl.class == 'Nd' then c = b.numeral elseif tbl.class == 'No' then c = b.numeral | p.diac elseif tbl.class == 'Cc' then if tbl.kind == 'S' or tbl.kind == 'WS' or tbl.kind == 'B' then c = b.space | p.wordsep else c = b.ctl | p.wordbreak | p.disallow end elseif tbl.class == 'Lu' then c = b.alpha | p.upper elseif tbl.class == 'Ll' then c = b.alpha | p.lower elseif tbl.class == 'Lo' or tbl.class == 'Lt' then c = b.alpha elseif tbl.class == 'Po' then c = b.punct | p.wordbreak elseif tbl.class == 'Sm' then c = b.symbol | p.wordsep elseif tbl.class == 'Ps' then c = b.punct | p.brack | p.left elseif tbl.class == 'Pe' then c = b.punct | p.brack | p.right elseif tbl.class == 'Pc' or tbl.class == 'Pd' or tbl.class == 'Sk' ................................................................................ local ranuirAlpha = {0xe39d, 0xe39f, 0xe3ad, 0xe3af, 0xe3b5, 0xe3b7, 0xe3b9, 0xe3bb, 0xe3bd, 0xe3be, 0xe3bf, 0xe3c5, 0xe3c7, 0xe3c9, 0xe3cb, 0xe3cc, 0xe3cd, 0xe3ce, 0xe3cf} local ranuirSpecial = { [0xe390] = basictype.space | props.wordsep; } local ranuir = {} for _,v in pairs(ranuirAlpha) do ranuir[v] = basictype.alpha end for k,v in pairs(ranuirSpecial) do ranuir[k] = v end local ranuirKeys = {} for k in pairs(ranuir) do table.insert(ranuirKeys, k) end table.sort(ranuirKeys) local recs = {} local ranuirok = false for ln in file:lines() do local v = {} for s in ln:gmatch('[^;]*') do table.insert(v, s) end v[1] = tonumber(v[1],0x10) if v[1] > 0x7f then -- discard ASCII, we already have that local code = { codepoint = v[1]; name = v[2]; class = v[3]; kind = v[5]; } code.cat = parsecat(code) ................................................................................ end ranuirok = true end if code.cat ~= 0 then table.insert(recs,code) end end end local ranges = {} local last = recs[1] local start = last local altern = false ................................................................................ flush() start = r end last = r end flush() -- expand bitmask -- for k,v in pairs(ranges) do -- local basic = v[3] & ((1<<3) - 1) -- first three bits -- if basic ~= 0 then -- v[4] = basictype[basic] -- end -- local bitrange = props[true] -- for j=bitrange[1], bitrange[2] do -- if (v[3] & (1<<j)) ~= 0 then -- table.insert(v, props[1<<j]) -- end -- end -- end -- the data has been collected and formatted in the manner we -- need; now we just need to emit it as a lua table local tab = {} local top = 1 for k,v in pairs(ranges) do tab[top] = string.format('{0x%x,0x%x,%u}',table.unpack(v)) top = top + 1 end io.stdout:write(string.format(tpl, table.concat(tab,','))) |
| < < < < < < < < < < < < < < < < < < < < < | < < < < < < < < | < < < < < < < < | | | | | | < < < < < < < < < < < < < < | |
21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 .. 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 .. 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 ... 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 ... 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 |
local file = io.stdin local path if arg[1] then path = arg[1] file = io.open(path, 'rb') end local ss = require'sirsem' local basictype = ss.str.charclass local props = ss.str.charprop local overrides = { [0x200B] = basictype.space | props.wordsep; -- database entry is wrong } local mask = ~0 -- mask out irrelevant properties to compactify database local function parsecat(tbl) ................................................................................ elseif tbl.class == 'Nd' then c = b.numeral elseif tbl.class == 'No' then c = b.numeral | p.diac elseif tbl.class == 'Cc' then if tbl.kind == 'S' or tbl.kind == 'WS' or tbl.kind == 'B' then c = b.space | p.wordsep else c = b.ctl | p.wordbreak | p.disallow end elseif tbl.class == 'Lu' then c = b.letter | p.upper elseif tbl.class == 'Ll' then c = b.letter | p.lower elseif tbl.class == 'Lo' or tbl.class == 'Lt' then c = b.letter elseif tbl.class == 'Po' then c = b.punct | p.wordbreak elseif tbl.class == 'Sm' then c = b.symbol | p.wordsep elseif tbl.class == 'Ps' then c = b.punct | p.brack | p.left elseif tbl.class == 'Pe' then c = b.punct | p.brack | p.right elseif tbl.class == 'Pc' or tbl.class == 'Pd' or tbl.class == 'Sk' ................................................................................ local ranuirAlpha = {0xe39d, 0xe39f, 0xe3ad, 0xe3af, 0xe3b5, 0xe3b7, 0xe3b9, 0xe3bb, 0xe3bd, 0xe3be, 0xe3bf, 0xe3c5, 0xe3c7, 0xe3c9, 0xe3cb, 0xe3cc, 0xe3cd, 0xe3ce, 0xe3cf} local ranuirSpecial = { [0xe390] = basictype.space | props.wordsep; } local ranuir = {} for _,v in pairs(ranuirAlpha) do ranuir[v] = basictype.letter end for k,v in pairs(ranuirSpecial) do ranuir[k] = v end local ranuirKeys = {} for k in pairs(ranuir) do table.insert(ranuirKeys, k) end table.sort(ranuirKeys) local recs = {} local ranuirok = false for ln in file:lines() do local v = {} for s in ln:gmatch('[^;]*') do table.insert(v, s) end v[1] = tonumber(v[1],0x10) -- if v[1] > 0x7f then -- discard ASCII, we already have that local code = { codepoint = v[1]; name = v[2]; class = v[3]; kind = v[5]; } code.cat = parsecat(code) ................................................................................ end ranuirok = true end if code.cat ~= 0 then table.insert(recs,code) end -- end end local ranges = {} local last = recs[1] local start = last local altern = false ................................................................................ flush() start = r end last = r end flush() -- the data has been collected and formatted in the manner we -- need; now we just need to emit it as a lua table local tab = {} local top = 1 for k,v in pairs(ranges) do tab[top] = string.format('{0x%x,0x%x,%u}',table.unpack(v)) top = top + 1 end io.stdout:write(string.format(tpl, table.concat(tab,',\n'))) |