Updated email address.

8 files changed, 117 insertions, 105 deletions

diff --git a/contrib/mom/BUGS b/contrib/mom/BUGS
index 7a520a22..f1801667 100644
--- a/contrib/mom/BUGS
+++ b/contrib/mom/BUGS
@@ -12,7 +12,7 @@ how things ought to be.
 Post to the groff mailing list with bug reports, questions and
 suggestions, or contact me directly at:
 
-    pschaffter@magma.ca
+    pschaffter@sympatico.ca
 
 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 +23,17 @@ Also, please--no html email.  That, too, gets nuked.
 ========================================================================
 Version 1.5-c
 =============
+
+When DOC_LEAD is called to change document leading in collated docs,
+document leading steadily increases by small amounts at each
+subsequent call to COLLATE.
+---Fixed---
+
+(DOC_)COVER requests annihilating families used in various document
+elements if those families differ from the document's overall
+family.
+---Fixed---
+
 Covers and doccovers not always respecting null pagenumbering.
 --Fixed---
 
diff --git a/contrib/mom/ChangeLog b/contrib/mom/ChangeLog
index 4efea727..a990eee6 100644
--- a/contrib/mom/ChangeLog
+++ b/contrib/mom/ChangeLog
@@ -1,7 +1,32 @@
+<<<<<<< ChangeLog
+* Sat Jan 17 2009
+
+o Changed FAMILY, FT and PT_SIZE requests in DO_COVER to groff
+  primitives (fam, ft and ps respectively).  Fixes (DOC_)COVER bug
+  where (DOC_)COVER was resetting families and fonts of various
+  document elements (QUOTE, BLOCKQUOTE, etc) to document default.
+
+o Removed (excessive) cleanup of (doc)cover and docheader strings and
+  registers from macro CLEANUP.  Changes to mom's default style for
+  these document elements now survive COLLATE.
+
+* Fri Jan 2 2009
+
+o Added possibility of quadding docheader left or right, as well as
+  center, which remains the default.
+
+* Wed Dec 31 2008
+
+o Default definition of $QUOTE0 and $QUOTE1 in om.tmac changed from
+  \[dq] to \[lq] and \[rq], respectively.
+
+====================================================================
+=======
 * Sun Jan 4 2009
 
 o Makefile.sub (CLEANADD): Add om.tmac-s.
 
+>>>>>>> 1.60
 * Tue Dec 30 2008
 
 o Doc fixes in toc.html
diff --git a/contrib/mom/copyright b/contrib/mom/copyright
index 7cefab16..d20da2d7 100644
--- a/contrib/mom/copyright
+++ b/contrib/mom/copyright
@@ -1,6 +1,6 @@
 AUTHOR
 ------
-Peter Schaffter (pschaffter@magma.ca)
+Peter Schaffter (pschaffter@sympatico.ca)
 3-281, rue de Cannes
 Gatineau (QC)
 J8T 8B9
diff --git a/contrib/mom/groff_mom.man b/contrib/mom/groff_mom.man
index 43d457b4..4d1cf3c8 100644
--- a/contrib/mom/groff_mom.man
+++ b/contrib/mom/groff_mom.man
@@ -89,7 +89,7 @@ mom comes with her own (very) complete documentation in HTML format.
 .
 .B mom
 was written by
-.MT pschaffter@magma.ca
+.MT pschaffter@sympatico.ca
 Peter Schaffter
 .ME .
 Please send bug reports to the
diff --git a/contrib/mom/momdoc/docprocessing.html b/contrib/mom/momdoc/docprocessing.html
index 4e2447ed..92f44b97 100644
--- a/contrib/mom/momdoc/docprocessing.html
+++ b/contrib/mom/momdoc/docprocessing.html
@@ -2624,6 +2624,7 @@ like this:
 
 <ol>
     <li><a href="#CHANGE_START">Change the starting position of the docheader</a></li>
