* Clarified manual about INITR

* Added mm.tmac and mmse.tmac wrappers
* Fixed bug in mmroff so a .qrf-file always will be created
* .EQ mark was not correctly positioned anymore.
* changed SP to sp in DS/DE to further correct .EQ

7 files changed, 38 insertions, 24 deletions

diff --git a/contrib/mm/ChangeLog b/contrib/mm/ChangeLog
index d3c2e674..baf4facf 100644
--- a/contrib/mm/ChangeLog
+++ b/contrib/mm/ChangeLog
@@ -1,3 +1,11 @@
+Fri May 20:35:32 2002  Joergen Haegg <jh@axis.com>
+
+	* Clarified manual about INITR
+	* Added mm.tmac and mmse.tmac wrappers
+	* Fixed bug in mmroff so a .qrf-file always will be created
+	* .EQ mark was not correctly positioned anymore.
+	* changed SP to sp in DS/DE to further correct .EQ
+
 Sun Dec 9 00:00:00 2001 Werner LEMBERG  (wl@gnu.org)
 
 	* Makefile.sim, groff_mm.man, groff_mmse.man: Minor fixes.
diff --git a/contrib/mm/Makefile.sim b/contrib/mm/Makefile.sim
index 6f789185..2c645bee 100644
--- a/contrib/mm/Makefile.sim
+++ b/contrib/mm/Makefile.sim
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.sim,v 2.2 2001/12/09 12:15:09 wlemb Exp $
+# $Id: Makefile.sim,v 2.3 2002/05/22 06:26:12 jhaegg Exp $
 #
 # To install mgm separately as gm.tmac:
 # make -f Makefile.sub tmacdir=/usr/local/lib/groff/tmac srcdir=. \
@@ -21,8 +21,8 @@ install = install -m 644
 
 # Do not change anything below this line
 srcdir = .
-version = 1.32
-mdate = 1999-09-03
+version = 2.8
+mdate = 2002-05-11
 
 .SUFFIXES: .n .man
 
diff --git a/contrib/mm/Makefile.sub b/contrib/mm/Makefile.sub
index d5dc9c0e..40b77071 100644
--- a/contrib/mm/Makefile.sub
+++ b/contrib/mm/Makefile.sub
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.sub,v 2.2 2001/12/09 12:15:09 wlemb Exp $
+# $Id: Makefile.sub,v 2.3 2002/05/22 06:26:12 jhaegg Exp $
 #
 PROG=mmroff
 MAN1=\
@@ -33,6 +33,10 @@ install_m:
 	$(INSTALL_DATA) $(srcdir)/m.tmac $(tmacdir)/$(tmac_m_prefix)m.tmac
 	@sed -e "s;^.mso m.tmac;.mso $(tmac_m_prefix)m.tmac;g" \
 		$(srcdir)/mse.tmac > $(tmacdir)/$(tmac_m_prefix)mse.tmac
+	@sed -e "s;^.mso mse.tmac;.mso $(tmac_m_prefix)mse.tmac;g" \
+		$(srcdir)/mmse.tmac > $(tmacdir)/$(tmac_m_prefix)mmse.tmac
+	@sed -e "s;^.mso m.tmac;.mso $(tmac_m_prefix)m.tmac;g" \
+		$(srcdir)/mm.tmac > $(tmacdir)/$(tmac_m_prefix)mm.tmac
 
 install_mmroff: mmroff
 	-test -d $(bindir) || $(mkinstalldirs) $(bindir)
@@ -51,6 +55,8 @@ uninstall_sub:
 	done
 	-rm -f $(tmacdir)/tmac.$(tmac_m_prefix)m
 	-rm -f $(tmacdir)/$(tmac_m_prefix)m.tmac
+	-rm -f $(tmacdir)/$(tmac_m_prefix)mm.tmac
 	-rm -f $(tmacdir)/$(tmac_m_prefix)mse.tmac
+	-rm -f $(tmacdir)/$(tmac_m_prefix)mmse.tmac
 	-rmdir $(tmacdir)/mm
 	-rm -f $(bindir)/mmroff
diff --git a/contrib/mm/README b/contrib/mm/README
index 15901ddc..f52f3eb0 100644
--- a/contrib/mm/README
+++ b/contrib/mm/README
@@ -1,5 +1,5 @@
 
-$Id: README,v 2.1 2000/11/17 04:27:03 jhaegg Exp $
+$Id: README,v 2.2 2002/05/22 06:26:12 jhaegg Exp $
 
 This is mgm, a macro package for groff.
 
