* added L, W and O in groff_mm.man

* extra space in expression removed in EPIC
* EPIC can leftadjust with -L
* EPIC was drawing 1v down
* forgot to add mmse.tmac and mm.tmac to cvs

5 files changed, 43 insertions, 10 deletions

diff --git a/contrib/mm/ChangeLog b/contrib/mm/ChangeLog
index baf4facf..2881dac8 100644
--- a/contrib/mm/ChangeLog
+++ b/contrib/mm/ChangeLog
@@ -1,3 +1,11 @@
+Wed May 10:18:26 2002  Joergen Haegg <jh@axis.com>
+
+	* added L, W and O in groff_mm.man
+	* extra space in expression removed in EPIC
+	* EPIC can leftadjust with -L
+	* EPIC was drawing 1v down
+	* forgot to add mmse.tmac and mm.tmac to cvs
+
 Fri May 20:35:32 2002  Joergen Haegg <jh@axis.com>
 
 	* Clarified manual about INITR
diff --git a/contrib/mm/groff_mm.man b/contrib/mm/groff_mm.man
index b7f131d9..6b2419ed 100644
--- a/contrib/mm/groff_mm.man
+++ b/contrib/mm/groff_mm.man
@@ -1,5 +1,5 @@
 .\"
-.\" $Id: groff_mm.man,v 2.6 2002/05/22 06:26:12 jhaegg Exp $
+.\" $Id: groff_mm.man,v 2.7 2002/05/23 08:34:51 jhaegg Exp $
 .\"
 .de T2
 .if t .ne 2v
@@ -476,12 +476,13 @@ Argument from \fBEF\fP.
 Argument from \fBOF\fP.
 .in
 .TP
-.B "EPIC width height [name]"
+.B "EPIC [-L] width height [name]"
 \fBEPIC\fP draws a box with the given \fIwidth\fP and \fIheight\fP, it will
 also print the text \fIname\fP or a default string if
 \fIname\fP is not specified..
 This is used to include external pictures, just give the size
 of the picture.
+\fB-L\fP will leftadjust the picture, the default is to center adjust.
 See \fBPIC\fP
 .TP
 .B "EQ [label]"
@@ -1906,6 +1907,9 @@ Set this variable to 1 on the command line to get ISO-formatted date string.
 (\fB-rIso=1\fP)
 Useless inside a document.
 .TP
+.B L
+Page length, only for command line settings.
+.TP
 .B Letwam
 Max lines in return-address, used in \fB.WA\fP/\fB.WE\fP.
 Default\ 14.
@@ -1957,6 +1961,9 @@ Numbered paragraphs, default 0.
 .br
 1\ ==\ numbered in first level headings.
 .TP
+.B O
+Page offset, only for command line settings.
+.TP
 .B Of
 Format of figure,table,exhibit,equation titles, default 0.
 .br
@@ -2014,6 +2021,9 @@ Display indent, default 5.
 .B Verbin
 Indent for \fB.VERBON\fP, default 5n.
 .TP
+.B W
+Line length, only for command line settings.
+.TP
 .B .mgm
 Always 1.
 .LP
diff --git a/contrib/mm/m.tmac b/contrib/mm/m.tmac
index d8df77b4..47fb900d 100644
--- a/contrib/mm/m.tmac
+++ b/contrib/mm/m.tmac
@@ -3,8 +3,8 @@
 .ds RE \\$2
 ..
 .\"
-.\" $Id: m.tmac,v 2.9 2002/05/22 06:26:12 jhaegg Exp $
-.@revision $Revision: 2.9 $
+.\" $Id: m.tmac,v 2.10 2002/05/23 08:34:51 jhaegg Exp $
+.@revision $Revision: 2.10 $
 .ig
 
 Copyright (C) 1991-2000 Free Software Foundation, Inc.
@@ -834,17 +834,24 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%]
 .\}
 ..
 .\" external picture
+.\" -L	left adjust
 .de EPIC
-.if \\n[.$]< 2 .@error "EPIC: Not enough arguments"
+.if \\n[.$]<2 .@error "EPIC: Not enough arguments"
+.nr pict*adj 0		\" centered
+.if '\\$1'-L' \{\
+.	shift 1		\" left adjust
+.	nr pict*adj 1
+.\}
+.if \\n[nl]<0 \&
 .nr pict*w \\$1
 .nr pict*h \\$2
 .ds pict*name "External picture
 .if !''$3' .ds pict*name \\$3
-\&
-.br
-.ne \\n[pict*h]u
-.sp \\n[pict*h]u
-.nr pict*ind (u;(\\n[.l]-\\n[.i]-\\n[pict*w])/2)
+.ne \\n[pict*h]u-1v
+.sp \\n[pict*h]u-1v
+.nr pict*ind 0
+.if !\\n[pict*adj] .nr pict*ind (u;(\\n[.l]-\\n[.i]-\\n[pict*w])/2)
+.mk
 .in +\\n[pict*ind]u
 \D'l \\n[pict*w]u 0'\
 \D'l 0 -\\n[pict*h]u'\
@@ -853,6 +860,8 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%]
 \v'-(u;\\n[pict*h]/2)'\
 \h'(u;(\\n[pict*w]-\w'\\*[pict*name]'/2))'\\*[pict*name]
 .in
+.rt
+.sp 1v
 ..
 .\" ######## module acc #################
 .\"-----------
diff --git a/contrib/mm/mm.tmac b/contrib/mm/mm.tmac
new file mode 100644
index 00000000..9ed09b72
--- /dev/null
+++ b/contrib/mm/mm.tmac
@@ -0,0 +1,3 @@
+.\" mm.tmac
+.\"
+.do mso m.tmac
diff --git a/contrib/mm/mmse.tmac b/contrib/mm/mmse.tmac
new file mode 100644
index 00000000..81986663
--- /dev/null
+++ b/contrib/mm/mmse.tmac
@@ -0,0 +1,3 @@
+.\" mmse.tmac
+.\"
+.do mso mse.tmac