* Makefile.comm, Makefile.in: Remove tmac_{s,an}_prefix stuff.

* tmac/Makefile.sub: Adapted to new macro names; removed `wrap'
stuff since it is no longer needed.

* README, PROBLEMS: Updated.

9 files changed, 40 insertions, 40 deletions

diff --git a/ChangeLog b/ChangeLog
index cf5a4d46..717764df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,6 +34,12 @@
 	* arch/djgpp/t-groff.bat: Fix GROFF_TMAC_PATH (hyphen.us is now in
 	the tmac subdirectory also).
 
+	* Makefile.comm, Makefile.in: Remove tmac_{s,an}_prefix stuff.
+	* tmac/Makefile.sub: Adapted to new macro names; removed `wrap'
+	stuff since it is no longer needed.
+
+	* README, PROBLEMS: Updated.
+
 2000-10-25  Werner LEMBERG  <wl@gnu.org>
 
 	Invert current behaviour: Search first FOOBAR.tmac, then
diff --git a/Makefile.comm b/Makefile.comm
index 11c5008e..8211f68a 100644
--- a/Makefile.comm
+++ b/Makefile.comm
@@ -133,9 +133,7 @@ revision=`sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' $(top_srcdir)/REVISION`
 	-e "s|@MAN1EXT@|$(man1ext)|g" \
 	-e "s|@MAN5EXT@|$(man5ext)|g" \
 	-e "s|@MAN7EXT@|$(man7ext)|g" \
-	-e "s|@TMAC_S_PREFIX@|$(tmac_s_prefix)|g" \
 	-e "s|@TMAC_M_PREFIX@|$(tmac_m_prefix)|g" \
-	-e "s|@TMAC_AN_PREFIX@|$(tmac_an_prefix)|g" \
 	-e "s|@TMAC_MDIR@|$(tmacdir)/mm|g" \
 	-e "s|@BROKEN_SPOOLER_FLAGS@|$(BROKEN_SPOOLER_FLAGS)|g" \
 	-e "s|@VERSION@|$(version)$(revision)|g" \
diff --git a/Makefile.in b/Makefile.in
index a296e338..03ef5e0d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -123,12 +123,6 @@ tmac_prefix=g
 # The groff -mm macros will be available as -m$(tmac_m_prefix)m.
 tmac_m_prefix=\
  `for i in $(tmac_wrap) ""; do case "$$i" in m) echo $(tmac_prefix);; esac; done`
-# The groff -ms macros will be available as -m$(tmac_s_prefix)s.
-tmac_s_prefix=\
- `for i in $(tmac_wrap) ""; do case "$$i" in s) echo $(tmac_prefix);; esac; done`
-# The groff -man macros will be available as -m$(tmac_an_prefix)an.
-tmac_an_prefix=\
- `for i in $(tmac_wrap) ""; do case "$$i" in an) echo $(tmac_prefix);; esac; done`
 
 # Extension to be used for refer index files.  Index files are not
 # sharable between different architectures, so you might want to use
@@ -285,8 +279,6 @@ MDEFINES= \
   "mkinstalldirs=$(mkinstalldirs)" \
   "tmac_wrap=$(tmac_wrap)" \
   "sys_tmac_prefix=$(sys_tmac_prefix)" \
-  "tmac_an_prefix=$(tmac_an_prefix)" \
-  "tmac_s_prefix=$(tmac_s_prefix)" \
   "tmac_m_prefix=$(tmac_m_prefix)" \
   "CCC=$(CCC)" \
   "CC=$(CC)" \
diff --git a/PROBLEMS b/PROBLEMS
index b73db2f4..b49d73ee 100644
--- a/PROBLEMS
+++ b/PROBLEMS
@@ -118,11 +118,11 @@ on the Software Companion CD and is installed as /opt/sfw/bin/gmake.
 
 * On Ultrix, the make stops with the message
 
-  *** Error code 1
+    *** Error code 1
 
-  Stop.
+    Stop.
 
-for no apparent reason.
+  for no apparent reason.
 
 Use GNU make.
 
@@ -172,10 +172,10 @@ No.  Real dependency files are created with a `make depend' call.
 
 ----------------------------------------------------------------------
 
-* Groff can't handle my troff document. It works fine with AT&T troff.
+* Groff can't handle my troff document.  It works fine with AT&T troff.
 
 Read the section on incompatibilities in gtroff(1).  Try using the -C
-option.  Alternatively there's the sed script in tmac/fixmacros.sed
+option.  Alternatively there's the sed script `tmac/fixmacros.sed'
 which will attempt to edit a file of macros so that it can be used
 with groff without the -C flag.
 
@@ -186,7 +186,8 @@ with groff without the -C flag.
 
 Yes, it does.  You may need to compile fonts with Metafont at these
 magnifications.  The CompileFonts script in the devdvi/generate
-directory may help you to do this.  (It will take a *long* time.)
+directory may help you to do this.  (It will take a *long* time on
+slow computers.)
 
 ----------------------------------------------------------------------
 
@@ -222,7 +223,7 @@ ps-file-server@adobe.com.)
 ----------------------------------------------------------------------
 
 * I've configured groff for A4 paper, but gtroff still seems to think
