diff options
| author | wl <wl> | 2005-01-19 06:50:30 +0000 |
|---|---|---|
| committer | wl <wl> | 2005-01-19 06:50:30 +0000 |
| commit | 9ee338637e5940c1e3db0462137b6d7f0dedcadb (patch) | |
| tree | acf89a29b808b1d2ba752338e605bbd743783be9 | |
| parent | d2d50c8448bc8bfb814ee1181f714fe23c3cff37 (diff) | |
| download | groff-9ee338637e5940c1e3db0462137b6d7f0dedcadb.tar.gz | |
* 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.
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | src/roff/troff/div.cpp | 5 | ||||
| -rw-r--r-- | tmac/doc-common | 4 | ||||
| -rw-r--r-- | tmac/doc-ditroff | 6 |
4 files changed, 13 insertions, 12 deletions
@@ -1,3 +1,13 @@ +2005-01-17 Ruslan Ermilov <ru@FreeBSD.org> + + * tmac/doc-common (Dd), tmac/doc-ditroff (gX, doc-setup-header): + Remove dead code. + +2004-01-17 Werner LEMBERG <wl@gnu.org> + + * src/roff/troff/div.cpp (top_level_diversion::space): Protect + against division by zero. + 2005-01-13 Ruslan Ermilov <ru@FreeBSD.org> * tmac/doc.tmac (Ef): Restore doc-curr-font and doc-curr-size. diff --git a/src/roff/troff/div.cpp b/src/roff/troff/div.cpp index 7ad7e4ca..f372239c 100644 --- a/src/roff/troff/div.cpp +++ b/src/roff/troff/div.cpp @@ -459,8 +459,9 @@ void top_level_diversion::space(vunits n, int forced) 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(); diff --git a/tmac/doc-common b/tmac/doc-common index 88157ad1..38f13807 100644 --- a/tmac/doc-common +++ b/tmac/doc-common @@ -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 diff --git a/tmac/doc-ditroff b/tmac/doc-ditroff index 14be96b8..fbfa61bb 100644 --- a/tmac/doc-ditroff +++ b/tmac/doc-ditroff @@ -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 .. . |