Sorry about this, 'commit' didn't allow -r

14 files changed, 41 insertions, 22 deletions

diff --git a/contrib/mm/Makefile.sim b/contrib/mm/Makefile.sim
index 7775c79b..1051785e 100644
--- a/contrib/mm/Makefile.sim
+++ b/contrib/mm/Makefile.sim
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.sim,v 1.2 2000/06/18 10:08:06 wlemb Exp $
+# $Id: Makefile.sim,v 2.0 2000/09/14 03:40:24 jhaegg Exp $
 #
 # To install mgm separately as tmac.gm:
 # make -f Makefile.sub tmacdir=/usr/local/lib/groff/tmac srcdir=. \
diff --git a/contrib/mm/Makefile.sub b/contrib/mm/Makefile.sub
index ea3cd594..60e268ff 100644
--- a/contrib/mm/Makefile.sub
+++ b/contrib/mm/Makefile.sub
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.sub,v 1.4 2000/08/28 20:34:26 wlemb Exp $
+# $Id: Makefile.sub,v 2.0 2000/09/14 03:40:24 jhaegg Exp $
 #
 PROG=mmroff
 MAN7=\
diff --git a/contrib/mm/NOTES b/contrib/mm/NOTES
index 43794a29..7643c100 100644
--- a/contrib/mm/NOTES
+++ b/contrib/mm/NOTES
@@ -1,4 +1,6 @@
 ######################################################################
+$Id: NOTES,v 2.0 2000/09/14 03:40:24 jhaegg Exp $
+
 Beware!
 This may be old information. Trust only the source. :-)
 
diff --git a/contrib/mm/README b/contrib/mm/README
index a720f070..f1b76724 100644
--- a/contrib/mm/README
+++ b/contrib/mm/README
@@ -1,10 +1,12 @@
 
+$Id: README,v 2.0 2000/09/14 03:40:24 jhaegg Exp $
+
 This is mgm, a macro package for groff.
 
 It is supposed to be compatible with the DWB mm macros,
 and has several extensions.
 
-Send bug reports to jh@axis.se with a description of the problem
+Send bug reports to jh@axis.com with a description of the problem
 and a sample of text which reproduces the error.
 
 Don't forget to mention the version of mgm (look in the beginning
@@ -12,9 +14,8 @@ of tmac.m) and the version of groff.
 
 Any new ideas or improvements are welcome.
 
-Newest version is available with anonymous FTP
-at ftp://ftp.efd.lth.se/pub/groff/mm<something>.gz
-or ftp://ftp.axis.se/pub/groff/mm<something>.gz
+Newest version is available here or at the groff CVS repository.
+ftp://ftp.axis.se/pub/groff/mm<something>.gz
 
 You can install mgm as a separate package without the configure in groff
 with the following command:
@@ -23,6 +24,14 @@ make -f Makefile.sim install
 
 This README should be bigger :-)
 
-Jörgen.
+/Jörgen Hägg
 
 Thanks to everyone who have sent me bug-reports and fixes.
+
+
+Yes, my version numbering differs from the groff CVS, but I
+like mine better. :-)
+
+More likely, I'm too lazy to change it, but someday I'll
+try to sync them...
+The step to 2.0 is an attempt, let's see if it works.
diff --git a/contrib/mm/groff_mm.man b/contrib/mm/groff_mm.man
index a6de21b5..e90eacf6 100644
--- a/contrib/mm/groff_mm.man
+++ b/contrib/mm/groff_mm.man
@@ -1,5 +1,5 @@
 .\"
-.\" $Id: groff_mm.man,v 1.3 2000/06/04 21:47:19 wlemb Exp $
+.\" $Id: groff_mm.man,v 2.0 2000/09/14 03:40:24 jhaegg Exp $
 .\"
 .de T2
 .ne 2v
@@ -318,13 +318,15 @@ A page break will occur between each display
 if \fBDe\fP is not zero.
 .in
 .TP
-.B "DL [text-indent [1]]"
+.B "DL [text-indent [1 [1]]]"
 Dash list start. Begins a list where each item is printed
 after a dash. \fIText-indent\fP changes the default indentation
 of the list items set by
 number register \fBPi\fP.
 A second argument prevents the empty line between each list item
 to be printed. See \fBLI\fP.
+A third argument will prohibit printing of a blank line before each
+item.
 .TP
 .B "DS [format [fill [rindent]]]"
 Static display start.
@@ -498,7 +500,7 @@ justification (ljust).
 .sp
 .fi
 .DT
-Argument greater than 11 is considered as arg 0.
+Argument greater than or equal to 11 is considered as arg 0.
 Default for m@TMAC_M_PREFIX@m is 10.
 .TP
 .B FE
diff --git a/contrib/mm/groff_mmse.man b/contrib/mm/groff_mmse.man
index 45ae7221..1e1f4a0d 100644
--- a/contrib/mm/groff_mmse.man
+++ b/contrib/mm/groff_mmse.man
@@ -1,5 +1,5 @@
 .\"
-.\" $Id: groff_mmse.man,v 1.2 2000/02/21 20:32:58 jhaegg Exp $
+.\" $Id: groff_mmse.man,v 2.0 2000/09/14 03:40:24 jhaegg Exp $
 .\" Skrivet av Jörgen Hägg, Lund, Sverige
 .\"
 .TH GROFF_MMSE @MAN7EXT@ "@MDATE@" "Groff Version @VERSION@"
diff --git a/contrib/mm/mm/0.MT b/contrib/mm/mm/0.MT
index 8c93108f..61f1a969 100644
--- a/contrib/mm/mm/0.MT
+++ b/contrib/mm/mm/0.MT
@@ -1,5 +1,5 @@
 .\"------------
