[Groff-commit] groff/man groff_out.man

[Eric S. Raymond]

CVSROOT:        /sources/groff
Module name:    groff
Changes by:     Eric S. Raymond <esr>   07/02/07 19:07:42

Modified files:
        man            : groff_out.man 

Log message:
        Final step: reduce x-command, get rid of eo/ec calls and fix macros to
        do without them. File should now be viewer-portable.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/man/groff_out.man?cvsroot=groff&r1=1.34&r2=1.35

Patches:
Index: groff_out.man
===================================================================
RCS file: /sources/groff/groff/man/groff_out.man,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- groff_out.man       7 Feb 2007 18:47:32 -0000       1.34
+++ groff_out.man       7 Feb 2007 19:07:42 -0000       1.35
@@ -52,33 +52,32 @@
 .ds @linebreak \fR\[la]line_break\[ra]\fP\"
 .
 .\" Begin of macro definitions
-.eo
 .
 .de offset
-(\fI\,\$1\/\fP,\ \fI\,\$2\/\fP)\$3
+(\fI\,\\$1\/\fP,\ \fI\,\\$2\/\fP)\\$3
 ..
 .de indexed_offset
-.offset \$1\d\s-3\fR\$2\fP\s+3\u \$3\d\s-3\fR\$4\fP\s+3\u \$5
+.offset \\$1\d\s-3\fR\\$2\fP\s+3\u \\$3\d\s-3\fR\\$4\fP\s+3\u \\$5
 ..
 .c format: .command <name> "<arguments>" <punctuation>
 .de command
-.IP "\fB\$1\fP\ \fI\,\$2\/\fP\$3"
+.IP "\fB\\$1\fP\ \fI\,\\$2\/\fP\\$3"
 ..
 .c format: .command+ <name> "<arguments>" <punctuation>
 .c continue previous .command heading
 .de command+
 .TQ
-\fB\$1\fP\ \fI\,\$2\/\fP\$3
+\fB\\$1\fP\ \fI\,\\$2\/\fP\\$3
 ..
 .c format: .D-command <subcommand> "<arguments>"
 .de D-command
-.IP "\fBD\$1\fP\ \fI\,\$2\/\fP\|address@hidden"
+.IP "\fBD\\$1\fP\ \fI\,\\$2\/\fP\|address@hidden"
 ..
 .c format: .D-command+ <subcommand> "<arguments>"
 .c continue previous .D-command heading
 .de D-command+
 .TQ
-\fBD\$1\fP\ \fI\,\$2\/\fP\|address@hidden
+\fBD\\$1\fP\ \fI\,\\$2\/\fP\|address@hidden
 ..
 .
 .c We set these as troff micromotions rather than eqn because \d and \u 
@@ -94,24 +93,16 @@
 .c graphics command .D with a variable number of arguments
 .c format: .D-multiarg <subcommand>
 .de D-multiarg
-.IP "\fBD\$1\fP\ \*[hv1] \*[hv2] ... \*[hvn]\|address@hidden"
+.IP "\fBD\\$1\fP\ \*[hv1] \*[hv2] ... \*[hvn]\|address@hidden"
 ..
 .c format: .x-command <subname> "<arguments>"
 .de x-command
-.  ds @sub \$1\"
-.  shift 1
-.  ds @args
-.  if (\n[.$] > 0) \
-.    ds @args \ \fI\,\$*\/\fP\"
-.  IP "address@hidden@args]\fP\|address@hidden"
-.  rm @sub
-.  rm @args
+.IP "\fBx\\$1\fP\ \fI\\$2\fP\|address@hidden"
 ..
 .de xsub
-.  RI "(" "\$1" " control command)"
-.  br
+.RI "(" "\\$1" " control command)"
+.br
 ..
-.ec
 .\" End of macro definitions 
 .
 .
@@ -532,7 +523,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.
@@ -1093,7 +1084,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.
@@ -1117,7 +1108,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 .
 \}
@@ -1145,7 +1136,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.
@@ -1743,7 +1734,7 @@
 So conflicts with classical devices are very unlikely.
 .
 .
-.ie (address@hidden == 1) \{\
+.ie address@hidden \{\
 .IP \[bu] 2m 
 The position changing after the commands
 .BR Dp ,