[Groff-commit] groff/contrib/mm ChangeLog groff_mm.man m.tmac

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Branch:         
Changes by:     Werner LEMBERG <address@hidden> 06/03/29 15:15:04

Modified files:
        contrib/mm     : ChangeLog groff_mm.man m.tmac 

Log message:
        * m.tmac (address@hidden): Correctly flush labels to the right.
        Problem reported by Morris Stern <address@hidden>.
        Fix vertical positions of labels.
        
        (address@hidden): Emit pre-display space earlier.
        
        * groff_mm.man: Document that only the last equation label of
        .EQ/.EN blocks within .DS/.DE is printed.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/groff/contrib/mm/ChangeLog.diff?tr1=2.36&tr2=2.37&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/contrib/mm/groff_mm.man.diff?tr1=2.17&tr2=2.18&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/contrib/mm/m.tmac.diff?tr1=2.31&tr2=2.32&r1=text&r2=text

Patches:
Index: groff/contrib/mm/ChangeLog
diff -u groff/contrib/mm/ChangeLog:2.36 groff/contrib/mm/ChangeLog:2.37
--- groff/contrib/mm/ChangeLog:2.36     Wed Mar 29 11:00:33 2006
+++ groff/contrib/mm/ChangeLog  Wed Mar 29 15:15:04 2006
@@ -12,6 +12,15 @@
        (LI): Remove superfluous line which sets number register `x' without
        reason.  Problem reported by Morris Stern <address@hidden>.
 
+       (address@hidden): Correctly flush labels to the right.
+       Problem reported by Morris Stern <address@hidden>.
+       Fix vertical positions of labels.
+
+       (address@hidden): Emit pre-display space earlier.
+
+       * groff_mm.man: Document that only the last equation label of
+       .EQ/.EN blocks within .DS/.DE is printed.
+
 Tue Mar 28 14:00:06 2006  Werner LEMBERG  <address@hidden>
 
        . Hardwire first four font positions with R, I, B, and BI -- the
Index: groff/contrib/mm/groff_mm.man
diff -u groff/contrib/mm/groff_mm.man:2.17 groff/contrib/mm/groff_mm.man:2.18
--- groff/contrib/mm/groff_mm.man:2.17  Tue Mar 28 12:32:04 2006
+++ groff/contrib/mm/groff_mm.man       Wed Mar 29 15:15:04 2006
@@ -1,5 +1,5 @@
 .\"
-.\" $Id: groff_mm.man,v 2.17 2006/03/28 12:32:04 wl Exp $
+.\" $Id: groff_mm.man,v 2.18 2006/03/29 15:15:04 wl Exp $
 .\"
 .de T2
 .  vpt 0
@@ -774,18 +774,30 @@
 .BR @address@hidden (@MAN1EXT@).
 .BR EQ / EN
 must be inside of a
-.BR DS / DE -pair,
+.BR DS / DE
+pair,
 except if
 .B EQ
-is only used to set options for
-.BR @address@hidden .
+is used to set options for
+.B @address@hidden
+only.
 The
 .I label
 argument appears at the right margin of the equation,
+centered vertically within the
+.BR DS / DE
+block,
 unless number register
 .B Eq
 is\~1.
 Then the label appears at the left margin.
+.IP
+If there are multiple
+.BR EQ / EN
+blocks within a single
+.BR DS / DE
+pair,
+only the last equation label (if any) is printed.
 .
 .TP
 .BI EX\  "\fR[\fPtitle \fR[\fPoverride \fR[\fPflag \fR[\fPrefname\fR]]]]\fP"
@@ -2893,7 +2905,7 @@
 .TP
 .B Dsp
 If defined, it controls the space output before and after static displays.
-Otherwise is the value of
+Otherwise the value of
 .B Lsp
 is used.
 .
Index: groff/contrib/mm/m.tmac
diff -u groff/contrib/mm/m.tmac:2.31 groff/contrib/mm/m.tmac:2.32
--- groff/contrib/mm/m.tmac:2.31        Wed Mar 29 11:00:33 2006
+++ groff/contrib/mm/m.tmac     Wed Mar 29 15:15:04 2006
@@ -3,8 +3,8 @@
 .ds RE \\$2
 ..
 .\"
-.\" $Id: m.tmac,v 2.31 2006/03/29 11:00:33 wl Exp $
address@hidden $Revision: 2.31 $
+.\" $Id: m.tmac,v 2.32 2006/03/29 15:15:04 wl Exp $
address@hidden $Revision: 2.32 $
 .ig
 
 Copyright (C) 1991-2000, 2001, 2002, 2003, 2004, 2005, 2006
@@ -2078,6 +2078,11 @@
 .\"    there are less than half of the page left.
 .if \\n[ds*need] .ne \\n[ds*need]u
 .\"
+.\"    Print static display
+.nr ds*i \\n[Lsp]
+.if r Dsp .nr ds*i \\n[Dsp]
+.\"
+.if \\n[Ds] .sp \\n[ds*i]u
 .\" check if pending equation label
 address@hidden \\n[ds*need]
 'in \\n[ds*old-in]u
@@ -2089,11 +2094,6 @@
 .if \\n[ds*format]=5 'in (u;\\n[.l]-\\n[ds*width])
 .\" **********
 .\"
-.\"    Print static display
-.nr ds*i \\n[Lsp]
-.if r Dsp .nr ds*i \\n[Dsp]
-.\"
-.if \\n[Ds] .sp \\n[ds*i]u
 .ds*div!\\n[ds*snr]
 .if \\n[Ds] .sp \\n[ds*i]u
 .\"
@@ -2371,14 +2371,14 @@
 .if !'\\*[eq*label]'' \{\
 .      mk
 .      \" space down to middle of equation
-'      sp (u;\\$1/2)
+'      sp (u;(\\$1-1v)/2)
 .      ie (\\n[Eq]%2) \{\
 .              \"      label to the left
 \h'|0'\\*[eq*label]
 .      \}
 .      el \{\
 .              \"      label to the right
-\h'|\\n[.l]u'\\*[eq*label]
+\h'|\\n[.l]u-\w'\\*[eq*label]'u'\\*[eq*label]
 .      \}
 .      rt
 .\}