diff options
Diffstat (limited to 'contrib')
49 files changed, 337 insertions, 1337 deletions
diff --git a/contrib/groffer/ChangeLog b/contrib/groffer/ChangeLog index f996a86b..aa561a55 100644 --- a/contrib/groffer/ChangeLog +++ b/contrib/groffer/ChangeLog @@ -1,39 +1,3 @@ -2011-10-17 Ingo Schwarze <schwarze@openbsd.org> - - Do not use INSTALL_DATA and INSTALL_SCRIPT during build phase. - - * Makefile.sub (groffer): Replace INSTALL_DATA and - INSTALL_SCRIPT with `cp'. Otherwise the build phase might - fail with `permission denied' if you use the `-o root' flag - of the `install' command. The use of INSTALL_* is an abuse - anyway because it's not installing anything at that point; - it's just copying files around locally, within in the build - directories. - -2011-03-21 Jan Vcelak <jvcelak@redhat.com> - Bernd Warken - - Remove hardcoded path to 'libdir/groff/groffer' directory. - - * Makefile.sub: use @groffer_dir@ - - * groffer.pl: use @groffer_dir@ - -2011-01-27 James Budiono <james.budiono@gmail.com> - Bernd Warken - - Fix display of manpages. - - Reported as - http://lists.gnu.org/archive/html/bug-groff/2011-01/msg00015.html. - - * perl/groffer.pl (_get_first_prog): Fix return value. - (Viewer_X): Add `okular' viewer. - * perl/man.pl (manpath_set_from_path): Handle `@main::Path)' - correctly. - - * version.sh: Updated. - 2009-01-03 Werner LEMBERG <wl@gnu.org> * version.sh: Prepare for groff release 1.20. @@ -262,7 +226,7 @@ ________________________________________________________________ License - Copyright (C) 2006-2009, 2011 + Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc. Written by Bernd Warken diff --git a/contrib/groffer/Makefile.sub b/contrib/groffer/Makefile.sub index dee3a430..6d2666be 100644 --- a/contrib/groffer/Makefile.sub +++ b/contrib/groffer/Makefile.sub @@ -2,11 +2,11 @@ # File position: <groff-source>/contrib/groffer/Makefile.sub -# Copyright (C) 2001, 2002, 2005, 2006, 2009, 2011 +# Copyright (C) 2001, 2002, 2005, 2006, 2009 # Free Software Foundation, Inc. # Written by Werner Lemberg <wl@gnu.org> and Bernd Warken. -# Last update: 17 Oct 2011 +# Last update: 5 Jan 2009 # This file is part of `groffer' which is part of `groff'. @@ -63,6 +63,8 @@ GROFFER_REST=$(srcdir)/roff2.man \ GROFFER_PERL_=`echo $(GROFFER_PERL) | sed 's|$(srcdir)/perl/||g'` GROFFER_SHELL_=`echo $(GROFFER_SHELL) | sed 's|$(srcdir)/shell||g'` +groffer_dir=$(libdir)/groff/groffer + # TODO: Add perl check to configure script. groffer: $(GROFFER_PERL) $(GROFFER_SHELL) \ $(GROFFER_REST) $(SH_DEPS_SED_SCRIPT) @@ -73,13 +75,12 @@ groffer: $(GROFFER_PERL) $(GROFFER_SHELL) \ -e "s|@g@|$(g)|g" \ -e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \ -e "s|@libdir@|$(DESTDIR)$(libdir)|g" \ - -e "s|@groffer_dir@|$(DESTDIR)$(groffer_dir)|g" \ -e "s|@VERSION@|$(version)$(revision)|g" \ -e "$(SH_SCRIPT_SED_CMD)" \ $(srcdir)/perl/groffer.pl >$@; \ - cp $(srcdir)/perl/groffer.man groffer.man; \ + $(INSTALL_DATA) $(srcdir)/perl/groffer.man groffer.man; \ for f in $(ROFF2PROGS); do \ - cp $(srcdir)/perl/roff2.pl $$f; \ + $(INSTALL_SCRIPT) $(srcdir)/perl/roff2.pl $$f; \ done; \ else \ : >HAVE_SHELL; \ @@ -88,13 +89,12 @@ groffer: $(GROFFER_PERL) $(GROFFER_SHELL) \ -e "s|@g@|$(g)|g" \ -e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \ -e "s|@libdir@|$(DESTDIR)$(libdir)|g" \ - -e "s|@groffer_dir@|$(DESTDIR)$(groffer_dir)|g" \ -e "s|@VERSION@|$(version)$(revision)|g" \ -e "$(SH_SCRIPT_SED_CMD)" \ $(srcdir)/shell/groffer.sh >$@; \ - cp $(srcdir)/shell/groffer.man groffer.man; \ + $(INSTALL_DATA) $(srcdir)/shell/groffer.man groffer.man; \ for f in $(ROFF2PROGS); do \ - cp $(srcdir)/shell/roff2.sh $$f; \ + $(INSTALL_SCRIPT) $(srcdir)/shell/roff2.sh $$f; \ done; \ fi chmod +x $@ diff --git a/contrib/groffer/perl/groffer.man b/contrib/groffer/perl/groffer.man index 55e8339f..0eb36d8f 100644 --- a/contrib/groffer/perl/groffer.man +++ b/contrib/groffer/perl/groffer.man @@ -15,13 +15,13 @@ groffer.1 - man page for groffer (section 1). Source file position: <groff_source_top>/contrib/groffer/perl/groffer.man Installed position: $prefix/share/man/man1/groffer.1 -Last update: 7 Feb 2011 +Last update: 2 Jun 2010 .. .de author This file was written by Bernd Warken. .. .de copyleft -Copyright (C) 2001, 2002, 2004-2006, 2009-2011 +Copyright (C) 2001, 2002, 2004, 2005, 2006, 2009, 2010 Free Software Foundation, Inc. . .P @@ -594,7 +594,7 @@ All other arguments are ignored. . .TP .OP -h\fR|\fR--help -Print help information with a short explanation of options to +Print a helping information with a short explanation of option sto standard output. . . @@ -980,7 +980,7 @@ Choose a viewer program for This can be a file name or a program to be searched in .Env_var $PATH . . -Common Postscript viewers include +Common Postscript viewers inlude .BR \%gv (1), .BR \%ghostview (1), and @@ -1021,7 +1021,7 @@ Choose a text pager for mode .IR tty . The standard pager is .BR less (1). -This option is equivalent to +This option is eqivalent to .I man option .BR --pager=prog . @@ -1582,7 +1582,7 @@ is a comma-separated list. . .TP .B --where -Equivalent to +Eqivalent to .B --location . . . @@ -1872,7 +1872,7 @@ arguments is ignored. . The \f[CR]GNU\f[] behavior to recognize options even when mixed with .I \%filespec -arguments is used throughout. +arguments is used througout. . But, as usual, the double minus argument .B -- @@ -2156,7 +2156,7 @@ You can change this automatic behavior by the option . .P Known viewers for the graphical display modes and their standard -\%\f[CR]X\~Window\f[] viewer programs are +\%\f[CR]X\~Window\f[] viewer progams are . .Topic in a PDF viewer @@ -2199,7 +2199,7 @@ in a dvi viewer program .P The .I \%pdf\~mode -has a major advantage \[em] it is the only graphical display mode that +has a major advantage \[em] it is the only graphical diplay mode that allows to search for text within the viewer; this can be a really important feature. . @@ -3537,7 +3537,7 @@ The quotes around .nh .I \[cq]troff(1)\[cq] .hy -are necessary because the parentheses are special shell characters; +are necessary because the paranthesis are special shell characters; escaping them with a backslash character .I \[rs]( and diff --git a/contrib/groffer/perl/groffer.pl b/contrib/groffer/perl/groffer.pl index 65d4cdbd..602abb06 100755 --- a/contrib/groffer/perl/groffer.pl +++ b/contrib/groffer/perl/groffer.pl @@ -5,10 +5,10 @@ # Source file position: <groff-source>/contrib/groffer/perl/groffer.pl # Installed position: <prefix>/bin/groffer -# Copyright (C) 2006, 2009, 2011 Free Software Foundation, Inc. +# Copyright (C) 2006, 2009 Free Software Foundation, Inc. # Written by Bernd Warken. -# Last update: 22 Mar 2011 +# Last update: 5 Jan 2009 # This file is part of `groffer', which is part of `groff'. @@ -132,7 +132,8 @@ BEGIN { $at_at{'BINDIR'} = '@BINDIR@'; $at_at{'G'} = '@g@'; $at_at{'LIBDIR'} = '@libdir@'; - $groffer_libdir = '@groffer_dir@'; + $groffer_libdir = + File::Spec->catdir($at_at{'LIBDIR'}, 'groff', 'groffer'); $file_perl_test_pl = File::Spec->catfile($groffer_libdir, 'perl_test.pl'); $File_version_sh = File::Spec->catfile($groffer_libdir, 'version.sh'); @@ -192,9 +193,9 @@ my %Viewer_X =('DVI' => ['kdvi', 'xdvi', 'dvilx'], 'HTML' => ['konqueror', 'epiphany'. 'mozilla-firefox', 'firefox', 'mozilla', 'netscape', 'galeon', 'opera', 'amaya','arena', 'mosaic'], - 'PDF' => ['okular', 'kpdf', 'acroread', 'evince', 'xpdf -z 150', 'gpdf', + 'PDF' => ['kpdf', 'acroread', 'evince', 'xpdf -z 150', 'gpdf', 'kghostview --scale 1.45', 'ggv'], - 'PS' => ['okular', 'kpdf', 'kghostview --scale 1.45', 'evince', 'ggv', + 'PS' => ['kpdf', 'kghostview --scale 1.45', 'evince', 'ggv', 'gv', 'ghostview', 'gs_x11', 'gs'], 'TTY' => ['xless'], 'X' => ['gxditview', 'xditview'], @@ -1322,8 +1323,8 @@ sub _get_first_prog { if (%prog) { $Display{'PROG'} = $prog{'fullname'}; $Display{'ARGS'} = $prog{'args'}; - return 1; } + return 1; } return 0; } # _get_first_prog() of main_set_mode() diff --git a/contrib/groffer/perl/man.pl b/contrib/groffer/perl/man.pl index fb7ace3a..9785a8b5 100644 --- a/contrib/groffer/perl/man.pl +++ b/contrib/groffer/perl/man.pl @@ -5,10 +5,10 @@ # Source file position: <groff-source>/contrib/groffer/perl/man.pl # Installed position: <prefix>/lib/groff/groffer/man.pl -# Copyright (C) 2006, 2009, 2011 Free Software Foundation, Inc. +# Copyright (C) 2006, 2009 Free Software Foundation, Inc. # Written by Bernd Warken. -# Last update: 27 Jan 2011 +# Last update: 5 Jan 2009 # This file is part of `groffer', which is part of `groff'. @@ -522,8 +522,7 @@ sub manpath_set_from_path { my @path = qw( /usr/local /usr /usr/X11R6 /usr/openwin /opt /opt/gnome /opt/kde ); # get a basic man path from $ENV{PATH} - my @path2 = @main::Path; - foreach (@path2) { + foreach (@main::Path) { s#bin/*$##; push @path, $_; } diff --git a/contrib/groffer/shell/ChangeLog.0 b/contrib/groffer/shell/ChangeLog.0 index 57510cbc..c112293d 100644 --- a/contrib/groffer/shell/ChangeLog.0 +++ b/contrib/groffer/shell/ChangeLog.0 @@ -502,7 +502,7 @@ systems parameter if any. Then _MAN_PATH is prepended by the language part. - _manpath_add_sys(): New subfunction of manpath_add_lang_sys() to - handle the systems part. + handle the sytems part. - man_search_section: Fix it to handle section names that have more than one character (an extension). - $_MAN_PATH: Now stores man path as a list. This is done in diff --git a/contrib/groffer/shell/README_SH b/contrib/groffer/shell/README_SH index 2bcea3ee..2def6f70 100644 --- a/contrib/groffer/shell/README_SH +++ b/contrib/groffer/shell/README_SH @@ -63,7 +63,7 @@ function obj_from_output(). Function Definitions in `groffer2.sh' Each funtion in groffer2.sh has a description that starts with the -function name and symbols for its arguments in parentheses `()'. Each +function name and symbols for its arguments in paranthesis `()'. Each `<>' construction gives an argument name that just gives a hint on what the argument is meant to be; these argument names are otherwise irrelevant. The `>' sign can be followed by another character that @@ -147,8 +147,8 @@ The `groffer' shell scripts are compatible to both the GNU and the POSIX shell and utilities. Care was taken to restrict the programming technics used here in order to achieve POSIX compatibility as far back as POSIX P1003.2 Draft 11.2 of September 1991. This draft is -available at http://www.funet.fi/pub/doc/posix/p1003.2/d11.2 on the -Internet. +available at http://www.funet.fi/pub/doc/posix/p1003.2/d11.2 in the +internet. The POSIX draft does not include `local' variables for functions. So this concept was replaced by global variables with a prefix that @@ -268,9 +268,9 @@ by all shells. The `trap' commands work for the shells `bash', ####### License -Last update: 7 Feb 2011 +Last update: 5 Jan 2009 -Copyright (C) 2003-2006, 2009, 2011 +Copyright (C) 2003, 2004, 2005, 2006, 2009 Free Software Foundation, Inc. Written by Bernd Warken diff --git a/contrib/groffer/shell/groffer.man b/contrib/groffer/shell/groffer.man index 729a7512..dc6ef30e 100644 --- a/contrib/groffer/shell/groffer.man +++ b/contrib/groffer/shell/groffer.man @@ -15,13 +15,13 @@ groffer.1 - man page for groffer (section 1). Source file position: <groff_source_top>/contrib/groffer/shell/groffer.man Installed position: $prefix/share/man/man1/groffer.1 -Last update: 7 Feb 2011 +Last update: 2 Jun 2010 .. .de author This file was written by Bernd Warken. .. .de copyleft -Copyright (C) 2001, 2002, 2004-2011 +Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. . .P @@ -593,7 +593,7 @@ All other arguments are ignored. . .TP .OP -h\fR|\fR--help -Print help information with a short explanation of options to +Print a helping information with a short explanation of option sto standard output. . . @@ -979,7 +979,7 @@ Choose a viewer program for This can be a file name or a program to be searched in .Env_var $PATH . . -Common Postscript viewers include +Common Postscript viewers inlude .BR \%gv (1), .BR \%ghostview (1), and @@ -1020,7 +1020,7 @@ Choose a text pager for mode .IR tty . The standard pager is .BR less (1). -This option is equivalent to +This option is eqivalent to .I man option .BR --pager=prog . @@ -1581,7 +1581,7 @@ is a comma-separated list. . .TP .B --where -Equivalent to +Eqivalent to .B --location . . . @@ -1937,7 +1937,7 @@ arguments is ignored. . The \f[CR]GNU\f[] behavior to recognize options even when mixed with .I \%filespec -arguments is used throughout. +arguments is used througout. . But, as usual, the double minus argument .B -- @@ -2221,7 +2221,7 @@ You can change this automatic behavior by the option . .P Known viewers for the graphical display modes and their standard -\%\f[CR]X\~Window\f[] viewer programs are +\%\f[CR]X\~Window\f[] viewer progams are . .Topic in a PDF viewer @@ -2264,7 +2264,7 @@ in a dvi viewer program .P The .I \%pdf\~mode -has a major advantage \[em] it is the only graphical display mode that +has a major advantage \[em] it is the only graphical diplay mode that allows to search for text within the viewer; this can be a really important feature. . @@ -3640,7 +3640,7 @@ The quotes around .nh .I \[cq]troff(1)\[cq] .hy -are necessary because the parentheses are special shell characters; +are necessary because the paranthesis are special shell characters; escaping them with a backslash character .I \[rs]( and @@ -3781,7 +3781,7 @@ Both scripts are compatible with both \%\f[CR]POSIX\fP compatibility refers to \%\f[CR]IEEE\~P1003.2/D11.2\fP of September 1991, a very early version of the \%\f[CR]POSIX\fP standard that is still freely -available on the Internet at +available in the internet at .UR http://\:www.funet.fi/\:pub/\:doc/\:posix/\:p1003.2/\:d11.2/\:all \%POSIX\~P1003.2\~draft\~11.2 .UE . diff --git a/contrib/groffer/version.sh b/contrib/groffer/version.sh index caf1e00e..393148cb 100644 --- a/contrib/groffer/version.sh +++ b/contrib/groffer/version.sh @@ -5,7 +5,7 @@ # Source file position: <groff-source>/contrib/groffer/version.sh # Installed position: <prefix>/lib/groff/groffer/version.sh -# Copyright (C) 2001-2006, 2009, 2011 +# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2009 # Free Software Foundation, Inc. # Written by Bernd Warken @@ -29,10 +29,10 @@ export _PROGRAM_VERSION; export _LAST_UPDATE; -_PROGRAM_VERSION='1.1.2'; -_LAST_UPDATE='26 Jan 2011'; +_PROGRAM_VERSION='1.1.1'; +_LAST_UPDATE='03 Jan 2009'; # this setting of the groff version is only used before make is run, # otherwise @VERSION@ will set it, see groffer.sh. export _GROFF_VERSION_PRESET; -_GROFF_VERSION_PRESET='1.21'; +_GROFF_VERSION_PRESET='1.20preset'; diff --git a/contrib/hdtbl/ChangeLog b/contrib/hdtbl/ChangeLog index 5c46f8ee..e280f7f6 100644 --- a/contrib/hdtbl/ChangeLog +++ b/contrib/hdtbl/ChangeLog @@ -1,16 +1,3 @@ -2011-01-17 Werner LEMBERG <wl@gnu.org> - - * examples/color_nested_tables.roff: Fix output. - - Problem reported by Ulrich Spörlein <uqs@spoerlein.net>. - -2011-01-17 Ulrich Spörlein <uqs@spoerlein.net> - - Don't make examples depend on bash. - - * examples/common.roff, examples/fonts_n.in, examples/fonts_x.in: - s/bash/sh/. - 2010-02-09 Werner LEMBEARG <wl@gnu.org> Make example compilation work again if srcdir != builddir. @@ -281,7 +268,7 @@ * Import of hdtbl 0.91 (with some further modifications). Still many rough edges. -Copyright 2006, 2008-2011 +Copyright 2006, 2008, 2009, 2010 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, diff --git a/contrib/hdtbl/examples/color_nested_tables.roff b/contrib/hdtbl/examples/color_nested_tables.roff index 6e6b70d8..e16d209a 100644 --- a/contrib/hdtbl/examples/color_nested_tables.roff +++ b/contrib/hdtbl/examples/color_nested_tables.roff @@ -5,7 +5,7 @@ color_nested_tables.roff This file is part of groff, the GNU roff type-setting system. -Copyright (C) 2005, 2006, 2009-2011 Free Software Foundation, Inc. +Copyright (C) 2005, 2006, 2009, 2010 Free Software Foundation, Inc. written by Joachim Walsdorff <Joachim.Walsdorff@urz.uni-heidelberg.de>. groff is free software; you can redistribute it and/or modify it under @@ -35,30 +35,23 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. .nr # 0 1 ***** .PN 39 .random# ".defcolor c\\n[#] rgb \\\\*[#random] " \ - ".TBL csp=0 cpd=0 border=1n bc=c\\n[#]" \ - ".if \\\\n+#=1 .CPTN val=b Nested Tables with Randomly Colored Border" \ - .TR .TD +".TBL csp=0 cpd=0 border=1n bc=c\\n[#]" \ +".if \\\\n+#=1 .CPTN val=b Nested Tables with Randomly Colored Border" \ +.TR .TD .PN 39 .ETB .PN 15 Text after first table. -. .time -. -.bp -. .time start -. .PN 15 Text before second table. ***** .nr # 0 1 .PN 39 .random# ".defcolor c\\n[#] rgb \\\\*[#random] " \ - ".TBL csp=0 cpd=1n border= bgc=c\\n[#]" \ - ".if \\\\n+#=1 .CPTN val=b Nested Tables with Randomly Colored Background" \ - .TR .TD +".TBL csp=0 cpd=1n border= bgc=c\\n[#]" \ +".if \\\\n+#=1 .CPTN val=b Nested Tables with Randomly Colored Background" \ +.TR .TD .PN 39 .ETB .PN 25 Text after second table. -. .time -. .\" 466MHz Celeron CPU, 384MB RAM .\" WindowsXP/cygwin groff18.1: 9/9s .\" WindowsXP/cygwin groff19.2: 14/14s diff --git a/contrib/hdtbl/examples/common.roff b/contrib/hdtbl/examples/common.roff index 392e4a25..c4857d38 100644 --- a/contrib/hdtbl/examples/common.roff +++ b/contrib/hdtbl/examples/common.roff @@ -65,7 +65,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. .\" ** for example "Sun Dec 5 22:27:57 2004" ** .\" ****************************************************************** .de date -. pso sh -c "echo -n .ds *date\ ;date" +. pso bash -c "echo -n .ds *date\ ;date" . tm \\*[*date] *** .. . @@ -83,9 +83,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. . ds * \\$1\" . substring * 0 0 . ie "\\*[*]"s" \ -. pso sh -c "echo -n .nr *time 0+;date +%s" +. pso bash -c "echo -n .nr *time 0+;date +%s" . el \{\ -. pso sh -c "echo -n .nr *time -;date +%s" +. pso bash -c "echo -n .nr *time -;date +%s" . nr *time 0-\\n[*time] . tm elapsed time: \\n[*time] seconds . \} diff --git a/contrib/hdtbl/examples/fonts_n.in b/contrib/hdtbl/examples/fonts_n.in index c6625885..709ffb25 100644 --- a/contrib/hdtbl/examples/fonts_n.in +++ b/contrib/hdtbl/examples/fonts_n.in @@ -50,7 +50,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. . el \ . ds *args \\n[.fn] . -. pso sh -c \ +. pso bash -c \ "echo -n .ds *f\ ; \ ls \\*[fontpath]/dev\*[.T] \ | tr '[:cntrl:]' ' '" diff --git a/contrib/hdtbl/examples/fonts_x.in b/contrib/hdtbl/examples/fonts_x.in index 639a8226..77b5ac37 100644 --- a/contrib/hdtbl/examples/fonts_x.in +++ b/contrib/hdtbl/examples/fonts_x.in @@ -50,7 +50,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. . el \ . ds *args \\n[.fn] . -. pso sh -c \ +. pso bash -c \ "echo -n .ds *f\ ; \ ls \\*[fontpath]/dev\*[.T] \ | tr '[:cntrl:]' ' '" 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 diff --git a/contrib/mom/BUGS b/contrib/mom/BUGS index cf8f7d54..2c0b728a 100644 --- a/contrib/mom/BUGS +++ b/contrib/mom/BUGS @@ -1,4 +1,4 @@ - Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 + Copyright 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, @@ -21,40 +21,6 @@ Also, please--no html email. That, too, gets nuked. --Peter Schaffter ======================================================================== -Version 6-a -=========== - -HEADER_RULE OFF turning off headers completely. ----Fixed--- - -FINIS depositing a blank final page when invoked too close to the -bottom margin. ----Fixed--- - -Version 6 -========= - -ENDNOTE_STRING_CAPS not disabling caps when arg given. ----Fixed--- - -Superfluous blank line before paragraphs with paraheads. ----Fixed--- - -Paraheads causing line numbering to overprint two line numbers. ----Fixed--- - -Endless loop when DOC_LEAD_ADJUST is disabled. ----Fixed--- - -In the case where the list doesn't fit the page, -mom inserts -an extra page with one word and a warning about "environment stack -underflow" and then continues on the following page. ---Fixed-- - -PRINTSTYLE TYPEWRITE not respecting TYPEWRITER_FAMILY when DOCTYPE -is LETTER. ----Fixed--- - Version 1.5-d ============= diff --git a/contrib/mom/ChangeLog b/contrib/mom/ChangeLog index 40e977eb..844fce65 100644 --- a/contrib/mom/ChangeLog +++ b/contrib/mom/ChangeLog @@ -1,23 +1,3 @@ -* Thu Sep 8 2011 -o Added register #SUBHEAD, analagous to #HEAD, to fix excessive - spacing between SUBHEADs and SUBSUBHEADs. - -* Sun Feb 20 2011 - -o Added support for sub-subheads from patch supplied by Petr Man. - -* Fri Feb 11 2011 - -o Moved register #UNADJUSTED_DOC_LEAD to top of TRAPS macro. - -* Fri Nov 19 2010 - -o Added utility macro, SINGE_SPACE, for PRINTSTYLE TYPEWRITE - -* Sat Jan 22 2011 - -o groff_mom.man (FILES): Fix directory locations. - * Sun Oct 3 2010 o Complete overhaul of refer macros and documentation @@ -1388,7 +1368,7 @@ o Added "Next," "Prev" and "Top" links to top and bottom of doc files. o Fixed some typos in the docs. -Copyright 2004-2011 +Copyright 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, diff --git a/contrib/mom/NEWS b/contrib/mom/NEWS index a7edb064..dbbb6458 100644 --- a/contrib/mom/NEWS +++ b/contrib/mom/NEWS @@ -1,14 +1,10 @@ - Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 + Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright notice and this notice are preserved. -Release 1.6-a -------------- -Support for sub-subheads added. - Release 1.6 ----------- Complete overhaul of refer handling. If you've been using mom and diff --git a/contrib/mom/groff_mom.man b/contrib/mom/groff_mom.man index 6f0dece6..1ee84990 100644 --- a/contrib/mom/groff_mom.man +++ b/contrib/mom/groff_mom.man @@ -1,7 +1,7 @@ .ig This file is part of groff, the GNU roff type-setting system. -Copyright (C) 2002, 2003, 2005, 2008, 2009, 2011 +Copyright (C) 2002, 2003, 2005, 2008, 2009 Free Software Foundation, Inc. written by Werner Lemberg <wl@gnu.org> @@ -75,13 +75,13 @@ mom comes with her own (very) complete documentation in HTML format. \[en] a wrapper file that calls om.tmac directly. . .TP -.UR @HTMLDOCDIR@/\:mom/\:toc.html -@HTMLDOCDIR@/\:mom/\:toc.html +.UR @HTMLDOCDIR@/\:momdoc/\:toc.html +@HTMLDOCDIR@/\:momdoc/\:toc.html .UE \[en] entry point to the HTML documentation . .TP -.B @EXAMPLEDIR@/mom/*.mom +.B @EXAMPLEDIR@/*.mom \[en] example files using mom . . diff --git a/contrib/mom/momdoc/appendices.html b/contrib/mom/momdoc/appendices.html index f6d65129..7aa92408 100644 --- a/contrib/mom/momdoc/appendices.html +++ b/contrib/mom/momdoc/appendices.html @@ -2,7 +2,7 @@ <!-- This file is part of groff, the GNU roff type-setting system. -Copyright (C) 2004, 2005, 2006, 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright (C) 2004, 2005, 2006, 2009, 2010 Free Software Foundation, Inc. Written by Peter Schaffter. Permission is granted to copy, distribute and/or modify this document @@ -756,18 +756,20 @@ mom’s homepage. <h2 id="contact" class="docs">Contact the author</h2> <p> -If you have any questions or comments about mom, suggestions to -make, criticisms to offer, or bugs to report, use the groff mailing -list (subscription information available -<a href="http://www.gnu.org/software/groff/groff.html">here</a>) +If you have any questions or comments about mom, +suggestions to make, criticisms to offer, or bugs to report, use the +groff mailing list at +<a href="mailto:groff@ffii.org">groff@ffii.org</a> +(subscription information available +<a href="http://ffii.org/mailman/listinfo/groff/">here</a>) or contact me, Peter Schaffter, directly at of the following address: <br/> <span class="pre-in-pp"> peter@schaffter.ca </span> -Please include the word “mom” or “groff” in -the Subject: line of any message sent to my personal address, or you +Please include the word “mom” or “groff” in the +Subject: line of any message sent to my personal address, or you risk the wrath of my implacable spam filters. :) </p> diff --git a/contrib/mom/momdoc/color.html b/contrib/mom/momdoc/color.html index 0018e85f..45e74163 100644 --- a/contrib/mom/momdoc/color.html +++ b/contrib/mom/momdoc/color.html @@ -2,7 +2,7 @@ <!-- This file is part of groff, the GNU roff type-setting system. -Copyright (C) 2004, 2005, 2006, 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright (C) 2004, 2005, 2006, 2009, 2010 Free Software Foundation, Inc. Written by Peter Schaffter. Permission is granted to copy, distribute and/or modify this document diff --git a/contrib/mom/momdoc/cover.html b/contrib/mom/momdoc/cover.html index 744d415e..e1b4d3ea 100644 --- a/contrib/mom/momdoc/cover.html +++ b/contrib/mom/momdoc/cover.html @@ -2,7 +2,7 @@ <!-- This file is part of groff, the GNU roff type-setting system. -Copyright (C) 2004, 2005, 2006, 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright (C) 2004, 2005, 2006, 2009, 2010 Free Software Foundation, Inc. Written by Peter Schaffter. Permission is granted to copy, distribute and/or modify this document diff --git a/contrib/mom/momdoc/definitions.html b/contrib/mom/momdoc/definitions.html index 3bc37bdb..0c26715d 100644 --- a/contrib/mom/momdoc/definitions.html +++ b/contrib/mom/momdoc/definitions.html @@ -2,7 +2,7 @@ <!-- This file is part of groff, the GNU roff type-setting system. -Copyright (C) 2004, 2005, 2006, 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright (C) 2004, 2005, 2006, 2009, 2010 Free Software Foundation, Inc. Written by Peter Schaffter. Permission is granted to copy, distribute and/or modify this document diff --git a/contrib/mom/momdoc/docelement.html b/contrib/mom/momdoc/docelement.html index 5da69632..c7bea507 100644 --- a/contrib/mom/momdoc/docelement.html +++ b/contrib/mom/momdoc/docelement.html @@ -2,7 +2,7 @@ <!-- This file is part of groff, the GNU roff type-setting system. -Copyright (C) 2004, 2005, 2006, 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright (C) 2004, 2005, 2006, 2009, 2010 Free Software Foundation, Inc. Written by Peter Schaffter. Permission is granted to copy, distribute and/or modify this document @@ -82,11 +82,6 @@ FDL in the main directory of the groff source package. <li><a href="#subhead">SUBHEAD</a></li> <li><a href="#subhead-control">Subhead control</a></li> </ul> -<h3 class="toc toc-docproc-header"><a class="header-link" href="#subsubhead-intro">Subsubheads</a></h3> -<ul class="toc-docproc" style="margin-top: .5em;"> - <li><a href="#subsubhead">SUBSUBHEAD</a></li> - <li><a href="#subsubhead-control">Subsubhead control</a></li> -</ul> <h3 class="toc toc-docproc-header"><a class="header-link" href="#parahead-intro">Paragraph heads</a></h3> <ul class="toc-docproc" style="margin-top: .5em;"> <li><a href="#parahead">PARAHEAD</a></li> @@ -1125,9 +1120,9 @@ See <a href="#control-macro-args">Arguments to the control macros</a>. </p> <span class="pre defaults"> -.HEAD_FAMILY default = prevailing document family -.HEAD_FONT default = bold, underlined (TYPESET); roman,underlined (TYPEWRITE) -.HEAD_SIZE default = +1 (TYPESET); 0 (TYPEWRITE) +.HEAD_FAMILY default = prevailing document family; default is Times Roman +.HEAD_FONT default = bold +.HEAD_SIZE default = +1 (point) .HEAD_COLOR default = black .HEAD_QUAD default = CENTER </span> @@ -1146,9 +1141,8 @@ To change this behaviour, do .HEAD_CAPS OFF </span> HEAD_CAPS is a toggle macro, therefore you can use any argument you -like instead of <kbd>OFF</kbd> to disable it (e.g. <b>END, QUIT, Q, -X</b>...). To turn HEAD_CAPS back on, simply invoke it without an -argument. +like instead of <kbd>OFF</kbd> (<b>END, QUIT, Q, X</b>...). To turn +HEAD_CAPS back on, simply invoke it without an argument. </p> <h4 id="head-space" class="docs" style="margin-top: -.25em;">3. Pre-head space</h4> @@ -1355,7 +1349,7 @@ Subheads should be used any place you want titles to introduce sections of a document below heads. If you wish, mom can number subheads for you. Subhead numbers can also be included hierarchically in numbered -<a href="#subsubhead-intro">subsubheads</a>. +<a href="#parahead-intro">paraheads</a>. </p> <p> @@ -1393,10 +1387,9 @@ surround each line with double-quotes. <div class="box-tip"> <p class="tip"> <span class="note">Note:</span> -If a subhead falls near the bottom of an output page and mom -is unable to fit the subhead <i>plus at least one line of text -underneath it</i>, she will set the subhead at the top of the next -page. +If a subhead falls near the bottom of an output page and mom is +unable to fit the head <i>plus at least one line of text underneath +it</i>, she will set the subhead at the top of the next page. </p> </div> @@ -1405,14 +1398,13 @@ page. <p class="defaults"> In addition to the usual family/font/size/quad control macros, there -are macros to manage subhead numbering and vertical placement. +are macros to manage subhead numbering. </p> <ol style="margin-top: .5em; padding-bottom: .5em;"> <li><a href="#subhead-general">Family/font/size/colour/quad</a></li> <li><a href="#number-subheads">Numbering</a></li> <li><a href="#reset-subhead-number">Reset subhead numbering</a></li> - <li><a href="#subhead-baseline-adjust">Baseline adjustment</a></li> <li><a href="#subhead-inlines">Vertical inline escapes inside subheads</a></li> </ol> </div> @@ -1425,9 +1417,9 @@ See <a href="#control-macro-args">Arguments to the control macros</a>. </p> <span class="pre defaults" style="padding-bottom: -1em;"> -.SUBHEAD_FAMILY default = prevailing document family -.SUBHEAD_FONT default = bold (TYPESET); italic, ie underlined (TYPEWRITE) -.SUBHEAD_SIZE default = +.5 (TYPESET); 0 (TYPEWRITE) +.SUBHEAD_FAMILY default = prevailing document family; default is Times Roman +.SUBHEAD_FONT default = bold +.SUBHEAD_SIZE default = +.5 (point) .SUBHEAD_COLOR default = black .SUBHEAD_QUAD default = LEFT </span> @@ -1483,32 +1475,7 @@ Your next subhead will be numbered “4” and subsequent subheads will be numbered in ascending order from “4”. </p> -<h4 id="subhead-baseline-adjust" class="docs" style="margin-top: -.25em;">4. Baseline adjustment</h4> - -<p> -For aesthetic reasons and to clarify document structure, mom raises -subheads slightly above the -<a href="definitions.html#baseline">baseline</a> -on which they would otherwise fall. In -<a href="docprocessing.html#printstyle">PRINTSTYLE <kbd>TYPESET</kbd></a>, -the amount is 1/8 of the prevailing -<a href="definitions.html#leading">leading</a>. In -<a href="docprocessing.html#printstyle">PRINTSTYLE <kbd>TYPEWRITE</kbd></a>, -it’s 1/5 of the prevailing leading. -</p> - -<p> -If you would prefer mom not exhibit this behaviour, or if you would -like to change the amount by which she raises the subhead, use the -macro <kbd>.SUBHEAD_BASELINE_ADJUST</kbd>. With an argument of 0 (zero), -subhead baseline adjustment will be disabled. Any other numeric -argument, with a -<a href="definitions.html#unitofmeasure">unit of measure</a> -appended directly onto the argument, will cause mom to raise your -subheads by the amount you specify. -</p> - -<h4 id="subhead-inlines" class="docs" style="margin-top: -.25em;">5. Vertical inline escapes inside subheads</h4> +<h4 id="subhead-inlines" class="docs" style="margin-top: -.25em;">4. Vertical inline escapes inside subheads</h4> <p> See @@ -1520,183 +1487,6 @@ The information there applies equally to subheads. <!-- ==================================================================== --> -<h2 id="subsubhead-intro" class="macro-group">Subsubheads</h2> - -<ul style="margin-left: -.5em;"> - <li><a href="#subsubhead">Tag: SUBSUBHEAD</a></li> - <li><a href="#subsubhead-control">Subsubhead control macros</a></li> -</ul> - -<p> -Subsubheads should be used any place you want titles to introduce -sections of a document below subheads. If you wish, mom can -number subsubheads for you. Subsubhead numbers can also be included -hierarchically in numbered -<a href="#parahead-intro">paraheads</a>. -</p> - -<p> -By default, subsubheads are flush left. In -<a href="docprocessing.html#printstyle">PRINTSTYLE <kbd>TYPESET</kbd></a>, -they are set in italic, slightly larger than paragraph text. In -<a href="docprocessing.html#printstyle">PRINTSTYLE <kbd>TYPEWRITE</kbd></a>, -they are set roman at the same size as the prevailing type. A -single linespace precedes them in both printstyles, and a tiny space -adjustment raises them slightly above text that comes afterwards for -greater clarity in document structuring. -</p> - -<p> -If these defaults don’t suit you, you can change them with the -subsubhead control macros. -</p> - -<!-- -SUBSUBHEAD- --> - -<div class="macro-id-overline"> -<h3 id="subsubhead" class="macro-id">SUBSUBHEAD</h3> -</div> - -<div class="box-macro-args"> -Macro: <b>SUBSUBHEAD</b> <kbd class="macro-args">"<text of subsubhead>" [ "<2nd line>" [ "<3rd line>" ... ] ]</kbd> -</div> - -<p> -The argument to SUBSUBHEAD is the text of the subsubhead, surrounded by -double-quotes. If you need additional lines for a subsubhead, simply -surround each line with double-quotes. -</p> - -<div class="box-tip"> -<p class="tip"> -<span class="note">Note:</span> -If a subsubhead falls near the bottom of an output page and mom -is unable to fit the subsubhead <i>plus at least one line of text -underneath it</i>, she will set the subsubhead at the top of the next -page. -</p> -</div> - -<div class="defaults-container" style="background-color: #ded4bd; border: none;"> -<h3 id="subsubhead-control" class="docs defaults">SUBSUBHEAD control macros and defaults</h3> - -<p class="defaults"> -In addition to the usual family/font/size/quad control macros, there -are macros to manage subsubhead numbering. -</p> - -<ol style="margin-top: .5em; padding-bottom: .5em;"> - <li><a href="#subsubhead-general">Family/font/size/colour/quad</a></li> - <li><a href="#number-subsubheads">Numbering</a></li> - <li><a href="#reset-subsubhead-number">Reset subsubhead numbering</a></li> - <li><a href="#subsubhead-baseline-adjust">Baseline adjustment</a></li> - <li><a href="#subsubhead-inlines">Vertical inline escapes inside subsubheads</a></li> -</ol> -</div> - -<h4 id="subsubhead-general" class="docs" style="margin-top: -1.5em; margin-bottom: .5em;">1. Family/font/size/quad</h4> - -<div class="defaults-container" style="padding-bottom: 8px;"> -<p class="defaults" style="padding-top: 6px;"> -See -<a href="#control-macro-args">Arguments to the control macros</a>. -</p> -<span class="pre defaults" style="padding-bottom: -1em;"> -.SUBSUBHEAD_FAMILY default = prevailing document family -.SUBSUBHEAD_FONT default = italic (TYPESET); roman (TYPEWRITE) -.SUBSUBHEAD_SIZE default = +.5 (TYPESET); 0 (TYPEWRITE) -.SUBSUBHEAD_COLOR default = black -.SUBSUBHEAD_QUAD default = LEFT -</span> -</div> - -<h4 id="number-subsubheads" class="docs" style="margin-top: -1.25em;">2. Number subsubheads</h4> - -<p> -If you’d like your subsubheads numbered, simply invoke -<kbd>.NUMBER_SUBSUBHEADS</kbd> with no argument. Mom will number -all subsequent subsubheads automatically (in ascending order, -naturally). -</p> - -<p> -If, in addition to numbering subsubheads, you also request that -<a href="#head-intro">heads</a> -be numbered, the head number will be included in the subsubhead -number (separated by a period [dot]). -</p> - -<p> -Should you wish to stop subsubhead numbering, invoke -<kbd>.NUMBER_SUBSUBHEADS</kbd> with any argument (<kbd>OFF, QUIT, END, -X</kbd>...). Subsubhead numbering will cease, and the subsubhead number -will not be included in the numbering of paraheads. -</p> - -<p> -See also -<a href="#prefix-chapter-number">Prefixing chapter numbers</a> -if you’d like chapter numbers prepended to the subsubhead numbers. -</p> - -<h4 id="reset-subsubhead-number" class="docs" style="margin-top: -.25em;">3. Reset subsubhead numbering</h4> - -<p> -Should you wish to reset the subsubhead number to “1”, -invoke -<span class="pre-in-pp"> - .RESET_SUBSUBHEAD_NUMBER -</span> -with no argument. If, for some reason, you want mom to use a -subsubhead number that is not the next in ascending order (i.e. the -last subsubhead number + 1), invoke <kbd>.RESET_SUBSUBHEAD_NUMBER</kbd> -with the number you want, e.g. -<br/> -<span class="pre-in-pp"> - .RESET_SUBSUBHEAD_NUMBER 4 -</span> - -Your next subsubhead will be numbered “4” and subsequent -subsubheads will be numbered in ascending order from “4”. -</p> - -<h4 id="subsubhead-baseline-adjust" class="docs" style="margin-top: -.25em;">4. Baseline adjustment</h4> - -<p> -For aesthetic reasons and to clarify document structure, mom raises -subsubheads slightly above the -<a href="definitions.html#baseline">baseline</a> -on which they would otherwise fall. In -<a href="docprocessing.html#printstyle">PRINTSTYLE <kbd>TYPESET</kbd></a>, -the amount is 1/8 of the prevailing -<a href="definitions.html#leading">leading</a>. In -<a href="docprocessing.html#printstyle">PRINTSTYLE <kbd>TYPEWRITE</kbd></a>, -it’s 1/5 of the prevailing leading. -</p> - -<p> -If you would prefer mom not exhibit this behaviour, or if you would -like to change the amount by which she raises the subsubhead, use the -macro <kbd>.SUBSUBHEAD_BASELINE_ADJUST</kbd>. With an argument of 0 (zero), -subsubhead baseline adjustment will be disabled. Any other numeric -argument, with a -<a href="definitions.html#unitofmeasure">unit of measure</a> -appended directly onto the argument, will cause mom to raise your -subsubheads by the amount you specify. -</p> - -<h4 id="subsubhead-inlines" class="docs" style="margin-top: -.25em;">5. Vertical inline escapes inside sububheads</h4> - -<p> -See -<a href="#head-inlines">Vertical inline escapes inside heads</a>. -The information there applies equally to subsubheads. -</p> - -<div class="rule-short"><hr/></div> - -<!-- ==================================================================== --> - <h2 id="parahead-intro" class="macro-group">Paragraph heads</h2> <ul style="margin-left: -.5em;"> @@ -1731,8 +1521,8 @@ parahead control macros. <div class="box-tip"> <p class="tip"> <span class="tip">Tip:</span> -If you really need a heading level below subsubheads that -isn’t joined to the body of a paragraph, you can trick +If you really need a heading level below subhead (a sub-subhead) +that isn’t joined to the body of a paragraph, you can trick PARAHEAD into giving you one by creating a paragraph that contains only a parahead, like this: <br/> @@ -1795,9 +1585,9 @@ See <a href="#control-macro-args">Arguments to the control macros</a>. </p> <span class="pre defaults"> -.PARAHEAD_FAMILY default = prevailing document family -.PARAHEAD_FONT default = bold italic (TYPESET); italic, ie underlined (TYPEWRITE) -.PARAHEAD_SIZE default = -.25 (TYPESET); 0 (TYPEWRITE) +.PARAHEAD_FAMILY default = prevailing document family; default is Times Roman +.PARAHEAD_FONT default = bold italic +.PARAHEAD_SIZE default = +.5 (point) .PARAHEAD_COLOR default = black* *If you colourize paragraph text, paraheads will appear in the same @@ -1825,6 +1615,9 @@ do: <span class="pre-in-pp"> .PARAHEAD_INDENT 2.5P </span> +</p> + +<p> Mom’s default indent for paragraph heads is 1/2 the first-line indent of normal paragraphs (both printstyles). However, as stated above, if you choose to change the indent, you must give an absolute @@ -1836,18 +1629,6 @@ PP_INDENT.) <div class="box-tip"> <p class="tip"> -<span class="tip">Tip:</span> -If you want to make the parahead indent equal to the paragraph -indent, a convenient way to do it is -<br/> -<span class="pre-in-pp"> - .PARAHEAD INDENT \n[#PP_INDENT] -</span> -</p> -</div> - -<div class="box-tip"> -<p class="tip"> <span class="note">Note:</span> Paragraph heads in “first paragraphs”, as defined in <a href="#para-indent-first">Indenting initial paragraphs</a>, @@ -1953,11 +1734,10 @@ Macro: <b>PREFIX_CHAPTER_NUMBER</b> <kbd class="macro-args"><none> | <c </div> <p> -If you’ve requested numbering of heads, subheads, subsubheads -and/or paragraph heads (with +If you’ve requested numbering of heads, subheads and/or paragraph +heads (with <a href="#number-heads">NUMBER_HEADS</a>, -<a href="#number-subheads">NUMBER_SUBHEADS,</a> -<a href="#number-subheads">NUMBER_SUBSUBHEADS</a> +<a href="#number-subheads">NUMBER_SUBHEADS</a> and/or <a href="#number-paraheads">NUMBER_PARAHEADS</a>) and you’d like mom, in addition, to prefix @@ -5556,11 +5336,10 @@ See <a href="#control-macro-args">Arguments to the control macros</a>. </p> <span class="pre defaults"> -.ENDNOTE_STRING_FAMILY default = prevailing document family +.ENDNOTE_STRING_FAMILY default = prevailing document family; default is Times Roman .ENDNOTE_STRING_FONT default = bold .ENDNOTE_STRING_SIZE* default = +1 .ENDNOTE_STRING_QUAD default = centred -.ENDNOTE_STRING_COLOR default = black *Relative to the size of the endnotes text (set with ENDNOTE_PT_SIZE) </span> diff --git a/contrib/mom/momdoc/docprocessing.html b/contrib/mom/momdoc/docprocessing.html index a2a45e91..5896d1cc 100644 --- a/contrib/mom/momdoc/docprocessing.html +++ b/contrib/mom/momdoc/docprocessing.html @@ -2,7 +2,7 @@ <!-- This file is part of groff, the GNU roff type-setting system. -Copyright (C) 2004, 2005, 2006, 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright (C) 2004, 2005, 2010, 2009, 2010 Free Software Foundation, Inc. Written by Peter Schaffter. Permission is granted to copy, distribute and/or modify this document diff --git a/contrib/mom/momdoc/goodies.html b/contrib/mom/momdoc/goodies.html index cfcdb9ad..69d402c3 100644 --- a/contrib/mom/momdoc/goodies.html +++ b/contrib/mom/momdoc/goodies.html @@ -2,7 +2,7 @@ <!-- This file is part of groff, the GNU roff type-setting system. -Copyright (C) 2004, 2005, 2006, 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright (C) 2004, 2005, 2006, 2009, 2010 Free Software Foundation, Inc. Written by Peter Schaffter. Permission is granted to copy, distribute and/or modify this document diff --git a/contrib/mom/momdoc/graphical.html b/contrib/mom/momdoc/graphical.html index ce98f365..f6c063de 100644 --- a/contrib/mom/momdoc/graphical.html +++ b/contrib/mom/momdoc/graphical.html @@ -2,7 +2,7 @@ <!-- This file is part of groff, the GNU roff type-setting system. -Copyright (C) 2004, 2005, 2006, 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright (C) 2004, 2005, 2006, 2009, 2010 Free Software Foundation, Inc. Written by Peter Schaffter. Permission is granted to copy, distribute and/or modify this document diff --git a/contrib/mom/momdoc/headfootpage.html b/contrib/mom/momdoc/headfootpage.html index f974b283..d411874a 100644 --- a/contrib/mom/momdoc/headfootpage.html +++ b/contrib/mom/momdoc/headfootpage.html @@ -2,7 +2,7 @@ <!-- This file is part of groff, the GNU roff type-setting system. -Copyright (C) 2004, 2005, 2006, 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright (C) 2004, 2005, 2006, 2009, 2010 Free Software Foundation, Inc. Written by Peter Schaffter. Permission is granted to copy, distribute and/or modify this document diff --git a/contrib/mom/momdoc/images.html b/contrib/mom/momdoc/images.html index 67e8ace5..e3af015f 100644 --- a/contrib/mom/momdoc/images.html +++ b/contrib/mom/momdoc/images.html @@ -2,7 +2,7 @@ <!-- This file is part of groff, the GNU roff type-setting system. -Copyright (C) 2004, 2005, 2006, 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright (C) 2004, 2005, 2006, 2009, 2010 Free Software Foundation, Inc. Written by Peter Schaffter. Permission is granted to copy, distribute and/or modify this document diff --git a/contrib/mom/momdoc/inlines.html b/contrib/mom/momdoc/inlines.html index bbb9d6eb..1349abcb 100644 --- a/contrib/mom/momdoc/inlines.html +++ b/contrib/mom/momdoc/inlines.html @@ -2,7 +2,7 @@ <!-- This file is part of groff, the GNU roff type-setting system. -Copyright (C) 2004, 2005, 2006, 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright (C) 2004, 2005, 2006, 2009, 2010 Free Software Foundation, Inc. Written by Peter Schaffter. Permission is granted to copy, distribute and/or modify this document diff --git a/contrib/mom/momdoc/intro.html b/contrib/mom/momdoc/intro.html index be911683..34dd571c 100644 --- a/contrib/mom/momdoc/intro.html +++ b/contrib/mom/momdoc/intro.html @@ -2,7 +2,7 @@ <!-- This file is part of groff, the GNU roff type-setting system. -Copyright (C) 2004, 2005, 2006, 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright (C) 2004, 2005, 2006, 2009, 2010 Free Software Foundation, Inc. Written by Peter Schaffter. Permission is granted to copy, distribute and/or modify this document diff --git a/contrib/mom/momdoc/letters.html b/contrib/mom/momdoc/letters.html index 4cfb2193..95a2e709 100644 --- a/contrib/mom/momdoc/letters.html +++ b/contrib/mom/momdoc/letters.html @@ -2,7 +2,7 @@ <!-- This file is part of groff, the GNU roff type-setting system. -Copyright (C) 2004, 2005, 2006, 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright (C) 2004, 2005, 2006, 2009, 2010 Free Software Foundation, Inc. Written by Peter Schaffter. Permission is granted to copy, distribute and/or modify this document diff --git a/contrib/mom/momdoc/macrolist.html b/contrib/mom/momdoc/macrolist.html index 6a1d4991..c320d158 100644 --- a/contrib/mom/momdoc/macrolist.html +++ b/contrib/mom/momdoc/macrolist.html @@ -2,7 +2,7 @@ <!-- This file is part of groff, the GNU roff type-setting system. -Copyright (C) 2004, 2005, 2006, 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright (C) 2004, 2005, 2006, 2009, 2010 Free Software Foundation, Inc. Written by Peter Schaffter. Permission is granted to copy, distribute and/or modify this document @@ -85,27 +85,27 @@ elsewhere in the documentation. <li><a href="#qr-25">Epigraphs</a></li> <li><a href="#qr-26">Main heads</a></li> <li><a href="#qr-27">Subheads</a></li> - <li><a href="#qr-28">Subsubheads</a></li> - <li><a href="#qr-29">Paragraph heads</a></li> - <li><a href="#qr-30">Paragraphs</a></li> - <li><a href="#qr-31">Quotes (line for line quotes)</a> </li> - <li><a href="#qr-32">Blockquotes (cited passages of text)</a></li> - <li><a href="#qr-33">Code snippets (inserting bits of programming code)</a></li> - <li><a href="#qr-34">Author linebreaks (section breaks)</a></li> - <li><a href="#qr-35">Document termination string</a></li> - <li><a href="#qr-36">Footnotes</a></li> - <li><a href="#qr-37">Endnotes</a></li> - <li><a href="#qr-38">Margin notes</a></li> - <li><a href="#qr-39">Bibliographic references</a></li> - <li><a href="#qr-40">Tables of contents</a></li> - <li><a href="#qr-41">Letter (correspondence) macros</a></li> - <li><a href="#qr-42">Changing global print style parameters after<br/><span style="margin-left: 1.25em;">START</span></a></li> - <li><a href="#qr-43">Managing a document’s first-page header<br/><span style="margin-left: 1.25em;">(the “docheader”)</span></a></li> - <li><a href="#qr-44">Managing page headers and footers</a></li> - <li><a href="#qr-45">Recto/verso page headers and footers</a></li> - <li><a href="#qr-46">Pagination</a></li> - <li><a href="#qr-47">Document and section cover (title) pages</a></li> - <li><a href="#qr-48">Utilities</a></li> + <li><a href="#qr-28">Paragraph heads</a></li> + <li><a href="#qr-19">Reference macros</a></li> + <li><a href="#qr-29">Paragraphs</a></li> + <li><a href="#qr-30">Quotes (line for line quotes)</a> </li> + <li><a href="#qr-31">Blockquotes (cited passages of text)</a></li> + <li><a href="#qr-32">Code snippets (inserting bits of programming code)</a></li> + <li><a href="#qr-33">Author linebreaks (section breaks)</a></li> + <li><a href="#qr-34">Document termination string</a></li> + <li><a href="#qr-35">Footnotes</a></li> + <li><a href="#qr-36">Endnotes</a></li> + <li><a href="#qr-37">Margin notes</a></li> + <li><a href="#qr-38">Bibliographic references</a></li> + <li><a href="#qr-39">Tables of contents</a></li> + <li><a href="#qr-40">Letter (correspondence) macros</a></li> + <li><a href="#qr-41">Changing global print style parameters after<br/><span style="margin-left: 1.25em;">START</span></a></li> + <li><a href="#qr-42">Managing a document’s first-page header<br/><span style="margin-left: 1.25em;">(the “docheader”)</span></a></li> + <li><a href="#qr-43">Managing page headers and footers</a></li> + <li><a href="#qr-44">Recto/verso page headers and footers</a></li> + <li><a href="#qr-45">Pagination</a></li> + <li><a href="#qr-46">Document and section cover (title) pages</a></li> + <li><a href="#qr-47">Utilities</a></li> </ul> </div> @@ -761,28 +761,7 @@ elsewhere in the documentation. <table class="quick-ref"> <tr> -<th id="qr-28" class="quick-ref" colspan="2" >+++ Subsubheads</th> -</tr> -<tr> -<td><a href="docelement.html#subsubhead">SUBSUBHEAD</a></td><td>-- set a subsubhead</td> -</tr> -<tr> -<td><a href="docelement.html#subsubhead-general">Control macros</a></td><td>-- change default style of subsubheads</td> -</tr> -<tr> -<td><a href="docelement.html#number-subsubheads"> NUMBER_SUBSUBHEADS</a></td><td>-- number subsubheads</td> -</tr> -<tr> -<td><a href="docelement.html#prefix-chapter-number"> PREFIX_CHAPTER_NUMBER</a></td><td>-- prefix chapter number to subsubhead numbers</td> -</tr> -<tr> -<td><a href="docelement.html#reset-subsubhead-number"> RESET_SUBSUBHEAD_NUMBER</a></td><td>-- reset subsubhead number to "1"</td> -</tr> -</table> - -<table class="quick-ref"> -<tr> -<th id="qr-29" class="quick-ref" colspan="2" >+++ Paragraph heads</th> +<th id="qr-28" class="quick-ref" colspan="2" >+++ Paragraph heads</th> </tr> <tr> <td><a href="docelement.html#parahead">PARAHEAD</a></td><td>-- set a paragraph head</td> @@ -803,7 +782,7 @@ elsewhere in the documentation. <table class="quick-ref"> <tr> -<th id="qr-30" class="quick-ref" colspan="2" >+++ Paragraphs</th> +<th id="qr-29" class="quick-ref" colspan="2" >+++ Paragraphs</th> </tr> <tr> <td><a href="docelement.html#pp">PP</a></td><td>-- set a paragraph</td> @@ -827,7 +806,7 @@ elsewhere in the documentation. <table class="quick-ref"> <tr> -<th id="qr-31" class="quick-ref" colspan="2" >+++ Quotes (line for line verbatim quotes)</th> +<th id="qr-30" class="quick-ref" colspan="2" >+++ Quotes (line for line verbatim quotes)</th> </tr> <tr> <td><a href="docelement.html#quote">QUOTE</a></td><td>-- set quoted text line for line </td> @@ -845,7 +824,7 @@ elsewhere in the documentation. <table class="quick-ref"> <tr> -<th id="qr-32" class="quick-ref" colspan="2" >+++ Blockquotes (cited passages of text)</th> +<th id="qr-31" class="quick-ref" colspan="2" >+++ Blockquotes (cited passages of text)</th> </tr> <tr> <td><a href="docelement.html#blockquote">BLOCKQUOTE</a></td><td>-- set longer passages of cited text</td> @@ -863,7 +842,7 @@ elsewhere in the documentation. <table class="quick-ref"> <tr> -<th id="qr-33" class="quick-ref" colspan="2" >+++ Code snippets</th> +<th id="qr-32" class="quick-ref" colspan="2" >+++ Code snippets</th> </tr> <tr> <td><a href="docelement.html#code">CODE</a></td><td>-- set a code snippet</td> @@ -881,7 +860,7 @@ elsewhere in the documentation. <table class="quick-ref"> <tr> -<th id="qr-34" class="quick-ref" colspan="2" >+++ Author linebreaks (section breaks)</th> +<th id="qr-33" class="quick-ref" colspan="2" >+++ Author linebreaks (section breaks)</th> </tr> <tr> <td><a href="docelement.html#linebreak">LINEBREAK</a></td><td>-- insert an author linebreak (section break)</td> @@ -899,7 +878,7 @@ elsewhere in the documentation. <table class="quick-ref"> <tr> -<th id="qr-35" class="quick-ref" colspan="2" >+++ Document termination string</th> +<th id="qr-34" class="quick-ref" colspan="2" >+++ Document termination string</th> </tr> <tr> <td><a href="docelement.html#finis">FINIS</a></td><td>-- insert a document termination string (e.g. --END--)</td> @@ -917,7 +896,7 @@ elsewhere in the documentation. <table class="quick-ref"> <tr> -<th id="qr-36" class="quick-ref" colspan="2" >+++ Footnotes</th> +<th id="qr-35" class="quick-ref" colspan="2" >+++ Footnotes</th> </tr> <tr> <td><a href="docelement.html#footnote">FOOTNOTE</a></td><td>-- set a footnote</td> @@ -953,7 +932,7 @@ elsewhere in the documentation. <table class="quick-ref"> <tr> -<th id="qr-37" class="quick-ref" colspan="2" >+++ Endnotes</th> +<th id="qr-36" class="quick-ref" colspan="2" >+++ Endnotes</th> </tr> <tr> <td><a href="docelement.html#endnote">ENDNOTE</a></td><td>-- set an endnote</td> @@ -994,7 +973,7 @@ elsewhere in the documentation. <table class="quick-ref"> <tr> -<th id="qr-38" class="quick-ref" colspan="2" >+++ Margin notes</th> +<th id="qr-37" class="quick-ref" colspan="2" >+++ Margin notes</th> </tr> <tr> <td><a href="docelement.html#mn-init">MN_INIT</a></td><td>-- initialize margin notes</td> @@ -1006,7 +985,7 @@ elsewhere in the documentation. <table class="quick-ref"> <tr> -<th id="qr-39" class="quick-ref" colspan="2" >+++ Bibliographic references</th> +<th id="qr-38" class="quick-ref" colspan="2" >+++ Bibliographic references</th> </tr> <tr> <td><a href="refer.html#ref">REF</a></td><td>-- begin a reference</td> @@ -1051,7 +1030,7 @@ elsewhere in the documentation. <table class="quick-ref"> <tr> -<th id="qr-40" class="quick-ref" colspan="2" >+++ Tables of contents</th> +<th id="qr-39" class="quick-ref" colspan="2" >+++ Tables of contents</th> </tr> <tr> <td><a href="docelement.html#toc">TOC</a></td><td>-- output a table of contents</td> @@ -1081,7 +1060,7 @@ elsewhere in the documentation. <table class="quick-ref"> <tr> -<th id="qr-41" class="quick-ref" colspan="2" >+++ Letter (correspondence) macros</th> +<th id="qr-40" class="quick-ref" colspan="2" >+++ Letter (correspondence) macros</th> </tr> <tr> <td><a href="letters.html#date">DATE</a></td><td>-- letter’s date</td> @@ -1111,7 +1090,7 @@ elsewhere in the documentation. <table class="quick-ref"> <tr> -<th id="qr-42" class="quick-ref" colspan="2" >+++ Changing global print style parameters after START</th> +<th id="qr-41" class="quick-ref" colspan="2" >+++ Changing global print style parameters after START</th> </tr> <tr> <td><a href="docprocessing.html#doc-left-margin">DOC_LEFT_MARGIN</a></td><td>-- left margin of everything on the page</td> @@ -1138,7 +1117,7 @@ elsewhere in the documentation. <table class="quick-ref"> <tr> -<th id="qr-43" class="quick-ref" colspan="2" >+++ Managing a document’s first-page header</th> +<th id="qr-42" class="quick-ref" colspan="2" >+++ Managing a document’s first-page header</th> </tr> <tr> <td><a href="docprocessing.html#docheader">DOCHEADER</a></td><td>-- document first-page header on or off</td> @@ -1150,7 +1129,7 @@ elsewhere in the documentation. <table class="quick-ref"> <tr> -<th id="qr-44" class="quick-ref" colspan="2" >+++ Managing page headers and footers</th> +<th id="qr-43" class="quick-ref" colspan="2" >+++ Managing page headers and footers</th> </tr> <tr> <td><a href="headfootpage.html#headers">HEADERS</a></td><td>-- page headers on or off</td> @@ -1189,7 +1168,7 @@ elsewhere in the documentation. <table class="quick-ref"> <tr> -<th id="qr-45" class="quick-ref" colspan="2" >+++ Recto/verso page headers and footers</th> +<th id="qr-44" class="quick-ref" colspan="2" >+++ Recto/verso page headers and footers</th> </tr> <tr> <td><a href="rectoverso.html#recto-verso">RECTO_VERSO</a></td><td>-- recto/verso headers and/or footers on or off</td> @@ -1216,7 +1195,7 @@ elsewhere in the documentation. <table class="quick-ref"> <tr> -<th id="qr-46" class="quick-ref" colspan="2" >+++ Pagination</th> +<th id="qr-45" class="quick-ref" colspan="2" >+++ Pagination</th> </tr> <tr> <td><a href="headfootpage.html#paginate">PAGINATE</a></td><td>-- pagination on or off</td> @@ -1241,7 +1220,7 @@ elsewhere in the documentation. <table class="quick-ref"> <tr> -<th id="qr-47" class="quick-ref" colspan="2" >+++ Document and section cover (title) pages</th> +<th id="qr-46" class="quick-ref" colspan="2" >+++ Document and section cover (title) pages</th> </tr> <tr> <td><a href="cover.html#cover">COVER</a></td><td>-- information to include in a section cover</td> @@ -1262,7 +1241,7 @@ elsewhere in the documentation. <table class="quick-ref"> <tr> -<th id="qr-48" class="quick-ref" colspan="2" >+++ Utilities</th> +<th id="qr-47" class="quick-ref" colspan="2" >+++ Utilities</th> </tr> <tr> <td><a href="docprocessing.html#add-space">ADD_SPACE</a></td><td>-- add space to the top of a page</td> diff --git a/contrib/mom/momdoc/rectoverso.html b/contrib/mom/momdoc/rectoverso.html index 97a67e77..1fbd1460 100644 --- a/contrib/mom/momdoc/rectoverso.html +++ b/contrib/mom/momdoc/rectoverso.html @@ -2,7 +2,7 @@ <!-- This file is part of groff, the GNU roff type-setting system. -Copyright (C) 2004, 2005, 2006, 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright (C) 2004, 2005, 2006, 2009, 2010 Free Software Foundation, Inc. Written by Peter Schaffter. Permission is granted to copy, distribute and/or modify this document diff --git a/contrib/mom/momdoc/refer.html b/contrib/mom/momdoc/refer.html index 2998b81a..e356f4fc 100644 --- a/contrib/mom/momdoc/refer.html +++ b/contrib/mom/momdoc/refer.html @@ -2,7 +2,7 @@ <!-- This file is part of groff, the GNU roff type-setting system. -Copyright (C) 2004, 2005, 2006, 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright (C) 2004, 2005, 2006, 2009, 2010 Free Software Foundation, Inc. Written by Peter Schaffter. Permission is granted to copy, distribute and/or modify this document diff --git a/contrib/mom/momdoc/reserved.html b/contrib/mom/momdoc/reserved.html index 474f7c37..a2b08b45 100644 --- a/contrib/mom/momdoc/reserved.html +++ b/contrib/mom/momdoc/reserved.html @@ -2,7 +2,7 @@ <!-- This file is part of groff, the GNU roff type-setting system. - Copyright (C) 2004, 2005, 2006, 2009, 2010, 2011 Free Software Foundation, Inc. + Copyright (C) 2004, 2005, 2006, 2009, 2010 Free Software Foundation, Inc. Written by Peter Schaffter. Permission is granted to copy, distribute and/or modify this document @@ -644,7 +644,6 @@ mom uses, along with brief descriptions of their functions. START Sets doc defaults and prints info collected with doc info macros SUBHEAD Subheads - SUBSUBHEAD Subsubheads <span style="display: block; margin-top: -.75em; margin-bottom: -1em;">*Headers/footers</span> BREAK_QUOTE Manually break a footnoted quote that crosses @@ -812,8 +811,6 @@ mom uses, along with brief descriptions of their functions. HDRFTR_VERSO User-defined, single string verso header/footer HEADERS Turns headers on or off - HEADER_GAP Space between header and running text - HEADER_MARGIN Space from top of page to header HEADERS_AND_FOOTERS Enables and permits the creation of headers and footers that appear on the same page @@ -834,6 +831,8 @@ mom uses, along with brief descriptions of their functions. endnotes -Heads- + HEADER_GAP Space between header and running text + HEADER_MARGIN Space from top of page to header HEAD_CAPS Print section titles in caps? (boolean) HEAD_SPACE Give HEADs 2 line-spaces before. If OFF, only 1. Default is on. @@ -844,12 +843,6 @@ mom uses, along with brief descriptions of their functions. -Subheads- NUMBER_SUBHEADS Print subhead numbers RESET_SUBHEAD_NUMBER Reset subhead number - SUBHEAD_BASELINE_ADJUST Amount to raise subhead above baseline - --Subsubheads- - NUMBER_SUBSUBHEADS Print subhead numbers - RESET_SUBSUBHEAD_NUMBER Reset subhead number - SUBSUBHEAD_BASELINE_ADJUST Amount to raise subhead above baseline -Para heads- NUMBER_PARAHEADS Print parahead numbers @@ -1516,27 +1509,27 @@ mom uses, along with brief descriptions of their functions. line numbering is enabled #LINES_PER_PAGE # of lines (at DOC_LEAD) that fit on page after #B_MARGIN is set - #LN Test 1st arg to NUMBER_LINES for digit or string - MN-active Are we doing a margin note? (boolean) - MN-curr Current margin note - MN-div-<n>-depth Depth of margin note <n> - MN-hy Hyphenation flag of margin notes + #LN Are line numbers on? (boolean) + MN-active Are we doing a margin note? (boolean) + MN-curr Current margin note + MN-div-<n>-depth Depth of margin note <n> + MN-hy Hyphenation flag of margin notes #MNinit Have margin notes been initialized? (boolean) #MNinit_DEFERRED Did we have to defer a margin note? (boolean) - MN-last-pos Baseline of previous margin note - MN-lead-adj Difference between the current DOC_LEAD and the - leading used in margin notes - MN-left Number of current left margin note - MN-left-start Horizontal start position of left margin note - MN-left-width Width of left margin note - MN-right Number of current right margin note - MN-right-start Horizontal start position of right margin note - MN-right-width Width of right margin note - MN-sep Gutter between margin notes and running text - MN-shifted Did we have to shift a margin note down? - (boolean) - MN-size Point size of margin notes - MN-spacing Leading of margin notes + MN-last-pos Baseline of previous margin note + MN-lead-adj Difference between the current DOC_LEAD and the + leading used in margin notes + MN-left Number of current left margin note + MN-left-start Horizontal start position of left margin note + MN-left-width Width of left margin note + MN-right Number of current right margin note + MN-right-start Horizontal start position of right margin note + MN-right-width Width of right margin note + MN-sep Gutter between margin notes and running text + MN-shifted Did we have to shift a margin note down? + (boolean) + MN-size Point size of margin notes + MN-spacing Leading of margin notes #MISC_<n> Used to print "next" misc lines in DO_COVER #MISC_COVER_NUM Number of cover misc items #MISC_DOCCOVER_NUM Number od doc cover misc items @@ -1583,10 +1576,9 @@ mom uses, along with brief descriptions of their functions. #NUMBER_HEAD Are heads numbered? (boolean) #NUMBER_PH Are paraheads numbered? (boolean) #NUMBER_SH Are subheads numbered? (boolean) - #NUMBER_SSH Are subsubheads numbered? (boolean) #NUM_COLS Number of columns per page #NUMBERED If set to 1, lets PARAHEAD know that - main-, sub-, and subsubhead numbers have already been + main- and subhead numbers have already been prefixed to the parahead string #NUM_FIELDS Incrementing register used to match #TOTAL_FIELDS @@ -1771,8 +1763,8 @@ mom uses, along with brief descriptions of their functions. #SAVED_WEIGHT_ADJ SAVED_UNDERSCORE_WEIGHT/2 #SEP_TYPE Set to 1 if LIST separator is ( or [ or { #SH_COLOR Colorize subheads? (boolean) - #SH_BASELINE_ADJ #DOC_LEAD/8 (TYPESET) or /5 (TYPEWRITE) - (used for subhead vertical spacing) + #SH_LEAD_ADJUST #DOC_LEAD/8 (TYPESET) or /2 (TYPEWRITE) + (used for subhead spacing) #SH_NUM Subhead number #SHIM Amount of lead required to advance to next valid baseline @@ -1794,8 +1786,6 @@ mom uses, along with brief descriptions of their functions. sometimes reports a fractionally larger space than is actually available for footnote text. - #SSH_BASELINE_ADJ #DOC_LEAD/8 (TYPESET) or /5 (TYPEWRITE) - (used for subsubhead vertical spacing) #START If 1, signals completion of START #START_FOR_FOOTERS Toggle set in START; signals to PRINT_HDRFTR that START has been invoked, @@ -1803,9 +1793,6 @@ mom uses, along with brief descriptions of their functions. not to print a footer on page 1 #START_FOR_MNinit If 1, defer processing MN_INIT until #START #STORED_PP_INDENT Temporarily holds value of #PP_INDENT - #SUBHEAD Was subhead the last macro invoked? (boolean) - Controls vert. space between SUBHEAD and - SUBSUBHEAD #SUBTITLE_COLOR Colorize subtitle? (boolean) #SUBTITLE_COVER_NUM Incrementing register used to define strings $SUBTITLE_COVER_<n> diff --git a/contrib/mom/momdoc/tables-of-contents.html b/contrib/mom/momdoc/tables-of-contents.html index 66b487eb..82c744b9 100644 --- a/contrib/mom/momdoc/tables-of-contents.html +++ b/contrib/mom/momdoc/tables-of-contents.html @@ -2,7 +2,7 @@ <!-- This file is part of groff, the GNU roff type-setting system. -Copyright (C) 2004, 2005, 2006, 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright (C) 2004, 2005, 2006, 2009, 2010 Free Software Foundation, Inc. Written by Peter Schaffter. Permission is granted to copy, distribute and/or modify this document @@ -552,15 +552,12 @@ entries, along with their defaults. <div id="toc-indent-note" class="box-tip"> <p class="tip"> <span class="note">Note:</span> -The table of contents _INDENT macros set an absolute indent, -relative to nothing, and therefore require an appended +The table of contents _INDENT +macros set an absolute indent, relative to nothing, and therefore +require an appended <a href="definitions.html#unitofmeasure">unit of measure</a>. -Furthermore, the size of the indent can only be changed when your -<a href="docprocessing.html#printstyle">PRINTSTYLE</a> -is <kbd>TYPESET</kbd>; the indent is fixed for <kbd>TYPEWRITE</kbd>. </p> </div> - <div id="index-toc-entry-control-macros" class="defaults-container" style="padding-bottom: 8px;"> <p class="defaults" style="padding-top: 6px;"> See @@ -570,37 +567,31 @@ See <span class="pre defaults"> <span id="toc-title"> .TOC_TITLE_FAMILY default = prevailing doc family -.TOC_TITLE_FONT default = bold italic (TYPESET); roman (TYPEWRITE) -.TOC_TITLE_SIZE default = +1.5 -.TOC_TITLE_INDENT default = 0 +.TOC_TITLE_FONT default = bold italic +.TOC_TITLE_SIZE default = +0 +.TOC_TITLE_INDENT default = 0 for TYPESET and TYPEWRITE </span> <span id="toc-head"> .TOC_HEAD_FAMILY default = prevailing doc family -.TOC_HEAD_FONT default = bold (TYPESET); roman (TYPEWRITE) +.TOC_HEAD_FONT default = bold .TOC_HEAD_SIZE default = +.5 -.TOC_HEAD_INDENT default = 2 <a href="definitions.html#figurespace">figure spaces</a> + a period +.TOC_HEAD_INDENT default = 18p for TYPESET; 2m for TYPEWRITE </span> <span id="toc-subhead"> .TOC_SUBHEAD_FAMILY default = prevailing doc family .TOC_SUBHEAD_FONT default = roman -.TOC_SUBHEAD_SIZE default = 0 -.TOC_SUBHEAD_INDENT default = TOC_HEAD_INDENT + 2 <a href="definitions.html#figurespace">figure spaces</a> + a period -</span> -<span id="toc-subsubhead"> -.TOC_SUBSUBHEAD_FAMILY default = prevailing doc family -.TOC_SUBSUBHEAD_FONT default = italic (TYPESET); roman (TYPEWRITE) -.TOC_SUBSUBHEAD_SIZE default = 0 -.TOC_SUBSUBHEAD_INDENT default = TOC_SUBHEAD_INDENT + 2 <a href="definitions.html#figurespace">figure spaces</a> + a period +.TOC_SUBHEAD_SIZE default = +0 +.TOC_SUBHEAD_INDENT default = 30p for TYPESET; 4m for TYPEWRITE </span> <span id="toc-parahead"> .TOC_PARAHEAD_FAMILY default = prevailing doc family -.TOC_PARAHEAD_FONT default = bold italic (TYPESET); roman (TYPEWRITE) -.TOC_PARAHEAD_SIZE default = 0 -.TOC_PARAHEAD_INDENT default = TOC_SUBSUBHEAD_INDENT + 2 <a href="definitions.html#figurespace">figure spaces</a> + a period +.TOC_PARAHEAD_FONT default = italic +.TOC_PARAHEAD_SIZE default = +0 +.TOC_PARAHEAD_INDENT default = 42p for TYPESET; 6m for TYPEWRITE </span> .TOC_PN_FAMILY default = prevailing doc family .TOC_PN_FONT default = roman -.TOC_PN_SIZE default = 0 +.TOC_PN_SIZE default = +0 </span> </div> diff --git a/contrib/mom/momdoc/toc.html b/contrib/mom/momdoc/toc.html index 01da91a9..1cc1573e 100644 --- a/contrib/mom/momdoc/toc.html +++ b/contrib/mom/momdoc/toc.html @@ -2,7 +2,7 @@ <!-- This file is part of groff, the GNU roff type-setting system. -Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. Written by Peter Schaffter (pschaffter@ncf.ca). Permission is granted to copy, distribute and/or modify this document @@ -19,7 +19,7 @@ FDL in the main directory of the groff source package. <head> <meta http-equiv="content-type" content="text/html;charset=utf-8"/> - <title>Mom, version 1.6-a -- Table of Contents</title> + <title>Mom, version 1.6 -- Table of Contents</title> <link rel="stylesheet" type="text/css" href="stylesheet.css" /> </head> @@ -30,7 +30,7 @@ FDL in the main directory of the groff source package. <div class="page"> <div class="version"> - mom, version 1.6-a + mom, version 1.6 </div> <h1 class="toc" style="margin-top: 9px;">Table of Contents</h1> @@ -308,18 +308,17 @@ FDL in the main directory of the groff source package. <li><a href="docelement.html#pp-intro">5.4.3 Paragraphs</a></li> <li><a href="docelement.html#head-intro">5.4.4 Main heads</a></li> <li><a href="docelement.html#subhead-intro">5.4.5 Subheads</a></li> - <li><a href="docelement.html#subsubhead-intro">5.4.6 Subsubheads</a></li> - <li><a href="docelement.html#parahead-intro">5.4.7 Paragraph heads</a></li> - <li><a href="docelement.html#linebreak-intro">5.4.8 Linebreaks</a> – author linebreaks (section breaks)</li> - <li><a href="docelement.html#quote-intro">5.4.9 Quotes</a> – line for line poetic quotes or unformatted, verbatim text (e.g. blocks of code)</li> - <li><a href="docelement.html#blockquote-intro">5.4.10 Blockquotes</a> – cited material</li> - <li><a href="docelement.html#code">5.4.11 Code</a> – inserting code snippets</li> - <li><a href="docelement.html#list-intro">5.4.12 Lists</a> – nested lists</li> - <li><a href="docelement.html#number-lines-intro">5.4.13 Line numbering</a></li> - <li><a href="docelement.html#footnote-intro">5.4.14 Footnotes</a></li> - <li><a href="docelement.html#endnote-intro">5.4.15 Endnotes</a></li> - <li><a href="docelement.html#margin-notes-intro">5.4.16 Margin notes</a></li> - <li><a href="docelement.html#finis-intro">5.4.17 Document termination string</a> – FINIS</li> + <li><a href="docelement.html#parahead-intro">5.4.6 Paragraph heads</a></li> + <li><a href="docelement.html#linebreak-intro">5.4.7 Linebreaks</a> – author linebreaks (section breaks)</li> + <li><a href="docelement.html#quote-intro">5.4.8 Quotes</a> – line for line poetic quotes or unformatted, verbatim text (e.g. blocks of code)</li> + <li><a href="docelement.html#blockquote-intro">5.4.9 Blockquotes</a> – cited material</li> + <li><a href="docelement.html#code">5.4.10 Code</a> – inserting code snippets</li> + <li><a href="docelement.html#list-intro">5.4.11 Lists</a> – nested lists</li> + <li><a href="docelement.html#number-lines-intro">5.4.12 Line numbering</a></li> + <li><a href="docelement.html#footnote-intro">5.4.13 Footnotes</a></li> + <li><a href="docelement.html#endnote-intro">5.4.14 Endnotes</a></li> + <li><a href="docelement.html#margin-notes-intro">5.4.15 Margin notes</a></li> + <li><a href="docelement.html#finis-intro">5.4.16 Document termination string</a> – FINIS</li> </ul></li> <li><a id="images" class="highlight" href="images.html#top">5.5 INSERTING IMAGES</a></li> <li><a id="hdrftr" class="highlight" href="headfootpage.html#top">5.6 PAGE HEADERS AND FOOTERS</a> @@ -358,7 +357,7 @@ FDL in the main directory of the groff source package. <ul> <li><a href="tables-of-contents.html#toc-behaviour">5.10.1 Table of contents behaviour</a></li> <li><a href="tables-of-contents.html#psselect">5.10.2 Using psselect to put tables of contents where you want them</a></li> - <li><a href="tables-of-contents.html#index-toc-control">5.10.3 Table of contents control macros</a></li> + <li><a href="tables-of-contents.html#toc-control">5.10.3 Table of contents control macros</a></li> </ul></li> <li><a id="ref" class="highlight" href="refer.html#top">5.11 BIBLIOGRAPHIES AND REFERENCES</a></li> <li><a id="letter" class="highlight" href="letters.html#top">5.12 WRITING LETTERS</a> diff --git a/contrib/mom/momdoc/typesetting.html b/contrib/mom/momdoc/typesetting.html index dad7d7ad..272250ac 100644 --- a/contrib/mom/momdoc/typesetting.html +++ b/contrib/mom/momdoc/typesetting.html @@ -2,7 +2,7 @@ <!-- This file is part of groff, the GNU roff type-setting system. -Copyright (C) 2004, 2005, 2006, 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright (C) 2004, 2005, 2006, 2009, 2010 Free Software Foundation, Inc. Written by Peter Schaffter. Permission is granted to copy, distribute and/or modify this document diff --git a/contrib/mom/momdoc/using.html b/contrib/mom/momdoc/using.html index 1c3170ac..2d215df6 100644 --- a/contrib/mom/momdoc/using.html +++ b/contrib/mom/momdoc/using.html @@ -2,7 +2,7 @@ <!-- This file is part of groff, the GNU roff type-setting system. -Copyright (C) 2004, 2005, 2006, 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright (C) 2004, 2005, 2006, 2009, 2010 Free Software Foundation, Inc. Written by Peter Schaffter. Permission is granted to copy, distribute and/or modify this document diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac index 36fcd0d7..0f2ec03d 100644 --- a/contrib/mom/om.tmac +++ b/contrib/mom/om.tmac @@ -2,7 +2,7 @@ .ig Mom -- a typesetting/document-processing macro set for groff. -Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. Written by Peter Schaffter (peter@schaffter.ca) @@ -21,8 +21,8 @@ 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/>. -Version 1.6-a -------------- +Version 1.6 +----------- Antoine de St-Exupéry asserted that elegance in engineering is achieved not when there is nothing left to add, but when there is nothing left to take away. @@ -41,8 +41,6 @@ may find other conventions preferable (e.g. NO, X, END, QUIT, etc.). "<anything>" in the description of arguments that can be passed to a macro means that any argument turns the feature off. - -Thanks to everyone who has contributed suggestions and patches. .. .\" %beginstrip% \# @@ -5109,7 +5107,6 @@ y\\R'#DESCENDER \\n[.cdp]' . if '\\$0'PARAHEAD_FAMILY' .ds $PH_FAM \\$1 . if '\\$0'QUOTE_FAMILY' .ds $QUOTE_FAM \\$1 . if '\\$0'SUBHEAD_FAMILY' .ds $SH_FAM \\$1 -. if '\\$0'SUBSUBHEAD_FAMILY' .ds $SSH_FAM \\$1 . if '\\$0'SUBTITLE_FAMILY' .ds $SUBTITLE_FAM \\$1 . if '\\$0'TITLE_FAMILY' .ds $TITLE_FAM \\$1 . if '\\$0'TOC_FAMILY' .ds $TOC_FAM \\$1 @@ -5119,7 +5116,6 @@ y\\R'#DESCENDER \\n[.cdp]' . if '\\$0'TOC_PARAHEAD_FAMILY' .ds $TOC_PH_FAM \\$1 . if '\\$0'TOC_PN_FAMILY' .ds $TOC_PN_FAM \\$1 . if '\\$0'TOC_SUBHEAD_FAMILY' .ds $TOC_SH_FAM \\$1 -. if '\\$0'TOC_SUBSUBHEAD_FAMILY' .ds $TOC_SSH_FAM \\$1 . if '\\$0'TOC_TITLE_FAMILY' .ds $TOC_TITLE_FAM \\$1 .END \# @@ -5163,7 +5159,6 @@ y\\R'#DESCENDER \\n[.cdp]' . if '\\$0'PARAHEAD_FONT' .ds $PH_FT \\$1 . if '\\$0'QUOTE_FONT' .ds $QUOTE_FT \\$1 . if '\\$0'SUBHEAD_FONT' .ds $SH_FT \\$1 -. if '\\$0'SUBSUBHEAD_FONT' .ds $SSH_FT \\$1 . if '\\$0'SUBTITLE_FONT' .ds $SUBTITLE_FT \\$1 . if '\\$0'TITLE_FONT' .ds $TITLE_FT \\$1 . if '\\$0'TOC_HEADER_FONT' .ds $TOC_HEADER_FT \\$1 @@ -5171,7 +5166,6 @@ y\\R'#DESCENDER \\n[.cdp]' . if '\\$0'TOC_PARAHEAD_FONT' .ds $TOC_PH_FT \\$1 . if '\\$0'TOC_PN_FONT' .ds $TOC_PN_FT \\$1 . if '\\$0'TOC_SUBHEAD_FONT' .ds $TOC_SH_FT \\$1 -. if '\\$0'TOC_SUBSUBHEAD_FONT' .ds $TOC_SSH_FT \\$1 . if '\\$0'TOC_TITLE_FONT' .ds $TOC_TITLE_FT \\$1 .END \# @@ -5214,7 +5208,6 @@ y\\R'#DESCENDER \\n[.cdp]' . if '\\$0'PARAHEAD_SIZE' .ds $PH_SIZE_CHANGE \\$1 . if '\\$0'QUOTE_SIZE' .ds $QUOTE_SIZE_CHANGE \\$1 . if '\\$0'SUBHEAD_SIZE' .ds $SH_SIZE_CHANGE \\$1 -. if '\\$0'SUBSUBHEAD_SIZE' .ds $SSH_SIZE_CHANGE \\$1 . if '\\$0'SUBTITLE_SIZE' .ds $SUBTITLE_SIZE_CHANGE \\$1 . if '\\$0'TITLE_SIZE' .ds $TITLE_SIZE_CHANGE \\$1 . if '\\$0'TOC_HEADER_SIZE' .ds $TOC_HEADER_SIZE_CHANGE \\$1 @@ -5222,7 +5215,6 @@ y\\R'#DESCENDER \\n[.cdp]' . if '\\$0'TOC_PARAHEAD_SIZE' .ds $TOC_PH_SIZE_CHANGE \\$1 . if '\\$0'TOC_PN_SIZE' .ds $TOC_PN_SIZE_CHANGE \\$1 . if '\\$0'TOC_SUBHEAD_SIZE' .ds $TOC_SH_SIZE_CHANGE \\$1 -. if '\\$0'TOC_SUBSUBHEAD_SIZE' .ds $TOC_SSH_SIZE_CHANGE \\$1 . if '\\$0'TOC_TITLE_SIZE' .ds $TOC_TITLE_SIZE_CHANGE \\$1 .END \# @@ -5337,10 +5329,6 @@ y\\R'#DESCENDER \\n[.cdp]' . nr #DOCTYPE_COLOR 1 . ds $DOCTYPE_COLOR \\$1 . \} -. if '\\$0'ENDNOTE_STRING_COLOR' \{\ -. nr #ENDNOTE_STRING_COLOR 1 -. ds $ENDNOTE_STRING_COLOR \\$1 -. \} . if '\\$0'EPIGRAPH_COLOR' \{\ . nr #EPI_COLOR 1 . ds $EPI_COLOR \\$1 @@ -5405,10 +5393,6 @@ y\\R'#DESCENDER \\n[.cdp]' . nr #SH_COLOR 1 . ds $SH_COLOR \\$1 . \} -. if '\\$0'SUBSUBHEAD_COLOR' \{\ -. nr #SSH_COLOR 1 -. ds $SSH_COLOR \\$1 -. \} . if '\\$0'SUBTITLE_COLOR' \{\ . nr #SUBTITLE_COLOR 1 . ds $SUBTITLE_COLOR \\$1 @@ -5450,7 +5434,6 @@ y\\R'#DESCENDER \\n[.cdp]' . if '\\$0'ENDNOTE_TITLE_QUAD' .ds $EN_TITLE_QUAD \\$1 . if '\\$0'EPIGRAPH_QUAD' .ds $EPI_QUAD \\$1 . if '\\$0'FOOTNOTE_QUAD' .ds $FN_QUAD \\$1 -. if '\\$0'SUBSUBHEAD_QUAD' .ds $SSH_QUAD \\$1 . if '\\$0'HEAD_QUAD' .ds $HEAD_QUAD \\$1 . if '\\$0'SUBHEAD_QUAD' .ds $SH_QUAD \\$1 . if '\\$0'TOC_HEADER_QUAD' .ds $TOC_HEADER_QUAD \\$1 @@ -5555,7 +5538,6 @@ y\\R'#DESCENDER \\n[.cdp]' . nr #DONE_ONCE 0 1 . RESET_HEAD_NUMBER . RESET_SUBHEAD_NUMBER -. RESET_SUBSUBHEAD_NUMBER . RESET_PARAHEAD_NUMBER .\" General style defaults for both PRINTSTYLEs . nr #PP_STYLE 1 @@ -5575,7 +5557,6 @@ y\\R'#DESCENDER \\n[.cdp]' . if !r#HEAD_CAPS \{ .HEAD_CAPS \} . if !r#HEAD_UNDERLINE \{ .HEAD_UNDERLINE \} . if !d$SH_QUAD \{ .SUBHEAD_QUAD LEFT \} -. if !d$SSH_QUAD \{ .SUBSUBHEAD_QUAD LEFT \} . if !r#HDRFTR_RIGHT_CAPS \{ .HDRFTR_RIGHT_CAPS \} . if \\n[#HDRFTR_RIGHT_CAPS]=0 \{\ . if !d$HDRFTR_RIGHT_SIZE_CHANGE \{ .HDRFTR_RIGHT_SIZE +0 \} @@ -5688,10 +5669,6 @@ y\\R'#DESCENDER \\n[.cdp]' .\" +Footnotes . if !d$FN_SIZE_CHANGE \{ .FOOTNOTE_SIZE +0 \} . if !r#FN_RULE_LENGTH \{ .FOOTNOTE_RULE_LENGTH 2i \} -.\" +Subheads -. if !r#SH_BASELINE_ADJ \{ .SUBHEAD_BASELINE_ADJUST \\n[#LEAD]u/5 \} -.\" +Subsubheads -. if !r#SSH_BASELINE_ADJ \{ .SUBSUBHEAD_BASELINE_ADJUST \\n[#LEAD]u/5 \} .\" +Paragraph heads . if !r#PH_INDENT \{ .PARAHEAD_INDENT \\n[#PP_INDENT]u/2u \} .\" +Endnotes @@ -5861,32 +5838,26 @@ y\\R'#DESCENDER \\n[.cdp]' . if \\n[#HDRFTR_RIGHT_CAPS] \{\ . if !d$HDRFTR_RIGHT_SIZE_CHANGE \{ .HDRFTR_RIGHT_SIZE -2 \} . \} -. if !d$HDRFTR_RIGHT_SIZE_CHANGE \{ .HDRFTR_RIGHT_SIZE -.5 \} +. if !d$HDRFTR_RIGHT_SIZE_CHANGE \{ .HDRFTR_RIGHT_SIZE -.5 \} .\" +Heads -. if !d$HEAD_FAM \{ .HEAD_FAMILY \\*[$DOC_FAM] \} -. if !d$HEAD_FT \{ .HEAD_FONT B \} -. if !d$HEAD_SIZE_CHANGE \{ .HEAD_SIZE +1 \} -. if !r#HEAD_SPACE \{ .HEAD_SPACE \} +. if !d$HEAD_FAM \{ .HEAD_FAMILY \\*[$DOC_FAM] \} +. if !d$HEAD_FT \{ .HEAD_FONT B \} +. if !d$HEAD_SIZE_CHANGE \{ .HEAD_SIZE +1 \} +. if !r#HEAD_SPACE \{ .HEAD_SPACE \} .\" +Subheads -. if !d$SH_FAM \{ .SUBHEAD_FAMILY \\*[$DOC_FAM] \} -. if !d$SH_FT \{ .SUBHEAD_FONT B \} -. if !d$SH_SIZE_CHANGE \{ .SUBHEAD_SIZE +.5 \} -. if !r#SH_BASELINE_ADJ \{ .SUBHEAD_BASELINE_ADJUST \\n[#LEAD]u/8 \} -.\" +SubSubheads -. if !d$SSH_FAM \{ .SUBSUBHEAD_FAMILY \\*[$DOC_FAM] \} -. if !d$SSH_FT \{ .SUBSUBHEAD_FONT I \} -. if !d$SSH_SIZE_CHANGE \{ .SUBSUBHEAD_SIZE +.5 \} -. if !r#SSH_BASELINE_ADJ \{ .SUBSUBHEAD_BASELINE_ADJUST \\n[#LEAD]u/8 \} +. if !d$SH_FAM \{ .SUBHEAD_FAMILY \\*[$DOC_FAM] \} +. if !d$SH_FT \{ .SUBHEAD_FONT B \} +. if !d$SH_SIZE_CHANGE \{ .SUBHEAD_SIZE +.5 \} .\" +Paragraph heads -. if !d$PH_FAM \{ .PARAHEAD_FAMILY \\*[$DOC_FAM] \} -. if !d$PH_FT \{ .PARAHEAD_FONT BI \} -. if !d$PH_SIZE_CHANGE \{ .PARAHEAD_SIZE -.25 \} -. if !r#PH_INDENT \{ .PARAHEAD_INDENT \\n[#PP_INDENT]u/2u \} -. if !d$PH_SPACE \{ .PARAHEAD_SPACE .6m \} +. if !d$PH_FAM \{ .PARAHEAD_FAMILY \\*[$DOC_FAM] \} +. if !d$PH_FT \{ .PARAHEAD_FONT BI \} +. if !d$PH_SIZE_CHANGE \{ .PARAHEAD_SIZE -.25 \} +. if !r#PH_INDENT \{ .PARAHEAD_INDENT \\n[#PP_INDENT]u/2u \} +. if !d$PH_SPACE \{ .PARAHEAD_SPACE .6m \} .\" +Quotes -. if !d$QUOTE_FAM \{ .QUOTE_FAMILY \\*[$DOC_FAM] \} -. if !d$QUOTE_FT \{ .QUOTE_FONT I \} -. if !d$QUOTE_SIZE_CHANGE \{ .QUOTE_SIZE +0 \} +. if !d$QUOTE_FAM \{ .QUOTE_FAMILY \\*[$DOC_FAM] \} +. if !d$QUOTE_FT \{ .QUOTE_FONT I \} +. if !d$QUOTE_SIZE_CHANGE \{ .QUOTE_SIZE +0 \} . if !r#Q_OFFSET_VALUE \{\ . if '\\*[$Q_OFFSET_VALUE]'' \{ .QUOTE_INDENT 3 \} . \} @@ -5931,41 +5902,35 @@ y\\R'#DESCENDER \\n[.cdp]' . if !d$BIB_STRING_FT \{ .BIBLIOGRAPHY_STRING_FONT B \} . if !d$BIB_STRING_SIZE_CHANGE \{ .BIBLIOGRAPHY_STRING_SIZE +1 \} .\" +Table of contents -. if !d$TOC_FAM \{ .TOC_FAMILY \\*[$DOC_FAM] \} -. if !r#TOC_PS \{ .TOC_PT_SIZE (\\n[#DOC_PT_SIZE]u) \} -. if !d$TOC_LEAD \{ .TOC_LEAD \\n[#DOC_LEAD]u ADJUST \} -. if !d$TOC_HEADER_FAM \{ .TOC_HEADER_FAMILY \\*[$TOC_FAM] \} -. if !d$TOC_HEADER_SIZE_CHANGE \{ .TOC_HEADER_SIZE +4 \} -. if !d$TOC_HEADER_FT \{ .TOC_HEADER_FONT B \} -. if !d$TOC_TITLE_FAM \{ .TOC_TITLE_FAMILY \\*[$TOC_FAM] \} -. if !d$TOC_PN_FAM \{ .TOC_PN_FAMILY \\*[$TOC_FAM] \} -. if !d$TOC_HEAD_FAM \{ .TOC_HEAD_FAMILY \\*[$TOC_FAM] \} -. if !d$TOC_SH_FAM \{ .TOC_SUBHEAD_FAMILY \\*[$TOC_FAM] \} -. if !d$TOC_SSH_FAM \{ .TOC_SUBSUBHEAD_FAMILY \\*[$TOC_FAM] \} -. if !d$TOC_PH_FAM \{ .TOC_PARAHEAD_FAMILY \\*[$TOC_FAM] \} -. if !d$TOC_TITLE_FT \{ .TOC_TITLE_FONT BI \} -. if !d$TOC_PN_FT \{ .TOC_PN_FONT R \} -. if !d$TOC_HEAD_FT \{ .TOC_HEAD_FONT B \} -. if !d$TOC_SH_FT \{ .TOC_SUBHEAD_FONT R \} -. if !d$TOC_SSH_FT \{ .TOC_SUBSUBHEAD_FONT I \} -. if !d$TOC_PH_FT \{ .TOC_PARAHEAD_FONT BI \} -. if !d$TOC_TITLE_SIZE_CHANGE \{ .TOC_TITLE_SIZE +1.5 \} -. if !d$TOC_PN_SIZE_CHANGE \{ .TOC_PN_SIZE +0 \} -. if !d$TOC_HEAD_SIZE_CHANGE \{ .TOC_HEAD_SIZE +.5 \} -. if !d$TOC_SH_SIZE_CHANGE \{ .TOC_SUBHEAD_SIZE +0 \} -. if !d$TOC_SSH_SIZE_CHANGE \{ .TOC_SUBSUBHEAD_SIZE +0 \} -. if !d$TOC_PH_SIZE_CHANGE \{ .TOC_PARAHEAD_SIZE +0 \} +. if !d$TOC_FAM \{ .TOC_FAMILY \\*[$DOC_FAM] \} +. if !r#TOC_PS \{ .TOC_PT_SIZE (\\n[#DOC_PT_SIZE]u) \} +. if !d$TOC_LEAD \{ .TOC_LEAD \\n[#DOC_LEAD]u ADJUST \} +. if !d$TOC_HEADER_FAM \{ .TOC_HEADER_FAMILY \\*[$TOC_FAM] \} +. if !d$TOC_HEADER_SIZE_CHANGE \{ .TOC_HEADER_SIZE +4 \} +. if !d$TOC_HEADER_FT \{ .TOC_HEADER_FONT B \} +. if !d$TOC_TITLE_FAM \{ .TOC_TITLE_FAMILY \\*[$TOC_FAM] \} +. if !d$TOC_PN_FAM \{ .TOC_PN_FAMILY \\*[$TOC_FAM] \} +. if !d$TOC_HEAD_FAM \{ .TOC_HEAD_FAMILY \\*[$TOC_FAM] \} +. if !d$TOC_SH_FAM \{ .TOC_SUBHEAD_FAMILY \\*[$TOC_FAM] \} +. if !d$TOC_PH_FAM \{ .TOC_PARAHEAD_FAMILY \\*[$TOC_FAM] \} +. if !d$TOC_TITLE_FT \{ .TOC_TITLE_FONT BI \} +. if !d$TOC_PN_FT \{ .TOC_PN_FONT R \} +. if !d$TOC_HEAD_FT \{ .TOC_HEAD_FONT B \} +. if !d$TOC_SH_FT \{ .TOC_SUBHEAD_FONT R \} +. if !d$TOC_PH_FT \{ .TOC_PARAHEAD_FONT I \} +. if !d$TOC_TITLE_SIZE_CHANGE \{ .TOC_TITLE_SIZE +.5 \} +. if !d$TOC_PN_SIZE_CHANGE \{ .TOC_PN_SIZE +0 \} +. if !d$TOC_HEAD_SIZE_CHANGE \{ .TOC_HEAD_SIZE +.5 \} +. if !d$TOC_SH_SIZE_CHANGE \{ .TOC_SUBHEAD_SIZE +0 \} +. if !d$TOC_PH_SIZE_CHANGE \{ .TOC_PARAHEAD_SIZE +0 \} . ps \\n[#TOC_PS]u\\*[$TOC_TITLE_SIZE_CHANGE] -. if !r#TOC_HEAD_INDENT \{ .TOC_HEAD_INDENT \w'\0\0.' \} +. if !r#TOC_HEAD_INDENT \{ .TOC_HEAD_INDENT \w'\0\0.' \} . ps . ps \\n[#TOC_PS]u\\*[$TOC_HEAD_SIZE_CHANGE] -. if !r#TOC_SH_INDENT \{ .TOC_SUBHEAD_INDENT \\n[#TOC_HEAD_INDENT]+\w'\0\0.' \} +. if !r#TOC_SH_INDENT \{ .TOC_SUBHEAD_INDENT \\n[#TOC_HEAD_INDENT]+\w'\0\0.' \} . ps . ps \\n[#TOC_PS]u\\*[$TOC_SH_SIZE_CHANGE] -. if !r#TOC_SSH_INDENT \{ .TOC_SUBSUBHEAD_INDENT \\n[#TOC_SH_INDENT]+\w'\0\0.' \} -. ps -. ps \\n[#TOC_PS]u\\*[$TOC_SSH_SIZE_CHANGE] -. if !r#TOC_PH_INDENT \{ .TOC_PARAHEAD_INDENT \\n[#TOC_SSH_INDENT]+\w'\0\0.' \} +. if !r#TOC_PH_INDENT \{ .TOC_PARAHEAD_INDENT \\n[#TOC_SH_INDENT]+\w'\0\0.' \} . ps . \} .\" +Refer support @@ -8030,7 +7995,6 @@ y\\R'#DESCENDER \\n[.cdp]' . PARAHEAD_FAMILY \\*[$DOC_FAM] . QUOTE_FAMILY \\*[$DOC_FAM] . SUBHEAD_FAMILY \\*[$DOC_FAM] -. SUBSUBHEAD_FAMILY \\*[$DOC_FAM] . SUBTITLE_FAMILY \\*[$DOC_FAM] . TITLE_FAMILY \\*[$DOC_FAM] .END @@ -8948,12 +8912,8 @@ y\\R'#DESCENDER \\n[.cdp]' \# on or off. \# .MAC HDRFTR_RULE END \"To print rule under header/over footer. -. if r#HEADERS_ON \{\ -. if \\n[#HEADERS_ON]=1 \{ .nr #HDRFTR_RULE_GAP \\n[#HEADER_RULE_GAP] \} -. \} -. if r#FOOTERS_ON \{\ -. if \\n[#FOOTERS_ON]=1 \{ .nr #HDRFTR_RULE_GAP \\n[#FOOTER_RULE_GAP] \} -. \} +. if \\n[#HEADERS_ON] \{ .nr #HDRFTR_RULE_GAP \\n[#HEADER_RULE_GAP] \} +. if \\n[#FOOTERS_ON] \{ .nr #HDRFTR_RULE_GAP \\n[#FOOTER_RULE_GAP] \} . if '\\$0'HDRFTR_RULE_INTERNAL' \{\ . ie \\n[#USERDEF_HDRFTR] \{\ . nr #CAP_HEIGHT_ADJUST \\n[#HDRFTR_HEIGHT] @@ -9785,7 +9745,7 @@ y\\R'#DESCENDER \\n[.cdp]' . if \\n[#UNDERLINE_WAS_ON]=1 \{\ . vs 0 . ie !n \{\ -. nop \R'#UNDERLINE_ON 1'\X'ps: exec \\n[_w] \\n[_d] decorline' +. nop \R'#UNDERLINE_ON 1'\X'ps: exec \\n[_w] \\n[_d] decorline' \} . \} . el \{\ . ul 1000 @@ -10241,13 +10201,11 @@ y\\R'#DESCENDER \\n[.cdp]' . ie '\\$1'' \{\ . nr #HEAD_NUM 0 1 . nr #SH_NUM 0 1 -. nr #SSH_NUM 0 1 . nr #PH_NUM 0 1 . \} . el \{\ . nr #HEAD_NUM \\$1-1 1 . nr #SH_NUM 0 1 -. nr #SSH_NUM 0 1 . nr #PH_NUM 0 1 . \} .END @@ -10279,60 +10237,19 @@ y\\R'#DESCENDER \\n[.cdp]' \# Resets incrementing register #SH_NUM to 1 or, if there's \# an argument, to user supplied number. \# *Notes: -\# When the subhead number is reset, it resets the subsubhead and -\# parahead numbers as well. If this behaviour is not what's -\# wanted, RESET_SUBSUBHEAD_NUMBER and RESET_PARAHEAD_NUMBER -\# allow the user to set the subsubhead and parahead number(s) to -\# whatever s/he desires. +\# When the subhead number is reset, it resets the parahead number as +\# well. If this behaviour is not what's wanted, RESET_SUBHEAD_NUMBER +\# allows the user to set the parahead number to whatever s/he desires. \# .MAC RESET_SUBHEAD_NUMBER END . ie '\\$1'' \{ .nr #SH_NUM 0 1 \} . el \{\ -. nr #SH_NUM \\$1-1 1 -. nr #SSH_NUM 0 1 -. nr #PH_NUM 0 1 +. nr #SH_NUM \\$1-1 1 +. nr #PH_NUM 0 1 . \} .END \# \# -\# NUMBER SUBSUBHEADS -\# --------------- -\# *Arguments: -\# <none> | <anything> -\# *Function: -\# Toggles register #NUMBER_SSH; sets incrementing register #SSH_NUM. -\# *Notes: -\# Default is OFF. -\# -.MAC NUMBER_SUBSUBHEADS END -. ie '\\$1'' \{\ -. nr #NUMBER_SSH 1 -. if !\\n[#SSH_NUM] \{ .nr #SSH_NUM 0 1 \} -. \} -. el \{ .rr #NUMBER_SSH \} -.END -\# -\# -\# RESET SUBSUBHEAD NUMBER -\# -------------------- -\# *Arguments: -\# <none> | <desired subsubhead number> -\# *Function: -\# Resets incrementing register #SSH_NUM to 1 or, if there's -\# an argument, to user supplied number. -\# *Notes: -\# When the subsubhead number is reset, it resets the parahead number as -\# well. If this behaviour is not what's wanted, RESET_PARAHEAD_NUMBER -\# allows the user to set the parahead number to whatever s/he desires. -\# -.MAC RESET_SUBSUBHEAD_NUMBER END -. ie '\\$1'' \{ .nr #SSH_NUM 0 1 \} -. el \{\ -. nr #SSH_NUM \\$1-1 1 -. nr #PH_NUM 0 1 -. \} -.END -\# \# NUMBER PARAHEADS \# ---------------- \# *Arguments: @@ -10519,7 +10436,7 @@ y\\R'#DESCENDER \\n[.cdp]' \!. TRAP OFF \!. PAD_MARKER ^ . ie \\n[#PRINT_STYLE]=1 \{\ -\!. PAD "\\h'\w'\0\0.'u'\\*[$TOC_HEAD_ITEM]\\*[$TOC_PN_TYPEWRITE]" +\!. PAD "\\h'2m'\\*[$TOC_HEAD_ITEM]\\*[$TOC_PN_TYPEWRITE]" . \} . el \{\ \!. PAD "\\h'\\n[#TOC_HEAD_INDENT]u'\\*[$TOC_HEAD_ITEM]\\*[$TOC_PN]" @@ -10667,9 +10584,8 @@ y\\R'#DESCENDER \\n[.cdp]' . CAPS OFF . ev . ALD \\n[#DOC_LEAD]u -. if \\n[#NUMBER_HEAD] \{ .RESET_SUBHEAD_NUMBER \} -. if \\n[#NUMBER_SH] \{ .RESET_SUBSUBHEAD_NUMBER \} -. if \\n[#NUMBER_SSH] \{ .RESET_PARAHEAD_NUMBER \} +. if \\n[#NUMBER_HEAD] \{ .RESET_SUBHEAD_NUMBER \} +. if \\n[#NUMBER_SH] \{ .RESET_PARAHEAD_NUMBER \} . if r#START \{ .rr #START \} . if r#EPIGRAPH \{ .rr #EPIGRAPH \} . if r#QUOTE \{ .rr #QUOTE \} @@ -10687,17 +10603,6 @@ y\\R'#DESCENDER \\n[.cdp]' \# \# ---Subheads--- \# -\# SUBHEAD BASELINE ADJUSTMENT -\# --------------------------- -\# *Arguments: -\# <amount to raise subhead> -\# *Function: -\# Creates or modifies register #SH_BASELINE_ADJ -\# -.MAC SUBHEAD_BASELINE_ADJUST END -. nr #SH_BASELINE_ADJ \\$1 -.END -\# \# SUBHEAD \# ------- \# *Arguments: @@ -10758,7 +10663,7 @@ y\\R'#DESCENDER \\n[.cdp]' \!. TRAP OFF \!. PAD_MARKER ^ . ie \\n[#PRINT_STYLE]=1 \{\ -\!. PAD "\\h'\w'\0\0.'u*2u'\\*[$TOC_SH_ITEM]\\*[$TOC_PN_TYPEWRITE]" +\!. PAD "\\h'4m'\\*[$TOC_SH_ITEM]\\*[$TOC_PN_TYPEWRITE]" . \} . el \{\ \!. PAD "\\h'\\n[#TOC_SH_INDENT]u'\\*[$TOC_SH_ITEM]\\*[$TOC_PN]" @@ -10780,12 +10685,11 @@ y\\R'#DESCENDER \\n[.cdp]' \!. TQ . di . ev -.\" End collection of subhead for TOC +.\" End collection of head for TOC .\" Process subhead . nr #ARG_NUM 0 1 . if r#QUOTE \{ .rr #QUOTE \} . if r#Q_AT_TOP \{ .rr #Q_AT_TOP \} -. nr #SUBHEAD 1 . ev SUBHEAD . ll \\n[#L_LENGTH]u . ta \\n(.lu @@ -10806,6 +10710,8 @@ y\\R'#DESCENDER \\n[.cdp]' . LS \\n[#DOC_LEAD]u . QUAD \\*[$SH_QUAD] . \} +. if \\n[#PRINT_STYLE]=1 \{ .nr #SH_LEAD_ADJUST \\n[#LEAD]/5 \} +. if \\n[#PRINT_STYLE]=2 \{ .nr #SH_LEAD_ADJUST \\n[#LEAD]/8 \} . ie \\n[#START] \{ .RLD 1v \} . el \{\ . ie \\n[#HEAD]=1 \{ . \} @@ -10837,24 +10743,24 @@ y\\R'#DESCENDER \\n[.cdp]' . \} . ie \\n[#NUMBER_HEAD] \{\ . br -. UNDERSCORE "\v'-\\n[#SH_BASELINE_ADJ]u'\\*[$CH_NUM]\\n[#HEAD_NUM].\\n+[#SH_NUM].\0\\$[\\n+[#ARG_NUM]]" +. UNDERSCORE "\v'-\\n[#SH_LEAD_ADJUST]u'\\*[$CH_NUM]\\n[#HEAD_NUM].\\n+[#SH_NUM].\0\\$[\\n+[#ARG_NUM]]" . br . \} . el \{\ . br -. UNDERSCORE "\v'-\\n[#SH_BASELINE_ADJ]u'\\*[$CH_NUM]\\n+[#SH_NUM].\0\\$[\\n+[#ARG_NUM]]" +. UNDERSCORE "\v'-\\n[#SH_LEAD_ADJUST]u'\\*[$CH_NUM]\\n+[#SH_NUM].\0\\$[\\n+[#ARG_NUM]]" . br . \} . \} . el \{\ . br -. UNDERSCORE "\v'-\\n[#SH_BASELINE_ADJ]u'\\$[\\n+[#ARG_NUM]]" +. UNDERSCORE "\v'-\\n[#SH_LEAD_ADJUST]u'\\$[\\n+[#ARG_NUM]]" . br . \} . \} . el \{\ . br -. UNDERSCORE "\v'-\\n[#SH_BASELINE_ADJ]u'\\$[\\n+[#ARG_NUM]]" +. UNDERSCORE "\v'-\\n[#SH_LEAD_ADJUST]u'\\$[\\n+[#ARG_NUM]]" . br . \} .\} @@ -10876,24 +10782,24 @@ y\\R'#DESCENDER \\n[.cdp]' . \} . ie \\n[#NUMBER_HEAD] \{\ . br -. PRINT "\v'-\\n[#SH_BASELINE_ADJ]u'\\*[$CH_NUM]\\n[#HEAD_NUM].\\n+[#SH_NUM].\0\\$[\\n+[#ARG_NUM]] +. PRINT "\v'-\\n[#SH_LEAD_ADJUST]u'\\*[$CH_NUM]\\n[#HEAD_NUM].\\n+[#SH_NUM].\0\\$[\\n+[#ARG_NUM]] . br . \} . el \{\ . br -. PRINT "\v'-\\n[#SH_BASELINE_ADJ]u'\\*[$CH_NUM]\\n+[#SH_NUM].\0\\$[\\n+[#ARG_NUM]] +. PRINT "\v'-\\n[#SH_LEAD_ADJUST]u'\\*[$CH_NUM]\\n+[#SH_NUM].\0\\$[\\n+[#ARG_NUM]] . br . \} . \} . el \{\ . br -. PRINT "\v'-\\n[#SH_BASELINE_ADJ]u'\\$[\\n+[#ARG_NUM]] +. PRINT "\v'-\\n[#SH_LEAD_ADJUST]u'\\$[\\n+[#ARG_NUM]] . br . \} . \} . el \{\ . br -. PRINT "\v'-\\n[#SH_BASELINE_ADJ]u'\\$[\\n+[#ARG_NUM]] +. PRINT "\v'-\\n[#SH_LEAD_ADJUST]u'\\$[\\n+[#ARG_NUM]] . br . \} .\} @@ -10951,274 +10857,6 @@ y\\R'#DESCENDER \\n[.cdp]' . nr #HEAD 2 .END \# -\# ---Subsubheads--- -\# -\# -\# SUBSUBHEAD BASELINE ADJUSTMENT -\# ------------------------------ -\# *Arguments: -\# <amount to raise subsubhead> -\# *Function: -\# Creates or modifies register #SSH_BASELINE_ADJ -\# -.MAC SUBSUBHEAD_BASELINE_ADJUST END -. nr #SSH_BASELINE_ADJ \\$1 -.END -\# -\# SUBSUBHEAD -\# ------- -\# *Arguments: -\# "text of subsubhead" ["text of subsubhead"] ... -\# *Function: -\# In TYPEWRITE, prints subsubheads underlined. -\# In TYPESET, prints subsubheads bold, .5 points larger than running -\# text. -\# In both styles, a line space precedes the subsubhead, and a small -\# amount of lead comes after. -\# *Notes: -\# As with the HEAD macro, double-quotes (") must surround -\# each line of text. -\# -.MAC SUBSUBHEAD END -. if \\n[#UNDERLINE_ON]=1 .UNDERLINE OFF -. br -. ne \\n[#NUM_ARGS]+2 -.\" Collect subsubhead for TOC. -. nr #ARG_NUM 0 1 -. nr #TOC_ENTRY_PN \\n%+\\n[#PAGE_NUM_ADJ] -. while \\n[#ARG_NUM]<\\n[#NUM_ARGS] \{\ -. ie \\n[#ARG_NUM]=\\n[#NUM_ARGS] \{\ -. as $TOC_SSH_ITEM \\$[\\n+[#ARG_NUM]]\\| -. \} -. el \{\ -.\" Note that in the .as lines, below, \ at the end has a literal -.\" space after it. -. ie \\n[#NUMBER_SSH] \{\ -. ie \\n[#ARG_NUM]=0 \{\ -. as $TOC_SSH_ITEM \\n+[#SSH_NUM].\0\\$[\\n+[#ARG_NUM]]\ \" -. nr #SSH_NUM \\n-[#SSH_NUM] -. \} -. el \{\ -. as $TOC_SSH_ITEM \\$[\\n+[#ARG_NUM]]\ \" -. \} -. \} -. el \{\ -. as $TOC_SSH_ITEM \\$[\\n+[#ARG_NUM]]\ \" -. \} -. \} -.\} -.\" Note the use of \!, which transparently embeds the macros used -.\" in the TOC_ENTRIES diversion. The elements they control must be -.\" processed literally when the diversion is output. -. ev TOC_EV -. da TOC_ENTRIES -. if \\n[#PRINT_STYLE]=1 \{\ -\!. fam \\*[$TYPEWRITER_FAM] -\!. ft R -\!. ps \\*[$TYPEWRITER_PS] -. \} -. if \\n[#PRINT_STYLE]=2 \{\ -\!. FAMILY \\*[$TOC_SSH_FAM] -\!. FT \\*[$TOC_SSH_FT] -\!. PT_SIZE \\n[#TOC_PS]u\\*[$TOC_SSH_SIZE_CHANGE] -. \} -\!. TRAP OFF -\!. PAD_MARKER ^ -. ie \\n[#PRINT_STYLE]=1 \{\ -\!. PAD "\\h'\w'\0\0.'u*3u'\\*[$TOC_SSH_ITEM]\\*[$TOC_PN_TYPEWRITE]" -. \} -. el \{\ -\!. PAD "\\h'\\n[#TOC_SSH_INDENT]u'\\*[$TOC_SSH_ITEM]\\*[$TOC_PN]" -. \} -\!. PAD_MARKER # -\!. EOL -\!. ST 100 L -\!. ST 101 R -. if \\n[#PRINT_STYLE]=2 \{\ -\!. FAMILY \\*[$TOC_PN_FAM] -\!. FT \\*[$TOC_PN_FT] -\!. PT_SIZE \\n[#TOC_PS]u\\*[$TOC_PN_SIZE_CHANGE] -. \} -\!. TAB 100 -\!. PRINT \\*[LEADER] -\!. TN -\!. TRAP -\!. PRINT \\n[#TOC_ENTRY_PN] -\!. TQ -. di -. ev -.\" End collection of subsubhead for TOC -.\" Process subsubhead -. nr #ARG_NUM 0 1 -. if r#QUOTE \{ .rr #QUOTE \} -. if r#Q_AT_TOP \{ .rr #Q_AT_TOP \} -. ev SUBSUBHEAD -. ll \\n[#L_LENGTH]u -. ta \\n(.lu -. if \\n[#COLUMNS] \{\ -. ll \\n[#COL_L_LENGTH]u -. ta \\n(.lu -. \} -. CHECK_INDENT -. if \\n[#PRINT_STYLE]=1 \{\ -. TYPEWRITER -. vs \\n[#DOC_LEAD]u -. QUAD \\*[$SSH_QUAD] -. \} -. if \\n[#PRINT_STYLE]=2 \{\ -. FAMILY \\*[$SSH_FAM] -. FT \\*[$SSH_FT] -. PT_SIZE \\n[#DOC_PT_SIZE]u\\*[$SSH_SIZE_CHANGE] -. LS \\n[#DOC_LEAD]u -. QUAD \\*[$SSH_QUAD] -. \} -. if \\n[#PRINT_STYLE]=1 \{ .nr #SSH_LEAD_ADJUST \\n[#LEAD]/5 \} -. if \\n[#PRINT_STYLE]=2 \{ .nr #SSH_LEAD_ADJUST \\n[#LEAD]/8 \} -. ie \\n[#START] \{ .RLD 1v \} -. el \{\ -. ie \\n[#SUBHEAD]=1 \{ . \} -. el \{\ -. if \\n[#PRINT_STYLE]=1 \{\ -. if !\\n[#LINEBREAK] \{ .ALD \\n[#DOC_LEAD]u \} -. \} -. if \\n[#PRINT_STYLE]=2 \{\ -. ie \\n[#PP_SPACE]=1 \{\ -. ie !\\n[#LINEBREAK] \{ .ALD \\n[#DOC_LEAD]u \} -. el \{ .RLD \\n[#DOC_LEAD]u \} -. \} -. el \{\ -. if !\\n[#LINEBREAK] \{ .ALD \\n[#DOC_LEAD]u \} -. \} -. \} -. \} -. \} -.\" Print subsubhead -. if \\n[#PRINT_STYLE]=1 \{\ -. while \\n[#ARG_NUM]<\\n[#NUM_ARGS] \{\ -. ie \\n[#NUMBER_SSH] \{\ -. ie \\n[#ARG_NUM]=0 \{\ -. ie \\n[#PREFIX_CH_NUM]=1 \{\ -. ds $CH_NUM \\n[#CH_NUM]. -. \} -. el \{\ -. rm $CH_NUM -. \} -. ie \\n[#NUMBER_HEAD] \{\ -. br -. PRINT "\v'-\\n[#SSH_BASELINE_ADJ]u'\\*[$CH_NUM]\\n[#HEAD_NUM].\\n[#SH_NUM].\\n+[#SSH_NUM].\0\\$[\\n+[#ARG_NUM]]" -. br -. \} -. el \{\ -. br -. PRINT "\v'-\\n[#SSH_BASELINE_ADJ]u'\\*[$CH_NUM]\\n+[#SSH_NUM].\0\\$[\\n+[#ARG_NUM]]" -. br -. \} -. \} -. el \{\ -. br -. PRINT "\v'-\\n[#SSH_BASELINE_ADJ]u'\\$[\\n+[#ARG_NUM]]" -. br -. \} -. \} -. el \{\ -. br -. PRINT "\v'-\\n[#SSH_BASELINE_ADJ]u'\\$[\\n+[#ARG_NUM]]" -. br -. \} -.\} -. \} -. if \\n[#PRINT_STYLE]=1 \{\ -. if \\n[#SINGLE_SPACE] \{ .ALD \\n[#DOC_LEAD]u \} -. \} -. if \\n[#PRINT_STYLE]=2 \{\ -. if \\n[#SSH_COLOR]=1 \{ .COLOR \\*[$SSH_COLOR] \} -. ie \\n[#PP_SPACE]=0 \{\ -. while \\n[#ARG_NUM]<\\n[#NUM_ARGS] \{\ -. ie \\n[#NUMBER_SH] \{\ -. ie \\n[#ARG_NUM]=0 \{\ -. ie \\n[#PREFIX_CH_NUM]=1 \{\ -. ds $CH_NUM \\n[#CH_NUM]. -. \} -. el \{\ -. rm $CH_NUM -. \} -. ie \\n[#NUMBER_HEAD] \{\ -. br -. PRINT "\v'-\\n[#SSH_BASELINE_ADJ]u'\\*[$CH_NUM]\\n[#HEAD_NUM].\\n[#SH_NUM].\\n+[#SSH_NUM].\0\\$[\\n+[#ARG_NUM]] -. br -. \} -. el \{\ -. br -. PRINT "\v'-\\n[#SSH_BASELINE_ADJ]u'\\*[$CH_NUM]\\n+[#SSH_NUM].\0\\$[\\n+[#ARG_NUM]] -. br -. \} -. \} -. el \{\ -. br -. PRINT "\v'-\\n[#SSH_BASELINE_ADJ]u'\\$[\\n+[#ARG_NUM]] -. br -. \} -. \} -. el \{\ -. br -. PRINT "\v'-\\n[#SSH_BASELINE_ADJ]u'\\$[\\n+[#ARG_NUM]] -. br -. \} -.\} -. \} -. el \{\ -. ALD \\n[#DOC_LEAD]u -. if \\n[#HEAD]=1 \{ .RLD \\n[#DOC_LEAD]u \} -. if \\n[#END_QUOTE] \{ .RLD \\n[#DOC_LEAD]u \} -. if \\n[#EPIGRAPH] \{ .RLD \\n[#DOC_LEAD]u \} -. while \\n[#ARG_NUM]<\\n[#NUM_ARGS] \{\ -. ie \\n[#NUMBER_SH] \{\ -. ie \\n[#ARG_NUM]=0 \{\ -. ie \\n[#PREFIX_CH_NUM]=1 \{\ -. ds $CH_NUM \\n[#CH_NUM]. -. \} -. el \{\ -. rm $CH_NUM -. \} -. ie \\n[#NUMBER_HEAD] \{\ -. br -. PRINT "\v'-\\n[#SSH_LEAD_ADJUST]u'\\*[$CH_NUM]\\n[#HEAD_NUM].\\n[#SH_NUM].\\n+[#SSH_NUM]\0\\$[\\n+[#ARG_NUM]] -. br -. \} -. el \{\ -. br -. PRINT "\v'-\\n[#SSH_LEAD_ADJUST]u'\\*[$CH_NUM]\\n+[#SSH_NUM].\0\\$[\\n+[#ARG_NUM]] -. br -. \} -. \} -. el \{\ -. br -. PRINT "\v'-\\n[#SSH_LEAD_ADJUST]u'\\$[\\n+[#ARG_NUM]] -. br -. \} -. \} -. el \{\ -. br -. PRINT "\v'-\\n[#SSH_LEAD_ADJUST]u'\\$[\\n+[#ARG_NUM]] -. br -. \} -.\} -. ALD \\n[#DOC_LEAD]u -. \} -. \} -. REMOVE_INDENT -. ev -. if \\n[#NUMBER_SH] \{ .RESET_PARAHEAD_NUMBER \} -. if r#START \{ .rr #START \} -. if r#EPIGRAPH \{ .rr #EPIGRAPH \} -. if r#Q_FITS \{ .rr #Q_FITS \} -. if r#END_QUOTE \{ .rr #END_QUOTE \} -. if r#LINEBREAK \{ .rr #LINEBREAK \} -. rm $TOC_SSH_ITEM -. nr #PP 0 -. nr #HEAD 2 -.END -\# \# ---Paragraph heads--- \# \# PARAHEAD INDENT @@ -11260,7 +10898,6 @@ y\\R'#DESCENDER \\n[.cdp]' \# .MAC PARAHEAD END . if \\n[#UNDERLINE_ON]=1 .UNDERLINE OFF -. if \\n[#LINENUMBERS] .nm .\" Collect parahead for TOC. . nr #TOC_ENTRY_PN \\n%+\\n[#PAGE_NUM_ADJ] . ie \\n[#NUMBER_PH] \{\ @@ -11285,7 +10922,7 @@ y\\R'#DESCENDER \\n[.cdp]' \!. TRAP OFF \!. PAD_MARKER ^ . ie \\n[#PRINT_STYLE]=1 \{\ -\!. PAD "\\h'\w'\0\0.'u*4u'\\*[$TOC_PH_ITEM]\\*[$TOC_PN_TYPEWRITE]" +\!. PAD "\\h'6m'\\*[$TOC_PH_ITEM]\\*[$TOC_PN_TYPEWRITE]" . \} . el \{\ \!. PAD "\\h'\\n[#TOC_PH_INDENT]u'\\*[$TOC_PH_ITEM]\\*[$TOC_PN]" @@ -11313,17 +10950,20 @@ y\\R'#DESCENDER \\n[.cdp]' . nr #SLANT_WAS_ON 1 \E*[SLANTX] . \} -. vpt 0 -. sp -1v . ie \\n[#PP]=1 \{\ . if \\n[#INDENT_FIRST_PARAS] \{\ +. vpt 0 +. if \\n[#PRINT_STYLE]=1 \{ .sp -1v \} . ti \\n[#PH_INDENT]u +. vpt . \} . \} . el \{\ +. vpt 0 +. if \\n[#PRINT_STYLE]=1 \{ .sp -1v \} . ti \\n[#PH_INDENT]u -. \} . vpt +. \} . ie \\n[#PREFIX_CH_NUM]=1 \{\ . ds $CH_NUM \\n[#CH_NUM]. . \} @@ -11335,7 +10975,7 @@ y\\R'#DESCENDER \\n[.cdp]' . ie \\n[#NUMBER_PH] \{\ . if \\n[#NUMBER_HEAD] \{\ . ie \\n[#NUMBER_SH] \{\ -. UNDERSCORE "\R'#NUMBERED 1'\\*[$CH_NUM]\\n[#HEAD_NUM].\\n[#SH_NUM].\\n[#SSH_NUM].\\n+[#PH_NUM].\\ \\$1" +. UNDERSCORE "\R'#NUMBERED 1'\\*[$CH_NUM]\\n[#HEAD_NUM].\\n[#SH_NUM].\\n+[#PH_NUM].\\ \\$1" \0 . \} . el \{\ @@ -11382,7 +11022,7 @@ y\\R'#DESCENDER \\n[.cdp]' . \} . if \\n[#NUMBER_HEAD] \{\ . ie \\n[#NUMBER_SH] \{\ -. PRINT "\R'#NUMBERED 1'\\*[$CH_NUM]\\n[#HEAD_NUM].\\n[#SH_NUM].\\n[#SSH_NUM].\\n+[#PH_NUM].\0\\$1\h'\\*[$PH_SPACE]'\c" +. PRINT "\R'#NUMBERED 1'\\*[$CH_NUM]\\n[#HEAD_NUM].\\n[#SH_NUM].\\n+[#PH_NUM].\0\\$1\h'\\*[$PH_SPACE]'\c" . \} . el \{\ . PRINT "\R'#NUMBERED 1'\\*[$CH_NUM]\\n[#HEAD_NUM].\\n+[#PH_NUM].\0\\$1\h'\\*[$PH_SPACE]'\c" @@ -11413,7 +11053,6 @@ y\\R'#DESCENDER \\n[.cdp]' . \} . rr #NUMBERED . rm $TOC_PH_ITEM -. if \\n[#LINENUMBERS] .nm +0 .END \# \# @@ -11703,7 +11342,6 @@ y\\R'#DESCENDER \\n[.cdp]' . if r#QUOTE \{ .rr #QUOTE \} . if r#END_QUOTE \{ .rr #END_QUOTE \} . if r#HEAD \{ .rr #HEAD \} -. if r#SUBHEAD \{ .rr #SUBHEAD \} . if r#EPIGRAPH \{ .rr #EPIGRAPH \} . if r#Q_FITS \{ .rr #Q_FITS \} . if r#LINEBREAK \{ .rr #LINEBREAK \} @@ -14323,7 +13961,7 @@ E\\R'#CAP_HEIGHT \\n[.cht]' \# .MAC ENDNOTE_STRING_CAPS END . ie '\\$1'' \{ .nr #EN_STRING_CAPS 1 \} -. el \{ .nr #EN_STRING_CAPS 0 \} +. el \{ .rr #EN_STRING_CAPS \} .END \# \# @@ -15021,12 +14659,6 @@ E\\R'#CAP_HEIGHT \\n[.cht]' . FT \\*[$EN_STRING_FT] . PT_SIZE \\n[#EN_PS]u\\*[$EN_STRING_SIZE_CHANGE] . vs \\n[#EN_LEAD]u -. if \\n[#ENDNOTE_STRING_COLOR]=1 \{\ -. TRAP OFF -. COLOR \\*[$ENDNOTE_STRING_COLOR] -. EOL -. TRAP -. \} . \} . if '\\*[$EN_STRING_QUAD]'L' \{ .LEFT \} . if '\\*[$EN_STRING_QUAD]'LEFT' \{ .LEFT \} @@ -15652,12 +15284,6 @@ E\\R'#CAP_HEIGHT \\n[.cht]' . nr #TOC_SH_INDENT (\\$1) .END \# -\# - for subsubhead entries -\# -.MAC TOC_SUBSUBHEAD_INDENT END -. nr #TOC_SSH_INDENT (\\$1) -.END -\# \# - for parahead entries \# .MAC TOC_PARAHEAD_INDENT END @@ -16881,7 +16507,6 @@ E\\R'#CAP_HEIGHT \\n[.cht]' \# exactly on #B_MARGIN. \# .MAC TRAPS END -. nr #UNADJUSTED_DOC_LEAD \\n[#DOC_LEAD] .\" Remove all header/footer traps . if !\\n[#NO_TRAP_RESET] \{\ . ch DO_T_MARGIN @@ -16908,6 +16533,7 @@ E\\R'#CAP_HEIGHT \\n[.cht]' . while \\n[#T_MARGIN]+(\\n[#DOC_LEAD]+\\n+[#DOC_LEAD_ADJ]*\\n[#LINES_PER_PAGE])<=\\n[#DEPTH_TO_B_MARGIN] \{\ . .\} +. nr #UNADJUSTED_DOC_LEAD \\n[#DOC_LEAD] . DOC_LEAD \\n[#DOC_LEAD]u+\\n[#DOC_LEAD_ADJ]u .\" The "visual" bottom margin is what \n(nl would report on the .\" last line before the FOOTER trap is sprung @@ -17520,7 +17146,6 @@ E\\R'#CAP_HEIGHT \\n[.cht]' .ALIAS PARAHEAD_FAMILY _FAMILY .ALIAS QUOTE_FAMILY _FAMILY .ALIAS SUBHEAD_FAMILY _FAMILY -.ALIAS SUBSUBHEAD_FAMILY _FAMILY .ALIAS SUBTITLE_FAMILY _FAMILY .ALIAS TITLE_FAMILY _FAMILY .ALIAS TOC_FAM _FAMILY @@ -17530,7 +17155,6 @@ E\\R'#CAP_HEIGHT \\n[.cht]' .ALIAS TOC_PARAHEAD_FAMILY _FAMILY .ALIAS TOC_PN_FAMILY _FAMILY .ALIAS TOC_SUBHEAD_FAMILY _FAMILY -.ALIAS TOC_SUBSUBHEAD_FAMILY _FAMILY .ALIAS TOC_TITLE_FAMILY _FAMILY \# .ALIAS AUTHOR_FONT _FONT @@ -17569,7 +17193,6 @@ E\\R'#CAP_HEIGHT \\n[.cht]' .ALIAS PARAHEAD_FONT _FONT .ALIAS QUOTE_FONT _FONT .ALIAS SUBHEAD_FONT _FONT -.ALIAS SUBSUBHEAD_FONT _FONT .ALIAS SUBTITLE_FONT _FONT .ALIAS TITLE_FONT _FONT .ALIAS TOC_HEADER_FONT _FONT @@ -17577,7 +17200,6 @@ E\\R'#CAP_HEIGHT \\n[.cht]' .ALIAS TOC_PARAHEAD_FONT _FONT .ALIAS TOC_PN_FONT _FONT .ALIAS TOC_SUBHEAD_FONT _FONT -.ALIAS TOC_SUBSUBHEAD_FONT _FONT .ALIAS TOC_TITLE_FONT _FONT \# .ALIAS AUTHOR_SIZE _SIZE @@ -17615,7 +17237,6 @@ E\\R'#CAP_HEIGHT \\n[.cht]' .ALIAS PARAHEAD_SIZE _SIZE .ALIAS QUOTE_SIZE _SIZE .ALIAS SUBHEAD_SIZE _SIZE -.ALIAS SUBSUBHEAD_SIZE _SIZE .ALIAS SUBTITLE_SIZE _SIZE .ALIAS TITLE_SIZE _SIZE .ALIAS TOC_HEADER_SIZE _SIZE @@ -17623,7 +17244,6 @@ E\\R'#CAP_HEIGHT \\n[.cht]' .ALIAS TOC_PARAHEAD_SIZE _SIZE .ALIAS TOC_PN_SIZE _SIZE .ALIAS TOC_SUBHEAD_SIZE _SIZE -.ALIAS TOC_SUBSUBHEAD_SIZE _SIZE .ALIAS TOC_TITLE_SIZE _SIZE \# .ALIAS ATTRIBUTE_COLOR _COLOR @@ -17651,7 +17271,6 @@ E\\R'#CAP_HEIGHT \\n[.cht]' .ALIAS DOC_COVER_TITLE_COLOR _COLOR .ALIAS DOCHEADER_COLOR _COLOR .ALIAS DOCTYPE_COLOR _COLOR -.ALIAS ENDNOTE_STRING_COLOR _COLOR .ALIAS EPIGRAPH_COLOR _COLOR .ALIAS FINIS_COLOR _COLOR .ALIAS FOOTNOTE_COLOR _COLOR @@ -17668,7 +17287,6 @@ E\\R'#CAP_HEIGHT \\n[.cht]' .ALIAS QUOTE_COLOR _COLOR .ALIAS SECTION_COLOR _COLOR .ALIAS SUBHEAD_COLOR _COLOR -.ALIAS SUBSUBHEAD_COLOR _COLOR .ALIAS SUBTITLE_COLOR _COLOR .ALIAS TITLE_COLOR _COLOR \# @@ -17690,7 +17308,6 @@ E\\R'#CAP_HEIGHT \\n[.cht]' .ALIAS FOOTNOTE_QUAD _QUAD .ALIAS HEAD_QUAD _QUAD .ALIAS SUBHEAD_QUAD _QUAD -.ALIAS SUBSUBHEAD_QUAD _QUAD .ALIAS TOC_HEADER_QUAD _QUAD \# \# Support aliases diff --git a/contrib/pdfmark/ChangeLog b/contrib/pdfmark/ChangeLog index 87b1bfa2..b9403abd 100644 --- a/contrib/pdfmark/ChangeLog +++ b/contrib/pdfmark/ChangeLog @@ -1,25 +1,3 @@ -2011-12-26 Mike Frysinger <vapier@gentoo.org> - - Fix parallel build race failure. - - Sometimes building in parallel will fail in the pdfmark directory: - - make[2]: Entering directory '.../contrib/pdfmark' - rm -f pdfroff - rm -f pdfmark.pdf - sed -f ... ./pdfroff.sh >pdfroff - ...; ./pdfroff ... pdfmark.ms >pdfmark.pdf - /bin/sh: ./pdfroff: Permission denied - chmod +x pdfroff - make[2]: *** [pdfmark.pdf] Error 126 - - This is because the generated pdf files use the local generated - pdfroff helper script, but they don't depend directly upon it, so - make tries to create the two in parallel and randomly falls over. - - * Makefile.sub: Have all the .pdf files explicitly depend on the - `pdfroff' helper script. - 2010-12-23 Keith Marshall <keith.d.marshall@ntlworld.com> Update copyright notices; pdfmark.tmac bug-fix. @@ -336,7 +314,7 @@ First import of pdfmark files. -Copyright 2004-2011 +Copyright 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, diff --git a/contrib/pdfmark/Makefile.sub b/contrib/pdfmark/Makefile.sub index 77e77a7f..9eb27631 100644 --- a/contrib/pdfmark/Makefile.sub +++ b/contrib/pdfmark/Makefile.sub @@ -1,4 +1,4 @@ -# Copyright (C) 2005, 2006, 2009, 2011 Free Software Foundation, Inc. +# Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc. # Written by Keith Marshall (keith.d.marshall@ntlworld.com) # # This file is part of groff. @@ -66,9 +66,6 @@ PDFROFF=\ all: pdfroff $(make_pdfdoc) -# The pdf files use the local script to generate. -$(PDFDOCFILES): pdfroff - pdfdoc: gnu.eps $(PDFDOCFILES) gnu.eps: diff --git a/contrib/pdfmark/pdfmark.ms b/contrib/pdfmark/pdfmark.ms index 31d2f95d..9e5e4e75 100644 --- a/contrib/pdfmark/pdfmark.ms +++ b/contrib/pdfmark/pdfmark.ms @@ -6,7 +6,7 @@ File position: <groff-source>/contrib/pdfmark/pdfmark.ms This file is part of groff, the GNU roff type-setting system. -Copyright (C) 2004-2006, 2009, 2011 Free Software Foundation, Inc. +Copyright (C) 2004, 2005, 2006, 2009 Free Software Foundation, Inc. written by Keith Marshall <keith.d.marshall@ntlworld.com> Permission is granted to copy, distribute and/or modify this document @@ -343,10 +343,6 @@ groff -Tps [-m .I options \& [- .I "file ..." \& "...] " .LP -(Or use the PDF post-processor to avoid using ghostscript, -.CW -Tpdf\c -). -.LP It may be noted that the .CW pdfmark macros have no dependencies on, and no known conflicts with, @@ -2494,10 +2490,6 @@ groff -Tps .I "-options ...\&" ] [ file(s) ... .LP -(Or use the PDF post-processor to avoid using ghostscript, -.CW -Tpdf\c -). -.LP When using the .CW spdf.tmac package, the |