use new ^E\ string building character for arrays and to simplify number insertions

1 files changed, 26 insertions, 26 deletions

diff --git a/doc/htbl.tes b/doc/htbl.tes
index 408f5a8..d8b8827 100755
--- a/doc/htbl.tes
+++ b/doc/htbl.tes
@@ -18,15 +18,15 @@ l.u.fl.-1u.t i
 q.f,q.t:sbox"Sli border="1"' q.f,q.t:sallbox"Sli rules="all"' q.f,q.t:sexpand"Sli width="\n[tbl-width]%"' q.f,q.t:stab("s0au.{tab}' q.fjk-dlri> l
 
 1u.{row} 1u.{col} @.r{
-  .{format.U.{row}.U.{col}.align} 0U.{format.U.{row}.U.{col}.bold} 0U.{format.U.{row}.U.{col}.italic}
-  1U.{format.U.{row}.U.{col}.rowspan} 1U.{format.U.{row}.U.{col}.colspan}
+  .{format.\.{row}.\.{col}.align} 0U.{format.\.{row}.\.{col}.bold} 0U.{format.\.{row}.\.{col}.italic}
+  1U.{format.\.{row}.\.{col}.rowspan} 1U.{format.\.{row}.\.{col}.colspan}
 } :M.r
 <
-0a-L"=.{format.U.{row}.U.{col}.align}left'
-0a-C"=.{format.U.{row}.U.{col}.align}center'
-0a-R"=.{format.U.{row}.U.{col}.align}right'
-0a-B"=1U.{format.U.{row}.U.{col}.bold}'
-0a-I"=1U.{format.U.{row}.U.{col}.italic}'
+0a-L"=.{format.\.{row}.\.{col}.align}left'
+0a-C"=.{format.\.{row}.\.{col}.align}center'
+0a-R"=.{format.\.{row}.\.{col}.align}right'
+0a-B"=1U.{format.\.{row}.\.{col}.bold}'
+0a-I"=1U.{format.\.{row}.\.{col}.italic}'
 0a- "=%.{col} :M.r'
 0a-,"=%.{row} 1u.{col} :M.r' 0a-10"=%.{row} 1u.{col} :M.r'
 0a-."=1;'
@@ -34,19 +34,19 @@ D>
 
 k q.{row}u.{frows} q.{col}u.{fcols} 1u.{row} 1u.{col} .u.#bd
 <Q.{row}-Q.{frows}">
-EQ.{format.U.{row}.U.{col}.align} G.{format.U.{frows}.U.{col}.align} 1EB
-Q.{format.U.{frows}.U.{col}.bold}U.{format.U.{row}.U.{col}.bold}
-Q.{format.U.{frows}.U.{col}.italic}U.{format.U.{row}.U.{col}.italic}
-Q.{format.U.{frows}.U.{col}.rowspan}U.{format.U.{row}.U.{col}.rowspan}
-Q.{format.U.{frows}.U.{col}.colspan}U.{format.U.{row}.U.{col}.colspan} '
+EQ.{format.\.{row}.\.{col}.align} G.{format.\.{frows}.\.{col}.align} 1EB
+Q.{format.\.{frows}.\.{col}.bold}U.{format.\.{row}.\.{col}.bold}
+Q.{format.\.{frows}.\.{col}.italic}U.{format.\.{row}.\.{col}.italic}
+Q.{format.\.{frows}.\.{col}.rowspan}U.{format.\.{row}.\.{col}.rowspan}
+Q.{format.\.{frows}.\.{col}.colspan}U.{format.\.{row}.\.{col}.colspan} '
 .,.+3:sT{
 "S .,s
-T}.-3X.{data.U.{row}.U.{col}} C 1| .,.+2:s\^^"S
-0U.{format.U.{row}.U.{col}.rowspan}
-Q.{row}-1U.#cr <Q.{format.U.#cr.U.{col}.rowspan}">1;' -%.#cr>
-%.{format.U.#cr.U.{col}.rowspan} '
+T}.-3X.{data.\.{row}.\.{col}} C 1| .,.+2:s\^^"S
+0U.{format.\.{row}.\.{col}.rowspan}
+Q.{row}-1U.#cr <Q.{format.\.#cr.\.{col}.rowspan}">1;' -%.#cr>
+%.{format.\.#cr.\.{col}.rowspan} '
 .u.f s[U.{tab},
- q.f,.-1X.{data.U.{row}.U.{col}} 0'u.{data.U.{row}.U.{col}.block}
+ q.f,.-1X.{data.\.{row}.\.{col}} 0'u.{data.\.{row}.\.{col}.block}
 -a-q.{tab}"= %.{col} | %.{row} 1u.{col} .,.+4:s.TE
 "S1;' '>
 q.#bd,.D
@@ -55,17 +55,17 @@ q.{row}-1u.{drows} 1u.{row}
 q.{drows}<I.HTML <tr>
 
 1u.{col}
-q.{fcols}<Q.{format.U.{row}.U.{col}.rowspan}">
-I.HTML <td rowspan="Q.{format.U.{row}.U.{col}.rowspan}\I colspan="Q.{format.U.{row}.U.{col}.colspan}\I"
-q.{data.U.{row}.U.{col}.block}"= I align="Q.{format.U.{row}.U.{col}.align}">
-Q.{format.U.{row}.U.{col}.bold}"N I<b> '
-Q.{format.U.{row}.U.{col}.italic}"N I<i> '
-G.{data.U.{row}.U.{col}}
-Q.{format.U.{row}.U.{col}.bold}"N I</b> '
-Q.{format.U.{row}.U.{col}.italic}"N I</i> '
+q.{fcols}<Q.{format.\.{row}.\.{col}.rowspan}">
+I.HTML <td rowspan="\.{format.\.{row}.\.{col}.rowspan}" colspan="\.{format.\.{row}.\.{col}.colspan}"
+q.{data.\.{row}.\.{col}.block}"= I align="Q.{format.\.{row}.\.{col}.align}">
+Q.{format.\.{row}.\.{col}.bold}"N I<b> '
+Q.{format.\.{row}.\.{col}.italic}"N I<i> '
+G.{data.\.{row}.\.{col}}
+Q.{format.\.{row}.\.{col}.bold}"N I</b> '
+Q.{format.\.{row}.\.{col}.italic}"N I</i> '
 I</td>
  | I>
-Q.{data.U.{row}.U.{col}}
+Q.{data.\.{row}.\.{col}}
 .HTML </td>
  ' '
 %.{col}>