+    <li><a href="#DOCHEADER_QUAD">Change quad direction the entire docheader</a></li>
     <li><a href="#DOCHEADER_FAMILY">Change the family of the entire docheader</a></li>
     <li><a href="#ADJUST_LEADING">Adjust the docheader leading</a></li>
     <li><a href="#CHANGE_FAMILY">Change the family of individual docheader elements</a></li>
@@ -2671,7 +2672,18 @@ Use
 to place them where you want.
 </p>
 
-<a name="DOCHEADER_FAMILY"><h5><u>2. Change the family of the entire docheader</u></h5></a>
+<a name="DOCHEADER_QUAD"><h5><u>2. Change the quad direction of the docheader</u></h5></a>
+
+<p>
+By default, <strong>mom</strong> centers the docheader.
+If you'd prefer to have your docheaders set flush left or right, or
+need to restore the default centering,
+invoke <kbd>.DOCHEADER_QUAD</kbd> with the quad direction you want,
+either <kbd>LEFT</kbd> (or <kbd>L</kbd>), <kbd>RIGHT</kbd> (or
+<kbd>R</kbd>) or <kbd>CENTER</kbd> (or <kbd>C</kbd>).
+</p>
+
+<a name="DOCHEADER_FAMILY"><h5><u>3. Change the family of the entire docheader</u></h5></a>
 
 <p>
 By default, <strong>mom</strong> sets the docheader in the same
@@ -2703,7 +2715,7 @@ with the macros listed
 <a href="#CHANGE_FAMILY">here</a>.
 </p>
 
-<a name="ADJUST_LEADING"><h5><u>3. Adjust the leading</u></h5></a>
+<a name="ADJUST_LEADING"><h5><u>4. Adjust the leading</u></h5></a>
 
 <p>
 The
@@ -2725,7 +2737,7 @@ or subtract from the lead of running text).  No
 is required; points is assumed.
 </p>
 
-<a name="CHANGE_FAMILY"><h5><u>4. Change the family of docheader elements</u></h5></a>
+<a name="CHANGE_FAMILY"><h5><u>5. Change the family of docheader elements</u></h5></a>
 
 <p>
 The following macros let you change the
@@ -2749,7 +2761,7 @@ would with
 <a href="typesetting.html#FAMILY">FAMILY</a>.
 </p>
 
-<a name="CHANGE_FONT"><h5><u>5. Change the font of docheader elements</u></h5></a>
+<a name="CHANGE_FONT"><h5><u>6. Change the font of docheader elements</u></h5></a>
 
 <p>
 The following macros let you change the
@@ -2773,7 +2785,7 @@ I</kbd> and <kbd>BI</kbd> have the same meaning as they do for
 <a href="typesetting.html#FONT">FT</a>.
 </p>
 
-<a name="CHANGE_COLOR"><h5><u>6. Change the colour of the docheader elements individually</u></h5></a>
+<a name="CHANGE_COLOR"><h5><u>7. Change the colour of the docheader elements individually</u></h5></a>
 
 <p>
 The following macros let you change the color of each docheader
@@ -2833,7 +2845,7 @@ If you want to colourize the entire docheader, use the macro
 </ul>
 </p>
 
-<a name="CHANGE_SIZE"><h5><u>7. Adjust the size of docheader elements</u></h5></a>
+<a name="CHANGE_SIZE"><h5><u>8. Adjust the size of docheader elements</u></h5></a>
 
 <p>
 The following macros let you adjust the point size of each docheader
@@ -2883,7 +2895,7 @@ sizes are allowed.
 Simply pass the appropriate macro the size adjustment you want.
 </p>
 
-<a name="CHANGE_ATTRIBUTE"><h5><u>8. Change the attribution string (&quot;by&quot;)</u></h5></a>
+<a name="CHANGE_ATTRIBUTE"><h5><u>9. Change the attribution string (&quot;by&quot;)</u></h5></a>
 
 <p>
 If you're not writing in English, you can change what
