diff options
| author | Peter Schaffter <peter@schaffter.ca> | 2013-01-29 05:02:47 +0000 |
|---|---|---|
| committer | Peter Schaffter <peter@schaffter.ca> | 2013-01-29 05:02:47 +0000 |
| commit | b54a18b06a8452db2bdfd13d7fec42a59322fc1b (patch) | |
| tree | 1093fe78b9c56a185d1f37298db81b91f59de653 | |
| parent | d64470f12d6a0324dcbade9fc6d0284d5cf4beb5 (diff) | |
| download | groff-git-b54a18b06a8452db2bdfd13d7fec42a59322fc1b.tar.gz | |
Added FORCE argument to FLOAT; updated docs.
Trivial fixes.
32 files changed, 172 insertions, 103 deletions
diff --git a/contrib/mom/BUGS b/contrib/mom/BUGS index 8a83398ad..591a7bcc6 100644 --- a/contrib/mom/BUGS +++ b/contrib/mom/BUGS @@ -1,4 +1,4 @@ - Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 + Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, @@ -25,13 +25,16 @@ Also, please--no html email. That, too, gets nuked. Version 2.0 =========== +tbl macros .TS/.TE not working unless inside a float. +---Fixed--- + Terminal period after page number(s) in refer items not always printing. ---Fixed--- ==================================================================== -Version 6-a +Version 1.6-a =========== Footnotes on last page of columnar docs before a TOC getting printed @@ -45,8 +48,8 @@ FINIS depositing a blank final page when invoked too close to the bottom margin. ---Fixed--- -Version 6 -========= +Version 1-6 +=========== ENDNOTE_STRING_CAPS not disabling caps when arg given. ---Fixed--- diff --git a/contrib/mom/NEWS b/contrib/mom/NEWS index e548e101e..077f8f777 100644 --- a/contrib/mom/NEWS +++ b/contrib/mom/NEWS @@ -1,10 +1,15 @@ - Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 + Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 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 2.0-a +------------- +FORCE argument added to FLOAT; immediately breaks to a new page +to output the float if it does not fit on current the page. + Release 2.0 ----------- Full integration with gropdf. Mom's focus now is on the generation diff --git a/contrib/mom/copyright b/contrib/mom/copyright index 00bf33a3c..8db4da2ba 100644 --- a/contrib/mom/copyright +++ b/contrib/mom/copyright @@ -8,7 +8,7 @@ Ottawa (ON) K1L 6X6 The groff macro file om.tmac and the html documentation pertaining to it are copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010, -2011, 2012 Peter Schaffter. +2011, 2012, 2013 Peter Schaffter. om.tmac is issued under the GNU General Public License, a full copy of which can be had at diff --git a/contrib/mom/examples/README.txt b/contrib/mom/examples/README.txt index 3bf2efe71..de427171a 100644 --- a/contrib/mom/examples/README.txt +++ b/contrib/mom/examples/README.txt @@ -1,4 +1,4 @@ - Copyright 2004, 2005, 2006, 2009, 2010, 2011, 2012 + Copyright 2004, 2005, 2006, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, diff --git a/contrib/mom/examples/letter.mom b/contrib/mom/examples/letter.mom index cc744a698..b9d4c75ac 100644 --- a/contrib/mom/examples/letter.mom +++ b/contrib/mom/examples/letter.mom @@ -1,4 +1,4 @@ -\# Copyright 2004, 2005, 2006, 2009, 2010, 2011, 2012 +\# Copyright 2004, 2005, 2006, 2009, 2010, 2011, 2012, 2013 \# Free Software Foundation, Inc. \# \# Copying and distribution of this file, with or without modification, @@ -10,7 +10,7 @@ .PRINTSTYLE TYPESET .START .DATE -August 25, 2012 +August 25, 2013 .TO GUILLAUME BARRIÈRES Minidoux Corporation diff --git a/contrib/mom/examples/mom-pdf.mom b/contrib/mom/examples/mom-pdf.mom index 21ed91a21..5a03148b3 100644 --- a/contrib/mom/examples/mom-pdf.mom +++ b/contrib/mom/examples/mom-pdf.mom @@ -441,7 +441,6 @@ appear where specified, the \%"Contents" entry in the PDF outline, which observes a hierarchy of levels, will assign the TOC to level\~\*[BU4]1\*[BU4], possibly disrupting the visual ordering of levels in the outline. -.NO_SHIM .HEADING 1 NAMED simplify "pdfmom: Simplifying PDF output" .PP As explained in the section @@ -453,6 +452,7 @@ for creating PDF files with \[groff]: the original method, ie. passing the \[-Tps] and \[-mpdfmark] options to \[groff] (or using \[pdfroff], which does this for you); or the newer \[-Tpdf], which produces PDF files natively. +.NO_SHIM .HEADING 2 NAMED fwd:ref "The problem of forward references" .PP .EW .2 @@ -473,7 +473,6 @@ times to find the unknown text. The program \[pdfroff] exists to handle these multiple runs, but it imposes some limitations on the PDF features available with \[mom]. .EW 0 -.NO_SHIM off .HEADING 2 NAMED pdfmom "pdfmom" .PP \[pdfmom] performs the same function as \[pdfroff], and is the diff --git a/contrib/mom/examples/sample_docs.mom b/contrib/mom/examples/sample_docs.mom index 9d3b45aaf..5994387dc 100644 --- a/contrib/mom/examples/sample_docs.mom +++ b/contrib/mom/examples/sample_docs.mom @@ -1,4 +1,4 @@ -\# Copyright 2004, 2005, 2006, 2009, 2010, 2011, 2012 +\# Copyright 2004, 2005, 2006, 2009, 2010, 2011, 2012, 2013 \# Free Software Foundation, Inc. \# \# Copying and distribution of this file, with or without modification, diff --git a/contrib/mom/examples/typesetting.mom b/contrib/mom/examples/typesetting.mom index a7269199a..bc2d53364 100644 --- a/contrib/mom/examples/typesetting.mom +++ b/contrib/mom/examples/typesetting.mom @@ -1,4 +1,4 @@ -\# Copyright 2004, 2005, 2006, 2009, 2010, 2011, 2012 +\# Copyright 2004, 2005, 2006, 2009, 2010, 2011, 2012, 2013 \# Free Software Foundation, Inc. \# \# Copying and distribution of this file, with or without modification, diff --git a/contrib/mom/groff_mom.man b/contrib/mom/groff_mom.man index cd121199b..39ec33fc7 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, 2012 +Copyright (C) 2002, 2003, 2005, 2008, 2009, 2011, 2012, 2013 Free Software Foundation, Inc. written by Werner Lemberg <wl@gnu.org> revised 2012 by Peter Schaffter <peter@schaffter.ca> diff --git a/contrib/mom/momdoc/appendices.html b/contrib/mom/momdoc/appendices.html index 20e1758be..d425f07ff 100644 --- a/contrib/mom/momdoc/appendices.html +++ b/contrib/mom/momdoc/appendices.html @@ -3,7 +3,7 @@ This file is part of groff, the GNU roff type-setting system. Copyright (C) 2004, 2005, 2006, 2009, 2010, -2011, 2012 Free Software Foundation, Inc. +2011, 2012, 2013 Free Software Foundation, Inc. Written by Peter Schaffter (peter@schaffter.ca). Permission is granted to copy, distribute and/or modify this document diff --git a/contrib/mom/momdoc/color.html b/contrib/mom/momdoc/color.html index b32143938..e05941a00 100644 --- a/contrib/mom/momdoc/color.html +++ b/contrib/mom/momdoc/color.html @@ -3,7 +3,7 @@ This file is part of groff, the GNU roff type-setting system. Copyright (C) 2004, 2005, 2006, 2009, 2010, -2011, 2012 Free Software Foundation, Inc. +2011, 2012, 2013 Free Software Foundation, Inc. Written by Peter Schaffter (peter@schaffter.ca). 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 908c98937..f65f45e7e 100644 --- a/contrib/mom/momdoc/cover.html +++ b/contrib/mom/momdoc/cover.html @@ -3,7 +3,7 @@ This file is part of groff, the GNU roff type-setting system. Copyright (C) 2004, 2005, 2006, 2009, 2010, -2011, 2012 Free Software Foundation, Inc. +2011, 2012, 2013 Free Software Foundation, Inc. Written by Peter Schaffter (peter@schaffter.ca). 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 d63d63384..192c4cc86 100644 --- a/contrib/mom/momdoc/definitions.html +++ b/contrib/mom/momdoc/definitions.html @@ -2,7 +2,8 @@ <!-- This file is part of groff, the GNU roff type-setting system. -Copyright (C) 2004, 2005, 2006, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. +Copyright (C) 2004, 2005, 2006, 2009, 2010, +2011, 2012, 2013 Free Software Foundation, Inc. Written by Peter Schaffter (peter@schaffter.ca). 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 b1336fce0..e7a53a798 100644 --- a/contrib/mom/momdoc/docelement.html +++ b/contrib/mom/momdoc/docelement.html @@ -3,7 +3,7 @@ This file is part of groff, the GNU roff type-setting system. Copyright (C) 2004, 2005, 2006, 2009, 2010, -2011, 2012 Free Software Foundation, Inc. +2011, 2012, 2013 Free Software Foundation, Inc. Written by Peter Schaffter (peter@schaffter.ca). Permission is granted to copy, distribute and/or modify this document @@ -1266,7 +1266,7 @@ the bold font of the prevailing document family, with a baseline adjustment of 1/10 of the current <a href="definitions.html#leading">leading</a>. In addition, level-1 headings are 3 points larger than running text, -level 2-headings 2 points larger, and level 3-headings 1 point +level-2 headings 2 points larger, and level 3-headings 1 point larger. The remaining 6 levels are the same size as running text. A single blank line precedes all levels of heading. </p> @@ -6080,6 +6080,7 @@ The default is black. notes hyphenated. <br/> <span class="pre-in-pp"> + 0 = do not hyphenate 1 = hyphenate without restrictions 2 = do not hyphenate the last word on the page 4 = do not hyphenate the last two characters of a word diff --git a/contrib/mom/momdoc/docprocessing.html b/contrib/mom/momdoc/docprocessing.html index f4f4803de..aa5d78875 100644 --- a/contrib/mom/momdoc/docprocessing.html +++ b/contrib/mom/momdoc/docprocessing.html @@ -3,7 +3,7 @@ This file is part of groff, the GNU roff type-setting system. Copyright (C) 2004, 2005, 2006, 2009, 2010, -2011, 2012 Free Software Foundation, Inc. +2011, 2012, 2013 Free Software Foundation, Inc. Written by Peter Schaffter (peter@schaffter.ca). 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 4c6726c3f..e624a920a 100644 --- a/contrib/mom/momdoc/goodies.html +++ b/contrib/mom/momdoc/goodies.html @@ -2,7 +2,8 @@ <!-- This file is part of groff, the GNU roff type-setting system. -Copyright (C) 2004, 2005, 2006, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. +Copyright (C) 2004, 2005, 2006, 2009, 2010, +2011, 2012, 2013 Free Software Foundation, Inc. Written by Peter Schaffter (peter@schaffter.ca). 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 01fbdbdac..54559a606 100644 --- a/contrib/mom/momdoc/graphical.html +++ b/contrib/mom/momdoc/graphical.html @@ -3,7 +3,7 @@ This file is part of groff, the GNU roff type-setting system. Copyright (C) 2004, 2005, 2006, 2009, 2010, -2011, 2012 Free Software Foundation, Inc. +2011, 2012, 2013 Free Software Foundation, Inc. Written by Peter Schaffter (peter@schaffter.ca). 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 b99a53e47..4201cd4bf 100644 --- a/contrib/mom/momdoc/headfootpage.html +++ b/contrib/mom/momdoc/headfootpage.html @@ -3,7 +3,7 @@ This file is part of groff, the GNU roff type-setting system. Copyright (C) 2004, 2005, 2006, 2009, 2010, -2011, 2012 Free Software Foundation, Inc. +2011, 2012, 2013 Free Software Foundation, Inc. Written by Peter Schaffter (peter@schaffter.ca). Permission is granted to copy, distribute and/or modify this document @@ -938,7 +938,7 @@ to change the colour of the header rule. Replace HEADER_, above, with FOOTER_ to colourize footers. </p> -<div class="box-macro-args"> +<div id="hdrftr-plain" class="box-macro-args"> Macro: <b>HEADER_PLAIN</b> </div> diff --git a/contrib/mom/momdoc/images.html b/contrib/mom/momdoc/images.html index 05819b0e4..1bdddd4c8 100644 --- a/contrib/mom/momdoc/images.html +++ b/contrib/mom/momdoc/images.html @@ -3,7 +3,7 @@ This file is part of groff, the GNU roff type-setting system. Copyright (C) 2004, 2005, 2006, 2009, 2010, -2011, 2012 Free Software Foundation, Inc. +2011, 2012, 2013 Free Software Foundation, Inc. Written by Peter Schaffter (peter@schaffter.ca). Permission is granted to copy, distribute and/or modify this document @@ -245,11 +245,12 @@ Mom automatically applies shimming after PDF_IMAGE. See for a discussion of shimming, and how to disable it. <p> -<p class="tip-bottom"> +<p> <span class="note">Additional note:</span> -Mom treats images inserted into a document with PDF_IMAGE like +Mom treats single, discrete images inserted into a document with +PDF_IMAGE somewhat like <a href="#floats-intro">floats</a>, -which is to say that if the image doesn’t fit on the output +which is to say that if an image doesn’t fit on the output page, she will defer it to the top of the next page while continuing to process <a href="definitions.html#running">running text</a>. @@ -257,6 +258,14 @@ to process message is printed to stderr advising you where the deferment has taken place. </p> + +<p class="tip-bottom"> +However, if more than one image does not fit on the output page, +mom defers only the first; the remainder are silently ignored. +Therefore, if you insert several images close together in the text, +it is highly recommended that you wrap the images in floats, which +do not have this restriction. +</p> </div> <!-- -PSPIC- --> @@ -432,7 +441,7 @@ or </div> <div class="box-macro-args"> -Macro: <b>FLOAT</b> <kbd class="macro-args">ADJUST [ +|-<amount> ] | <anything></kbd> +Macro: <b>FLOAT</b> <kbd class="macro-args">[ FORCE ] [ ADJUST +|-<amount> ] | <anything></kbd> </div> <div class="box-tip"> @@ -449,6 +458,16 @@ invoke <kbd>.FLOAT OFF</kbd> (or <kbd>QUIT, END, X</kbd>, etc). </p> <p> +The optional <kbd>FORCE</kbd> argument instructs mom to output +the float exactly where it occurs in the input file. With +<kbd>FORCE</kbd>, mom immediately breaks to a new page to output +the float if it does not fit on the current page. While this is +somewhat contrary to the notion of floats (ie that running text +should continue to fill the page), there are circumstances where it +may be desirable. +</p> + +<p> The <kbd>ADJUST</kbd> argument tells mom to raise (<kbd>+</kbd>) or lower (<kbd>-</kbd>) the float <i>within the space allotted to it</i> by the specified amount. diff --git a/contrib/mom/momdoc/inlines.html b/contrib/mom/momdoc/inlines.html index 861041895..eb128f210 100644 --- a/contrib/mom/momdoc/inlines.html +++ b/contrib/mom/momdoc/inlines.html @@ -3,7 +3,7 @@ This file is part of groff, the GNU roff type-setting system. Copyright (C) 2004, 2005, 2006, 2009, 2010, -2011, 2012 Free Software Foundation, Inc. +2011, 2012, 2013 Free Software Foundation, Inc. Written by Peter Schaffter (peter@schaffter.ca). 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 dca751d97..205b24a70 100644 --- a/contrib/mom/momdoc/intro.html +++ b/contrib/mom/momdoc/intro.html @@ -3,7 +3,7 @@ This file is part of groff, the GNU roff type-setting system. Copyright (C) 2004, 2005, 2006, 2009, -2010, 2011, 2012 Free Software Foundation, Inc. +2010, 2011, 2012, 2013 Free Software Foundation, Inc. Written by Peter Schaffter (peter@schaffter.ca). 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 fcb50eb6d..6a5b99447 100644 --- a/contrib/mom/momdoc/letters.html +++ b/contrib/mom/momdoc/letters.html @@ -3,7 +3,7 @@ This file is part of groff, the GNU roff type-setting system. Copyright (C) 2004, 2005, 2006, 2009, 2010, -2011, 2012 Free Software Foundation, Inc. +2011, 2012, 2013 Free Software Foundation, Inc. Written by Peter Schaffter (peter@schaffter.ca). 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 6a42ab358..22c49ffee 100644 --- a/contrib/mom/momdoc/macrolist.html +++ b/contrib/mom/momdoc/macrolist.html @@ -3,7 +3,7 @@ This file is part of groff, the GNU roff type-setting system. Copyright (C) 2004, 2005, 2006, 2009, 2010, -2011, 2012 Free Software Foundation, Inc. +2011, 2012, 2013 Free Software Foundation, Inc. Written by Peter Schaffter (peter@schaffter.ca). Permission is granted to copy, distribute and/or modify this document diff --git a/contrib/mom/momdoc/rectoverso.html b/contrib/mom/momdoc/rectoverso.html index e5814e91b..b725e9e25 100644 --- a/contrib/mom/momdoc/rectoverso.html +++ b/contrib/mom/momdoc/rectoverso.html @@ -3,7 +3,7 @@ This file is part of groff, the GNU roff type-setting system. Copyright (C) 2004, 2005, 2006, 2009, 2010, -2011, 2012 Free Software Foundation, Inc. +2011, 2012, 2013 Free Software Foundation, Inc. Written by Peter Schaffter (peter@schaffter.ca). 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 da57b472e..d7f7eead6 100644 --- a/contrib/mom/momdoc/refer.html +++ b/contrib/mom/momdoc/refer.html @@ -3,7 +3,7 @@ This file is part of groff, the GNU roff type-setting system. Copyright (C) 2004, 2005, 2006, 2009, 2010, -2011, 2012 Free Software Foundation, Inc. +2011, 2012, 2013 Free Software Foundation, Inc. Written by Peter Schaffter (peter@schaffter.ca). 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 8beada181..b941cb6af 100644 --- a/contrib/mom/momdoc/reserved.html +++ b/contrib/mom/momdoc/reserved.html @@ -3,7 +3,7 @@ This file is part of groff, the GNU roff type-setting system. Copyright (C) 2004, 2005, 2006, 2009, 2010, -2011, 2012 Free Software Foundation, Inc. +2011, 2012, 2013 Free Software Foundation, Inc. Written by Peter Schaffter (peter@schaffter.ca). Permission is granted to copy, distribute and/or modify this document diff --git a/contrib/mom/momdoc/tables-of-contents.html b/contrib/mom/momdoc/tables-of-contents.html index 3248e705d..000f0b7c7 100644 --- a/contrib/mom/momdoc/tables-of-contents.html +++ b/contrib/mom/momdoc/tables-of-contents.html @@ -3,7 +3,7 @@ This file is part of groff, the GNU roff type-setting system. Copyright (C) 2004, 2005, 2006, 2009, 2010, -2011, 2012 Free Software Foundation, Inc. +2011, 2012, 2013 Free Software Foundation, Inc. Written by Peter Schaffter (peter@schaffter.ca). Permission is granted to copy, distribute and/or modify this document diff --git a/contrib/mom/momdoc/toc.html b/contrib/mom/momdoc/toc.html index 96732a344..fcab30f97 100644 --- a/contrib/mom/momdoc/toc.html +++ b/contrib/mom/momdoc/toc.html @@ -3,7 +3,7 @@ This file is part of groff, the GNU roff type-setting system. Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, -2011, 2012 Free Software Foundation, Inc. +2011, 2012, 2013 Free Software Foundation, Inc. Written by Peter Schaffter (peter@schaffter.ca). Permission is granted to copy, distribute and/or modify this document @@ -21,7 +21,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 2.0 -- Table of Contents</title> + <title>Mom, version 2.0-a -- Table of Contents</title> <link rel="stylesheet" type="text/css" href="stylesheet.css" /> </head> @@ -32,7 +32,7 @@ FDL in the main directory of the groff source package. <div class="page"> <div class="version"> - mom, version 2.0 + mom, version 2.0-a </div> <h1 class="toc" style="margin-top: 9px;">Table of Contents</h1> diff --git a/contrib/mom/momdoc/typesetting.html b/contrib/mom/momdoc/typesetting.html index d5aac6785..e3bab7911 100644 --- a/contrib/mom/momdoc/typesetting.html +++ b/contrib/mom/momdoc/typesetting.html @@ -3,7 +3,7 @@ This file is part of groff, the GNU roff type-setting system. Copyright (C) 2004, 2005, 2006, 2009, 2010, -2011, 2012 Free Software Foundation, Inc. +2011, 2012, 2013 Free Software Foundation, Inc. Written by Peter Schaffter (peter@schaffter.ca). Permission is granted to copy, distribute and/or modify this document @@ -1910,46 +1910,45 @@ to stretch the word spacing. </p> <p> -Word space is relative to type size. Knowing how it’s -calculated is unimportant. What matters is having a sense of how -the value passed to WS affects the look of your type. Generally, -in/decreasing the word space by a value of 1 or 2 produces a -difference that in many cases is scarcely visible; in/decreasing by -a value of 5 or so produces a subtle but noticeable difference; and -in/decreasing by a value greater than 10 is always apparent. You -should preview your work to assess the effect of WS. +Word space is relative to point size. Generally, in/decreasing the +word space by a value of 1 or 2 produces a difference that in many +cases is scarcely visible; in/decreasing by a value between 3 and 5 +produces a subtle but noticeable difference; and in/decreasing by a +value greater than 6 is almost always apparent. You should preview +your work to assess the effect of WS. </p> <p id="ws-usage"> -WS takes as its argument a number (decimal fractions are allowed) -preceded by a plus or minus sign. Therefore, to decrease the word -space slightly, you might enter <br/> +WS takes as its argument a whole number preceded by a plus or minus +sign. Therefore, to decrease the word space slightly, you might +enter +<br/> <span class="pre-in-pp"> - .WS -4 + .WS -2 </span> To increase it by a noticeable amount, you might enter <br/> <span class="pre-in-pp"> - .WS +12 + .WS +6 </span> You can reset the word spacing to its previous value by switching the plus or minus sign, like this: <br/> <span class="pre-in-pp"> - .WS +4 + .WS +2 A line of text - .WS -4 + .WS -2 </span> -The <kbd>.WS -4</kbd> undoes the effect of -<kbd>.WS +4</kbd>. You can also reset WS to its groff default +The <kbd>.WS -2</kbd> undoes the effect of +<kbd>.WS +2</kbd>. You can also reset WS to its groff default by entering <br/> <span class="pre-in-pp"> .WS DEFAULT </span> This can be particularly useful if you’ve been playing around -with plus and minus values, and can’t remember by how much you -have to in/decrease the word space to get it back to normal. +with plus and minus values, and can’t remember by how much to +in/decrease the word space to get it back to normal. </p> <!-- -SS- --> diff --git a/contrib/mom/momdoc/using.html b/contrib/mom/momdoc/using.html index 1f02757bd..7006761cd 100644 --- a/contrib/mom/momdoc/using.html +++ b/contrib/mom/momdoc/using.html @@ -3,7 +3,7 @@ This file is part of groff, the GNU roff type-setting system. Copyright (C) 2004, 2005, 2006, 2009, 2010, -2011, 2012 Free Software Foundation, Inc. +2011, 2012, 2013 Free Software Foundation, Inc. Written by Peter Schaffter (peter@schaffter.ca). Permission is granted to copy, distribute and/or modify this document diff --git a/contrib/mom/momdoc/version-2.html b/contrib/mom/momdoc/version-2.html index 5402d8ed0..15b38b187 100644 --- a/contrib/mom/momdoc/version-2.html +++ b/contrib/mom/momdoc/version-2.html @@ -3,7 +3,7 @@ This file is part of groff, the GNU roff type-setting system. Copyright (C) 2004, 2005, 2006, 2009, 2010, -2011, 2012 Free Software Foundation, Inc. +2011, 2012, 2013 Free Software Foundation, Inc. Written by Peter Schaffter (peter@schaffter.ca). Permission is granted to copy, distribute and/or modify this document @@ -344,7 +344,7 @@ recognizes PDF images that have been embedded with <p> A bash script, <strong>install-font</strong>, has been posted at the -<a href="http://www.schaffter.ca/mom/">mom site</a>. +<a href="http://www.schaffter.ca/mom/mom-01.html">mom site</a>. There’s nothing mom-specific about the script, and it is not an official part of groff. </p> diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac index ead01a6c6..b85b28f78 100644 --- a/contrib/mom/om.tmac +++ b/contrib/mom/om.tmac @@ -23,8 +23,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 2.0 ------------ +Version 2.0-a +------------- 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. @@ -3285,14 +3285,16 @@ end \# \n[.sss] holds the current sentence space value. \# .MAC WS END -. ds $WS_CONSTANT 12 -. ds $WS_VAR \\$1 -. ie '\\$1'DEFAULT' .ds $WS_VAR +0 -. el .ds $WS (\\*[$WS_CONSTANT]\\*[$WS_VAR]) -. ie \\n[.sss]=12 .ss \\*[$WS] 12 +. ds $WS_CURR \\n[.ss] +. ds $WS_VAR \\$1 +. ie '\\$1'DEFAULT' .ss 12 \\n[.sss] . el \{\ -. ss \\*[$WS] (\\*[$WS]\\*[$SS_VAR]) -. SS \\*[$SS_VAR] +. ds $WS (\\*[$WS_CURR]\\*[$WS_VAR]) +. ie \\n[.sss]=12 .ss \\*[$WS] 12 +. el \{\ +. ss \\*[$WS] (\\*[$WS]\\*[$SS_VAR]) +. SS \\*[$SS_VAR] +. \} . \} .END \# @@ -5471,7 +5473,7 @@ y\\R'#DESCENDER \\n[.cdp]' . if \\n[#PAGE_NUM_HYPHENS]=1 .PAGENUM_HYPHENS . \} . el .PAGENUM_HYPHENS -. if !\\n[#HDRFTR_RIGHT_CAPS] .HDRFTR_RIGHT_CAPS +. if !r #HDRFTR_RIGHT_CAPS .HDRFTR_RIGHT_CAPS . if \\n[#HDRFTR_RIGHT_CAPS]=0 \{\ . if !d $HDRFTR_RIGHT_SIZE_CHANGE .HDRFTR_RIGHT_SIZE +0 . \} @@ -8260,13 +8262,13 @@ $DOC_COVER_TITLE_\\n+[#DOC_COVER_TITLE_NUM] \\$\\n[#DOC_COVER_TITLE_NUM] \# Deposits --END-- at the end of a document. \# .MAC FINIS END -. br . if !\\n[@TOP] \{\ -. if \\n[.t]<=1v \{\ +. if \\n[.t]<=2v \{\ . tm1 "[mom]: Insufficient room to print \\$0 on last page. . return . \} . \} +. br . ev FINIS . evc 0 . if \\n[#TAB_ACTIVE] .TQ @@ -8284,11 +8286,12 @@ $DOC_COVER_TITLE_\\n+[#DOC_COVER_TITLE_NUM] \\$\\n[#DOC_COVER_TITLE_NUM] . ie \\n[#FINIS_COLOR] \ . PRINT \ \m[\\*[$FINIS_COLOR]]\v'-\\n[#EM_ADJUST]u'\[em]\v'+\\n[#EM_ADJUST]u'\ -\\*[$FINIS_STRING]\v'-\\n[#EM_ADJUST]u'\*[FU1]\[em]\m[] +\\*[$FINIS_STRING]\v'-\\n[#EM_ADJUST]u'\*[FU1]\[em]\m[]\c . el .PRINT \ \v'-\\n[#EM_ADJUST]u'\[em]\v'+\\n[#EM_ADJUST]u'\ -\\*[$FINIS_STRING]\v'-\\n[#EM_ADJUST]u'\*[FU1]\[em]\m[] +\\*[$FINIS_STRING]\v'-\\n[#EM_ADJUST]u'\*[FU1]\[em]\m[]\c . \} +. EL . if \\n[#FINIS_STRING_CAPS]=1 .CAPS OFF . ev . pdfsync @@ -9143,7 +9146,9 @@ $DOC_COVER_TITLE_\\n+[#DOC_COVER_TITLE_NUM] \\$\\n[#DOC_COVER_TITLE_NUM] . if \\n[#RECTO_VERSO] \{\ . nr #DOC_LR_MARGIN_TMP \\n[#DOC_L_MARGIN] . DOC_LEFT_MARGIN \\n[#DOC_R_MARGIN]u +. if \\n[#CROPS] .DOC_LEFT_MARGIN \\n[#DOC_R_MARGIN]u+\\n[cropmarks]u . DOC_RIGHT_MARGIN \\n[#DOC_LR_MARGIN_TMP]u +. if \\n[#CROPS] .DOC_RIGHT_MARGIN \\n[#DOC_LR_MARGIN_TMP]u-\\n[cropmarks]u . SWITCH_HDRFTR_CENTER_PAD . \} . \} @@ -9219,7 +9224,7 @@ $DOC_COVER_TITLE_\\n+[#DOC_COVER_TITLE_NUM] \\$\\n[#DOC_COVER_TITLE_NUM] . el .nr #Q_OFFSET \\n[#L_MARGIN]+\\*[$Q_OFFSET_VALUE] . po \\n[#Q_OFFSET]u . \} -\#. if \\n[#PRINT_STYLE]=2 .ALD \\n[#Q_LEAD_DIFF]u +. if \\n[#PRINT_STYLE]=2 .sp \\n[#Q_LEAD_DIFF]u . \} . if \\n[#EPIGRAPH] \{\ . ie \\n[#TAB_ACTIVE] .TAB \\n[#CURRENT_TAB] @@ -9239,7 +9244,7 @@ $DOC_COVER_TITLE_\\n+[#DOC_COVER_TITLE_NUM] \\$\\n[#DOC_COVER_TITLE_NUM] . \} . el \{\ . ie \\n[#EPI_FITS] .ns -. el .ALD \\n[#DOC_LEAD]u-\\n[#EPI_LEAD]u +. el .sp \\n[#DOC_LEAD]u-\\n[#EPI_LEAD]u . \} . \} . el .ns @@ -10211,8 +10216,16 @@ $DOC_COVER_TITLE_\\n+[#DOC_COVER_TITLE_NUM] \\$\\n[#DOC_COVER_TITLE_NUM] . if '\\$1'UNDERSCORE' \{\ . nr #HEAD_\\n[#LEVEL]_UNDERSCORE 1 . shift +. if '\\$1'' \{\ +. tm1 "[mom]: The UNDERSCORE argument to \\$0 requires a rule weight. +. ab Aborting \\n[.F] at \\$0, line \\n[.c]. +. \} . ds $HEAD_\\n[#LEVEL]_UL_WEIGHT \\$1 . shift +. if '\\$1'' \{\ +. tm1 "[mom]: The UNDERSCORE argument to \\$0 requires a rule gap. +. ab Aborting \\n[.F] at \\$0, line \\n[.c]. +. \} . ds $HEAD_\\n[#LEVEL]_UL_GAP \\$1 . shift . \} @@ -10223,10 +10236,22 @@ $DOC_COVER_TITLE_\\n+[#DOC_COVER_TITLE_NUM] \\$\\n[#DOC_COVER_TITLE_NUM] . if '\\$1'UNDERSCORE2' \{\ . nr #HEAD_\\n[#LEVEL]_UNDERSCORE2 1 . shift +. if '\\$1'' \{\ +. tm1 "[mom]: The UNDERSCORE2 argument to \\$0 requires a rule weight. +. ab Aborting \\n[.F] at \\$0, line \\n[.c]. +. \} . ds $HEAD_\\n[#LEVEL]_UL2_WEIGHT \\$1 . shift +. if '\\$1'' \{\ +. tm1 "[mom]: The UNDERSCORE2 argument to \\$0 requires a rule gap. +. ab Aborting \\n[.F] at \\$0, line \\n[.c]. +. \} . ds $HEAD_\\n[#LEVEL]_UL2_GAP_1 \\$1 . shift +. if '\\$1'' \{\ +. tm1 "[mom]: The UNDERSCORE2 argument to \\$0 requires an inter-rule gap. +. ab Aborting \\n[.F] at \\$0, line \\n[.c]. +. \} . ds $HEAD_\\n[#LEVEL]_UL2_GAP_2 \\$1 . shift . \} @@ -10565,24 +10590,17 @@ $DOC_COVER_TITLE_\\n+[#DOC_COVER_TITLE_NUM] \\$\\n[#DOC_COVER_TITLE_NUM] .MAC LINEBREAK END . if r #Q_AT_TOP .rr #Q_AT_TOP . po \\n[#DOC_L_MARGIN]u -. ie '\\*[$LINEBREAK_CHAR]'' .ALD \\n[#DOC_LEAD]u*2 +. ie '\\*[$LINEBREAK_CHAR]'' .sp 2 . el \{\ -. if \\n[#PRINT_STYLE]=1 \{\ -. ie \\n[#END_QUOTE] . -. el .ALD \\n[#DOC_LEAD]u -. \} -. if \\n[#PRINT_STYLE]=2 \{\ -. ie \\n[#END_QUOTE] . -. el .ALD \\n[#DOC_LEAD]u -. \} +. ie \\n[#END_QUOTE] . +. el .sp . ev LINEBREAK . evc 0 . CENTER . PRINT \ -\m[\\*[$LINEBREAK_COLOR]]\\v'\\*[$LINEBREAK_CHAR_V_ADJ]'\ -\\*[$LINEBREAK_CHAR]\\v'\\*[$LINEBREAK_CHAR_V_ADJ]'\m[] -. if \\n[#PRINT_STYLE]=1 .ALD \\n[#DOC_LEAD]u -. if \\n[#PRINT_STYLE]=2 .ALD \\n[#DOC_LEAD]u +\m[\\*[$LINEBREAK_COLOR]]\v'\\*[$LINEBREAK_CHAR_V_ADJ]'\ +\\*[$LINEBREAK_CHAR]\m[] +. sp . ev . QUAD \\*[$DOC_QUAD] . \} @@ -15769,8 +15787,9 @@ E\\R'#CAP_HEIGHT \\n[.cht]' \# Compensation is applied in FLOAT. .MAC TS END . if '\\n[.z]'FLOAT*DIV' \{\ -. if '\\$1'BOXED' \{\ -. if !\\n[.d] .nr boxed-table 1 +. if '\\$1'BOXED' \{\ +. if !\\n[.d] .nr boxed-table 1 +. \} . \} .END . @@ -15791,7 +15810,12 @@ E\\R'#CAP_HEIGHT \\n[.cht]' \# the diversion within the space allotted. \# .MAC FLOAT END +.\" Case where upcoming .br breaks to a new page, causing a defered float +.\" to be output by HEADER and the defer register to be cleared. +. nr pagenum \\n%+\\n[#PAGE_NUM_ADJ] +.\" Possibly breaks to a new page. . br +. if !(\\n%+\\n[#PAGE_NUM_ADJ])=\\n[pagenum] .nr broken*at*float 1 .\" Clear .ns when a single line of running text precededs float .\" at the top of the page. . if \\n[nl]=\\n[#T_MARGIN] \{\ @@ -15803,6 +15827,10 @@ E\\R'#CAP_HEIGHT \\n[.cht]' . rr #ARG_NUM . nr #ARG_NUM 0 1 . nr #OPTS \\n[#NUM_ARGS] +. if '\\$1'FORCE' \{\ +. nr #FORCE 1 +. shift +. \} . if '\\$1'ADJUST' \{\ . shift . ds float-adj:top \\$1 @@ -15823,17 +15851,23 @@ E\\R'#CAP_HEIGHT \\n[.cht]' . br . di . ev -. if (\\n[dn]>\\n[.t]):(\\n[D-float]>\\n[.t]) \{\ +. if ((\\n[dn]-\\n[.v])>\\n[.t]):(\\n[D-float]>\\n[.t]) \{\ . ie \\n[@TOP] \{\ . rs . sp . \} . el \{\ -. if !\\n[defer] .nr defer 0 1 -. rn FLOAT*DIV FLOAT*DIV:\\n+[defer] -. if \\n[D-float] .nr D-float:\\n[defer] \\n[D-float] -. nr float-depth:\\n[defer] \\n[dn] -. return \" output div after header +. ie \\n[#FORCE] \{\ +. NEWPAGE +. rr #FORCE +. \} +. el \{\ +. if !\\n[defer] .nr defer 0 1 +. rn FLOAT*DIV FLOAT*DIV:\\n+[defer] +. if \\n[D-float] .nr D-float:\\n[defer] \\n[D-float] +. nr float-depth:\\n[defer] \\n[dn] +. return \" output div after header +. \} . \} . \} . sp 0\\*[float-adj:top]\\*[float-adj] @@ -15853,6 +15887,12 @@ E\\R'#CAP_HEIGHT \\n[.cht]' . fi . rr #RESTORE_FILL . \} +. if \\n[broken*at*float] \{\ +. if !\\n[defer] \{\ +. sp -\\n[.v]u +. rr broken*at*float +. \} +. \} . rm FLOAT*DIV . sp 0\\*[float-adj:bottom]\\*[float-adj] . SHIM @@ -18361,7 +18401,7 @@ Macro MN: Warning: Right margin note #\\n[MN-curr] on page \\n[#P] shifted down. . ds pdf-img@file \\$1 . substring pdf-img@file -1 -3 . if !'\\*[pdf-img@file]'pdf' \{\ -. tm1 "[mom]: Image file at line \\n[.c] not found, or not a PDF image. +. tm1 "[mom]: Image file '\\*[pdf-img:file]' at line \\n[.c] not found, or not a PDF image. . ab Aborting. . \} . nr pdf-img:width \\$2 @@ -18411,7 +18451,7 @@ Macro MN: Warning: Right margin note #\\n[MN-curr] on page \\n[#P] shifted down. . ie \\n[@TOP] .rs . el \{\ . nr pgnum \\n%+\\n[#PAGE_NUM_ADJ] 1 -. tm1 "[mom]: Image \\*[pdf-img:file] at line \\n[.c] does not fit on output page \\n[pgnum]. +. tm1 "[mom]: Image '\\*[pdf-img:file]' at line \\n[.c] does not fit on output page \\n[pgnum]. . tm1 " Shifting to top of page \\n+[pgnum]. . ev . return @@ -18427,6 +18467,7 @@ Macro MN: Warning: Right margin note #\\n[MN-curr] on page \\n[#P] shifted down. \# .MAC PDF_IMAGE_CLEAN END . if !'\\n[.z]'FLOAT*DIV' .SHIM \" Get ourselves back on the baseline grid +. rm PDF*IMAGE . rm pdf-img:adj . rm pdf-img:bottom . rm pdf-img:file |