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

[Peter Schaffter]

CVSROOT:        /sources/groff
Module name:    groff
Changes by:     Peter Schaffter <PTPi>  13/10/31 21:22:30

Modified files:
        contrib/mom    : om.tmac 

Log message:
        Updated om.tmac missing from prevous commit.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/om.tmac?cvsroot=groff&r1=1.79&r2=1.80

Patches:
Index: om.tmac
===================================================================
RCS file: /sources/groff/groff/contrib/mom/om.tmac,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -b -r1.79 -r1.80
--- om.tmac     30 Oct 2013 19:15:09 -0000      1.79
+++ om.tmac     31 Oct 2013 21:22:30 -0000      1.80
@@ -553,7 +553,7 @@
 .    ie \\n[#PRE_COLLATE]=1 .
 .    el \{\
 .       if \\n[#COLLATE]=1 \{\
-.          if !r#START .DOC_FAM \\*[$FAMILY]
+.          if !r#START .ds $DOC_FAM \\*[$FAMILY]
 .       \}
 .    \}
 .END
@@ -11786,7 +11786,7 @@
 .    ie '\\$1'' .nr #PAGINATE 1
 .    el \{\
 .      nr #PAGINATE 0
-.      rr #PAGE_NUM_V_POS
+.      if !\\n[#COLLATE] .rr #PAGE_NUM_V_POS
 .    \}
 .    if \\n[#HF_OFF]=1 \{\
 .       rr #PAGINATION_STATE
@@ -11923,8 +11923,8 @@
 .    po \\n[#DOC_L_MARGIN]u
 .    ll \\n[#DOC_L_LENGTH]u
 .    ta \\n[.l]u
-.    FAMILY  \\*[$PAGE_NUM_FAM]
-.    FT      \\*[$PAGE_NUM_FT]
+.    fam \\*[$PAGE_NUM_FAM]
+.    ft  \\*[$PAGE_NUM_FT]
 .    ps \\n[#DOC_PT_SIZE]u\\*[$PAGE_NUM_SIZE_CHANGE]
 .    if \\n[#PRINT_STYLE]=1 .TYPEWRITER
 .    if \\n[#PAGE_NUM_V_POS]=1 .vs 0
@@ -11951,10 +11951,6 @@
 .       if \\n[#BIB_FIRST_PN] .PAGENUMBER \\n[#BIB_FIRST_PN]
 .       rr #BIB_FIRST_PAGE
 .    \}
-.    if \\n[#TOC_FIRST_PAGE] \{\
-.       PAGENUMBER 1
-.       rr #TOC_FIRST_PAGE
-.    \}
 .    ie \\n[#DRAFT_WITH_PAGENUM] \{\
 .       ie '\\*[$REVISION]'' \
 .          PRINT "\\*[$DRAFT_STRING]\\*[$DRAFT] / \\n[#PAGENUMBER]"
@@ -14807,17 +14803,16 @@
 .    \}
 .    ie \\n[#PAGINATE_TOC]=1 .PAGINATE
 .    el .PAGINATION OFF
-.    if \\n[#FOOTERS_ON]=1 \{\
 .       ds $HDRFTR_CENTER \\*[$HDRFTR_CENTER_NEW]
 .       rm $HDRFTR_CENTER_OLD
 .       rm $HDRFTR_CENTER_NEW
-.    \}
 .    rr #COLLATED_DOC
 .    DOCHEADER OFF \\n[#T_MARGIN]u-\\n[#DOC_LEAD]
 .    PAGENUMBER 1
 .    if \\n[#LINENUMBERS]=2 .nr #LINENUMBERS 3
 .    L_MARGIN   \\n[#DOC_L_MARGIN]u
 .    LL         \\n[#DOC_L_LENGTH]u
+.    HEADER_CENTER "\\*[$TOC_HEADER_STRING]
 .    START
 .    nop
 .    nr #COLUMNS 0