Diffs between last version checked in and current workfile(s): Index: contrib/chem/chem.man =================================================================== RCS file: /sources/groff/groff/contrib/chem/chem.man,v retrieving revision 1.7 diff -u -r1.7 chem.man --- contrib/chem/chem.man 11 Nov 2006 23:32:35 -0000 1.7 +++ contrib/chem/chem.man 13 Jan 2007 07:48:38 -0000 @@ -1,32 +1,19 @@ -.TH @address@hidden @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@" -.SH NAME address@hidden@chem \- groff preprocessor for producing chemical structure diagrams -. -. -.SH "SYNOPSIS" -.\" The .SH was moved to this place in order to appease `apropos'. -. -.mso www.tmac -. -.\" -------------------------------------------------------------------- -.\" Legalize -.\" -------------------------------------------------------------------- -. .ig @address@hidden - man page for @address@hidden (section 1). Source file position: /contrib/chem/chem.man Installed position: $prefix/share/man/man1/@address@hidden -Last update: 11 Nov 2006 +Last update: +10 Jan 2007 -- simpilified to use .SY/.OP./.YS .. . . .de author This file was written by -.MTO "" "Bernd Warken" . +Bernd Warken. It is based on the documentation of -.URL http://cm.bell-labs.com/cm/cs/who/bwk/index.html "Brian Kernighan\f[R]'s\f[]" +http://cm.bell-labs.com/cm/cs/who/bwk/index.html "Brian Kernighan\fR's\fP" original .I awk version of @@ -57,10 +44,10 @@ . . .P -You should have received a copy of the \f[CR]GNU General Public -License\f[] along with +You should have received a copy of the \f(CRGNU General Public +License\fP along with .IR groff , -see the files \%\f[CB]COPYING\f[] and \%\f[CB]LICENSE\f[] in the top +see the files \%\f(CBCOPYING\fP and \%\f(CBLICENSE\fP in the top directory of the .I groff source package. @@ -75,142 +62,61 @@ .hy .. . +.mso an-ext.tmac . .\" -------------------------------------------------------------------- -.\" Setup -.\" -------------------------------------------------------------------- -. -.if n \{\ -. mso tty-char.tmac -. ftr CR R -. ftr CI I -. ftr CB B -.\} -. -.if '\*[.T]'dvi' \{\ -. ftr CB CW -.\} -. -.ds Ellipsis "\&.\|.\|.\&\"" -. -. -.\" -------------------------------------------------------------------- -.\" Macro definitions +.\" Local macro definitions . -.\" Ignore all arguments like a comment, even after a .eo call. -.de c -.. -. -.c -------------------------------------------------------------------- -.c .TP+ () -.c -.c Continuation line for .TP header. -.c -.de TP+ -. br -. ns -. TP \\$1 -.. -. -.c -------------------------------------------------------------------- -.c .File_name () -.c -.c Display a file or directory name in CB font. -.c -.de File_name -. Header_CB \\$@ -.. -. -.c -------------------------------------------------------------------- -.c .Header_CB () -.c -.c Display a line in CB font, for example after .TP -.c -.de Header_CB -. nh -. Text \f[CB]\\$1\f[]\\$2 -. hy -.. -. -.c -------------------------------------------------------------------- -.c Static register for inter-macro communication in `.Synopsis'. -.c -.nr chem:Synopsis.level 0 -. -.c -------------------------------------------------------------------- -.c .Synopsis () -.c -.c Begin a synopsis section, to be ended by a ./Synopsis macro. -.c -.de Synopsis -. if (\\n[chem:Synopsis.level] > 0) \ -. Error .\\$0: previous .Synopsis was not closed by ./Synopsis. -. nh -. ds @1 \\$1\" -. nr @old_indent \\n[.i] -. ad l -. in +\w'address@hidden'u -. ti address@hidden -. B address@hidden -. rr @old_indent -. rm @1 -. nr chem:Synopsis.level +1\" marker for ./Synopsis -.. +.ds El \&...\& . -.c -------------------------------------------------------------------- -.c ./Synopsis () -.c -.c Close a synopsis section opened by the previous .Synopsis macro. -.c -.de /Synopsis -. if (\\n[chem:Synopsis.level] <= 0) \ -. Error .\\$0: no previous call of .Synopsis -. br -. ad -. in -. hy -. nr chem:Synopsis.level -1 +.\" .File_name () +.\" +.\" Display a file or directory name in CB font. +.\" +.de FN +. CB \\$@ .. . -.c -------------------------------------------------------------------- -.c .Text (...) -.c -.c Treat the arguments as text, no matter how they look like. -.c -.de Text -. if (\\n[.$] == 0) \ -. return -. nh -. nop \)\\$*\) -. hy +.\" .CB () +.\" +.\" Display a line in CB font, for example after .TP +.\" +.de CB +.nh +\\&\\f(CB\\$1\\fP\\$2 +.hy .. . .\" End of macro definitions +.TH @address@hidden @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@" +.SH NAME address@hidden@chem \- groff preprocessor for producing chemical structure diagrams . . +.SH "SYNOPSIS" .\" -------------------------------------------------------------------- .\" SH "SYNOPSIS" .\" -------------------------------------------------------------------- . -.ad l -.Synopsis @address@hidden -.RI [ "\%option" \*[Ellipsis]] +.SY @address@hidden +.RI [ "\%option" \*(El] .RB [ \-\- ] -.RI [ "\%filespec" \*[Ellipsis]] -./Synopsis +.RI [ "\%filespec" \*(El] . -.Synopsis @address@hidden -\f[CB]\-h\fP\f[CR]|\fP\f[CB]\-\-help\fP -./Synopsis +.SY @address@hidden +\f(CB\-h\fP\f(CR|\fP\f(CB\-\-help\fP . -.Synopsis @address@hidden -\f[CB]\-v\fP\f[CR]|\fP\f[CB]\-\-version\fP -./Synopsis +.SY @address@hidden +\f(CB\-v\fP\f(CR|\fP\f(CB\-\-version\fP +.YS . +.\" -------------------------------------------------------------------- +.SH OPTION USAGE +.\" -------------------------------------------------------------------- . .P -There are no other options than \f[CB]\-h\f[], \f[CB]\-\-help\f[], -\f[CB]\-v\f[] and \%\f[CB]\-\-version\f[]; these options provoke the +There are no other options than \f(CB\-h\fP, \f(CB\-\-help\fP, +\f(CB\-v\fP and \%\f(CB\-\-version\fP; these options provoke the printing of a version or usage information, respectively, and all .I filespec arguments are ignored. @@ -258,16 +164,16 @@ The program .B @address@hidden originates from the Perl source file -.File_name chem.pl . +.FN chem.pl . It tells .B @address@hidden to include a copy of the macro file -.File_name chem.pic . +.FN chem.pic . . Moreover the .I groff source file -.File_name pic.tmac +.FN pic.tmac is loaded. . . @@ -291,7 +197,7 @@ .nf .ft B \&.cstart -\f[I]chem data\f[] +\fIchem data\fP \&.cend .ft .fi @@ -354,7 +260,7 @@ .BR groffer : . .IP -.B @address@hidden [file\*[Ellipsis]] | groffer +.B @address@hidden [file\*(El] | groffer . .P If you want to create just @@ -368,7 +274,7 @@ for the activation of .BR @address@hidden : .IP -.B @address@hidden [file\*[Ellipsis]] | groff -p \*[Ellipsis] +.B @address@hidden [file\*(El] | groff -p \*(El . . .\" -------------------------------------------------------------------- @@ -382,7 +288,7 @@ moieties (e.g., .BR C , .BR NH3 , -\*[Ellipsis]) and strings. +\*(El) and strings. . . .\" -------------------------------------------------------------------- @@ -491,21 +397,21 @@ .RS .TP 10m .B CH3 -.TP+ +.TQ .B bond (this one goes right from the CH3) -.TP+ +.TQ .B C (at the right end of the bond) -.TP+ +.TQ .B double bond up (from the C) -.TP+ +.TQ .B O (at the end of the double bond) -.TP+ +.TQ .B bond right from C -.TP+ +.TQ .B CH3 .RE . @@ -539,16 +445,16 @@ .B ring .RB [ \%pointing\ ( up | right | left | down )] .RB [ \%aromatic ] -.RB [ put\ Mol\ at\ \f[I]n\f[] ] +.RB [ put\ Mol\ at\ \fIn\fP ] .RB [ \%double .IR i , j .IR k , l -\*[Ellipsis]] +\*(El] .RI [ picstuff ] . . .P -The vertices of a ring are numbered 1, 2, \*[Ellipsis] from the +The vertices of a ring are numbered 1, 2, \*(El from the vertex that points in the natural compass direction. . So for a hexagonal ring with the point at the top, the top vertex @@ -569,8 +475,8 @@ .P The ring vertices are named .BR .V1 , -\*[Ellipsis], -.BI .V n\f[R],\f[] +\*(El, +.BI .V n\fR,\fP with .B .V1 in the pointing direction. @@ -609,7 +515,7 @@ . .P Interior double bonds are specified as -.BI \%double\ n1 , n2\ n3 , n4\ \f[R]\*[Ellipsis];\f[] +.BI \%double\ n1 , n2\ n3 , n4\ \fR\*(El;\fP each number pair adds an interior bond. . So the alternate form of a benzene ring is @@ -621,7 +527,7 @@ .P Heterocycles (rings with something other than carbon at a vertex) are written as -.BI put\ X\ at\ V\f[R],\f[] +.BI put\ X\ at\ V\fR,\fP as in . .IP @@ -730,7 +636,7 @@ This can be used then for specifying a place. . The name -.BP BP +.B BP is derived from .I branch point (i.e., line crossing). @@ -738,14 +644,14 @@ . .P A string within double quotes -.B \[dq] +.B \(dq is interpreted as a part of a .I chem command. . It represents a string that should be printed (without the quotes). . -Text within quotes \[dq]\*[Ellipsis]\[dq] is treated more or less +Text within quotes \(dq\*(El\(dq is treated more or less like a moiety except that no changes are made to the quoted part. . . @@ -765,7 +671,7 @@ . .IP .IB Name : -\*[Ellipsis] +\*(El . . .P @@ -781,7 +687,7 @@ .TP .B First: .B bond -.TP+ +.TQ \& .B bond 30 from First .RE @@ -794,7 +700,7 @@ The specific construction .RS .TP -.BR bond\ \*[Ellipsis] " ; moiety" +.BR bond\ \*(El " ; moiety" .RE .P is equivalent to @@ -946,7 +852,7 @@ . . .P -There is no in-line chemistry yet (e.g., analogous to the $...$ +There is no in-line chemistry yet (e.g., analogous to the $\*(El$ construct of eqn). . . @@ -980,14 +886,14 @@ .\" -------------------------------------------------------------------- . .TP -.File_name @DATASUBDIR@/pic/chem.pic +.FN @DATASUBDIR@/pic/chem.pic A collection of .I pic macros needed by .BR @address@hidden . . .TP -.File_name @MACRODIR@/pic.tmac +.FN @MACRODIR@/pic.tmac A macro file which redefines .B .PS and @@ -997,12 +903,12 @@ diagrams. . .TP -.File_name @DOCDIR@/examples/chem/*.chem +.FN @DOCDIR@/examples/chem/*.chem Example files for .IR chem . . .TP -.File_name @DOCDIR@/examples/chem/122/*.chem +.FN @DOCDIR@/examples/chem/122/*.chem Example files from the classical .I chem book @@ -1058,7 +964,7 @@ "chem awk source" . . Its -.File_name README +.FN README file was used for this manual page. . . Index: contrib/pdfmark/pdfroff.man =================================================================== RCS file: /sources/groff/groff/contrib/pdfmark/pdfroff.man,v retrieving revision 1.7 diff -u -r1.7 pdfroff.man --- contrib/pdfmark/pdfroff.man 14 Jul 2006 23:48:35 -0000 1.7 +++ contrib/pdfmark/pdfroff.man 13 Jan 2007 07:48:40 -0000 @@ -8,6 +8,7 @@ File position: /contrib/pdfmark/pdfroff.man Last update: +9 Jan 2007. Converted to use .SY/.OP/.YS This file is part of groff, the GNU roff type-setting system. @@ -29,117 +30,75 @@ A copy of the Free Documentation License is included as a file called FDL in the main directory of the groff source package. .. -.\" -------------------------------------------------------------------- -. -.SH NAME -pdfroff \- create PDF documents using -.I groff + +.mso an-ext.tmac . -.ig - This `.ig' block is here to make mandb happy -- it forces the end of - the NAME section processing. -.. +.\" -------------------------------------------------------------------- +.\" Local macro definitions . .hw pdfmark .de Q \&\\$3\*(lq\\$1\*(rq\\$2 .. -.de nohy +.de NH .hy 0 \&\\$* .hy .. .\" -------------------------------------------------------------------- . +.SH NAME +pdfroff \- create PDF documents using +.I groff +. +.\" -------------------------------------------------------------------- +. .SH SYNOPSIS -.de cmd -. if address@hidden .in -. nr @i \\n(.i -. in +\w'\f[B]\\$1\0'u -. ti \\n(@iu -. B \\$1\0\c -.. -.de opt -. tr -\- -. RB [ -\\$1\c -. IR \&\\$2 ] -. tr -- -.. -.de opta -. ie \\n(.$>1 .opt \\$1 \0\\$2 -. el .opt \\$1 -.. -.de opte -. tr -\- -. RB [ -\\$1 =\c -. IR \&\\$2 ] -. tr -- -.. -.de optx -. tr -\- -. RB [ --no\\$1 \0|\0\c -. BR -\\$1 =\c -. IR \&\\$2 ] -. tr -- -.. -.ad l -.hy 0 -.ll -5 -.cmd pdfroff -.opt abcegilpstzCEGNRSUVXZ -.opta d cs -.opta f fam -.opta F dir -.opta I dir -.opta L arg -.opta m name -.opta M dir -.opta n num -.opta o list -.opta P arg -.opta r cn -.opta T dev -.opta w name -.opta W name -.opt -emit-ps -.opt -no-toc-relocation -.opt -no-kill-null-pages -.opte -stylesheet name -.optx -pdf-output name -.optx -reference-dictionary name -.opt -report-progress -.opt -keep-temporary-files -.B file -.I ... -.ll -.sp -.cmd pdfroff +.SY pdfroff +.OP -abcegilpstzCEGNRSUVXZ +.OP -d cs +.OP -f fam +.OP -F dir +.br +.OP -I dir +.OP -L arg +.OP -m name +.OP -M dir +.OP -n num +.OP -o list +.br +.OP -P arg +.OP -r cn +.OP -T dev +.OP -w name +.OP -W name +.OP -emit-ps +.br +.OP -no-toc-relocation +.OP -no-kill-null-pages +.br +.OP -stylesheet=\fIname\fP +.OP -pdf-output=\fIname\fP +.br +.OP -reference-dictionary=\fIname\fP +.OP -reference-dictionary +.br +.OP -report-progress +.OP -keep-temporary-files +.I file +... +.SY pdfroff .B -h | .B --help .sp -.cmd pdfroff +.SY pdfroff .B -v | .B --version .RI [ option .IR ... ] -.rr @i -.in -.ad -.hy -.P -The command line is parsed in accordance with normal GNU conventions, -but with one exception \(em when specifying any short form option -(i.e., a single character option introduced by a single hyphen), -and if that option expects an argument, then it -.I must -be specified independently (i.e., it may -.I not -be appended to any group of other single character short form options). -.P -Long form option names (i.e., those introduced by a double hyphen) -may be abbreviated to their minimum length unambigous initial substring. +.YS . .\" -------------------------------------------------------------------- . @@ -197,6 +156,20 @@ .\" -------------------------------------------------------------------- . .SH USAGE +The command line is parsed in accordance with normal GNU conventions, +but with one exception \(em when specifying any short form option +(i.e., a single character option introduced by a single hyphen), +and if that option expects an argument, then it +.I must +be specified independently (i.e., it may +.I not +be appended to any group of other single character short form options). +.P +Long form option names (i.e., those introduced by a double hyphen) +may be abbreviated to their minimum length unambigous initial +substring. +.P +Otherwise, .B pdfroff usage closely mirrors that of .B groff @@ -521,7 +494,7 @@ .IP .I .ad l -.nohy gs \-dBATCH \-dQUIET \-dNOPAUSE \-sDEVICE=pdfwrite \-sOutputFile=\- +.NH gs \-dBATCH \-dQUIET \-dNOPAUSE \-sDEVICE=pdfwrite \-sOutputFile=\- .ad .RE .TP @@ -784,17 +757,15 @@ .I GNU troff software package. It was originally written by Keith Marshall, -.nohy , +.NH , who also wrote the implementation of the .I pdfroff program, to which it relates. .LP You should have received a copy of the FDL as part of the .I GNU troff -distribution; it is also available on\-line, at the GNU -.Q copyleft -site, -.nohy . +distribution; it is also available on\-line, at +.URL http://www.gnu.org/copyleft/fdl.html "The GNU copyleft site" . . .\" -------------------------------------------------------------------- .\" EOF / vim: ft=groff Index: man/ditroff.man =================================================================== RCS file: /sources/groff/groff/man/ditroff.man,v retrieving revision 1.5 diff -u -r1.5 ditroff.man --- man/ditroff.man 3 Jul 2004 12:46:58 -0000 1.5 +++ man/ditroff.man 13 Jan 2007 07:48:41 -0000 @@ -1,7 +1,8 @@ .ig ditroff.man -Last update: 2 Jul 2004 +Last update: +09 Jan 2007 -- converted to use .SY/.OP./.YS. This file is part of groff, the GNU roff type-setting system. @@ -18,24 +19,7 @@ A copy of the Free Documentation License is included as a file called FDL in the main directory of the groff source package. .. -. -.\" -------------------------------------------------------------------- -.\" Setup -.\" -------------------------------------------------------------------- -. -.mso www.tmac -. -.if n \{\ -. mso tty-char.tmac -. ftr CR R -. ftr CI I -. ftr CB B -.\} -. -.if '\*[.T]'dvi' \ -. ftr CB CW -. -. +.mso an-ext.tmac .\" -------------------------------------------------------------------- .\" Title .\" -------------------------------------------------------------------- @@ -132,7 +116,6 @@ and .IR "Brian Kernighan" , see -.br .URL http://\:cm.bell-labs.com/\:cm/\:cs/\:cstr/\:54.ps.gz \ "Bell Labs CSTR\~#54" . . @@ -144,7 +127,6 @@ is the original documentation of the first multi-device troff .RI ( ditroff\/ ), see -.br .URL http://\:cm.bell-labs.com/\:cm/\:cs/\:cstr/\:97.ps.gz \ "Bell Labs CSTR\~#97" . . Index: man/groff_diff.man =================================================================== RCS file: /sources/groff/groff/man/groff_diff.man,v retrieving revision 1.60 diff -u -r1.60 groff_diff.man --- man/groff_diff.man 26 Oct 2006 19:39:07 -0000 1.60 +++ man/groff_diff.man 13 Jan 2007 07:48:41 -0000 @@ -3,7 +3,8 @@ .ig groff_diff.man -Last update : 26 Oct 2006 +Last update: +10 Jan 2007 -- macro simplification by ESR. This file is part of groff, the GNU roff type-setting system. It is the source of the man-page groff_diff(7). @@ -24,26 +25,11 @@ A copy of the Free Documentation License is included as a file called FDL in the main directory of the groff source package. .. -. +.mso an-ext.tmac .\" -------------------------------------------------------------------- -.\" Setup +.\" Local definitions .\" -------------------------------------------------------------------- . -.do nr groff_diff_C \n[.C] -.cp 0 -. -.mso www.tmac -. -.if n \{\ -. mso tty-char.tmac -. ftr CR R -. ftr CI I -. ftr CB B -.\} -. -.if '\*[.T]'dvi' \ -. ftr CB CW -. .\" define a string tx for the TeX logo .ie t .ds tx T\h'-.1667m'\v'.224m'E\v'-.224m'\h'-.125m'X .el .ds tx TeX @@ -52,54 +38,38 @@ .\" -------------------------------------------------------------------- .\" start of macro definitions . -.eo -. -.de c -.. -. -.de TQ -. br -. ns -. TP \$1 -.. .de Text -. RI "\$*" +. RI "\\$*" .. +. .de Topic . TP 2m . Text \[bu] +. RI "\\$*" .. +. .de squoted -. ds @arg1 \$1 -. shift -.\" Text address@hidden -. Text address@hidden +. ds @arg1 \\$1 +. shift 1 +. Text address@hidden . rm @arg1 .. -.c A shell command line -.de ShellCommand -. br -. IR "shell#" "\h'1m'\f[CB]\$*\f[]\/" -.. -.c reference of a request or macro +.\" reference of a request or macro .de request -. ds @arg1 \$1 +. ds @arg1 \\$1 . shift 1 -.\" Text address@hidden -. Text address@hidden +. Text address@hidden . rm @arg1 .. .als option request . -.c representation of an escape sequence +.\" representation of an escape sequence .de esc -. ds @arg1 \$1 -. shift -.\" Text address@hidden -. Text address@hidden&\f[]\$* +. ds @arg1 \\$1 +. shift 1 +. Text address@hidden . rm @arg1 .. -.ec .\" end of macro definitions . .\" from old groff_out.man @@ -108,7 +78,6 @@ .el \ . ds ic \^ . -. .\" -------------------------------------------------------------------- .\" Title .\" -------------------------------------------------------------------- @@ -410,16 +379,12 @@ . For example, strings to start and end superscripting could be defined like this -. .RS -.IP -.ft CB -.Text .ds { \[rs]v'\-.3m'\[rs]s'\[rs]En[.s]*6u/10u' -.br -.Text .ds } \[rs]s0\[rs]v'.3m' -.ft -. -.P +.EX +\&.ds { \[rs]v'\-.3m'\[rs]s'\[rs]En[.s]*6u/10u' +\&.ds } \[rs]s0\[rs]v'.3m' +.EE +.TQ The use of .B \[rs]E ensures that these definitions work even if @@ -746,7 +711,7 @@ .Text .nr x 1 .Text .nf .Text .di d -.Text \[rs]?\[rs]\[rs]?\[rs]\[rs]\[rs]\[rs]?\[rs]\[rs]\[rs]\[rs]\[rs]\[rs]\[rs]\c +.Text \[rs]?\[rs]\[rs]?\[rs]\[rs]\[rs]\[rs]?\[rs]\[rs]\[rs]\[rs]\[rs]\[rs]\[rs]\ec .Text \[rs]nx\[rs]\[rs]\[rs]\[rs]?\[rs]\[rs]?\[rs]? .Text .di .Text .nr x 2 @@ -1822,7 +1787,7 @@ .IP Line-tabs mode is associated with the current environment; the read-only number register -.B \\[rs]n[.linetabs] +.B \[rs]n[.linetabs] is set to\~1 if in line-tabs mode, and 0 otherwise. . .TP @@ -3898,9 +3863,9 @@ .IR groff . From the command line, this is called using . -.IP -.ShellCommand man\~7\~groff -. +.EX +man\~7\~groff +.EE .TP .BR roff (@MAN7EXT@) A survey of @@ -3919,8 +3884,6 @@ .URL http://\:cm.bell-labs.com/\:cm/\:cs/\:cstr/\:54.ps.gz \ "classical troff documentation" . . -.cp \n[groff_diff_C] -. .\" -------------------------------------------------------------------- .\" Emacs variables .\" -------------------------------------------------------------------- Index: man/groff_out.man =================================================================== RCS file: /sources/groff/groff/man/groff_out.man,v retrieving revision 1.23 diff -u -r1.23 groff_out.man --- man/groff_out.man 31 Jul 2006 09:48:57 -0000 1.23 +++ man/groff_out.man 13 Jan 2007 07:48:42 -0000 @@ -21,30 +21,7 @@ FDL in the main directory of the groff source package. .. . -.\" -------------------------------------------------------------------- -.\" Setup -.\" -------------------------------------------------------------------- -. -.do nr groff_out_C \n[.C] -.cp 0 -. -.mso www.tmac -. -.if n \{\ -. mso tty-char.tmac -. ftr CR R -. ftr CI I -. ftr CB B -.\} -. -.if '\*[.T]'dvi' \ -. ftr CB CW -. -.if t \{\ -.EQ -delim $$ -.EN -.\} +.mso an-ext.tmac . .\" ----------------- Document configuration . @@ -60,185 +37,171 @@ .. .nr @STUPID_DRAWING_POSITIONING 1 . -.\" ----------------- Syntactical definitions +.\" ----------------- Syntactic definitions . -.\" comments when escapes are switched off -.de c .. .\" Begin of macro definitions -.eo . .de Text -. nop \)\$* +. nop \\)\\$* .. -.c follow-up line for a .TP header -.de TP+ -. br -. ns -. TP \$1 -.. -.c a bulleted paragraph +.\" a bulleted paragraph .de Topic . TP 2m -. nop \[bu] +. nop \\[bu] .. .de ShellCommand . br -. IR "shell>" "\h'1m'\f[CB]\$*\f[]\/" +. IR "shell>" "\ \\f[CB]\\$*\\f[]\\/" .. -.ec .\" End of macro definitions . -.c ----------------- Semantical definitions +.\" ----------------- Semantic definitions . .nr @maxcolor 65536 -.ds @backslash \[rs]\" -.ds @linebreak \f[R]\[la]line_break\[ra]\f[]\" +.ds @backslash \[rs] +.ds @linebreak \f[R]\[la]line_break\[ra]\f[] . .\" Begin of macro definitions -.eo . -.c format: .unit +.\" format: .unit .de unit -. BR \$@ +. BR \\$@ .. -.c argument in italic with punctuation +.\" argument in italic with punctuation .de argument -. if (\n[.$] == 0) \ -. return -. IR \$@ +. IR \\$@ .. -.c comma separated list of indexed variables +.\" comma separated list of indexed variables .de list1..n -. ds @arg1 \$1\" -. nop \c +. ds @arg1 \\$1 +. nop \\c . ie t \ -. nop address@hidden sub 1$, address@hidden sub 2$, .\|.\|., address@hidden sub n$ \c +. nop address@hidden sub 1$, address@hidden sub 2$, .\\|.\\|., address@hidden sub n$ \\c . el \{\ -. IR address@hidden , -. IR address@hidden , -. nop \&..., -. I address@hidden +. IR address@hidden , +. IR address@hidden , +. nop \\&..., +. I address@hidden . \} . rm @arg1 .. .de offset -. if (\n[.$] < 2) \ +. if \\n(.$<2 \ . ab `.offset' needs at least 2 arguments -. ds @arg1 \$1\" -. ds @arg2 \$2\" +. ds @arg1 \\$1 +. ds @arg2 \\$2 . shift 2 -. nop (\f[I]\,address@hidden/\f[],\ \f[I]\,address@hidden/\f[])\$* +. nop (\\f[I]\\,address@hidden/\\f[],\\ \\f[I]\\,address@hidden/\\f[])\\$* . rm @arg1 . rm @arg2 .. .de indexed_offset -. if (\n[.$] < 4) \ +. if \\n(.$<4 \ . ab `.indexed_offset' needs at least 4 arguments -. ds @arg1 \$1\" -. ds @index1 \$2\" -. ds @arg2 \$3\" -. ds @index2 \$4\" +. ds @arg1 \\$1 +. ds @index1 \\$2 +. ds @arg2 \\$3 +. ds @index2 \\$4 . shift 4 . ie t \{\ -. ie \B'address@hidden' \{\ -. nop (address@hidden sub roman address@hidden,\ \c +. ie \\B'address@hidden' \{\ +. nop (address@hidden sub roman address@hidden,\\ \\c . \} . el \{\ -. nop (address@hidden sub address@hidden,\ \c +. nop (address@hidden sub address@hidden,\\ \\c . \} -. ie \B'address@hidden' \{\ -. nop address@hidden sub roman address@hidden)\$* \c +. ie \\B'address@hidden' \{\ +. nop address@hidden sub roman address@hidden)\\$* \\c . \} . el \{\ -. nop address@hidden sub address@hidden)\$* \c +. nop address@hidden sub address@hidden)\\$* \\c . \} . \} . el \{\ -. nop (address@hidden@index1]\f[],\ \c -. nop address@hidden@index2]\f[])\$* \c +. nop (address@hidden@index1]\\f[],\\ \\c +. nop address@hidden@index2]\\f[])\\$* \\c . \} . rm @arg1 . rm @arg2 . rm @index1 . rm @index2 .. -.c format: .command "" +.\" format: .command "" .de command -. ds @arg1 \$1\" -. ds @arg2 \$2\" +. ds @arg1 \\$1 +. ds @arg2 \\$2 . shift 2 -. IP "address@hidden \f[I]\,address@hidden/\f[]\$*" +. IP "address@hidden \\f[I]\\,address@hidden/\\f[]\\$*" . rm @arg1 . rm @arg2 .. -.c format: .command+ "" -.c continue previous .command heading +.\" format: .command+ "" +.\" continue previous .command heading .de command+ -. ds @arg1 \$1\" -. ds @arg2 \$2\" +. ds @arg1 \\$1 +. ds @arg2 \\$2 . shift 2 -. TP+ -. Text "address@hidden \f[I]\,address@hidden/\f[]\$*" +. TQ +. Text "address@hidden \\f[I]\\,address@hidden/\\f[]\\$*" . rm @arg1 . rm @arg2 .. -.c format: .D-command "" +.\" format: .D-command "" .de D-command -. ds @sub \$1\" +. ds @sub \\$1 . shift 1 -. IP "address@hidden \f[I]\,\$*\/\f[]\|address@hidden" +. IP "address@hidden \\f[I]\\,\\$*\\/\\f[]\\|address@hidden" . rm @sub .. -.c format: .D-command+ "" -.c continue previous .D-command heading +.\" format: .D-command+ "" +.\" continue previous .D-command heading .de D-command+ -. ds @sub \$1\" +. ds @sub \\$1 . shift 1 -. TP+ -. Text "address@hidden \f[I]\,\$*\/address@hidden" +. TQ +. Text "address@hidden \\f[I]\\,\\$*\\/address@hidden" . rm @sub .. .de Da-command . shift 1 . ie t \ -. ds @args $h sub 1$\~$v sub 1$ $h sub 2$\~$v sub 2$\" +. ds @args $h sub 1$\\~$v sub 1$ $h sub 2$\\~$v sub 2$ . el \ -. ds @args \f[I]h1\~v1 h2\~v2\f[]\" -. IP "\f[B]Da\f[]\ address@hidden|address@hidden" +. ds @args \\f[I]h1\\~v1 h2\\~v2\\f[] +. IP "\\f[B]Da\\f[]\\ address@hidden|address@hidden" . rm @args .. -.c graphics command .D with a variable number of arguments -.c format: .D-multiarg +.\" graphics command .D with a variable number of arguments +.\" format: .D-multiarg .de D-multiarg -. ds @sub \$1\" +. ds @sub \\$1 . shift 1 . ie t \{\ -. ds @args "$h sub 1$\~$v sub 1$ $h sub 2$\~$v sub 2$ .\|.\|. \" -. as @args "$h sub n$\~$v sub n$\" +. ds @args "$h sub 1$\\~$v sub 1$ $h sub 2$\\~$v sub 2$ .\\|.\\|. +. as @args "$h sub n$\\~$v sub n$ . \} . el \ -. ds @args \f[I]h1\~v1 h2\~v2\f[] ... \f[I]\,hn\~vn\f[]\" -. IP "address@hidden address@hidden|address@hidden" +. ds @args \\f[I]h1\\~v1 h2\\~v2\\f[] ... \\f[I]\\,hn\\~vn\\f[] +. IP "address@hidden address@hidden|address@hidden" . rm @args . rm @sub .. -.c format: .x-command "" +.\" format: .x-command "" .de x-command -. ds @sub \$1\" +. ds @sub \\$1 . shift 1 . ds @args -. if (\n[.$] > 0) \ -. ds @args \ \f[I]\,\$*\/\f[]\" -. IP "address@hidden@args]\f[]\|address@hidden" +. if \\n(.$>0 \ +. ds @args \\ \\f[I]\\,\\$*\\/\\f[] +. IP "address@hidden@args]\\f[]\\|address@hidden" . rm @sub . rm @args .. .de xsub -. RI "(" "\$1" " control command)" +. RI "(" "\\$1" " control command)" . br .. -.ec .\" End of macro definitions . . @@ -545,14 +508,11 @@ .I groff prologue is guaranteed to consist of the following three lines (in that order): .RS -.P -.B x\ T -.I device -.br -.B x\ res -.I n\ h\ v -.br -.B x init +.EX +\fBx\ T\fP\fIdevice\fP +\fBx\ res\fPn\ h\ v +\fBx init\fP +.EE .RE .P with the arguments set as outlined in the section @@ -659,7 +619,7 @@ preceding argument ends with a string argument. . . -.if (address@hidden == 1) \{\ +.if address@hidden \{\ .command { Open a new environment by copying the actual device configuration data to the environment stack. @@ -1218,7 +1178,7 @@ .offset hn vn , and from there back to the starting position. . -.ie (address@hidden == 1) \{\ +.ie address@hidden \{\ For historical reasons, the position is changed by adding the sum of all arguments with odd index to the actual horizontal position and the even ones to the vertical position. @@ -1242,7 +1202,7 @@ command with the same arguments, but draws a solid polygon in the current fill color rather than an outlined polygon. . -.ie (address@hidden == 1) \{\ +.ie address@hidden \{\ The position is changed in the same way as with .BR Dp . \} @@ -1270,7 +1230,7 @@ .B Dt command was specified). . -.ie (address@hidden == 1) \{\ +.ie address@hidden \{\ For historical reasons, the horizontal position is changed by adding the argument to the actual horizontal position, while the vertical position is not changed. @@ -1862,7 +1822,7 @@ So conflicts with classical devices are very unlikely. . . -.ie (address@hidden == 1) \{\ +.ie address@hidden \{\ .Topic The position changing after the commands .BR Dp , @@ -2096,8 +2056,6 @@ maintained by .MTO address@hidden "Werner Lemberg" . . -.cp \n[groff_out_C] -. .\" -------------------------------------------------------------------- .\" Emacs settings .\" -------------------------------------------------------------------- Index: man/roff.man =================================================================== RCS file: /sources/groff/groff/man/roff.man,v retrieving revision 1.34 diff -u -r1.34 roff.man --- man/roff.man 19 Nov 2006 09:56:49 -0000 1.34 +++ man/roff.man 13 Jan 2007 07:48:42 -0000 @@ -20,130 +20,25 @@ FDL in the main directory of the groff source package. .. . -.\" -------------------------------------------------------------------- -.\" Setup -.\" -------------------------------------------------------------------- -. -.do nr roff_C \n[.C] -.cp 0 -. -.mso www.tmac -. -.if n \{\ -. mso tty-char.tmac -. ftr CR R -. ftr CI I -. ftr CB B -.\} -. -.if '\*[.T]'dvi' \{\ -. ftr CB CW -.\} -. -. -.\" -------------------------------------------------------------------- -.\" String definitions -. -.\" Final `\""' comments are used to make Emacs happy, sic \"" -. -.\" The `-' sign for options. -.ie t \{\ -. ds @- \-\" -. ds @-- \-\-\" -.\} -.el \{\ -. ds @- -\" -. ds @-- --\" -.\} -. -.ds Comment \.\[rs]\[dq]\" -.ds Ellipsis \.\|.\|.\&\" -. +.mso an-ext.tmac . .\" -------------------------------------------------------------------- -.\" Begin of macro definitions -. -.de c -.\" this is like a comment request when escape mechanism is off -.. -. -.eo -. -.c --------------------------------------------------------------------- -. -.de Text -. nop \)\$* -.. -. -.de CodeSkip -. ie t \ -. sp 0.2v -. el \ -. sp -.. +.\" Local macros . .de Esc -. ds @1 \$1\" +. ds @1 \\$1 . shift -. Text address@hidden +. nop address@hidden . rm @1 .. . .de QuotedChar -. ds @1 \$1 -. shift -. nop address@hidden'\$* -. rm @1 -.. -. -.c -------------------------------------------------------------------- -. -.c a shell command line -.de ShellCommand -. br -. ad l -. nh -. Text \f[I]sh#\h'1m'\f[]\f[CR]\$*\f[]\&\" -. ft R -. ft P -. hy -. ad -.. -. -.c -------------------------------------------------------------------- -. -.c ShortOpt ([c [punct]]) -.c -.c `-c' somewhere in the text. -.c The second argument is some trailing punctuation. -.c -.de ShortOpt -. ds @1 \$1\" +. ds @1 \\$1 . shift -. nh -. Text address@hidden@1]\f[]\/\$* -. hy +. nop address@hidden'\\$* . rm @1 .. . -.de TP+ -. br -. ns -. TP \$1 -.. -. -.c -------------------------------------------------------------------- -. -.c Topic -.c -.de Topic -. TP 2m -. Text \[bu] -.. -. -.ec -.\" End of macro definitions -. . .\" -------------------------------------------------------------------- .\" Title @@ -609,17 +504,9 @@ where the output of each program in the queue is taken as the input for the next program. . -.CodeSkip -. -.ds @1 "cat \f[I]file\f[P] |\"" -.ds @2 "\*[Ellipsis] | \f[I]preproc\f[P] | \*[Ellipsis] |\"" -.ds @3 "troff \f[I]options\f[P] | \f[I]postproc\f[P]\"" -. -.ShellCommand "address@hidden address@hidden address@hidden" -. -.rm @1 -.rm @2 -.rm @3 +.EX +cat \f[I]file\f[P] | ... | \f[I]preproc\f[P] | ... | troff \f[I]options\f[P] | \f[I]postproc\f[P] +.EE .P The preprocessors generate .I roff @@ -700,32 +587,16 @@ The classical preprocessors are . -.de @TP -.\" local indent for .TP -.TP \\w'\\f[B]soelim\\f[P]'u+2n -.. -.P .RS -.PD 0 address@hidden -.B tbl -for tables. address@hidden -.B eqn -for mathematical formul\[ae]. address@hidden -.B pic -for drawing diagrams. address@hidden -.B refer -for bibliographic references. address@hidden -.B soelim -for including macro files from standard locations. address@hidden -.B chem -for drawing chemical formul\[ae]. -.PD +.TS +lb l. +tbl for tables. +eqn for mathematical formul\[ae]. +pic for drawing diagrams. +refer for bibliographic references. +soelim for including macro files from standard locations. +chem for drawing chemical formul\[ae]. +.TE .RE . .P @@ -734,20 +605,13 @@ . .P .RS -.PD 0 address@hidden -.B grap -for constructing graphical elements. address@hidden -.B grn -for including -.BR gremlin (1) -pictures. -.PD +.TS +lb l. +grap for constructing graphical elements. +grn for including \fBgremlin\fR(1) pictures. +.TE .RE . -.rm @TP -. .\" -------------------------------------------------------------------- .SS "Formatter Programs" .\" -------------------------------------------------------------------- @@ -917,7 +781,7 @@ .P A macro package that is to be used in a document can be announced to the formatter by the command line option -.ShortOpt m , +-m , see .BR troff (@MAN1EXT@), or it can be specified within a document using the file inclusion @@ -1069,9 +933,9 @@ .BR LESSOPEN . This process is not well documented, so here an example: . -.CodeSkip -.ShellCommand LESSOPEN='|lesspipe %s' -.CodeSkip +.EX +LESSOPEN='|lesspipe %s' +.EE . where .B lesspipe @@ -1111,28 +975,27 @@ But it is also possible to have the mode automatically selected when the file is loaded into the editor. . -.Topic +.IP \(bu The most general method is to include the following 3 comment lines at the end of the file. . -.CodeSkip -.nf -.B \*[Comment] Local Variables: -.B \*[Comment] mode: nroff -.B \*[Comment] End: -.fi +.EX +.B \&.\e" Local Variables: +.B \&.\e" mode: nroff +.B \&.\e" End: +.EE . -.Topic +.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. . -.Topic +.IP \(bu Theoretically, it is possible to write the sequence -.CodeSkip -.B \*[Comment] \%-*-\ nroff\ -*- -.CodeSkip +.EX +.B \&.\e" \%-*-\ nroff\ -*- +.EE as the first line of a file to have it started in .I nroff mode when loaded. @@ -1149,17 +1012,17 @@ . In order to not disturb this, the following tips can be helpful. . -.Topic +.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 \*[Comment] +.B \&.\e" if a structuring element is needed. . -.Topic +.IP \(bu Never start a line with whitespace because this can lead to unexpected behavior. . @@ -1167,14 +1030,14 @@ .I roff requests. . -.Topic +.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. . -.Topic +.IP \(bu To additionally use the auto-fill mode in Emacs, it is best to insert an empty .I roff @@ -1190,14 +1053,14 @@ This is an example for a .I roff document. -.Text . +\&. This is the next sentence in the same paragraph. -.Text . +\&. 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. -.Text . +\&. In the output, this will still go to the same paragraph. .fi @@ -1426,8 +1289,6 @@ it is maintained by .MTO address@hidden "Werner Lemberg". . -.cp \n[roff_C] -. .\" -------------------------------------------------------------------- .\" Emacs setup .\" -------------------------------------------------------------------- Index: src/roff/groff/groff.man =================================================================== RCS file: /sources/groff/groff/src/roff/groff/groff.man,v retrieving revision 1.46 diff -u -r1.46 groff.man --- src/roff/groff/groff.man 28 Oct 2006 15:49:54 -0000 1.46 +++ src/roff/groff/groff.man 13 Jan 2007 07:48:43 -0000 @@ -1,7 +1,8 @@ .ig groff.man -Last update: 10 May 2006 +Last update: +09 Jan 2007 -- adapted to use .SY/.OP/.YS. Copyright (C) 1989, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -17,215 +18,22 @@ FDL in the main directory of the groff source package. .. . -.\" -------------------------------------------------------------------- -.\" Setup -.\" -------------------------------------------------------------------- -. -.do nr groff_C \n[.C] -.cp 0 -. -.mso www.tmac -. -.\" set adjust to both -.ad b -. -.\" fonts of fixed length -. -.if n \{\ -. mso tty-char.tmac -. ftr CR R -. ftr CI I -. ftr CB B -.\} -. -.if '\*[.T]'dvi' \ -. ftr CB CW -. -.\" -------------------------------------------------------------------- -.\" String definitions -. -.ds @- "\-\" -.ds @-- "\-\^\-\" -. -.ds Ellipsis .\|.\|.\" -. +.mso an-ext.tmac . -.\" -------------------------------------------------------------------- -.\" Begin of macro definitions -.de c -. \" this is like a comment request when escape mechanism is off -.. -.eo -. -.c -------------------------------------------------------------------- -.de TP+ -. br -. ns -. TP \$1 -.. -.c -------------------------------------------------------------------- -.c Like TP, but if specified indent is more than half -.c the current line-length - indent, use the default indent. -.de Tp -. ie \n[.$]=0:((0\$1)*2u>(\n.lu-\n(.iu)) .TP -. el .TP "\$1" -.. -.c -------------------------------------------------------------------- -.de Text -. nop \)\$* -.. -.c -------------------------------------------------------------------- -.de Synopsis -. ds @arg1 \$1\" -. nr @old_indent \n[.i] -. ad l -. in +\w'address@hidden'u -. ti address@hidden -. B address@hidden -. rr @old_indent -. rm @arg1 -.. -.c -------------------------------------------------------------------- -.de EndSynopsis -. ad -. in -.. -.c -------------------------------------------------------------------- -.c ShortOpt[] (name [arg]) -.c -.c short option in synopsis -.c -.de ShortOpt[] -. if \n[.$]=0 \ -. return -. ds @opt \$1\" -. shift -. ie \n[.$]=0 \ -. Text address@hidden@opt]\f[]\f[R]]\f[] -. el \ -. Text address@hidden@opt]\~\f[]\f[I]\/\$*\f[]\f[R]]\f[] -. rm @opt -.. -.c -------------------------------------------------------------------- -.c Option in synopsis (short option) -.de SynOpt -. if \n[.$]=0 \ -. return -. ds @opt \$1\" -. shift -. ie \n[.$]=0 \ -. Text address@hidden@opt]\f[]\f[R]]\f[] -. el \ -. Text address@hidden@opt]\~\f[]\f[I]\/\$*\f[]\f[R]]\f[] -. rm @opt -.. -.c -------------------------------------------------------------------- -.c ShortOpt ([char [punct]]) -.c -.c `-c' somewhere in the text -.c second arg is punctuation -.c -.de ShortOpt -. ds @opt \$1\" -. shift -. Text address@hidden@opt]\f[]\/\$* -. rm @opt -.. -.c -------------------------------------------------------------------- -.c LongOpt ([name [punct]]) -.c -.c `--name' somewhere in the text -.c second arg is punctuation -.c -.de LongOpt -. ds @opt \$1\" -. shift -. Text address@hidden@opt]\f[]\/\$* -. rm @opt -.. -.c -------------------------------------------------------------------- -.c OptDef (shortopt [longopt [argument]]) -.c -.c option documentation -.c args : `shortopt', `longopt' can be "" -.c -.de OptDef -. ds @short -. ds @long -. ds @arg -. if \n[.$]>=1 \{\ -. ds @arg1 "\$1\" -. if !'address@hidden'' \ -. ds @short "address@hidden@arg1]\f[]\" -. if \n[.$]>=2 \{\ -. if !'address@hidden'' \ -. as @short \f[CW]\0\f[] -. ds @arg2 "\$2\" -. if !'address@hidden'' \ -. ds @long "address@hidden@arg2]\f[]\" -. if \n[.$]>=3 \{\ -. if !'address@hidden'' \ -. as @long \|=\|\" -. shift 2 -. ds @arg \f[I]\$*\" -. \} -. \} -. \} -. IP "address@hidden@address@hidden" -. rm @arg -. rm @arg1 -. rm @arg2 -. rm @short -. rm @long .. -.c -------------------------------------------------------------------- -.c Continuation of an OptDef header. -.de OptDef+ -. br -. ns -. OptDef \$@ -.. -.c -------------------------------------------------------------------- -.c Environment variable +.\" -------------------------------------------------------------------- +.\" Environment variable .de EnvVar . SM -. BR \%\$1 \$2 +. BR \\%\\$1 \\$2 .. -.c -------------------------------------------------------------------- -.c a shell command line -.de ShellCommand -. nr @font \n[.f] -. c replace argument separator by unbreakable space -. ds @args \$1\"" -. shift -. while (\n[.$]>0) \{\ -. ds @args address@hidden -. shift -. \} -. br -. ad l -. nh -. Text \f[I]sh#\h'1m'address@hidden&\" -. ft R -. ft P -. hy -. ad -. ft address@hidden -. br -. rr @font -. rm @args -.. -.c -------------------------------------------------------------------- -.c `char or string' +.\" -------------------------------------------------------------------- +.\" `char or string' .de Quoted . ft CR -. Text \[oq]\$*\[cq] + \\[oq]\\$*\\[cq] . ft .. -.c -------------------------------------------------------------------- -.c End of macro definitions -.ec -. . .\" -------------------------------------------------------------------- .\" Title @@ -240,56 +48,46 @@ .SH SYNOPSIS .\" -------------------------------------------------------------------- . -.ad l -.Synopsis groff -.ShortOpt[] abcegiklpstzCEGNRSUVXZ -.ShortOpt[] d cs -.ShortOpt[] f fam -.ShortOpt[] F dir -.ShortOpt[] I dir -.ShortOpt[] K arg -.ShortOpt[] L arg -.ShortOpt[] m name -.ShortOpt[] M dir -.ShortOpt[] n num -.ShortOpt[] o list -.ShortOpt[] P arg -.ShortOpt[] r cn -.ShortOpt[] T dev -.ShortOpt[] w name -.ShortOpt[] W name +.SY groff +.OP -abcegiklpstzCEGNRSUVXZ +.OP -d cs +.OP -f fam +.OP -F dir +.OP -I dir +.br +.OP -K arg +.OP -L arg +.OP -m name +.OP -M dir +.OP -n num +.OP -o list +.OP -P arg +.br +.OP -r cn +.OP -T dev +.OP -w name +.OP -W name .RI [ file -.Text \*[Ellipsis]] -.EndSynopsis +.IR ... ] +.YS . -.Synopsis groff -.ShortOpt h +.SY groff +[ +.B -h | -.LongOpt help -.EndSynopsis -. -.Synopsis groff -.ShortOpt v +.B --help +] +.YS +. +.SY groff +[ +.B -v | -.LongOpt version +--version +] .RI [ option -.Text \*[Ellipsis]] -.EndSynopsis -. -.P -The command line is parsed according to the usual \f[CR]GNU\f[] -convention. -. -The whitespace between a command line option and its argument is -optional. -. -Options can be grouped behind a single -.ShortOpt -(minus character). -. -A filename of -.ShortOpt -(minus character) denotes the standard input. +.IR ...] +.YS . . .\" -------------------------------------------------------------------- @@ -329,6 +127,18 @@ .\" -------------------------------------------------------------------- .SH OPTIONS .\" -------------------------------------------------------------------- +.P +The command line is parsed according to the usual \f[CR]GNU\f[] +convention. +. +The whitespace between a command line option and its argument is +optional. +. +Options can be grouped behind a single \- (minus character). +. +A filename of \- (minus character) denotes the standard input. +. +.P . As .B groff @@ -359,26 +169,31 @@ .BR groff . . . -.OptDef e +.TP +-e Preprocess with .BR @address@hidden . . . -.OptDef g +.TP +-g Preprocess with .BR @address@hidden . . . -.OptDef G +.TP +-G Preprocess with .BR grap . . . -.OptDef h help +.TP +-h help Print a help message. . . -.OptDef I "" dir +.TP +-I dir This option may be used to specify a directory to search for files (both those on the command line and those named in .B \&.psbb @@ -394,11 +209,12 @@ the directories are searched in the order specified. No directory search is performed for files specified using an absolute path. This option implies the -.ShortOpt s +-s option. . . -.OptDef k +.TP +-k Preprocess with .BR preconv . This is run before any other preprocessor. @@ -406,21 +222,23 @@ Please refer to .BR preconv 's manual page for its behaviour if no -.ShortOpt K +-K option is specified. . . -.OptDef K "" arg +.TP +-K arg Set input encoding used by .B preconv to .IR arg . . Implies -.ShortOpt k . +-k . . . -.OptDef l +.TP +-l Send the output to a spooler program for printing. . The command that should be used for this is specified by the @@ -432,73 +250,80 @@ program by default. . See options -.ShortOpt L +-L and -.ShortOpt X . +-X . . . -.OptDef L "" arg +.TP +-L arg Pass .I arg to the spooler program. Several arguments should be passed with a separate -.ShortOpt L +-L option each. . Note that .B groff does not prepend -.ShortOpt\" just a minus sign +- (a minus sign) to .I arg before passing it to the spooler program. . . -.OptDef N +.TP +-N Don't allow newlines within .I eqn delimiters. . This is the same as the -.ShortOpt N +-N option in .BR @address@hidden . . . -.OptDef p +.TP +-p Preprocess with .BR @address@hidden . . . -.OptDef P "" "address@hidden" -.OptDef+ P "" "address@hidden address@hidden arg" +.TP +-P "-option" +.TQ +-P "-option \f[CB]-P\f[] arg" Pass -.I address@hidden +.I -option or -.I address@hidden arg +.I -option arg to the postprocessor. . The option must be specified with the necessary preceding minus sign(s) -.Quoted address@hidden +.Quoted - or -.Quoted address@hidden +.Quoted -- because .B groff does not prepend any dashes before passing it to the postprocessor. . For example, to pass a title to the \%gxditview postprocessor, the shell command -.IP -.ShellCommand groff address@hidden address@hidden address@hidden address@hidden 'groff it' \f[I]foo\f[] -.IP +.EX +groff -X -P -title -P 'groff it' \f[I]foo\f[] +.EE is equivalent to -.IP -.ShellCommand groff address@hidden address@hidden \f[I]foo\f[] | \ -gxditview address@hidden 'groff it' address@hidden +.EX +groff -X -Z \f[I]foo\f[] | \ +gxditview -title 'groff it' - +.EE . . -.OptDef R +.TP +-R Preprocess with .BR @address@hidden . . @@ -514,16 +339,18 @@ for more details. . . -.OptDef s +.TP +-s Preprocess with .BR @address@hidden . . . -.OptDef S +.TP +-S Safer mode. . Pass the -.ShortOpt S +-S option to .B @address@hidden and disable the following @@ -538,12 +365,14 @@ For security reasons, safer mode is enabled by default. . . -.OptDef t +.TP +-t Preprocess with .BR @address@hidden . . . -.OptDef T "" dev +.TP +-T dev Set output device to .IR dev . For this device, @@ -594,7 +423,7 @@ .IP For the following TTY output devices (postprocessor is always .BR grotty ), -.ShortOpt T +-T selects the output encoding: .RS .RS @@ -632,23 +461,26 @@ .BR @DEVICE@ . . . -.OptDef U +.TP +-U Unsafe mode. . Reverts to the (old) unsafe behaviour; see option -.ShortOpt S . +-S . . . -.OptDef v version +.TP +-v version Output version information of .B groff and of all programs that are run by it; that is, the given command line is parsed in the usual way, passing -.ShortOpt v +-v to all subprograms. . . -.OptDef V +.TP +-V Output the pipeline that would be run by .BR groff (as a wrapper program) on the standard output, but do not execute it. @@ -656,19 +488,20 @@ the commands are both printed on the standard error and run. . . -.OptDef X +.TP +-X Use .B \%gxditview instead of using the usual postprocessor to (pre)view a document. . The printing spooler behavior as outlined with options -.ShortOpt l +-l and -.ShortOpt L +-L is carried over to .BR \%gxditview (@MAN1EXT@) by determining an argument for the -.B address@hidden +.B -printCommand option of .BR \%gxditview (@MAN1EXT@). . @@ -676,34 +509,37 @@ .B Print action and the corresponding menu entry to that value. . -.ShortOpt X +-X only produces good results with -.ShortOpt Tps , -.ShortOpt TX75 , -.ShortOpt TX75-12 , -.ShortOpt TX100 , +-Tps , +-TX75 , +-TX75-12 , +-TX100 , and -.ShortOpt TX100-12 . +-TX100-12 . . The default resolution for previewing -.ShortOpt Tps +-Tps output is 75\|dpi; this can be changed by passing the -.ShortOpt resolution +-resolution option to .BR \%gxditview , for example . -.IP -.ShellCommand groff address@hidden address@hidden@-]resolution address@hidden address@hidden foo.1 +.EX +groff -X -P-resolution -P100 -man foo.1 +.EE . . -.OptDef z +.TP +-z Suppress output generated by .BR @address@hidden . Only error messages are printed. . . -.OptDef Z +.TP +-Z Do not automatically postprocess .I groff intermediate output in the usual manner. @@ -729,65 +565,83 @@ These options are described in more detail in .BR @address@hidden (@MAN1EXT@). . -.OptDef a +.TP +-a ascii approximation of output. . -.OptDef b +.TP +-b backtrace on error or warning. . -.OptDef c +.TP +-c disable color output. . Please consult the .BR \%grotty (@MAN1EXT@) man page for more details. . -.OptDef C +.TP +-C enable compatibility mode. . -.OptDef d "" cs -.OptDef+ d "" name=s +.TP +-d cs +.TQ +-d name=s define string. . -.OptDef E +.TP +-E disable .B @address@hidden error messages. . -.OptDef f "" fam +.TP +-f fam set default font family. . -.OptDef F "" dir +.TP +-F dir set path for font DESC files. . -.OptDef i +.TP +-i process standard input after the specified input files. . -.OptDef m "" name +.TP +-m name include macro file \f[I]name\f[]\f[B].tmac\f[] (or \f[B]tmac.\f[]\f[I]name\f[]); see also .BR \%groff_tmac (@MAN5EXT@). . -.OptDef M "" dir +.TP +-M dir path for macro files. . -.OptDef n "" num +.TP +-n num number the first page .IR num . . -.OptDef o "" list +.TP +-o list output only pages in .IR list . . -.OptDef r "" cn -.OptDef+ r "" name=n +.TP +-r cn +.TQ +-r name=n set number register. . -.OptDef w "" name +.TP +-w name enable warning .IR name . . -.OptDef W "" name +.TP +-W name disable warning .IR name . . @@ -971,7 +825,7 @@ .\" -------------------------------------------------------------------- . Macro packages can be included by option -.ShortOpt m . +-m . . The .I groff @@ -986,9 +840,9 @@ The traditional man page format; see .BR \%groff_man (@MAN7EXT@). It can be specified on the command line as -.ShortOpt man +-man or -.ShortOpt m +-m .BR man . . .TP @@ -1001,9 +855,9 @@ format and branches to the corresponding macro package. . It can be specified on the command line as -.ShortOpt mandoc +-mandoc or -.ShortOpt m +-m .BR mandoc . . .TP @@ -1011,9 +865,9 @@ The \f[CR]BSD\f[]-style man page format; see .BR \%groff_mdoc (@MAN7EXT@). It can be specified on the command line as -.ShortOpt mdoc +-mdoc or -.ShortOpt m +-m .BR mdoc . . .TP @@ -1023,9 +877,9 @@ document format; see .BR \%groff_me (@MAN7EXT@). It can be specified on the command line as -.ShortOpt me +-me or -.ShortOpt m +-m .BR me . . .TP @@ -1035,9 +889,9 @@ document format; see .BR \%groff_mm (@MAN7EXT@). It can be specified on the command line as -.ShortOpt mm +-mm or -.ShortOpt m +-m .BR mm . . .TP @@ -1047,9 +901,9 @@ document format; see .BR \%groff_ms (@MAN7EXT@). It can be specified on the command line as -.ShortOpt ms +-ms or -.ShortOpt m +-m .BR ms . . .TP @@ -1112,7 +966,7 @@ extensions. . The command line option -.ShortOpt C +-C switches .B @address@hidden into @@ -1149,7 +1003,7 @@ file format. . A device is specified by the option -.ShortOpt T . +-T . The .I groff devices are as follows. @@ -1223,7 +1077,7 @@ .BR \%groff_font (@MAN5EXT@). . This can be overridden with the -.B address@hidden +.B -X option. . .P @@ -1473,7 +1327,7 @@ Setting this option implies .BR groff 's command line option -.ShortOpt k +-k (this is, .B groff actually always calls @@ -1486,7 +1340,7 @@ without arguments. . An explicit -.ShortOpt K +-K command line option overrides the value of .EnvVar GROFF_ENCODING . . @@ -1557,7 +1411,7 @@ device is used as default. . This device name is overwritten by the option -.ShortOpt T . +-T . . . .\" -------------------------------------------------------------------- @@ -1613,7 +1467,7 @@ . .TP .IB name .tmac -.TP+ +.TQ .BI tmac. name Macro file for macro package .IR name . @@ -1676,31 +1530,31 @@ .I troff had to be called by . -.P -.ShellCommand pic foo.me | tbl | troff address@hidden address@hidden | grotty -. +.EX +pic foo.me | tbl | troff -me -Tlatin1 | grotty +.EX .P Using .BR groff , this pipe can be shortened to the equivalent command -.P -.ShellCommand groff address@hidden address@hidden address@hidden address@hidden latin1 foo.me -. +.EX +groff -p -t -me -T latin1 foo.me +.EE .P An even easier way to call this is to use .BR grog (@MAN1EXT@) to guess the preprocessor and macro options and execute the generated command (by using backquotes to specify shell command substitution) -.P -.ShellCommand \`grog address@hidden foo.me\` -. +.EX +\`grog -Tlatin1 foo.me\` +.EE .P The simplest way is to view the contents in an automated way by calling . -.P -.ShellCommand groffer foo.me -. +.EX +groffer foo.me +.EE . .\" -------------------------------------------------------------------- .SH BUGS @@ -1802,7 +1656,7 @@ .MTO address@hidden "James Clark" . . It was rewritten, enhanced, and put under the FDL license by -\m[blue]Bernd Warken\m[]. +Bernd Warken. . It is maintained by .MTO address@hidden "Werner Lemberg" . Index: src/roff/grog/grog.man =================================================================== RCS file: /sources/groff/groff/src/roff/grog/grog.man,v retrieving revision 1.12 diff -u -r1.12 grog.man --- src/roff/grog/grog.man 6 Nov 2006 17:57:21 -0000 1.12 +++ src/roff/grog/grog.man 13 Jan 2007 07:48:44 -0000 @@ -1,9 +1,4 @@ .TH GROG @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@" -.SH NAME -grog \- guess options for groff command -.SH SYNOPSIS -.\" The .SH was moved to this place in order to appease `apropos'. -. .\" -------------------------------------------------------------------- .\" Legalize .\" -------------------------------------------------------------------- @@ -64,301 +59,45 @@ .hy .. . -.\" -------------------------------------------------------------------- -.\" Setup -.\" -------------------------------------------------------------------- -. -.mso www.tmac -. -.if n \{\ -. mso tty-char.tmac -. ftr CR R -. ftr CI I -. ftr CB B -.\} -. -.if '\*[.T]'dvi' \{\ -. ftr CB CW -.\} -. -.ds Ellipsis "\&.\|.\|.\"" -. -.\" -------------------------------------------------------------------- -.\" configuration of prompt for `.Shell_cmd'* macros -.ds grog:Shell_cmd.prompt_text sh#\" prompt for shell commands -.ds grog:Shell_cmd_base.prompt_font I\" font for prompts -. -.\" automatically determine setup from the configuration above -.als @f grog:Shell_cmd_base.prompt_font\" -.als @t grog:Shell_cmd.prompt_text\" -.ds grog:Shell_cmd.prompt address@hidden@t]\f[]\" needed -.nr @w \w'\*[grog:Shell_cmd.prompt]'\" -.ft address@hidden -.\" Full prompt width is maximum of texts plus 1m -.nr grog:Shell_cmd_base.prompt_width (address@hidden>address@hidden)\" needed -.ft -.rm @f -.rm @t -.rr @w -. -. -.\" -------------------------------------------------------------------- -.\" static register for inter-macro communication in `.Synopsis'* -.nr grog:Synopsis.level 0 +.mso an-ext.tmac . .\" -------------------------------------------------------------------- -.\" Macro definitions -. -.\" Ignore all arguments like a comment, even after a .eo call. -.de c -.. -.c -------------------------------------------------------------------- -.c .Synopsis () -.c -.c Begin a synopsis section, to be ended by a ./Synopsis macro. -.c -.de Synopsis -. if (\\n[grog:Synopsis.level] > 0) \ -. Error .\\$0: previous .Synopsis was not closed by ./Synopsis. -. nh -. ds @1 \\$1\" -. nr @old_indent \\n(.i -. ad l -. in +\w'address@hidden'u -. ti address@hidden -. B address@hidden -. rr @old_indent -. rm @1 -. nr grog:Synopsis.level +1\" marker for ./Synopsis -.. -.c -------------------------------------------------------------------- -.c ./Synopsis () -.c -.c Close a synopsis section opened by the previous .Synopsis macro. -.c -.de /Synopsis -. if (\\n[grog:Synopsis.level] <= 0) \ -. Error .\\$0: no previous call of .Synopsis -. br -. ad -. in -. hy -. nr grog:Synopsis.level -1 -.. -.c -------------------------------------------------------------------- -.c .Opt_alt ([ ]... [ []]) -.c -.c Alternate options separated by a vertical bar. -.c -.c Arguments: -.c minus: either `-' or `--' (font CB). -.c opt: a name for an option, empty allowed (font CB). -.c arg: optionally, the argument to the option (font I). -.c punct: optional punctuation (in the starting font). -.c Result: -.c The minus/opt argument pairs, each -.c separated by a vertical bar `|', optionally add 'arg', separated -.c a space character ` '. -.c -.c Example: -.c .Opt_alt - T -- device -- device-troff device . -.c results in -.c -T|--device|--device-troff device. -.c -.de Opt_alt -. Opt_alt_base "" | "" \\$@ -.. -.c -------------------------------------------------------------------- -.c .Opt_alt_base (
   [ ]... [arg [punct]])
