* 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'.

3 files changed, 33 insertions, 11 deletions

diff --git a/contrib/hdtbl/ChangeLog b/contrib/hdtbl/ChangeLog
index e7143254..9d8680ee 100644
--- a/contrib/hdtbl/ChangeLog
+++ b/contrib/hdtbl/ChangeLog
@@ -1,3 +1,11 @@
+2006-11-06  Joachim Walsdorff  <JWalsdorff@compuserve.de>
+
+	* 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  <wl@gnu.org>
 
 	* hdtbl.tmac (t*divs): Fix a bug which causes incorrect table cell
diff --git a/contrib/hdtbl/hdmisc.tmac b/contrib/hdtbl/hdmisc.tmac
index 21f2b608..773c7e25 100644
--- a/contrib/hdtbl/hdmisc.tmac
+++ b/contrib/hdtbl/hdmisc.tmac
@@ -315,12 +315,6 @@ Software Foundation, 51 Franklin St - Fifth Floor, Boston, MA
 .\"	**	when calling groff/troff				**
 .\"	******************************************************************
 .
-.ie n \
-.  ds g tty:\"
-.el \
-.  ds g ps: exec\"
-.
-.
 .\"	******************************************************************
 .\"	**		Header macro for the examples			**
 .\"	******************************************************************
diff --git a/contrib/hdtbl/hdtbl.tmac b/contrib/hdtbl/hdtbl.tmac
index 9715a52e..3c946543 100644
--- a/contrib/hdtbl/hdtbl.tmac
+++ b/contrib/hdtbl/hdtbl.tmac
@@ -100,6 +100,11 @@ Software Foundation, 51 Franklin St - Fifth Floor, Boston, MA
 .\"	*	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 @@ Software Foundation, 51 Franklin St - Fifth Floor, Boston, MA
 .\"		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 @@ Software Foundation, 51 Franklin St - Fifth Floor, Boston, MA
 .  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 @@ Software Foundation, 51 Franklin St - Fifth Floor, Boston, MA
 .
 .      \" 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[**]