[Groff-commit] groff ChangeLog NEWS man/groff_tmac.man tmac/an...

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Changes by:     Werner LEMBERG <wl>     08/10/04 21:24:38

Modified files:
        .              : ChangeLog NEWS 
        man            : groff_tmac.man 
        tmac           : an-old.tmac andoc.tmac groff_man.man 
                         groff_mdoc.man 

Log message:
        * tmac/andoc.tmac: Rewritten, based on a preliminary version from
        Tadziu Hoffmann.  It can now process multiple man pages with both
        man and mdoc formats intermixed.
        
        * NEWS, tmaca/groff_man.man, tmac/groff_mdoc.man,
        man/groff_tmac.man: Document it.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1152&r2=1.1153
http://cvs.savannah.gnu.org/viewcvs/groff/NEWS?cvsroot=groff&r1=1.248&r2=1.249
http://cvs.savannah.gnu.org/viewcvs/groff/man/groff_tmac.man?cvsroot=groff&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/groff/tmac/an-old.tmac?cvsroot=groff&r1=1.59&r2=1.60
http://cvs.savannah.gnu.org/viewcvs/groff/tmac/andoc.tmac?cvsroot=groff&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/groff/tmac/groff_man.man?cvsroot=groff&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/groff/tmac/groff_mdoc.man?cvsroot=groff&r1=1.45&r2=1.46

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.1152
retrieving revision 1.1153
diff -u -b -r1.1152 -r1.1153
--- ChangeLog   4 Oct 2008 20:46:59 -0000       1.1152
+++ ChangeLog   4 Oct 2008 21:24:37 -0000       1.1153
@@ -2,6 +2,15 @@
 
        * tmac/doc-common (doc-operating-system-*): Update releases.
 
+       * tmac/an-old.tmac (an-extra1, an-extra2, an-extra3): Initialize.
+
+       * tmac/andoc.tmac: Rewritten, based on a preliminary version from
+       Tadziu Hoffmann.  It can now process multiple man pages with both
+       man and mdoc formats intermixed.
+
+       * NEWS, tmaca/groff_man.man, tmac/groff_mdoc.man,
+       man/groff_tmac.man: Document it.
+
 2008-10-04  Werner LEMBERG  <address@hidden>
 
        * src/roff/troff/input.cpp (do_suppress): Make \O[3], \O[4], and

Index: NEWS
===================================================================
RCS file: /cvsroot/groff/groff/NEWS,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -b -r1.248 -r1.249
--- NEWS        1 Oct 2008 20:33:14 -0000       1.248
+++ NEWS        4 Oct 2008 21:24:37 -0000       1.249
@@ -163,6 +163,8 @@
 Macro Packages
 --------------
 
+o -mandoc now supports multiple man pages (in either man or mdoc format).
+
 o Fabrice Ménard contributed locales support.  In particular, it is now
   possible to get French localization of the main macro packages (-ms, -mm,
   -me, and -mom, but not -man and -mdoc which are localized differently) by

Index: man/groff_tmac.man
===================================================================
RCS file: /cvsroot/groff/groff/man/groff_tmac.man,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- man/groff_tmac.man  24 Mar 2008 20:01:37 -0000      1.32
+++ man/groff_tmac.man  4 Oct 2008 21:24:38 -0000       1.33
@@ -79,6 +79,14 @@
 .
 .P
 fails.
+Exception to this is the use of man pages written with either the
+.B mdoc
+or the
+.B man
+macro package.
+See below the description of the
+.B andoc.tmac
+file.
 .
 .
 .\" --------------------------------------------------------------------
@@ -102,6 +110,18 @@
 .BR groff_mdoc (@MAN7EXT@).
 .
 .
+.TP
+.B andoc
+.TQ
+.B mandoc
+Use this file in case you don't know whether the
+.B man
+macros or the
+.B mdoc
+package should be used.
+Multiple man pages (in either format) can be handled.
+.
+.
 .\" --------------------------------------------------------------------
 .SS "Full Packages"
 .\" --------------------------------------------------------------------

Index: tmac/an-old.tmac
===================================================================
RCS file: /cvsroot/groff/groff/tmac/an-old.tmac,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- tmac/an-old.tmac    9 Sep 2008 14:44:06 -0000       1.59
+++ tmac/an-old.tmac    4 Oct 2008 21:24:38 -0000       1.60
@@ -127,6 +127,10 @@
 .  nr an-margin \\n[IN]
 ..
 .
