diff options
Diffstat (limited to 'contrib/mm')
| -rw-r--r-- | contrib/mm/ChangeLog | 68 | ||||
| -rw-r--r-- | contrib/mm/Makefile.sub | 4 | ||||
| -rw-r--r-- | contrib/mm/groff_mm.man | 36 | ||||
| -rw-r--r-- | contrib/mm/m.tmac | 53 | ||||
| -rw-r--r-- | contrib/mm/mmroff.man | 18 | ||||
| -rw-r--r-- | contrib/mm/refer-mm.tmac | 106 |
6 files changed, 39 insertions, 246 deletions
diff --git a/contrib/mm/ChangeLog b/contrib/mm/ChangeLog index b3808e28..b3efc153 100644 --- a/contrib/mm/ChangeLog +++ b/contrib/mm/ChangeLog @@ -1,69 +1,3 @@ -Sun Aug 14 07:36:29 2011 Anton Shepelev <anton.txt@gmail.com> - - Fix indents in nested static displays. - - * m.tmac (DS, ds@end): Save indent with a stack. - See http://lists.gnu.org/archive/html/groff/2011-07/msg00068.html - for an example. - -Sun Mar 27 09:25:01 2011 Anton Shepelev <anton.txt@gmail.com> - - * m.tmac (misc@tag): Fix last patch. - -Sat Mar 19 13:46:50 2011 James Avera <jimav> - - * m.tmac (RD): Don't use `.ie' but `.if'. - -Fri Mar 18 09:10:19 2011 Anton Shepelev <anton.txt@gmail.com> - - * m.tmac (misc@tag): Retain temporary indentation. - -Sat Feb 5 08:06:39 2011 Anton Shepelev <anton.txt@gmail.com> - - Fix vertical space around displays. - - * m.tmac (ds@end): Use `.SP', not `.sp'. - -Fri Jan 28 11:15:29 2011 Werner LEMBERG <wl@gnu.org> - - Handle `refer-mm.tmac' file. - - * refer-mm.tmac: New file. - * Makefile.sub (install_data, uninstall_sub): Handle it. - -Fri Jan 28 10:56:29 2011 Werner LEMBERG <wl@gnu.org> - - Add `refer' support. - - * m.tmac: Include `refer-mm.tmac'. - -Fri Jan 28 10:26:29 2011 Werner LEMBERG <wl@gnu.org> - - Prepare `refer' support. - - * m.tmac (\n[Rpe]): New register to control page eject status of the - `RP' macro. - (RP): Updated. - (ref@start-print): Move the trailing full stop in reference number - to... - (RS): This macro. - - * groff_mm.man: Document `Rpe' register. - -Fri Jan 28 10:05:29 2011 Werner LEMBERG <wl@gnu.org> - - * mmroff.man, groff_mm.man: s/reference/cross reference/ where - appropriate. - -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. @@ -919,7 +853,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, 2011 + 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, diff --git a/contrib/mm/Makefile.sub b/contrib/mm/Makefile.sub index d0eac3c5..bde215bc 100644 --- a/contrib/mm/Makefile.sub +++ b/contrib/mm/Makefile.sub @@ -1,4 +1,4 @@ -# Copyright 1991-1993, 1999-2001, 2006, 2007, 2009, 2011 +# Copyright 1991, 1992, 1993, 1999, 2000, 2001, 2006, 2007, 2009 # # This file is part of groff. # @@ -44,7 +44,6 @@ install_data: install_m test -f $(DESTDIR)$(tmacdir)/mm/$$f \ || touch $(DESTDIR)$(tmacdir)/mm/$$f; \ done - $(INSTALL_DATA) $(srcdir)/refer-mm.tmac $(DESTDIR)$(tmacdir)/refer-mm.tmac install_m: -test -d $(DESTDIR)$(tmacdir) \ @@ -83,6 +82,5 @@ uninstall_sub: -rm -f $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)mm.tmac -rm -f $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)mse.tmac -rm -f $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)mmse.tmac - -rm -f $(DESTDIR)$(tmacdir)/refer-mm.tmac -rmdir $(DESTDIR)$(tmacdir)/mm -rm -f $(DESTDIR)$(bindir)/mmroff diff --git a/contrib/mm/groff_mm.man b/contrib/mm/groff_mm.man index 71f6fdab..284a31b3 100644 --- a/contrib/mm/groff_mm.man +++ b/contrib/mm/groff_mm.man @@ -1,6 +1,6 @@ '\" t .ig -Copyright (C) 1989, 2000-2003, 2006, 2007, 2009-2011 +Copyright (C) 1989, 2000, 2001, 2002, 2003, 2006, 2007, 2009, 2010 Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of @@ -1010,7 +1010,7 @@ and with the text `chapter' and `,\~page'. The string .B Qrf -contains the text for the cross reference: +contains the text for the reference: . .RS .IP @@ -1158,7 +1158,7 @@ and also less than or equal to .B Hb or .B Hs -are centered. +are centerered. .RE . .IP @@ -1229,7 +1229,7 @@ Fourteen number registers named up to .B H14 contain the counter for each heading level. -The values are printed using Arabic numerals; +The values are printed using arabic numerals; this can be changed with the macro .B HM (see below). @@ -1474,9 +1474,9 @@ T} . .TP .BI INITR\ filename -Initialize the cross reference macros. -Cross references are written to stderr and are supposed to -be redirected into file `\fIfilename\fR.qrf'. +Initialize the refence macros. +References are written to stderr and are supposed to +be written to `\fIfilename\fR.qrf'. Requires two passes with groff; this is handled by a separate program called .BR mmroff (@MAN1EXT@). @@ -1484,7 +1484,7 @@ This program exists because .BR groff (@MAN1EXT@) by default deactivates the unsafe operations that are required by .BR INITR . -The first pass looks for cross references, +The first pass looks for references, and the second one includes them. .B INITR can be used several times, @@ -1590,7 +1590,7 @@ is still controlled by .IR text-indent . . .IP -The mark is left-justified within the mark area if +The mark is left-justified whitin the mark area if .I pad is\~0. If @@ -1664,7 +1664,7 @@ Default is\~0. List-status clear. Terminates all current active lists down to .IR list-level , -or\~0 if no argument is given. +or\~0 if no argmuent is given. This is used by\~\c .B H to clear any active list. @@ -2243,7 +2243,10 @@ whether to eject a page or not. .TS tab(@); l lx. -0@The reference page is printed on a separate page. +0@T{ +The reference page is printed on a separate page. +This is the default. +T} 1@Do not eject page after the list. 2@Do not eject page before the list. 3@Do not eject page before and after the list. @@ -2260,11 +2263,6 @@ to\~0 suppresses the line. The string .B Rp contains the reference page title and is set to `REFERENCES' by default. -The number register -.B Rpe -holds the default value for the second argument of -.BR RP ; -it is initially set to\~0. . .TP .BI RS\ \fR[\fPstring-name\fR]\fP @@ -3358,12 +3356,6 @@ T} Default is\~0. . .TP -.B Rpe -Set default value for second argument of -.BR .RP . -Default is\~0. -. -.TP .B Sectf A flag controlling `section-figures' numbering style. A non-zero value enables this. diff --git a/contrib/mm/m.tmac b/contrib/mm/m.tmac index d86c7f95..73271c1c 100644 --- a/contrib/mm/m.tmac +++ b/contrib/mm/m.tmac @@ -3,11 +3,12 @@ .ds RE \\$2 .. .\" -.\" $Id: m.tmac,v 2.52 2011/08/14 05:41:42 wl Exp $ -.@revision $Revision: 2.52 $ +.\" $Id: m.tmac,v 2.43 2010/06/24 10:45:57 wl Exp $ +.@revision $Revision: 2.43 $ .ig -Copyright (C) 1991-2006, 2009-2011 +Copyright (C) 1991-2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, + 2010 Free Software Foundation, Inc. mgm is written by Jörgen Hägg <jh@axis.com> @@ -139,8 +140,6 @@ Index array!index .nr Pt 0 .\" Reference title .ds Rp REFERENCES -.\" Reference page eject status -.nr Rpe 0 .\" Display indent .nr Si 5 .\" @@ -690,7 +689,7 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%] .rd \\$1\t .br .di -.if !''\\$3' \{\ +.ie !''\\$3' \{\ . di misc*rd2 . ds \\$3 "\\*[misc*rd] . br @@ -739,22 +738,6 @@ 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 -.\" unwanted vertical space. -.de misc@tag -.\" retain temporary indentation -.if !(\\n[.in]-\\n[.i]=0) .nr misc*ti \\n[.in] -.vpt 0 -.DEVTAG-\\$1 \\$2 -.br -.if r misc*ti \{ -. ti \\n[misc*ti]u -. rr misc*ti -. sp -1 -.\} -.sp -1 -.vpt 1 -.. .\" ######## module pict ################# .nr pict*width 0 .nr pict*height 0 @@ -1060,8 +1043,7 @@ 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" -.\" HTML: mark beginning of heading -.misc@tag NH \\n[hd*level] +.DEVTAG-NH \\n[hd*level] \" HTML: mark beginning of heading .\"-------------------------------------- .nr hd*mark-size \w@\\*[hd*mark]@ .if (\\n[hd*level]<=\\n[Hc])&\\n[hd*htype] .ce\" center if level<=Hc @@ -1109,8 +1091,7 @@ 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 -.\" HTML: end of heading -.misc@tag EO-H +.DEVTAG-EO-H \" HTML: end of heading .. .\"-------- .de HM @@ -2072,8 +2053,7 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%] .\" .nr ds*old-ll \\n[.l] .nr ds*old-in \\n[.i] -.misc@push ds-in \\n[ds*old-in] \" Saving indent and line length of -.misc@push ds-ll \\n[ds*old-ll] \" the text outside the display. +.misc@push ds-ll \\n[.l] .misc@push ds-form \\n[ds*format] .nr ds*i \\n[.i] .nr ds*ftmp \\n[.f] @@ -2096,8 +2076,7 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%] .\" ********** .nr ds*width \\n[dl] .nr ds*height \\n[dn] -.misc@pop-nr ds-ll ds*old-ll \" Restore indent and -.misc@pop-nr ds-in ds*old-in \" line length +.misc@pop-nr ds-ll ds*old-ll .misc@pop-nr ds-form ds*format .\" .\" ********** @@ -2115,7 +2094,7 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%] .nr ds*i \\n[Lsp] .if r Dsp .nr ds*i \\n[Dsp] .\" -.if \\n[Ds] .SP \\n[ds*i]u \" Space before display +.if \\n[Ds] .sp \\n[ds*i]u .\" check if pending equation label .eq@check \\n[ds*need] 'in \\n[ds*old-in]u @@ -2128,7 +2107,7 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%] .\" ********** .\" .ds*div!\\n[ds*snr] -.if \\n[Ds] .SP \\n[ds*i]u \" Space after display +.if \\n[Ds] .sp \\n[ds*i]u .\" .if \\n[ds*format]=2 'ce 0 .if \\n[ds*format]=4 'rj 0 @@ -2804,7 +2783,6 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%] .nr box*ll 0 .. .\"########################### module ref ############################ -.mso refer-mm.tmac .nr ref*nr 0 1 .aln :R ref*nr .nr ref*nr-width 5n @@ -2817,7 +2795,7 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%] .if !''\\$1' .ds \\$1 \v'-.4m'\s-3[\\n[ref*nr]]\s0\v'.4m' .nr ref*flag 1 .am ref*mac -.ref@start-print \\n[ref*nr]. +.ref@start-print \\n[ref*nr] \\.. .eo .am ref*mac RF @@ -2833,8 +2811,8 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%] .de ref@start-print .di ref*div .in \\n[ref*nr-width]u -.ti -(\w@\\$1@u+1n) -\\$1 +.ti -(\w@\\$1.@u+1n) +\\$1. .sp -1 .. .de ref@stop-print @@ -2851,8 +2829,7 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%] .\"----------- .de RP .if !d ref*mac .@error "RP: No references!" -.ie !''\\$2' .nr ref*i 0\\$2 -.el .nr ref*i \\n[Rpe] +.nr ref*i 0\\$2 .if \\n[ref*i]<2 .SK .SP 2 .ref@print-refs diff --git a/contrib/mm/mmroff.man b/contrib/mm/mmroff.man index 843b7c95..80b88409 100644 --- a/contrib/mm/mmroff.man +++ b/contrib/mm/mmroff.man @@ -1,5 +1,5 @@ .ig -Copyright (C) 1989, 2001, 2009, 2011 +Copyright (C) 1989, 2001, 2009 Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of @@ -20,7 +20,7 @@ the original English. . .TH MMROFF @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@" .SH NAME -mmroff \- cross reference preprocessor +mmroff \- reference preprocessor .SH SYNOPSIS .B mmroff [ @@ -29,17 +29,16 @@ mmroff \- cross reference preprocessor .I groff_arguments .SH DESCRIPTION \fBmmroff\fP is a simple preprocessor for \fBgroff\fP, it is -used for expanding cross references in \fBm@TMAC_M_PREFIX@m\fP, see +used for expanding references in \fBm@TMAC_M_PREFIX@m\fP, see \fBgroff_mm(@MAN7EXT@)\fP. \fBgroff\fP is executed twice, first with \fB-z\fP and \fB-rRef=1\fR -to collect all cross references and then to do the real processing -when the cross reference file is up to date. +to collect all references and then to do the real processing +when the reference file is up to date. .TP \fB\-x\fR -Just create the cross reference file. -This can be used to refresh the cross reference file, -it isn't always needed to have accurate -cross references and by using this option \fBgroff\fP will only +Just create the reference file. This can be used to refresh +the reference file, it isn't always needed to have accurate +references and by using this option \fBgroff\fP will only be run once. .\".SH BUGS .SH AUTHOR @@ -64,5 +63,4 @@ Jörgen Hägg, Lund, Sweden <jh@axis.se>. . .\" Local Variables: .\" mode: nroff -.\" coding: latin-1 .\" End: diff --git a/contrib/mm/refer-mm.tmac b/contrib/mm/refer-mm.tmac deleted file mode 100644 index 55dac432..00000000 --- a/contrib/mm/refer-mm.tmac +++ /dev/null @@ -1,106 +0,0 @@ -.\" -*- mode: nroff; coding: iso-latin-1; -*- -.\" -.\" refer-mm.tmac -.\" -.\" Refer support for mm macros. -.\" -.\" Copyright (C) 2011 Free Software Foundation, Inc. -.\" Written by Werner Lemberg (wl@gnu.org) -.\" -.\" This file is part of groff. -.\" -.\" groff is free software; you can redistribute it and/or modify it under -.\" the terms of the GNU General Public License as published by the Free -.\" Software Foundation, either version 3 of the License, or -.\" (at your option) any later version. -.\" -.\" groff is distributed in the hope that it will be useful, but WITHOUT ANY -.\" WARRANTY; without even the implied warranty of MERCHANTABILITY or -.\" FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -.\" for more details. -.\" -.\" You should have received a copy of the GNU General Public License -.\" along with this program. If not, see <http://www.gnu.org/licenses/>. -.\" -.\" Please send comments to groff@gnu.org. -. -. -.als ref*error @warning -. -.de ref*text-label-start -. FS "\\$1" -.. -.de ref*text-label-end -. FE -.. -. -.de ref*biblio-item-start -. ref@start-print "\\$1" -.. -.de ref*biblio-item-start-nolabel -. ref@start-print \& -.. -.de ref*biblio-item-end -. ref@stop-print -.. -. -.ds ref*refnum-start \" empty -.ds ref*refnum-end .\" -. -.ds [. \v'-.4m'\s-3[\" -.ds .] ]\s0\v'.4m'\" -. -.ds ref*spec!0 Q A T S V N P I C D O -.ds ref*spec!1 Q A T J S V N P I C D O -.ds ref*spec!2 Q A T S V P I C D O -.ds ref*spec!3 Q A T B E S V P I C D O -.ds ref*spec!4 Q A T R G P I C D O -. -.ds ref*spec!A ", " " -.ds ref*spec!B """ " " "in \fI" "" "\fP" -.ds ref*spec!D """ " " "(" ")" -.ds ref*spec!E ", " " "ed. " -.ds ref*spec!G """ " " "(" ")" -.ds ref*spec!J ", " " "\fI" "" "\fP" -.ds ref*spec!N """ "(" "" ")" -.ds ref*spec!O ". " " -.ds ref*spec!P ", " " "p.\~" -.ds ref*spec!PP ", " " "pp.\~" -.ds ref*spec!T ", " " "\(lq" "" "\(rq" -.ds ref*spec!T:0 ", " " "\fI" "" "\fP" -.ds ref*spec!T:2 ", " " "\fI" "" "\fP" -.ds ref*spec!V """ " " "\fB" "\fR" -.ds ref*spec!dflt ", " " -. -.\" For the bibliography section, we emulate the .RS/.RF mechanism of mm by -.\" collecting references (enclosed with .]- and .][) in macro `ref*mac'. -.\" This macro gets expanded while calling the .RP macro. -. -.de ref*][-first-pass -. ec -. am ref*mac -. ds [F "\\*([F\" -. ][ "\\$1" "\\$2" -\\.. -.. -. -.de ref*biblio-start-hook -. als ref*][-second-pass ][ -. als ][ ref*][-first-pass -. de ref*item-start-hook -. eo -. am ref*mac ][ -\\.. -.. -. -.de ref*biblio-end-hook -. als ][ ref*][-second-pass -. rm ref*item-start-hook -. als ref*print ref*end-print -. RP -. als ref*print ref*normal-print -.. -. -.mso refer.tmac -. -.\" EOF |