4890 - new html renderings

a) Switch to a light background.
b) Linkify calls in .subx files.
c) Keep all colorization in the Vim colorscheme, get rid of hacky special-cases
   in update_html.

1 files changed, 30 insertions, 35 deletions

diff --git a/html/subx/apps/factorial.subx.html b/html/subx/apps/factorial.subx.html
index 026db18a..39715397 100644
--- a/html/subx/apps/factorial.subx.html
+++ b/html/subx/apps/factorial.subx.html
@@ -7,27 +7,22 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.subxComment { color:#16bfff; }
-.subxS2Comment { color:#4466ff; }
-.LineNr { color:#444444; }
-.subxS1Comment { color:#2d8cff; }
-.CommentedCode { color: #6c6c6c; }
-.Constant { color:#00a0a0; }
+.subxComment { color: #005faf; }
+.subxS2Comment { color: #8a8a8a; }
+.LineNr { }
+.subxS1Comment { color: #0000af; }
+.SpecialChar { color: #d70000; }
+.Constant { color: #008787; }
 .subxFunction { color: #af5f00; text-decoration: underline; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
 .subxTest { color: #5f8700; }
-.SpecialChar { color: #d70000; }
-.subxH1Comment { color:#00ffff; }
+.subxH1Comment { color: #005faf; text-decoration: underline; }
 -->
 </style>
 
@@ -86,25 +81,25 @@ if ('onhashchange' in window) {
 <span id="L21" class="LineNr"> 21 </span>
 <span id="L22" class="LineNr"> 22 </span><span class="subxComment"># main:</span>
 <span id="L23" class="LineNr"> 23 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L24" class="LineNr"> 24 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L24" class="LineNr"> 24 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L25" class="LineNr"> 25 </span>    <span class="subxH1Comment"># - if argc &gt; 1 and argv[1] == &quot;test&quot; then return run_tests()</span>
 <span id="L26" class="LineNr"> 26 </span>    <span class="subxS1Comment"># . argc &gt; 1</span>
-<span id="L27" class="LineNr"> 27 </span>    81          7/subop/compare     1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0/disp8         1/imm32           <span class="subxComment"># compare *EBP</span>
+<span id="L27" class="LineNr"> 27 </span>    81          7/subop/compare     1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0/disp8         1/imm32           <span class="subxComment"># compare *EBP</span>
 <span id="L28" class="LineNr"> 28 </span>    7e/jump-if-lesser-or-equal  $run-main/disp8
 <span id="L29" class="LineNr"> 29 </span>    <span class="subxS1Comment"># . argv[1] == &quot;test&quot;</span>
 <span id="L30" class="LineNr"> 30 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L31" class="LineNr"> 31 </span>    68/push  <span class="Constant">&quot;test&quot;</span>/imm32
-<span id="L32" class="LineNr"> 32 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L32" class="LineNr"> 32 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
 <span id="L33" class="LineNr"> 33 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L34" class="LineNr"> 34 </span>    e8/call  kernel-string-equal/disp32
+<span id="L34" class="LineNr"> 34 </span>    e8/call  <a href='052kernel_string_equal.subx.html#L31'>kernel-string-equal</a>/disp32
 <span id="L35" class="LineNr"> 35 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L36" class="LineNr"> 36 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L36" class="LineNr"> 36 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L37" class="LineNr"> 37 </span>    <span class="subxS1Comment"># . check result</span>
 <span id="L38" class="LineNr"> 38 </span>    3d/compare-EAX  1/imm32
 <span id="L39" class="LineNr"> 39 </span>    75/jump-if-not-equal  $run-main/disp8
 <span id="L40" class="LineNr"> 40 </span>    <span class="subxS1Comment"># . run-tests()</span>
 <span id="L41" class="LineNr"> 41 </span>    e8/call  run-tests/disp32
-<span id="L42" class="LineNr"> 42 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX   <span class="SpecialChar">Num-test-failures</span>/disp32          <span class="subxComment"># copy *Num-test-failures to EAX</span>
+<span id="L42" class="LineNr"> 42 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   <span class="SpecialChar"><a href='051test.subx.html#L87'>Num-test-failures</a></span>/disp32          <span class="subxComment"># copy *Num-test-failures to EAX</span>
 <span id="L43" class="LineNr"> 43 </span>    eb/jump  $main:end/disp8  <span class="subxComment"># where EAX will get copied to EBX</span>
 <span id="L44" class="LineNr"> 44 </span>    <span class="subxH1Comment"># - otherwise return factorial(5)</span>
 <span id="L45" class="LineNr"> 45 </span><span class="Constant">$run-main</span>:
@@ -113,40 +108,40 @@ if ('onhashchange' in window) {
 <span id="L48" class="LineNr"> 48 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L49" class="LineNr"> 49 </span>    e8/call  factorial/disp32
 <span id="L50" class="LineNr"> 50 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L51" class="LineNr"> 51 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L51" class="LineNr"> 51 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L52" class="LineNr"> 52 </span><span class="Constant">$main:end</span>:
 <span id="L53" class="LineNr"> 53 </span>    <span class="subxComment"># syscall(exit, EAX)</span>
-<span id="L54" class="LineNr"> 54 </span>    89/copy                         3/mod/direct    3/rm32/EBX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EAX to EBX</span>
-<span id="L55" class="LineNr"> 55 </span>    b8/copy-to-EAX  1/imm32
+<span id="L54" class="LineNr"> 54 </span>    89/copy                         3/mod/direct    3/rm32/EBX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EAX to EBX</span>
+<span id="L55" class="LineNr"> 55 </span>    b8/copy-to-EAX  1/imm32/exit
 <span id="L56" class="LineNr"> 56 </span>    cd/syscall  0x80/imm8
 <span id="L57" class="LineNr"> 57 </span>
 <span id="L58" class="LineNr"> 58 </span><span class="subxFunction">factorial</span>:  <span class="subxComment"># n : int -&gt; int/EAX</span>
 <span id="L59" class="LineNr"> 59 </span>    <span class="subxS1Comment"># . prolog</span>
 <span id="L60" class="LineNr"> 60 </span>    55/push-EBP
-<span id="L61" class="LineNr"> 61 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L61" class="LineNr"> 61 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L62" class="LineNr"> 62 </span>    53/push-EBX
 <span id="L63" class="LineNr"> 63 </span>    <span class="subxComment"># EAX = 1 (base case)</span>
 <span id="L64" class="LineNr"> 64 </span>    b8/copy-to-EAX  1/imm32
 <span id="L65" class="LineNr"> 65 </span>    <span class="subxComment"># if (n &lt;= 1) return</span>
-<span id="L66" class="LineNr"> 66 </span>    81          7/subop/compare     1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8         1/imm32           <span class="subxComment"># compare *(EBP+8)</span>
+<span id="L66" class="LineNr"> 66 </span>    81          7/subop/compare     1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8         1/imm32           <span class="subxComment"># compare *(EBP+8)</span>
 <span id="L67" class="LineNr"> 67 </span>    7e/jump-if-&lt;=  $factorial:end/disp8
 <span id="L68" class="LineNr"> 68 </span>    <span class="subxComment"># EBX = n-1</span>
-<span id="L69" class="LineNr"> 69 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none              3/r32/EBX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+8) to EBX</span>
-<span id="L70" class="LineNr"> 70 </span>    81          5/subop/subtract    3/mod/direct    3/rm32/EBX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              1/imm32           <span class="subxComment"># subtract from EBX</span>
+<span id="L69" class="LineNr"> 69 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>                        3/r32/EBX   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to EBX</span>
+<span id="L70" class="LineNr"> 70 </span>    81          5/subop/subtract    3/mod/direct    3/rm32/EBX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              1/imm32           <span class="subxComment"># subtract from EBX</span>
 <span id="L71" class="LineNr"> 71 </span>    <span class="subxComment"># EAX = factorial(n-1)</span>
 <span id="L72" class="LineNr"> 72 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L73" class="LineNr"> 73 </span>    53/push-EBX
 <span id="L74" class="LineNr"> 74 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L75" class="LineNr"> 75 </span>    e8/call  factorial/disp32
 <span id="L76" class="LineNr"> 76 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L77" class="LineNr"> 77 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L77" class="LineNr"> 77 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L78" class="LineNr"> 78 </span>    <span class="subxComment"># return n * factorial(n-1)</span>
-<span id="L79" class="LineNr"> 79 </span>    f7          4/subop/multiply    1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none                          8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># multiply *(EBP+8) into EAX</span>
+<span id="L79" class="LineNr"> 79 </span>    f7          4/subop/multiply    1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>                                    8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># multiply *(EBP+8) into EAX</span>
 <span id="L80" class="LineNr"> 80 </span>    <span class="subxComment"># TODO: check for overflow</span>
 <span id="L81" class="LineNr"> 81 </span><span class="Constant">$factorial:end</span>:
 <span id="L82" class="LineNr"> 82 </span>    <span class="subxS1Comment"># . epilog</span>
 <span id="L83" class="LineNr"> 83 </span>    5b/pop-to-EBX
-<span id="L84" class="LineNr"> 84 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L84" class="LineNr"> 84 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L85" class="LineNr"> 85 </span>    5d/pop-to-EBP
 <span id="L86" class="LineNr"> 86 </span>    c3/return
 <span id="L87" class="LineNr"> 87 </span>
@@ -157,16 +152,16 @@ if ('onhashchange' in window) {
 <span id="L92" class="LineNr"> 92 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L93" class="LineNr"> 93 </span>    e8/call  factorial/disp32
 <span id="L94" class="LineNr"> 94 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L95" class="LineNr"> 95 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L95" class="LineNr"> 95 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L96" class="LineNr"> 96 </span>    <span class="subxComment"># check-ints-equal(EAX, 120, msg)</span>
 <span id="L97" class="LineNr"> 97 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L98" class="LineNr"> 98 </span>    68/push  <span class="Constant">&quot;F - test-factorial&quot;</span>/imm32
 <span id="L99" class="LineNr"> 99 </span>    68/push  0x78/imm32/expected-120
 <span id="L100" class="LineNr">100 </span>    50/push-EAX
 <span id="L101" class="LineNr">101 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L102" class="LineNr">102 </span>    e8/call  check-ints-equal/disp32
+<span id="L102" class="LineNr">102 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L103" class="LineNr">103 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L104" class="LineNr">104 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L104" class="LineNr">104 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L105" class="LineNr">105 </span>    <span class="subxComment"># end</span>
 <span id="L106" class="LineNr">106 </span>    c3/return
 <span id="L107" class="LineNr">107 </span>