+.ds an-extra1
+.ds an-extra2
+.ds an-extra3
+.
 .\" .TH title section extra1 extra2 extra3
 .de1 TH
 .  if \\n[an-html] \{\

Index: tmac/andoc.tmac
===================================================================
RCS file: /cvsroot/groff/groff/tmac/andoc.tmac,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- tmac/andoc.tmac     24 Jan 2002 22:37:34 -0000      1.2
+++ tmac/andoc.tmac     4 Oct 2008 21:24:38 -0000       1.3
@@ -1,19 +1,80 @@
 .\" andoc.tmac
 .\"
-.\" Load either an-old.tmac or doc.tmac.
-.if !\n(.g .ab These macros require groff.
-.de Dd
-.rm Dd
-.do mso doc.tmac
-\\*(Dd\\
+.\" Load either an-old.tmac or doc.tmac.  Multiple man pages can be
+.\" handled.
+.\"
+.\"
+.\" Copyright (C) 1991, 1995, 2000, 2002, 2008
+.\"   Free Software Foundation, Inc.
+.\"      Written by James Clark (address@hidden)
+.\"
+.\" This file is part of groff.
+.\"
+.\" groff is free software; you can redistribute it and/or modify it under
+.\" the terms of the GNU General Public License as published by the Free
+.\" Software Foundation; either version 2, or (at your option) any later
+.\" version.
+.\"
+.\" groff is distributed in the hope that it will be useful, but WITHOUT ANY
+.\" WARRANTY; without even the implied warranty of MERCHANTABILITY or
+.\" FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+.\" for more details.
+.\"
+.\" You should have received a copy of the GNU General Public License along
+.\" with groff; see the file COPYING.  If not, write to the Free Software
+.\" Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301, USA.
+.\"
+.
+.if !\n(.g \
+.  ab These macros require groff.
+.
+.nr _C \n(.C
+.cp 0
+.
+.als andoc-em em
+.als andoc-bp bp
+.
+.de1 reload-doc
+.  ch an-header   \" remove trap set by an-old.tmac
+.  ch an-footer   \" remove trap set by an-old.tmac
+.  ch an-p-footer \" remove trap set by an-old.tmac
+.
+.  als em andoc-em
+.  als bp andoc-bp
+.  rm Dd          \" disable load-only-once, see doc.tmac
+.
+.  mso doc.tmac
+.
+.  ds str-dfp NAME\" this triggers setup-header
+.  als TH reload-man
+\\*[Dd]\\
 ..
-.de TH
-.rm TH
-.do mso an-old.tmac
-\\*(TH\\
+.
+.de1 reload-man
+.  ch header      \" remove trap set by doc.tmac
+.  ch footer      \" remove trap set by doc.tmac
+.
+.  als em andoc-em
+.  als bp andoc-bp
+.  rm RI          \" disable load-only-once, see an-old.tmac
+.  blm            \" no blank line macro
+.  rm TH
+.
+.  mso an-old.tmac
+.
+.  als Dd reload-doc
+\\*[TH]\\
 ..
-.\" dummy equation macros -- eqnrc is read before .TH or .Dd is parsed.
+.
+.als TH reload-man
+.als Dd reload-doc
+.
+.\" dummy equation macros -- eqnrc is read before .TH or .Dd is parsed
 .de EQ
 ..
 .de EN
 ..
+.
+.cp \n[_C]
+.
+.\" end of andoc.tmac

Index: tmac/groff_man.man
===================================================================
RCS file: /cvsroot/groff/groff/tmac/groff_man.man,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- tmac/groff_man.man  6 Sep 2008 07:03:22 -0000       1.35
+++ tmac/groff_man.man  4 Oct 2008 21:24:38 -0000       1.36
@@ -1068,11 +1068,12 @@
 .
 .TP
 .B andoc.tmac
-This file checks whether the
+Use this file in case you don't know whether the
 .B man
 macros or the
 .B mdoc
 package should be used.
+Multiple man pages (in either format) can be handled.
 .
 .TP
 .B an-old.tmac

Index: tmac/groff_mdoc.man
===================================================================
RCS file: /cvsroot/groff/groff/tmac/groff_mdoc.man,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- tmac/groff_mdoc.man 11 Nov 2007 07:08:46 -0000      1.45
+++ tmac/groff_mdoc.man 4 Oct 2008 21:24:38 -0000       1.46
@@ -4088,11 +4088,12 @@
 .It Pa mdoc.local
 Local additions and customizations.
 .It Pa andoc.tmac
-This file checks whether the
+Use this file if you don't know whether the 
 .Nm \-mdoc
 or the
 .Nm \-man
 package should be used.
+Multiple man pages (in either format) can be handled.
 .El
 .
 .