[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Groff-commit] groff/contrib/hdtbl ChangeLog hdmisc.tmac hdtbl...
|
From: |
Werner LEMBERG |
|
Subject: |
[Groff-commit] groff/contrib/hdtbl ChangeLog hdmisc.tmac hdtbl... |
|
Date: |
Thu, 26 Oct 2006 19:38:23 +0000 |
CVSROOT: /cvsroot/groff
Module name: groff
Changes by: Werner LEMBERG <wl> 06/10/26 19:38:23
Modified files:
contrib/hdtbl : ChangeLog hdmisc.tmac hdtbl.tmac
Log message:
* hdmisc.tmac: Add `\"' at various places to protect against
trailing spaces.
(getarg): Don't use a different escape character but
`\?' escapes to protect against incomplete input.
Improve documentation.
* hdtbl.tmac: Improve various warning messages.
(TR): Add validity check for `height' keyword.
(TD): Don't use `\\\\' but `\E'.
(\*[*#trc*]): Initialize.
(t*dntr): Avoid undefined register warning.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/hdtbl/ChangeLog?cvsroot=groff&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/hdtbl/hdmisc.tmac?cvsroot=groff&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/hdtbl/hdtbl.tmac?cvsroot=groff&r1=1.5&r2=1.6
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/contrib/hdtbl/ChangeLog,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- ChangeLog 23 Oct 2006 07:59:19 -0000 1.17
+++ ChangeLog 26 Oct 2006 19:38:23 -0000 1.18
@@ -1,3 +1,17 @@
+2006-10-26 Werner LEMBERG <address@hidden>
+
+ * hdmisc.tmac: Add `\"' at various places to protect against
+ trailing spaces.
+ (getarg): Don't use a different escape character but
+ `\?' escapes to protect against incomplete input.
+ Improve documentation.
+
+ * hdtbl.tmac: Improve various warning messages.
+ (TR): Add validity check for `height' keyword.
+ (TD): Don't use `\\\\' but `\E'.
+ (\*[*#trc*]): Initialize.
+ (t*dntr): Avoid undefined register warning.
+
2006-10-23 Werner LEMBERG <address@hidden>
* hdtbl.tmac (\n[t*#]): Initialize.
Index: hdmisc.tmac
===================================================================
RCS file: /cvsroot/groff/groff/contrib/hdtbl/hdmisc.tmac,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- hdmisc.tmac 16 Jun 2006 07:02:46 -0000 1.3
+++ hdmisc.tmac 26 Oct 2006 19:38:23 -0000 1.4
@@ -37,87 +37,111 @@
.\" ******************************************************************
.\" ** Some macros and default settings needed by hdtbl **
.\" ******************************************************************
+.
+.
+.\" Utility macro: .getarg <key> ...
.\"
-.\" ******************************************************************
-.\" ** Macro getarg: process macro arguments **
-.\" ** **
-.\" ** getarg argname targetname a1=v1 key1 **
-.\" ** a2=v2 key2 ..., mixed **
-.\" ** returns value of arg as string in target. **
-.\" ** arg without value returns the argname. **
-.\" ** `arg=' returns `='. **
-.\" ** after return string `args' contains the remaining args. **
-.\" ******************************************************************
+.\" Get macro argument. This macro searches <key> in the
+.\" remaining arguments and assigns its value to a string
+.\" register named <key>. The following syntax forms are
+.\" recognized.
+.\"
+.\" <key>=<val> Assign <val> to string <key>.
+.\" <val> must not contain spaces.
+.\" <key>='<val>' Assign <val> to string <key>.
+.\" <val> can contain spaces.
+.\" <key>= Assign `=' to string <key>.
+.\" <key> Assign `key' to string <key>.
+.\"
+.\" After return, the string `args' contains the remaining
+.\" arguments.
+.\"
+.\" Example: With the definition of string `foo' as
+.\"
+.\" .ds foo aaa=xxx bbb ccc='yyy zzz' ddd= eee
+.\"
+.\" a call to `getarg' with
+.\"
+.\" .getarg ccc \*[foo]
+.\"
+.\" sets string `ccc' to value `yyy zzz'. The string `args'
+.\" now contains `aaa=xxx bbb ddd= eee'. An additional call
+.\" like
+.\"
+.\" .getarg ddd \*[args]
+.\"
+.\" sets string `ddd' to value `=', and `args' contains
+.\" `aaa=xxx bbb eee'.
.de getarg
. ds \\$1
. ds args
.
. if (\\n[.$] < 2) \
-. return \" speeds up significantly
+. return
.
-. ds $1 \\$1
+. ds $1 \\$1\"
. shift
.
. length * \\*[$1]
-. \" Change escape char to avoid conflicts with escapes in args.
-. \" Note that it is expected that trailing comments are stripped
-. \" before executing the HDtbl macros.
-. ec
-. while n[.$] {
-. ds * "$1\"
-. ds ** "$1\"
+. while \\n[.$] \{\
+. ds * "\\$1\"
+. ds ** "\\$1\"
+. length ** \\*[**]
. shift
-. substring * 0 (n[*] - 1)
-. ie !"*[$1]"*[*]" {
-. as args " "*[**]"\" arg not found, repeat
+. if (\\n[*] > \\n[**]) \{\
+. as args " "\\*[**]"\" argument too short, repeat
+. continue
+. \}
+. substring * 0 (\\n[*] - 1)
+. \" string comparison
+. ie !"\?\\*[$1]\?"\?\\*[*]\?" \{\
+. as args " "\\*[**]"\" argument not found, repeat
. continue
-. }
-. el {
-. ie "*[**]"*[$1]"
-. ds *[$1] *[$1]\" return bare arg name as string
-. el {
-. ie "*[**]"*[$1]="
-. ds *[$1] =\" return value `=' as string
-. el {
-. substring ** (n[*] + 1) -1
-. ds * *[**]\"
+. \}
+. el \{\
+. ie "\?\\*[**]\?"\?\\*[$1]\?" \
+. ds \\*[$1] \\*[$1]\" return bare arg name as string
+. el \{\
+. ie "\?\\*[**]\?"\?\\*[$1]=\?" \
+. ds \\*[$1] =\" return value `=' as string
+. el \{\
+. substring ** (\\n[*] + 1) -1
+. ds * \\*[**]\"
. substring * 0 0
.
-. if "*[*]"'" {
+. if "\?\\*[*]\?"\?'\?" \{\
. substring ** 1 -1 \" remove 1st char from arg (')
-. ds * *[**]\"
-. substring * -1 -1 \" remove 2nd char also (')
+. ds * \\*[**]\"
+. substring * -1 -1 \" remove 2nd char also ('\)
.
-. ie "*[*]"'"
+. ie "\?\\*[*]\?"\?'\?" \
. substring ** 0 -2 \" yes, skip next clause
-. el {
-. as *[$1] *[**] \" no, append this arg
+. el \{\
+. as \\*[$1] \\*[**] \" no, append this arg
.
-. while 1 {
-. ds ** $1\" get next arg
-. ds * $1\"
+. while 1 \{\
+. ds ** \\$1\" get next arg
+. ds * \\$1\"
. shift
. substring * -1 -1
.
-. if "*[*]"'" {
+. if "\?\\*[*]\?"\?'\?" \{\
. substring ** 0 -2
. break \" leave loop if last char isn't '
-. }
+. \}
.
-. as *[$1] *[**] \" otherwise append arg and repeat
-. }
-. }}
+. as \\*[$1] \\*[**] \" otherwise append arg and
repeat
+. \}
+. \}\}
.
-. as *[$1] *[**]
-. }
+. as \\*[$1] \\*[**]\"
+. \}
.
-. as args " $@
-. }}
+. as args " address@hidden"
+. \}\}
.
-. ec
. return
. \} \" end of while
-. ec
..
.
.
@@ -291,9 +315,9 @@
.\" ******************************************************************
.
.ie n \
-. ds g tty:
+. ds g tty:\"
.el \
-. ds g ps: exec
+. ds g ps: exec\"
.
.
.\" ******************************************************************
@@ -373,7 +397,7 @@
. nr * (\\$1 + 1) 1
. while \\n-[*] \
. shift
-. as hex# \\$1
+. as hex# \\$1\"
..
.
.
Index: hdtbl.tmac
===================================================================
RCS file: /cvsroot/groff/groff/contrib/hdtbl/hdtbl.tmac,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- hdtbl.tmac 23 Oct 2006 07:59:19 -0000 1.5
+++ hdtbl.tmac 26 Oct 2006 19:38:23 -0000 1.6
@@ -93,6 +93,8 @@
.nr t*# 0 \" table nesting level
.nr t*numb 0 1 \" held table diversion #
.
+.ds *#trc*
+.
.
.\" *****************************************************************
.\" * The four base macros and the two optional macros *
@@ -199,7 +201,7 @@
. tm \\n[.F]:\\n[.c]: Invalid height value `\\*[height]'.
. \}
.
-. t*cl \\*[width] \" get cell widths and indents
+. t*cl \\*[width] \" get cell widths and offsets
. t*args \\n[t*#] \" look for common arguments
.
. getarg tal \\*[args] \" table horizontal alignment
@@ -214,15 +216,14 @@
. ie "\\*[tal]"r" \
. nr in\\n[t*#] (\\n[.l] - \\n[ll\\n[t*#]] + \\n[.i])
. el \{\
-. tmc \\n[.F]:\\n[.c]: Invalid `tal' value `\\*[tal]':
+. tmc \\n[.F]:\\n[.c]: Invalid horizontal table alignment `\\*[tal]':
. tm1 " must be `l', `c' or `r'.
. \}\}\}
.
-. nr t*r#\\n[t*#] 0 1 \" rowindex in TBL
+. nr t*r#\\n[t*#] 0 \" initialize row index
. mk toptbl\\n[t*#]
.
. P1 \\*[args]
-.\" \\.. \" XXX
..
.
.
@@ -279,26 +280,34 @@
.\" successor: TD
.de TR
. ft 1
-. if !\\n[t*#] \
+. if !\\n[t*#] \{\
. tm \\n[.F]:\\n[.c]: Table row (.TR) without preceding table start (.TBL).
+. return
+. \}
.
+. \" finish previous data cell, if any
. if \\n[t*r#\\n[t*#]] \
. t*dntr 1 \\n[c#\\*[#t#r]] \\n[t*cols\\n[t*#]] \\*[*#trc*]
.
-. nr t*r#\\n[t*#] +1 \" row# of this table
-. ds #t#r \\n[t*#]*\\n[t*r#\\n[t*#]]\"
-. nr c#\\*[#t#r] 0 1 \" clear cellcounter
-. nr dntr\\*[#t#r] 0 1 \" clear accumulated row
height1
+. nr t*r#\\n[t*#] +1 \" row number of this table
+. ds #t#r \\n[t*#]*\\n[t*r#\\n[t*#]]\" table row identifier
+. \" (<level>*<row>)
+. nr c#\\*[#t#r] 0 1 \" clear cell counter
+. nr dntr\\*[#t#r] 0 1 \" clear accumulated row
height
.
. getarg height \\$@
. ie "\\*[height]"" \
. nr t*height\\*[#t#r] 0
-. el \
+. el \{\
+. ie \B\\*[height] \
. nr t*height\\*[#t#r] \\*[height]
+. el \
+. tm \\n[.F]:\\n[.c]: Invalid table row height `\\*[height]'.
+. \}
.
. \" If there is a TR with height `height', the total height of the table
-. \" is too high by 3/2 b, independent of the numer of TR with `height'.
-. t*args \\*[#t#r] \\n[t*#]
+. \" is too high by 3/2 b, independent of the number of TR with `height'.
+. t*args \\*[#t#r] \\n[t*#] \" look for common arguments
.
. P1 \\*[args]
..
@@ -321,9 +330,11 @@
.\" successor: text, TD, TR, TBL or ETB
.de TD
. ft 1
-. t*dntr 0 \\n[c#\\*[#t#r]]-1 \\\\n[c#\\*[#t#r]] \\*[*#trc*]\" four
backslashes!
+. \" finish previous data cell -- note the use of \E
+. t*dntr 0 \\n[c#\\*[#t#r]]-1 \En[c#\\*[#t#r]] \\*[*#trc*]
.
-. ds *#trc* \\*[#t#r]*\\n[c#\\*[#t#r]]\"
+. ds *#trc* \\*[#t#r]*\\n[c#\\*[#t#r]]\" table cell identifier
+. \" (<level>*<row>*<column>)
.
. getarg rowspan \\$@
. nr rowspan 1
@@ -427,7 +438,7 @@
. tm1 " without corresponding tablestart (.TBL)!
. \}
.
-. ds #t#r \\n[t*#]*\\n[t*r#\\n[t*#]]\" refresh #t#r
+. ds #t#r \\n[t*#]*\\n[t*r#\\n[t*#]]\" refresh table row
identifier
. t*dntr 2 \\n[c#\\*[#t#r]] \\n[t*cols\\n[t*#]] \\*[*#trc*]
.
. t*divs \" print this table
@@ -700,7 +711,9 @@
..
.
.
-.\" Utility macro: Calculate cell widths, table width, and cell offsets.
+.\" Utility macro: .t*cl [width1 [width2 [...]]]
+.\"
+.\" Calculate cell widths, table width, and cell offsets.
.de t*cl
. nr t*cols\\n[t*#] (\\n[.$] >? \\n[t*cols\\n[t*#]])
. nr ll\\n[t*#] 0 \" accumulated cell widths
@@ -776,21 +789,26 @@
..
.
.
-.\" Utility macro: Close TD-diversion, make some calculations, and set
-.\" some help strings and registers.
+.\" Utility macro: .t*dntr <origin> <cell position> ? <cell ID>
+.\"
+.\" Close TD diversion, make some calculations, and set
+.\" some help strings and registers. Argument 1 is 0,
+.\" 1, or 2 if the call of .t*dntr occurs in .TD, .TR, or
+.\" .ETB, respectively.
.de t*dntr
-. nr dn 0 \" dn must be reset!
-. br \" finish last div
+. nr dn 0 \" reset diversion height
+. br \" finish cell data
.
. if "\\n[.z]"*t*dummy*" \
. return
.
-. ds #t#r \\n[t*#]*\\n[t*r#\\n[t*#]]\" refresh #t#r
+. ds #t#r \\n[t*#]*\\n[t*r#\\n[t*#]]\" refresh table row
identifier
.
. if \\n[c#\\*[#t#r]] \{\
-. di
-. nr dn\\$4 \\n[dn] \" height of this cell
+. di \" close diversion
+. nr dn\\$4 \\n[dn] \" save height of this cell
. if !\\n[rsp\\*[#trc]] \{\
+. \" update row height if not in a row span
. nr dntr\\*[#t#r] (\\n[dntr\\*[#t#r]] >? \\n[dn])
. if \\$2 \
. nr dntr\\*[#t#r] ((\\n[t*height\\*[#t#r]] \
@@ -801,13 +819,16 @@
. nr c#\\*[#t#r] +1
. nr * \\$2
.
+. \" update column span registers
. while (\\n+[*] <= \\$3) \{\
+. if r csp\\*[#t#r]*\\n[*] \
. nr c#\\*[#t#r] +\\n[csp\\*[#t#r]*\\n[*]]
. nr csp\\*[#t#r]*\\n[*] 0
. \}
.
. ds #trc \\*[#t#r]*\\n[c#\\*[#t#r]]\"
.
+. \" only check for cell underflow if called by .TR or .ETB
. if (\\$1 & (\\n[c#\\*[#t#r]] <= \\n[t*cols\\n[t*#]])) \{\
. ds * are
. ds ** columns
@@ -832,7 +853,13 @@
..
.
.
-.\" Utility-macro: Get the arguments common to TBL, TR, and TD.
+.\" Utility-macro: .t*args level_1 [level_2]
+.\"
+.\" Get the arguments common to TBL, TR, and TD for the level
+.\" in argument 1, using default values from the level in
+.\" argument 2. If argument 2 is missing, use the global
+.\" default values.
+.\"
.de t*args
. ds t*bgc\\$1 \\*[t*bgc\\$2]\"
. ds t*fgc\\$1 \\*[t*fgc\\$2]\"
- [Groff-commit] groff/contrib/hdtbl ChangeLog hdmisc.tmac hdtbl...,
Werner LEMBERG <=