* hdmisc.tmac: Fix test for \n[?] to avoid warning message.

s/\n[.s]p/\n[.ps]/.
(pv): Use `z' scaling indicator.

* hdtbl.tmac: Fix test for \n[?] and \n[*miscs] to avoid warning
messages.

3 files changed, 20 insertions, 11 deletions

diff --git a/contrib/hdtbl/ChangeLog b/contrib/hdtbl/ChangeLog
index ed5d632c..14791a62 100644
--- a/contrib/hdtbl/ChangeLog
+++ b/contrib/hdtbl/ChangeLog
@@ -1,3 +1,12 @@
+2006-06-14  Werner LEMBERG  <wl@gnu.org>
+
+	* hdmisc.tmac: Fix test for \n[?] to avoid warning message.
+	s/\n[.s]p/\n[.ps]/.
+	(pv): Use `z' scaling indicator.
+
+	* hdtbl.tmac: Fix test for \n[?] and \n[*miscs] to avoid warning
+	messages.
+
 2006-06-11  Werner LEMBERG  <wl@gnu.org>
 
 	* groff_hdtbl.man: Use `.ig' block after NAME section to make mandb
diff --git a/contrib/hdtbl/hdmisc.tmac b/contrib/hdtbl/hdmisc.tmac
index 4ebaa6fa..a10cb72b 100644
--- a/contrib/hdtbl/hdmisc.tmac
+++ b/contrib/hdtbl/hdmisc.tmac
@@ -28,7 +28,7 @@ Software Foundation, 51 Franklin St - Fifth Floor, Boston, MA
 .
 .\" %beginstrip%
 .
-.if (\n[?] == 1) \
+.if r ? \
 .  tm HDroff: loading misc. macros file \n[.F].
 .
 .nr *miscs 1
@@ -218,7 +218,7 @@ Software Foundation, 51 Franklin St - Fifth Floor, Boston, MA
 .  br
 .
 .  if \\n[.$] \
-.    ps (\\n[s]u * \\$1p / 1p)
+.    ps (\\n[s]u * \\$1z / 1z)
 .
 .  ie (\\n[.$] - 1) \
 .    vs (\\n[v]u * \\$2p / 1p)
@@ -232,7 +232,7 @@ Software Foundation, 51 Franklin St - Fifth Floor, Boston, MA
 .
 .  if !""\\$4" \{\
 .    nr v \\n[.v]
-.    nr s \\n[.s]p
+.    nr s \\n[.ps]
 .    nr hy \\n[.hy]
 .  \}
 ..
@@ -475,7 +475,7 @@ Software Foundation, 51 Franklin St - Fifth Floor, Boston, MA
 .\"	******************************************************************
 .\"	**			minimal Page setup			**
 .\"	******************************************************************
-.nr s \n[.s]p
+.nr s \n[.ps]
 .nr v \n[.v]
 .pv 1.2 1.2 "" X
 .nr l 6.6i
diff --git a/contrib/hdtbl/hdtbl.tmac b/contrib/hdtbl/hdtbl.tmac
index 60293c21..1f86ca85 100644
--- a/contrib/hdtbl/hdtbl.tmac
+++ b/contrib/hdtbl/hdtbl.tmac
@@ -31,12 +31,12 @@ Software Foundation, 51 Franklin St - Fifth Floor, Boston, MA
 .\"	*			Vers. 0.91 December 2005		*
 .\"	*****************************************************************
 .
-.if (\n[?] == 1) \
+.if r ? \
 .  tm HDroff: Loading table macros file \n[.F].
 .
 .nr *hdtbl 1
 .
-.if !\n[*miscs] \
+.if !r *miscs \
 .  mso hdmisc.tmac
 .
 .wh 0 HM	\"	comment this, if a page header macro exists
@@ -188,10 +188,10 @@ Software Foundation, 51 Franklin St - Fifth Floor, Boston, MA
 .    nr in\\n[t*#] \\n[.i]
 .  el \{\
 .    ie "\\*[tal]"c" \
-.      nr in\\n[t*#] \\n[.l]-\\n[ll\\n[t*#]]/2+\\n[.i]
+.      nr in\\n[t*#] (\\n[.l] - \\n[ll\\n[t*#]]/2 + \\n[.i])
 .    el \{\
 .      ie "\\*[tal]"r" \
-.        nr in\\n[t*#] \\n[.l]-\\n[ll\\n[t*#]]+\\n[.i]
+.        nr in\\n[t*#] (\\n[.l] - \\n[ll\\n[t*#]] + \\n[.i])
 .      el \{\
 .        tmc \\n[.F]:\\n[.c]: Invalid `tal' value `\\*[tal]':
 .        tm1 " must be `l', `c' or `r'.
@@ -413,7 +413,7 @@ Software Foundation, 51 Franklin St - Fifth Floor, Boston, MA
 .    di
 .    in \\n[t*i]u
 .    ie "\\*[hold]"" \{\
-.      ie \\n[.t]-\\n[dn] \
+.      ie (\\n[.t] - \\n[dn]) \
 .        DI t*tbl0
 .      el \{\
 .        rn t*tbl0 t*tbl\\n[t*numb]
@@ -495,7 +495,7 @@ Software Foundation, 51 Franklin St - Fifth Floor, Boston, MA
 .
 .  nr b/2 \\n[b/2\\n[t*#]]		\"	some abbrevs.
 .  nr cscp \\n[cscp\\n[t*#]]
-.  nr cscpb \\n[b/2]+\\n[cscp]
+.  nr cscpb (\\n[b/2] + \\n[cscp])
 .
 .  nr topdiv (\\n[.d] + \\n[b/2] - \\n[cscp]) \"	top of cell diversion
 .  nr cscpb2 (\\n[b/2] / 2 + \\n[cscp])
@@ -699,7 +699,7 @@ Software Foundation, 51 Franklin St - Fifth Floor, Boston, MA
 .  nr ** (0 >? \\n[t*b\\n[t*#]])
 .  nr * 0 1
 .
-.  \" second-while loop: calculate
+.  \" second while loop: calculate
 .  while (\\n[t*cols\\n[t*#]] >= \\n+[*]) \{\
 .    \" net cellwidths and indents.
 .    if \\n[t*b\\n[t*#]] \{\