-  that the length of a page (as returned by \n(.p) is 11 inches.
+  that the length of a page (as returned by `\n(.p') is 11 inches.
 
 This is intentional.  The PAGE option is used only by grops.  For
 compatibility with ditroff, the default page length in gtroff is
@@ -233,7 +234,7 @@ request.
 
 * Groff doesn't use the font names I'm used to.
 
-Use the `ftr' request.  See gtroff(1).
+Use the `ftr' request.  See (g)troff(1).
 
 ----------------------------------------------------------------------
 
@@ -326,11 +327,7 @@ files produced by TeX.  Try getting a more up to date driver.
 
 * I get lots of errors when I use groff with the AT&T -mm macros.
 
-The AT&T -mm macros need a few changes to work with groff; `make
-install.dwbmm' will copy your -mm macros to groff's macro directory
-and make the necessary changes.  You may need to edit the commands for
-the install.mm target in the Makefile.  Alternatively use the groff
--mm macros.
+Use the groff -mm macros.
 
 ----------------------------------------------------------------------
 
@@ -369,7 +366,7 @@ comments, you can do it like this:
 
 There seem to be many different styles of page header and footer
 produced by different versions of the -man macros.  You will need to
-modify macros/tmac.an to suit your personal taste.  For example, if
+modify tmac/an-old.tmac to suit your personal taste.  For example, if
 you want the center of the page header to say
 
   System Programmer's Manual
@@ -410,10 +407,9 @@ The solution is to fix the manual page:
 
 The Ultrix man pages use a number of non-standard extensions to the
 Unix man macros.  One solution is to use the Ultrix -man macros with
-groff.  Rename /usr/local/lib/groff/tmac/tmac.an to
-/usr/local/lib/groff/tmac/tmac.an.gnu, copy /usr/lib/tmac/tmac.an to
-/usr/local/lib/groff/tmac/tmac.an and apply the following patch (from
-Frank Wortner):
+groff.  Copy /usr/lib/tmac/tmac.an to
+/usr/local/share/groff/site-tmac/an.tmac and apply the following patch
+(from Frank Wortner):
 
 *** /usr/local/lib/groff/tmac/tmac.an     Wed Sep  9 12:29:28 1992
 --- /usr/lib/tmac/tmac.an       Fri Jul 24 19:58:19 1992
@@ -436,17 +432,15 @@ Frank Wortner):
   .}f
 
 Another possible solution is to install tmac/man.ultrix as
-/usr/local/lib/groff/tmac/man.local.
+/usr/local/share/groff/site-tmac/man.local.
 
 ----------------------------------------------------------------------
 
 * I'm having problems formatting HP-UX 9.0 man pages with groff -man.
 
-Rename /usr/local/lib/groff/tmac/tmac.an to (for example)
-/usr/local/lib/groff/tmac/tmac.gan, copy HP's tmac.an into
-/usr/local/lib/groff/tmac/tmac.an, and either put `.cp 1' at the
-beginning or filter it (and any files it .so's) through
-tmac/fixmacros.sed.
+Copy HP's tmac.an into /usr/local/share/groff/site-tmac/an.tmac, and
+either put `.cp 1' at the beginning or filter it (and any files it .so's)
+through tmac/fixmacros.sed.
 
 ----------------------------------------------------------------------
 
diff --git a/README b/README
index 62ea08d8..88f8f878 100644
--- a/README
+++ b/README
@@ -20,7 +20,7 @@ The file PROBLEMS describes various problems that have been encountered
 in compiling, installing, and running groff.
 
 For the moment, the documentation assumes that you are already familiar
-with the Unix versions of troff, -man, -ms, and the preprocessors.
+with the Unix versions of troff, -ms, and the preprocessors.
 
 The most recent released version of groff is always available by
 anonymous ftp from ftp.gnu.org in the directory pub/gnu/groff.
diff --git a/doc/groff.texinfo b/doc/groff.texinfo
index e3944c5f..5b2433c7 100644
--- a/doc/groff.texinfo
+++ b/doc/groff.texinfo
@@ -1885,8 +1885,6 @@ are based on it.
 The command line format for using the @file{man} macros with
 @code{groff} is:
 
-@c XXX document @TMAC_AN_PREFIX@
-
 @example
 groff -m man [ -rC1 ] [ -rD1 ] [ -rP@var{nnn} ] [ -rS@var{xx} ]
       [ -rX@var{nnn} ] [ @var{files}@dots{} ] 
@@ -6346,7 +6344,7 @@ name.
 This would be called as
 
 @example
-.vl $Id: groff.texinfo,v 1.50 2000/10/26 14:15:08 wlemb Exp $
+.vl $Id: groff.texinfo,v 1.51 2000/10/26 21:49:47 wlemb Exp $
 @end example
 
 @xref{Request Arguments}.
diff --git a/tmac/groff_mdoc.man b/tmac/groff_mdoc.man
index 4ed33d42..2c8dfb6d 100644
--- a/tmac/groff_mdoc.man
+++ b/tmac/groff_mdoc.man
@@ -45,6 +45,9 @@ macro package
 .Nm groff
 .Fl m Ns Ar doc
 .Ar files ...
+.Nm groff
+.Fl m Ar mdoc
+.Ar files ...
 .Sh DESCRIPTION
 The
 .Nm \-mdoc
diff --git a/tmac/groff_me.man b/tmac/groff_me.man
index 5b3ae575..7debe290 100644
--- a/tmac/groff_me.man
+++ b/tmac/groff_me.man
@@ -26,7 +26,7 @@ groff_me \- troff macros for formatting papers
 [ options ]
 file ...
 .br
-.B "troff \-me"
+.B "groff \-m\ me"
 [ options ]
 file ...
 .SH DESCRIPTION
diff --git a/tmac/groff_ms.man b/tmac/groff_ms.man
index 7d88a109..91463d8e 100644
--- a/tmac/groff_ms.man
+++ b/tmac/groff_ms.man
@@ -21,7 +21,16 @@ the original English.
 groff_ms \- groff ms macros
 .SH SYNOPSIS
 .B groff
-.B \-m@TMAC_S_PREFIX@s
+.B \-ms
+[
+.IR options .\|.\|.
+]
+[
+.IR files .\|.\|.
+]
+.br
+.B groff
+.B \-m\ ms
 [
 .IR options .\|.\|.
 ]