summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--contrib/mm/ChangeLog5
-rw-r--r--contrib/mm/m.tmac13
2 files changed, 12 insertions, 6 deletions
diff --git a/contrib/mm/ChangeLog b/contrib/mm/ChangeLog
index bacafcee..d678fe83 100644
--- a/contrib/mm/ChangeLog
+++ b/contrib/mm/ChangeLog
@@ -1,3 +1,8 @@
+Wed Apr 06:42:35 2003 Joergen Haegg <jh@axis.com>
+
+ * the footer was not adjusted by VM due to a missing
+ pg*extra-footer-size in the calculation of pg*last-pos
+
Wed Apr 06:04:58 2003 Joergen Haegg <jh@axis.com>
* space adjustments in 4.MT to make it more like
diff --git a/contrib/mm/m.tmac b/contrib/mm/m.tmac
index 579ac094..f7851910 100644
--- a/contrib/mm/m.tmac
+++ b/contrib/mm/m.tmac
@@ -3,8 +3,8 @@
.ds RE \\$2
..
.\"
-.\" $Id: m.tmac,v 2.17 2003/03/29 21:04:33 jhaegg Exp $
-.@revision $Revision: 2.17 $
+.\" $Id: m.tmac,v 2.18 2003/04/02 04:44:59 jhaegg Exp $
+.@revision $Revision: 2.18 $
.ig
Copyright (C) 1991-2000 Free Software Foundation, Inc.
@@ -1130,8 +1130,8 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%]
.\"
.\" last-pos points to the position of the footer and bottom
.\" block below foot-notes.
-.nr pg*last-pos \\n[@pl]u-(\\n[pg*block-size]u+\\n[pg*foot-margin]u+\\n[pg*footer-size]u)
-.if \\n[D]>2 .tm pg*last-pos \\n[@pl]u-(\\n[pg*block-size]u+\\n[pg*foot-margin]u+\\n[pg*footer-size]u) = \\n[pg*last-pos]
+.nr pg*last-pos \\n[@pl]u-(\\n[pg*block-size]u+\\n[pg*foot-margin]u+\\n[pg*footer-size]u+\\n[pg*extra-footer-size]u)
+.if \\n[D]>2 .tm pg*last-pos \\n[@pl]u-(\\n[pg*block-size]u+\\n[pg*foot-margin]u+\\n[pg*footer-size]u+\\n[pg*extra-footer-size]u) = \\n[pg*last-pos]
..
.de pg@enable-trap
.wh \\n[pg*foot-trap]u pg@footer
@@ -1246,7 +1246,7 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%]
.\" FOOTER
.de pg@footer
.ec
-.if \\n[D]>2 .tm Footer# \\n[%] (\\n[.F]:\\n[c.])
+.if \\n[D]>2 .tm Footer# \\n[%] (\\n[.F]:\\n[c.]) nl=\\n[nl]
.pg@disable-trap
.\".debug footer
.tbl@bottom-hook
@@ -1254,7 +1254,7 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%]
.\" move to the exact start of footer.
'sp |\\n[pg*foot-trap]u+1v
.\"
-.if \\n[D]>3 .tm FOOTER after .sp
+.if \\n[D]>3 .tm FOOTER after .sp, nl=\\n[nl]
.\" print footnotes
.if d ft*div .ft@print
.\"
@@ -1269,6 +1269,7 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%]
.de pg@print-footer
.\" jump to the position just below the foot-notes.
'sp |\\n[pg*last-pos]u+1v
+.if \\n[D]>3 .tm print-footer nl=\\n[nl]
.\" check if there are any bottom block
.if d pg*block-div .pg@block
.\"