From 2a49a3306d4c20e4805591a4f19af3e46efc8230 Mon Sep 17 00:00:00 2001 From: Steffen Nurpmeso Date: Mon, 22 Jun 2015 16:40:10 +0200 Subject: [PATCH] Sync-to-go: man.. This changeset touches quite some files that were already updated by other [sync.2015-05-20] changesets: this is because i renamed the l_roff_XY to l_roff-XY, and (dit)?roff.7.in to l_ditroff.7.in and l_roff-history.7.in, and updated all references accordingly. Practically in sync. For now we however miss requests like .class and .lsm, so that those must be subtracted from this statement. I did not take/integrate the Bernd Warken commit series that turned copyrights etc. into macros, nor his one which uses strings etc. for apostrophes etc. (i saw errors in that one, too). On the long run i want to convert most manuals into mdoc(7), and thus that is counterproductive. Another reason for the pretty large resulting diff(1) is that i already started to break up lines more nicely etc. The following is a partial list: - l_roff.7.in . [6054a4e] (groff.7: add documentation for the Unicode escapes \[u....] and \[u.....], 2014-08-05, Bernd Warken) i did differently. . I haven't taken the new sections on underlining etc. . I have taken the text of [e85eb55], (* man/groff.man: Document missing number registers (`$$', `.b', `.F', `.j', `.k', `.L', `.O', `.P', `.R', `opmaxx', `opmaxy', `opminx', `opminy')., 2009-02-10). - l_roff-diff.7.in . Taken [9af742c] (* man/groff_diff.man: Document \n[.P]., 2010-06-05). - l_roff-out.5.in . Took (some formatting parts of) [21eee56] (groff_out.man: Formatting, whitespace., 2014-03-27, Bjarni Ingi Gislason). - l_roff-tmac.5.in . Took (some formatting parts of) [03149c3] (groff_tmac.man: Formatting, whitespace., 2014-03-27, Bjarni Ingi Gislason). --- man/dev-dvi.1.in | 14 +-- man/dev-html.1.in | 8 +- man/dev-ps.1.in | 18 +-- man/dev-tty.1.in | 8 +- man/{ditroff.7.in => l_ditroff.7.in} | 16 ++- man/{l_roff_char.7.in => l_roff-char.7.in} | 10 +- man/{l_roff_diff.7.in => l_roff-diff.7.in} | 34 +++--- man/{l_roff_font.5.in => l_roff-font.5.in} | 14 +-- man/{roff.7.in => l_roff-history.7.in} | 177 +++-------------------------- man/{l_roff_out.5.in => l_roff-out.5.in} | 70 ++++-------- man/{l_roff_tmac.5.in => l_roff-tmac.5.in} | 87 +++++++------- man/l_roff.7.in | 108 +++++++++++++++--- man/pre-eqn.1.in | 2 +- man/pre-pic.1.in | 4 +- man/src-roff.1.in | 79 ++++++------- man/src-troff.1.in | 6 +- man/tmac-trace.7.in | 6 +- man/ute-addftinfo.1.in | 4 +- man/ute-afmtodit.1.in | 4 +- man/ute-tfmtodit.1.in | 2 +- 20 files changed, 297 insertions(+), 374 deletions(-) rename man/{ditroff.7.in => l_ditroff.7.in} (93%) rename man/{l_roff_char.7.in => l_roff-char.7.in} (99%) rename man/{l_roff_diff.7.in => l_roff-diff.7.in} (99%) rename man/{l_roff_font.5.in => l_roff-font.5.in} (97%) rename man/{roff.7.in => l_roff-history.7.in} (87%) rename man/{l_roff_out.5.in => l_roff-out.5.in} (97%) rename man/{l_roff_tmac.5.in => l_roff-tmac.5.in} (95%) diff --git a/man/dev-dvi.1.in b/man/dev-dvi.1.in index 0631be29..b4110f34 100644 --- a/man/dev-dvi.1.in +++ b/man/dev-dvi.1.in @@ -130,7 +130,7 @@ automatically, providing the macro. . Please check -.BR @L_ROFF@_tmac (@MAN5EXT@) +.BR @L_ROFF@-tmac (@MAN5EXT@) for a detailed description. . .LP @@ -233,7 +233,7 @@ commands in the file; it accepts the same arguments as the .B papersize command (see -.BR @L_ROFF@_font (@MAN5EXT@) +.BR @L_ROFF@-font (@MAN5EXT@) for details). . .TP @@ -389,7 +389,7 @@ directory in addition to the default ones. See .BR \%@L_TROFF@ (@MAN1EXT@) and -.BR \%@L_ROFF@_font (@MAN5EXT@) +.BR \%@L_ROFF@-font (@MAN5EXT@) for more details. . . @@ -437,10 +437,10 @@ and widths of rules be rounded. .BR @L_TFMTODIT@ (@MAN1EXT@), .BR @L_ROFF@ (@MAN1EXT@), .BR @L_TROFF@ (@MAN1EXT@), -.BR @L_ROFF@_out (@MAN5EXT@), -.BR @L_ROFF@_font (@MAN5EXT@), -.BR @L_ROFF@_tmac (@MAN5EXT@), -.BR @L_ROFF@_char (@MAN7EXT@) +.BR @L_ROFF@-out (@MAN5EXT@), +.BR @L_ROFF@-font (@MAN5EXT@), +.BR @L_ROFF@-tmac (@MAN5EXT@), +.BR @L_ROFF@-char (@MAN7EXT@) . .cp \n[devdvi_C] .\" s-ts-mode diff --git a/man/dev-html.1.in b/man/dev-html.1.in index 15e45834..da86aa26 100644 --- a/man/dev-html.1.in +++ b/man/dev-html.1.in @@ -323,7 +323,7 @@ directory in addition to the default ones. See .BR @L_TROFF@ (@MAN1EXT@) and -.BR \%@L_ROFF@_font (@MAN5EXT@) +.BR \%@L_ROFF@-font (@MAN5EXT@) for more details. . . @@ -331,8 +331,8 @@ for more details. .BR @L_AFMTODIT@ (@MAN1EXT@), .BR @L_ROFF@ (@MAN1EXT@), .BR @L_TROFF@ (@MAN1EXT@), -.BR @L_ROFF@_out (@MAN5EXT@), -.BR @L_ROFF@_font (@MAN5EXT@), -.BR @L_ROFF@_char (@MAN7EXT@) +.BR @L_ROFF@-out (@MAN5EXT@), +.BR @L_ROFF@-font (@MAN5EXT@), +.BR @L_ROFF@-char (@MAN7EXT@) . .\" s-ts-mode diff --git a/man/dev-ps.1.in b/man/dev-ps.1.in index 2af86514..1a699333 100644 --- a/man/dev-ps.1.in +++ b/man/dev-ps.1.in @@ -272,7 +272,7 @@ file; it accepts the same arguments as the command. . See -.B @L_ROFF@_font (@MAN5EXT@) +.B @L_ROFF@-font (@MAN5EXT@) for details. . .TP @@ -306,7 +306,7 @@ must be in the format output by .BR @L_TROFF@ (@MAN1EXT@). . This is described in -.BR @L_ROFF@_out (@MAN5EXT@). +.BR @L_ROFF@-out (@MAN5EXT@). . .LP In addition, the device and font description files for the device used @@ -321,7 +321,7 @@ device uses a resolution of 72000 and a sizescale of 1000. . .LP The device description file must contain a valid paper size; see -.BR @L_ROFF@_font (@MAN5EXT@) +.BR @L_ROFF@-font (@MAN5EXT@) for more information. . .LP @@ -977,7 +977,7 @@ request. . .IP See -.BR @L_ROFF@_tmac (@MAN5EXT@) +.BR @L_ROFF@-tmac (@MAN5EXT@) for a description of the .B PSPIC macro which provides a convenient high-level interface for inclusion of @@ -1294,7 +1294,7 @@ directory in addition to the default ones. See .BR @L_TROFF@ (@MAN1EXT@) and -.BR \%@L_ROFF@_font (@MAN5EXT@) +.BR \%@L_ROFF@-font (@MAN5EXT@) for more details. . . @@ -1344,10 +1344,10 @@ PostScript printers (e.g., `eth' or `thorn'). .BR @L_ROFF@ (@MAN1EXT@), .BR @L_TROFF@ (@MAN1EXT@), .BR \%@L_PFBTOPS@ (@MAN1EXT@), -.BR \%@L_ROFF@_out (@MAN5EXT@), -.BR \%@L_ROFF@_font (@MAN5EXT@), -.BR \%@L_ROFF@_char (@MAN7EXT@), -.BR \%@L_ROFF@_tmac (@MAN5EXT@) +.BR \%@L_ROFF@-out (@MAN5EXT@), +.BR \%@L_ROFF@-font (@MAN5EXT@), +.BR \%@L_ROFF@-char (@MAN7EXT@), +.BR \%@L_ROFF@-tmac (@MAN5EXT@) . .LP .UR http://\:partners.adobe.com/\:public/\:developer/\:en/\:ps/\:5001.DSC_Spec.pdf diff --git a/man/dev-tty.1.in b/man/dev-tty.1.in index 4833a731..a7524893 100644 --- a/man/dev-tty.1.in +++ b/man/dev-tty.1.in @@ -312,7 +312,7 @@ directory in addition to the default ones. See .BR @L_TROFF@ (@MAN1EXT@) and -.BR \%@L_ROFF@_font (@MAN5EXT@) +.BR \%@L_ROFF@-font (@MAN5EXT@) for more details. . . @@ -422,9 +422,9 @@ cell, affecting all subsequent operations. . .BR @L_ROFF@ (@MAN1EXT@), .BR @L_TROFF@ (@MAN1EXT@), -.BR @L_ROFF@_out (@MAN5EXT@), -.BR @L_ROFF@_font (@MAN5EXT@), -.BR @L_ROFF@_char (@MAN7EXT@), +.BR @L_ROFF@-out (@MAN5EXT@), +.BR @L_ROFF@-font (@MAN5EXT@), +.BR @L_ROFF@-char (@MAN7EXT@), .BR ul (1), .BR more (1), .BR man (1), diff --git a/man/ditroff.7.in b/man/l_ditroff.7.in similarity index 93% rename from man/ditroff.7.in rename to man/l_ditroff.7.in index aa152f58..0bbe8bca 100644 --- a/man/ditroff.7.in +++ b/man/l_ditroff.7.in @@ -1,5 +1,5 @@ .ig -@ ditroff.7 +@ @L_DITROFF@.7 Copyright (c) 2014 - 2015 Steffen (Daode) Nurpmeso . @@ -17,10 +17,10 @@ as part of the file COPYING; also located in the main directory of the source package of this program. .. . -.TH DITROFF @MAN7EXT@ "@MDATE@" "@T_ROFF@ v@VERSION@" +.TH @U_DITROFF@ @MAN7EXT@ "@MDATE@" "@T_ROFF@ v@VERSION@" . .SH NAME -ditroff \- classical device independent roff +@T_DITROFF@ \- classical device independent roff . . .\" @@ -34,7 +34,7 @@ once marked a development level of the text processing system. . In actual -.BR roff (@MAN7EXT@) +.BR @L_ROFF@-history (@MAN7EXT@) systems, the name .I troff is used as a synonym for @@ -63,9 +63,7 @@ today. In order to distinguish it from Ossanna's original mono-device version, it was called .I ditroff -(\c -.IR d\/ "evice " i\/ "ndependent " troff\/\c -) +.RI ( d "evice " i "ndependent " troff ) on some systems, though this naming isn't mentioned in the classical documentation. . @@ -125,7 +123,7 @@ Bell Labs CSTR\~#97 .UE . . .TP -.BR roff (@MAN7EXT@) +.BR @L_ROFF@-history (@MAN7EXT@) This document gives details on the history and concepts of roff. . .TP @@ -138,7 +136,7 @@ The actual implementation of The @L_ROFF@ program and pointers to all documentation around @T_ROFF@. . .TP -.BR @L_ROFF@_out (@MAN5EXT@) +.BR @L_ROFF@-out (@MAN5EXT@) The @T_ROFF@ version of the intermediate output language, the basis for multi-devicing. . diff --git a/man/l_roff_char.7.in b/man/l_roff-char.7.in similarity index 99% rename from man/l_roff_char.7.in rename to man/l_roff-char.7.in index 4913d53d..1727e4d6 100644 --- a/man/l_roff_char.7.in +++ b/man/l_roff-char.7.in @@ -1,9 +1,9 @@ '\" t -- preprocess: tbl(1) -.\"@ @L_ROFF@_char.7 +.\"@ @L_ROFF@-char.7 . -.TH @U_ROFF@_CHAR @MAN7EXT@ "@MDATE@" "@T_ROFF@ v@VERSION@" +.TH @U_ROFF@-CHAR @MAN7EXT@ "@MDATE@" "@T_ROFF@ v@VERSION@" .SH NAME -@L_ROFF@_char \- @T_ROFF@ glyph names +@L_ROFF@-char \- @T_ROFF@ glyph names . .de co Copyright (c) 2014 - 2015 Steffen (Daode) Nurpmeso . @@ -328,8 +328,8 @@ code set, being identical to the Unicode range . . .P -Input characters in range 128-159 (on non-EBCDIC hosts) are not printable -characters. +Input characters in range 128\-159 (on non-EBCDIC hosts) are not +printable characters. . . .TP diff --git a/man/l_roff_diff.7.in b/man/l_roff-diff.7.in similarity index 99% rename from man/l_roff_diff.7.in rename to man/l_roff-diff.7.in index 5304f046..ac90061d 100644 --- a/man/l_roff_diff.7.in +++ b/man/l_roff-diff.7.in @@ -1,6 +1,6 @@ '\" e -- preprocess: eqn(1) .ig -@ @L_ROFF@_diff.7 +@ @L_ROFF@-diff.7 Copyright (c) 2014 - 2015 Steffen (Daode) Nurpmeso . @@ -43,9 +43,9 @@ source package of this program. .\" Title .\" . -.TH @U_ROFF@_DIFF @MAN7EXT@ "@MDATE@" "@T_ROFF@ v@VERSION@" +.TH @U_ROFF@-DIFF @MAN7EXT@ "@MDATE@" "@T_ROFF@ v@VERSION@" .SH NAME -@L_ROFF@_diff \- differences between @T_ROFF@ and classical troff +@L_ROFF@-diff \- differences between @T_ROFF@ and classical troff . . .\" @@ -110,7 +110,7 @@ Example: `\[rs][A\~ho]' is capital letter A with ogonek which finally maps to glyph name `u0041_0328'. . See -.BR @L_ROFF@_char (@MAN7EXT@) +.BR @L_ROFF@-char (@MAN7EXT@) for a list of glyph name components used in composite glyph names and details of how a glyph name for a composite glyph is constructed. . @@ -365,7 +365,7 @@ This is the same as the request. . .B \[rs]F[] -switches back to the previous color (note that +switches back to the previous font (note that .B \[rs]FP won't work; it selects font family `P' instead). . @@ -704,12 +704,12 @@ correct if the following glyph is a roman glyph. . nop For example, if an italic\~f is immediately followed by a roman . nop right parenthesis, then in many fonts the top right portion of . nop the\~f overlaps the top left of the right parenthesis -. nop producing \f[I]f\f[R])\f[R], which is ugly. +. nop producing \f[I]f\f[R]), which is ugly. . nop Inserting . B \[rs]/ . nop produces -. ie \n(.g \f[I]f\/\f[R])\f[R] -. el \f[I]f\|\f[R])\f[R] +. ie \n(.g \f[I]f\/\f[R]) +. el \f[I]f\|\f[R]) . nop and avoids this problem. .\} It is a good idea to use this escape sequence whenever an italic @@ -744,7 +744,7 @@ request to be transparent for the purposes of end-of-sentence recognition. . .TP -.B \[rs]~ +.B \[rs]\[ti] This produces an unbreakable space that stretches like a normal inter-word space when a line is adjusted. . @@ -1594,6 +1594,9 @@ Use the request to map the encoding used in hyphenation patterns files to .BR roff 's input encoding. +By default, everything maps to itself except letters `A' to `Z' which +map to `a' to `z'. +. .IP The set of hyphenation patterns is associated with the current language set by the @@ -2761,6 +2764,11 @@ register. 1\~if no-space mode is active, 0\~otherwise. . .TP +.B \[rs]n[.P] +1\~if the current page is in the output list set with +.BR \-o . +. +.TP .B \[rs]n[.pe] 1\~during a page ejection caused by the .B bp @@ -3087,7 +3095,7 @@ In a long escape name .B ] is not recognized as a closing delimiter except when it occurs at the same input level as the opening\~\c -.BR ] . +.BR [ . . In compatibility mode, no attention is paid to the input-level. . @@ -3152,7 +3160,7 @@ Font translation is applied. The .B tr request can now map characters onto -.BR \[rs]~ . +.BR \[rs]\[ti] . . .P The space width emitted by the @@ -3427,7 +3435,7 @@ is not one of .BR l , .BR a , or\~\c -.BR ~ , +.BR \[ti] , Unix troff treats each of the $x sub i$ as a horizontal quantity, and each of the $y sub i$ as a vertical quantity and assumes that the width of the drawn object is $sum from i=1 to n x sub i$, @@ -3818,7 +3826,7 @@ language, including a short, but complete reference of all predefined requests, registers and escapes. . .TP -.BR roff (@MAN7EXT@) +.BR @L_ROFF@-history (@MAN7EXT@) A survey of .I roff systems, including pointers to further historical documentation. diff --git a/man/l_roff_font.5.in b/man/l_roff-font.5.in similarity index 97% rename from man/l_roff_font.5.in rename to man/l_roff-font.5.in index 5d6edb4c..035cf905 100644 --- a/man/l_roff_font.5.in +++ b/man/l_roff-font.5.in @@ -1,5 +1,5 @@ .ig -@ @L_ROFF@_font.5 +@ @L_ROFF@-font.5 Copyright (c) 2014 - 2015 Steffen (Daode) Nurpmeso . @@ -34,11 +34,11 @@ the original English. .. . . -.TH @U_ROFF@_FONT @MAN5EXT@ "@MDATE@" "@T_ROFF@ v@VERSION@" +.TH @U_ROFF@-FONT @MAN5EXT@ "@MDATE@" "@T_ROFF@ v@VERSION@" . . .SH NAME -@L_ROFF@_font \- format of @T_ROFF@ device and font description files +@L_ROFF@-font \- format of @T_ROFF@ device and font description files . . .SH DESCRIPTION @@ -662,13 +662,13 @@ Most entries in kernpairs section have a negative value for\~\c . .SH FILES . -.Tp \w'@FONTDIR@/devname/DESC'u+3n -.BI @FONTDIR@/dev name /DESC +.Tp \w'@FONTDIR@/dev-name/DESC'u+3n +.B @FONTDIR@/dev-name/DESC Device description file for device .IR name . . .TP -.BI @FONTDIR@/dev name / F +.B @FONTDIR@/dev-name/F Font file for font\~\c .I F of device @@ -677,7 +677,7 @@ of device . .SH "SEE ALSO" . -.BR @L_ROFF@_out (@MAN5EXT@), +.BR @L_ROFF@-out (@MAN5EXT@), .BR @L_TROFF@ (@MAN1EXT@). . .cp \n[roff_font_C] diff --git a/man/roff.7.in b/man/l_roff-history.7.in similarity index 87% rename from man/roff.7.in rename to man/l_roff-history.7.in index 255f4402..5b92f96b 100644 --- a/man/roff.7.in +++ b/man/l_roff-history.7.in @@ -1,6 +1,6 @@ '\" t -- preprocess: tbl(1) .ig -@ roff.7 +@ @L_ROFF@-history.7 Copyright (c) 2014 - 2015 Steffen (Daode) Nurpmeso . @@ -43,9 +43,9 @@ source package of this program. .\" Title .\" . -.TH ROFF @MAN7EXT@ "@MDATE@" "@T_ROFF@ v@VERSION@" +.TH @U_ROFF@-HISTORY @MAN7EXT@ "@MDATE@" "@T_ROFF@ v@VERSION@" .SH NAME -roff \- concepts and history of roff typesetting +@T_ROFF@-history \- concepts and history of roff typesetting . . .\" @@ -358,6 +358,14 @@ It is the first system that is available on almost all operating systems \[en] and it is free. . +.P +An alternative is the +.UR https://\:github.com/\:n-t-roff/\:heirloom-doctools +.UE +project, started in 2005, which provides enhanced versions of the various +roff tools found in the OpenSolaris and Plan\~9 operating systems, now +available under free licenses. +. . .\" .SH "USING ROFF" @@ -548,7 +556,7 @@ or This language was first specified in .IR "[CSTR\~#97]" ; its @T_ROFF@ extension is documented in -.BR @L_ROFF@_out (@MAN5EXT@). +.BR @L_ROFF@-out (@MAN5EXT@). . The intermediate output language is a kind of assembly language compared to the high-level @@ -682,7 +690,7 @@ positions. . Details on the naming of macro packages and their placement is found in -.BR @L_ROFF@_tmac (@MAN5EXT@). +.BR @L_ROFF@-tmac (@MAN5EXT@). . .P A macro package that is to be used in a document can be announced to @@ -854,154 +862,7 @@ where is either a system supplied command or a shell script of your own. . . -.\" -.SH "EDITING ROFF" -.\" -. -The best program for editing a -.I roff -document is Emacs (or Xemacs), see -.BR emacs (1). -. -It provides an -.I nroff -mode that is suitable for all kinds of -.I roff -dialects. -. -This mode can be activated by the following methods. -. -.P -When editing a file within Emacs the mode can be changed by typing -.RI ` "M-x nroff-mode" ', -where -.B M-x -means to hold down the -.B Meta -key (or -.BR Alt ) -and hitting the -.BR x\~ key -at the same time. -. -.P -But it is also possible to have the mode automatically selected when -the file is loaded into the editor. -. -.IP \(bu -The most general method is to include the following 3 comment lines at -the end of the file. -. -.RS -.IP -.EX -\&.\[rs]" Local Variables: -\&.\[rs]" mode: nroff -\&.\[rs]" End: -.EE -.RE -. -.IP \(bu -There is a set of file name extensions, e.g.\& the man pages that -trigger the automatic activation of the -.I nroff -mode. -. -.IP \(bu -Theoretically, it is possible to write the sequence -. -.RS -.IP -.EX -\&.\[rs]" \%-*-\ nroff\ -*- -.EE -.RE -. -.IP -as the first line of a file to have it started in -.I nroff -mode when loaded. -. -Unfortunately, some applications such as the -.B man -program are confused by this; so this is deprecated. -. -.P -All -.I roff -formatters provide automated line breaks and horizontal and vertical -spacing. -. -In order to not disturb this, the following tips can be helpful. -. -.IP \(bu -Never include empty or blank lines in a -.I roff -document. -. -Instead, use the empty request (a line consisting of a dot only) or a -line comment -.B .\[rs]" -if a structuring element is needed. -. -.IP \(bu -Never start a line with whitespace because this can lead to -unexpected behavior. -. -Indented paragraphs can be constructed in a controlled way by -.I roff -requests. -. -.IP \(bu -Start each sentence on a line of its own, for the spacing after a dot -is handled differently depending on whether it terminates an -abbreviation or a sentence. -. -To distinguish both cases, do a line break after each sentence. -. -.IP \(bu -To additionally use the auto-fill mode in Emacs, it is best to insert -an empty -.I roff -request (a line consisting of a dot only) after each sentence. -. -.P -The following example shows how optimal -.I roff -editing could look. -. -.RS -.P -.EX -This is an example for a -\&.I roff -document. -\&. -This is the next sentence in the same paragraph. -\&. -This is a longer sentence stretching over several -lines; abbreviations like `cf.' are easily -identified because the dot is not followed by a -line break. -\&. -In the output, this will still go to the same -paragraph. -.EE -.RE -. -.P -Besides Emacs, some other editors provide -.I nroff -style files too, e.g.\& -.BR vim (1), -an extension of the -.BR vi (1) -program. -. -. -.\" .SH "SEE ALSO" -.\" . There is a lot of documentation on .IR roff . @@ -1112,7 +973,7 @@ language are . .TP [CSTR\~#54] -J. F. Ossanna, +J.\& F.\& Ossanna, .UR http://\:cm.bell-labs.com/\:cm/\:cs/\:cstr/\:54.ps.gz .I "Nroff/\:Troff User's Manual" .UE ; @@ -1121,7 +982,7 @@ Bell Labs, 1976; revised by Brian Kernighan, 1992. . .TP [CSTR\~#97] -Brian Kernighan, +Brian W.\& Kernighan, .UR http://\:cm.bell-labs.com/\:cm/\:cs/\:cstr/\:97.ps.gz .I "A Typesetter-independent TROFF" .UE , @@ -1135,7 +996,7 @@ papers are . .TP [CSTR\~#114] -Jon L. Bentley and Brian W. Kernighan, +J\. L.\& Bentley and Brian W.\& Kernighan, .UR http://\:cm.bell-labs.com/\:cm/\:cs/\:cstr/\:114.ps.gz .I "GRAP \[en] A Language for Typesetting Graphs" .UE ; @@ -1144,7 +1005,7 @@ Bell Labs, August 1984. . .TP [CSTR\~#116] -Brian W. Kernighan, +Brian W.\& Kernighan, .UR http://\:cm.bell-labs.com/\:cm/\:cs/\:cstr/\:116.ps.gz .I "PIC \[en] A Graphics Language for Typesetting" .UE ; @@ -1153,7 +1014,7 @@ Bell Labs, December 1984. . .TP [CSTR\~#122] -J. L. Bentley, L. W. Jelinski, and B. W. Kernighan, +J.\& L.\& Bentley, L.\& W.\& Jelinski, and B.\& W.\& Kernighan, .UR http://\:cm.bell-labs.com/\:cm/\:cs/\:cstr/\:122.ps.gz .I "CHEM \[en] A Program for Typesetting Chemical Structure Diagrams," .I "Computers and Chemistry" @@ -1162,9 +1023,7 @@ J. L. Bentley, L. W. Jelinski, and B. W. Kernighan, Bell Labs, April 1986. . . -.\" .SS "Manual Pages" -.\" . Due to its complex structure, a full .I roff diff --git a/man/l_roff_out.5.in b/man/l_roff-out.5.in similarity index 97% rename from man/l_roff_out.5.in rename to man/l_roff-out.5.in index cf4c0a9e..7977fb43 100644 --- a/man/l_roff_out.5.in +++ b/man/l_roff-out.5.in @@ -1,6 +1,6 @@ '\" e -- preprocess: eqn(1) .ig -@ @L_ROFF@_out.5 +@ @L_ROFF@-out.5 Copyright (c) 2014 - 2015 Steffen (Daode) Nurpmeso . @@ -45,7 +45,7 @@ after these commands, otherwise the position is not changed. .RI ( \,\\$1\/ ,\ \,\\$2\/ )\\$3 .. .de indexed_offset -.offset \fI\\$1\fP\d\s-3\\$2\s+3\u \fI\\$3\fP\d\s-3\\$4\s+3\u \\$5 +.offset \fI\\$1\/\fP\d\s-3\\$2\s+3\u\x'\n[.v]/4' \fI\\$3\/\fP\d\s-3\\$4\s+3\u\x'\n[.v]/4' \\$5\x'\n[.v]/4' .. .\" format: .command "" .de command @@ -59,9 +59,9 @@ after these commands, otherwise the position is not changed. .\" We set these as troff micromotions rather than eqn because \d and \u .\" can be lifted to XML subscript/superscript tags. Don't change .\" these to a parameterized string, man2html won't handle that. -.ds hv1 \fIh\d\s-3\&1\s+3\u\~v\d\s-3\&1\s+3\u\fP -.ds hv2 \fIh\d\s-3\&2\s+3\u\~v\d\s-3\&2\s+3\u\fP -.ds hvn \fIh\d\s-3\&n\s+3\u\~v\d\s-3\&n\s+3\u\fP +.ds hv1 \fIh\d\s-3\&1\s+3\u\~v\d\s-3\&1\s+3\u\fP\x'\n[.v]/4' +.ds hv2 \fIh\d\s-3\&2\s+3\u\~v\d\s-3\&2\s+3\u\fP\x'\n[.v]/4' +.ds hvn \fIh\d\s-3\&n\s+3\u\~v\d\s-3\&n\s+3\u\fP\x'\n[.v]/4' . .de Da-command \fBDa\fP\ \*[hv1] \*[hv2]\|\*[@linebreak] @@ -82,19 +82,13 @@ after these commands, otherwise the position is not changed. .\" End of macro definitions . . -.\" -.\" Title -.\" -. -.TH @U_ROFF@_OUT @MAN5EXT@ "@MDATE@" "@T_ROFF@ v@VERSION@" +.TH @U_ROFF@-OUT @MAN5EXT@ "@MDATE@" "@T_ROFF@ v@VERSION@" . .SH NAME -@L_ROFF@_out \- @T_ROFF@ intermediate output format +@L_ROFF@-out \- @T_ROFF@ intermediate output format . . -.\" .SH DESCRIPTION -.\" . This manual page describes the .I intermediate output @@ -113,7 +107,7 @@ Because of this it is called intermediate. The .B @L_ROFF@ program provides the option -.B -Z +.B \-Z to inhibit postprocessing, such that the produced .I intermediate output is sent to standard output just like calling @@ -167,9 +161,7 @@ produced by output was hard to understand because of strange habits. . . -.\" .SH "LANGUAGE CONCEPTS" -.\" . During the run of .BR @L_TROFF@ , @@ -194,9 +186,7 @@ There are commands for positioning and text writing, for drawing, and for device controlling. . . -.\" .SS "Separation" -.\" . .I Classical troff output had strange requirements on whitespace. @@ -314,7 +304,7 @@ Note that these scale indicators are relative to the chosen device. They are defined by the parameters specified in the device's .I DESC file; see -.BR @L_ROFF@_font (@MAN5EXT@). +.BR @L_ROFF@-font (@MAN5EXT@). . . .P @@ -412,9 +402,7 @@ is done relative to the current page, all other positioning is done relative to the current location within this page. . . -.\" .SH "COMMAND REFERENCE" -.\" . This section describes all .I intermediate output @@ -423,9 +411,7 @@ commands, the classical commands as well as the extensions. . . -.\" .SS "Comment Command" -.\" . .TP .BI # anything \[la]end-of-line\[ra] @@ -725,7 +711,7 @@ extension; it is only used for devices whose file contains the .B tcommand keyword; see -.BR @L_ROFF@_font (@MAN5EXT@). +.BR @L_ROFF@-font (@MAN5EXT@). . . .TP @@ -748,7 +734,7 @@ extension; it is only used for devices whose file contains the .B tcommand keyword; see -.BR @L_ROFF@_font (@MAN5EXT@). +.BR @L_ROFF@-font (@MAN5EXT@). . . .TP @@ -867,7 +853,7 @@ as defined in section . . .TP -.D-multiarg ~ +.D-multiarg \[ti] Draw B-spline from current position to offset .indexed_offset h 1 v 1 , then to offset @@ -1012,7 +998,7 @@ having the 3\~color components red, green, and blue. .D-command f n The argument .I n -must be an integer in the range -32767 to 32767. +must be an integer in the range \-32767 to 32767. . .RS .TP @@ -1215,7 +1201,7 @@ Mount font position\~\c .I s (a text word), cf. -.BR @L_ROFF@_font (@MAN5EXT@). +.BR @L_ROFF@-font (@MAN5EXT@). . . .TP @@ -1420,9 +1406,7 @@ and\~\c provide a better functionality. . . -.\" .SH "POSTPROCESSING" -.\" . The .I roff @@ -1449,9 +1433,7 @@ For details, see the reference in section .BR FILES . . . -.\" .SH "EXAMPLES" -.\" . This section presents the .I intermediate output @@ -1472,7 +1454,7 @@ High-resolution device .RS .P .EX -\fBshell>\fP echo "hell world" | @L_ROFF@ -Z -T ps +\fBshell>\fP echo "hell world" | @L_ROFF@ \-Z \-T ps .EE . . @@ -1526,7 +1508,7 @@ formatter. . .P .EX -\fBshell>\fP "hell world" | @L_ROFF@ -Z -T latin1 +\fBshell>\fP "hell world" | @L_ROFF@ \-Z \-T latin1 .EE . . @@ -1583,9 +1565,7 @@ Due to the obsolete jump-and-write command, the text clusters in the classical output are almost unreadable. . . -.\" .SH "COMPATIBILITY" -.\" . The .I intermediate output @@ -1629,7 +1609,7 @@ modern . .IP \[bu] 2m The B-spline command -.B D~ +.B D\[ti] is correctly handled by the .I intermediate output parser, but the drawing routines aren't implemented in some of the @@ -1707,12 +1687,10 @@ The differences between and .I classical troff are documented in -.BR @L_ROFF@_diff (@MAN7EXT@). +.BR @L_ROFF@-diff (@MAN7EXT@). . . -.\" .SH "FILES" -.\" . .TP .BI @FONTDIR@/dev name /DESC @@ -1734,9 +1712,7 @@ This parser is the definitive specification of the format. . . -.\" .SH "SEE ALSO" -.\" . A reference like .BR @L_ROFF@ (@MAN7EXT@) @@ -1765,7 +1741,7 @@ For more details, see .TP .BR @L_ROFF@ (@MAN1EXT@) option -.B -Z +.B \-Z and further readings. . . @@ -1775,7 +1751,7 @@ for details of the language such as numerical units and escape sequences. . . .TP -.BR @L_ROFF@_font (@MAN5EXT@) +.BR @L_ROFF@-font (@MAN5EXT@) for details on the device scaling parameters of the .B DESC file. @@ -1787,12 +1763,12 @@ generates the device-independent intermediate output. . . .TP -.BR roff (@MAN7EXT@) +.BR @L_ROFF@-history (@MAN7EXT@) for historical aspects and the general structure of roff systems. . . .TP -.BR @L_ROFF@_diff (@MAN7EXT@) +.BR @L_ROFF@-diff (@MAN7EXT@) The differences between the intermediate output in groff and classical troff. . @@ -1844,9 +1820,7 @@ CSTR\~#54 .UE . . . -.\" .SH "AUTHORS" -.\" . Copyright (c) 2014 - 2015 Steffen (Daode) Nurpmeso . diff --git a/man/l_roff_tmac.5.in b/man/l_roff-tmac.5.in similarity index 95% rename from man/l_roff_tmac.5.in rename to man/l_roff-tmac.5.in index 3695f244..dc8c7180 100644 --- a/man/l_roff_tmac.5.in +++ b/man/l_roff-tmac.5.in @@ -1,5 +1,5 @@ .ig -@ @L_ROFF@_tmac.5 +@ @L_ROFF@-tmac.5 Copyright (c) 2014 - 2015 Steffen (Daode) Nurpmeso . @@ -20,9 +20,9 @@ source package of this program. .. .ds Ellipsis \&.\|.\|.\&\" . -.TH @U_ROFF@_TMAC @MAN5EXT@ "@MDATE@" "@T_ROFF@ v@VERSION@" +.TH @U_ROFF@-TMAC @MAN5EXT@ "@MDATE@" "@T_ROFF@ v@VERSION@" .SH NAME -@L_ROFF@_tmac \- macro files in the roff typesetting system +@L_ROFF@-tmac \- macro files in the roff typesetting system . . .\" @@ -30,7 +30,7 @@ source package of this program. .\" . The -.BR roff (@MAN7EXT@) +.BR @L_ROFF@ (@MAN7EXT@) type-setting system provides a set of macro packages suitable for special kinds of documents. . @@ -96,7 +96,7 @@ file. .B man This is the classical macro package for UNIX manual pages (man\~pages); it is quite handy and easy to use; see -.BR @L_ROFF@_man (@MAN7EXT@). +.BR @L_ROFF@-man (@MAN7EXT@). . . .TP @@ -106,7 +106,7 @@ This is the classical macro package for UNIX manual pages An alternative macro package for man\~pages mainly used in BSD systems; it provides many new features, but it is not the standard for man\~pages; see -.BR @L_ROFF@_mdoc (@MAN7EXT@). +.BR @L_ROFF@-mdoc (@MAN7EXT@). . . .TP @@ -137,7 +137,7 @@ to use. The classical .I me macro package; see -.BR @L_ROFF@_me (@MAN7EXT@). +.BR @L_ROFF@-me (@MAN7EXT@). . . .TP @@ -145,7 +145,7 @@ macro package; see The semi-classical .I mm macro package; see -.BR @L_ROFF@_mm (@MAN7EXT@). +.BR @L_ROFF@-mm (@MAN7EXT@). . . .TP @@ -153,7 +153,7 @@ macro package; see The classical .I ms macro package; see -.BR @L_ROFF@_ms (@MAN7EXT@). +.BR @L_ROFF@-ms (@MAN7EXT@). . . .\" @@ -197,7 +197,7 @@ Example: .RS .IP .EX -\fIsh#\fP @L_ROFF@ -ms -mfr foo.ms > foo.ps +\fIsh#\fP @L_ROFF@ \-ms \-mfr foo.ms > foo.ps .EE .RE . @@ -213,7 +213,7 @@ ligature. Swedish localization support, including the me, mom, and ms macro packages. . Note that Swedish for the mm macros is handled separately; see -.BR @L_ROFF@_mmse (@MAN7EXT@). +.BR @L_ROFF@-mmse (@MAN7EXT@). . It should be used as the last macro package on the command line. . @@ -261,7 +261,7 @@ For example, saying . .P .EX -@L_ROFF@ -Tlatin1 -mlatin9 ... +@L_ROFF@ \-Tlatin1 \-mlatin9 ... .EE . .P @@ -285,9 +285,9 @@ macro package or to plain @L_ROFF@. . . .TP -.B 60bit -Provide some macros for addition, multiplication, and division of 60bit -integers (allowing safe multiplication of 30bit integers, for example). +.B 62bit +Provide some macros for addition, multiplication, and division of 62bit +integers (allowing safe multiplication of 31bit integers, for example). . . .TP @@ -313,7 +313,7 @@ Possible values for are the same as the predefined .B papersize values in the DESC file (only lowercase; see -.BR @L_ROFF@_font (@MAN5EXT@) +.BR @L_ROFF@-font (@MAN5EXT@) for more) except .BR a7 - d7 . . @@ -388,7 +388,7 @@ Syntax: |\|\fB\-R\fP\|\ |\|\fB\-C\fP\|\ |\|\fB\-I\fP\ \fIn\fP] \ -\fI\|file\fP [\fIwidth\fP [\fIheight\fP]] +\fI\|file\fP [\fIwidth\fP [,\fIheight\fP]] .RE . .IP @@ -454,7 +454,7 @@ covers the image's width. \&.am PSPIC \&.\ \ vpt 0 \&\[rs]h'(\[rs]\[rs]n[ps-offset]u + \[rs]\[rs]n[ps-deswid]u)' -\&.\ \ sp -1 +\&.\ \ sp \-1 \&.\ \ vpt 1 \&.. .EE @@ -480,7 +480,7 @@ Use this for tracing macro calls. It is only useful for debugging. . See -.BR @L_ROFF@_trace (@MAN7EXT@) . +.BR @L_ROFF@-trace (@MAN7EXT@) . . . .TP @@ -497,7 +497,7 @@ normal TTY formatting to allow processing with critical equipment. Additions of elements known from the HTML format, as used in the internet (World Wide Web) pages; this includes URL links and mail addresses; see -.BR @L_ROFF@_www (@MAN7EXT@). +.BR @L_ROFF@-www (@MAN7EXT@). . . .\" @@ -696,8 +696,11 @@ is used or In both cases, the formatter should be called with option .B \-s to invoke -.BR @L_P_SOELIM@ . -. +.BR @L_P_SOELIM@ : +.IP +.EX +\fIsh#\fP groff \-s docu.roff +.EE . .P If you want to write your own @T_ROFF@ macro file, call it @@ -736,9 +739,7 @@ preprocessors are recognized, `e' (for .BR eqn ), -.\" `G', -.\" `g', -`p` +`p' (for .BR pic ), `R' @@ -752,7 +753,7 @@ and (for .BR tbl ). (see -.BR roff (@MAN7EXT@)). +.BR @L_ROFF@-history (@MAN7EXT@)). . . .P @@ -768,7 +769,7 @@ The program handles some preprocessors automatically, such that in man\~pages only the following characters should be used: `e', `p', and `t'. -. +.. . . .\" @@ -776,13 +777,13 @@ man\~pages only the following characters should be used: .\" . A -.BR roff (@MAN7EXT@) +.BR @L_ROFF@ (@MAN7EXT@) document is a text file that is enriched by predefined formatting constructs, such as requests, escape sequences, strings, numeric registers, and macros from a macro package. . These elements are described in -.BR roff (@MAN7EXT@). +.BR @L_ROFF@ (@MAN7EXT@). . . .P @@ -886,28 +887,28 @@ Let's analyze each backslash in the macro definition. As the positional parameters and the number of arguments change with each call of the macro their leading backslash must be doubled, which results in -.I \[rs]\[rs]$* +.RI \[rs]\[rs] $* and -.IR \[rs]\[rs][.$] . +.RI \[rs]\[rs] [.$] . The same applies to the macro name because it could be called with an alias name, so -.IR \[rs]\[rs]$0 . +.RI \[rs]\[rs] $0 . . . .P On the other hand, .I midpart is a constant string, it does not change, so no doubling for -.IR \[rs]*[midpart] . +.RI \[rs] *[midpart] . The -.I \[rs]f +.RI \[rs] f escape sequences are predefined elements for setting the font within the text. . Of course, this behavior does not change, so no doubling with -.I \[rs]f[I] +.RI \[rs] f[I] and -.IR \[rs]f[] . +.RI \[rs] f[] . . . .\" @@ -1183,19 +1184,19 @@ an overview of the @T_ROFF@ system. . . .TP -.BR @L_ROFF@_man (@MAN7EXT@), +.BR @L_ROFF@-man (@MAN7EXT@), .TQ -.BR @L_ROFF@_mdoc (@MAN7EXT@), +.BR @L_ROFF@-mdoc (@MAN7EXT@), .TQ -.BR @L_ROFF@_me (@MAN7EXT@), +.BR @L_ROFF@-me (@MAN7EXT@), .TQ -.BR @L_ROFF@_mm (@MAN7EXT@), +.BR @L_ROFF@-mm (@MAN7EXT@), .TQ -.BR @L_ROFF@_ms (@MAN7EXT@), +.BR @L_ROFF@-ms (@MAN7EXT@), .TQ -.BR @L_ROFF@_trace (@MAN7EXT@), +.BR @L_ROFF@-trace (@MAN7EXT@), .TQ -.BR @L_ROFF@_www (@MAN7EXT@). +.BR @L_ROFF@-www (@MAN7EXT@). the @T_ROFF@ tmac macro packages. . . diff --git a/man/l_roff.7.in b/man/l_roff.7.in index 709cfa57..85decd8a 100644 --- a/man/l_roff.7.in +++ b/man/l_roff.7.in @@ -237,7 +237,7 @@ source package of this program. is a free implementation of the roff type-setting system. . See -.BR roff (@MAN7EXT@) +.BR @L_ROFF@-history (@MAN7EXT@) for a survey and the background of the @T_ROFF@ system. . .P @@ -357,7 +357,7 @@ This does not produce the most efficient code, but it should work as a first measure. . Predefined macro packages may give a better user experience: see -.BR @L_ROFF@_tmac (@MAN5EXT@). +.BR @L_ROFF@-tmac (@MAN5EXT@). . .P Reading roff source files is easier, just reduce all double backslashes @@ -955,7 +955,7 @@ Some requests have optional arguments with a different behaviour. Not all of these details are outlined here. . Refer to -.BR @L_ROFF@_diff (@MAN7EXT@) +.BR @L_ROFF@-diff (@MAN7EXT@) for all details. . .P @@ -1154,7 +1154,7 @@ Print a backtrace of the input on stderr. Embolden .I font by -.IR N -1 +.IR N \-1 units. . .TPx @@ -1860,7 +1860,7 @@ Change to the previous value of additional intra-line skip. Set additional intra-line skip value to .IR N , i.e., -.IR N -1 +.IR N \-1 blank lines are inserted after each text output line. . .TPx @@ -2502,7 +2502,7 @@ to the stream named Besides these standard roff requests, there might be further macro calls. They can originate from a macro package (see -.BR roff (@MAN7EXT@) +.BR @L_ROFF@-history (@MAN7EXT@) for an overview) or from a preprocessor. . .P @@ -3273,7 +3273,7 @@ available in the special font. . Below you can find a selection of the most important glyphs; a complete list can be found in -.BR @L_ROFF@_char (@MAN7EXT@). +.BR @L_ROFF@-char (@MAN7EXT@). .RS .P .PD 0 @@ -3342,9 +3342,32 @@ Plus-minus sign .RE . . -.\" +.SS "Unicode Characters" +. +Via the special escape +.BI \e[u HEX ] +it is possible to include Unicode codepoints and even complete graphem +clusters into a document. +Here +.B u +denotes the escape and +.B HEX +is the hexadecimal Unicode codepoint to include; to specify a graphem +cluster specify multiple codepoints separated by underscores, as in +.BI \e[u HEX1 _ HEX2 _ HEX3 ]\c +; +e.g., +.B \e[u0041_0301] +is +.IR "A acute" , +.BR \['A] . +. +.P +The availability of Unicode characters depends on the used output device +and the used font. +. +. .SS "Strings" -.\" . Strings are defined by the .request ds @@ -3417,6 +3440,11 @@ results from request calls. .PD 0 . .TPx +.REG $$ +The process ID of +.BR troff . +. +.TPx .REG .$ Number of arguments in the current macro or string. . @@ -3435,6 +3463,12 @@ is used; always\~1 in .BR nroff . . .TPx +.REG .b +The emboldening offset while +.request .bd +is active. +. +.TPx .REG .br Within a macro, set to\~1 if macro called with the `normal' control character, and to\~0 otherwise. @@ -3490,6 +3524,10 @@ The name or number of the current environment (string-valued). Current font number. . .TPx +.REG .F +The name of the current input file (string-valued). +. +.TPx .REG .fam The current font family (string-valued). . @@ -3569,6 +3607,16 @@ Positive if last output line contains .esc c . . .TPx +.REG .j +The current adjustment mode. +It can be stored and used to set adjustment. +(n=1, b=1, l=0, r=5, c=3). +. +.TPx +.REG .k +The current horizontal output position (relative to the current indentation). +. +.TPx .REG .kern 1\~if pairwise kerning is enabled, 0\~otherwise. . @@ -3577,6 +3625,11 @@ Positive if last output line contains Current line length. . .TPx +.REG .L +The current line spacing setting as set by +.request .ls . +. +.TPx .REG .lg The current ligature mode (as set by the .request lg @@ -3628,10 +3681,21 @@ Useful in conjunction with Current page offset. . .TPx +.REG .O +The suppression nesting level (see +.esc O ). +. +.TPx .REG .p Current page length. . .TPx +.REG .P +1\~if the current page is being printed, 0\~otherwise (as determined by the +.option \-o +command line option). +. +.TPx .REG .pe 1\~during page ejection, 0\~otherwise. . @@ -3834,6 +3898,7 @@ image (set by .REG ln Output line number. . + .TPx .REG minutes The number of minutes after the hour. @@ -3849,6 +3914,21 @@ Current month (1-12). Vertical position of last printed text base-line. . .TPx +.REG opmaxx +.TPx +.REG opmaxy +.TPx +.REG opminx +.TPx +.REG opminy +These four registers mark the top left and bottom right hand corners of a box +which encompasses all written glyphs. +They are reset to \-1 by +.escarg O 0 +or +.escarg O 1 . +. +.TPx .REG rsb Like .register sb , @@ -3939,7 +4019,7 @@ The differences of the @T_ROFF@ language in comparison to classical troff as defined by .I [CSTR\~#54] are documented in -.BR @L_ROFF@_diff (@MAN7EXT@). +.BR @L_ROFF@-diff (@MAN7EXT@). . .P The @T_ROFF@ system provides a compatibility mode, see @@ -3992,22 +4072,22 @@ the usage of the @L_ROFF@ program and pointers to the documentation and availability of the @T_ROFF@ system. . .TP -.BR @L_ROFF@_diff (@MAN7EXT@) +.BR @L_ROFF@-diff (@MAN7EXT@) the differences of the @T_ROFF@ language as compared to classical roff. . This is the authoritative document for the predefined language elements that are specific to @T_ROFF@. . .TP -.BR @L_ROFF@_char (@MAN7EXT@) +.BR @L_ROFF@-char (@MAN7EXT@) the predefined @T_ROFF@ special characters (glyphs). . .TP -.BR @L_ROFF@_font (@MAN5EXT@) +.BR @L_ROFF@-font (@MAN5EXT@) the specification of fonts and the DESC file. . .TP -.BR roff (@MAN7EXT@) +.BR @L_ROFF@-history (@MAN7EXT@) the history of roff, the common parts shared by all roff systems, and pointers to further documentation. . diff --git a/man/pre-eqn.1.in b/man/pre-eqn.1.in index 65d4292e..7e06f743 100644 --- a/man/pre-eqn.1.in +++ b/man/pre-eqn.1.in @@ -1256,7 +1256,7 @@ This is allowed by the specification, but inefficient. .BR @L_ROFF@ (@MAN1EXT@), .BR @L_TROFF@ (@MAN1EXT@), .BR @L_P_PIC@ (@MAN1EXT@), -.BR @L_ROFF@_font (@MAN5EXT@), +.BR @L_ROFF@-font (@MAN5EXT@), .I The\ \*(txbook . .cp \n[__compat] diff --git a/man/pre-pic.1.in b/man/pre-pic.1.in index 8df5e3a4..fa2b16c2 100644 --- a/man/pre-pic.1.in +++ b/man/pre-pic.1.in @@ -144,7 +144,7 @@ Don't use the @L_ROFF@ extensions to the troff drawing commands. You should use this if you are using a postprocessor that doesn't support these extensions. The extensions are described in -.BR @L_ROFF@_out (@MAN5EXT@). +.BR @L_ROFF@-out (@MAN5EXT@). The .B \-n option also causes @@ -1071,7 +1071,7 @@ macros. .SH "SEE ALSO" . .BR @L_TROFF@ (@MAN1EXT@), -.BR @L_ROFF@_out (@MAN5EXT@), +.BR @L_ROFF@-out (@MAN5EXT@), .BR tex (1), .BR gs (1), .BR ps2eps (1), diff --git a/man/src-roff.1.in b/man/src-roff.1.in index 850a84e2..21b69c04 100644 --- a/man/src-roff.1.in +++ b/man/src-roff.1.in @@ -84,7 +84,7 @@ This document describes the program, the main front-end for the .I @T_ROFF@ document formatting system, which is a -.BR roff (@MAN7EXT@) +.BR @L_ROFF@ (@MAN7EXT@) implementation that has all features of the classical .IR roff , but also adds extensions. @@ -195,7 +195,7 @@ Send the output to a spooler program for printing. The command that should be used for this is specified by the .B print command in the device description file, see -.BR \%@L_ROFF@_font (@MAN5EXT@). +.BR \%@L_ROFF@-font (@MAN5EXT@). If this command is not present, the output is piped into the .BR lpr (1) program by default. @@ -306,7 +306,7 @@ generates the .I intermediate .IR output ; see -.BR \%@L_ROFF@_out (@MAN5EXT@). +.BR \%@L_ROFF@-out (@MAN5EXT@). Then .B @L_ROFF@ calls a postprocessor to convert @@ -406,7 +406,7 @@ This will cause .B @L_TROFF@ output to appear on standard output, replacing the usual postprocessor output; see -.BR \%@L_ROFF@_out (@MAN5EXT@). +.BR \%@L_ROFF@-out (@MAN5EXT@). . .\" .SS Transparent Options @@ -468,7 +468,7 @@ Include macro file (or .BI tmac. name\c ); see also -.BR \%@L_ROFF@_tmac (@MAN5EXT@). +.BR \%@L_ROFF@-tmac (@MAN5EXT@). . .TP .BI \-M\ dir @@ -506,8 +506,10 @@ disable warning . The .I @T_ROFF@ system -implements the infrastructure of classical roff; see -.BR roff (@MAN7EXT@) +implements the infrastructure of classical +.IR roff; +see +.BR @L_ROFF@ (@MAN7EXT@) for a survey on how a .I roff system works in general. @@ -516,7 +518,7 @@ it easier than .IR "classical roff" with its pipeline approach. This section gives an overview of those added parts and complements -.BR roff (@MAN7EXT@). +.BR @L_ROFF@ (@MAN7EXT@). . .\" .SS Paper Size @@ -531,7 +533,7 @@ to format the input is controlled globally with the requests and .BR .ll . See -.BR @L_ROFF@_tmac (@MAN5EXT@) +.BR @L_ROFF@-tmac (@MAN5EXT@) for the `papersize' macro package which provides a convenient interface. . .P @@ -545,7 +547,7 @@ with the command line options and .BR \-l . See -.BR @L_ROFF@_font (@MAN5EXT@) +.BR @L_ROFF@-font (@MAN5EXT@) and the man pages of the output devices for more details. .B @L_ROFF@ uses the command line option @@ -566,7 +568,8 @@ and automatically runs the postprocessor that is appropriate for the selected device after processing the data with @L_TROFF@. @L_ROFF@ therefore acts as a replacement for the necessity to manually specify the processor pipeline as is required by classical -.BR roff (@MAN7EXT@). +.BR roff " (" +.BR @L_ROFF@ (@MAN7EXT@)). . .\" .SS Preprocessors @@ -625,7 +628,7 @@ Actually, the following macro packages are included: .TP .B man The traditional man page format; see -.BR \%@L_ROFF@_man (@MAN7EXT@). +.BR \%@L_ROFF@-man (@MAN7EXT@). It can be specified on the command line as .B \-man or @@ -648,7 +651,7 @@ or .TP .B mdoc The \f[CR]BSD\f[]-style man page format; see -.BR \%@L_ROFF@_mdoc (@MAN7EXT@). +.BR \%@L_ROFF@-mdoc (@MAN7EXT@). It can be specified on the command line as .B \-mdoc or @@ -659,7 +662,7 @@ or The classical .I me document format; see -.BR \%@L_ROFF@_me (@MAN7EXT@). +.BR \%@L_ROFF@-me (@MAN7EXT@). It can be specified on the command line as .B \-me or @@ -670,7 +673,7 @@ or The classical .I ms document format; see -.BR \%@L_ROFF@_ms (@MAN7EXT@). +.BR \%@L_ROFF@-ms (@MAN7EXT@). It can be specified on the command line as .B \-ms or @@ -681,12 +684,12 @@ or HTML-like macros for inclusion in arbitrary .I groff documents; see -.BR \%@L_ROFF@_www (@MAN7EXT@). +.BR \%@L_ROFF@-www (@MAN7EXT@). . .P Details on the naming of macro files and their placement can be found in -.BR \%@L_ROFF@_tmac (@MAN5EXT@); +.BR \%@L_ROFF@-tmac (@MAN5EXT@); this man page also documents some other, minor auxiliary macro packages not mentioned here. . @@ -696,7 +699,7 @@ not mentioned here. General concepts common to all .I roff programming languages are described in -.BR roff (@MAN7EXT@). +.BR @L_ROFF@ (@MAN7EXT@). . .P The @@ -704,7 +707,7 @@ The extensions to the classical .I troff language are documented in -.BR \%@L_ROFF@_diff (@MAN7EXT@). +.BR \%@L_ROFF@-diff (@MAN7EXT@). In here you find also differences in between GNU troff and @T_ROFF@. . .P @@ -752,7 +755,7 @@ the current locale. The formatter program generates .IR "intermediate output" ; see -.BR \%@L_ROFF@_out (@MAN7EXT@). +.BR \%@L_ROFF@-out (@MAN7EXT@). . .\" .SS Devices @@ -810,7 +813,7 @@ XHTML output. The postprocessor to be used for a device is specified by the .B postpro command in the device description file; see -.BR \%@L_ROFF@_font (@MAN5EXT@). +.BR \%@L_ROFF@-font (@MAN5EXT@). . .P The default device is @@ -972,7 +975,7 @@ directory in addition to the default ones. See .BR @L_TROFF@ (@MAN1EXT@) and -.BR \%@L_ROFF@_font (@MAN5EXT@) +.BR \%@L_ROFF@-font (@MAN5EXT@) for more details. . .TP @@ -982,7 +985,7 @@ the default directories. See .BR @L_TROFF@ (@MAN1EXT@) and -.BR \%@L_ROFF@_tmac (@MAN5EXT@) +.BR \%@L_ROFF@-tmac (@MAN5EXT@) for more details. . .TP @@ -1036,7 +1039,7 @@ in the @T_ROFF@ system installation this directory is .IR @MACRODIR@ . Note that more than a single directory is searched for those files as documented in -.BR \%@L_ROFF@_tmac (@MAN5EXT@) +.BR \%@L_ROFF@-tmac (@MAN5EXT@) . .P The following files contained in the @@ -1083,7 +1086,7 @@ have a special meaning: Device description file for device .IR name , see -.BR \%@L_ROFF@_font (@MAN5EXT@). +.BR \%@L_ROFF@-font (@MAN5EXT@). . .TP .BI dev name / F @@ -1150,7 +1153,7 @@ Werner Lemberg . .TP Introduction, history and further readings: -.BR roff (@MAN7EXT@). +.BR \%@L_ROFF@-history (@MAN7EXT@). . .TP Wrapper programs for formatters: @@ -1170,19 +1173,19 @@ Roff preprocessors: .TP Roff language with the groff extensions: .BR \%@L_ROFF@ (@MAN7EXT@), -.BR \%@L_ROFF@_char (@MAN7EXT@), -.BR \%@L_ROFF@_diff (@MAN7EXT@), -.BR \%@L_ROFF@_font (@MAN5EXT@). +.BR \%@L_ROFF@-char (@MAN7EXT@), +.BR \%@L_ROFF@-diff (@MAN7EXT@), +.BR \%@L_ROFF@-font (@MAN5EXT@). . .TP Roff formatter programs: .BR \%@L_NROFF@ (@MAN1EXT@), .BR \%@L_TROFF@ (@MAN1EXT@), -.BR ditroff (@MAN7EXT@). +.BR \%@L_DITROFF@ (@MAN7EXT@). . .TP The intermediate output language: -.BR \%@L_ROFF@_out (@MAN7EXT@). +.BR \%@L_ROFF@-out (@MAN7EXT@). . .TP Postprocessors for the output devices: @@ -1193,13 +1196,13 @@ Postprocessors for the output devices: . .TP Groff macro packages and macro-specific utilities: -.BR \%@L_ROFF@_tmac (@MAN5EXT@), -.BR \%@L_ROFF@_man (@MAN7EXT@), -.BR \%@L_ROFF@_mdoc (@MAN7EXT@), -.BR \%@L_ROFF@_me (@MAN7EXT@), -.BR \%@L_ROFF@_ms (@MAN7EXT@), -.BR \%@L_ROFF@_www (@MAN7EXT@), -.BR \%@L_ROFF@_trace (@MAN7EXT@), +.BR \%@L_ROFF@-tmac (@MAN5EXT@), +.BR \%@L_ROFF@-man (@MAN7EXT@), +.BR \%@L_ROFF@-mdoc (@MAN7EXT@), +.BR \%@L_ROFF@-me (@MAN7EXT@), +.BR \%@L_ROFF@-ms (@MAN7EXT@), +.BR \%@L_ROFF@-www (@MAN7EXT@), +.BR \%@L_ROFF@-trace (@MAN7EXT@), . .TP The following utilities are available: diff --git a/man/src-troff.1.in b/man/src-troff.1.in index 3f36cb37..e1c2fc9d 100644 --- a/man/src-troff.1.in +++ b/man/src-troff.1.in @@ -55,7 +55,7 @@ and translates roff text input into an intermediate output language that can be and usually is furtherly used by @T_ROFF@ output devices. It is functionally compatible with UNIX troff, but has many extensions, see -.BR \%@L_ROFF@_diff (@MAN7EXT@). +.BR \%@L_ROFF@-diff (@MAN7EXT@). Usually it is invoked by using the .BR @L_ROFF@ (@MAN1EXT@) command which will also run preprocessors and postprocessors in the @@ -585,7 +585,7 @@ A description of the roff language, including a short but complete reference of all predefined requests, registers, and escapes. . .TP -.BR \%@L_ROFF@_diff (@MAN7EXT@) +.BR \%@L_ROFF@-diff (@MAN7EXT@) The differences of the .I @T_ROFF@ language, GNU troff and the @@ -593,7 +593,7 @@ language, GNU troff and the language. . .TP -.BR roff (@MAN7EXT@) +.BR @L_ROFF@ (@MAN7EXT@) An overview over roff. . .\" s-it2-mode diff --git a/man/tmac-trace.7.in b/man/tmac-trace.7.in index 4537fcb7..b72824a6 100644 --- a/man/tmac-trace.7.in +++ b/man/tmac-trace.7.in @@ -224,7 +224,7 @@ macros are kept in the file located in the .IR "tmac directory" ; see -.BR @L_ROFF@_tmac (@MAN5EXT@) +.BR @L_ROFF@-tmac (@MAN5EXT@) for details. . .\" @@ -234,7 +234,7 @@ for details. .B $@U_ROFF@_TMAC_PATH A colon-separated list of additional tmac directories in which to search for macro files; see -.BR @L_ROFF@_tmac (@MAN5EXT@) +.BR @L_ROFF@-tmac (@MAN5EXT@) for details. . .\" @@ -268,7 +268,7 @@ For details on option .BR \-m . . .TP -.BR @L_ROFF@_tmac (@MAN5EXT@) +.BR @L_ROFF@-tmac (@MAN5EXT@) A general description of @T_ROFF@ macro packages. . .TP diff --git a/man/ute-addftinfo.1.in b/man/ute-addftinfo.1.in index f5a5cf91..92472238 100644 --- a/man/ute-addftinfo.1.in +++ b/man/ute-addftinfo.1.in @@ -108,7 +108,7 @@ a Times font. . .SH "SEE ALSO" .BR @L_ROFF@ (@MAN1EXT@), -.BR @L_ROFF@_font (@MAN5EXT@), -.BR @L_ROFF@_char (@MAN7EXT@) +.BR @L_ROFF@-font (@MAN5EXT@), +.BR @L_ROFF@-char (@MAN7EXT@) . .\" s-ts-mode diff --git a/man/ute-afmtodit.1.in b/man/ute-afmtodit.1.in index 9f590d6f..f7668516 100644 --- a/man/ute-afmtodit.1.in +++ b/man/ute-afmtodit.1.in @@ -166,7 +166,7 @@ will automatically generate an italic correction, a left italic correction and a subscript correction for each character (the significance of these parameters is explained in -.BR @L_ROFF@_font (@MAN5EXT@)); +.BR @L_ROFF@-font (@MAN5EXT@)); these parameters may be specified for individual characters by adding to the .I afm_file @@ -356,6 +356,6 @@ Standard mapping. .BR @L_ROFF@ (@MAN1EXT@), .BR @L_D_PS@ (@MAN1EXT@), .BR perl (1) , -.BR @L_ROFF@_font (@MAN5EXT@) +.BR @L_ROFF@-font (@MAN5EXT@) . .\" s-ts-mode diff --git a/man/ute-tfmtodit.1.in b/man/ute-tfmtodit.1.in index 728e1d61..d3472e7e 100644 --- a/man/ute-tfmtodit.1.in +++ b/man/ute-tfmtodit.1.in @@ -196,6 +196,6 @@ Font description file for font .SH "SEE ALSO" .BR @L_ROFF@ (@MAN1EXT@), .BR @L_D_DVI@ (@MAN1EXT@), -.BR @L_ROFF@_font (@MAN5EXT@) +.BR @L_ROFF@-font (@MAN5EXT@) . .\" s-ts-mode -- 2.11.4.GIT