Reintegrate mgm-1.29 and our changes into groff-1.11a.

10 files changed, 15 insertions, 15 deletions

diff --git a/gnu/usr.bin/groff/mm/Makefile.sub b/gnu/usr.bin/groff/mm/Makefile.sub
index 18a1e285626..f3e3421659e 100644
--- a/gnu/usr.bin/groff/mm/Makefile.sub
+++ b/gnu/usr.bin/groff/mm/Makefile.sub
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.sub,v 1.2 1997/04/22 14:07:30 kstailey Exp $
+# $Id: Makefile.sub,v 1.3 1998/01/19 00:40:11 etheisen Exp $
 #
 MAN7=groff_mm.n groff_mmse.n
 FILES=0.MT 5.MT 4.MT ms.cov se_ms.cov 
diff --git a/gnu/usr.bin/groff/mm/groff_mm.man b/gnu/usr.bin/groff/mm/groff_mm.man
index 842329d2307..c2fa055cf24 100644
--- a/gnu/usr.bin/groff/mm/groff_mm.man
+++ b/gnu/usr.bin/groff/mm/groff_mm.man
@@ -16,7 +16,7 @@ versions, except that this permission notice may be included in
 translations approved by the Free Software Foundation instead of in
 the original English.
 ..
-.\" $Id: groff_mm.man,v 1.2 1997/04/22 14:07:31 kstailey Exp $
+.\" $Id: groff_mm.man,v 1.3 1998/01/19 00:40:12 etheisen Exp $
 .\"
 .de T2
 .ne 2v
diff --git a/gnu/usr.bin/groff/mm/groff_mmse.man b/gnu/usr.bin/groff/mm/groff_mmse.man
index 1018d2e4815..01eefd958b4 100644
--- a/gnu/usr.bin/groff/mm/groff_mmse.man
+++ b/gnu/usr.bin/groff/mm/groff_mmse.man
@@ -1,5 +1,5 @@
 .\" -*- nroff -*-
-.\" $Id: groff_mmse.man,v 1.2 1997/04/22 14:07:32 kstailey Exp $
+.\" $Id: groff_mmse.man,v 1.3 1998/01/19 00:40:13 etheisen Exp $
 .\" Skrivet av Jörgen Hägg, Lund, Sverige
 .\"
 .TH GROFF_MMSE @MAN7EXT@ "@MDATE@" "Groff Version @VERSION@"
diff --git a/gnu/usr.bin/groff/mm/mm/0.MT b/gnu/usr.bin/groff/mm/mm/0.MT
index 9a152e75efd..548c4a8bfca 100644
--- a/gnu/usr.bin/groff/mm/mm/0.MT
+++ b/gnu/usr.bin/groff/mm/mm/0.MT
@@ -1,5 +1,5 @@
 .\"------------
-.\" $Id: 0.MT,v 1.2 1997/04/22 14:07:34 kstailey Exp $
+.\" $Id: 0.MT,v 1.3 1998/01/19 00:40:18 etheisen Exp $
 .\" Cover sheet. Memorandum type 0-3 and "string".
 .\"------------
 .if !r Au .nr Au 1
diff --git a/gnu/usr.bin/groff/mm/mm/4.MT b/gnu/usr.bin/groff/mm/mm/4.MT
index 0ebc189e6b5..232f4331843 100644
--- a/gnu/usr.bin/groff/mm/mm/4.MT
+++ b/gnu/usr.bin/groff/mm/mm/4.MT
@@ -1,5 +1,5 @@
 .\"------------
-.\" $Id: 4.MT,v 1.2 1997/04/22 14:07:35 kstailey Exp $
+.\" $Id: 4.MT,v 1.3 1998/01/19 00:40:19 etheisen Exp $
 .\" Cover sheet. Memorandum type 4
 .\"------------
 .de cov@print-title
diff --git a/gnu/usr.bin/groff/mm/mm/5.MT b/gnu/usr.bin/groff/mm/mm/5.MT
index 9c5a44307d2..157bb74e389 100644
--- a/gnu/usr.bin/groff/mm/mm/5.MT
+++ b/gnu/usr.bin/groff/mm/mm/5.MT
@@ -1,5 +1,5 @@
 .\"------------
-.\" $Id: 5.MT,v 1.2 1997/04/22 14:07:35 kstailey Exp $
+.\" $Id: 5.MT,v 1.3 1998/01/19 00:40:20 etheisen Exp $
 .\" Cover sheet. Memorandum type 5
 .\"------------
 .nr cov*mt0-ind 1.1c
diff --git a/gnu/usr.bin/groff/mm/mm/ms.cov b/gnu/usr.bin/groff/mm/mm/ms.cov
index f6698bef83e..dc110011a35 100644
--- a/gnu/usr.bin/groff/mm/mm/ms.cov
+++ b/gnu/usr.bin/groff/mm/mm/ms.cov
@@ -1,5 +1,5 @@
 .\"------------
-.\" $Id: ms.cov,v 1.2 1997/04/22 14:07:36 kstailey Exp $
+.\" $Id: ms.cov,v 1.3 1998/01/19 00:40:20 etheisen Exp $
 .\" Cover sheet. Mostly like ms cover.
 .\"------------
 .de cov@print-title
diff --git a/gnu/usr.bin/groff/mm/mm/se_ms.cov b/gnu/usr.bin/groff/mm/mm/se_ms.cov
index a41da428fd5..11a6b53431d 100644
--- a/gnu/usr.bin/groff/mm/mm/se_ms.cov
+++ b/gnu/usr.bin/groff/mm/mm/se_ms.cov
@@ -1,3 +1,3 @@
-.\" $Id: se_ms.cov,v 1.2 1997/04/22 14:07:36 kstailey Exp $
+.\" $Id: se_ms.cov,v 1.3 1998/01/19 00:40:21 etheisen Exp $
 .mso mm/ms.cov
 .nr cur*abstract-ll 11c
diff --git a/gnu/usr.bin/groff/mm/tmac.m b/gnu/usr.bin/groff/mm/tmac.m
index 54266de30e7..4491e24c0df 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.3 1997/11/17 04:41:54 deraadt Exp $
-.@revision $Revision: 1.3 $
+.\" $Id: tmac.m,v 1.4 1998/01/19 00:40:14 etheisen Exp $
+.@revision $Revision: 1.4 $
 .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 :-)
-.nr *year \\n[yr]+1900
-.ds cov*new-date \\*[MO\\n[mo]] \\n[dy], \\n[*year]
+.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]
 .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 bdccb5da19e..522600ea7df 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.3 1997/11/17 04:41:57 deraadt Exp $
+.\" $Id: tmac.mse,v 1.4 1998/01/19 00:40:16 etheisen Exp $
 .\"
 .\" swedish version of mm
 .\" See tmac.m for version-information.
@@ -65,8 +65,8 @@
 .ds MO10 oktober
 .ds MO11 november
 .ds MO12 december
-.nr *year \\n[yr]+1900
-.ds cov*new-date \\n[dy] \\*[MO\\n[mo]] \\n[*year]
+.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 pg*footer-size 4\"                  1v+footer+even/odd footer+1v
 .\"------------------------------------------------
 .\" Dokumentnamn