groff-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Groff-commit] groff/contrib/mom BUGS NEWS copyright groff_mom...


From: Peter Schaffter
Subject: [Groff-commit] groff/contrib/mom BUGS NEWS copyright groff_mom...
Date: Tue, 29 Jan 2013 05:02:47 +0000

CVSROOT:        /sources/groff
Module name:    groff
Changes by:     Peter Schaffter <PTPi>  13/01/29 05:02:47

Modified files:
        contrib/mom    : BUGS NEWS copyright groff_mom.man om.tmac 
        contrib/mom/examples: README.txt letter.mom mom-pdf.mom 
                              sample_docs.mom typesetting.mom 
        contrib/mom/momdoc: appendices.html color.html cover.html 
                            definitions.html docelement.html 
                            docprocessing.html goodies.html 
                            graphical.html headfootpage.html images.html 
                            inlines.html intro.html letters.html 
                            macrolist.html rectoverso.html refer.html 
                            reserved.html tables-of-contents.html 
                            toc.html typesetting.html using.html 
                            version-2.html 

Log message:
        Added FORCE argument to FLOAT; updated docs.
        Trivial fixes.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/BUGS?cvsroot=groff&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/NEWS?cvsroot=groff&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/copyright?cvsroot=groff&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/groff_mom.man?cvsroot=groff&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/om.tmac?cvsroot=groff&r1=1.68&r2=1.69
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/examples/README.txt?cvsroot=groff&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/examples/letter.mom?cvsroot=groff&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/examples/mom-pdf.mom?cvsroot=groff&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/examples/sample_docs.mom?cvsroot=groff&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/examples/typesetting.mom?cvsroot=groff&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/momdoc/appendices.html?cvsroot=groff&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/momdoc/color.html?cvsroot=groff&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/momdoc/cover.html?cvsroot=groff&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/momdoc/definitions.html?cvsroot=groff&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/momdoc/docelement.html?cvsroot=groff&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/momdoc/docprocessing.html?cvsroot=groff&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/momdoc/goodies.html?cvsroot=groff&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/momdoc/graphical.html?cvsroot=groff&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/momdoc/headfootpage.html?cvsroot=groff&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/momdoc/images.html?cvsroot=groff&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/momdoc/inlines.html?cvsroot=groff&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/momdoc/intro.html?cvsroot=groff&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/momdoc/letters.html?cvsroot=groff&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/momdoc/macrolist.html?cvsroot=groff&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/momdoc/rectoverso.html?cvsroot=groff&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/momdoc/refer.html?cvsroot=groff&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/momdoc/reserved.html?cvsroot=groff&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/momdoc/tables-of-contents.html?cvsroot=groff&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/momdoc/toc.html?cvsroot=groff&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/momdoc/typesetting.html?cvsroot=groff&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/momdoc/using.html?cvsroot=groff&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/momdoc/version-2.html?cvsroot=groff&r1=1.1&r2=1.2

Patches:
Index: BUGS
===================================================================
RCS file: /sources/groff/groff/contrib/mom/BUGS,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- BUGS        6 Sep 2012 21:14:42 -0000       1.51
+++ BUGS        29 Jan 2013 05:02:44 -0000      1.52
@@ -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 @@
 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 @@
 bottom margin.
 ---Fixed---
 
-Version 6
-=========
+Version 1-6
+===========
 
 ENDNOTE_STRING_CAPS not disabling caps when arg given.
 ---Fixed---

Index: NEWS
===================================================================
RCS file: /sources/groff/groff/contrib/mom/NEWS,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- NEWS        31 Aug 2012 22:49:57 -0000      1.35
+++ NEWS        29 Jan 2013 05:02:44 -0000      1.36
@@ -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

Index: copyright
===================================================================
RCS file: /sources/groff/groff/contrib/mom/copyright,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- copyright   31 Aug 2012 22:49:57 -0000      1.12
+++ copyright   29 Jan 2013 05:02:44 -0000      1.13
@@ -8,7 +8,7 @@
 
 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

