54 files changed, 243 insertions, 248 deletions

diff --git a/tmac/Makefile.sub b/tmac/Makefile.sub
index 03ad5846..e809d460 100644
--- a/tmac/Makefile.sub
+++ b/tmac/Makefile.sub
@@ -9,47 +9,37 @@ MAN7=\
   groff_markup.n
 
 NORMALFILES=\
-  tmac.mandoc tmac.andoc tmac.pic tmac.ps tmac.psnew tmac.psold tmac.pspic \
-  tmac.psatk tmac.dvi tmac.tty tmac.tty-char tmac.X tmac.Xps tmac.latin1 \
-  tmac.lj4 eqnrc troffrc troffrc-end tmac.html tmac.html2 \
-  tmac.html-tags tmac.markup tmac.arkup tmac.a4 tmac.trace tmac.me \
-  tmac.mdoc tmac.an.old hyphen.us
-SPECIALFILES=tmac.an tmac.s tmac.man tmac.ms
-STRIPFILES=tmac.e tmac.doc tmac.doc.old
+  mandoc.tmac andoc.tmac an-old.tmac man.tmac an.tmac \
+  me.tmac \
+  ms.tmac s.tmac \
+  mdoc.tmac \
+  pic.tmac \
+  a4.tmac \
+  trace.tmac \
+  ps.tmac psnew.tmac psold.tmac pspic.tmac psatk.tmac \
+  dvi.tmac \
+  tty.tmac tty-char.tmac latin1.tmac \
+  X.tmac Xps.tmac \
+  lj4.tmac \
+  html.tmac html2.tmac html-tags.tmac markup.tmac arkup.tmac \
+  eqnrc \
+  troffrc troffrc-end \
+  hyphen.us
+STRIPFILES=e.tmac doc.tmac doc-old.tmac
 MDOCFILES=doc-common doc-ditroff doc-nroff doc-syms
 mdocdir=$(tmacdir)/mdoc
 CLEANADD=\
-  stamp-strip stamp-wrap stamp-sed tmac.e-s tmac.doc-s tmac.doc.old-s \
-  doc-common-s doc-ditroff-s doc-nroff-s doc-syms-s *-wrap \
-  tmac.man-sed tmac.ms-sed
-tmac_s_prefix=
-tmac_an_prefix=
-tmac_wrap=
-sys_tmac_prefix=
+  stamp-strip e.tmac-s doc.tmac-s doc-old.tmac-s \
+  doc-common-s doc-ditroff-s doc-nroff-s doc-syms-s
 
-all: stamp-strip stamp-wrap stamp-sed
+all: stamp-strip
 
-install_data: $(NORMALFILES) $(SPECIALFILES) \
-              stamp-wrap stamp-strip stamp-sed man.local
+install_data: $(NORMALFILES) man.local stamp-strip
 	-test -d $(tmacdir) || $(mkinstalldirs) $(tmacdir)
-	-test -d $(localtmacdir) || $(mkinstalldirs) $(localtmacdir)
-	if test -n "$(tmac_wrap)"; then \
-	  for m in ""$(tmac_wrap); do \
-	    $(INSTALL_DATA) $$m-wrap $(tmacdir)/tmac.$$m; \
-	  done; \
-	fi
 	for f in $(NORMALFILES); do \
 	  rm -f $(tmacdir)/$$f; \
 	  $(INSTALL_DATA) $(srcdir)/$$f $(tmacdir)/$$f; \
 	done
-	-rm -f $(tmacdir)/tmac.$(tmac_s_prefix)s
-	$(INSTALL_DATA) $(srcdir)/tmac.s $(tmacdir)/tmac.$(tmac_s_prefix)s
-	-rm -f $(tmacdir)/tmac.ms
-	$(INSTALL_DATA) tmac.ms-sed $(tmacdir)/tmac.ms
-	-rm -f $(tmacdir)/tmac.$(tmac_an_prefix)an
-	$(INSTALL_DATA) $(srcdir)/tmac.an $(tmacdir)/tmac.$(tmac_an_prefix)an
-	-rm -f $(tmacdir)/tmac.man
-	$(INSTALL_DATA) tmac.man-sed $(tmacdir)/tmac.man
 	for f in $(STRIPFILES); do \
 	  rm -f $(tmacdir)/$$f; \
 	  $(INSTALL_DATA) $$f-s $(tmacdir)/$$f; \
@@ -61,7 +51,6 @@ install_data: $(NORMALFILES) $(SPECIALFILES) \
 	done
 	-test -f $(localtmacdir)/man.local || \
 	  $(INSTALL_DATA) $(srcdir)/man.local $(localtmacdir)/man.local
-	-rm -f temp
 
 stamp-strip: $(STRIPFILES) $(MDOCFILES)
 	for f in $(STRIPFILES) $(MDOCFILES); do \
@@ -70,38 +59,10 @@ stamp-strip: $(STRIPFILES) $(MDOCFILES)
 	done
 	touch $@
 
-stamp-wrap:
-	if test -n "$(tmac_wrap)"; then \
-	  for m in ""$(tmac_wrap); do \
-	    rm -f $$m-wrap; \
-	    if test "$$m" = an; then \
-	      echo .do mso tmac.andoc >>$$m-wrap; \
-	    fi; \
-	    echo .cp 1 >>$$m-wrap; \
-	    echo .so $(sys_tmac_prefix)$$m >>$$m-wrap; \
-	  done; \
-	fi
-	touch $@
-
-stamp-sed: tmac.man tmac.ms
-	for f in tmac.man tmac.ms; do \
-	  rm -f $$f-sed; \
-	  sed -e "s;@TMAC_AN_PREFIX@;$(tmac_an_prefix);g" \
-	  -e "s;@TMAC_S_PREFIX@;$(tmac_s_prefix);g" \
-	  $(srcdir)/$$f > $$f-sed; \
-	done
-	touch $@
-
 uninstall_sub:
