[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: |
Sun, 19 Nov 2006 09:41:45 +0000 |
CVSROOT: /cvsroot/groff
Module name: groff
Changes by: Werner LEMBERG <wl> 06/11/19 09:41:45
Modified files:
contrib/hdtbl : ChangeLog hdmisc.tmac hdtbl.tmac
Log message:
* hdmisc.tmac: Avoid loading itself more than once.
Load hdtbl.tmac unconditionally.
(\n[?], *miscs): Remove.
(random-s1): Use only 9 digits.
* hdtbl.tmac: Avoid loading itself more than once.
Load hdmisc.tmac unconditionally.
Load 62bit.tmac
(\n[*hdtbl]): Removed.
(t*cl): Prevent scaling overflow by using routines from 62bit.tmac.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/hdtbl/ChangeLog?cvsroot=groff&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/hdtbl/hdmisc.tmac?cvsroot=groff&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/hdtbl/hdtbl.tmac?cvsroot=groff&r1=1.9&r2=1.10
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/contrib/hdtbl/ChangeLog,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- ChangeLog 15 Nov 2006 18:55:34 -0000 1.22
+++ ChangeLog 19 Nov 2006 09:41:45 -0000 1.23
@@ -1,3 +1,16 @@
+2006-11-17 Werner LEMBERG <address@hidden>
+
+ * hdmisc.tmac: Avoid loading itself more than once.
+ Load hdtbl.tmac unconditionally.
+ (\n[?], *miscs): Remove.
+ (random-s1): Use only 9 digits.
+
+ * hdtbl.tmac: Avoid loading itself more than once.
+ Load hdmisc.tmac unconditionally.
+ Load 62bit.tmac
+ (\n[*hdtbl]): Removed.
+ (t*cl): Prevent scaling overflow by using routines from 62bit.tmac.
+
2006-11-15 Werner LEMBERG <address@hidden>
* hdmisc.tmac (d2x): Use string array instead of `dzx' macro.
Index: hdmisc.tmac
===================================================================
RCS file: /cvsroot/groff/groff/contrib/hdtbl/hdmisc.tmac,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- hdmisc.tmac 15 Nov 2006 18:55:34 -0000 1.7
+++ hdmisc.tmac 19 Nov 2006 09:41:45 -0000 1.8
@@ -28,10 +28,8 @@
.
.\" %beginstrip%
.
-.if r ? \
-. tm HDroff: loading misc. macros file \n[.F].
-.
-.nr *miscs 1
+.if d getarg \
+. nx
.
.
.\" ******************************************************************
@@ -512,7 +510,7 @@
.
.ds random-s1 \n[minutes]\n[seconds]\n[$$]\n[hours]\"
.\" prevent overflow
-.substring random-s1 0 9
+.substring random-s1 0 8
.
.nr random-s1 (\*[random-s1] % 2147483562)
.nr random-s2 \n[dy]\n[year]\n[mo]
@@ -616,7 +614,7 @@
. gcolor black
.if "\n[.M]"" \
. fcolor white
-.if !\n[*hdtbl] \
-. mso hdtbl.tmac\" load table macros
+.
+.mso hdtbl.tmac\" load table macros
.
.\" EOF
Index: hdtbl.tmac
===================================================================
RCS file: /cvsroot/groff/groff/contrib/hdtbl/hdtbl.tmac,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- hdtbl.tmac 6 Nov 2006 23:38:59 -0000 1.9
+++ hdtbl.tmac 19 Nov 2006 09:41:45 -0000 1.10
@@ -31,13 +31,11 @@
.\" * Vers. 0.91 December 2005 *
.\" *****************************************************************
.
-.if r ? \
-. tm HDroff: Loading table macros file \n[.F].
+.if d TBL \
+. nx
.
-.nr *hdtbl 1
-.
-.if !r *miscs \
-. mso hdmisc.tmac
+.mso hdmisc.tmac
+.mso 62bit.tmac
.
.wh 0 HM \" comment this out if a page header macro exists
.wh -1i BM \" comment this out if a bottom margin macro exists
@@ -85,9 +83,9 @@
.\" %beginstrip%
.
.\" for better error messages
-.ds nth-1 st
-.ds nth-2 nd
-.ds nth-3 rd
+.ds nth-1 st\"
+.ds nth-2 nd\"
+.ds nth-3 rd\"
.
.\" initialization of various registers
.nr t*# 0 \" table nesting level
@@ -250,7 +248,7 @@
.
. index "\\*[args]" .TR
. ie \\n[index] \{\
-. ds *a\\n[t*#] "\\*[args]
+. ds *a\\n[t*#] "\\*[args]\"
. substring args\\n[t*#] 0 \\n[index]
. substring *a\\n[t*#] \\n[index]-2 -1
. \}
@@ -404,17 +402,17 @@
. \}
.
. if (\\n[c#\\n[t*#]*\\n[t*r#\\n[t*#]]] > \\n[t*cols\\n[t*#]]) \{\
-. ds * are
-. ds ** columns
+. ds * are\"
+. ds ** columns\"
. if (\\n[c#\\*[#t#r]] == 1) \{\
-. ds * is
-. ds ** column
+. ds * is\"
+. ds ** column\"
. \}
. tmc \\n[.F]:\\n[.c]: There \\*[*] \\n[c#\\*[#t#r]] table \\*[**] (.TD)
.
-. ds * are
+. ds * are\"
. if (\\n[t*cols\\n[t*#]] == 1) \
-. ds * is
+. ds * is\"
. tm1 " but only \\n[t*cols\\n[t*#]] \\*[*] expected.
.
. ds *
@@ -783,9 +781,12 @@
. \" Remove border width, if any.
. if \\n[t*b\\n[t*#]] \{\
. \" cell_width := cell_width * (length - 1.5*border) / length
+. nr #* (\\n[ll\\n[t*#]] - (3 * \\n[t*b\\n[t*#]] / 2))
+. nr *** (\\n[ll\\n[t*#]] / 2)
. \" avoid multiplication overflow
-. nr #* (1000 * \\n[ll\\n[t*#]] / \\n[t*b\\n[t*#]])
-. nr $\\n[*] (\\n[$\\n[*]] - (1500 * \\n[$\\n[*]] / \\n[#*]))
+. mult31by31 $\\n[*] #* ****
+. add31to62 *** **** ****
+. div62by31 **** ll\\n[t*#] $\\n[*]
. \}
.
. \" Get cell widths without padding, spacing, and separator line.
@@ -795,16 +796,16 @@
.
. \" Check whether value is non-positive.
. if !\\n[cll\\n[t*#]*\\n[*]] \{\
-. nr *h ((1000 \
- * \\n[ll\\n[t*#]] \
- / (\\n[ll\\n[t*#]] - (3 * \\n[t*b\\n[t*#]] / 2)) \
- * (2 * \\n[cscp\\n[t*#]] + \\n[b/2\\n[t*#]]) \
- / 1000 \
- + 50) / 10 * 10)
-. ds * \\n[*]th
+. nr #* (\\n[ll\\n[t*#]] - (3 * \\n[t*b\\n[t*#]] / 2))
+. nr *** (\\n[#*] / 2)
+. nr *h (2 * \\n[cscp\\n[t*#]] + \\n[b/2\\n[t*#]])
+. mult31by31 *h ll\\n[t*#] ****
+. add31to62 *** **** ****
+. div62by31 **** #* *h
+. ds * \\n[*]th\"
. nr *** (\\n[*] % 10)
. if d nth-\\n[***] \
-. ds * \\n[*]\\*[nth-\\n[***]]
+. ds * \\n[*]\\*[nth-\\n[***]]\"
. tmc \\n[.F]:\\n[.c]: The \\*[*] width value (\\$\\n[*]) is too small.
. tm1 " It should be greater than \\n[*h].
. \}
@@ -856,24 +857,24 @@
.
. \" 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
+. ds * are\"
+. ds ** columns\"
. if (\\n-[c#\\*[#t#r]] == 1) \{\
-. ds * is
-. ds ** column
+. ds * is\"
+. ds ** column\"
. \}
. tmc \\n[.F]:\\n[.c]: There \\*[*] only \\n[c#\\*[#t#r]] \\*[**]
.
. nr * \\n[t*r#\\n[t*#]]
-. ds * \\n[*]th
+. ds * \\n[*]th\"
. nr *** (\\n[*] % 10)
. if d nth-\\n[***] \
-. ds * \\n[*]\\*[nth-\\n[***]]
+. ds * \\n[*]\\*[nth-\\n[***]]\"
. tmc " in the \\*[*] row
.
-. ds * are
+. ds * are\"
. if (\\n[t*cols\\n[t*#]] == 1) \
-. ds * is
+. ds * is\"
. tm1 " but \\n[t*cols\\n[t*#]] \\*[*] expected.
. \}
..
@@ -992,8 +993,8 @@
. \}
.
. if (\\n[*] - \\n[.t]) \{\
-. ds t*kept \\n[*] \\*[t*kept]
-. ds t*kept \\*[*] \\*[t*kept]
+. ds t*kept \\n[*] \\*[t*kept]\"
+. ds t*kept \\*[*] \\*[t*kept]\"
. tmc \\n[.F]:\\n[.c]: Remaining table(s),
. tm1 " because not all fit onto this page.
. break