Index: groff_mom.man
===================================================================
RCS file: /sources/groff/groff/contrib/mom/groff_mom.man,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- groff_mom.man       31 Aug 2012 22:49:57 -0000      1.17
+++ groff_mom.man       29 Jan 2013 05:02:45 -0000      1.18
@@ -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 <address@hidden>
 revised 2012 by Peter Schaffter <address@hidden>

Index: om.tmac
===================================================================
RCS file: /sources/groff/groff/contrib/mom/om.tmac,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- om.tmac     7 Sep 2012 19:16:13 -0000       1.68
+++ om.tmac     29 Jan 2013 05:02:45 -0000      1.69
@@ -23,8 +23,8 @@
 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,15 +3285,17 @@
 \#   \n[.sss] holds the current sentence space value.
 \#
 .MAC WS END
-.    ds $WS_CONSTANT 12
+.    ds $WS_CURR \\n[.ss]
 .    ds $WS_VAR \\$1
-.    ie '\\$1'DEFAULT' .ds $WS_VAR +0
-.    el .ds $WS (\\*[$WS_CONSTANT]\\*[$WS_VAR])
+.    ie '\\$1'DEFAULT' .ss 12 \\n[.sss]
+.    el \{\
+.       ds $WS (\\*[$WS_CURR]\\*[$WS_VAR])
 .    ie \\n[.sss]=12 .ss \\*[$WS] 12
 .    el \{\
 .       ss \\*[$WS] (\\*[$WS]\\*[$SS_VAR])
 .       SS \\*[$SS_VAR]
 .    \}
+.    \}
 .END
 \#
 \# SENTENCE SPACE CONTROL
@@ -5471,7 +5473,7 @@
 .       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 @@
 \#   Deposits --END-- at the end of a document.
 \#
 .MAC FINIS END
-.    br
 .    if address@hidden \{\
-.       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 @@
 .       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 @@
 .    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 @@
 .          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 @@
 .       \}
 .       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 @@
 .       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 @@
 .       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 @@
 .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
-.       \}
+.       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]
 .    \}
@@ -15772,6 +15790,7 @@
 .    if '\\$1'BOXED' \{\
 .       if !\\n[.d] .nr boxed-table 1
 .    \}
+.    \}
 .END
 .
 .MAC TE END
@@ -15791,7 +15810,12 @@
 \#   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 @@
 .    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,12 +15851,17 @@
 .       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 address@hidden \{\
 .             rs
 .             sp
 .          \}
 .          el \{\
+.             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]
@@ -15836,6 +15869,7 @@
 .             return \" output div after header
 .          \}
 .       \}
+.       \}
 .       sp 0\\*[float-adj:top]\\*[float-adj]
 .       if \\n[boxed-table] .sp 1-.35v
 .       if \\n[.u] .nr #RESTORE_FILL 1
@@ -15853,6 +15887,12 @@
 .          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 @@
 .    ds address@hidden \\$1
 .    substring address@hidden -1 -3
 .    if !'address@hidden'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 @@
 .       ie address@hidden .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 @@
 \#
 .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

Index: examples/README.txt
===================================================================
RCS file: /sources/groff/groff/contrib/mom/examples/README.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- examples/README.txt 31 Aug 2012 22:49:58 -0000      1.6
+++ examples/README.txt 29 Jan 2013 05:02:45 -0000      1.7
@@ -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,

Index: examples/letter.mom
===================================================================
RCS file: /sources/groff/groff/contrib/mom/examples/letter.mom,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- examples/letter.mom 31 Aug 2012 22:49:58 -0000      1.5
+++ examples/letter.mom 29 Jan 2013 05:02:45 -0000      1.6
@@ -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

