summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwl <wl>2011-01-05 14:50:26 +0000
committerwl <wl>2011-01-05 14:50:26 +0000
commit780ced59285b77d1d2fdab0bddfdce0cefd0f6a5 (patch)
tree53c60774f9ecfbfada2e7c6456957222ae3a1cfc
parentc1e239b342a2e03ec402c9c0b23132d88a20a7cc (diff)
downloadgroff-780ced59285b77d1d2fdab0bddfdce0cefd0f6a5.tar.gz
Fix use of .DEVTAG-* macros.
Reported by Anton Shepelev <anton.txt@gmail.com>. * m.tmac (misc@tag): Wrapper around .DEVTAG-* to compensate unwanted vertical space. (H): Use it.
-rw-r--r--contrib/mm/ChangeLog11
-rw-r--r--contrib/mm/m.tmac21
2 files changed, 26 insertions, 6 deletions
diff --git a/contrib/mm/ChangeLog b/contrib/mm/ChangeLog
index b3efc153..17d5d177 100644
--- a/contrib/mm/ChangeLog
+++ b/contrib/mm/ChangeLog
@@ -1,3 +1,12 @@
+Wed Jan 5 15:05:47 2011 Werner LEMBERG <wl@gnu.org>
+
+ Fix use of .DEVTAG-* macros.
+ Reported by Anton Shepelev <anton.txt@gmail.com>.
+
+ * m.tmac (misc@tag): Wrapper around .DEVTAG-* to compensate unwanted
+ vertical space.
+ (H): Use it.
+
Mon Dec 27 09:39:20 2010 Werner LEMBERG <wl@gnu.org>
* groff_mm.man: Fix indentation.
@@ -853,7 +862,7 @@ Sun Jan 1 00:00:00 1991 Joergen Haegg (jh at efd.lth.se)
* warnings for unimplemented macros
Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
- 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010
+ 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010, 2011
Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification,
diff --git a/contrib/mm/m.tmac b/contrib/mm/m.tmac
index 73271c1c..041b06ea 100644
--- a/contrib/mm/m.tmac
+++ b/contrib/mm/m.tmac
@@ -3,12 +3,12 @@
.ds RE \\$2
..
.\"
-.\" $Id: m.tmac,v 2.43 2010/06/24 10:45:57 wl Exp $
-.@revision $Revision: 2.43 $
+.\" $Id: m.tmac,v 2.44 2011/01/05 14:50:26 wl Exp $
+.@revision $Revision: 2.44 $
.ig
Copyright (C) 1991-2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
- 2010
+ 2010, 2011
Free Software Foundation, Inc.
mgm is written by Jörgen Hägg <jh@axis.com>
@@ -738,6 +738,15 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%]
.ev
.nr @verbose-flag 0
..
+.\" Wrapper to cancel the side effect of .tag + .br generating
+.\" unwanded vertical space.
+.de misc@tag
+.vpt 0
+.DEVTAG-\\$1 \\$2
+.br
+.sp -1
+.vpt 1
+..
.\" ######## module pict #################
.nr pict*width 0
.nr pict*height 0
@@ -1043,7 +1052,8 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%]
.\"---------- user macro HY -------------
.\" user macro to reset indents
.if d HY .HY \\n[hd*level] \\n[hd*arg1] "\\$2\\$3"
-.DEVTAG-NH \\n[hd*level] \" HTML: mark beginning of heading
+.\" HTML: mark beginning of heading
+.misc@tag NH \\n[hd*level]
.\"--------------------------------------
.nr hd*mark-size \w@\\*[hd*mark]@
.if (\\n[hd*level]<=\\n[Hc])&\\n[hd*htype] .ce\" center if level<=Hc
@@ -1091,7 +1101,8 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%]
.nr hd*last-pos \\n[nl]
.nr hd*last-hsize \\n[.k]
.nr par@ind-flag 0
-.DEVTAG-EO-H \" HTML: end of heading
+.\" HTML: end of heading
+.misc@tag EO-H
..
.\"--------
.de HM