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, 20 insertions, 25 deletions

diff --git a/html/subx/examples/ex10.subx.html b/html/subx/examples/ex10.subx.html
index ae437909..cdca2942 100644
--- a/html/subx/examples/ex10.subx.html
+++ b/html/subx/examples/ex10.subx.html
@@ -7,24 +7,19 @@
 <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; }
+.subxComment { color: #005faf; }
+.subxS2Comment { color: #8a8a8a; }
+.LineNr { }
+.subxS1Comment { color: #0000af; }
 .subxFunction { color: #af5f00; text-decoration: underline; }
-.Constant { color:#00a0a0; }
+.Constant { color: #008787; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
 -->
 </style>
 
@@ -81,37 +76,37 @@ if ('onhashchange' in window) {
 <span id="L19" class="LineNr">19 </span><span class="subxComment">#         argv[1]: *(ESP+8)</span>
 <span id="L20" class="LineNr">20 </span><span class="subxComment">#         ...</span>
 <span id="L21" class="LineNr">21 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L22" class="LineNr">22 </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="L22" class="LineNr">22 </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="L23" class="LineNr">23 </span>    <span class="subxComment"># argv-equal(argv[1], argv[2])</span>
 <span id="L24" class="LineNr">24 </span>    <span class="subxS2Comment"># . . push argv[2]</span>
-<span id="L25" class="LineNr">25 </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>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L25" class="LineNr">25 </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>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
 <span id="L26" class="LineNr">26 </span>    <span class="subxS2Comment"># . . push argv[1]</span>
-<span id="L27" class="LineNr">27 </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="L27" class="LineNr">27 </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="L28" class="LineNr">28 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L29" class="LineNr">29 </span>    e8/call argv-equal/disp32
 <span id="L30" class="LineNr">30 </span>    <span class="subxComment"># syscall(exit, EAX)</span>
-<span id="L31" class="LineNr">31 </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="L32" class="LineNr">32 </span>    b8/copy-to-EAX  1/imm32
+<span id="L31" class="LineNr">31 </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="L32" class="LineNr">32 </span>    b8/copy-to-EAX  1/imm32/exit
 <span id="L33" class="LineNr">33 </span>    cd/syscall  0x80/imm8
 <span id="L34" class="LineNr">34 </span>
 <span id="L35" class="LineNr">35 </span><span class="subxComment"># compare two null-terminated ascii strings</span>
 <span id="L36" class="LineNr">36 </span><span class="subxComment"># reason for the name: the only place we should have null-terminated ascii strings is from commandline args</span>
 <span id="L37" class="LineNr">37 </span><span class="subxFunction">argv-equal</span>:  <span class="subxComment"># (s1, s2) : null-terminated ascii strings -&gt; EAX : boolean</span>
 <span id="L38" class="LineNr">38 </span>    <span class="subxComment"># initialize s1 (ECX) and s2 (EDX)</span>
-<span id="L39" class="LineNr">39 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="CommentedCode"> . </span>          1/r32/ECX   4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(ESP+4) to ECX</span>
-<span id="L40" class="LineNr">40 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="CommentedCode"> . </span>          2/r32/EDX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(ESP+8) to EDX</span>
+<span id="L39" class="LineNr">39 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(ESP+4) to ECX</span>
+<span id="L40" class="LineNr">40 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="Normal"> . </span>          2/r32/EDX   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(ESP+8) to EDX</span>
 <span id="L41" class="LineNr">41 </span>    <span class="subxComment"># while (true)</span>
 <span id="L42" class="LineNr">42 </span><span class="Constant">$argv-equal:loop</span>:
 <span id="L43" class="LineNr">43 </span>    <span class="subxComment"># c1/EAX, c2/EBX = *s1, *s2</span>
 <span id="L44" class="LineNr">44 </span>    b8/copy-to-EAX  0/imm32
-<span id="L45" class="LineNr">45 </span>    8a/copy                         0/mod/indirect  1/rm32/ECX   <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 byte at *ECX to lower byte of EAX</span>
+<span id="L45" class="LineNr">45 </span>    8a/copy                         0/mod/indirect  1/rm32/ECX   <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 byte at *ECX to lower byte of EAX</span>
 <span id="L46" class="LineNr">46 </span>    bb/copy-to-EBX  0/imm32
-<span id="L47" class="LineNr">47 </span>    8a/copy                         0/mod/indirect  2/rm32/EDX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy byte at *EDX to lower byte of EBX</span>
+<span id="L47" class="LineNr">47 </span>    8a/copy                         0/mod/indirect  2/rm32/EDX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy byte at *EDX to lower byte of EBX</span>
 <span id="L48" class="LineNr">48 </span>    <span class="subxComment"># if (c1 == 0) break</span>
 <span id="L49" class="LineNr">49 </span>    3d/compare-EAX  0/imm32
 <span id="L50" class="LineNr">50 </span>    74/jump-if-equal  $argv-equal:break/disp8
 <span id="L51" class="LineNr">51 </span>    <span class="subxComment"># if (c1 != c2) return false</span>
-<span id="L52" class="LineNr">52 </span>    39/compare                      3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># compare EAX with EBX</span>
+<span id="L52" class="LineNr">52 </span>    39/compare                      3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare EAX with EBX</span>
 <span id="L53" class="LineNr">53 </span>    75/jump-if-not-equal  $argv-equal:false/disp8
 <span id="L54" class="LineNr">54 </span>    <span class="subxComment"># ++s1, ++s2</span>
 <span id="L55" class="LineNr">55 </span>    41/inc-ECX
@@ -120,7 +115,7 @@ if ('onhashchange' in window) {
 <span id="L58" class="LineNr">58 </span>    eb/jump  $argv-equal:loop/disp8
 <span id="L59" class="LineNr">59 </span><span class="Constant">$argv-equal:break</span>:
 <span id="L60" class="LineNr">60 </span>    <span class="subxComment"># if (c2 == 0) return true</span>
-<span id="L61" class="LineNr">61 </span>    81          7/subop/compare     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>              0/imm32           <span class="subxComment"># compare EBX</span>
+<span id="L61" class="LineNr">61 </span>    81          7/subop/compare     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>              0/imm32           <span class="subxComment"># compare EBX</span>
 <span id="L62" class="LineNr">62 </span>    75/jump-if-not-equal  $argv-equal:false/disp8
 <span id="L63" class="LineNr">63 </span><span class="Constant">$argv-equal:success</span>:
 <span id="L64" class="LineNr">64 </span>    b8/copy-to-EAX  1/imm32