Index: examples/mom-pdf.mom
===================================================================
RCS file: /sources/groff/groff/contrib/mom/examples/mom-pdf.mom,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- examples/mom-pdf.mom        31 Aug 2012 22:49:58 -0000      1.1
+++ examples/mom-pdf.mom        29 Jan 2013 05:02:45 -0000      1.2
@@ -441,7 +441,6 @@
 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 @@
 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 @@
 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

Index: examples/sample_docs.mom
===================================================================
RCS file: /sources/groff/groff/contrib/mom/examples/sample_docs.mom,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- examples/sample_docs.mom    31 Aug 2012 22:49:58 -0000      1.7
+++ examples/sample_docs.mom    29 Jan 2013 05:02:45 -0000      1.8
@@ -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,

Index: examples/typesetting.mom
===================================================================
RCS file: /sources/groff/groff/contrib/mom/examples/typesetting.mom,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- examples/typesetting.mom    31 Aug 2012 22:49:58 -0000      1.4
+++ examples/typesetting.mom    29 Jan 2013 05:02:45 -0000      1.5
@@ -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,

Index: momdoc/appendices.html
===================================================================
RCS file: /sources/groff/groff/contrib/mom/momdoc/appendices.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- momdoc/appendices.html      31 Aug 2012 22:49:58 -0000      1.23
+++ momdoc/appendices.html      29 Jan 2013 05:02:45 -0000      1.24
@@ -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 (address@hidden).
 
 Permission is granted to copy, distribute and/or modify this document

Index: momdoc/color.html
===================================================================
RCS file: /sources/groff/groff/contrib/mom/momdoc/color.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- momdoc/color.html   31 Aug 2012 22:49:58 -0000      1.15
+++ momdoc/color.html   29 Jan 2013 05:02:45 -0000      1.16
@@ -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 (address@hidden).
 
 Permission is granted to copy, distribute and/or modify this document

Index: momdoc/cover.html
===================================================================
RCS file: /sources/groff/groff/contrib/mom/momdoc/cover.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- momdoc/cover.html   31 Aug 2012 22:49:58 -0000      1.17
+++ momdoc/cover.html   29 Jan 2013 05:02:45 -0000      1.18
@@ -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 (address@hidden).
 
 Permission is granted to copy, distribute and/or modify this document

Index: momdoc/definitions.html
===================================================================
RCS file: /sources/groff/groff/contrib/mom/momdoc/definitions.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- momdoc/definitions.html     31 Aug 2012 22:49:58 -0000      1.20
+++ momdoc/definitions.html     29 Jan 2013 05:02:45 -0000      1.21
@@ -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 (address@hidden).
 
 Permission is granted to copy, distribute and/or modify this document

Index: momdoc/docelement.html
===================================================================
RCS file: /sources/groff/groff/contrib/mom/momdoc/docelement.html,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- momdoc/docelement.html      31 Aug 2012 22:49:58 -0000      1.39
+++ momdoc/docelement.html      29 Jan 2013 05:02:45 -0000      1.40
@@ -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 (address@hidden).
 
 Permission is granted to copy, distribute and/or modify this document
@@ -1266,7 +1266,7 @@
 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 @@
 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

Index: momdoc/docprocessing.html
===================================================================
RCS file: /sources/groff/groff/contrib/mom/momdoc/docprocessing.html,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- momdoc/docprocessing.html   31 Aug 2012 22:49:58 -0000      1.41
+++ momdoc/docprocessing.html   29 Jan 2013 05:02:46 -0000      1.42
@@ -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 (address@hidden).
 
 Permission is granted to copy, distribute and/or modify this document

Index: momdoc/goodies.html
===================================================================
RCS file: /sources/groff/groff/contrib/mom/momdoc/goodies.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- momdoc/goodies.html 31 Aug 2012 22:49:59 -0000      1.30
+++ momdoc/goodies.html 29 Jan 2013 05:02:46 -0000      1.31
@@ -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 (address@hidden).
 
 Permission is granted to copy, distribute and/or modify this document