-	-if test -n "$(tmac_wrap)"; then \
-	  for m in ""$(tmac_wrap); do \
-	    rm -f $(tmacdir)/tmac.$$m; \
-	  done; \
-	fi
-	-for f in $(NORMALFILES) $(STRIPFILES); do rm -f $(tmacdir)/$$f; done
-	-rm -f $(tmacdir)/tmac.$(tmac_s_prefix)s
-	-rm -f $(tmacdir)/tmac.$(tmac_an_prefix)an
-	-rm -f $(tmacdir)/tmac.man $(tmacdir)/tmac.ms
+	-for f in $(NORMALFILES) $(STRIPFILES); do \
+	  rm -f $(tmacdir)/$$f; \
+	done
 	-if cmp -s $(localtmacdir)/man.local $(srcdir)/man.local; then \
 	  rm -f $(localtmacdir)/man.local; \
 	fi
diff --git a/tmac/tmac.X b/tmac/X.tmac
index 4219b4a2..464770c6 100755..100644
--- a/tmac/tmac.X
+++ b/tmac/X.tmac
@@ -1,3 +1,5 @@
+.\" X.tmac
+.\"
 .nr _C \n(.C
 .cp 0
 .ftr CW CR
@@ -42,5 +44,5 @@
 .if !c\(bq .tr \(bq,
 .if !c\(aq .tr \(aq'
 .if '\*(.T'X100' .char \[radicalex] \h'-\w'\(sr'u'\[radicalex]\h'\w'\(sr'u'
-.if !\n(_C .mso tmac.pspic
+.if !\n(_C .mso pspic.tmac
 .cp \n(_C
diff --git a/tmac/tmac.Xps b/tmac/Xps.tmac
index 92471abb..ddb037a0 100755..100644
--- a/tmac/tmac.Xps
+++ b/tmac/Xps.tmac
@@ -1,4 +1,6 @@
-.do mso tmac.ps
+.\" Xps.tmac
+.\"
+.do mso ps.tmac
 .nr _C \n(.C
 .cp 0
 .de Xps-char
diff --git a/tmac/tmac.a4 b/tmac/a4.tmac
index e620195d..5001939d 100755..100644
--- a/tmac/tmac.a4
+++ b/tmac/a4.tmac
@@ -1,3 +1,5 @@
+.\" a4.tmac
+.\"
 .\" Set up groff for A4 paper.  Must be called before any other macro
 .\" package.  For correct PS output, you must also set the
 .\" `paperlength' keyword in devps/DESC to 841890 in case groff hasn't
diff --git a/tmac/tmac.an.old b/tmac/an-old.tmac
index 55cea695..1a453320 100755..100644
--- a/tmac/tmac.an.old
+++ b/tmac/an-old.tmac
@@ -1,3 +1,5 @@
+.\" an-old.tmac
+.\"
 .\" Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
 .\"      Written by James Clark (jjc@jclark.com)
 .\"
@@ -425,4 +427,4 @@
 .
 .cp \n(_C
 .
-.\" end of tmac.an
+.\" end of an-old.tmac
diff --git a/tmac/an.tmac b/tmac/an.tmac
new file mode 100644
index 00000000..2e3c243f
--- /dev/null
+++ b/tmac/an.tmac
@@ -0,0 +1,3 @@
+.\" an.tmac
+.\"
+.do mso andoc.tmac
diff --git a/tmac/andoc.tmac b/tmac/andoc.tmac
new file mode 100644
index 00000000..f6a16db6
--- /dev/null
+++ b/tmac/andoc.tmac
@@ -0,0 +1,14 @@
+.\" 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\\
+..
+.de TH
+.rm TH
+.do mso an-old.tmac
+\\*(TH\\
+..
diff --git a/tmac/tmac.arkup b/tmac/arkup.tmac
index ea3113d1..8c52d121 100755
--- a/tmac/tmac.arkup
+++ b/tmac/arkup.tmac
@@ -1,6 +1,7 @@
+.\" arkup.tmac
 .\"
-.\"  A simple set of macros to provide HTML documents with basic
-.\"  www functionality.  It will work with any macro set.
+.\" A simple set of macros to provide HTML documents with basic
+.\" www functionality.  It will work with any macro set.
 .\"
 .de HTML
 .  if '\*(.T'html' \{\
@@ -137,13 +138,13 @@
 .\"         The same source for web pages can be burnt onto a CD and also
 .\"         served across the network. It doesn't solve the problem of one
 .\"         machine doing both though :-(
-.\"         
+.\"        
 .\"
-.\".de CDFTP 
-.\".  sy /bin/rm -f /tmp/tmac.n
-.\".  sy /bin/echo ".ds HOSTNAME `hostname --short`" > /tmp/tmac.n
-.\".  so /tmp/tmac.n
-.\".  sy /bin/rm -f /tmp/tmac.n
+.\".de CDFTP
+.\".  sy /bin/rm -f /tmp/n.tmac
+.\".  sy /bin/echo ".ds HOSTNAME `hostname --short`" > /tmp/n.tmac
+.\".  so /tmp/n.tmac
+.\".  sy /bin/rm -f /tmp/n.tmac
 .\".  ie '\\*[HOSTNAME]'\\$1' \{\
 .\".    FTP "\\$2"  "\\$3"
 .\".  \}
diff --git a/tmac/tmac.doc.old b/tmac/doc-old.tmac
index 51a0ec00..5e5db592 100755..100644
--- a/tmac/tmac.doc.old
+++ b/tmac/doc-old.tmac
@@ -30,7 +30,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     @(#)tmac.doc.old	5.2 (Berkeley) 3/13/91
+.\"     @(#)doc-old.tmac	5.2 (Berkeley) 3/13/91
 .\"     Slightly modified by jjc@jclark.com to work with groff as well.
 .\"
 .\" Assume nroff on crt's only if cR==1
diff --git a/tmac/tmac.doc b/tmac/doc.tmac
index b8058cb1..f83f0874 100755..100644
--- a/tmac/tmac.doc
+++ b/tmac/doc.tmac
@@ -29,12 +29,12 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     @(#)doc	5.8 (Berkeley) 8/5/91
+.\"     @(#)doc.tmac	5.8 (Berkeley) 8/5/91
 .\" Modified by jjc@jclark.com as follows: the doc-* files are assumed to be
 .\" installed as mdoc/doc-* rather than tmac.doc-* (the filename
 .\" `tmac.doc-common' would be too long); when using groff, the doc-* files
 .\" are loaded using the `mso' request.
-.\"   
+.\"  
 .\" .mdoc-parse - attempt to parse troff request arguments
 .\"     %beginstrip%
 .if \n(.g \{\
diff --git a/tmac/tmac.dvi b/tmac/dvi.tmac
index 634f49f9..5fec4270 100755..100644
--- a/tmac/tmac.dvi
+++ b/tmac/dvi.tmac
@@ -1,3 +1,5 @@
+.\" dvi.tmac
+.\"
 .nr _C \n(.C
 .cp 0
 .ftr CR CW
@@ -142,4 +144,4 @@
 .if !c\(,c .char \(,c \o'\(acc'
 .hcode \(,cc
 .cp \n(_C
-.do mso tmac.latin1
+.do mso latin1.tmac
diff --git a/tmac/tmac.e b/tmac/e.tmac
index 3a4eb86a..a747fce9 100755..100644
--- a/tmac/tmac.e
+++ b/tmac/e.tmac
@@ -1,4 +1,4 @@
-.\"	@(#)tmac.e	2.31 (Berkeley) 5/21/88
+.\"	@(#)e.tmac	2.31 (Berkeley) 5/21/88
 .\"	Modified by James Clark for use with groff.
 .\"
 .\" Copyright (c) 1988 Regents of the University of California.
@@ -993,7 +993,7 @@
 .ip "\\*([F.\0"
 .if !"\\*([A"" \\*([A,
 .if !"\\*([T"" \\f2\\*([T\\f1\c
-.if !"\\*([T"" .if !"\\*([O"" ,\ 
+.if !"\\*([T"" .if !"\\*([O"" ,\ \"
 .ie !"\\*([O"" \\*([O
 .el .if !"\\*([T"" \&.
 .if !"\\*([D"" \\*([D.
diff --git a/tmac/fixmacros.sed b/tmac/fixmacros.sed
index 63cce22a..56caf9fd 100644
--- a/tmac/fixmacros.sed
+++ b/tmac/fixmacros.sed
@@ -1,3 +1,4 @@
+# try to fix macros for AT&T troff so that they work without groff's -C switch
 s/^\([.'][	]*[^\\ 	][^ \\]\)\([^ ]\)/\1 \2/
 s/^\(\\![.'][	]*[^\\ 	][^ \\]\)\([^ ]\)/\1 \2/
 s/\([.'][ 	]*i[ef] *[^ ]* [.'][ 	]*[^\\0-9 	][^ \\]\)\([^ ]\)/\1 \2/
diff --git a/tmac/groff_man.man b/tmac/groff_man.man
index 14bd3b0c..27d92a68 100644
--- a/tmac/groff_man.man
+++ b/tmac/groff_man.man
@@ -30,7 +30,16 @@ groff_man \- groff `man' macros to support generation of man pages
 .SH SYNOPSIS
 .
 .B groff
-.B \-m@TMAC_AN_PREFIX@an
+.B \-man
+[
+.IR options .\|.\|.
+]
+[
+.IR files .\|.\|.
+]
+.br
+.B groff
+.B \-m\ man
 [
 .IR options .\|.\|.
 ]
@@ -40,11 +49,11 @@ groff_man \- groff `man' macros to support generation of man pages
 .
 .SH DESCRIPTION
 .
-The 
-.B tmac.@TMAC_AN_PREFIX@an 
-macros used to generate man pages with 
+The
+.B man
+macros used to generate man pages with
 .I groff
-were written by James Clark.  
+were written by James Clark.
 This document provides a brief summary of the use of each macro in that
 package.
 .
@@ -91,11 +100,12 @@ For example, the option `\-rX2' will produce the following page numbers:
 This section describes the available macros for manual pages.
 For further customization, put additional macros and requests into the file
 .B man.local
-which will be loaded immediately after
-.BR tmac.@TMAC_AN_PREFIX@an .
+which will be loaded immediately after the
+.B man
+package.
 .TP
 .BI .TH " title section " [ extra1 "] [" extra2 "] [" extra3 ]
-Sets the title of the man page to 
+Sets the title of the man page to
 .I title
 and the section to
 .IR section ,
@@ -154,7 +164,7 @@ value.
 .TP
 .BI ".TP [" nnn ]
 Sets up an indented paragraph with label.
-The indentation is set to 
+The indentation is set to
 .I nnn
 if that argument is supplied (the default unit is `n' if omitted), otherwise
 it is set to the default indentation value.
@@ -188,8 +198,8 @@ The font size and shape are reset to the default value (10pt resp. Roman).
 Finally, the current left margin is restored.
 .TP
 .BI ".IP [" designator "] [" nnn ]
-Sets up an indented paragraph, using 
-.I designator 
+Sets up an indented paragraph, using
+.I designator
 as a tag to mark its beginning.
 The indentation is set to
 .I nnn
@@ -205,9 +215,9 @@ designator, using `.IP\ \\(bu\ 4':
 .RS
 .IP \(bu 4
 .B IP
-is one of the three macros used in 
-.B tmac.@TMAC_AN_PREFIX@an
-to format lists.
+is one of the three macros used in the
+.B man
+package to format lists.
 .IP \(bu 4
 .B HP
 is another.
@@ -413,15 +423,35 @@ Modern implementations of the
 program read this first line and automatically call the right
 preprocessor(s).
 .
+.SH FILES
+.TP
+.B man.tmac
+.TQ
+.B an.tmac
+These are wrapper files to call
+.BR andoc.tmac .
+.TP
+.B andoc.tmac
+This file checks whether the
+.B man
+macros or the
+.B mdoc
+package should be used.
+.TP
+.B an-old.tmac
+All
+.B man
+macros are contained in this file.
+.
 .SH "SEE ALSO"
 .
-Since the 
-.B tmac.@TMAC_AN_PREFIX@an
-macros consist of groups of 
-.I groff 
+Since the
+.B man
+macros consist of groups of
+.I groff
 requests, one can, in principle, supplement the functionality of the
-.B tmac.@TMAC_AN_PREFIX@an
-macros with individual 
+.B man
+macros with individual
 .I groff
 requests where necessary.
 A complete list of these requests is available on the WWW at
diff --git a/tmac/groff_markup.man b/tmac/groff_markup.man
index 46233cea..74cc40f0 100755
--- a/tmac/groff_markup.man
+++ b/tmac/groff_markup.man
@@ -3,24 +3,24 @@
 .\"      Written by Gaius Mulley (gaius@glam.ac.uk)
 .\"
 .\" 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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 .\"
 .\" user level guide to using the -markup macroset
 .\"
-.do mso tmac.arkup
+.do mso arkup.tmac
 .LINE
 .SH NAME
 groff_markup \- groff macros for authoring web pages
@@ -28,7 +28,7 @@ groff_markup \- groff macros for authoring web pages
 .SH SYNOPSIS
 .B "groff \-markup"
 [ options ]
-file ... 
+file ...
 .SH DESCRIPTION
 This manual page describes the GNU \-markup macros, which is part of the
 groff document formatting system.
@@ -83,7 +83,7 @@ Output of the
 and
 .I tbl
 preprocessors is acceptable as input.
-.SH REQUESTS 
+.SH REQUESTS
 .TP
 .B HTMLINDEX
 determines the cut off point for automatic link generation to headings.
@@ -162,7 +162,7 @@ This is achieved by the following macros:
 Note that all the urls actually are treated as consuming no textual space
 in groff.
 This could be considered as a bug since it causes some problems.
-To circumvent this, \fCtmac.arkup\fP inserts a zero-width character which
+To circumvent this, \fCarkup.tmac\fP inserts a zero-width character which
 expands to a harmless space (only if in HTML mode)
 .TP
 .B FTP
@@ -252,7 +252,7 @@ $1 is the name of the link, $2 is the actual URL
 .\".sp
 .\"which means if the html is generated on machine \fCmerlin\fP
 .\"then generate a URL to \fC../../groff.tar.gz\fP.
-.\"Otherwise construct an FTP URL to 
+.\"Otherwise construct an FTP URL to
 .\"\fCftp://ftp.ffii.org/pub/groff/devel/groff-current.tar.gz\fP.
 .TP
 .B LINE
@@ -300,7 +300,9 @@ and patches :-).
 Tbl, pic, eqn's are also generated using images which may be
 considered a limitation.
 .SH FILES
-@MACRODIR@/tmac.arkup
+@MACRODIR@/markup.tmac (a wrapper for arkup.tmac)
+.br
+@MACRODIR@/arkup.tmac
 .SH "SEE ALSO"
 .BR groff (@MAN1EXT@),
 .BR @g@troff (@MAN1EXT@)
diff --git a/tmac/groff_mdoc.man b/tmac/groff_mdoc.man
index e89dc018..4ed33d42 100644
--- a/tmac/groff_mdoc.man
+++ b/tmac/groff_mdoc.man
@@ -33,9 +33,9 @@
 .\"
 .\"	@(#)mdoc.7	8.2 (Berkeley) 12/30/93
 .\"
-.Dd November 24, 1997
-.Os
-.Dt MDOC 7
+.Dd @MDATE@
+.Os "Groff Version @VERSION@"
+.Dt MDOC @MAN7EXT@
 .Sh NAME
 .Nm mdoc
 .Nd quick reference guide for the
@@ -56,7 +56,7 @@ The macro names and their meanings are
 listed below for quick reference; for
 a detailed explanation on using the package,
 see the tutorial sampler
-.Xr mdoc.samples 7 .
+.Xr mdoc.samples @MAN7EXT@ .
 .Pp
 The macros are described in two groups, the first
 includes the structural and physical page layout macros.
@@ -397,26 +397,25 @@ The extended list macros are used when the number of macro arguments
 would exceed the
 .Xr troff
 limitation of nine arguments.
-.Sh CONFIGURATION
-For site specific configuration of the macro package,
-see the file
-.Pa /usr/src/share/tmac/README .
 .Sh FILES
-.Bl -tag -width "tmac.doc-ditroff" -compact
-.It Pa tmac.doc
+.Bl -tag -width "mdoc/doc-ditroff" -compact
+.It Pa mdoc.tmac
+Wrapper file for
+.Pa doc.tmac .
+.It Pa doc.tmac
 Manual and general text domain macros.
-.It Pa tmac.doc-common
+.It Pa mdoc/doc-common
 Common structural macros and definitions.
-.It Pa tmac.doc-nroff
+.It Pa mdoc/doc-nroff
 Site dependent
 .Xr nroff
 style file.
-.It Pa tmac.doc-ditroff
+.It Pa mdoc/doc-ditroff
 Site dependent
 .Xr troff
 style file.
-.It Pa tmac.doc-syms
+.It Pa mdoc/doc-syms
 Special defines (such as the standards macro).
 .El
 .Sh SEE ALSO
-.Xr mdoc.samples 7
+.Xr groff_mdoc.samples @MAN7EXT@
diff --git a/tmac/groff_mdoc.samples.man b/tmac/groff_mdoc.samples.man
index e35fbaba..3329ec89 100755
--- a/tmac/groff_mdoc.samples.man
+++ b/tmac/groff_mdoc.samples.man
@@ -307,7 +307,7 @@ manual
 .Xr mdoc 7 .
 This is a technical
 .Em faux pas
-as almost all of the macros in 
+as almost all of the macros in
 .Nm \-mdoc
 are parsed, but as it was cumbersome to constantly refer to macros
 as being callable and being able to call other macros,
diff --git a/tmac/groff_me.man b/tmac/groff_me.man
index 49196212..5b3ae575 100644
--- a/tmac/groff_me.man
+++ b/tmac/groff_me.man
@@ -24,16 +24,16 @@ groff_me \- troff macros for formatting papers
 .SH SYNOPSIS
 .B "groff \-me"
 [ options ]
-file ... 
+file ...
 .br
 .B "troff \-me"
 [ options ]
-file ... 
+file ...
 .SH DESCRIPTION
 This manual page describes the GNU version of the \-me macros,
 which is part of the groff document formatting system.
 This version can be used with both GNU troff and Unix troff.
-This package of 
+This package of
 .I troff
 macro definitions provides a canned formatting
 facility for tech%nical papers in various formats.
@@ -65,7 +65,9 @@ and
 preprocessors
 is acceptable as input.
 .SH FILES
-@MACRODIR@/tmac.e
+@MACRODIR@/me.tmac (a wrapper file for e.tmac)
+.br
+@MACRODIR@/e.tmac
 .SH "SEE ALSO"
 .BR groff (@MAN1EXT@),
 .BR @g@troff (@MAN1EXT@)
@@ -74,7 +76,7 @@ is acceptable as input.
 .br
 Writing Papers with Groff Using \-me
 .tr &.
-.SH REQUESTS 
+.SH REQUESTS
 This list is incomplete;
 see
 .I "The \-me Reference Manual"
@@ -86,6 +88,7 @@ for interesting details.
 			\ka
 .br
 .di
+.na
 .in \nau
 .ti 0
 Request	Initial	Cause	Explanation
@@ -272,3 +275,4 @@ points.
 .ti 0
 \&.xp \fIx\fR	-	no	Print index
 .I x.
+.ad
diff --git a/tmac/groff_ms.man b/tmac/groff_ms.man
index 0e1f64c7..7d88a109 100644
--- a/tmac/groff_ms.man
+++ b/tmac/groff_ms.man
@@ -224,7 +224,11 @@ names containing
 .IP \(bu
 names containing only uppercase letters and digits.
 .SH FILES
-.B @MACRODIR@/tmac.@TMAC_S_PREFIX@s
+.B @MACRODIR@/ms.tmac
+(a wrapper file for
+.BR s.tmac )
+.br
+.B @MACRODIR@/s.tmac
 .SH "SEE ALSO"
 .BR groff (@MAN1EXT@),
 .BR @g@troff (@MAN1EXT@),
diff --git a/tmac/groff_tmac.man b/tmac/groff_tmac.man
index a52beef9..00a941bb 100755
--- a/tmac/groff_tmac.man
+++ b/tmac/groff_tmac.man
@@ -1,4 +1,4 @@
-.\"                        -*- nroff -*- 
+.\"                        -*- nroff -*-
 .ig /
 groff_tmac.5
 
@@ -24,7 +24,7 @@ FDL in the main directory of the groff source package.
 .\" --------------------------------------------------------------------
 .
 .if n \{\
-.  mso tmac.tty-char
+.  mso tty-char.tty
 .  ftr CR R
 .  ftr CI I
 .  ftr CB B
@@ -111,7 +111,10 @@ this letter was omitted, e.g., the macro package for the man pages
 was called
 .I an
 and its macro file
-.IR tmac.an .
+.I tmac.an
+(note that in recent versions of groff this file is called
+.I an.tmac
+instead).
 .LP
 By a similar reasoning, macro packages that did not start with an
 .'char m
@@ -154,6 +157,8 @@ system is to check the content of the
 directories.
 For example, a file called
 .BI tmac. anything
+or
+.IB anything .tmac
 determines a macro package named
 .IR anything .
 .LP
@@ -179,7 +184,7 @@ If this file isn't found,
 .BI tmac. name
 will be searched.
 .LP
-It is also possible to include the macro file into the document by using 
+It is also possible to include the macro file into the document by using
 the groff requests
 .request .so
 or
@@ -219,7 +224,7 @@ in the preprocessor word as described in section
 .BR CONVENTION .
 .LP
 For example, suppose a macro file is stored as
-.I @MACRODIR@/tmac.macros
+.I @MACRODIR@/macros.tmac
 and is used in some document called
 .IR docu.roff .
 .LP
@@ -236,13 +241,13 @@ At run-time, the formatter call for this is
 To include the macro file directly in the document either
 .RS
 .ft CR
-\&\.mso tmac.macros
+\&\.mso macros.tmac
 .ft P
 .RE
 is used or
 .RS
 .ft CR
-\&\.so @MACRODIR@/tmac.macros
+\&\.so @MACRODIR@/macros.tmac
 .ft P
 .RE
 .LP
@@ -268,8 +273,8 @@ comment characters and a blank) constitutes the
 .BR word .
 That means that the letters of this word are interpreted as
 abbreviations for those preprocessor commands that should be run
-when formatting the document.  Mostly, only the letters corresponding to 
-the options for the preprocessors are recognized, 
+when formatting the document.  Mostly, only the letters corresponding to
+the options for the preprocessors are recognized,
 .'char e ,
 .'char G ,
 .'char g ,
@@ -297,7 +302,7 @@ section.
 .LP
 To use the tmac functionality, call the macro file
 .IB whatever .tmac
-(or 
+(or
 .BI tmac. whatever\c
 ) and put it in some directory of the tmac path, cf. section
 .BR FILES .
@@ -438,4 +443,3 @@ and the formatters in
 .LP
 The Filesystem Hierarchy Standard (FHS) is available at
 .BR http://www.pathname.com/fhs/ .
-
diff --git a/tmac/tmac.html-tags b/tmac/html-tags.tmac
index b01f8b9f..e1715afa 100755
--- a/tmac/tmac.html-tags
+++ b/tmac/html-tags.tmac
@@ -1,5 +1,4 @@
-.\"
-.\" tmac.html-tags - issues tags for post-html2
+.\" html-tags.tmac - issues tags for post-html2
 .\"
 .als html-sp-old sp
 .de sp
@@ -37,7 +36,7 @@
 .  html-ta-old  \\$*
 ..
 .\" these definitions should be removed once grohtml2 has been finished
-.\" and tmac.arkup is working with html2 (actually expect html2 to replace html).
+.\" and arkup.html is working with html2 (actually expect html2 to replace html).
 .de HTML
 .  if '\*(.T'html2' \{\
 .\" the following line makes the vertical mode leave, so to say
diff --git a/tmac/tmac.html b/tmac/html.tmac
index 239ce0e9..05457807 100755..100644
--- a/tmac/tmac.html
+++ b/tmac/html.tmac
@@ -1,3 +1,5 @@
+.\" html.tmac
+.\"
 .nr _C \n(.C
 .cp 0
 .ftr CW CR
@@ -42,7 +44,7 @@
 .if !c\(bq .tr \(bq,
 .if !c\(aq .tr \(aq'
 .if '\*(.T'html' .char \[radicalex] \h'-\w'\(sr'u'\[radicalex]\h'\w'\(sr'u'
-.if !\n(_C .mso tmac.pspic
+.if !\n(_C .mso pspic.tmac
 .cp \n(_C
 .\" now turn off all headers and footers for ms, me and mm macro sets
 .if d EF .EF '''
diff --git a/tmac/tmac.html2 b/tmac/html2.tmac
index 7fa88661..e98aa4ae 100755
--- a/tmac/tmac.html2
+++ b/tmac/html2.tmac
@@ -1,3 +1,5 @@
+.\" html2.tmac
+.\"
 .nr _C \n(.C
 .cp 0
 .ftr CW CR
@@ -42,7 +44,7 @@
 .if !c\(bq .tr \(bq,
 .if !c\(aq .tr \(aq'
 .if '\*(.T'html' .char \[radicalex] \h'-\w'\(sr'u'\[radicalex]\h'\w'\(sr'u'
-.if !\n(_C .mso tmac.pspic
+.if !\n(_C .mso pspic.tmac
 .cp \n(_C
 .\" now turn off all headers and footers for ms, me and mm macro sets
 .if d EF .EF '''
@@ -59,4 +61,4 @@
 .\" avoid line breaks after hyphen-like characters.
 .cflags 0 -\(hy\(em\(en\[shc]
 .\" now load the tag macros
-.mso tmac.html-tags
+.mso html-tags.tmac
diff --git a/tmac/tmac.latin1 b/tmac/latin1.tmac
index b9c74735..9cc15cce 100755..100644
--- a/tmac/tmac.latin1
+++ b/tmac/latin1.tmac
@@ -1,3 +1,5 @@
+.\" latin1.tmac
+.\"
 .nr _C \n(.C
 .cp 0
 .de latin1-tr
diff --git a/tmac/tmac.lbp b/tmac/lbp.tmac
index 3cba12c3..0d17b631 100755..100644
--- a/tmac/tmac.lbp
+++ b/tmac/lbp.tmac
@@ -1,3 +1,5 @@
+.\" lbp.tmac
+.\"
 .nr _C \n(.C
 .cp 0
 .ftr CW CR
diff --git a/tmac/tmac.lj4 b/tmac/lj4.tmac
index 658b9a7a..b5644e46 100755..100644
--- a/tmac/tmac.lj4
+++ b/tmac/lj4.tmac
@@ -1,3 +1,5 @@
+.\" lj4.tmac
+.\"
 .nr _C \n(.C
 .cp 0
 .ftr CW CR
diff --git a/tmac/man.local b/tmac/man.local
index 7bb8f503..c47b2433 100644
--- a/tmac/man.local
+++ b/tmac/man.local
@@ -1,2 +1,2 @@
-.\" This file is loaded after tmac.an.
-.\" Put any local modifications to tmac.an here.
+.\" This file is loaded after an-old.tmac.
+.\" Put any local modifications to an-old.tmac here.
diff --git a/tmac/man.tmac b/tmac/man.tmac
new file mode 100644
index 00000000..ca7d14da
--- /dev/null
+++ b/tmac/man.tmac
@@ -0,0 +1,3 @@
+.\" man.tmac
+.\"
+.do mso andoc.tmac
diff --git a/tmac/mandoc.tmac b/tmac/mandoc.tmac
new file mode 100644
index 00000000..ee214971
--- /dev/null
+++ b/tmac/mandoc.tmac
@@ -0,0 +1,3 @@
+.\" mandoc.tmac
+.\"
+.do mso andoc.tmac
diff --git a/tmac/markup.tmac b/tmac/markup.tmac
new file mode 100755
index 00000000..787b6db6
--- /dev/null
+++ b/tmac/markup.tmac
@@ -0,0 +1,3 @@
+.\" markup.tmac
+.\"
+.do mso arkup.tmac
diff --git a/tmac/mdoc.tmac b/tmac/mdoc.tmac
new file mode 100644
index 00000000..250d615d
--- /dev/null
+++ b/tmac/mdoc.tmac
@@ -0,0 +1,3 @@
+.\" mdoc.tmac
+.\"
+.do mso doc.tmac
diff --git a/tmac/me.tmac b/tmac/me.tmac
new file mode 100644
index 00000000..0c90a9b5
--- /dev/null
+++ b/tmac/me.tmac
@@ -0,0 +1,3 @@
+.\" me.tmac
+.\"
+.do mso e.tmac
diff --git a/tmac/mm.diff b/tmac/mm.diff
deleted file mode 100755
index d6694aa3..00000000
--- a/tmac/mm.diff
+++ /dev/null
@@ -1,70 +0,0 @@
-*** tmac.m-	Thu Aug  2 14:49:57 1990
---- tmac.m	Thu Aug  2 14:55:40 1990
-***************
-*** 744,749 ****
-  .fi
-  .di >A
-! \!.cs 3 48
-! .if !0\\$1-\\n(:d .if !\\n(:f \\*(}y\\$4\\\\f3\\a\\\\fP\\*(}3
-  .if !0\\$1-\\n(:d .if \\n(:f \\*(}y\\$4\\t\\*(}3
-  .if 0\\$1-\\n(:d \\*(}y\\$4\\*(}3
---- 744,749 ----
-  .fi
-  .di >A
-! .cs 3 48
-! .if !0\\$1-\\n(:d .if !\\n(:f \\*(}y\\$4\?\f3\?\\a\?\fP\?\\*(}3
-  .if !0\\$1-\\n(:d .if \\n(:f \\*(}y\\$4\\t\\*(}3
-  .if 0\\$1-\\n(:d \\*(}y\\$4\\*(}3
-***************
-*** 750,754 ****
-  .br
-  \!.br
-! \!.cs 3
-  .di
-  .br
---- 750,754 ----
-  .br
-  \!.br
-! .cs 3
-  .di
-  .br
-***************
-*** 1397,1406 ****
-  .tr ,+
-  .tr |.
-- .ie \\nE \{\
-- |ds\ >8\ \f3\\\\$1+\\\\$2+\\\\$3+\\\\$4+\\\\$5+\\\\$6+\\\\$7+\\\\$8+\\\\$9\fP
-- 'br \}
-- .el \{\
-  |ds\ >8\ \\\\$1+\\\\$2+\\\\$3+\\\\$4+\\\\$5+\\\\$6+\\\\$7+\\\\$8+\\\\$9
-- 'br \}
-  .br
-  \!.br
---- 1397,1401 ----
-***************
-*** 1407,1410 ****
---- 1402,1406 ----
-  .tr ,,++||
-  .di
-+ .asciify >A
-  \\..
-  .>7 \\*(>1
-***************
-*** 1424,1429 ****
---- 1420,1427 ----
-  .tr ||++
-  .di
-+ .asciify >7
-  .de >A
-  .de >T
-+ .if \\nE .ft 3
-  .if \\\\n(.$ \\\\$1
-  .if \\\\n(.$-1 \\\\$2
-***************
-*** 1435,1438 ****
---- 1433,1437 ----
-  .if \\\\n(.$-7 \\\\$8
-  .if \\\\n(.$-8 \\\\$9
-+ .if \\nE .ft
-  \\\\..
-  \\..
diff --git a/tmac/ms.tmac b/tmac/ms.tmac
new file mode 100644
index 00000000..50e03704
--- /dev/null
+++ b/tmac/ms.tmac
@@ -0,0 +1,3 @@
+.\" ms.tmac
+.\"
+.do mso s.tmac
diff --git a/tmac/tmac.pic b/tmac/pic.tmac
index 1177fc09..ac3b0249 100755..100644
--- a/tmac/tmac.pic
+++ b/tmac/pic.tmac
@@ -1,7 +1,9 @@
+.\" pic.tmac
+.\"
 .de PS
 .br
 .sp .3v
-.ne 0\\$1+1v+\n(.Vu 
+.ne 0\\$1+1v+\n(.Vu
 .in \\n(.lu-\\n(.iu-0\\$2/2u>?0
 ..
 .de PE
diff --git a/tmac/tmac.ps b/tmac/ps.tmac
index 4d954f4a..c5f13862 100755..100644
--- a/tmac/tmac.ps
+++ b/tmac/ps.tmac
@@ -1,3 +1,5 @@
+.\" ps.tmac
+.\"
 .nr _C \n(.C
 .cp 0
 .ftr AX ABI
@@ -49,5 +51,5 @@
 .\" pic tests this register to see whether it should use \X'ps:...'
 .nr 0p 1
 .cp \n(_C
-.if !\n(.C .mso tmac.pspic
-.do mso tmac.psold
+.if !\n(.C .mso pspic.tmac
+.do mso psold.tmac
diff --git a/tmac/tmac.psatk b/tmac/psatk.tmac
index b59d23a2..dc6d2f38 100755..100644
--- a/tmac/tmac.psatk
+++ b/tmac/psatk.tmac
@@ -1,5 +1,7 @@
+.\" psatk.tmac
+.\"
 .\" Implementation of the ATK PB and PE macros for use with groff and grops.
-.\" Load this after tmac.atk.
+.\" Load this after atk.tmac.
 .nr zT 0
 .if '\*(.T'ps' .nr zT 1
 .nr psatk-unit 1p
diff --git a/tmac/tmac.psfig b/tmac/psfig.tmac
index 5f4111ce..f9668227 100755..100644
--- a/tmac/tmac.psfig
+++ b/tmac/psfig.tmac
@@ -1,3 +1,5 @@
+.\" psfig.tmac
+.\"
 .\" These are macros to make psfig work with groff.
 .\" They require that psfig be patched as described in ../grops/psfig.diff.
 .de psfig-defs
diff --git a/tmac/tmac.psnew b/tmac/psnew.tmac
index e13bdb88..9e18aa02 100755
--- a/tmac/tmac.psnew
+++ b/tmac/psnew.tmac
@@ -1,4 +1,6 @@
-.\" Undo the effect of tmac.psold.  This gives access to the additional
+.\" psnew.tmac
+.\"
+.\" Undo the effect of psold.tmac.  This gives access to the additional
 .\" characters that are present in the text fonts of newer PostScript
 .\" printers.  It is a bad idea to use this if you are going to
 .\" distribute the resulting PostScript output to others.
diff --git a/tmac/tmac.psold b/tmac/psold.tmac
index 04a5f6df..7e9f69a5 100755..100644
--- a/tmac/tmac.psold
+++ b/tmac/psold.tmac
@@ -1,10 +1,12 @@
+.\" psold.tmac
+.\"
 .\" In the newer PostScript printers, the text fonts contain all ISO Latin-1
 .\" characters.  The font description files that comes with groff match
 .\" these fonts.  The text fonts in older PostScript printers are missing
 .\" some of these characters.  This file prevents those characters from
 .\" being used.  This will allow the PostScript output to be printed on both
 .\" old and new printers.  The effect of this file can be undone by
-.\" tmac.psnew.
+.\" psnew.tmac.
 .nr _C \n(.C
 .cp 0
 .\" Define an accented character.
diff --git a/tmac/tmac.pspic b/tmac/pspic.tmac
index 55e51b36..77b52ec2 100755..100644
--- a/tmac/tmac.pspic
+++ b/tmac/pspic.tmac
@@ -1,3 +1,5 @@
+.\" pspic.tmac
+.\"
 .\" Define the PSPIC macro.
 .\" When used other than with -Tps, it will draw a box around where
 .\" the picture would go.
diff --git a/tmac/tmac.s b/tmac/s.tmac
index 6770b0df..3bee5272 100755..100644
--- a/tmac/tmac.s
+++ b/tmac/s.tmac
@@ -1,5 +1,8 @@
 .\" -*- nroff -*-
 .ig
+
+s.tmac
+
 Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
diff --git a/tmac/strip.sed b/tmac/strip.sed
index b309e86f..3dac41e5 100644
--- a/tmac/strip.sed
+++ b/tmac/strip.sed
@@ -1,2 +1,3 @@
+# strip all troff comments after a line containing `%beginstrip%
 /%beginstrip%/,$s/[	 ]*\\".*//
 /^\.$/d
diff --git a/tmac/tmac.an b/tmac/tmac.an
deleted file mode 100755
index 9318ad95..00000000
--- a/tmac/tmac.an
+++ /dev/null
@@ -1 +0,0 @@
-.do mso tmac.andoc
diff --git a/tmac/tmac.andoc b/tmac/tmac.andoc
deleted file mode 100755
index 2f3fbfda..00000000
--- a/tmac/tmac.andoc
+++ /dev/null
@@ -1,12 +0,0 @@
-.\" Load either tmac.an or tmac.doc.
-.if !\n(.g .ab These macros require groff.
-.de Dd
-.rm Dd
-.do mso tmac.doc
-\\*(Dd\\
-..
-.de TH
-.rm TH
-.do mso tmac.an.old
-\\*(TH\\
-..
diff --git a/tmac/tmac.man b/tmac/tmac.man
deleted file mode 100755
index 70abd5b5..00000000
--- a/tmac/tmac.man
+++ /dev/null
@@ -1 +0,0 @@
-.do mso tmac.@TMAC_AN_PREFIX@an
diff --git a/tmac/tmac.mandoc b/tmac/tmac.mandoc
deleted file mode 100755
index 9318ad95..00000000
--- a/tmac/tmac.mandoc
+++ /dev/null
@@ -1 +0,0 @@
-.do mso tmac.andoc
diff --git a/tmac/tmac.markup b/tmac/tmac.markup
deleted file mode 100755
index 3395ecac..00000000
--- a/tmac/tmac.markup
+++ /dev/null
@@ -1 +0,0 @@
-.do mso tmac.arkup
diff --git a/tmac/tmac.mdoc b/tmac/tmac.mdoc
deleted file mode 100755
index d814358a..00000000
--- a/tmac/tmac.mdoc
+++ /dev/null
@@ -1 +0,0 @@
-.do mso tmac.doc
diff --git a/tmac/tmac.me b/tmac/tmac.me
deleted file mode 100755
index 49738b51..00000000
--- a/tmac/tmac.me
+++ /dev/null
@@ -1 +0,0 @@
-.do mso tmac.e
diff --git a/tmac/tmac.ms b/tmac/tmac.ms
deleted file mode 100755
index 05f6fe45..00000000
--- a/tmac/tmac.ms
+++ /dev/null
@@ -1 +0,0 @@
-.do mso tmac.@TMAC_S_PREFIX@s
diff --git a/tmac/tmac.trace b/tmac/trace.tmac
index b393c618..143f9540 100755..100644
--- a/tmac/tmac.trace
+++ b/tmac/trace.tmac
@@ -1,3 +1,5 @@
+.\" trace.tmac
+.\"
 .\" Load this before a macro package that you want to trace.
 .
 .eo
diff --git a/tmac/tmac.tty-char b/tmac/tty-char.tmac
index e8a45f9f..02a10716 100755..100644
--- a/tmac/tmac.tty-char
+++ b/tmac/tty-char.tmac
@@ -1,3 +1,5 @@
+.\" tty-char.tmac
+.\"
 .\" This file defines standard troff characters and some groff characters for
 .\" use with -Tascii, -Tlatin1, -Tutf8, and -Tcp1047.
 .\"
@@ -199,4 +201,4 @@
 .tty-char \[arrowvertex] |
 .cp \n(_C
 .if !'\*(.T'cp1047' \
-.	do mso tmac.latin1
+.	do mso latin1.tmac
diff --git a/tmac/tmac.tty b/tmac/tty.tmac
index 115c9d30..e6804357 100755..100644
--- a/tmac/tmac.tty
+++ b/tmac/tty.tmac
@@ -1,3 +1,5 @@
+.\" tty.tmac
+.\"
 .nr _C \n(.C
 .cp 0
 .nroff
@@ -43,6 +45,6 @@
 .tty-char \(ae ae
 .tty-char \(an -
 .cp \n(_C
-.\" If you want the character definitions in tmac.tty-char to be loaded
+.\" If you want the character definitions in tty-char.tmac to be loaded
 .\" automatically, remove the `\"' from the next line.
-.\"do mso tmac.tty-char
+.\"do mso tty-char.tmac