[Groff-commit] groff NEWS doc/groff.texinfo tmac/groff_ms.man ...

[Eric S. Raymond]

CVSROOT:        /sources/groff
Module name:    groff
Changes by:     Eric S. Raymond <esr>   07/02/01 23:09:22

Modified files:
        .              : NEWS 
        doc            : groff.texinfo 
        tmac           : groff_ms.man s.tmac 

Log message:
        The other Bell Labs localisms are now enabled when you call .SC.
        It is no longer necessary to specift "-r bell=1" on the command line.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/NEWS?cvsroot=groff&r1=1.235&r2=1.236
http://cvs.savannah.gnu.org/viewcvs/groff/doc/groff.texinfo?cvsroot=groff&r1=1.255&r2=1.256
http://cvs.savannah.gnu.org/viewcvs/groff/tmac/groff_ms.man?cvsroot=groff&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/groff/tmac/s.tmac?cvsroot=groff&r1=1.28&r2=1.29

Patches:
Index: NEWS
===================================================================
RCS file: /sources/groff/groff/NEWS,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -b -r1.235 -r1.236
--- NEWS        1 Feb 2007 09:36:19 -0000       1.235
+++ NEWS        1 Feb 2007 23:09:22 -0000       1.236
@@ -122,8 +122,8 @@
   to handle normal groff number operations without risking overflow errors).
 
 o For -ms, Eric S. Raymond contributed support for ancient Bell Labs
-  localisms `.SC', `.UC', `.P1', and `.P2' when the command-line switch
-  `-r bell=1' is given.
+  localisms `.SC', `.UC', `.P1', and `.P2'.  The latter three are enabled
+  only after .SC is called.
 
 
 VERSION 1.19.2

Index: doc/groff.texinfo
===================================================================
RCS file: /sources/groff/groff/doc/groff.texinfo,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -b -r1.255 -r1.256
--- doc/groff.texinfo   1 Feb 2007 09:36:19 -0000       1.255
+++ doc/groff.texinfo   1 Feb 2007 23:09:22 -0000       1.256
@@ -4369,6 +4369,23 @@
 number register.
 @endDefmpreg
 
+Emulations of a few ancient Bell Labs macros can be re-enabled by calling
+the otherwise undocumented @code{SC} section-header macro.  Calling @code{SC}
+enables @code{UC} for marking up a product or application name, and the pair 
address@hidden/@code{P2} for surrounding code example displays.
+
+These are not enabled by default because (a)@tie{}they were not documented,
+in the original @code{ms} manual, and (b)@tie{}the @code{P1} and @code{UC}
+macros collide with different macros with the same names in the
+Berkeley version of @code{ms}.
+
+These @code{groff} emulations are sufficient to give back the
+1976 address@hidden& Cherry paper @cite{Typsetting Mathematics -- User's
+Guide} its section headings, and restore some text that had gone
+missing as arguments of undefined macros.  No warranty express or
+implied is given as to how well the typographic details these produce
+match the original Bell Labs macros.
+
 @menu
 * Missing ms Macros::
 * Additional ms Macros::
@@ -4411,22 +4428,6 @@
 A cover sheet macro
 @end table
 
-Emulations of a few ancient Bell Labs macros can be re-enabled with
-the @code{groff} command-line option @address@hidden bell=1}}.  They are
address@hidden, @code{UC}, @code{P1}, and @code{P2}.
-
-These are not enabled by default because (a)@tie{}they were not documented,
-in the original @code{ms} manual, and (b)@tie{}the @code{P1} and @code{UC}
-macros collide with different macros with the same names in the
-Berkeley version of @code{ms}.
-
-These @code{groff} emulations are sufficient to give back the
-1976 address@hidden& Cherry paper @cite{Typsetting Mathematics -- User's
-Guide} its section headings, and restore some text that had gone
-missing as arguments of undefined macros.  No warranty express or
-implied is given as to how well the typographic details these produce
-match the original Bell Labs macros.
-
 @c ---------------------------------------------------------------------
 
 @node Additional ms Macros,  , Missing ms Macros, Differences from AT&T ms

Index: tmac/groff_ms.man
===================================================================
RCS file: /sources/groff/groff/tmac/groff_ms.man,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- tmac/groff_ms.man   1 Feb 2007 09:36:19 -0000       1.19
+++ tmac/groff_ms.man   1 Feb 2007 23:09:22 -0000       1.20
@@ -1299,10 +1299,10 @@
 .
 .IP \(bu
 Some Bell Labs localisms are not implemented by default.
-However, by giving the command-line option
-.B "-r\ bell=1"
-you can enable implementations of the archaic Bell Labs macros 
-.BR SC ,
+However, if you call the otherwise undocumented
+.BR SC 
+section-header macro, you will enable implementations of three other
+archaic Bell Labs macros:
 .BR UC ,
 .BR P1 ,
 and 
@@ -1316,9 +1316,8 @@
 .B UC
 macros both collide with different macros in the Berkeley version of
 .IR ms . 
-The 
-.B "-r\ bell=1"
-emulations are sufficient to give back the 1976 Kernighan\~& Cherry paper
+.sp
+These emulations are sufficient to give back the 1976 Kernighan\~& Cherry paper
 .I "Typsetting Mathematics \(en User's Guide"
 its section headings, and restore some text that had gone missing as
 arguments of undefined macros.

Index: tmac/s.tmac
===================================================================
RCS file: /sources/groff/groff/tmac/s.tmac,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- tmac/s.tmac 1 Feb 2007 21:50:11 -0000       1.28
+++ tmac/s.tmac 1 Feb 2007 23:09:22 -0000       1.29
@@ -470,7 +470,11 @@
 ..
 .nr pg*P1 0
 .de P1
-.nr pg*P1 1
+.ie r bell_localisms \{\
+.      DS L
+.      ft CW
+.\}
+.el .nr pg*P1 1
 ..
 .wh -\n[FM]u address@hidden
 .wh -\n[FM]u/2u pg*footer
@@ -2076,28 +2080,30 @@
 .\" ****************************
 .\" ******** module bell ********
 .\" ****************************
-.\" Emulate Bell Labs localisms by setting `-r bell=1' on the command line.
-.\" They're not enabled by default because (a) they're not documented, and
-.\" (b) the .P1 and .UC macros collides with different ones in Berkeley ms. 
+.\" Emulate Bell Labs localisms. Note, (a) they're not documented, and
+.\" (b) the .P1 and .UC macros collide with different ones in Berkeley ms.
+.\" We hack around this by conditionalizing the behavior of P1; UC was
+.\" not defined by groff and will be a no-op if called Berkeley style
+.\" with no arguments, so there is no problem with hijacking it here.
+.\"
 .\" What's done here is sufficient to give back the Guide to EQN (1976) its
 .\" section headings and restore some text that had gone missing as macro
 .\" arguments; no warranty express or implied is given as to how well the
 .\" typographic details these produce match the original Bell Labs macros.
-.if r bell \{\
+.\"
+.\" P1 is now defined in module pg.
 .de SC
+.nr bell_localisms 1
 .NH 
 \\$*
 ..
 .de UC
-\f(CW\\$*\fP
-..
-.de P1
-.DS L
-ft CW
+.if r bell_localisms \f(CW\\$*\fP
 ..
 .de P2
-.ft
-.DE
-..
+.if r bell_localisms \{\
+.      ft
+.      DE
 .\}
+..
 .\" Make sure that no blank lines creep in at the end of this file.