From 5ffefe3926dc1e261ea2894392bc11d9a7796489 Mon Sep 17 00:00:00 2001
From: PTPi <PTPi>
Date: Thu, 8 Sep 2011 18:30:42 +0000
Subject: Fixed bug that was causing HEADER_RULE OFF to turn off headers
 completely.  Fixed SUBSUBHEAD spacing issues.  Updated docs.

---
 contrib/mom/BUGS                 | 10 ++++++++++
 contrib/mom/ChangeLog            |  4 ++++
 contrib/mom/momdoc/reserved.html |  3 +++
 contrib/mom/om.tmac              | 35 ++++++++++++++++++++++-------------
 4 files changed, 39 insertions(+), 13 deletions(-)

(limited to 'contrib')

diff --git a/contrib/mom/BUGS b/contrib/mom/BUGS
index 3bddc48a..cf8f7d54 100644
--- a/contrib/mom/BUGS
+++ b/contrib/mom/BUGS
@@ -21,6 +21,16 @@ 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
 =========
 
diff --git a/contrib/mom/ChangeLog b/contrib/mom/ChangeLog
index 52f95539..40e977eb 100644
--- a/contrib/mom/ChangeLog
+++ b/contrib/mom/ChangeLog
@@ -1,3 +1,7 @@
+* 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.
diff --git a/contrib/mom/momdoc/reserved.html b/contrib/mom/momdoc/reserved.html
index d8cd524c..474f7c37 100644
--- a/contrib/mom/momdoc/reserved.html
+++ b/contrib/mom/momdoc/reserved.html
@@ -1803,6 +1803,9 @@ 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_&lt;n&gt;
diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac
index 6a72fc73..36fcd0d7 100644
--- a/contrib/mom/om.tmac
+++ b/contrib/mom/om.tmac
@@ -8948,8 +8948,12 @@ y\\R'#DESCENDER \\n[.cdp]'
 \#   on or off.
 \#
 .MAC HDRFTR_RULE END   \"To print rule under header/over footer.
-.    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 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 '\\$0'HDRFTR_RULE_INTERNAL' \{\
 .       ie \\n[#USERDEF_HDRFTR] \{\
 .          nr #CAP_HEIGHT_ADJUST \\n[#HDRFTR_HEIGHT]
@@ -10776,11 +10780,12 @@ y\\R'#DESCENDER \\n[.cdp]'
 \!.  TQ
 .    di
 .    ev
-.\" End collection of head for TOC
+.\" End collection of subhead 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
@@ -11042,7 +11047,7 @@ y\\R'#DESCENDER \\n[.cdp]'
 \!.  TQ
 .    di
 .    ev
-.\" End collection of head for TOC
+.\" End collection of subsubhead for TOC
 .\" Process subsubhead
 .    nr #ARG_NUM 0 1
 .    if r#QUOTE    \{ .rr #QUOTE    \}
@@ -11071,17 +11076,20 @@ y\\R'#DESCENDER \\n[.cdp]'
 .    if \\n[#PRINT_STYLE]=2 \{ .nr #SSH_LEAD_ADJUST \\n[#LEAD]/8 \}
 .    ie \\n[#START] \{ .RLD 1v \}
 .    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 \{\
+.       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
@@ -11695,6 +11703,7 @@ 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 \}
-- 
cgit v1.2.1