11 files changed, 33 insertions, 373 deletions

diff --git a/gnu/usr.bin/groff/tmac/Makefile.sub b/gnu/usr.bin/groff/tmac/Makefile.sub
index 8ce46437682..0528ad76fc9 100644
--- a/gnu/usr.bin/groff/tmac/Makefile.sub
+++ b/gnu/usr.bin/groff/tmac/Makefile.sub
@@ -1,16 +1,14 @@
-MAN7=groff_ms.n me.n msafer.n
+MAN7=groff_ms.7 groff_man.7 groff_me.7 groff_msafer.7
 
-NORMALFILES=$(TMAC_ANDOC) tmac.pic tmac.ps tmac.psnew tmac.psold tmac.pspic \
+NORMALFILES=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 tmac.safer
-SPECIALFILES=$(TMAC_AN) tmac.s
-STRIPFILES=tmac.e tmac.doc tmac.doc.old
-# MDOCFILES=doc-common doc-ditroff doc-nroff doc-syms
+      tmac.lj4 eqnrc troffrc tmac.safer tmac.html tmac.arkup
+SPECIALFILES=tmac.s
+STRIPFILES=tmac.e
 mdocdir=$(tmacdir)/mdoc
 CLEANADD=stamp-strip stamp-wrap tmac.e-s tmac.doc-s tmac.doc.old-s \
- doc-common-s doc-ditroff-s doc-nroff-s doc-syms-s *-wrap
+      doc-common-s doc-ditroff-s doc-nroff-s doc-syms-s *-wrap
 tmac_s_prefix=
-tmac_an_prefix=
 tmac_wrap=
 sys_tmac_prefix=
 
@@ -19,7 +17,7 @@ all: stamp-strip stamp-wrap
 install_data: $(NORMALFILES) $(SPECIALFILES) stamp-wrap stamp-strip man.local
 	-test -d $(tmacdir) || mkdir $(tmacdir)
 	if test -n "$(tmac_wrap)"; then \
-	  for m in $(tmac_wrap); do \
+	  for m in ""$(tmac_wrap); do \
 	    $(INSTALL_DATA) $$m-wrap $(tmacdir)/tmac.$$m; \
 	  done; \
 	fi
@@ -27,23 +25,12 @@ install_data: $(NORMALFILES) $(SPECIALFILES) stamp-wrap stamp-strip man.local
 	  rm -f $(tmacdir)/$$f; \
 	  $(INSTALL_DATA) $(srcdir)/$$f $(tmacdir)/$$f; \
 	done
-	if test -n "$(TMAC_S)"; then \
-		rm -f $(tmacdir)/tmac.$(tmac_s_prefix)s ; \
-		$(INSTALL_DATA) $(srcdir)/tmac.s $(tmacdir)/tmac.$(tmac_s_prefix)s ; \
-	fi
-	if test -n "$(TMAC_AN)"; then \
-		rm -f $(tmacdir)/tmac.$(tmac_an_prefix)an ; \
-		$(INSTALL_DATA) $(srcdir)/tmac.an $(tmacdir)/tmac.$(tmac_an_prefix)an ; \
-	fi
+	-rm -f $(tmacdir)/tmac.$(tmac_s_prefix)s
+	$(INSTALL_DATA) $(srcdir)/tmac.s $(tmacdir)/tmac.$(tmac_s_prefix)s
 	for f in $(STRIPFILES); do \
 	  rm -f $(tmacdir)/$$f; \
 	  $(INSTALL_DATA) $$f-s $(tmacdir)/$$f; \
 	done
-	-test -d $(mdocdir) || mkdir $(mdocdir)
-	for f in $(MDOCFILES); do \
-	  rm -f $(mdocdir)/$$f; \
-	  $(INSTALL_DATA) $$f-s $(mdocdir)/$$f; \
-	done
 	-test -f $(tmacdir)/man.local || \
 	  $(INSTALL_DATA) $(srcdir)/man.local $(tmacdir)/man.local
 	-rm -f temp
@@ -57,7 +44,7 @@ stamp-strip: $(STRIPFILES) $(MDOCFILES)
 
 stamp-wrap:
 	if test -n "$(tmac_wrap)"; then \
-	  for m in $(tmac_wrap); do \
+	  for m in ""$(tmac_wrap); do \
 	    rm -f $$m-wrap; \
 	    echo .cp 1 >$$m-wrap; \
 	    echo .so $(sys_tmac_prefix)$$m >>$$m-wrap; \
