[Groff-commit] groff/contrib/hdtbl ChangeLog hdmisc.tmac hdtbl...

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Changes by:     Werner LEMBERG <wl>     06/11/06 23:38:59

Modified files:
        contrib/hdtbl  : ChangeLog hdmisc.tmac hdtbl.tmac 

Log message:
        * hdmisc.tmac (\*[g]): Move definition back to...
        * hdtbl.tmac: This file.
        (TD, t*divs): Fix a bug with consecutive groups of spanned rows by
        introducing string *rsp*\\*[#trc].  Reported by Barry Nisly.
        (TH): Add arguments `hal', `val', and `fst'.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/hdtbl/ChangeLog?cvsroot=groff&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/hdtbl/hdmisc.tmac?cvsroot=groff&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/hdtbl/hdtbl.tmac?cvsroot=groff&r1=1.8&r2=1.9

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/contrib/hdtbl/ChangeLog,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- ChangeLog   2 Nov 2006 08:52:07 -0000       1.20
+++ ChangeLog   6 Nov 2006 23:38:59 -0000       1.21
@@ -1,3 +1,11 @@
+2006-11-06  Joachim Walsdorff  <address@hidden>
+
+       * hdmisc.tmac (\*[g]): Move definition back to...
+       * hdtbl.tmac: This file.
+       (TD, t*divs): Fix a bug with consecutive groups of spanned rows by
+       introducing string *rsp*\\*[#trc].  Reported by Barry Nisly.
+       (TH): Add arguments `hal', `val', and `fst'.
+
 2006-11-01  Werner LEMBERG  <address@hidden>
 
        * hdtbl.tmac (t*divs): Fix a bug which causes incorrect table cell

Index: hdmisc.tmac
===================================================================
RCS file: /cvsroot/groff/groff/contrib/hdtbl/hdmisc.tmac,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- hdmisc.tmac 28 Oct 2006 16:57:08 -0000      1.5
+++ hdmisc.tmac 6 Nov 2006 23:38:59 -0000       1.6
@@ -315,12 +315,6 @@
 .\"    **      when calling groff/troff                                **
 .\"    ******************************************************************
 .
-.ie n \
-.  ds g tty:\"
-.el \
-.  ds g ps: exec\"
-.
-.
 .\"    ******************************************************************
 .\"    **              Header macro for the examples                   **
 .\"    ******************************************************************

Index: hdtbl.tmac
===================================================================
RCS file: /cvsroot/groff/groff/contrib/hdtbl/hdtbl.tmac,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- hdtbl.tmac  2 Nov 2006 08:52:07 -0000       1.8
+++ hdtbl.tmac  6 Nov 2006 23:38:59 -0000       1.9
@@ -100,6 +100,11 @@
 .\"    *       The four base macros and the two optional macros        *
 .\"    *****************************************************************
 .
+.ie n \
+.  ds g tty:\"
+.el \
+.  ds g ps: exec\"
+.
 .\"    TBL:    table start
 .\"            predecessor:    text, TD or ETB
 .\"            successor:      CPTN or TR
@@ -321,7 +326,19 @@
 .\"            else like .TD
 .de TH
 .  ft 1
-.  TD val=m hal=c fst=B \\$@
+.  getarg hal \\$@
+.  if "\\*[hal]"" \
+.    ds hal c\"
+.
+.  getarg val \\*[args]
+.  if "\\*[val]"" \
+.    ds val m\"
+.
+.  getarg fst \\*[args]
+.  if "\\*[fst]"" \
+.    ds fst B\"
+.
+.  TD hal=\\*[hal] val=\\*[val] fst=\\*[fst] \\*[args]
 ..
 .
 .
@@ -339,8 +356,10 @@
 .  getarg rowspan \\$@
 .  nr rowspan 1
 .  if !"\\*[rowspan]"" \{\
-.    ie \B\\*[rowspan] \
+.    ie \B\\*[rowspan] \{\
 .      nr rowspan (\\*[rowspan] >? 1)
+.      nr *rsp*\\*[*#trc*] (\\n[rowspan] - 1)
+.    \}
 .    el \
 .      tm \\n[.F]:\\n[.c]: Invalid value of `rowspan' keyword.
 .  \}
@@ -572,14 +591,15 @@
 .
 .      \" if we have spanned rows, calculate resulting row height
 .      \" and position of lower horizontal line
-.      if \\n[rspan\\*[#trc]] \{\
+.      if \\n[*rsp*\\*[#trc]] \{\
 .        nr * \\n[#r] 1
 .        nr rspan\\*[#trc] 0-1         \"      set `no hl' flag
 .        nr corr (\\n[dn\\*[#trc]] - \\n[dntr\\n[t*#]*\\n[#r]])
 .
 .        \" clear row span flags in following rows and update row height
-.        while \\n[rspan\\n[t*#]*\\n+[*]*\\n[#c]] \{\
-.          nr rspan\\n[t*#]*\\n[*]*\\n[#c] 0
+.        while \\n[*rsp*\\*[#trc]] \{\
+.          nr *rsp*\\*[#trc] -1
+.          nr rspan\\n[t*#]*\\n+[*]*\\n[#c] 0
 .          nr ** (\\n[dntr\\n[t*#]*\\n[*]] + \\n[cscp] + \\n[cscpb])
 .          nr corr -\\n[**]
 .          nr $1 +\\n[**]