@@ -29,9 +29,3 @@ This README should be bigger :-)
 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 7085867d..b7f131d9 100644
--- a/contrib/mm/groff_mm.man
+++ b/contrib/mm/groff_mm.man
@@ -1,5 +1,5 @@
 .\"
-.\" $Id: groff_mm.man,v 2.5 2001/12/09 12:15:09 wlemb Exp $
+.\" $Id: groff_mm.man,v 2.6 2002/05/22 06:26:12 jhaegg Exp $
 .\"
 .de T2
 .if t .ne 2v
@@ -860,13 +860,16 @@ Both page numbers and header marks, tab separated
 .TP
 .B "INITR filename"
 Initialize the refencemacros.
-References will be written to
-\fIfilename.tmp\fP and \fIfilename.qrf\fP.
-Requires two passes with groff.
-The first looks for references and the second includes them.
+References will be written to stderr and is supposed to
+be written to \fIfilename.qrf\fP. 
+Requires two passes with groff, this is handled by a
+separate program called \fBmmroff\fP, the reason is that
+groff is often installed without the unsafe operations that
+\fBINITR\fP requiered.
+The first pass looks for references and the second one includes them.
 \fBINITR\fP can be used several times, but it is only the first
 occurrence of \fBINITR\fP that is active.
-Option \fB-U\fP might be needed if \fBunsafe\fP-errors occur.
+
 See also \fBSETR\fP, \fBGETPN\fP and \fBGETHN\fP.
 .TP
 .B "IND arg1 [arg2 [...]]"
diff --git a/contrib/mm/m.tmac b/contrib/mm/m.tmac
index e8eafe54..d8df77b4 100644
--- a/contrib/mm/m.tmac
+++ b/contrib/mm/m.tmac
@@ -3,8 +3,8 @@
 .ds RE \\$2
 ..
 .\"
-.\" $Id: m.tmac,v 2.8 2001/11/28 08:14:06 wlemb Exp $
-.@revision $Revision: 2.8 $
+.\" $Id: m.tmac,v 2.9 2002/05/22 06:26:12 jhaegg Exp $
+.@revision $Revision: 2.9 $
 .ig
 
 Copyright (C) 1991-2000 Free Software Foundation, Inc.
@@ -1978,6 +1978,7 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%]
 .\" nested DS/DE is allowed. No limit on depth.
 .de DS
 .br
+.nr XXX \\n[nl]
 .nr ds*lvl +1
 .ds@set-format \\$@
 .\"
@@ -2035,9 +2036,9 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%]
 .nr ds*i \\n[Lsp]
 .if r Dsp .nr ds*i \\n[Dsp]
 .\"
-.if \\n[Ds] .SP \\n[ds*i]u
+.if \\n[Ds] .sp \\n[ds*i]u
 .ds*div!\\n[ds*snr]
-.if \\n[Ds] .SP \\n[ds*i]u
+.if \\n[Ds] .sp \\n[ds*i]u
 .\"
 .if \\n[ds*format]=2 'ce 0
 .if \\n[ds*format]=4 'rj 0
@@ -2313,10 +2314,11 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%]
 .de eq@check
 .if !'\\*[eq*label]'' \{\
 .	mk
-'	sp (u;\\$1/2-.45v)
+.	\" space down to middle of equation
+'	sp (u;\\$1/2)
 .	ie (\\n[Eq]%2) \{\
 .		\"	label to the left
-\h'|0'\\*[eq*label]\c
+\h'|0'\\*[eq*label]
 .	\}
 .	el \{\
 .		\"	label to the right
diff --git a/contrib/mm/mmroff.pl b/contrib/mm/mmroff.pl
index 69b6105b..1a4ff46d 100644
--- a/contrib/mm/mmroff.pl
+++ b/contrib/mm/mmroff.pl
@@ -66,11 +66,12 @@ while(<MACRO>) {
 close(MACRO);
 
 
-if ($rfilename && @out) {
+if ($rfilename) {
 	push(@out, ".nr pict*max-height $max_height\n") if defined $max_height;
 	push(@out, ".nr pict*max-width $max_width\n") if defined $max_width;
 
 	open(OUT, ">$rfilename") || "create $rfilename:$!";
+	print OUT '.\" references', "\n";
 	my $i;
 	for $i (@out) {
 		print OUT $i;