Convert macros `tmac.XXX' to `XXX.tmac'. Special cases:

  tmac.doc.old -> doc-old.tmac
  tmac.an.old  -> an-old.tmac

* tmac/tmac.*: Moved to ...
* tmac/*.tmac: this.
* tmac/man.local: Fix comment.
* tmac/groff_man.man, tmac/groff_markup.man, tmac/groff_mdoc.man,
tmac/groff_me.man, tmac/groff_ms.man, tmac/groff_tmac.man: Updated.
Added some `FILES' sections.  More use of @...@ directives.  Other
minor updates.
* arch/djgpp/README, font/devutf8/NOTES: Updated.
* doc/homepage.ms, doc/groff.texinfo: Updated.
* man/groff.man, man/roff.man: Updated.
* src/devices/grodvi/grodvi.man, src/devices/grolbp/grolbp.man,
src/devices/grolj4/grolj4.man, src/devices/grops/grops.man,
src/devices/grotty/grotty.man: Updated.
* src/preproc/pic/pic.man: Updated.
* src/roff/grog/grog.pl, src/roff/grog/grog.sh: Use -mdoc-old
instead of -mdoc.old.
* src/roff/grog/grog.man: Document -mdoc and -mdoc-old.
* src/roff/nroff/nroff.man: Updated.
* NEWS: Updated.

* tmac/fixmacros.sed, tmac/strip.sed: Add explanatory comment.

* tmac/mm.diff: Removed -- it has no use now since the mm package
is part of groff.

* tmac/*: Removed trailing spaces.

* arch/djgpp/t-groff.bat: Fix GROFF_TMAC_PATH (hyphen.us is now in
the tmac subdirectory also).

1 files changed, 24 insertions, 63 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