o Doc fixes in toc.html

o Control of null pagenumbering of covers passed to \n%; formerly
  handled by \n[#PAGE_NUM_ADJ]

4 files changed, 26 insertions, 6 deletions

diff --git a/contrib/mom/BUGS b/contrib/mom/BUGS
index feb5b6d3..3de7a9dc 100644
--- a/contrib/mom/BUGS
+++ b/contrib/mom/BUGS
@@ -21,6 +21,11 @@ Also, please--no html email.  That, too, gets nuked.
 --Peter Schaffter
 
 ========================================================================
+Version 1.5-c
+=============
+Covers and doccovers not always respecting null pagenumbering.
+--Fixed---
+
 Version 1.5-b
 =============
 Use of \E*[UC] and \E*[LC] inside strings for HDRFTR_RECTO and
diff --git a/contrib/mom/ChangeLog b/contrib/mom/ChangeLog
index 1ff75a9b..79bcecaf 100644
--- a/contrib/mom/ChangeLog
+++ b/contrib/mom/ChangeLog
@@ -1,3 +1,12 @@
+* Tue Dec 30 2008
+
+o Doc fixes in toc.html
+
+o Control of null pagenumbering of covers passed to \n%; formerly
+  handled by \n[#PAGE_NUM_ADJ]
+
+====================================================================
+
 * Tue Dec 23 2008
 
 o Added a CAPS option to HDRFTR_RECTO and HDRFTR_VERSO to allow
diff --git a/contrib/mom/momdoc/toc.html b/contrib/mom/momdoc/toc.html
index c2a1205c..56ff8c1d 100644
--- a/contrib/mom/momdoc/toc.html
+++ b/contrib/mom/momdoc/toc.html
@@ -2,8 +2,8 @@
 <!--
 This file is part of groff, the GNU roff type-setting system.
 
-Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
-Written by Peter Schaffter.
+Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation,
+Inc.  Written by Peter Schaffter.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
@@ -294,8 +294,8 @@ Alternatively, go directly to the
             <li><a href="docprocessing.html#REVISION">5.3.2.8 REVISION</a></li>
             <li><a href="docprocessing.html#COPYRIGHT">5.3.2.9 COPYRIGHT</a></li>
             <li><a href="docprocessing.html#MISC">5.3.2.10 MISC</a></li>
-            <li><a href="docprocessing.html#COVERTITLE">5.3.2.11 COVER_TITLE</a></li>
-            <li><a href="docprocessing.html#COVERTITLE">5.3.2.12 DOC_COVER_TITLE</a></li>
+            <li><a href="docprocessing.html#COVERTITLE">5.3.2.11 COVERTITLE</a></li>
+            <li><a href="docprocessing.html#COVERTITLE">5.3.2.12 DOC_COVERTITLE</a></li>
         </ul>
 
         <li><a href="docprocessing.html#DOCSTYLE_MACROS"><strong>5.3.3 The Docstyle Macros</strong></a> &mdash; telling <strong>mom</strong> what kind of document you're creating and how you want it to look overall</li>
diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac
index 7d36cd81..4bb37e8f 100644
--- a/contrib/mom/om.tmac
+++ b/contrib/mom/om.tmac
@@ -48,6 +48,7 @@ to a macro means that any argument turns the feature off.
 \# ====================================================================
 \#
 \# Check which version of groff is being run
+.if r#PAGINATE .ab
 .if (\n[.x]\n[.y] < 118) \
 .   ab [mom]: You need GNU troff version 1.18 or higher to run this version of mom.
 \# Check that GNU troff is being run
@@ -7409,22 +7410,27 @@ y\\R'#DESCENDER \\n[.cdp]'
 .    EOL
 .    TRAP
 .    NEWPAGE
+.    if \\n[#PAGINATION_WAS_ON]=1 \{ .nr % +1 \}
 .    if \\n[#DOCCOVER_END]=1 \{\
 .       ie \\n[#DOCCOVER_BLANKPAGE]=1 \{\
 .          NEWPAGE
 .          rr #DOCCOVER_BLANKPAGE
+.          if !\\n[#DOCCOVERS_COUNT]=1 \{ .nr % -2 \}
+.       \}
+.       el \{\
 .          if !\\n[#DOCCOVERS_COUNT]=1 \{ .nr #PAGE_NUM_ADJ -1 \}
 .       \}
-.       el \{ . \}
 .       rr #DOCCOVER_END
 .    \}
 .    if \\n[#COVER_END]=1 \{\
 .       ie \\n[#COVER_BLANKPAGE]=1 \{\
 .          NEWPAGE
 .          rr #COVER_BLANKPAGE
+.          if !\\n[#COVERS_COUNT]=1 \{ .nr % -2 \}
+.       \}
+.       el \{\
 .          if !\\n[#COVERS_COUNT]=1 \{ .nr #PAGE_NUM_ADJ -1 \}
 .       \}
-.       el \{ . \}
 .       rr #COVER_END
 .    \}
 .    ev