summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorwl <wl>2010-06-02 14:13:39 +0000
committerwl <wl>2010-06-02 14:13:39 +0000
commitab590f215cb6946071ff9f1e650f10f740086e6a (patch)
tree2b1216049dc9ce28275b0e1165a2d48db6e7a232 /contrib
parent77ef6bc16851b8830cf3b2a306189008664540af (diff)
downloadgroff-ab590f215cb6946071ff9f1e650f10f740086e6a.tar.gz
Fix .EOP handling and non-numeric format of \n[P].
* m.tmac (pg@header): Set `.af' temporarily to numeric format. (pg@print-footer): Disable vertical traps for call to .EOP also.
Diffstat (limited to 'contrib')
-rw-r--r--contrib/mm/ChangeLog7
-rw-r--r--contrib/mm/m.tmac14
2 files changed, 17 insertions, 4 deletions
diff --git a/contrib/mm/ChangeLog b/contrib/mm/ChangeLog
index 0ca56097..86434fb5 100644
--- a/contrib/mm/ChangeLog
+++ b/contrib/mm/ChangeLog
@@ -1,5 +1,12 @@
Wed Jun 2 16:03:39 2010 Larry Jones <lawrence.jones@siemens.com>
+ Fix .EOP handling and non-numeric format of \n[P].
+
+ * m.tmac (pg@header): Set `.af' temporarily to numeric format.
+ (pg@print-footer): Disable vertical traps for call to .EOP also.
+
+Wed Jun 2 16:03:39 2010 Larry Jones <lawrence.jones@siemens.com>
+
* m.tmac (toc@entry): Use MM page number (\nP).
Sun May 30 07:14:15 2010 Larry Jones <lawrence.jones@siemens.com>
diff --git a/contrib/mm/m.tmac b/contrib/mm/m.tmac
index 2526b59a..f2f845aa 100644
--- a/contrib/mm/m.tmac
+++ b/contrib/mm/m.tmac
@@ -3,8 +3,8 @@
.ds RE \\$2
..
.\"
-.\" $Id: m.tmac,v 2.39 2010/06/02 14:05:50 wl Exp $
-.@revision $Revision: 2.39 $
+.\" $Id: m.tmac,v 2.40 2010/06/02 14:13:41 wl Exp $
+.@revision $Revision: 2.40 $
.ig
Copyright (C) 1991-2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
@@ -1233,8 +1233,11 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%]
. ie d TP .TP
. el \{\
' sp 3
+. ds hd*format \\g[P]
+. af P 0
. ie ((\\n[P]=1)&((\\n[N]=1):(\\n[N]=2))) .sp
. el .tl \\*[pg*header]
+. af P \\*[hd*format]
. ie o .tl \\*[pg*odd-header]
. el .tl \\*[pg*even-header]
' sp 2
@@ -1302,17 +1305,20 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%]
.\" print the footer and eject new page
.ev pg*tl-ev
.pg@set-env
+.vpt 0
.\" user defined end-of-page macro
.ie d EOP .EOP
.el \{\
-. vpt 0
. ie o .tl \\*[pg*odd-footer]
. el .tl \\*[pg*even-footer]
+. ds hd*format \\g[P]
+. af P 0
. ie (\\n[P]=1)&(\\n[N]=1) .tl \\*[pg*header]
. el .tl \\*[pg*footer]
+. af P \\*[hd*format]
. tl ''\\*[Pg_type!\\n[@copy_type]]''
-. vpt 1
.\}
+.vpt 1
.ev
.\" be sure that floating displays and footnotes will be
.\" printed at the end of the document.