Index: momdoc/graphical.html
===================================================================
RCS file: /sources/groff/groff/contrib/mom/momdoc/graphical.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- momdoc/graphical.html       31 Aug 2012 22:49:59 -0000      1.9
+++ momdoc/graphical.html       29 Jan 2013 05:02:46 -0000      1.10
@@ -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 (address@hidden).
 
 Permission is granted to copy, distribute and/or modify this document

Index: momdoc/headfootpage.html
===================================================================
RCS file: /sources/groff/groff/contrib/mom/momdoc/headfootpage.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- momdoc/headfootpage.html    31 Aug 2012 22:49:59 -0000      1.24
+++ momdoc/headfootpage.html    29 Jan 2013 05:02:46 -0000      1.25
@@ -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 (address@hidden).
 
 Permission is granted to copy, distribute and/or modify this document
@@ -938,7 +938,7 @@
 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>
 

Index: momdoc/images.html
===================================================================
RCS file: /sources/groff/groff/contrib/mom/momdoc/images.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- momdoc/images.html  31 Aug 2012 22:49:59 -0000      1.3
+++ momdoc/images.html  29 Jan 2013 05:02:46 -0000      1.4
@@ -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 (address@hidden).
 
 Permission is granted to copy, distribute and/or modify this document
@@ -245,11 +245,12 @@
 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&#8217;t fit on the output
+which is to say that if an image doesn&#8217;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 @@
 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 @@
 </div>
 
 <div class="box-macro-args">
-Macro: <b>FLOAT</b> <kbd class="macro-args">ADJUST [ +|-&lt;amount&gt; ] | 
&lt;anything&gt;</kbd>
+Macro: <b>FLOAT</b> <kbd class="macro-args">[ FORCE ] [ ADJUST 
+|-&lt;amount&gt; ] | &lt;anything&gt;</kbd>
 </div>
 
 <div class="box-tip">
@@ -449,6 +458,16 @@
 </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.

Index: momdoc/inlines.html
===================================================================
RCS file: /sources/groff/groff/contrib/mom/momdoc/inlines.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- momdoc/inlines.html 31 Aug 2012 22:49:59 -0000      1.27
+++ momdoc/inlines.html 29 Jan 2013 05:02:46 -0000      1.28
@@ -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 (address@hidden).
 
 Permission is granted to copy, distribute and/or modify this document

Index: momdoc/intro.html
===================================================================
RCS file: /sources/groff/groff/contrib/mom/momdoc/intro.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- momdoc/intro.html   31 Aug 2012 22:49:59 -0000      1.22
+++ momdoc/intro.html   29 Jan 2013 05:02:46 -0000      1.23
@@ -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 (address@hidden).
 
 Permission is granted to copy, distribute and/or modify this document

Index: momdoc/letters.html
===================================================================
RCS file: /sources/groff/groff/contrib/mom/momdoc/letters.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- momdoc/letters.html 31 Aug 2012 22:49:59 -0000      1.18
+++ momdoc/letters.html 29 Jan 2013 05:02:46 -0000      1.19
@@ -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 (address@hidden).
 
 Permission is granted to copy, distribute and/or modify this document

Index: momdoc/macrolist.html
===================================================================
RCS file: /sources/groff/groff/contrib/mom/momdoc/macrolist.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- momdoc/macrolist.html       31 Aug 2012 22:49:59 -0000      1.20
+++ momdoc/macrolist.html       29 Jan 2013 05:02:46 -0000      1.21
@@ -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 (address@hidden).
 
 Permission is granted to copy, distribute and/or modify this document

Index: momdoc/rectoverso.html
===================================================================
RCS file: /sources/groff/groff/contrib/mom/momdoc/rectoverso.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- momdoc/rectoverso.html      6 Sep 2012 21:14:42 -0000       1.17
+++ momdoc/rectoverso.html      29 Jan 2013 05:02:46 -0000      1.18
@@ -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 (address@hidden).
 
 Permission is granted to copy, distribute and/or modify this document