diff --git a/contrib/mom/momdoc/reserved.html b/contrib/mom/momdoc/reserved.html
index 34cfaacd..b3751603 100644
--- a/contrib/mom/momdoc/reserved.html
+++ b/contrib/mom/momdoc/reserved.html
@@ -2062,6 +2062,7 @@ $DOCCOVER_UNDERLINE_GAP          Distance between baseline of doctype and the
                                  underline on covers
 $DOCHEADER_COLOR                 Color of docheader
 $DOCHEADER_FAM                   Family used for all parts of the docheader
+$DOCHEADER_QUAD                  Quad direction (LRC) of docheader
 $DOCHEADER_LEAD_ADJ              +|- value applied to #DOC_LEAD to
                                  in/decrease leading of doc header
 $DOCTYPE_COLOR                   Color of DOCTYPE string in doc header
@@ -2544,6 +2545,7 @@ DOC_COVER_TITLE_FONT          _FONT
 DOC_COVER_TITLE_SIZE          _SIZE
 DOCHEADER_COLOR               _COLOR
 DOCHEADER_FAMILY              _FAMILY
+DOCHEADER_QUAD                _QUAD
 DOC_QUAD                      _QUAD
 DOCTYPE_FAMILY                _FAMILY
 DOCTYPE_FONT                  _FONT
diff --git a/contrib/mom/momdoc/toc.html b/contrib/mom/momdoc/toc.html
index 41ddb23f..81d9a076 100644
--- a/contrib/mom/momdoc/toc.html
+++ b/contrib/mom/momdoc/toc.html
@@ -3,8 +3,8 @@
 This file is part of groff, the GNU roff type-setting system.
 
 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009
-  Free Software Foundation,
-Inc.  Written by Peter Schaffter.
+  Free Software Foundation, Inc.
+Written by Peter Schaffter (pschaffter@sympatico.ca).
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac
index 211f4765..8674bafd 100644
--- a/contrib/mom/om.tmac
+++ b/contrib/mom/om.tmac
@@ -4,7 +4,7 @@ Mom -- a typesetting/document-processing macro set for groff.
 
 Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
   Free Software Foundation, Inc.
-     Written by Peter Schaffter (pschaffter@magma.ca)
+     Written by Peter Schaffter (pschaffter@sympatico)
 
 This file is part of groff.
 
@@ -1291,8 +1291,8 @@ to a macro means that any argument turns the feature off.
 .    \}
 .END
 \#
-.ds $QUOTE0 \[dq]
-.ds $QUOTE1 \[dq]
+.ds $QUOTE0 \[lq]
+.ds $QUOTE1 \[rq]
 \#
 \# Strings for foot and inch marks
 \#
@@ -5466,6 +5466,7 @@ y\\R'#DESCENDER \\n[.cdp]'
 .    if '\\$0'COVER_MISC_QUAD'          .ds $COVER_MISC_QUAD \\$1
 .    if '\\$0'DOC_COVER_COPYRIGHT_QUAD' .ds $DOC_COVER_COPYRIGHT_QUAD \\$1
 .    if '\\$0'DOC_COVER_MISC_QUAD'      .ds $DOC_COVER_MISC_QUAD \\$1
+.    if '\\$0'DOCHEADER_QUAD'           .ds $DOCHEADER_QUAD \\$1
 .    if '\\$0'DOC_QUAD' \{\
 .        ds $DOC_QUAD \\$1
 .        QUAD \\*[$DOC_QUAD]