-.c
-.c Alternating options; base macro for many others; do not use directly.
-.c
-.c Arguments:
-.c   
: prefix, result is preceded by this.
-.c   : separator between minus/opt pairs.
-.c   : postfix, is appended to the result.
-.c   : either `-' or `--' (font CB).
-.c   : a name for an option, empty allowed (font CB).
-.c   : optionally, the argument to the option (font I).
-.c   : optional punctuation (in the starting font).
-.c Result:
-.c   String `
' followed by the / argument pairs, each
-.c   separated by string `', optionally add '', separated by
-.c   a single space ` ', followed by the string `'.  Terminated
-.c   by the optional punctuation .
-.c
-.de Opt_alt_base
-.  nr @font \\n[.f]\"
-.  if (\\n[.$] < 3) \
-.    Error .\\0: not enough arguments.
-.  ds @pre \)\\$1\)\"                   prefix
-.  ds @sep \)\\$2\)\"                   separator
-.  ds @post \)\\$3\)\"                  postfix
-.  shift 3
-.  nr @count 0
-.  ds @res address@hidden"
-.  while (\\n[.$] >= 2) \{\
-.    c                                  do the pairs, break on no `-'
-.    if !'\\$1'-' \{\
-.      if !'\\$1'--' \
-.        break
-.    \}
-.    c                                  separator
-.    if (address@hidden > 0) \
-.      as @res address@hidden:\"
-.    nr @count +1
-.    c                                  combine minus with option name
-.    as @res \f[CB]\\-\"
-.    if '\\$1'--' \
-.      as @res \\-\"
-.    as @res \\$2\"
-.    shift 2
-.  \}
-.  if (\\n[.$] >= 3) \
-.    Error .\\0: wrong arguments: \\$@
-.  c                                    all pairs are done
-.  ie (\\n[.$] == 0) \
-.    as @res address@hidden"
-.  el \{\
-.    c                                  optional option argument
-.    if !'\\$1'' \
-.      as @res \f[CR] \,\f[I]\\$1\"
-.    shift
-.    c                                  postfix
-.    as @res address@hidden"
-.    if (\\n[.$] >= 1) \{\
-.      c                                add punctuation
-.      as @res address@hidden"
-.    \}
-.  \}
-.  nh
-.  Text address@hidden
-.  hy
-.  ft address@hidden
-.  rr @count
-.  rr @font
-.  rm @pre
-.  rm @post
-.  rm @sep
-.  rm @res
-..
-.c  --------------------------------------------------------------------
-.c .Text  (...)
-.c
-.c Treat the arguments as text, no matter how they look.
-.c
-.de Text
-.  if (\\n[.$] == 0) \
-.    return
-.  nh
-.  nop \)\\$*\)
-.  hy
-..
-.c --------------------------------------------------------------------
-.c .File_name  ()
-.c
-.c Display a file or directory name in CB font.
-.c
-.de File_name
-.  Header_CB \\$@
-..
-.c --------------------------------------------------------------------
-.c .Header_CB  ()
-.c
-.c Display a line in CB font, for example after .TP
-.c
-.de Header_CB
-.  nh
-.  Text \f[CB]\\$1\f[]\\$2
-.  hy
-..
-.c --------------------------------------------------------------------
-.c .Topic  ([])
-.c
-.c A bulleted paragraph
-.c
-.de Topic
-.  ie (\\n[.$] = 0) \
-.    ds @indent 2m\"
-.  el \
-.    ds @indent \\$1\"
-.  TP address@hidden
-.  Text \[bu]
-.  rm @indent
-..
-.c --------------------------------------------------------------------
-.c .Shell_cmd  ( [] ...)
-.c
-.c A shell command line; display args alternating in fonts CR and CI.
-.c
-.de Shell_cmd
-.  grog:Shell_cmd_base "\*[grog:Shell_cmd.prompt]" \\$@
-..
-.c --------------------------------------------------------------------
-.c .Shell_cmd_base  ( [ [] ...])
-.c
-.c A shell command line; display args alternating in fonts CR and CI.
-.c Internal, do not use directly.
-.c
-.c Globals: read-only register @.Shell_cmd_width
-.c
-.de grog:Shell_cmd_base
-.  if (\\n[.$] <= 0) \
-.    return
-.  nr @+font \\n[.f]\"
-.  ds @prompt \\$1\"
-.  ft CR
-.  c gap between prompt and command
-.  nr @+gap \\n[grog:Shell_cmd_base.prompt_width]-\\w'address@hidden'\"
-.  ds @res address@hidden'address@hidden'\"
-.  shift
-.  ds @cf CR\"
-.  while (\\n[.$] > 0) \{\
-.    as @res address@hidden"
-.    shift
-.    ie 'address@hidden'CR' \
-.      ds @cf I\"
-.    el \
-.      ds @cf CR\"
-.  \}
-.  br
-.  ad l
-.  nh
-.  nf
-.  Text address@hidden"
-.  fi
-.  hy
-.  ad
-.  br
-.  ft address@hidden
-.  rr @+font
-.  rr @+gap
-.  rm @cf
-.  rm @res
+.\" Local macros
+.de FN
+.I \\$1
 ..
+
+.\" --------------------------------------------------------------------
 .
-.\" End of macro definitions
-.
+.SH NAME
+grog \- guess options for groff command
+
+.SH SYNOPSIS
 .
 .\" --------------------------------------------------------------------
 .\" SH "SYNOPSIS"
 .\" --------------------------------------------------------------------
 .
-.ad l
-.Synopsis grog
-.RB [ \-C ]
-.RI [ groff\-option \*[Ellipsis]]
-.RB [ \-\- ]
-.RI [ \%filespec \*[Ellipsis]]
-./Synopsis
-.
-.Synopsis grog
-.Opt_alt - h -- help
-./Synopsis
-.
-.Synopsis grog
-.Opt_alt - v -- version
-./Synopsis
+.SY grog
+.OP \-C
+.OP groff\-option ...
+.OP \-\-
+.RI filespec ...
+.
+.SY groff
+[ 
+.B -h
+|
+.B --help
+]
+.
+.SY groff
+[
+.B -v
+|
+--version
+]
+.YS
 .
 .
 .\" --------------------------------------------------------------------
@@ -582,34 +321,33 @@
 .SH "EXAMPLES"
 .\" --------------------------------------------------------------------
 .
-.Topic
+.IP \(bu
 Calling
 .RS
-.IP
-.Shell_cmd "grog meintro.me"
-.P
+.EX
+grog meintro.me
+.EE
 results in
-.IP
-.ft CR
+.EX
 groff \-me meintro.me
-.ft
+.EE
 .P
 So
 .B grog
 recognized that the file
-.File_name meintro.me
+.FN meintro.me
 is written with the
 .B \-me
 macro package.
 .RE
 .
 .
-.Topic
+.IP \(bu
 On the other hand,
 .RS
-.IP
-.Shell_cmd "grog pic.ms"
-.P
+.EX
+grog pic.ms
+.EE
 outputs
 .IP
 .ft CR
@@ -620,7 +358,7 @@
 .BR \-ms ,
 .B grog
 recognized that the file
-.File_name pic.ms
+.FN pic.ms
 additionally needs
 .BR \-pte ,
 the combination of
@@ -637,12 +375,12 @@
 .RE
 .
 .
-.Topic
+.IP \(bu
 If both files are combined by the command
 .RS
-.IP
-.Shell_cmd "grog meintro.me pic.ms"
-.P
+.EX
+grog meintro.me pic.ms
+.EE
 an error message is sent to standard error because
 .B groff
 cannot work with two different macro packages:
@@ -662,12 +400,12 @@
 .RE
 .
 .
-.Topic
+.IP \(bu
 The call of
 .RS
-.IP
-.Shell_cmd "grog \-ksS \-Tdvi grnexmpl.g"
-.P
+.EX
+grog \-ksS \-Tdvi grnexmpl.g
+.EE
 contains several
 .B groff
 options that are just passed on the output without any interface to
@@ -684,11 +422,9 @@
 with argument
 .BR dvi .
 The output is
-.IP
-.ft CR
+.EX
 groff \-ksS \-Tdvi grnexmpl.g
-.ft
-.P
+.EE
 so no additional option was added by
 .BR grog .
 As no option
@@ -699,7 +435,7 @@
 .RE
 .
 .
-.Topic
+.IP \(bu
 .B grog
 can also handle files using the
 .I chem
@@ -707,14 +443,13 @@
 .
 The example
 .RS
-.IP
-.Shell_cmd "grog chAh_brackets.chem"
-.P
+.EX
+grog chAh_brackets.chem
+.EE
 outputs
-.IP
-.ft CR
+.EX
 chem chAh_brackets.chem | groff \-pe
-.ft
+.EE
 .P
 So
 .B chem
Index: src/roff/nroff/nroff.man
===================================================================
RCS file: /sources/groff/groff/src/roff/nroff/nroff.man,v
retrieving revision 1.17
diff -u -r1.17 nroff.man
--- src/roff/nroff/nroff.man	13 Apr 2005 05:56:32 -0000	1.17
+++ src/roff/nroff/nroff.man	13 Jan 2007 07:48:44 -0000
@@ -17,23 +17,15 @@
 the original English.
 ..
 .
+.mso an-ext.tmac
+.
 .TH @address@hidden @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
 .
 .SH NAME
 @address@hidden \- emulate nroff command with groff
 .
 .SH SYNOPSIS
-.nr a \n(.j
-.ad l
-.nr i \n(.i
-.in +\w'address@hidden@nroff 'u
-.ti \niu
-.B @address@hidden
-.de OP
-.ie \\n(.$-1 .RI "[\ \fB\\$1\fP" "\\$2" "\ ]"
-.el .RB "[\ " "\\$1" "\ ]"
-..
-.
+.SY @address@hidden
 .OP \-CchipStUv
 .OP \-d cs
 .OP \-M dir
@@ -43,8 +35,7 @@
 .OP \-r cn
 .OP \-T name
 .RI "[\ " "file" "\ .\|.\|.\ ]"
-.br
-.ad \na
+.YS
 .
 .SH DESCRIPTION
 The
Index: src/roff/troff/troff.man
===================================================================
RCS file: /sources/groff/groff/src/roff/troff/troff.man,v
retrieving revision 1.60
diff -u -r1.60 troff.man
--- src/roff/troff/troff.man	13 Oct 2003 19:53:52 -0000	1.60
+++ src/roff/troff/troff.man	13 Jan 2007 07:48:44 -0000
@@ -2,7 +2,8 @@
 .ig
 troff.man
 
-Last update : 12 Oct 2003
+Last update:
+09 Jan 2007 -- converted to use .SY/.OP./.YS.
 
 This file is part of groff, the GNU roff type-setting system.
 
@@ -12,6 +13,7 @@
 
 modified by Werner Lemberg 
             Bernd Warken 
+            Eric S. Raymond 
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
@@ -23,25 +25,10 @@
 FDL in the main directory of the groff source package.
 ..
 .
+.mso an-ext.tmac
 .
 .\" --------------------------------------------------------------------
-.\" Setup
-.\" --------------------------------------------------------------------
-.
-.do nr troff_C \n[.C]
-.cp 0
-.
-.mso www.tmac
-.
-.if n \{\
-.  mso tty-char.tmac
-.  ftr CR R
-.  ftr CI I
-.  ftr CB B
-.\}
-.
-.if '\*[.T]'dvi' \
-.  ftr CB CW
+.\" Local macro definitions
 .
 .de TQ
 .br
@@ -49,14 +36,6 @@
 .TP \\$1
 ..
 .
-.\" Like TP, but if specified indent is more than half
-.\" the current line-length - indent, use the default indent.
-.de Tp
-.ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
-.el .TP "\\$1"
-..
-.
-.
 .\" --------------------------------------------------------------------
 .\" Title
 .\" --------------------------------------------------------------------
@@ -70,21 +49,13 @@
 .SH SYNOPSIS
 .\" --------------------------------------------------------------------
 .
-.nr a \n(.j
-.ad l
-.nr i \n(.i
-.in +\w'address@hidden@troff 'u
-.ti \niu
-.B @address@hidden
-.de OP
-.ie \\n(.$-1 .RI "[\ \fB\\$1\fP" "\\$2" "\ ]"
-.el .RB "[\ " "\\$1" "\ ]"
-..
+.SY @address@hidden
 .OP \-abcivzCERU
 .OP \-d cs
 .OP \-f fam
 .OP \-F dir
 .OP \-I dir
+.br
 .OP \-m name
 .OP \-M dir
 .OP \-n num
@@ -93,12 +64,9 @@
 .OP \-T name
 .OP \-w name
 .OP \-W name
-.RI "[\ " files\|.\|.\|. "\ ]"
 .br
-.ad \na
-.P
-It is possible to have whitespace between a command line option and
-its parameter.
+.RI "[" files\|... "]"
+.YS
 .
 .
 .\" --------------------------------------------------------------------
@@ -121,6 +89,9 @@
 .\" --------------------------------------------------------------------
 .SH OPTIONS
 .\" --------------------------------------------------------------------
+.P
+Whitespace is optional between a command line option and
+its parameter.
 .
 .TP \w'\-dname=s'u+2n
 .B \-a
@@ -378,10 +349,7 @@
 .TE
 .
 .P
-.nr x \w'\fBright-brace'+1n+\w'00000'u
-.ta \nxuR
-.
-.TP \nxu+3n
+.TP
 .BR break "\t4"
 In fill mode, lines which could not be broken so that their length was
 less than the line length.
@@ -575,7 +543,7 @@
 .SH FILES
 .\" --------------------------------------------------------------------
 .
-.Tp \w'@FONTDIR@/devname/DESC'u+3n
+.TP
 .B @MACRODIR@/troffrc
 Initialization file (called before any other macro package).
 .
--- tmac/Makefile.sub.~1.42.~	2006-12-19 03:02:52.000000000 -0500
+++ tmac/Makefile.sub	2007-01-12 10:00:16.000000000 -0500
@@ -27,7 +27,7 @@
   groff_www.n
 
 NORMALFILES=\
-  man.tmac mandoc.tmac andoc.tmac an-old.tmac \
+  man.tmac mandoc.tmac andoc.tmac an-old.tmac an-ext.tmac \
   ms.tmac \
   me.tmac \
   mdoc.tmac \
Index: tmac/an-old.tmac
===================================================================
RCS file: /sources/groff/groff/tmac/an-old.tmac,v
retrieving revision 1.55
diff -u -r1.55 an-old.tmac
--- tmac/an-old.tmac	27 May 2006 14:48:22 -0000	1.55
+++ tmac/an-old.tmac	13 Jan 2007 07:48:45 -0000
@@ -582,6 +582,20 @@
 .  in \\n[an-margin]u
 ..
 .
+.de EX
+.  sp 0.5
+.  nf
+.  hy 0
+.  ft CW
+..
+.de EE
+.  ft
+.  fi
+.  hy
+.  sp 0.5
+..
+.
+.
 .\" table support
 .
 .de1 TS
Index: tmac/groff_me.man
===================================================================
RCS file: /sources/groff/groff/tmac/groff_me.man,v
retrieving revision 1.4
diff -u -r1.4 groff_me.man
--- tmac/groff_me.man	27 Jun 2001 12:47:29 -0000	1.4
+++ tmac/groff_me.man	13 Jan 2007 07:48:45 -0000
@@ -1,3 +1,4 @@
+.\" t
 .\" Copyright (c) 1980 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -36,7 +37,7 @@
 This package of
 .I troff
 macro definitions provides a canned formatting
-facility for tech%nical papers in various formats.
+facility for technical papers in various formats.
 .PP
 The macro requests are defined below.
 Many
@@ -44,9 +45,9 @@
 requests are unsafe in conjunction with
 this package, however, these requests may be used with
 impunity after the first .pp:
-.nf
-.IP
-.ta \w'.sz +n  'u
+.
+.TS
+l l.
 \&.bp	begin new page
 \&.br	break output line here
 \&.sp n	insert n spacing lines
@@ -54,7 +55,7 @@
 \&.na	no alignment of right margin
 \&.ce n	center next n lines
 \&.ul n	underline next n lines
-.fi
+.TE
 .PP
 Output of the
 .I pic,
@@ -65,9 +66,12 @@
 preprocessors
 is acceptable as input.
 .SH FILES
address@hidden@/me.tmac (a wrapper file for e.tmac)
-.br
+.TP
address@hidden@/me.tmac 
+a wrapper file for e.tmac
+.TP
 @MACRODIR@/e.tmac
+the macros themselves
 .SH "SEE ALSO"
 .BR groff (@MAN1EXT@),
 .BR @address@hidden (@MAN1EXT@)
@@ -82,51 +86,28 @@
 .I "The \-me Reference Manual"
 for interesting details.
 .PP
-.ta \w'.eh \'x\'y\'z\'  'u +\w'Initial 'u +\w'Cause 'u
-.br
-.di x
-			\ka
-.br
-.di
-.na
-.in \nau
-.ti 0
-Request	Initial	Cause	Explanation
-.ti 0
-	Value	Break
-.br
-.in \nau
-.ti 0
+.TS
+l l l l.
+Request	Initial\ Value	Cause\ Break	Explanation
 \&.(c	-	yes	Begin centered block
-.ti 0
 \&.(d	-	no	Begin delayed text
-.ti 0
 \&.(f	-	no	Begin footnote
-.ti 0
 \&.(l	-	yes	Begin list
-.ti 0
 \&.(q	-	yes	Begin major quote
-.ti 0
-\&.(x \fIx\fR	-	no	Begin indexed item in index
+\&.(x \fIx\fR	-	no	T{
+Begin indexed item in index
 .I x
-.ti 0
+T}
 \&.(z	-	no	Begin floating keep
-.ti 0
 \&.)c	-	yes	End centered block
-.ti 0
 \&.)d	-	yes	End delayed text
-.ti 0
 \&.)f	-	yes	End footnote
-.ti 0
 \&.)l	-	yes	End list
-.ti 0
 \&.)q	-	yes	End major quote
-.ti 0
 \&.)x	-	yes	End index item
-.ti 0
 \&.)z	-	yes	End floating keep
-.ti 0
-\&.++ \fIm H\fR	-	no	Define paper section.
+\&.++ \fIm H\fR	-	no	T{
+Define paper section.
 .I m
 defines the part of the paper, and can be
 .B C
@@ -142,23 +123,24 @@
 or
 .B RA
 (appendix renumbered from page one).
-.ti 0
-\&.+c \fIT\fR	-	yes	Begin chapter (or appendix, etc., as
+T}
+\&.+c \fIT\fR	-	yes	T{
+Begin chapter (or appendix, etc., as
 set by .++).
 .I T
 is the chapter title.
-.ti 0
+T}
 \&.1c	1	yes	One column format on a new page.
-.ti 0
 \&.2c	1	yes	Two column format.
-.ti 0
-\&.EN	-	yes	Space after equation
+\&.EN	-	yes	T{
+Space after equation
 produced by
 .I eqn
 or
 .IR neqn .
-.ti 0
-\&.EQ \fIx y\fR	-	yes	Precede equation; break out and
+T}
+\&.EQ \fIx y\fR	-	yes	T{
+Precede equation; break out and
 add space.
 Equation number is
 .IR y .
@@ -170,112 +152,102 @@
 to left-adjust the equation, or
 .I C
 to center the equation.
-.ti 0
+T}
 \&.GE	-	yes	End \fIgremlin\fP picture.
-.ti 0
 \&.GS	-	yes	Begin \fIgremlin\fP picture.
-.ti 0
 \&.PE	-	yes	End \fIpic\fP picture.
-.ti 0
 \&.PS	-	yes	Begin \fIpic\fP picture.
-.ti 0
 \&.TE	-	yes	End table.
-.ti 0
 \&.TH	-	yes	End heading section of table.
-.ti 0
-\&.TS \fIx\fR	-	yes	Begin table; if \fIx\fR is
+\&.TS \fIx\fR	-	yes	T{
+Begin table; if \fIx\fR is
 .I H
 table has repeated heading.
-.ti 0
-\&.b \fIx\fR	no	no	Print
+T}
+\&.b \fIx\fR	no	no	T{
+Print
 .I x
 in boldface; if no argument switch to boldface.
-.ti 0
-\&.ba \fI+n\fR	0	yes	Augments the base indent by
+T}
+\&.ba \fI+n\fR	0	yes	T{
+Augments the base indent by
 .I n.
 This indent is used to set the indent on regular text
 (like paragraphs).
-.ti 0
+T}
 \&.bc	no	yes	Begin new column
-.ti 0
-\&.bi \fIx\fR	no	no	Print
+\&.bi \fIx\fR	no	no	T{
+Print
 .I x
 in bold italics (nofill only)
-.ti 0
+T}
 \&.bu	-	yes	Begin bulleted paragraph
-.ti 0
 \&.bx \fIx\fR	no	no	Print \fIx\fR in a box (nofill only).
-.ti 0
 \&.ef \fI\'x\'y\'z\'\fR	\'\'\'\'	no	Set even footer to x  y  z
-.ti 0
 \&.eh \fI\'x\'y\'z\'\fR	\'\'\'\'	no	Set even header to x  y  z
-.ti 0
 \&.fo \fI\'x\'y\'z\'\fR	\'\'\'\'	no	Set footer to x  y  z
-.ti 0
 \&.hx	-	no	Suppress headers and footers on next page.
-.ti 0
 \&.he \fI\'x\'y\'z\'\fR	\'\'\'\'	no	Set header to x  y  z
-.ti 0
 \&.hl	-	yes	Draw a horizontal line
-.ti 0
-\&.i \fIx\fR	no	no	Italicize
+\&.i \fIx\fR	no	no	T{
+Italicize
 .I x;
 if
 .I x
 missing, italic text follows.
-.ti 0
-\&.ip \fIx y\fR	no	yes	Start indented paragraph,
+T}
+\&.ip \fIx y\fR	no	yes	T{
+Start indented paragraph,
 with hanging tag
 .IR x .
 Indentation is
 .I y
 ens (default 5).
-.ti 0
+T}
 \&.lp	yes	yes	Start left-blocked paragraph.
-.ti 0
 \&.np	1	yes	Start numbered paragraph.
-.ti 0
 \&.of \fI\'x\'y\'z\'\fR	\'\'\'\'	no	Set odd footer to x  y  z
-.ti 0
 \&.oh \fI\'x\'y\'z\'\fR	\'\'\'\'	no	Set odd header to x  y  z
-.ti 0
 \&.pd	-	yes	Print delayed text.
-.ti 0
-\&.pp	no	yes	Begin paragraph.
+\&.pp	no	yes	T{
+Begin paragraph.
 First line indented.
-.ti 0
+T}
 \&.r	yes	no	Roman text follows.
-.ti 0
 \&.re	-	no	Reset tabs to default values.
-.ti 0
-\&.sh \fIn x\fR	-	yes	Section head follows,
+\&.sh \fIn x\fR	-	yes	T{
+Section head follows,
 font automatically bold.
 .I n
 is level of section,
 .I x
 is title of section.
-.ti 0
-\&.sk	no	no	Leave the next page blank.
+T}
+\&.sk	no	no	T{
+Leave the next page blank.
 Only one page is remembered ahead.
-.ti 0
-\&.sm \fIx\fR	-	no	Set
+T}
+\&.sm \fIx\fR	-	no	T{
+Set
 .I x
 in a smaller pointsize.
-.ti 0
-\&.sz \fI+n\fR	10p	no	Augment the point size by
+T}
+\&.sz \fI+n\fR	10p	no	T{
+Augment the point size by
 .I n
 points.
-.ti 0
+T}
 \&.tp	no	yes	Begin title page.
-.ti 0
-\&.u \fIx\fR	-	no	Underline argument (even in \fItroff\fR).
+\&.u \fIx\fR	-	no	T{
+Underline argument (even in \fItroff\fR).
 (Nofill only).
-.ti 0
+T}
 \&.uh	-	yes	Like .sh but unnumbered.
-.ti 0
-\&.xp \fIx\fR	-	no	Print index
+\&.xp \fIx\fR	-	no	T{
+Print index
 .I x.
-.ad
+T}
+.TE
 .
 .\" Local Variables:
 .\" mode: nroff
Index: tmac/groff_trace.man
===================================================================
RCS file: /sources/groff/groff/tmac/groff_trace.man,v
retrieving revision 1.3
diff -u -r1.3 groff_trace.man
--- tmac/groff_trace.man	24 Oct 2006 08:04:14 -0000	1.3
+++ tmac/groff_trace.man	13 Jan 2007 07:48:45 -0000
@@ -1,15 +1,3 @@
-.
-.TH GROFF_TRACE @MAN7EXT@ "@MDATE@" "Groff Version @VERSION@"
-.SH NAME
-groff_trace \- groff macro package trace.tmac
-.SH SYNOPSIS
-.\" The .SH was moved to this place to make `apropos' happy.
-.
-.
-.\" --------------------------------------------------------------------
-.\" Legalize
-.\" --------------------------------------------------------------------
-.
 .ig
 groff_trace.7
 
@@ -32,286 +20,17 @@
 FDL in the main directory of the groff source package.
 ..
 .
-.\" --------------------------------------------------------------------
-.\" Setup
-.\" --------------------------------------------------------------------
-.
-.do nr groff_trace_C \n[.C]
-.cp 0
-.
-.mso www.tmac
-.
-.if n \{\
-.  mso tty-char.tmac
-.  ftr CR R
-.  ftr CI I
-.  ftr CB B
-.\}
-.
-.ds Ellipsis .\|.\|.\&\"
-.
-.\" Global static variables for inter-macro communication
-.rr @+Example_font
-.
-.\" --------------------------------------------------------------------
-.\" setup for the macro definitions below
-.\"
-.\" naming:  namespace:category_macro.variable_name  (experimental)
-.
-.\" --------------------------------------------------------------------
-.\" configuration of prompt for `.Shell_cmd'* macros
-.ds trace:Shell_cmd.prompt_text sh#\"    prompt for shell commands
-.ds trace:Shell_cmd+.prompt_text >\"     prompt on continuation lines
-.ds trace:Shell_cmd_base.prompt_font I\" font for prompts
-.
-.\" automatically determine setup from the configuration above
-.als @f trace:Shell_cmd_base.prompt_font\"
-.als @t trace:Shell_cmd.prompt_text\"
-.als @t+ trace:Shell_cmd+.prompt_text\"
-.ds trace:Shell_cmd.prompt address@hidden@t]\f[]\"            needed
-.ds trace:Shell_cmd+.prompt address@hidden@t+]\f[]\"          needed
-.nr @w \w'\*[trace:Shell_cmd.prompt]'\"
-.nr @w+ \w'\*[trace:Shell_cmd+.prompt]'\"
-.ft address@hidden
-.\" Full prompt width is maximum of texts plus 1m
-.nr trace:Shell_cmd_base.prompt_width (address@hidden>address@hidden)\" needed
-.ft
-.rm @f
-.rm @f+
-.rm @t
-.rm @t+
-.rr @w
-.rr @w+
-.
-.\"--------------------------------------------------------------------
-.\" Ignore all arguments like a comment, even after a .eo call.
-.de c
-..
-.c --------------------------------------------------------------------
-.de BIR
-.  ie (\\n[.$] < 3) \
-.    BI \\$@
-.  el \{\
-.    ds @tmp@ \fB\\$1\f[]\fI\\$2\f[]
-.    shift 2
-.    Text address@hidden@]\fR\\$*\f[]
-.    rm @tmp@
-.  \}
-..
-.c --------------------------------------------------------------------
-.c .Env_var  ( [])
-.c
-.c Display an environment variable, with optional punctuation.
-.c
-.de Env_var
-.  nh
-.  SM
-.  Text \f[CB]\\$1\f[]\\$2
-.  hy
-..
-.c --------------------------------------------------------------------
-.c .Error  (...)
-.c
-.c Print error message to terminal and abort.
-.c
-.de Error
-.  tm \\$*
-.  ab
-..
-.c --------------------------------------------------------------------
-.de Example
-.  if address@hidden \
-.    Error previous .Example was not terminated by a ./Example
-.  nr @+Example_font \\n[.f]
-.  nh
-.  nf
-.c  RS \\n[trace:Shell_cmd_base.prompt_width]u
-.  ft CR
-..
-.c --------------------------------------------------------------------
-.de /Example
-.  if address@hidden \
-.    Error no previous call to .Example
-.  ft address@hidden
-.c  RE
-.  fi
-.  hy
-.  rr @+Example_font
-..
-.c --------------------------------------------------------------------
-.de Macdef
-.  if (\\n[.$] <= 0) \
-.    Error \\$0 needs at least one argument.
-.  ds @s .\f[B]\\$1\f[]\"
-.  shift
-.  if (\\n[.$] > 0) \
-.    as @s \~\f[I]\\$*\f[]\"
-.  IP address@hidden
-.  rm @s
-..
-.c --------------------------------------------------------------------
-.de Macdef+
-.  br
-.  ns
-.  Macdef \\$@
-..
-.c --------------------------------------------------------------------
-.c .Shell_cmd  ( [] ...)
-.c
-.c A shell command line; display args alternating in fonts CR and CI.
-.c
-.c Examples:
-.c   .Shell_cmd "groffer --dpi 100 file"
-.c     result: `sh#  groffer --dpi 100 file'
-.c             with 'sh#' in font I, the rest in CR
-.c
-.c   .Shell_cmd groffer\~--dpi\~100\~file
-.c     result: the same as above
-.c
-.c   .Shell_cmd "groffer --dpi=" value " file"
-.c     result: sh#  groffer --dpi=value file
-.c             with `groffer --dpi=' and `file' in CR; `value' in CI
-.c
-.c   .Shell_cmd groffer\~--dpi= value \~file
-.c     result: the same as the previous example
-.c
-.de Shell_cmd
-.  trace:Shell_cmd_base "\*[trace:Shell_cmd.prompt]" \\$@
-..
-.c --------------------------------------------------------------------
-.c .Shell_cmd+  ( [] ...)
-.c
-.c A continuation line for .Shell_cmd.
-.c
-.de Shell_cmd+
-.  trace:Shell_cmd_base "\*[trace:Shell_cmd+.prompt]" \\$@
-..
-.c --------------------------------------------------------------------
-.c .Shell_cmd_base  ( [ [] ...])
-.c
-.c A shell command line; display args alternating in fonts CR and CI.
-.c Internal, do not use directly.
-.c
-.c Globals: read-only register @.Shell_cmd_width
-.c
-.de trace:Shell_cmd_base
-.  if (\\n[.$] <= 0) \
-.    return
-.  nr @+font \\n[.f]\"
-.  ds @prompt \\$1\"
-.  ft CR
-.  c gap between prompt and command
-.  nr @+gap \\n[trace:Shell_cmd_base.prompt_width]-\\w'address@hidden'\"
-.  ds @res address@hidden'address@hidden'\"
-.  shift
-.  ds @cf CR\"
-.  while (\\n[.$] > 0) \{\
-.    as @res address@hidden"
-.    shift
-.    ie 'address@hidden'CR' \
-.      ds @cf I\"
-.    el \
-.      ds @cf CR\"
-.  \}
-.  br
-.  ad l
-.  nh
-.  nf
-.  Text address@hidden"
-.  fi
-.  hy
-.  ad
-.  br
-.  ft address@hidden
-.  rr @+font
-.  rr @+gap
-.  rm @cf
-.  rm @res
-..
-.c --------------------------------------------------------------------
-.c .Text  (...)
-.c
-.c Treat the arguments as text, no matter how they look.
-.c
-.de Text
-.  if (\\n[.$] == 0) \
-.    return
-.  nop \)\\$*\)
-..
-.c --------------------------------------------------------------------
-.c .Topic  ([])
-.c
-.c A bulleted paragraph.
-.c
-.de Topic
-.  ie (\\n[.$] = 0) \
-.    .ds @indent 2m\"
-.  el \
-.    .ds @indent \\$1\"
-.  TP address@hidden
-.  Text \[bu]
-.  rm @indent
-..
-.c --------------------------------------------------------------------
-.c .TP+  ()
-.c
-.c Continuation line for .TP header.
-.c
-.de TP+
-.  br
-.  ns
-.  TP \\$1
-..
-.c --------------------------------------------------------------------
-.de 'char
-.  ds @tmp@ `\f(CR\\$1\f[]'
-.  shift
-.  Text address@hidden@]\\$*
-.  rm @tmp@
-..
-.c --------------------------------------------------------------------
-.de option
-.  ds @tmp@ \f(CB\\$1\f[]
-.  shift 1
-.  Text address@hidden@]\\$*
-.  rm @tmp@
-..
-.c --------------------------------------------------------------------
-.de argument
-.  ds @tmp@ \f(CI\\$1\f[]
-.  shift 1
-.  Text address@hidden@]\\$*
-.  rm @tmp@
-..
-.c --------------------------------------------------------------------
-.de request
-.  ds @tmp@ \f(CB\\$1\f[]
-.  shift 1
-.  Text address@hidden@]\\$*
-.  rm @tmp@
-..
-.c --------------------------------------------------------------------
-.de escape
-.  ds @tmp@ \f[CB]\\$1\f[]
-.  shift 1
-.  Text address@hidden@]\\$*
-.  rm @tmp@
-..
-.
-.
+.TH GROFF_TRACE @MAN7EXT@ "@MDATE@" "Groff Version @VERSION@"
+.SH NAME
+groff_trace \- groff macro package trace.tmac
 .\" --------------------------------------------------------------------
 .\" SH SYNOPSIS
 .\" --------------------------------------------------------------------
