[Vastly superior, more fool-proof and consistent table system
Panu Kalliokoski <pkalliok@ling.helsinki.fi>**20040720101107
 Keywords: 
 
 
 (atehwa@sange.fi--2004/stx2any--prod--2--patch-138)
] {
hunk ./common/markup.lm4 288
+! Table infrastructure
+
+Generic table environment.  These transform low-level `w_horizbr' and
+`w_linebr' into high-level environment calls.  The environment is based
+on `w_table', to be defined output-format-specifically.
+{{{
+w_derive_env(`table', `w_table', 0,
+`w_setup_list(columns, $@)w_newcounter(column)w_newcounter(row,column)'dnl
+`pushdef(`w_pending_block_hook',)'dnl
+`pushdef(`w_linebr',
+  `w_end(w_cell)`'w_end(w_row)`'define(`w_pending_block_hook',
+    `w_begin_row`'w_begin_cell`'')')'dnl
+`pushdef(`w_horizbr', `w_end(w_cell)`'w_begin_cell`'')'dnl
+`pushdef(`w_sectbreak', `w_table_rule(w_length_list(columns))')',
+`w_begin_row`'w_begin_cell`'undefine(`@w_para_flag')',
+,
+`popdef(`w_linebr')popdef(`w_horizbr')popdef(`w_sectbreak')'dnl
+`popdef(`w_pending_block_hook')w_delcounter(column)w_delcounter(row)'dnl
+`w_unsetup_list(columns)')
+define(`w_begin_row',
+`w_reinit_list(columns)w_stepcounter(row)'dnl
+`w_beg(w_row, w_counter_arabic(row))`'')
+define(`w_begin_cell',
+`w_stepcounter(column)w_beg(w_cell, w_counter_arabic(row),
+  w_counter_arabic(column), w_next_in_list(columns))')
+}}}
+
hunk ./docbook-xml/make.lm4 133
-
-w_define_env(table,
-
-`pushdef(`w_sectbreak',)'dnl TODO?
-`pushdef(`w_linebr', `w_close</Entry></Row><Row><Entry>')'dnl
-`pushdef(`w_horizbr', `w_close</Entry><Entry>')'dnl
-`w_close<InformalTable><TGroup cols="$#">w_make_tablespec($@)'dnl
-`undefine(`@w_para_flag')'dnl
-`<TBody><Row><Entry>',
-
-`w_close</Entry></Row></TBody></TGroup></InformalTable>w_softopen`''dnl
-`popdef(`w_linebr')popdef(`w_horizbr')popdef(`w_sectbreak')')
+w_define_env(w_table,
+`w_close<InformalTable><TGroup cols="$#">w_make_tablespec($@)w_nl<TBody>',
+`w_close</TBody></TGroup></InformalTable>w_softopen`'')
+w_define_env(w_row, `w_close<Row>', `w_close</Row>')
+w_define_env(w_cell, `w_close<Entry>', `w_close</Entry>')
+define(`w_table_rule',) dnl TODO?
hunk ./html/make.lm4 77
-define(`w_cell_markup',
-`<td align="ifelse(`$1',l,left,`$1',r,right,`$1',c,center)">')
-define(`w_begin_cell', `w_cell_markup(w_next_in_list(columns))')
-define(`w_prepare_row',
-`define(`w_pending_block_hook', `<tr valign="baseline">w_begin_cell`'')')
-
-w_define_env(table,
-
-`w_setup_list(columns, $@)'dnl
-`pushdef(`w_pending_block_hook',)'dnl
-`pushdef(`w_sectbreak',
- `<tr><td colspan="w_length_list(columns)"><hr></td></tr>')'dnl
-`pushdef(`w_linebr', `</td></tr>w_reinit_list(columns)w_prepare_row')'dnl
-`pushdef(`w_horizbr', `</td>w_begin_cell`'')'dnl
-`undefine(`@w_para_flag')'dnl
-`<table border=0>w_prepare_row',
-
-`ifelse(defn(`w_pending_block_hook'),,</td></tr>)</table>'dnl
-`w_unsetup_list(columns)'dnl
-`popdef(`w_linebr')popdef(`w_horizbr')popdef(`w_sectbreak')'dnl
-`popdef(`w_pending_block_hook')')
+w_define_env(w_table, `<table border=0>', `</table>')
+w_define_env(w_row, `<tr valign="baseline">', `</tr>')
+w_define_env(w_cell,
+`<td align="ifelse(`$3',l,left,`$3',r,right,`$3',c,center)">', `</td>')
+define(`w_table_rule', `<tr><td colspan="$1"><hr></td></tr>')
hunk ./latex/make.lm4 84
-define(`w_img', `w_ensure_pkg(graphicx)\includegraphics{w_file(`$1.'w_picture_suffix)}')
+define(`w_img',
+`w_ensure_pkg(graphicx)\includegraphics{w_file(`$1.'w_picture_suffix)}')
hunk ./latex/make.lm4 95
-`ifelse(`$*',,,`ifelse(`$1',p,`p{0.3\textwidth}',`$1')`'w_make_tablespec(shift($@))')')
-w_define_env(`table',
-`pushdef(`w_horizbr', `&')'dnl
-`pushdef(`w_sectbreak', `\hline')'dnl
-`\begin{tabular}{w_make_tablespec($@)}w_nl',
-`\end{tabular}popdef(`w_horizbr')popdef(`w_sectbreak')')
+`ifelse(`$*',,,
+  `ifelse(`$1',p,`p{0.3\textwidth}',`$1')`'w_make_tablespec(shift($@))')')
+w_define_env(`w_table',
+`\begin{tabular}{w_make_tablespec($@)}w_nl', `\end{tabular}w_nl')
+w_define_env(`w_row',,`undefine(`@w_in_row_flag')\\')
+w_define_env(`w_cell',
+`ifdef(`@w_in_row_flag',`&')define(`@w_in_row_flag',t)',)
+define(`w_table_rule', `\hline')
hunk ./man/make.lm4 97
-define(`w_begin_cell',
-`ifelse(w_next_in_list(columns),p,`w_table_emb_text')')
-define(`w_prepare_row',
-`define(`w_pending_block_hook', ``'w_begin_cell`'')')
-
-w_define_env(table,
-
-`w_setup_list(columns, $@)'dnl
-`pushdef(`w_horizbr',
-   `w_end_emb_text	w_begin_cell')'dnl
-`pushdef(`w_linebr',
-   `w_end_emb_text`'w_reinit_list(columns)w_prepare_row`'define(`w_eline',
-      `define(`w_eline',` \')')')'dnl
-`pushdef(`w_eline',` \')pushdef(`w_sectbreak',`_')pushdef(`w_paragraph',)'dnl
-`\&w_nl`'.TS`'w_nl`'w_make_tablespec($@).w_nl`'w_begin_cell',
-
-`w_end_emb_text\&w_nl`'.TE`'w_nl`''dnl
-`popdef(`w_eline')popdef(`w_linebr')popdef(`w_sectbreak')'dnl
-`popdef(`w_horizbr')popdef(`w_paragraph')')
-
-define(`w_end_emb_text',)
-define(`w_table_emb_text',
-`T{w_nl\&define(`w_end_emb_text',
-   `\&w_nl`'T}define(`w_end_emb_text',)')')
+w_define_env(w_table,
+`pushdef(`w_eline',` \')\&w_nl`'.TS`'w_nl`'w_make_tablespec($@).w_nl`'',
+`\&w_nl`'.TE`'w_nl`'popdef(`w_eline')')
+w_define_env(w_row,,
+`undefine(`@w_in_row_flag')define(`w_eline',`define(`w_eline',` \')')')
+w_define_env(w_cell,
+`ifdef(`@w_in_row_flag',`	')define(`@w_in_row_flag',t)'dnl
+`ifelse(`$3',p,`T{w_nl\&')',
+`ifelse(`$3',p,`\&w_nl`'T}')')
+define(`w_table_rule', `_')
hunk ./regression/table.docbook-xml 10
-<InformalTable><TGroup cols="2"><ColSpec align="justify"/><ColSpec align="center"/><TBody><Row><Entry>Emigration is nice! </Entry><Entry> foo </Entry></Row><Row><Entry>
-Immigration is even nicer! </Entry><Entry> bar
-</Entry></Row></TBody></TGroup></InformalTable>
-<InformalTable><TGroup cols="3"><ColSpec align="left"/><ColSpec align="left"/><ColSpec align="justify"/><TBody><Row><Entry>account </Entry><Entry> name </Entry><Entry> miscellaneous notes </Entry></Row><Row><Entry>
+<InformalTable><TGroup cols="2"><ColSpec align="justify"/><ColSpec align="center"/>
+<TBody><Row><Entry>Emigration is nice! </Entry><Entry> foo </Entry></Row>
+<Row><Entry>Immigration is even nicer! </Entry><Entry> bar </Entry></Row>
+</TBody></TGroup></InformalTable>
+<InformalTable><TGroup cols="3"><ColSpec align="left"/><ColSpec align="left"/><ColSpec align="justify"/>
+<TBody><Row><Entry>account </Entry><Entry> name </Entry><Entry> miscellaneous notes </Entry></Row>
hunk ./regression/table.docbook-xml 17
-pkalliok </Entry><Entry> Panu </Entry><Entry> not trustworthy, but a nice fellow overall.  Good to
-get acquainted with. </Entry></Row><Row><Entry>
-atehwa </Entry><Entry> Panu </Entry><Entry> the same person </Entry></Row><Row><Entry>
-root </Entry><Entry> superuser </Entry><Entry> found in every Unix under the sky
-</Entry></Row></TBody></TGroup></InformalTable>
-<InformalTable><TGroup cols="3"><ColSpec align="right"/><ColSpec align="center"/><ColSpec align="left"/><TBody><Row><Entry>j</Entry><Entry>"</Entry><Entry>,</Entry></Row><Row><Entry>
-L</Entry><Entry> </Entry><Entry>J</Entry></Row><Row><Entry>
-`</Entry><Entry>_</Entry><Entry>'
-</Entry></Row></TBody></TGroup></InformalTable>
-<InformalTable><TGroup cols="3"><ColSpec align="right"/><ColSpec align="justify"/><ColSpec align="justify"/><TBody><Row><Entry>first row
-</Entry><Entry>first row, first item
-</Entry><Entry>first row, second item
-</Entry></Row><Row><Entry>
-second row
-</Entry><Entry>second row, first item
-</Entry><Entry>second row, second item
-</Entry></Row><Row><Entry>
-</Entry></Row></TBody></TGroup></InformalTable>
-<ItemizedList><ListItem><Para>still works?
+<Row><Entry>pkalliok </Entry><Entry> Panu </Entry><Entry> not trustworthy, but a nice fellow overall.  Good to
+get acquainted with. </Entry></Row>
+<Row><Entry>atehwa </Entry><Entry> Panu </Entry><Entry> the same person </Entry></Row>
+<Row><Entry>root </Entry><Entry> superuser </Entry><Entry> found in every Unix under the sky </Entry></Row>
+</TBody></TGroup></InformalTable>
+<InformalTable><TGroup cols="3"><ColSpec align="right"/><ColSpec align="center"/><ColSpec align="left"/>
+<TBody><Row><Entry>j</Entry><Entry>"</Entry><Entry>,</Entry></Row>
+<Row><Entry>L</Entry><Entry> </Entry><Entry>J</Entry></Row>
+<Row><Entry>`</Entry><Entry>_</Entry><Entry>'</Entry></Row>
+</TBody></TGroup></InformalTable>
+<Para>
+</Para><ItemizedList><ListItem><Para>still works?
hunk ./regression/table.html 12
-<tr valign="baseline"><td align="">Immigration is even nicer! </td><td align="center"> bar
-</td></tr></table>
+<tr valign="baseline"><td align="">Immigration is even nicer! </td><td align="center"> bar </td></tr>
+</table>
hunk ./regression/table.html 19
-<tr valign="baseline"><td align="left">root </td><td align="left"> superuser </td><td align=""> found in every Unix under the sky
-</td></tr></table>
+<tr valign="baseline"><td align="left">root </td><td align="left"> superuser </td><td align=""> found in every Unix under the sky </td></tr>
+</table>
hunk ./regression/table.html 23
-<tr valign="baseline"><td align="right">`</td><td align="center">_</td><td align="left">'
-</td></tr></table>
-<table border=0><tr valign="baseline"><td align="right">first row
-</td><td align="">first row, first item
-</td><td align="">first row, second item
-</td></tr>
-<tr valign="baseline"><td align="right">second row
-</td><td align="">second row, first item
-</td><td align="">second row, second item
-</td></tr>
+<tr valign="baseline"><td align="right">`</td><td align="center">_</td><td align="left">'</td></tr>
hunk ./regression/table.html 25
+<p>
hunk ./regression/table.latex 16
-Immigration is even nicer! & bar
+Immigration is even nicer! & bar \\
hunk ./regression/table.latex 18
+
hunk ./regression/table.latex 25
-root & superuser & found in every Unix under the sky
+root & superuser & found in every Unix under the sky \\
hunk ./regression/table.latex 27
+
hunk ./regression/table.latex 31
-`&_&'
+`&_&'\\
hunk ./regression/table.latex 33
-\begin{tabular}{rp{0.3\textwidth}p{0.3\textwidth}}
-first row
-&first row, first item
-&first row, second item
-\\
-second row
-&second row, first item
-&second row, second item
-\\
-\end{tabular}
+
+
hunk ./regression/table.man 10
-T}	 bar \
+T}	 bar 
hunk ./regression/table.man 28
-\& found in every Unix under the sky \
+\& found in every Unix under the sky \&
+T}
hunk ./regression/table.man 31
-T}\&
hunk ./regression/table.man 37
-`	_	' \
+`	_	'
hunk ./regression/table.man 40
-\&
-.TS
-r l l .
-first row \
-	T{
-\&first row, first item \
-\&
-T}	T{
-\&first row, second item \
-\&
-T}
-second row
-	T{
-\&second row, first item \
-\&
-T}	T{
-\&second row, second item \
-\&
-T}
-\&
-.TE
+.PP
hunk ./regression/table.test 4
-Immigration is even nicer! || bar
+Immigration is even nicer! || bar //
hunk ./regression/table.test 13
-root || superuser || found in every Unix under the sky
+root || superuser || found in every Unix under the sky //
hunk ./regression/table.test 19
-w_bq||_||'
+w_bq||_||'//
hunk ./regression/table.test 22
-w_beg(listtable, r, p, p)
-* first row
-  * first row, first item
-  * first row, second item
-* second row
-  * second row, first item
-  * second row, second item
-w_end(listtable)
+dnl w_beg(listtable, r, p, p)
+dnl * first row
+dnl * first row, first item
+dnl * first row, second item
+dnl * second row
+dnl * second row, first item
+dnl * second row, second item
+dnl w_end(listtable)
}