diff options
author | wlemb <wlemb> | 2002-01-26 07:52:03 +0000 |
---|---|---|
committer | wlemb <wlemb> | 2002-01-26 07:52:03 +0000 |
commit | 3a411f58f94a0aa475dcb05a12ef6778f7884009 (patch) | |
tree | 19d39a7585c9c6172ad3141087a632d2def8c2af /tmac | |
parent | 7482010e8f31df2ac357c1f652c20f2d4fd6e713 (diff) | |
download | groff-3a411f58f94a0aa475dcb05a12ef6778f7884009.tar.gz |
* tmac/groff_ms.man: Typographical improvements.
* doc/groff.texinfo: Updated version and copyright.
* src/devices/grops/grops.man: Updated.
* tmac/groff_tmac.man: Fix `ig' macro.
* tmac/an-old.tmac (ne): Redefine `ne' request to be a no-op in
nroff mode.
Use `.ne' unconditionally everywhere.
(TS): Only insert some vertical space. Doing a page break is no
longer necessary due to the redefinition of the `ne' request.
* src/libs/libdriver/input.cc (parse_D_command): Don't emit a
warning for unknown subcommands but parse and pass them to the
device driver.
Diffstat (limited to 'tmac')
-rw-r--r-- | tmac/an-old.tmac | 23 | ||||
-rw-r--r-- | tmac/groff_ms.man | 129 | ||||
-rwxr-xr-x | tmac/groff_tmac.man | 4 | ||||
-rw-r--r-- | tmac/groff_www.man | 2 |
4 files changed, 106 insertions, 52 deletions
diff --git a/tmac/an-old.tmac b/tmac/an-old.tmac index 0e064e9c..b9e3da83 100644 --- a/tmac/an-old.tmac +++ b/tmac/an-old.tmac @@ -63,6 +63,11 @@ .if \n[an-html] .nr C 1 .if r ps4html .nr C 1 . +.if n \{\ +. de ne +. . +.\} +. .de set-an-margin . nr an-margin \\n[IN] .. @@ -256,7 +261,7 @@ . nr an-break-flag 1 . ps \\n[PS-SH]u . ft B -. if !\\n[cR] .ne (2v + 1u) +. ne (2v + 1u) . if \\n[.$] \&\\$* .. . @@ -273,7 +278,7 @@ . nr an-break-flag 1 . ps \\n[PS-SS]u . ft B -. if !\\n[cR] .ne (2v + 1u) +. ne (2v + 1u) . if \\n[.$] \&\\$* .. . @@ -337,7 +342,7 @@ . di . ie (\\n[dl] + \\n[an-tag-sep] > \\n[an-prevailing-indent]) \{\ . in \\n[an-margin]u -. if !\\n[cR] .ne (2v + 1u) +. ne (2v + 1u) . an-div . br . in (\\n[an-margin]u + \\n[an-prevailing-indent]u) @@ -346,7 +351,7 @@ . in (\\n[an-margin]u + \\n[an-prevailing-indent]u) . ti -\\n[an-prevailing-indent]u . chop an-div -. if !\\n[cR] .ne (1v + 1u) +. ne (1v + 1u) \\*[an-div]\\h'|\\n[an-prevailing-indent]u'\c . \} .. @@ -370,7 +375,7 @@ . vs \\n[VS]u . ft R . sp \\n[PD]u -. if !\\n[cR] .ne (1v + 1u) +. ne (1v + 1u) . in (\\n[an-margin]u + \\n[an-prevailing-indent]u) . \} . el \{\ @@ -385,7 +390,7 @@ . vs \\n[VS]u . ft R . sp \\n[PD]u -. if !\\n[cR] .ne (1v + 1u) +. ne (1v + 1u) . if \\n[.$] .nr an-prevailing-indent (n;\\$1) . in (\\n[an-margin]u + \\n[an-prevailing-indent]u) . ti \\n[an-margin]u @@ -494,12 +499,6 @@ . .de1 TS . sp \\n[PD]u -. if n \{\ -. nr an-pl \\n[.p] -. pl \\n[nl]u -. bp -. pl \\n[an-pl]u -. \} .. . .de1 TE diff --git a/tmac/groff_ms.man b/tmac/groff_ms.man index eca546f6..cea0de74 100644 --- a/tmac/groff_ms.man +++ b/tmac/groff_ms.man @@ -120,50 +120,79 @@ or just after the .B RP macro. .LP +.ne 9 .B Margin settings +.RS +.na .TS -center; -cb cb cb cb -afCW l l l . +cb s cb s s cb s cb s +afCW s l s s l s l s. Reg. Definition Effective Default _ -PO Page offset (left margin) next page 1i -LL Line length next para. 6i -LT Header/footer length next para. 6i -HM Top (header) margin next page 1i -FM Bottom (footer) margin next page 1i +PO T{ +Page offset (left margin) +T} T{ +next page +T} 1i +LL T{ +Line length +T} next para. 6i +LT T{ +Header/footer length +T} next para. 6i +HM T{ +Top (header) margin +T} next page 1i +FM T{ +Bottom (footer) margin +T} next page 1i _ .TE +.RE .LP +.ne 7 .B Text settings +.RS .TS -center; -cb cb cb cb -afCW l l l . +cb s cb s s cb s cb s +afCW s l s s l s l s. Reg. Definition Effective Default _ -PS Point size next para. 10p -VS Line spacing (leading) next para. 12p +PS T{ +Point size +T} next para. 10p +VS T{ +Line spacing (leading) +T} next para. 12p _ .TE +.RE .LP -.if t .bp +.ne 7 .B Paragraph settings +.RS .TS -center; -cb cb cb cb -afCW l l l . +cb cb s cb cb +afCW l s l l . Reg. Definition Effective Default _ -PI Initial indent next para. 5n -PD Space between paragraphs next para. 0.3v -QI Quoted paragraph indent next para. 5n +PI T{ +Initial indent +T} next para. 5n +PD T{ +Space between paragraphs +T} next para. 0.3v +QI T{ +Quoted paragraph indent +T} next para. 5n _ .TE +.RE .LP +.ne 7 .B Footnote settings +.RS .TS -center; cb cb cb cb afCW l l l . Reg. Definition Effective Default @@ -173,17 +202,23 @@ FI Footnote indent next footnote 2n FF Footnote format next footnote 0 _ .TE +.RE .LP +.ne 6 .B Other settings +.RS .TS -center; -cb cb cb cb -afCW l l l . +cb s cb s s cb s cb s +afCW s l s s l s l s. Reg. Definition Effective Default _ -MINGW Minimum width between columns next page 2n +MINGW T{ +Minimum width between columns +T} next page 2n _ .TE +.ad +.RE .\" ----- .SS "Cover page macros" Use the following macros to create a cover page for your document @@ -432,11 +467,13 @@ Displays can be .I kept on a single page, or allowed to break across pages. The following table shows the display types available. +.RS +.ne 11 +.na .TS -center; -cb s | cb -cb cb | ^ -lfCW lfCW | lw(3i) . +cb s s s cbt s s +cb s cb s ^ s s +lfCW s lfCW s l s s. Display macro Type of display With keep No keep _ @@ -451,6 +488,8 @@ T} \&.DS R \&.RD Right-justified. _ .TE +.RE +.ad .LP Use the .B DE @@ -593,6 +632,7 @@ prints footnote numbers by changing the value of the .B FF register as follows: .RS +.ne 7 .TP 0 Prints the footnote number as a superscript; indents the footnote (default). @@ -666,19 +706,33 @@ appearing in the header or footer text. .SS Margins You control margins using a set of number registers. The following table lists the register names and defaults: +.RS +.ne 8 +.na .TS -center; -cb cb cb cb -afCW l l a . +cb s cb s s cb s cb s +afCW s l s s l s l s. Reg. Definition Effective Default _ -PO Page offset (left margin) next page 1i -LL Line length next para. 6i -LT Header/footer length next para. 6i -HM Top (header) margin next page 1i -FM Bottom (footer) margin next page 1i +PO T{ +Page offset (left margin) +T} next page 1i +LL T{ +Line length +T} next para. 6i +LT T{ +Header/footer length +T} next para. 6i +HM T{ +Top (header) margin +T} next page 1i +FM T{ +Bottom (footer) margin +T} next page 1i _ .TE +.RE +.ad .PP Note that there is no right margin setting. The combination of page offset and line length @@ -814,6 +868,7 @@ should use this number register. You can redefine the following strings to adapt the .I "groff ms" macros to languages other than English: +.ne 18 .TS center; cb cb diff --git a/tmac/groff_tmac.man b/tmac/groff_tmac.man index e8fe0ab4..b6654848 100755 --- a/tmac/groff_tmac.man +++ b/tmac/groff_tmac.man @@ -1,4 +1,4 @@ -.ig / +.ig groff_tmac.5 This file is part of groff, the GNU roff type-setting system. @@ -14,7 +14,7 @@ Front-Cover Texts, and with no Back-Cover Texts. A copy of the Free Documentation License is included as a file called FDL in the main directory of the groff source package. -./ +.. . .\" -------------------------------------------------------------------- .\" Setup diff --git a/tmac/groff_www.man b/tmac/groff_www.man index f531b981..a60bd558 100644 --- a/tmac/groff_www.man +++ b/tmac/groff_www.man @@ -1,5 +1,5 @@ .TH GROFF_WWW @MAN7EXT@ "@MDATE@" "Groff Version @VERSION@" -.\" Copyright (C) 2000, 2001 Free Software Foundation, Inc. +.\" Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc. .\" Written by Gaius Mulley (gaius@glam.ac.uk) .\" .\" This file is part of groff. |