+.SH SYNOPSIS
 .
 .B groff -m trace
-.RI [ options\*[Ellipsis] ]
-.RI [ files\*[Ellipsis] ]
-.
-.
-.P
-Elements in brackets denote optional arguments, and the ellipsis means
-that there can be any number of arguments of this kind.
-.
+.RI [ options ... ]
+.RI [ files ... ]
 .
 .\" --------------------------------------------------------------------
 .SH DESCRIPTION
@@ -380,20 +99,19 @@
 .\" --------------------------------------------------------------------
 .SS "Command line option"
 .
-.P
-.Shell_cmd "echo '."
-.Shell_cmd+ ".de test_macro"
-.Shell_cmd+ ".."
-.Shell_cmd+ ".test_macro"
-.Shell_cmd+ ".test_macro some dummy arguments"
-.Shell_cmd+ "' | groff -m trace >/dev/null"
-.P
-.Example
+.EX
+\fIsh#\fP echo '.
+> .de test_macro
+> ..
+> .test_macro
+> .test_macro some dummy arguments
+> ' | groff -m trace >/dev/null
+
 *** de trace enter: test_macro
 *** trace exit: test_macro
 *** de trace enter: test_macro "some" "dummy" "arguments"
 *** trace exit: test_macro "some" "dummy" "arguments"
