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, 17 insertions, 22 deletions

diff --git a/html/subx/examples/ex9.subx.html b/html/subx/examples/ex9.subx.html
index 4d9f2949..fa8732f7 100644
--- a/html/subx/examples/ex9.subx.html
+++ b/html/subx/examples/ex9.subx.html
@@ -7,23 +7,18 @@
 <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; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
 -->
 </style>
 
@@ -84,30 +79,30 @@ if ('onhashchange' in window) {
 <span id="L23" class="LineNr">23 </span><span class="subxS1Comment"># . 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
 <span id="L24" class="LineNr">24 </span>
 <span id="L25" class="LineNr">25 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L26" class="LineNr">26 </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="L26" class="LineNr">26 </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="L27" class="LineNr">27 </span>    <span class="subxComment"># ascii-difference(argv[1], argv[2])</span>
 <span id="L28" class="LineNr">28 </span>    <span class="subxS2Comment"># . . push argv[2]</span>
-<span id="L29" class="LineNr">29 </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="L29" class="LineNr">29 </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="L30" class="LineNr">30 </span>    <span class="subxS2Comment"># . . push argv[1]</span>
-<span id="L31" class="LineNr">31 </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="L31" class="LineNr">31 </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="L32" class="LineNr">32 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L33" class="LineNr">33 </span>    e8/call  ascii-difference/disp32
 <span id="L34" class="LineNr">34 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L35" class="LineNr">35 </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="L35" class="LineNr">35 </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="L36" class="LineNr">36 </span>    <span class="subxComment"># syscall(exit, EAX)</span>
-<span id="L37" class="LineNr">37 </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="L37" class="LineNr">37 </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="L38" class="LineNr">38 </span>    b8/copy-to-EAX  1/imm32/exit
 <span id="L39" class="LineNr">39 </span>    cd/syscall  0x80/imm8
 <span id="L40" class="LineNr">40 </span>
 <span id="L41" class="LineNr">41 </span><span class="subxFunction">ascii-difference</span>:  <span class="subxComment"># (s1, s2) : null-terminated ascii strings</span>
 <span id="L42" class="LineNr">42 </span>    <span class="subxComment"># a = first letter of s1 (ECX)</span>
-<span id="L43" class="LineNr">43 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none              0/r32/EAX   4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(ESP+4) to EAX</span>
-<span id="L44" class="LineNr">44 </span>    8b/copy                         0/mod/indirect  0/rm32/EAX   <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 EAX</span>
+<span id="L43" class="LineNr">43 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none              0/r32/EAX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(ESP+4) to EAX</span>
+<span id="L44" class="LineNr">44 </span>    8b/copy                         0/mod/indirect  0/rm32/EAX   <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 EAX</span>
 <span id="L45" class="LineNr">45 </span>    <span class="subxComment"># b = first letter of s2 (EDX)</span>
 <span id="L46" class="LineNr">46 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none              1/r32/ECX   8/disp8                           <span class="subxComment"># copy *(ESP+8) to ECX</span>
-<span id="L47" class="LineNr">47 </span>    8b/copy                         0/mod/indirect  1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          1/r32/ECX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *ECX to ECX</span>
+<span id="L47" class="LineNr">47 </span>    8b/copy                         0/mod/indirect  1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *ECX to ECX</span>
 <span id="L48" class="LineNr">48 </span>    <span class="subxComment"># a-b</span>
-<span id="L49" class="LineNr">49 </span>    29/subtract                     3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          1/r32/ECX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># subtract ECX from EAX</span>
+<span id="L49" class="LineNr">49 </span>    29/subtract                     3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># subtract ECX from EAX</span>
 <span id="L50" class="LineNr">50 </span>    c3/return
 <span id="L51" class="LineNr">51 </span>
 <span id="L52" class="LineNr">52 </span><span class="subxS2Comment"># . . vim&#0058;nowrap:textwidth=0</span>