Fix conflicts which arose during import, also add $FreeBSD$.

5 files changed, 21 insertions, 11 deletions

diff --git a/contrib/groff/tmac/doc-common b/contrib/groff/tmac/doc-common
index ce883c0..1fc5de1 100644
--- a/contrib/groff/tmac/doc-common
+++ b/contrib/groff/tmac/doc-common
@@ -119,6 +119,7 @@
 .nr Xc 3
 .nr Xo 1
 .nr Xr 10n
+.nr Yr \n(yr+1900
 .ds sV \& \&
 .ds hV \&\ \&
 .ds iV \& \&
@@ -284,8 +285,7 @@
 .		if "\\n(mo"10" .ds dD October
 .		if "\\n(mo"11" .ds dD November
 .		if "\\n(mo"12" .ds dD December
-.		nr _y \\n(yr+1900
-.		as dD \&\ \\n(dy, \\n(_y
+.		as dD \&\ \\n(dy, \\n(Yr
 .	\}
 .\}
 .el \{\
diff --git a/contrib/groff/tmac/doc-syms b/contrib/groff/tmac/doc-syms
index b355fde..a581bd7 100644
--- a/contrib/groff/tmac/doc-syms
+++ b/contrib/groff/tmac/doc-syms
@@ -398,11 +398,13 @@
 .       \}
 .       if "\\*(A\\n(aP"-iso8802-3" \{\
 .		ie \\n(sT==1 \{\
-.			ds b1 \&\\*(tNISO \\*(aa8802-3: 1989\\*(sV
+.			ds b1 \&\\*(tNISO \\*(aa8802-3: 1989
+.\" .			ds b1 \&\\*(tNISO \\*(aa8802-3: 1989\\*(sV
 .\" .			as b1 (``\\*(tNANSI C\\*(aa'')
 .		\}
 .		el \{\
-.			ds b1 \&\\*(tNISO \\*(aa8802-3: 1989\\*(sV
+.			ds b1 \&\\*(tNISO \\*(aa8802-3: 1989
+.\" .			ds b1 \&\\*(tNISO \\*(aa8802-3: 1989\\*(sV
 .\" .			as b1 (``\\*(tNANSI C\\*(aa'')
 .		\}
 .       \}
diff --git a/contrib/groff/tmac/eqnrc b/contrib/groff/tmac/eqnrc
index fd064d1..2156c15 100644
--- a/contrib/groff/tmac/eqnrc
+++ b/contrib/groff/tmac/eqnrc
@@ -1,4 +1,5 @@
 .\" Startup file for eqn.
+.\" $FreeBSD$
 .EQ
 sdefine << %{ < back 20 < }%
 sdefine >> %{ > back 20 > }%
@@ -15,10 +16,11 @@ ifdef X100 ! define X %1% !
 ifdef X75-12 ! define X %1% !
 ifdef X100-12 ! define X %1% !
 
-ifdef ps ! define ps|X %1% !
-ifdef X ! define ps|X %1% !
+ifdef ps ! define ps|X|html %1% !
+ifdef X ! define ps|X|html %1% !
+ifdef html ! define ps|X|html %1% !
 
-ifdef ps|X ! sdefine inf %"\s[\En[.s]*13u/10u]\v'12M'\(if\v'-12M'\s0"% !
+ifdef ps|X|html ! sdefine inf %"\s[\En[.s]*13u/10u]\v'12M'\(if\v'-12M'\s0"% !
 
 ifdef dvi !
 sdefine int %{type "operator" vcenter \(is}%
@@ -46,7 +48,7 @@ set big_op_spacing5 10
 
 ifdef X ! set axis_height 32 !
 
-ifdef ps|X ! set draw_lines 1 !
+ifdef ps|X|html ! set draw_lines 1 !
 
 ifdef ascii ! define n %1% !
 ifdef latin1 ! define n %1% !
@@ -58,4 +60,5 @@ set nroff 1
 undef X
 undef ps|X
 undef n
+undef html
 .EN
diff --git a/contrib/groff/tmac/tmac.e b/contrib/groff/tmac/tmac.e
index 144565a..6747af4 100644
--- a/contrib/groff/tmac/tmac.e
+++ b/contrib/groff/tmac/tmac.e
@@ -39,6 +39,8 @@
 .\"			to provide variant functions.
 .\"		---	an internal macro.
 .\"
+.\"	$FreeBSD$
+.\"
 .if !\n(.g .ig
 .de @R			\" --- initialize number register to 0, if undefined
 .if !r\\$1 .nr \\$1 0
@@ -1519,8 +1521,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 _y \n(yr+1900
-.ds td \*(mo \n(dy, \n(_y
+.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
diff --git a/contrib/groff/tmac/troffrc b/contrib/groff/tmac/troffrc
index 5c647d4..858d915 100644
--- a/contrib/groff/tmac/troffrc
+++ b/contrib/groff/tmac/troffrc
@@ -15,10 +15,11 @@
 .do ds troffrc!latin1 tmac.tty
 .do ds troffrc!koi8-r tmac.tty
 .do ds troffrc!lj4 tmac.lj4
+.do ds troffrc!html tmac.html
 .do if d troffrc!\*[.T] \
 .	do mso \*[troffrc!\*[.T]]
 .do rm troffrc!ps troffrc!Xps troffrc!dvi troffrc!X75 troffrc!X75-12 \
-troffrc!X100 troffrc!X100-12 troffrc!lj4
+troffrc!X100 troffrc!X100-12 troffrc!lj4 troffrc!html
 .ie "\*[.T]"koi8-r" .do tr \[char154]
 .el .do tr \[char160]
 .\" Set the hyphenation language to `us' unless we're using koi8-r (russian)