diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | src/roff/groff/groff.man | 89 | ||||
| -rw-r--r-- | src/roff/nroff/nroff.man | 6 | ||||
| -rw-r--r-- | src/roff/troff/div.cc | 2 | ||||
| -rw-r--r-- | src/roff/troff/troff.man | 7 | ||||
| -rw-r--r-- | tmac/an-old.tmac | 13 |
6 files changed, 97 insertions, 29 deletions
@@ -1,3 +1,12 @@ +2002-12-08 Werner LEMBERG <wl@gnu.org> + + * tmac/an-old.tmac (TH): Use integer value for `IN' if in nroff + mode to avoid rounding errors. + (an-do-tag, an-do-tag-html, RS, RE): Remove redundant `.br'. + + * src/roff/groff/groff.man, src/roff/nroff/nroff.man, + src/roff/troff/troff.man: Improve documentation of -T. + 2002-12-07 Jeff Conrad <jeff_conrad@msn.com> * src/roff/groff/pipeline.c: Don't define `const' for _WIN32. diff --git a/src/roff/groff/groff.man b/src/roff/groff/groff.man index 8d605602..ff20b63d 100644 --- a/src/roff/groff/groff.man +++ b/src/roff/groff/groff.man @@ -1,7 +1,7 @@ .ig groff.man -Last update: 14 July 2002 +Last update: 09 Dec 2002 Copyright (C) 1989, 2002 Free Software Foundation, Inc. Rewritten in 2002 by Bernd Warken <bwarken@mayn.de> @@ -504,28 +504,79 @@ Preprocess with .OptDef T "" dev Set output device to .IR dev . -The possible values in -.I groff +Contrary to +.BR @g@troff , +.B groff +calls a postprocessor to convert +.BR @g@troff 's +intermediate output to its final format. +Real devices in +.B groff are -.BR ascii , -.BR cp1047 , -.BR dvi , -.BR html , -.BR latin1 , -.BR lbp , -.BR lj4 , -.BR ps , -.BR utf8 , -.BR X75 , -and -.BR X100 . . -Additionally, -.B X75-12 +.RS +.RS +.IP dvi +TeX DVI format (postprocessor is +.BR grodvi ). +.IP html +HTML output (preprocessors are +.B @g@soelim and -.B X100-12 -are available for documents which use 12\|pt as the base document size. +.BR \%pre-grohtml , +postprocessor is +.BR \%post-grohtml ). +.IP lbp +Canon CAPSL printers (\%LBP-4 and \%LBP-8 series laser printers; +postprocessor is +.BR grolbp ). +.IP lj4 +HP LaserJet4 compatible (or other PCL5 compatible) printers (postprocessor +is +.BR grolj4 ). +.IP ps +PostScript output (postprocessor is +.BR grops ). +.RE +.RE +. +.IP +For the following TTY output devices (postprocessor is always +.BR grotty ), +.ShortOpt T +selects the output encoding: +.RS +.RS +.IP ascii +7bit ASCII. +.IP cp1047 +Latin-1 character set for EBCDIC hosts. +.IP latin1 +ISO 8859-1. +.IP utf8 +Unicode character set in UTF-8 encoding. +.RE +.RE . +.IP +The following arguments select +.B gxditview +as the `postprocessor' (it is rather a viewing program): +. +.RS +.RS +.IP X75 +75dpi resolution, 10pt document base font. +.IP X75-12 +75dpi resolution, 12pt document base font. +.IP X100 +100dpi resolution, 10pt document base font. +.IP X100-12 +100dpi resolution, 12pt document base font. +.RE +.RE +. +.IP The default device is .BR @DEVICE@ . . diff --git a/src/roff/nroff/nroff.man b/src/roff/nroff/nroff.man index c76676e0..7e1262f2 100644 --- a/src/roff/nroff/nroff.man +++ b/src/roff/nroff/nroff.man @@ -1,5 +1,5 @@ .ig -Copyright (C) 1989-2001 Free Software Foundation, Inc. +Copyright (C) 1989-2001, 2002 Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice @@ -53,7 +53,9 @@ and .B cp1047 are valid arguments for the .B -T -option. +option, selecting the output encoding emitted by +.BR grotty , +groff's TTY output device. If an invalid or no .BR \-T option is given, diff --git a/src/roff/troff/div.cc b/src/roff/troff/div.cc index 94ca7883..1bbbe450 100644 --- a/src/roff/troff/div.cc +++ b/src/roff/troff/div.cc @@ -752,7 +752,7 @@ void space_request() while (!tok.newline() && !tok.eof()) tok.next(); if (!unpostpone_traps() && !curdiv->no_space_mode) - curdiv->space(n); + curdiv->space(n); else // The line might have had line spacing that was truncated. truncated_space += n; diff --git a/src/roff/troff/troff.man b/src/roff/troff/troff.man index 19bb624d..dce81dd4 100644 --- a/src/roff/troff/troff.man +++ b/src/roff/troff/troff.man @@ -2,7 +2,7 @@ .ig troff.man -Last update : 9 Jan 2002 +Last update : 09 Dec 2002 This file is part of groff, the GNU roff type-setting system. @@ -272,7 +272,10 @@ and Prepare output for device .IR name , rather than the default -.BR @DEVICE@ . +.BR @DEVICE@ ; +see +.BR groff (@MAN1EXT@) +for a more detailed description. . .TP .B \-U diff --git a/tmac/an-old.tmac b/tmac/an-old.tmac index 56d1b91b..5d199bed 100644 --- a/tmac/an-old.tmac +++ b/tmac/an-old.tmac @@ -136,7 +136,10 @@ . vs \\n[VS]u . ll \\n[LL]u . -. nr IN 7.2n +.\" We must select an integer indentation value for nroff; +.\" see comment in an-do-tag. +. ie t .nr IN 7.2n +. el .nr IN 7n . PD . nr SN 3n \" the indentation of sub-sub-headings relative to sub-headings . nr an-level 1 @@ -357,10 +360,13 @@ . in \\n[an-margin]u . ne (2v + 1u) . an-div -. br . in (\\n[an-margin]u + \\n[an-prevailing-indent]u) . \} . el \{\ +. \" In nroff mode, if the indentation value is not an integer multiple +. \" of the character cell, it is possible that the following combination +. \" of .in and .ti yields a different result as the .in request in +. \" the .ie part above. . in (\\n[an-margin]u + \\n[an-prevailing-indent]u) . ti -\\n[an-prevailing-indent]u . chop an-div @@ -377,7 +383,6 @@ . ie ((\\n[dl] + \\n[an-tag-sep]) > \\n[an-prevailing-indent]) \{\ . in \\n[an-margin]u . an-div -. br . in (\\n[an-margin]u + \\n[an-prevailing-indent]u + \\n[an-tag-sep]u) . \} . el \{\ @@ -508,7 +513,6 @@ .. . .de1 RS -. br . nr an-saved-margin\\n[an-level] \\n[an-margin] . nr an-saved-prevailing-indent\\n[an-level] \\n[an-prevailing-indent] . ie \\n[.$] .nr an-margin +(n;\\$1) @@ -519,7 +523,6 @@ .. . .de1 RE -. br . ie \\n[.$] .nr an-level ((;\\$1) <? \\n[an-level]) . el .nr an-level -1 . nr an-level (1 >? \\n[an-level]) |