@@ -67,11 +54,12 @@ stamp-wrap:
 
 uninstall_sub:
 	-if test -n "$(tmac_wrap)"; then \
-	  for m in $(tmac_wrap); do rm -f $(tmacdir)/tmac.$$m; done; \
+	  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
 	-if cmp -s $(tmacdir)/man.local $(srcdir)/man.local; then \
 	  rm -f $(tmacdir)/man.local; \
 	fi
diff --git a/gnu/usr.bin/groff/tmac/doc-common b/gnu/usr.bin/groff/tmac/doc-common
index eb5e87570e3..1be195979fa 100644
--- a/gnu/usr.bin/groff/tmac/doc-common
+++ b/gnu/usr.bin/groff/tmac/doc-common
@@ -118,6 +118,7 @@
 .nr Xc 3
 .nr Xo 1
 .nr Xr 10n
+.nr Yr \n(yr+1900
 .ds sV \& \&
 .ds hV \&\ \&
 .ds iV \& \&
@@ -157,9 +158,9 @@
 .	ds cH \\$2
 .\" .	if "\\$3"" \{\
 .		if \\$2>=1 .if \\$2<=8 \{\
-.			ds vT UNIX Reference Manual
-.			if \\$2>1 .if \\$2<6 .ds vT UNIX Programmer's Manual
-.			if "\\$2"8" .ds vT UNIX System Manager's Manual
+.			ds vT System Reference Manual
+.			if \\$2>1 .if \\$2<6 .ds vT System Programmer's Manual
+.			if "\\$2"8" .ds vT System Manager's Manual
 .			nr sN \\$2
 .		\}
 .		if "\\$2"unass"  .ds vT DRAFT
@@ -168,17 +169,17 @@
 .\" .	\}
 .\}
 .if !"\\$3"" \{\
-.	if "\\$3"USD"   .ds vT UNIX User's Supplementary Documents
-.	if "\\$3"PS1"   .ds vT UNIX Programmers's Supplementary Documents
-.	if "\\$3"AMD"   .ds vT UNIX Ancestral Manual Documents
-.	if "\\$3"SMM"   .ds vT UNIX System Manager's Manual
-.	if "\\$3"URM"   .ds vT UNIX Reference Manual
-.	if "\\$3"PRM"   .ds vT UNIX Programmers's Manual
-.	if "\\$3"IND"   .ds vT UNIX Manual Master Index
-.\" .	if "\\$3"CON"   .ds vT UNIX Contributed Software Manual
-.\" .	if "\\$3"IMP"	.ds vT UNIX Implementation Notes
-.\" .	if "\\$3"HOW"	.ds vT UNIX How Pocket Manual
-.	if "\\$3"LOCAL" .ds vT UNIX Local Manual
+.	if "\\$3"USD"   .ds vT User's Supplementary Documents
+.	if "\\$3"PS1"   .ds vT Programmers's Supplementary Documents
+.	if "\\$3"AMD"   .ds vT Ancestral Manual Documents
+.	if "\\$3"SMM"   .ds vT System Manager's Manual
+.	if "\\$3"URM"   .ds vT Reference Manual
+.	if "\\$3"PRM"   .ds vT Programmers's Manual
+.	if "\\$3"IND"   .ds vT Manual Master Index
+.\" .	if "\\$3"CON"   .ds vT Contributed Software Manual
+.\" .	if "\\$3"IMP"	.ds vT Implementation Notes
+.\" .	if "\\$3"HOW"	.ds vT How Pocket Manual
+.	if "\\$3"LOCAL" .ds vT Local Manual
 .	if "\\$3"tahoe" .as vT \ (Tahoe Architecture)
 .	if "\\$3"vax" .as vT \ (VAX Architecture)
 .	if "\\$3"hp300" .as vT \ (HP300 Architecture)
@@ -245,8 +246,7 @@
 .		if "\\n(mo"10" .ds dD October
 .		if "\\n(mo"11" .ds dD November
 .		if "\\n(mo"12" .ds dD December
-.		nr *year \\n(yr+1900
-.		as dD \&\ \\n(dy, \\n([*year]
+.		as dD \&\ \\n(dy, \\n(Yr
 .	\}
 .\}
 .el \{\
diff --git a/gnu/usr.bin/groff/tmac/groff_man.man b/gnu/usr.bin/groff/tmac/groff_man.7_in
index 57eb9ec4555..57eb9ec4555 100644
--- a/gnu/usr.bin/groff/tmac/groff_man.man
+++ b/gnu/usr.bin/groff/tmac/groff_man.7_in
diff --git a/gnu/usr.bin/groff/tmac/groff_mdoc.man b/gnu/usr.bin/groff/tmac/groff_mdoc.7_in
index 2112eba4eba..2112eba4eba 100644
--- a/gnu/usr.bin/groff/tmac/groff_mdoc.man
+++ b/gnu/usr.bin/groff/tmac/groff_mdoc.7_in
diff --git a/gnu/usr.bin/groff/tmac/groff_mdoc.samples.man b/gnu/usr.bin/groff/tmac/groff_mdoc.samples.7_in
index cdbbc21c4f6..cdbbc21c4f6 100644
--- a/gnu/usr.bin/groff/tmac/groff_mdoc.samples.man
+++ b/gnu/usr.bin/groff/tmac/groff_mdoc.samples.7_in
diff --git a/gnu/usr.bin/groff/tmac/groff_me.man b/gnu/usr.bin/groff/tmac/groff_me.7_in
index 49196212391..49196212391 100644
--- a/gnu/usr.bin/groff/tmac/groff_me.man
+++ b/gnu/usr.bin/groff/tmac/groff_me.7_in
diff --git a/gnu/usr.bin/groff/tmac/groff_ms.man b/gnu/usr.bin/groff/tmac/groff_ms.7_in
index 0e1f64c741f..0e1f64c741f 100644
--- a/gnu/usr.bin/groff/tmac/groff_ms.man
+++ b/gnu/usr.bin/groff/tmac/groff_ms.7_in
diff --git a/gnu/usr.bin/groff/tmac/groff_msafer.man b/gnu/usr.bin/groff/tmac/groff_msafer.7_in
index 0e0de775b63..0e0de775b63 100644
--- a/gnu/usr.bin/groff/tmac/groff_msafer.man
+++ b/gnu/usr.bin/groff/tmac/groff_msafer.7_in
diff --git a/gnu/usr.bin/groff/tmac/me.man b/gnu/usr.bin/groff/tmac/me.man
deleted file mode 100644
index 49196212391..00000000000
--- a/gnu/usr.bin/groff/tmac/me.man
+++ /dev/null
@@ -1,274 +0,0 @@
-.\" Copyright (c) 1980 The Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms are permitted
-.\" provided that the above copyright notice and this paragraph are
-.\" duplicated in all such forms and that any documentation,
-.\" advertising materials, and other materials related to such
-.\" distribution and use acknowledge that the software was developed
-.\" by the University of California, Berkeley.  The name of the
-.\" University may not be used to endorse or promote products derived
-.\" from this software without specific prior written permission.
-.\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-.\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-.\"
-.\"	@(#)me.7	6.4 (Berkeley) 4/13/90
-.\"
-.\" Modified for groff by jjc@jclark.com
-.hc %
-.TH GROFF_ME @MAN7EXT@ "@MDATE@" "Groff Version @VERSION@"
-.UC 3
-.SH NAME
-groff_me \- troff macros for formatting papers
-.SH SYNOPSIS
-.B "groff \-me"
-[ options ]
-file ... 
-.br
-.B "troff \-me"
-[ options ]
-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 
-.I troff
-macro definitions provides a canned formatting
-facility for tech%nical papers in various formats.
-.PP
-The macro requests are defined below.
-Many
-.I troff
-requests are unsafe in conjunction with
-this package, however, these requests may be used with
-impunity after the first .pp:
-.nf
-.IP
-.ta \w'.sz +n  'u
-\&.bp	begin new page
-\&.br	break output line here
-\&.sp n	insert n spacing lines
-\&.ls n	(line spacing) n=1 single, n=2 double space
-\&.na	no alignment of right margin
-\&.ce n	center next n lines
-\&.ul n	underline next n lines
-.fi
-.PP
-Output of the
-.I pic,
-.I eqn,
-.I refer,
-and
-.I tbl
-preprocessors
-is acceptable as input.
-.SH FILES
-@MACRODIR@/tmac.e
-.SH "SEE ALSO"
-.BR groff (@MAN1EXT@),
-.BR @g@troff (@MAN1EXT@)
-.br
-\-me Reference Manual, Eric P. Allman
-.br
-Writing Papers with Groff Using \-me
-.tr &.
-.SH REQUESTS 
-This list is incomplete;
-see
-.I "The \-me Reference Manual"
-for interesting details.
-.PP
-.ta \w'.eh \'x\'y\'z\'  'u +\w'Initial 'u +\w'Cause 'u
-.br
-.di x
-			\ka
-.br
-.di
-.in \nau
-.ti 0
-Request	Initial	Cause	Explanation
-.ti 0
-	Value	Break
-.br
-.in \nau
-.ti 0
-\&.(c	-	yes	Begin centered block
-.ti 0
-\&.(d	-	no	Begin delayed text
-.ti 0
-\&.(f	-	no	Begin footnote
-.ti 0
-\&.(l	-	yes	Begin list
-.ti 0
-\&.(q	-	yes	Begin major quote
-.ti 0
-\&.(x \fIx\fR	-	no	Begin indexed item in index
-.I x
-.ti 0
-\&.(z	-	no	Begin floating keep
-.ti 0
-\&.)c	-	yes	End centered block
-.ti 0
-\&.)d	-	yes	End delayed text
-.ti 0
-\&.)f	-	yes	End footnote
-.ti 0
-\&.)l	-	yes	End list
-.ti 0
-\&.)q	-	yes	End major quote
-.ti 0
-\&.)x	-	yes	End index item
-.ti 0
-\&.)z	-	yes	End floating keep
-.ti 0
-\&.++ \fIm H\fR	-	no	Define paper section.
-.I m
-defines the part of the paper, and can be
-.B C
-(chapter),
-.B A
-(appendix),
-.B P
-(preliminary, e.g., abstract, table of contents, etc.),
-.B B
-(bibliography),
-.B RC
-(chapters renumbered from page one each chapter),
-or
-.B RA
-(appendix renumbered from page one).
-.ti 0
-\&.+c \fIT\fR	-	yes	Begin chapter (or appendix, etc., as
-set by .++).
-.I T
-is the chapter title.
-.ti 0
-\&.1c	1	yes	One column format on a new page.
-.ti 0
-\&.2c	1	yes	Two column format.
-.ti 0
-\&.EN	-	yes	Space after equation
-produced by
-.I eqn
-or
-.IR neqn .
-.ti 0
-\&.EQ \fIx y\fR	-	yes	Precede equation; break out and
-add space.
-Equation number is
-.IR y .
-The optional argument \fIx\fR
-may be
-.I I
-to indent equation (default),
-.I L
-to left-adjust the equation, or
-.I C
-to center the equation.
-.ti 0
-\&.GE	-	yes	End \fIgremlin\fP picture.
-.ti 0
-\&.GS	-	yes	Begin \fIgremlin\fP picture.
-.ti 0
-\&.PE	-	yes	End \fIpic\fP picture.
-.ti 0
-\&.PS	-	yes	Begin \fIpic\fP picture.
-.ti 0
-\&.TE	-	yes	End table.
-.ti 0
-\&.TH	-	yes	End heading section of table.
-.ti 0
-\&.TS \fIx\fR	-	yes	Begin table; if \fIx\fR is
-.I H
-table has repeated heading.
-.ti 0
-\&.b \fIx\fR	no	no	Print
-.I x
-in boldface; if no argument switch to boldface.
-.ti 0
-\&.ba \fI+n\fR	0	yes	Augments the base indent by
-.I n.
-This indent is used to set the indent on regular text
-(like paragraphs).
-.ti 0
-\&.bc	no	yes	Begin new column
-.ti 0
-\&.bi \fIx\fR	no	no	Print
-.I x
-in bold italics (nofill only)
-.ti 0
-\&.bu	-	yes	Begin bulleted paragraph
-.ti 0
-\&.bx \fIx\fR	no	no	Print \fIx\fR in a box (nofill only).
-.ti 0
-\&.ef \fI\'x\'y\'z\'\fR	\'\'\'\'	no	Set even footer to x  y  z
-.ti 0
-\&.eh \fI\'x\'y\'z\'\fR	\'\'\'\'	no	Set even header to x  y  z
-.ti 0
-\&.fo \fI\'x\'y\'z\'\fR	\'\'\'\'	no	Set footer to x  y  z
-.ti 0
-\&.hx	-	no	Suppress headers and footers on next page.
-.ti 0
-\&.he \fI\'x\'y\'z\'\fR	\'\'\'\'	no	Set header to x  y  z
-.ti 0
-\&.hl	-	yes	Draw a horizontal line
-.ti 0
-\&.i \fIx\fR	no	no	Italicize
-.I x;
-if
-.I x
-missing, italic text follows.
-.ti 0
-\&.ip \fIx y\fR	no	yes	Start indented paragraph,
-with hanging tag
-.IR x .
-Indentation is
-.I y
-ens (default 5).
-.ti 0
-\&.lp	yes	yes	Start left-blocked paragraph.
-.ti 0
-\&.np	1	yes	Start numbered paragraph.
-.ti 0
-\&.of \fI\'x\'y\'z\'\fR	\'\'\'\'	no	Set odd footer to x  y  z
-.ti 0
-\&.oh \fI\'x\'y\'z\'\fR	\'\'\'\'	no	Set odd header to x  y  z
-.ti 0
-\&.pd	-	yes	Print delayed text.
-.ti 0
-\&.pp	no	yes	Begin paragraph.
-First line indented.
-.ti 0
-\&.r	yes	no	Roman text follows.
-.ti 0
-\&.re	-	no	Reset tabs to default values.
-.ti 0
-\&.sh \fIn x\fR	-	yes	Section head follows,
-font automatically bold.
-.I n
-is level of section,
-.I x
-is title of section.
-.ti 0
-\&.sk	no	no	Leave the next page blank.
-Only one page is remembered ahead.
-.ti 0
-\&.sm \fIx\fR	-	no	Set
-.I x
-in a smaller pointsize.
-.ti 0
-\&.sz \fI+n\fR	10p	no	Augment the point size by
-.I n
-points.
-.ti 0
-\&.tp	no	yes	Begin title page.
-.ti 0
-\&.u \fIx\fR	-	no	Underline argument (even in \fItroff\fR).
-(Nofill only).
-.ti 0
-\&.uh	-	yes	Like .sh but unnumbered.
-.ti 0
-\&.xp \fIx\fR	-	no	Print index
-.I x.
diff --git a/gnu/usr.bin/groff/tmac/msafer.man b/gnu/usr.bin/groff/tmac/msafer.man
deleted file mode 100644
index 05712855652..00000000000
--- a/gnu/usr.bin/groff/tmac/msafer.man
+++ /dev/null
@@ -1,56 +0,0 @@
-.ig \"-*- nroff -*-
-Copyright (C) 1989-1995 Free Software Foundation, Inc.
-
-Permission is granted to make and distribute verbatim copies of
-this manual provided the copyright notice and this permission notice
-are preserved on all copies.
-
-Permission is granted to copy and distribute modified versions of this
-manual under the conditions for verbatim copying, provided that the
-entire resulting derived work is distributed under the terms of a
-permission notice identical to this one.
-
-Permission is granted to copy and distribute translations of this
-manual into another language, under the above conditions for modified
-versions, except that this permission notice may be included in
-translations approved by the Free Software Foundation instead of in
-the original English.
-..
-.TH MSAFER @MAN7EXT@ "@MDATE@" "Groff Version @VERSION@"
-.SH NAME
-msafer \- groff -msafer macros
-.SH SYNOPSIS
-.B groff
-.B \-msafer
-[
-.IR options .\|.\|.
-]
-[
-.IR files .\|.\|.
-]
-.SH DESCRIPTION
-The -msafer macros remove the
-.BR open ,
-.BR opena ,
-.BR pso ,
-.B sy
-and
-.B pi
-requests.
-These macros should be used when processing input from
-an untrustworthy source.
-For maximum safety,
-they should be the first -m option on the command-line.
-Normally they are invoked using the
-.B \-S
-option of groff, which will also pass
-.B @g@pic
-the
-.B \-S
-flag.
-.SH FILES
-.B @MACRODIR@/tmac.safer
-.SH "SEE ALSO"
-.BR groff (@MAN1EXT@),
-.BR @g@troff (@MAN1EXT@),
-.BR @g@pic (@MAN1EXT@)
diff --git a/gnu/usr.bin/groff/tmac/tmac.e b/gnu/usr.bin/groff/tmac/tmac.e
index a472560979c..3a4eb86a999 100644
--- a/gnu/usr.bin/groff/tmac/tmac.e
+++ b/gnu/usr.bin/groff/tmac/tmac.e
@@ -1519,8 +1519,10 @@ in \\f2\\*([B\\f1, \c
 .if \n(dw=5 .ds dw Thursday
 .if \n(dw=6 .ds dw Friday
 .if \n(dw=7 .ds dw Saturday
-.nr *year \n(yr+1900
-.ds td \*(mo \n(dy, \n[*year]
+.nr y2 \n(yr%100
+.af y2 00
+.nr y4 \n(yr+1900
+.ds td \*(mo \n(dy, \n(y4
 .\"		*** PARAMETRIC INITIALIZATIONS ***
 .rr x
 .nr $v \n(.v00+\n(.sp-1/\n(.sp	\" vs as percentage of ps for .sz request