diff options
| -rw-r--r-- | ChangeLog | 16 | ||||
| -rw-r--r-- | doc/groff.texinfo | 4 | ||||
| -rw-r--r-- | tmac/doc-common | 22 | ||||
| -rw-r--r-- | tmac/doc-ditroff | 11 | ||||
| -rw-r--r-- | tmac/doc-nroff | 12 | ||||
| -rw-r--r-- | tmac/doc.tmac | 26 |
6 files changed, 45 insertions, 46 deletions
@@ -1,5 +1,21 @@ 2002-10-26 Werner LEMBERG <wl@gnu.org> + * tmac/doc-ditroff: Remove useless switch/variable -rC. + (doc-setup-header): Don't set page register `%'. + * tmac/doc-nroff: Remove variable `C'. + (doc-setup-page-layout): Set doc-header-space to .5i unconditionally. + (doc-setup-header): Don't set page register `%'. + Don't call `bp'. + * tmac/doc-common (doc-header): Call `ns'. + (doc-paragraph): Protect .sp with .br so that it survives the + implicit new-page trap. + * tmac/doc.tmac (Bp, Bl, doc-set-vertical-and-indent): Ditto. + + * tmac/doc*:Replace ' with . for consistency in all mdoc-related + files if no effect. + +2002-10-26 Werner LEMBERG <wl@gnu.org> + * tmac/an-old.tmac (SH, SS, TP, IP, HP, TS): Protect .sp with .br so that it survives the implicit new-page trap. diff --git a/doc/groff.texinfo b/doc/groff.texinfo index e9818ed5..3c02247b 100644 --- a/doc/groff.texinfo +++ b/doc/groff.texinfo @@ -6494,9 +6494,7 @@ Calling @code{ta} without an argument removes all tab stops. @item @cindex tab stops, for TTY output devices -The start-up value of @code{gtroff} is @w{@samp{T 0.5i}} in troff mode -and @w{@samp{T 0.8i}} in nroff mode (the latter is done with an -explicit call to the @code{ta} request in the file @file{tty.tmac}. +The start-up value of @code{gtroff} is @w{@samp{T 0.8i}}. @end itemize @cindex tab settings register (@code{.tabs}) diff --git a/tmac/doc-common b/tmac/doc-common index 7310d191..8eafa0e1 100644 --- a/tmac/doc-common +++ b/tmac/doc-common @@ -542,7 +542,7 @@ . ev doc-env-dh . doc-setup-page-layout . if !\n[cR] \ -' sp \n[doc-header-space]u +. sp \n[doc-header-space]u . nr doc-reg-dh \w'\*[doc-caption-font]\*[doc-header-string]\f[]' . nr doc-reg-dh1 \w'\*[doc-caption-font2]\*[doc-volume]\f[]' . if (\n[doc-reg-dh] + \n[doc-reg-dh1] + \n[doc-reg-dh] >= \n[.lt]) \{\ @@ -553,8 +553,9 @@ . as doc-header-string "\|.\|.\|. . \} . tl \*[doc-caption-font]\*[doc-header-string]\f[]\*[doc-caption-font2]\*[doc-volume]\f[]\*[doc-caption-font]\*[doc-header-string]\f[] -' sp \n[doc-header-space]u +. sp \n[doc-header-space]u . ev +. ns .. . . @@ -563,11 +564,11 @@ . .de doc-footer . ie \n[cR] \ -' br +. br . el \{\ . ev doc-caption-enviroment . doc-setup-page-layout -' sp \n[doc-footer-space]u +. sp \n[doc-footer-space]u . ie \n[D] \{\ . ie o \ . tl %\*[doc-caption-font2]\*[doc-date-string]\f[]\*[doc-caption-font]\*[doc-operating-system]\f[] @@ -576,7 +577,7 @@ . \} . el \ . tl \*[doc-caption-font]\*[doc-operating-system]\f[]\*[doc-caption-font2]\*[doc-date-string]\f[]% -' bp +. bp . ev . \} .. @@ -602,7 +603,7 @@ . tm mdoc warning: list open at EOF! A .Bl directive has no matching .El . . if \n[cR] \{\ -' sp +. sp . tl \*[doc-caption-font]\*[doc-operating-system]\f[]\*[doc-caption-font2]\*[doc-date-string]\f[]\*[doc-caption-font]\*[doc-operating-system]\f[] . \" suppress empty lines after the footer . pl \n[nl]u @@ -614,6 +615,7 @@ .\" NS insert a paragraph . .de doc-paragraph +. br . sp \n[doc-paragraph-space]u . if !\n[cR] \ . ne 2 @@ -761,14 +763,14 @@ . doc-parse-args \$@ . . if t \ -' ad +. ad . . \" this resolves e.g. `.Sh "SEE ALSO"' . doc-first-parameter \$* . . ie "\*[doc-str-dfp]"\*[doc-section-name]" \{\ . doc-setup-header -' in 0 +. in 0 . \} . el \{\ . nr doc-in-synopsis-section 0 @@ -805,12 +807,12 @@ . \} . . doc-setup-page-layout -' sp +. sp . ns . ta T .5i . if !\n[cR] \ . ne 3 -' fi +. fi . . if t \{\ . nr doc-reg-Sh \n[.ss] diff --git a/tmac/doc-ditroff b/tmac/doc-ditroff index 94f7e504..6c830093 100644 --- a/tmac/doc-ditroff +++ b/tmac/doc-ditroff @@ -36,10 +36,6 @@ . .eo . -.\" use -rC=1 to number pages continuously -. -.if !r C .nr C 0 -. .\" use -rD=1 for double-sided printing . .if !r D .nr D 0 @@ -212,18 +208,11 @@ . wh 0 doc-header . wh -1.25i doc-footer . -. nr nL \n[nl] . if \n[gX] \ . ds doc-command-name . . br . -. \" Don't set the page number if this is the first page, -. \" in case the user has used -n. -. if \n[nL] \ -. if !\n[C] \ -. nr % 1 -. . nr gX 0 . e@ doc-end-macro .. diff --git a/tmac/doc-nroff b/tmac/doc-nroff index 9c5f3075..0c043812 100644 --- a/tmac/doc-nroff +++ b/tmac/doc-nroff @@ -44,10 +44,9 @@ . .if !r cR .nr cR 1 . -.\" the following switches are ignored in nroff mode +.\" the following switch is ignored in nroff mode . .nr S 10 -.nr C 0 . .\" the `doc-xx-font' strings must not be empty! . @@ -122,10 +121,7 @@ .\" NS doc-header-space . .de doc-setup-page-layout -. ie \n[cR] \ -. nr doc-header-space 0 -. el \ -. nr doc-header-space .5i +. nr doc-header-space .5i . nr doc-footer-space .5i . . ie r LL \ @@ -201,7 +197,6 @@ .\" NS doc-header-string . .de doc-setup-header -. nr % 1 . ds doc-header-string "\*[doc-document-title] . if !"\*[doc-section]"Null" \ . as doc-header-string (\*[doc-section]) @@ -213,9 +208,6 @@ . wh -1.167i doc-footer . \} . -. if ((\n[nl] == 0) : (\n[nl] == -1)) \ -' bp -. . e@ doc-end-macro .. . diff --git a/tmac/doc.tmac b/tmac/doc.tmac index 36676432..c872b093 100644 --- a/tmac/doc.tmac +++ b/tmac/doc.tmac @@ -2652,10 +2652,10 @@ . . ie t \{\ . nop \*[doc-Li-font]\c -' ta T 9n +. ta T 9n . \} . el \ -' ta T 8n +. ta T 8n . nf . \} . el \{ .ie "\$1"-filled" \{\ @@ -2696,13 +2696,11 @@ . nr doc-display-indent-stack\n[doc-display-depth] 0 . . if \n[doc-display-indent-stack\n[doc-display-depth]] \ -' in +\n[doc-display-indent-stack\n[doc-display-depth]]u +. in +\n[doc-display-indent-stack\n[doc-display-depth]]u . . if !\n[doc-is-compact] \{\ -. ie "\*[doc-display-type-stack\n[doc-display-depth]]"ragged" \ -. sp \n[doc-display-vertical]u -. el \ -' sp \n[doc-display-vertical]u +. br +. sp \n[doc-display-vertical]u . \} . . if !\n[cR] \ @@ -3002,8 +3000,10 @@ . if "\*[doc-list-type-stack\n[doc-list-depth]]"column-list" \{\ . doc-set-column-tab \n[doc-num-columns] ' in -\n[doc-column-indent-width]u -. if !\n[doc-compact-list-stack\n[doc-list-depth]] \ +. if !\n[doc-compact-list-stack\n[doc-list-depth]] \{\ +. br . sp \n[doc-display-vertical]u +. \} . . nf . nr doc-num-columns 0 @@ -4015,8 +4015,10 @@ .\" NS doc-list-have-indent-stackXXX . .de doc-set-vertical-and-indent -. if !\n[doc-compact-list-stack\n[doc-list-depth]] \ +. if !\n[doc-compact-list-stack\n[doc-list-depth]] \{\ +. br . sp \n[doc-display-vertical]u +. \} . . if \n[doc-list-have-indent-stack\n[doc-list-depth]] \{\ . nr doc-list-have-indent-stack\n[doc-list-depth] 0 @@ -4317,7 +4319,7 @@ . nr doc-list-indent-stack\n[doc-list-depth] \n[doc-column-indent-width]u . if !\n[.u] \{\ . fi -' in +\n[doc-column-indent-width]u +. in +\n[doc-column-indent-width]u . \} . ti -\n[doc-column-indent-width]u . @@ -4363,7 +4365,7 @@ .\" NS width register `Dl' set in doc-common . .de Dl -' ta T .5i +. ta T .5i . in +\n[doc-display-indent]u . . ie \n[doc-arg-limit] \{\ @@ -4398,7 +4400,7 @@ .\" NS width register `D1' set in doc-common . .de D1 -' ta T .5i +. ta T .5i . in +\n[doc-display-indent]u . . ie \n[doc-arg-limit] \{\ |