[Groff-commit] groff ./ChangeLog src/roff/troff/div.cpp tmac/d...

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Branch:         
Changes by:     Werner LEMBERG <address@hidden> 05/01/19 06:50:30

Modified files:
        .              : ChangeLog 
        src/roff/troff : div.cpp 
        tmac           : doc-common doc-ditroff 

Log message:
        * tmac/doc-common (Dd), tmac/doc-ditroff (gX, doc-setup-header):
        Remove dead code.
        
        * src/roff/troff/div.cpp (top_level_diversion::space): Protect
        against division by zero.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/ChangeLog.diff?tr1=1.777&tr2=1.778&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/roff/troff/div.cpp.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/tmac/doc-common.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/tmac/doc-ditroff.diff?tr1=1.9&tr2=1.10&r1=text&r2=text

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.777 groff/ChangeLog:1.778
--- groff/ChangeLog:1.777       Fri Jan 14 09:02:10 2005
+++ groff/ChangeLog     Wed Jan 19 06:50:30 2005
@@ -1,3 +1,13 @@
+2005-01-17  Ruslan Ermilov  <address@hidden>
+
+       * tmac/doc-common (Dd), tmac/doc-ditroff (gX, doc-setup-header):
+       Remove dead code.
+
+2004-01-17  Werner LEMBERG  <address@hidden>
+
+       * src/roff/troff/div.cpp (top_level_diversion::space): Protect
+       against division by zero.
+
 2005-01-13  Ruslan Ermilov  <address@hidden>
 
        * tmac/doc.tmac (Ef): Restore doc-curr-font and doc-curr-size.
Index: groff/src/roff/troff/div.cpp
diff -u groff/src/roff/troff/div.cpp:1.8 groff/src/roff/troff/div.cpp:1.9
--- groff/src/roff/troff/div.cpp:1.8    Fri Oct 15 05:08:35 2004
+++ groff/src/roff/troff/div.cpp        Wed Jan 19 06:50:30 2005
@@ -459,8 +459,9 @@
   vunits next_trap_pos;
   trap *next_trap = find_next_trap(&next_trap_pos);
   vunits y = vertical_position + n;
-  curenv->seen_space += n.to_units()
-                       / curenv->get_vertical_spacing().to_units();
+  if (curenv->get_vertical_spacing().to_units())
+    curenv->seen_space += n.to_units()
+                         / curenv->get_vertical_spacing().to_units();
   if (vertical_position_traps_flag && next_trap != 0 && y >= next_trap_pos) {
     vertical_position = next_trap_pos;
     nl_reg_contents = vertical_position.to_units();
Index: groff/tmac/doc-common
diff -u groff/tmac/doc-common:1.26 groff/tmac/doc-common:1.27
--- groff/tmac/doc-common:1.26  Thu Apr 15 16:09:07 2004
+++ groff/tmac/doc-common       Wed Jan 19 06:50:30 2005
@@ -551,10 +551,6 @@
 .ds doc-date-12 December
 .
 .de Dd
-.  \" XXX: why do we need gX?
-.  if "\*[doc-date-string]"" \
-.    nr gX 1
-.
 .  ie \n[.$] \{\
 .    ie (\n[.$] == 3) \
 .      ds doc-date-string \$1\~\$2 \$3
Index: groff/tmac/doc-ditroff
diff -u groff/tmac/doc-ditroff:1.9 groff/tmac/doc-ditroff:1.10
--- groff/tmac/doc-ditroff:1.9  Fri May  2 18:40:20 2003
+++ groff/tmac/doc-ditroff      Wed Jan 19 06:50:30 2005
@@ -180,8 +180,6 @@
 .ds Ba \f[R]|\f[]
 .ds Am &
 .
-.nr gX 0
-.
 .
 .\" NS doc-header-string global string
 .\" NS   the final string used for the manual page header
@@ -203,12 +201,8 @@
 .  wh 0 doc-header
 .  wh -1.25i doc-footer
 .
-.  if \n[gX] \
-.    ds doc-command-name
-.
 .  br
 .
-.  nr gX 0
 .  e@ doc-end-macro
 ..
 .