groff-commit
[Top][All Lists]
Advanced

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

[Groff-commit] groff/contrib/mom BUGS ChangeLog NEWS TODO copy...


From: Peter Schaffter
Subject: [Groff-commit] groff/contrib/mom BUGS ChangeLog NEWS TODO copy...
Date: Wed, 24 Dec 2008 01:48:58 +0000

CVSROOT:        /sources/groff
Module name:    groff
Changes by:     Peter Schaffter <PTPi>  08/12/24 01:48:57

Modified files:
        contrib/mom    : BUGS ChangeLog NEWS TODO copyright om.tmac 
        contrib/mom/momdoc: goodies.html headfootpage.html inlines.html 
                            reserved.html toc.html 

Log message:
        o Added a CAPS option to HDRFTR_RECTO and HDRFTR_VERSO to allow
          capitalization of reserved strings when designing recto and/or
          verso headers.  Fixed docs accordingly.
        
        o Added .nr #DIVER_DEPTH 0 to end of PRINT_PAGE_NUMBER to ensure
          that #DIVER_DEPTH=0
        
        o Moved string definition of $FONT in macro FT to top of macro.
        
        o Moved string definition of $FAMILY in macro FAMILY to top of
          macro.
        
        o Changed condition generating #NO_BREAK at top of macro COLLATE
          from
            .if ( \\n[.t] < \\n[.v] ) \{ .nr #NO_BREAK 1 \}
          to
            .if ( (\\n[.t]-1) <= \\n[.v] ) \{ .nr #NO_BREAK 1 \}
        
          (Bottom-of-page trap is tripped 1 unit below last legal
          baseline, not on it.)
        
        o Commented out what appears to be a superfluous and destructive
          resetting of #VARIABLE_FOOTER_POSITION at line 13347 in FOOTNOTE
          macro.  For now, fixes the "vanishing first footnote with some
          overflow" bug.
        
        o Added a bit to .PP to accommodate .PP_FONT I when PRINTSTYLE is
          TYPEWRITE and ITALIC_MEANS_ITALIC
        
        o Removed spurious 'sp |\\n[MN-curr-pos]u from MNbottom-right, prior
          to re-invoking traps.  Hopefully, fixes vanishing RH margin notes
          bug.
        
        o Added missing spaced paras bit in blockquotes.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/BUGS?cvsroot=groff&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/ChangeLog?cvsroot=groff&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/NEWS?cvsroot=groff&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/TODO?cvsroot=groff&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/copyright?cvsroot=groff&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/om.tmac?cvsroot=groff&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/momdoc/goodies.html?cvsroot=groff&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/momdoc/headfootpage.html?cvsroot=groff&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/momdoc/inlines.html?cvsroot=groff&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/momdoc/reserved.html?cvsroot=groff&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/momdoc/toc.html?cvsroot=groff&r1=1.28&r2=1.29

Patches:
Index: BUGS
===================================================================
RCS file: /sources/groff/groff/contrib/mom/BUGS,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- BUGS        16 Feb 2008 04:39:56 -0000      1.36
+++ BUGS        24 Dec 2008 01:48:56 -0000      1.37
@@ -1,4 +1,4 @@
-    Copyright 2004, 2005, 2006
+    Copyright 2004, 2005, 2006, 2007, 2008
       Free Software Foundation, Inc.
 
     Copying and distribution of this file, with or without modification,
@@ -13,8 +13,6 @@
 suggestions, or contact me directly at:
 
     address@hidden
-    or
-    address@hidden
 
 If writing me directly, please include the word "groff" or "mom" in
 the Subject line or you risk my spam filters nuking your message.
@@ -23,6 +21,42 @@
 --Peter Schaffter
 
 ========================================================================
+Version 1.5-b
+=============
+Use of \E*[UC] and \E*[LC] inside strings for HDRFTR_RECTO and
+HDRFTR_VERSO breaking headers.
+---Not fixable.  CAPS option added to HDRFTR_RECTO/VERSO to
+   accomodate situations where capitalized reserved
+   strings(\*[$TITLE], \*[$AUTHOR], etc) are desired.---
+
+COLLATE depositing a blank page if last output line before it falls
+at the bottom of running text.
+---Fixed---
+
+PRINTSTYLE TYPEWRITE not setting $FAMILY or $FONT or $PP_FT, with
+consequences for COLLATE.
+---Fixed---
+
+FOOTNOTE_MARKERS OFF not disabling footnote markers if used before
+START.
+---Fixed---
+
+1st footnotes with overflow vanishing altogether with an
+"automatically ending diversion `FN_OVERFLOW' on exit" warning.
+---Fixed---
+
+Right hand margin notes vanishing when an RH margin note overflows
+to the next output page.
+---Fixed (I think)---
+
+Doc bug; \*[S<size>] escape incorrectly typed as \*S[<size>] in the
+section on mom's inlines.
+---Fixed---
+
+Paragraphs inside blockquotes not being spaced when .PARA_SPACE is
+active.
+---Fixed---
+
 Version 1.5-a
 =============
 Indenting of references (collected with .REF) on endnotes pages when

Index: ChangeLog
===================================================================
RCS file: /sources/groff/groff/contrib/mom/ChangeLog,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- ChangeLog   16 Feb 2008 04:39:57 -0000      1.56
+++ ChangeLog   24 Dec 2008 01:48:56 -0000      1.57
@@ -1,3 +1,52 @@
+* Tue Dec 23 2008
+
+o Added a CAPS option to HDRFTR_RECTO and HDRFTR_VERSO to allow
+  capitalization of reserved strings when designing recto and/or
+  verso headers.  Fixed docs accordingly.
+
+* Sun Nov 30 2008
+
+o Added .nr #DIVER_DEPTH 0 to end of PRINT_PAGE_NUMBER to ensure
+  that #DIVER_DEPTH=0
+
+o Moved string definition of $FONT in macro FT to top of macro.
+
+o Moved string definition of $FAMILY in macro FAMILY to top of
+  macro.
+
+o Changed condition generating #NO_BREAK at top of macro COLLATE
+  from
+    .if ( \\n[.t] < \\n[.v] ) \{ .nr #NO_BREAK 1 \}
+  to
+    .if ( (\\n[.t]-1) <= \\n[.v] ) \{ .nr #NO_BREAK 1 \}
+
+  (Bottom-of-page trap is tripped 1 unit below last legal
+  baseline, not on it.)
+
+* Tue Nov 25 2008
+
+o Commented out what appears to be a superfluous and destructive
+  resetting of #VARIABLE_FOOTER_POSITION at line 13347 in FOOTNOTE
+  macro.  For now, fixes the "vanishing first footnote with some
+  overflow" bug.
+
+* Mon Oct 6 2008
+
+o Added a bit to .PP to accommodate .PP_FONT I when PRINTSTYLE is
+  TYPEWRITE and ITALIC_MEANS_ITALIC
+
+* Mon Jun 30 2008
+
+o Removed spurious 'sp |\\n[MN-curr-pos]u from MNbottom-right, prior
+  to re-invoking traps.  Hopefully, fixes vanishing RH margin notes
+  bug.
+
+* Sun Mar 16 2008
+
+o Added missing spaced paras bit in blockquotes.
+
+====================================================================
+
 * Tue Jan 22 2008
 
 o Fixed indent handling of refer items in endnotes.

Index: NEWS
===================================================================
RCS file: /sources/groff/groff/contrib/mom/NEWS,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- NEWS        13 Sep 2007 16:57:59 -0000      1.28
+++ NEWS        24 Dec 2008 01:48:56 -0000      1.29
@@ -1,10 +1,18 @@
-    Copyright 2004, 2005, 2006
+    Copyright 2004, 2005, 2006, 2007, 2008
       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 1.5-c
+-------------
+Bugfix release (see BUGS, Version 1.5-b).
+
+Release 1.5-b
+-------------
+Bugfix release (see BUGS, Version 1.5-a).
+
 Release 1.5-a
 -------------
 Bugfix release (see BUGS, Version 1.5).

Index: TODO
===================================================================
RCS file: /sources/groff/groff/contrib/mom/TODO,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- TODO        18 Aug 2007 07:06:56 -0000      1.12
+++ TODO        24 Dec 2008 01:48:56 -0000      1.13
@@ -1,4 +1,4 @@
-    Copyright 2004, 2005, 2006
+    Copyright 2004, 2005, 2006, 2007, 2008
       Free Software Foundation, Inc.
 
     Copying and distribution of this file, with or without modification,

Index: copyright
===================================================================
RCS file: /sources/groff/groff/contrib/mom/copyright,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- copyright   1 Aug 2006 01:11:51 -0000       1.6
+++ copyright   24 Dec 2008 01:48:56 -0000      1.7
@@ -1,6 +1,6 @@
 AUTHOR
 ------
-Peter Schaffter (address@hidden) (address@hidden)
+Peter Schaffter (address@hidden)
 3-281, rue de Cannes
 Gatineau (QC)
 J8T 8B9
@@ -8,7 +8,7 @@
 ========================================================================
 
 The groff macro file om.tmac and the html documentation pertaining
-to it are copyright (c) 2004, 2005, 2006 Peter Schaffter.
+to it are copyright (c) 2004, 2005, 2006, 2007, 2008 Peter Schaffter.
 
 om.tmac is issued under the GNU General Public License, a full copy of
 which can be had at

Index: om.tmac
===================================================================
RCS file: /sources/groff/groff/contrib/mom/om.tmac,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- om.tmac     16 Feb 2008 04:39:57 -0000      1.44
+++ om.tmac     24 Dec 2008 01:48:56 -0000      1.45
@@ -2,7 +2,8 @@
 .ig
 Mom -- a typesetting/document-processing macro set for groff.
 
-Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007,
+2008 Free Software Foundation, Inc.
      Written by Peter Schaffter (address@hidden)
 
 This file is part of groff.
@@ -21,7 +22,7 @@
 with groff; see the file COPYING.  If not, write to the Free Software
 Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-Version 1.5-b
+Version 1.5-c
 -------------
 Antoine de St-Exupéry asserted that elegance in engineering is
 achieved not when there is nothing left to add, but when there is
@@ -449,6 +450,7 @@
 \#   to $FAMILY.
 \#
 .MAC FAMILY END
+.    ds $FAMILY \\$1
 .    if \\n[#PRINT_STYLE]=1 \{\
 .       fam C
 .       return
@@ -460,7 +462,6 @@
 .    if (\\n[.x]\\n[.y]\\n[.Y] >= 1192) \{\
 .       ds $SAVED_STYLE \\n[.sty]
 .    \}
-.    ds $FAMILY \\$1
 .    ft 0
 .    fam \\*[$FAMILY]
 .    if (\\n[.x]\\n[.y]\\n[.Y] >= 1192) \{\
@@ -486,6 +487,7 @@
 \#  Stores user supplied font in $FONT and sets .ft to $FONT.
 \#
 .MAC FT END
+.    ds $FONT \\$1
 .    if \\n[#PRINT_STYLE]=1 \{\
 .       ie '\\$1'I' \{\
 .          if \\n[#UNDERLINE_ITALIC]=1 \{\
@@ -501,7 +503,6 @@
 .       el \{ .UNDERLINE OFF \}
 .       return
 .    \}
-.    ds $FONT \\$1
 .    ft 0
 .    ft \\*[$FONT]
 .    if (\\n[.x]\\n[.y]\\n[.Y] >= 1192) \{\
@@ -645,7 +646,7 @@
 .ds IT   \EfI
 .ds BD   \EfB
 .ds BDI  \Ef(BI
-.ds PREV \EfP
+.ds PREV \Ef[]
 .ds S    \Es
 \#
 \# =====================================================================
@@ -1195,9 +1196,15 @@
 .    rr #ARGS_TO_SQ
 .    if \\n[#RESTORE_SQ]=1 \{\
 .       rr #RESTORE_SQ
+.       ie '\\*[$RESTORE_SQ]'' \{\
+.          ds $QUOTE0 \[dq]
+.          ds $QUOTE1 \[dq]
+.       \}
+.       el \{\
 .       SMARTQUOTES \\*[$RESTORE_SQ]
 .       return
 .    \}
+.    \}
 .    ie '\\$1'' \{\
 .       nr #OPEN_CLOSE 0
 .       ds $QUOTE0 \\[lq]
@@ -5605,7 +5612,9 @@
 .    if !d$FN_QUAD              \{ .FOOTNOTE_QUAD \\*[$DOC_QUAD]       \}
 .    if !r#FN_RULE              \{ .FOOTNOTE_RULE                      \}
 .    if !r#FN_MARKERS           \{ .FOOTNOTE_MARKERS                   \}
+.    if \\n[#FN_MARKERS]=1 \{\
 .    if !\\n[#FN_MARKER_STYLE]  \{ .FOOTNOTE_MARKER_STYLE STAR         \}
+.    \}
 .    if !\\n[#EN_MARKER_STYLE]  \{ .ENDNOTE_MARKER_STYLE NUMBER        \}
 .    if !d$EN_PN_STYLE          \{ .ENDNOTES_PAGENUM_STYLE digit       \}
 .    if !d$EN_FAM               \{ .ENDNOTE_FAMILY \\*[$DOC_FAM]       \}
@@ -9123,6 +9132,8 @@
 .    if '\\$1'CENTRE' \{ .nr #USERDEF_HDRFTR_RECTO_QUAD 2 \}
 .    if '\\$1'R'      \{ .nr #USERDEF_HDRFTR_RECTO_QUAD 3 \}
 .    if '\\$1'RIGHT'  \{ .nr #USERDEF_HDRFTR_RECTO_QUAD 3 \}
+.    shift
+.    if '\\$1'CAPS' \{ .nr #HDRFTR_RECTO_CAPS 1 \}
 .    ds $USERDEF_HDRFTR_RECTO \\$2
 .END
 \#
@@ -9148,10 +9159,11 @@
 .    if '\\$1'CENTRE' \{ .nr #USERDEF_HDRFTR_VERSO_QUAD 2 \}
 .    if '\\$1'R'      \{ .nr #USERDEF_HDRFTR_VERSO_QUAD 3 \}
 .    if '\\$1'RIGHT'  \{ .nr #USERDEF_HDRFTR_VERSO_QUAD 3 \}
+.    shift
+.    if '\\$1'CAPS' \{ .nr #HDRFTR_VERSO_CAPS 1 \}
 .    ds $USERDEF_HDRFTR_VERSO \\$2
 .END
 \#
-\#
 \# PRINT FOOTER ON FIRST PAGE
 \# --------------------------
 \# *Arguments:
@@ -9426,7 +9438,9 @@
 .          if \\n[#USERDEF_HDRFTR_RECTO_QUAD]=1 \{ .LEFT   \}
 .          if \\n[#USERDEF_HDRFTR_RECTO_QUAD]=2 \{ .CENTER \}
 .          if \\n[#USERDEF_HDRFTR_RECTO_QUAD]=3 \{ .RIGHT  \}
+.          if \\n[#HDRFTR_RECTO_CAPS]=1 \{ .CAPS \}
 .          PRINT \\*[$USERDEF_HDRFTR_RECTO]
+.          if \\n[#HDRFTR_RECTO_CAPS]=1 \{ .CAPS OFF \}
 .          EOL
 .          if \\n[#FOOTERS_ON] \{\
 .             di NULL
@@ -9440,7 +9454,9 @@
 .             if \\n[#USERDEF_HDRFTR_VERSO_QUAD]=1 \{ .LEFT   \}
 .             if \\n[#USERDEF_HDRFTR_VERSO_QUAD]=2 \{ .CENTER \}
 .             if \\n[#USERDEF_HDRFTR_VERSO_QUAD]=3 \{ .RIGHT  \}
+.             if \\n[#HDRFTR_VERSO_CAPS]=1 \{ .CAPS \}
 .             PRINT \\*[$USERDEF_HDRFTR_VERSO]
+.             if \\n[#HDRFTR_VERSO_CAPS]=1 \{ .CAPS OFF \}
 .             EOL
 .             if \\n[#FOOTERS_ON] \{\
 .                di NULL
@@ -9453,7 +9469,9 @@
 .             if \\n[#USERDEF_HDRFTR_RECTO_QUAD]=1 \{ .LEFT   \}
 .             if \\n[#USERDEF_HDRFTR_RECTO_QUAD]=2 \{ .CENTER \}
 .             if \\n[#USERDEF_HDRFTR_RECTO_QUAD]=3 \{ .RIGHT  \}
+.             if \\n[#HDRFTR_RECTO_CAPS]=1 \{ .CAPS \}
 .             PRINT \\*[$USERDEF_HDRFTR_RECTO]
+.             if \\n[#HDRFTR_RECTO_CAPS]=1 \{ .CAPS OFF \}
 .             EOL
 .             if \\n[#FOOTERS_ON] \{\
 .                di NULL
@@ -9468,7 +9486,9 @@
 .       if \\n[#USERDEF_HDRFTR_RECTO_QUAD]=1 \{ .LEFT   \}
 .       if \\n[#USERDEF_HDRFTR_RECTO_QUAD]=2 \{ .CENTER \}
 .       if \\n[#USERDEF_HDRFTR_RECTO_QUAD]=3 \{ .RIGHT  \}
+.       if \\n[#HDRFTR_RECTO_CAPS]=1 \{ .CAPS \}
 .       PRINT \\*[$USERDEF_HDRFTR_RECTO]
+.       if \\n[#HDRFTR_RECTO_CAPS]=1 \{ .CAPS OFF \}
 .       EOL
 .       if \\n[#FOOTERS_ON] \{\
 .          di NULL
@@ -11104,7 +11124,10 @@
 \#   Affects all paragraphs.
 \#
 .MAC PP_FONT END
-.    if \\n[#IGNORE] \{ .return \}
+.    if \n[#PRINT_STYLE]=1 \{\
+.       ie \n[#ITALIC_MEANS_ITALIC] \{ .nop \}
+.       el \{ .return \}
+.    \}
 .    br
 .    if \\n[#COLLATE]=1 \{\
 .       if !'\\*[$SAVED_PP_FT]'' \{ .rm $SAVED_PP_FT \}
@@ -11231,6 +11254,9 @@
 .          if \\n[#SLANT_ON] \{\
 .             if \\n[#UNDERLINE_SLANT] \{ .UNDERLINE \}
 .          \}
+.          if '\\*[$PP_FT]'I' \{\
+.             if \\n[#ITALIC_MEANS_ITALIC] \{ .FT I \}
+.          \}
 .       \}
 .       el \{\
 .          ie \\n[#ENDNOTE] \{\
@@ -11336,6 +11362,7 @@
 .       \}
 .       el \{\
 .          ti \\n[#PP_INDENT]u/2u
+.          if \\n[#PP_SPACE]=1 \{ .ALD \\n[#DOC_LEAD]u \}
 .       \}
 .       if \\n[#CONDENSE] \{\
 \E*[COND]\c
@@ -11867,7 +11894,7 @@
 .       el \{ .RLD 0-\\n[#Q_LEAD_DIFF]u \}
 .    \}
 .    el \{\
-.       ALD \\n[#Q_SPACE_ADJ]u
+.       if \\n[#PRINT_STYLE]=2 \{ .ALD \\n[#Q_SPACE_ADJ]u \}
 .    \}
 .    if \\n[#QUOTE]=1 \{\
 .       nf
@@ -11880,6 +11907,7 @@
 .    \}
 .    if \\n[#PRINT_STYLE]=1 \{\
 .       ALD \\n[#DOC_LEAD]u
+.       if !\\n[.v]=\\n[#DOC_LEAD] \{ .SHIM \}
 .    \}
 .    if \\n[#PRINT_STYLE]=2 \{\
 .       ie \\n[#START] \{\
@@ -12267,7 +12295,7 @@
 .    nr #HYPHEN_ADJ \\n[#CAP_HEIGHT]/12
 .    ds $HYPHEN \v'-\En[#HYPHEN_ADJ]u'-\v'\En[#HYPHEN_ADJ]u'
 .    PRINT \m[\\*[$PAGENUM_COLOR]]\\*[$HYPHEN]\|\\n[#PAGENUMBER]\|\\*[$HYPHEN]
-.br
+.    br
 .END
 \#
 \#
@@ -12362,6 +12390,7 @@
 .       el \{ .PRINT "\m[\\*[$PAGENUM_COLOR]]\\n[#PAGENUMBER]" \}
 .    \}
 .    ev
+.    nr #DIVER_DEPTH 0
 .END
 \#
 \# ====================================================================
@@ -13086,8 +13115,8 @@
 .          \}
 .       \}
 .    \}
-.\" If INDENT arg is passed to FOOTNOTE, calculate the indent...
 .    el \{\
+.\" If INDENT arg is passed to FOOTNOTE, calculate the indent...
 .       ie '\\$1'INDENT' \{\
 .          ev FOOTNOTES
 .          if '\\$2'L'     \{ .in (\\$3)  \}
@@ -13330,7 +13359,13 @@
 .                            \}
 .                         \}
 .                      \}
-.                      nr #VARIABLE_FOOTER_POS -\\n[#VFP_DIFF]
+.\" Not sure what I was thinking with this next line.  As is, it
+.\" moves the already established VFP trap for footnote 1 higher up
+.\" the page, resulting in a VFP that's higher on the page than the
+.\" current page position.  Leaving it in anyway, commented out, in
+.\" case the logic and the conditions under which it should
+.\" apply reveal themselves.
+\#.                    nr #VARIABLE_FOOTER_POS -\\n[#VFP_DIFF]
 .                      nr #FN_DEPTH \\n[#SAVED_FN_DEPTH_1]+\\n[#VFP_DIFF]
 .                   \}
 .                   el \{\
@@ -16075,7 +16110,7 @@
 \#   macros that alter mom's behaviour).
 \#
 .MAC COLLATE END
-.    if ( \\n[.t] < \\n[.v] ) \{ .nr #NO_BREAK 1 \}
+.    if ( (\\n[.t]-1) <= \\n[.v] ) \{ .nr #NO_BREAK 1 \}
 .    ds $SAVED_PP_FT \\*[$PP_FT]
 .    nr #COLLATE 1
 .    nr #PRE_COLLATE 1
@@ -18009,7 +18044,7 @@
 .      nr MN-shifted 1
 .      sp 1v
 .      SHIM
-.      if \\n[#SHIM]u>\\n[MN-spacing] .sp -(1v+\\n[MN-lead-adj]u)
+.      if \\n[#SHIM]>\\n[MN-spacing] .sp -(1v+\\n[MN-lead-adj]u)
 .      tm [mom]: Macro MN: Warning: Left margin note #\\n[MN-curr] on page 
\\n[#P] shifted down.
 .    \}
 .\" If last margin note doesn't fit
@@ -18065,10 +18100,11 @@
 .      nr MN-shifted 1
 .      sp 1v
 .      SHIM
+.      if \\n[#SHIM]>\\n[MN-spacing] .sp -(1v+\\n[MN-lead-adj]u)
 .      tm [mom]: Macro MN: Warning: Right margin note #\\n[MN-curr] on page 
\\n[#P] shifted down.
 .    \}
 .\" If last margin note doesn't fit
-.    if ( (\\n(nl+\\n[MN-div-r-\\n[MN-curr]-depth]) > 
(\\n(.p+\\n[#VARIABLE_FOOTER_POS]) ) \{\
+.    if ( (\\n(nl+\\n[MN-div-r-\\n[MN-curr]-depth]) > 
(\\n(.p+\\n[#VARIABLE_FOOTER_POS]-1) ) \{\
 .      if \\n[MN-shifted]=1 \{\
 .        sp -(1v+\\n[#SHIM]u)
 .        rm MN-div-r-\\n[MN-curr]
@@ -18095,7 +18131,6 @@
 .\}
 .  ev
 .  po
-'  sp |\\n[MN-curr-pos]u
 .  if !\\n[#no-repeat-MN-right]=1 .vpt 1
 ..
 \#

Index: momdoc/goodies.html
===================================================================
RCS file: /sources/groff/groff/contrib/mom/momdoc/goodies.html,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- momdoc/goodies.html 13 Sep 2007 16:58:00 -0000      1.21
+++ momdoc/goodies.html 24 Dec 2008 01:48:57 -0000      1.22
@@ -479,7 +479,7 @@
 </p>
 
 <p>
-If you wish to capitalise a section of type inlines, use the
+If you wish to capitalise a section of type inline, use the
 <a href="definitions.html#TERMS_INLINES">inline escapes</a>,
 <a href="inlines.html#UC_LC"><kbd>\*[UC]...\*[LC]</kbd></a>
 like this:
@@ -495,16 +495,6 @@
 </pre>
 </p>
 
-<p>
-The inline escapes are especially useful for capitalizing
-<strong>mom</strong>'s
-<a href="headfootpage.html#RESERVED_STRINGS">reserved strings</a>
-(document title, author[s], etc) when designing your own
-<a href="headfootpage.html#HEADFOOTPAGE_INTRO">HEADERS and FOOTERS</a>
-when using the
-<a href="docprocessing.html#DOCPROCESSING">document processing macros</a>.
-</p>
-
 <!-- -STRING- -->
 
 <hr width="33%" align="left"/>

Index: momdoc/headfootpage.html
===================================================================
RCS file: /sources/groff/groff/contrib/mom/momdoc/headfootpage.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- momdoc/headfootpage.html    13 Sep 2007 16:58:00 -0000      1.16
+++ momdoc/headfootpage.html    24 Dec 2008 01:48:57 -0000      1.17
@@ -566,10 +566,10 @@
 <a name="HDRFTR_RECTOVERSO"></a>
 
 <p>
-<nobr>Macro: <strong>HEADER_RECTO</strong> <kbd>LEFT | CENTER | RIGHT 
&quot;&lt;header recto string&gt;&quot;</kbd></nobr>
+<nobr>Macro: <strong>HEADER_RECTO</strong> <kbd>LEFT | CENTER | RIGHT [ CAPS ] 
&quot;&lt;header recto string&gt;&quot;</kbd></nobr>
 <br/>
 
-<nobr>Macro: <strong>HEADER_VERSO</strong> <kbd>LEFT | CENTER | RIGHT 
&quot;&lt;header verso string&gt;&quot;</kbd></nobr>
+<nobr>Macro: <strong>HEADER_VERSO</strong> <kbd>LEFT | CENTER | RIGHT [ CAPS ] 
&quot;&lt;header verso string&gt;&quot;</kbd></nobr>
 <br/>
 </p>
 
@@ -587,8 +587,19 @@
 direction in which you want the header
 <a href="definitions.html#TERMS_QUAD">quadded</a>.
 <kbd>L, C</kbd> and <kbd>R</kbd> may be used in place of <kbd>LEFT,
-CENTER</kbd> and <kbd>RIGHT</kbd>.  The second argument is a string,
-surrounded by double-quotes, containing what you want in the header.
+CENTER</kbd> and <kbd>RIGHT</kbd>.
+
+<p>
+The second argument (optional) tells <strong>mom</strong> to
+capitalize the text of the header.  <strong>Please note:</strong>
+Do NOT attempt to use
+<a href="inlines.html#UC_LC">\*[UC]...\*[LC]</a>
+inside the string passed to <strong>HEADER_RECTO</strong>.
+</p>
+
+<p>
+The final argument is a string, surrounded by
+double-quotes, containing what you want in the header.
 <strong>HEADER_RECTO</strong> disables <strong>mom</strong>'s normal
 3-part headers, therefore anything you want in the headers must be
 entered by hand in the string, including colours (via the
@@ -616,7 +627,8 @@
 
 <p>
 To include the current page number in the string, use the
-<kbd>\*[PAGE#]</kbd> inline.
+<kbd>\*[PAGE#]</kbd>
+<a href="definitions.html#TERMS_INLINES">inline escape</a>.
 </p>
 
 <a name="PADDING_HDRFTR"><h4>*<u>Padding the HEADER_RECTO/HEADER_VERSO 
string</u></h4></a>

Index: momdoc/inlines.html
===================================================================
RCS file: /sources/groff/groff/contrib/mom/momdoc/inlines.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- momdoc/inlines.html 13 Sep 2007 16:58:00 -0000      1.19
+++ momdoc/inlines.html 24 Dec 2008 01:48:57 -0000      1.20
@@ -223,7 +223,7 @@
 or
 
 <pre>
-    \*S[12]
+    \*[S12]
 </pre>
 </p>
 
@@ -302,16 +302,20 @@
 </p>
 
 <p>
-Most of the time, when you need type in all caps (upper case), you
-simply enter it that way in your input files.  The chief use of
-<kbd>\*[UC]...\*[LC]</kbd> is for capitalizing
-<strong>mom</strong>'s
-<a href="headfootpage.html#RESERVED_STRINGS">reserved strings</a>
-when designing your own
-<a href="headfootpage.html#HEADFOOTPAGE_INTRO">HEADERS or FOOTERS</a>
-during document processing.  If you are using
-<kbd>\*[UC]...\*[LC]</kbd> for this purpose, you must enter both
-inlines beginning with <kbd>\*E</kbd> rather than just <kbd>\*</kbd>.
+<strong>NOTE:</strong> <kbd>\*[UC]</kbd> and <kbd>\*[LC]</kbd>
+must not be used inside the
+<a href="definitions.html#TERMS_STRINGARGUMENT">string arguments</a>
+passed to the
+<a href="headfootpage.html#HDRFTR_STRINGS">HEADER_&lt;POSITION&gt;</a>
+macro.  Instead, use the
+control macro
+<a href="headfootpage.html#_CAPS">HEADER_&lt;POSITION&gt;_CAPS.</a>
+For
+<a href="headfootpage.html#HDRFTR_RECTOVERSO">HEADER_RECTO</a>
+(or _VERSO) or
+<a href="headfootpage.html#HDRFTR_RECTOVERSO">FOOTER_RECTO</a>
+(or _VERSO), supply the <kbd>CAPS</kbd> option to the appropriate
+macro.
 </p>
 
 <!-- -INLINE_KERNING_MOM- -->

Index: momdoc/reserved.html
===================================================================
RCS file: /sources/groff/groff/contrib/mom/momdoc/reserved.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- momdoc/reserved.html        13 Sep 2007 16:58:00 -0000      1.30
+++ momdoc/reserved.html        24 Dec 2008 01:48:57 -0000      1.31
@@ -1467,6 +1467,7 @@
                            (boolean; default=off)
 #HDRFTR_LEFT_COLOR         Colorize header/footer left? (boolean)
 #HDRFTR_PT_SIZE            Initial point size of headers/footers
+#HDRFTR_RECTO_CAPS         Header/footer recto caps? (boolean)
 #HDRFTR_RIGHT_CAPS         Right part of header/footer in caps?
                            (boolean; default=on)
 #HDRFTR_RIGHT_COLOR        Colorize header/footer right? (boolean)
@@ -1478,6 +1479,7 @@
 #HDRFTR_RULE_WEIGHT_ADJ    HDRFTR_RULE_WEIGHT/2
 #HDRFTR_TMP_CAPS_SWITCH    Temporarily holds HDRFTR_LEFT_CAPS value if
                            #SWITCH_HDRFTR=1
+#HDRFTR_VERSO_CAPS         Header/footer verso caps? (boolean)
 #HEAD                      1=main/section head 2=subhead
 #HEAD_CAPS                 Print section titles in caps? (boolean)
 #HEAD_COLOR                Colorize heads? (boolean)

Index: momdoc/toc.html
===================================================================
RCS file: /sources/groff/groff/contrib/mom/momdoc/toc.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- momdoc/toc.html     16 Feb 2008 04:39:57 -0000      1.28
+++ momdoc/toc.html     24 Dec 2008 01:48:57 -0000      1.29
@@ -18,13 +18,13 @@
 <html xmlns="http://www.w3.org/1999/xhtml";>
 <head>
 <meta http-equiv="content-type" content="text/html;charset=iso-8859-1"/>
-<title>Mom, version 1.5-b -- Table of Contents</title>
+<title>Mom, version 1.5-c -- Table of Contents</title>
 </head>
 <body bgcolor="#dfdfdf">
 
 <!-- ==================================================================== -->
 
-<h1 align="center"><u>Table of Contents for mom, version 1.5-b</u></h1>
+<h1 align="center"><u>Table of Contents for mom, version 1.5-c</u></h1>
 
 <p>
 The table of contents has grown quite large.  If you've been using




reply via email to

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