Index: momdoc/refer.html
===================================================================
RCS file: /sources/groff/groff/contrib/mom/momdoc/refer.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- momdoc/refer.html   6 Sep 2012 21:14:42 -0000       1.15
+++ momdoc/refer.html   29 Jan 2013 05:02:46 -0000      1.16
@@ -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 (address@hidden).
 
 Permission is granted to copy, distribute and/or modify this document

Index: momdoc/reserved.html
===================================================================
RCS file: /sources/groff/groff/contrib/mom/momdoc/reserved.html,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- momdoc/reserved.html        31 Aug 2012 22:49:59 -0000      1.43
+++ momdoc/reserved.html        29 Jan 2013 05:02:46 -0000      1.44
@@ -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 (address@hidden).
 
 Permission is granted to copy, distribute and/or modify this document

Index: momdoc/tables-of-contents.html
===================================================================
RCS file: /sources/groff/groff/contrib/mom/momdoc/tables-of-contents.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- momdoc/tables-of-contents.html      6 Sep 2012 21:14:42 -0000       1.5
+++ momdoc/tables-of-contents.html      29 Jan 2013 05:02:46 -0000      1.6
@@ -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 (address@hidden).
 
 Permission is granted to copy, distribute and/or modify this document

Index: momdoc/toc.html
===================================================================
RCS file: /sources/groff/groff/contrib/mom/momdoc/toc.html,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- momdoc/toc.html     31 Aug 2012 22:49:59 -0000      1.41
+++ momdoc/toc.html     29 Jan 2013 05:02:46 -0000      1.42
@@ -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 (address@hidden).
 
 Permission is granted to copy, distribute and/or modify this document
@@ -21,7 +21,7 @@
 
 <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 @@
 <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>

Index: momdoc/typesetting.html
===================================================================
RCS file: /sources/groff/groff/contrib/mom/momdoc/typesetting.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- momdoc/typesetting.html     31 Aug 2012 22:50:00 -0000      1.30
+++ momdoc/typesetting.html     29 Jan 2013 05:02:46 -0000      1.31
@@ -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 (address@hidden).
 
 Permission is granted to copy, distribute and/or modify this document
@@ -1910,46 +1910,45 @@
 </p>
 
 <p>
-Word space is relative to type size.  Knowing how it&#8217;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&nbsp;-4</kbd> undoes the effect of
-<kbd>.WS&nbsp;+4</kbd>.  You can also reset WS to its groff default
+The <kbd>.WS&nbsp;-2</kbd> undoes the effect of
+<kbd>.WS&nbsp;+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&#8217;ve been playing around
-with plus and minus values, and can&#8217;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&#8217;t remember by how much to
+in/decrease the word space to get it back to normal.
 </p>
 
 <!-- -SS- -->

Index: momdoc/using.html
===================================================================
RCS file: /sources/groff/groff/contrib/mom/momdoc/using.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- momdoc/using.html   31 Aug 2012 22:50:00 -0000      1.17
+++ momdoc/using.html   29 Jan 2013 05:02:47 -0000      1.18
@@ -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 (address@hidden).
 
 Permission is granted to copy, distribute and/or modify this document

Index: momdoc/version-2.html
===================================================================
RCS file: /sources/groff/groff/contrib/mom/momdoc/version-2.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- momdoc/version-2.html       31 Aug 2012 22:50:00 -0000      1.1
+++ momdoc/version-2.html       29 Jan 2013 05:02:47 -0000      1.2
@@ -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 (address@hidden).
 
 Permission is granted to copy, distribute and/or modify this document
@@ -344,7 +344,7 @@
 
 <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&#8217;s nothing mom-specific about the script, and it is not
 an official part of groff.
 </p>



reply via email to

[Prev in Thread] Current Thread [Next in Thread]