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

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Changes by:     Werner LEMBERG <wl>     06/06/16 07:02:46

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

Log message:
        * 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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/hdtbl/ChangeLog?cvsroot=groff&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/hdtbl/hdmisc.tmac?cvsroot=groff&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/hdtbl/hdtbl.tmac?cvsroot=groff&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/contrib/hdtbl/ChangeLog,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- ChangeLog   12 Jun 2006 05:28:07 -0000      1.12
+++ ChangeLog   16 Jun 2006 07:02:46 -0000      1.13
@@ -1,3 +1,12 @@
+2006-06-14  Werner LEMBERG  <address@hidden>
+
+       * 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  <address@hidden>
 
        * groff_hdtbl.man: Use `.ig' block after NAME section to make mandb

Index: hdmisc.tmac
===================================================================
RCS file: /cvsroot/groff/groff/contrib/hdtbl/hdmisc.tmac,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- hdmisc.tmac 5 Jun 2006 16:17:03 -0000       1.2
+++ hdmisc.tmac 16 Jun 2006 07:02:46 -0000      1.3
@@ -28,7 +28,7 @@
 .
 .\" %beginstrip%
 .
-.if (\n[?] == 1) \
+.if r ? \
 .  tm HDroff: loading misc. macros file \n[.F].
 .
 .nr *miscs 1
@@ -218,7 +218,7 @@
 .  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 @@
 .
 .  if !""\\$4" \{\
 .    nr v \\n[.v]
-.    nr s \\n[.s]p
+.    nr s \\n[.ps]
 .    nr hy \\n[.hy]
 .  \}
 ..
@@ -475,7 +475,7 @@
 .\"    ******************************************************************
 .\"    **                      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

Index: hdtbl.tmac
===================================================================
RCS file: /cvsroot/groff/groff/contrib/hdtbl/hdtbl.tmac,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- hdtbl.tmac  4 Jun 2006 11:02:11 -0000       1.3
+++ hdtbl.tmac  16 Jun 2006 07:02:46 -0000      1.4
@@ -31,12 +31,12 @@
 .\"    *                       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 @@
 .    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 @@
 .    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 @@
 .
 .  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 @@
 .  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*#]] \{\