[Groff-commit] groff/contrib/mom BUGS ChangeLog om.tmac momdoc...

[Peter Schaffter]

CVSROOT:        /sources/groff
Module name:    groff
Changes by:     Peter Schaffter <PTPi>  11/09/08 18:30:43

Modified files:
        contrib/mom    : BUGS ChangeLog om.tmac 
        contrib/mom/momdoc: reserved.html 

Log message:
        Fixed bug that was causing HEADER_RULE OFF to turn off headers
        completely.  Fixed SUBSUBHEAD spacing issues.  Updated docs.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/BUGS?cvsroot=groff&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/ChangeLog?cvsroot=groff&r1=1.71&r2=1.72
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/om.tmac?cvsroot=groff&r1=1.63&r2=1.64
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/momdoc/reserved.html?cvsroot=groff&r1=1.41&r2=1.42

Patches:
Index: BUGS
===================================================================
RCS file: /sources/groff/groff/contrib/mom/BUGS,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- BUGS        22 Feb 2011 19:42:29 -0000      1.48
+++ BUGS        8 Sep 2011 18:30:42 -0000       1.49
@@ -21,6 +21,16 @@
 --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
 =========
 

Index: ChangeLog
===================================================================
RCS file: /sources/groff/groff/contrib/mom/ChangeLog,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- ChangeLog   22 Feb 2011 19:42:29 -0000      1.71
+++ ChangeLog   8 Sep 2011 18:30:43 -0000       1.72
@@ -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.

Index: om.tmac
===================================================================
RCS file: /sources/groff/groff/contrib/mom/om.tmac,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- om.tmac     22 Feb 2011 19:48:53 -0000      1.63
+++ om.tmac     8 Sep 2011 18:30:43 -0000       1.64
@@ -8948,8 +8948,12 @@
 \#   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 @@
 \!.  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 @@
 \!.  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,6 +11076,8 @@
 .    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 \}
 .       \}
@@ -11084,6 +11091,7 @@
 .          \}
 .       \}
 .    \}
+.    \}
 .\" Print subsubhead
 .    if \\n[#PRINT_STYLE]=1 \{\
 .       while \\n[#ARG_NUM]<\\n[#NUM_ARGS] \{\
@@ -11695,6 +11703,7 @@
 .       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 \}

Index: momdoc/reserved.html
===================================================================
RCS file: /sources/groff/groff/contrib/mom/momdoc/reserved.html,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- momdoc/reserved.html        22 Feb 2011 19:42:30 -0000      1.41
+++ momdoc/reserved.html        8 Sep 2011 18:30:43 -0000       1.42
@@ -1803,6 +1803,9 @@
                                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;