fix Y2K problems

4 files changed, 11 insertions, 9 deletions

diff --git a/gnu/usr.bin/groff/mm/tmac.m b/gnu/usr.bin/groff/mm/tmac.m
index 5308eed4616..54266de30e7 100644
--- a/gnu/usr.bin/groff/mm/tmac.m
+++ b/gnu/usr.bin/groff/mm/tmac.m
@@ -3,8 +3,8 @@
 .ds RE \\$2
 ..
 .\"
-.\" $Id: tmac.m,v 1.2 1997/04/22 14:07:33 kstailey Exp $
-.@revision $Revision: 1.2 $
+.\" $Id: tmac.m,v 1.3 1997/11/17 04:41:54 deraadt Exp $
+.@revision $Revision: 1.3 $
 .ig
 
 Copyright (C) 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
@@ -2620,8 +2620,8 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%]
 .de AE
 ..
 .\" I am planning to use mgm some time :-)
-.ie \\n[yr]<50 .ds cov*new-date \\*[MO\\n[mo]] \\n[dy], 20\\n[yr]
-.el .ds cov*new-date \\*[MO\\n[mo]] \\n[dy], 19\\n[yr]
+.nr *year \\n[yr]+1900
+.ds cov*new-date \\*[MO\\n[mo]] \\n[dy], \\n[*year]
 .als DT cov*new-date
 .de ND
 .ds cov*new-date \\$1
diff --git a/gnu/usr.bin/groff/mm/tmac.mse b/gnu/usr.bin/groff/mm/tmac.mse
index b9612787b64..bdccb5da19e 100644
--- a/gnu/usr.bin/groff/mm/tmac.mse
+++ b/gnu/usr.bin/groff/mm/tmac.mse
@@ -1,4 +1,4 @@
-.\" $Id: tmac.mse,v 1.2 1997/04/22 14:07:33 kstailey Exp $
+.\" $Id: tmac.mse,v 1.3 1997/11/17 04:41:57 deraadt Exp $
 .\"
 .\" swedish version of mm
 .\" See tmac.m for version-information.
@@ -65,8 +65,8 @@
 .ds MO10 oktober
 .ds MO11 november
 .ds MO12 december
-.ie \\n[yr]<50 .ds cov*new-date \\n[dy] \\*[MO\\n[mo]] 20\\n[yr]
-.el .ds cov*new-date \\n[dy] \\*[MO\\n[mo]] 19\\n[yr]
+.nr *year \\n[yr]+1900
+.ds cov*new-date \\n[dy] \\*[MO\\n[mo]] \\n[*year]
 .nr pg*footer-size 4\"                  1v+footer+even/odd footer+1v
 .\"------------------------------------------------
 .\" Dokumentnamn
diff --git a/gnu/usr.bin/groff/tmac/doc-common b/gnu/usr.bin/groff/tmac/doc-common
index 2d25d0b7867..eb5e87570e3 100644
--- a/gnu/usr.bin/groff/tmac/doc-common
+++ b/gnu/usr.bin/groff/tmac/doc-common
@@ -245,7 +245,8 @@
 .		if "\\n(mo"10" .ds dD October
 .		if "\\n(mo"11" .ds dD November
 .		if "\\n(mo"12" .ds dD December
-.		as dD \&\ \\n(dy, 19\\n(yr
+.		nr *year \\n(yr+1900
+.		as dD \&\ \\n(dy, \\n([*year]
 .	\}
 .\}
 .el \{\
diff --git a/gnu/usr.bin/groff/tmac/tmac.e b/gnu/usr.bin/groff/tmac/tmac.e
index a7abb0ad081..3a63751a077 100644
--- a/gnu/usr.bin/groff/tmac/tmac.e
+++ b/gnu/usr.bin/groff/tmac/tmac.e
@@ -1519,7 +1519,8 @@ 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
-.ds td \*(mo \n(dy, 19\n(yr
+.nr *year \n(yr+1900
+.ds td \*(mo \n(dy, \n([*year]
 .\"		*** PARAMETRIC INITIALIZATIONS ***
 .rr x
 .nr $v \n(.v00+\n(.sp-1/\n(.sp	\" vs as percentage of ps for .sz request