-.\" $Id: 0.MT,v 1.2 2000/02/21 20:32:58 jhaegg Exp $
+.\" $Id: 0.MT,v 2.0 2000/09/14 03:40:25 jhaegg Exp $
 .\" Cover sheet. Memorandum type 0-3 and "string".
 .\"------------
 .if !r Au .nr Au 1
diff --git a/contrib/mm/mm/4.MT b/contrib/mm/mm/4.MT
index 330d2838..c8b6f37d 100644
--- a/contrib/mm/mm/4.MT
+++ b/contrib/mm/mm/4.MT
@@ -1,5 +1,5 @@
 .\"------------
-.\" $Id: 4.MT,v 1.2 2000/02/21 20:32:58 jhaegg Exp $
+.\" $Id: 4.MT,v 2.0 2000/09/14 03:40:25 jhaegg Exp $
 .\" Cover sheet. Memorandum type 4
 .\"------------
 .de cov@print-title
diff --git a/contrib/mm/mm/5.MT b/contrib/mm/mm/5.MT
index ee0ac116..a274d234 100644
--- a/contrib/mm/mm/5.MT
+++ b/contrib/mm/mm/5.MT
@@ -1,5 +1,5 @@
 .\"------------
-.\" $Id: 5.MT,v 1.2 2000/02/21 20:32:58 jhaegg Exp $
+.\" $Id: 5.MT,v 2.0 2000/09/14 03:40:25 jhaegg Exp $
 .\" Cover sheet. Memorandum type 5
 .\"------------
 .nr cov*mt0-ind 1.1c
diff --git a/contrib/mm/mm/ms.cov b/contrib/mm/mm/ms.cov
index 699ca440..25d4579e 100644
--- a/contrib/mm/mm/ms.cov
+++ b/contrib/mm/mm/ms.cov
@@ -1,5 +1,5 @@
 .\"------------
-.\" $Id: ms.cov,v 1.2 2000/02/21 20:32:58 jhaegg Exp $
+.\" $Id: ms.cov,v 2.0 2000/09/14 03:40:25 jhaegg Exp $
 .\" Cover sheet. Mostly like ms cover.
 .\"------------
 .de cov@print-title
diff --git a/contrib/mm/mm/se_ms.cov b/contrib/mm/mm/se_ms.cov
index 64e7c117..2d16d48e 100644
--- a/contrib/mm/mm/se_ms.cov
+++ b/contrib/mm/mm/se_ms.cov
@@ -1,3 +1,3 @@
-.\" $Id: se_ms.cov,v 1.2 2000/02/21 20:32:58 jhaegg Exp $
+.\" $Id: se_ms.cov,v 2.0 2000/09/14 03:40:25 jhaegg Exp $
 .mso mm/ms.cov
 .nr cur*abstract-ll 11c
diff --git a/contrib/mm/mmroff.man b/contrib/mm/mmroff.man
index e6aa5eb4..efe79b45 100644
--- a/contrib/mm/mmroff.man
+++ b/contrib/mm/mmroff.man
@@ -1,5 +1,5 @@
 .\"
-.\" $Id: mmroff.man,v 1.2 2000/02/21 20:32:58 jhaegg Exp $
+.\" $Id: mmroff.man,v 2.0 2000/09/14 03:40:24 jhaegg Exp $
 .\"
 .TH MMROFF @MAN7EXT@ "@MDATE@" "Groff Version @VERSION@"
 .SH NAME
diff --git a/contrib/mm/tmac.m b/contrib/mm/tmac.m
index cf7d8e11..4ca4fe46 100755
--- a/contrib/mm/tmac.m
+++ b/contrib/mm/tmac.m
@@ -3,12 +3,12 @@
 .ds RE \\$2
 ..
 .\"
-.\" $Id: tmac.m,v 1.2 2000/02/21 20:32:58 jhaegg Exp $
-.@revision $Revision: 1.2 $
+.\" $Id: tmac.m,v 2.0 2000/09/14 03:40:24 jhaegg Exp $
+.@revision $Revision: 2.0 $
 .ig
 
 Copyright (C) 1991-2000 Free Software Foundation, Inc.
-mgm is written by Jörgen Hägg <jh@axis.se>
+mgm is written by Jörgen Hägg <jh@axis.com>
 
 mgm is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -1461,7 +1461,13 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%]
 .ie ''\\$2' .nr pg*column-sep \\n[pg*column-size]/15
 .el .nr pg*column-sep (n;\\$2)
 .\"
-.nr pg*cols-per-page (u;\\n[.l]/(\\n[pg*column-size]+\\n[pg*column-sep]+1))
+.\" calculate the number of columns/page
+.nr pg*cols-per-page 0
+.nr pg*i \\n[pg*column-size]
+.while \\n[pg*i]<=\\n[.l] \{\
+.	nr pg*cols-per-page \\n[pg*cols-per-page]+1
+.	nr pg*i \\n[pg*i]+\\n[pg*column-sep]+\\n[pg*column-size]
+.\}
 .nr pg*cur-column 0 1
 .nr pg*cur-po \\n[@po]u
 .ll \\n[pg*column-size]u
diff --git a/contrib/mm/tmac.mse b/contrib/mm/tmac.mse
index 39f137ea..9671c459 100755
--- a/contrib/mm/tmac.mse
+++ b/contrib/mm/tmac.mse
@@ -1,4 +1,4 @@
-.\" $Id: tmac.mse,v 1.2 2000/02/21 20:32:58 jhaegg Exp $
+.\" $Id: tmac.mse,v 2.0 2000/09/14 03:40:24 jhaegg Exp $
 .\"
 .\" swedish version of mm
 .\" See tmac.m for version-information.