@@ -6036,7 +6037,10 @@ y\\R'#DESCENDER \\n[.cdp]'
 .    el \{\
 .       if \\n[#COLLATE] \{\
 .          if !\\n[#PRINT_STYLE]=1 \{\
-.             if \\n[#RERUN_TRAPS] \{ .TRAPS \}
+.             if \\n[#RERUN_TRAPS] \{\
+.                TRAPS
+.                rr #RERUN_TRAPS
+.             \}
 .          \}
 .       \}
 .    \}
@@ -6091,22 +6095,18 @@ y\\R'#DESCENDER \\n[.cdp]'
 \#
 \# Next, some utility macros for various routines to prevent repetition
 \#
-.    if '\\$1'DOC_COVER' \{\
-.       shift
-.       nr #AUTHOR_DOCCOVER_NUM 0 1
-.       while \\n[#NUM_ARGS]>\\n[#AUTHOR_DOCCOVER_NUM] \{\
-.       ds $AUTHOR_DOCCOVER_\\n+[#AUTHOR_DOCCOVER_NUM] \\$\\n[#AUTHOR_DOCCOVER_NUM]
-.\}
-.       return
-.    \}
-.    if '\\$1'COVER' \{\
-.       shift
-.       nr #AUTHOR_COVER_NUM 0 1
-.       while \\n[#NUM_ARGS]>\\n[#AUTHOR_COVER_NUM] \{\
-.       ds $AUTHOR_COVER_\\n+[#AUTHOR_COVER_NUM] \\$\\n[#AUTHOR_COVER_NUM]
-.\}
-.       return
+.MAC DOC_HEADER_QUAD END
+.    ie !'\\*[$DOCHEADER_QUAD]'' \{\
+.       if '\\*[$DOCHEADER_QUAD]'L'      \{ .LEFT   \}
+.       if '\\*[$DOCHEADER_QUAD]'LEFT'   \{ .LEFT   \}
+.       if '\\*[$DOCHEADER_QUAD]'R'      \{ .RIGHT  \}
+.       if '\\*[$DOCHEADER_QUAD]'RIGHT'  \{ .RIGHT  \}
+.       if '\\*[$DOCHEADER_QUAD]'C'      \{ .RIGHT  \}
+.       if '\\*[$DOCHEADER_QUAD]'CENTER' \{ .CENTER \}
+.       if '\\*[$DOCHEADER_QUAD]'CENTRE' \{ .CENTER \}
 .    \}
+.    el \{ .CENTER \}
+.END
 \#
 .MAC PRINT_AUTHORS END
 .    ie r#DOING_COVER \{\
@@ -6170,8 +6170,8 @@ y\\R'#DESCENDER \\n[.cdp]'
 .END
 \#
 .MAC DEFAULT_DOCHEADER END
+.    DOC_HEADER_QUAD
 .    if !'\\*[$TITLE_1]'' \{\
-.       CENTER
 .       FAMILY  \\*[$TITLE_FAM]
 .       FT      \\*[$TITLE_FT]
 .       PT_SIZE \\*[$TITLE_PT_SIZE]
@@ -6216,7 +6216,7 @@ y\\R'#DESCENDER \\n[.cdp]'
 \#
 \#
 .MAC CHAPTER_DOCHEADER END
-.    CENTER
+.    DOC_HEADER_QUAD
 .    FAMILY  \\*[$TITLE_FAM]
 .    FT      \\*[$TITLE_FT]
 .    PT_SIZE \\*[$TITLE_PT_SIZE]
@@ -6275,7 +6275,7 @@ y\\R'#DESCENDER \\n[.cdp]'
 \#
 \#
 .MAC NAMED_DOCHEADER END
-.    CENTER
+.    DOC_HEADER_QUAD
 .    FAMILY  \\*[$TITLE_FAM]
 .    FT      \\*[$TITLE_FT]
 .    PT_SIZE \\*[$TITLE_PT_SIZE]
@@ -6882,9 +6882,9 @@ y\\R'#DESCENDER \\n[.cdp]'
 .                if \\n[#SINGLE_SPACE]=0 \{ .vs \\n[#DOC_LEAD]u \}
 .             \}
 .             el \{\
-.                FAMILY  \\*[$DOC_COVER_CHAPTER_TITLE_FAM]
-.                FT      \\*[$DOC_COVER_CHAPTER_TITLE_FT]
-.                PT_SIZE \\*[$DOC_COVER_CHAPTER_TITLE_PT_SIZE]
+.                fam \\*[$DOC_COVER_CHAPTER_TITLE_FAM]
+.                ft  \\*[$DOC_COVER_CHAPTER_TITLE_FT]
+.                ps  \\*[$DOC_COVER_CHAPTER_TITLE_PT_SIZE]
 .                nr #ARG_NUM 0 1
 .                ALD \\n[.v]u/4u \"Put a little space before the chapter title
 .                while \\n[#CHAPTER_TITLE_NUM]>=\\n+[#ARG_NUM] \{\
@@ -6917,9 +6917,9 @@ y\\R'#DESCENDER \\n[.cdp]'
 .       \}
 .       if !\\n[#DOC_TYPE]=2 \{\
 .          if \\n[#DOC_COVER_SUBTITLE]=1 \{\
-.             FAMILY  \\*[$DOC_COVER_SUBTITLE_FAM]
-.             FT      \\*[$DOC_COVER_SUBTITLE_FT]
-.             PT_SIZE \\*[$DOC_COVER_SUBTITLE_PT_SIZE]
+.             fam \\*[$DOC_COVER_SUBTITLE_FAM]
+.             ft  \\*[$DOC_COVER_SUBTITLE_FT]
+.             ps  \\*[$DOC_COVER_SUBTITLE_PT_SIZE]
 .             if \\n[#PRINT_STYLE]=1 \{\
 .                TYPEWRITER
 .                ie \\n[#SINGLE_SPACE]=0 \{ .vs \\n[#DOC_LEAD]u/2u \}
@@ -6957,9 +6957,9 @@ y\\R'#DESCENDER \\n[.cdp]'
 .          \}
 .       \}
 .       if \\n[#DOC_COVER_AUTHOR]=1 \{\
-.          FAMILY  \\*[$DOC_COVER_AUTHOR_FAM]
-.          FT      \\*[$DOC_COVER_AUTHOR_FT]
-.          PT_SIZE \\*[$DOC_COVER_AUTHOR_PT_SIZE]
+.          fam \\*[$DOC_COVER_AUTHOR_FAM]
+.          ft  \\*[$DOC_COVER_AUTHOR_FT]
+.          ps  \\*[$DOC_COVER_AUTHOR_PT_SIZE]
 .          if \\n[#PRINT_STYLE]=1 \{\
 .             TYPEWRITER
 .             ie \\n[#SINGLE_SPACE]=1 \{ .vs \\n[#DOC_LEAD]u \}
@@ -6982,9 +6982,9 @@ y\\R'#DESCENDER \\n[.cdp]'
 .          \}
 .          PRINT_AUTHORS
 .       \}
-.       FAMILY  \\*[$DOC_COVER_DOCTYPE_FAM]
-.       FT      \\*[$DOC_COVER_DOCTYPE_FT]
-.       PT_SIZE \\*[$DOC_COVER_DOCTYPE_PT_SIZE]
+.       fam \\*[$DOC_COVER_DOCTYPE_FAM]
+.       ft  \\*[$DOC_COVER_DOCTYPE_FT]
+.       ps  \\*[$DOC_COVER_DOCTYPE_PT_SIZE]
 .       SP
 .       if \\n[#DOC_TYPE]=3 \{\
 .          if \\n[#DOC_COVER_DOCTYPE]=1 \{\
@@ -7015,8 +7015,8 @@ y\\R'#DESCENDER \\n[.cdp]'
 .          el \{ .vs \\n[#DOC_LEAD]u/2u \}
 .       \}
 .       el \{\
-.          FAMILY  \\*[$DOC_COVER_COPYRIGHT_FAM]
-.          FT      \\*[$DOC_COVER_COPYRIGHT_FT]
+.          fam \\*[$DOC_COVER_COPYRIGHT_FAM]
+.          ft  \\*[$DOC_COVER_COPYRIGHT_FT]
 .          AUTOLEAD 2
 .          PT_SIZE \\*[$DOC_COVER_COPYRIGHT_PT_SIZE]
 .       \}
@@ -7093,13 +7093,12 @@ y\\R'#DESCENDER \\n[.cdp]'
 .       if \\n[#COVER_COLOR]=1 \{\
 .          nf
 \m[\\*[$COVER_COLOR]]
-.          EOL
 .       \}
 .       CENTER
-.       FAMILY  \\*[$COVER_TITLE_FAM]
-.       FT      \\*[$COVER_TITLE_FT]
-.       PT_SIZE \\*[$COVER_TITLE_PT_SIZE]
-.       LS      \\n[#COVER_LEAD]u
+.       fam \\*[$COVER_TITLE_FAM]
+.       ft  \\*[$COVER_TITLE_FT]
+.       ps  \\*[$COVER_TITLE_PT_SIZE]
+.       vs      \\n[#COVER_LEAD]u
 .       if \\n[#PRINT_STYLE]=1 \{ .TYPEWRITER \}
 .       if \\n[#COVER_TITLE]=1 \{\
 .          ie \\n[#PRINT_STYLE]=1 \{\
@@ -7209,9 +7208,9 @@ y\\R'#DESCENDER \\n[.cdp]'
 .                if \\n[#SINGLE_SPACE]=0 \{ .vs \\n[#DOC_LEAD]u \}
 .             \}
 .             el \{\
-.                FAMILY  \\*[$COVER_CHAPTER_TITLE_FAM]
-.                FT      \\*[$COVER_CHAPTER_TITLE_FT]
-.                PT_SIZE \\*[$COVER_CHAPTER_TITLE_PT_SIZE]
+.                fam \\*[$COVER_CHAPTER_TITLE_FAM]
+.                ft  \\*[$COVER_CHAPTER_TITLE_FT]
+.                ps  \\*[$COVER_CHAPTER_TITLE_PT_SIZE]
 .                ALD \\n[.v]u/4u \"Put a little space before the chapter title
 .                nr #ARG_NUM 0 1
 .                while \\n[#CHAPTER_TITLE_NUM]>=\\n+[#ARG_NUM] \{\
@@ -7244,9 +7243,9 @@ y\\R'#DESCENDER \\n[.cdp]'
 .       \}
 .       if !\\n[#DOC_TYPE]=2 \{\
 .          if \\n[#COVER_SUBTITLE]=1 \{\
-.             FAMILY  \\*[$COVER_SUBTITLE_FAM]
-.             FT      \\*[$COVER_SUBTITLE_FT]
-.             PT_SIZE \\*[$COVER_SUBTITLE_PT_SIZE]
+.             fam \\*[$COVER_SUBTITLE_FAM]
+.             ft  \\*[$COVER_SUBTITLE_FT]
+.             ps  \\*[$COVER_SUBTITLE_PT_SIZE]
 .             if \\n[#PRINT_STYLE]=1 \{\
 .                TYPEWRITER
 .                if \\n[#PRINT_STYLE]=1 \{\
@@ -7287,9 +7286,9 @@ y\\R'#DESCENDER \\n[.cdp]'
 .          \}
 .       \}
 .       if \\n[#COVER_AUTHOR]=1 \{\
-.          FAMILY  \\*[$COVER_AUTHOR_FAM]
-.          FT      \\*[$COVER_AUTHOR_FT]
-.          PT_SIZE \\*[$COVER_AUTHOR_PT_SIZE]
+.          fam \\*[$COVER_AUTHOR_FAM]
+.          ft  \\*[$COVER_AUTHOR_FT]
+.          ps  \\*[$COVER_AUTHOR_PT_SIZE]
 .          if \\n[#PRINT_STYLE]=1 \{\
 .             TYPEWRITER
 .             ie \\n[#SINGLE_SPACE]=1 \{ .vs \\n[#DOC_LEAD]u \}
@@ -7312,9 +7311,9 @@ y\\R'#DESCENDER \\n[.cdp]'
 .          \}
 .          PRINT_AUTHORS
 .       \}
-.       FAMILY  \\*[$COVER_DOCTYPE_FAM]
-.       FT      \\*[$COVER_DOCTYPE_FT]
-.       PT_SIZE \\*[$COVER_DOCTYPE_PT_SIZE]
+.       fam \\*[$COVER_DOCTYPE_FAM]
+.       ft  \\*[$COVER_DOCTYPE_FT]
+.       ps  \\*[$COVER_DOCTYPE_PT_SIZE]
 .       SP
 .       if \\n[#DOC_TYPE]=3 \{\
 .          if \\n[#COVER_DOCTYPE]=1 \{\
@@ -7345,8 +7344,8 @@ y\\R'#DESCENDER \\n[.cdp]'
 .          el \{ .vs \\n[#DOC_LEAD]u/2u \}
 .       \}
 .       el \{\
-.          FAMILY  \\*[$COVER_COPYRIGHT_FAM]
-.          FT      \\*[$COVER_COPYRIGHT_FT]
+.          fam  \\*[$COVER_COPYRIGHT_FAM]
+.          ft      \\*[$COVER_COPYRIGHT_FT]
 .          AUTOLEAD 2
 .          PT_SIZE \\*[$COVER_COPYRIGHT_PT_SIZE]
 .       \}
@@ -7843,48 +7842,10 @@ y\\R'#DESCENDER \\n[.cdp]'
 \#
 .MAC CLEANUP_DEFAULTS END
 .    nr #START 1
-.\" Family strings for docheader
-.    rm $AUTHOR_FAM
-.    rm $CHAPTER_TITLE_FAM
-.    rm $DOCTYPE_FAM
-.    rm $SUBTITLE_FAM
-.    rm $TITLE_FAM
-.\" Family strings for cover
-.    rm $COVER_AUTHOR_FAM
-.    rm $COVER_CHAPTER_TITLE_FAM
-.    rm $COVER_COPYRIGHT_FAM
-.    rm $COVER_DOCTYPE_FAM
-.    rm $COVER_LEAD_ADJ
-.    rm $COVER_SUBTITLE_FAM
-.    rm $COVER_TITLE_FAM
-.\" Family strings for doc cover
-.    rm $DOC_COVER_AUTHOR_FAM
-.    rm $DOC_COVER_CHAPTER_TITLE_FAM
-.    rm $DOC_COVER_COPYRIGHT_FAM
-.    rm $DOC_COVER_DOCTYPE_FAM
-.    rm $DOC_COVER_LEAD_ADJ
-.    rm $DOC_COVER_SUBTITLE_FAM
-.    rm $DOC_COVER_TITLE_FAM
-.\" Quad args to copyright and misc
-.    rm $COVER_COPYRIGHT_QUAD
-.    rm $COVER_MISC_QUAD
-.    rm $DOC_COVER_COPYRIGHT_QUAD
-.    rm $DOC_COVER_MISC_QUAD
-.\" Miscellaneous strings
 .    rm $TOC_TITLE_ITEM
 .    rm $DOCHEADER_LEAD_ADJ
 .\" Various registers
-.    rr #ADJ_DOC_LEAD
-.    rr #ADVANCE_FROM_TOP
-.    rr #COVER_LEAD
-.    rr #DEPTH_1
-.    rr #DEPTH_2
-.    rr #DOC_COVER_LEAD
 .    if \\n[#DOC_HEADER]=1 \{ .nr #DOC_HEADER 2 \}
-.    rr #DOCHEADER_ADVANCE
-.    rr #DOCHEADER_EXTRA_SPACE
-.    rr #DOCHEADER_LEAD
-.    rr #DOCHEADER_SPACE_ADJ
 .    rr #MISC_NUM
 .    rr #MISCS
 .    rr #NEXT_AUTHOR
@@ -17177,6 +17138,7 @@ E\\R'#CAP_HEIGHT \\n[.cht]'
 .ALIAS   COVER_MISC_QUAD            _QUAD
 .ALIAS   DOC_COVER_COPYRIGHT_QUAD   _QUAD
 .ALIAS   DOC_COVER_MISC_QUAD        _QUAD
+.ALIAS   DOCHEADER_QUAD             _QUAD
 .ALIAS   DOC_QUAD                   _QUAD
 .ALIAS   ENDNOTE_QUAD               _QUAD
 .ALIAS   ENDNOTE_STRING_QUAD        _QUAD