-./Example
+.EE
 .
 .P
 The entry and the exit of each macro call is displayed on the terminal
@@ -403,22 +121,21 @@
 .\" --------------------------------------------------------------------
 .SS "Nested macro calls"
 .
-.P
-.Shell_cmd "echo '."
-.Shell_cmd+ ".de child"
-.Shell_cmd+ ".."
-.Shell_cmd+ ".de parent"
-.Shell_cmd+ ".child"
-.Shell_cmd+ ".."
-.Shell_cmd+ ".parent"
-.Shell_cmd+ "' | groff -m trace >/dev/null"
-.P
-.Example
+.EX
+\fIsh#\fP echo '.
+> .de child
+> ..
+> .de parent
+> .child
+> ..
+> .parent
+> ' | groff -m trace >/dev/null
+
 *** de trace enter: parent
 *** de trace enter: child
 *** trace exit: child
 *** trace exit: parent
-./Example
+.EE
 .
 .P
 This shows that macro calls can be nested.
@@ -429,21 +146,21 @@
 .\" --------------------------------------------------------------------
 .SS "Activating with .mso"
 .
-.Shell_cmd "echo '."
-.Shell_cmd+ ".de before"
-.Shell_cmd+ ..
-.Shell_cmd+ ".mso trace.tmac"
-.Shell_cmd+ ".de after"
-.Shell_cmd+ ..
-.Shell_cmd+ .before
-.Shell_cmd+ .after
-.Shell_cmd+ .before
-.Shell_cmd+ "' | groff >/dev/null"
-.P
-.Example
+.EX
+\fIsh#\fP echo '.
+> .de before
+> ..
+> .mso trace.tmac
+> .de after
+> ..
+> .before
+> .after
+> .before
+>  ' | groff >/dev/null
+
 *** de trace enter: after
 *** trace exit: after
-./Example
+.EE
 .
 .P
 Here, the tracing is activated within the document, not by a command
@@ -472,9 +189,9 @@
 macro call
 .
 .P
-.Example
+.EX
 \&.foo \e\e\e\en[bar]
-./Example
+.EE
 .
 .P
 normally passes `\e\en[bar]' to macro `.foo', but with the redefined
@@ -488,9 +205,9 @@
 example
 .
 .P
-.Example
+.EX
 \&.foo \eEn[bar]
-./Example
+.EE
 .
 .
 .\" --------------------------------------------------------------------
@@ -513,7 +230,7 @@
 .\" --------------------------------------------------------------------
 .
 .TP
-.Env_var $GROFF_TMAC_PATH
+.B $GROFF_TMAC_PATH
 A colon-separated list of additional tmac directories in which to
 search for macro files; see
 .BR groff_tmac (@MAN5EXT@)
@@ -579,8 +296,6 @@
 .BR info (1)
 file.
 .
-.cp \n[groff_trace_C]
-.
 .\" Local Variables:
 .\" mode: nroff
 .\" End:

End of diffs.