o Added CLOSING_INDENT and SIGNATURE_SPACE to DOCTYPE LETTER macros.

8 files changed, 104 insertions, 27 deletions

diff --git a/contrib/mom/ChangeLog b/contrib/mom/ChangeLog
index 309a8ed1..c3824d81 100644
--- a/contrib/mom/ChangeLog
+++ b/contrib/mom/ChangeLog
@@ -1,3 +1,7 @@
+* Mon 6 2009
+
+o Added CLOSING_INDENT and SIGNATURE_SPACE to DOCTYPE LETTER macros.
+
 * Sun Jun 14 2009
 
 o DROPCAP handling changed; uses local vertical motions now instead
diff --git a/contrib/mom/momdoc/appendices.html b/contrib/mom/momdoc/appendices.html
index b53af14e..9652865b 100644
--- a/contrib/mom/momdoc/appendices.html
+++ b/contrib/mom/momdoc/appendices.html
@@ -525,7 +525,7 @@ ln -s /usr/local/share/groff/1.19.2/font/devps/text.enc text.enc
         <li>For TrueType fonts</li>
         <ul>
             <li><kbd>ttf2pt1 \-b fontfilename.ttf</kbd>
-
+                <br/>
                 <em>For TrueType fonts, this will generate a PostScript
                 .pfb file as well as an .afm file.</em>
             </li>
diff --git a/contrib/mom/momdoc/intro.html b/contrib/mom/momdoc/intro.html
index 38ea12f6..c1819e67 100644
--- a/contrib/mom/momdoc/intro.html
+++ b/contrib/mom/momdoc/intro.html
@@ -296,7 +296,7 @@ Writing documentation is tough, no doubt about it.  One is never
 quite sure of the user's level of expertise.  Is s/he new to the
 application, new to its underlying protocols and programs, new to
 the operating system, new to computers?  At some point, one has to
-decide who the documentation is for.  Making the wrong decision can
+decide whom the documentation is for.  Making the wrong decision can
 mean the difference between a program that gets used and a program
 that gets tossed.
 </p>
@@ -317,7 +317,7 @@ even if they don't know much about it.  Lastly, it assumes that
 everyone &mdash; groff newbies and experts alike &mdash; learns
 faster from a few well-placed examples than from manpage-style
 reference docs.  What <strong>mom</strong>'s documentation doesn't
-assume is that you know everything--not about groff, not about
+assume is that you know everything &mdash; not about groff, not about
 typesetting, not about document processing.  Even experts have odd
 lacunae in their knowledge base.  Therefore, whenever I suspect
 that a term or procedure will cause head scratching, I offer an
@@ -447,7 +447,7 @@ include them in the argument, like this:
 <h4><u>Example 2: A macro with required and optional arguments</u></h4>
 
 <blockquote>
-    <nobr>Macro: <strong>TAB_SET</strong> <kbd>&lt;tab #&gt;  &lt;indent&gt;  &lt;length&gt;  [ L | R | C | J [ QUAD ] ]</kbd></nobr>
+    <nobr>Macro: <strong>TAB_SET</strong> <kbd>&lt;tab number&gt;  &lt;indent&gt;  &lt;length&gt;  [ L | R | C | J [ QUAD ] ]</kbd></nobr>
 </blockquote>
 
 <p>
diff --git a/contrib/mom/momdoc/letters.html b/contrib/mom/momdoc/letters.html
index 0d815bfb..d06c8cfd 100644
--- a/contrib/mom/momdoc/letters.html
+++ b/contrib/mom/momdoc/letters.html
@@ -529,6 +529,53 @@ like this:
 </pre>
 </p>
 
+<p>
+There are two macros that may be used to control the behaviour
+of <kbd>.CLOSING</kbd>: <strong>CLOSING_INDENT</strong> and
+<strong>SIGNATURE_SPACE</strong>.
+</p>
+
+<a name="CLOSING_INDENT"></a>
+<p>
+The first, <strong>CLOSING_INDENT</strong>, indicates the distance
+from the left margin you'd like to have your closing indented.  It
+takes a single
+<a href="definitions.html#TERMS_NUMERICARGUMENT">numeric argument</a>
+and must have a
+<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>
+appended to it, unless you want an indent of 0 (zero).
+<strong>Mom</strong>'s default is 1/2 the width of the letter's line
+length (i.e. halfway across the page).  If you wanted instead an
+indent of 6
+<a href="definitions.html#TERMS_PICASPOINTS">picas</a>,
+you'd do it like this:
+
+<pre>
+    .CLOSING_INDENT 6P
+</pre>
+
+Or, if you wanted to have no indent at all:
+
+<pre>
+    .CLOSING_INDENT 0
+</pre>
+</p>
+
+<a name="SIGNATURE_SPACE"></a>
+<p>
+The second, <strong>SIGNATURE_SPACE</strong>, controls how much room
+to leave for the signature.  It takes a single
+<a href="definitions.html#TERMS_NUMERICARGUMENT">numeric argument</a>
+and must have a
+<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>
+appended to it.  <strong>Mom</strong>'s default is 3 line spaces,
+but if you wanted to change that to, say, 2 line spaces, you'd do:
+
+<pre>
+    .SIGNATURE_SPACE 2v
+</pre>
+</p>
+
 <!-- -NO_SUITE- -->
 
 <hr width="33%" align="left"/>
diff --git a/contrib/mom/momdoc/macrolist.html b/contrib/mom/momdoc/macrolist.html
index 74bc28ad..3c79d259 100644
--- a/contrib/mom/momdoc/macrolist.html
+++ b/contrib/mom/momdoc/macrolist.html
@@ -407,12 +407,14 @@ DOCUMENT PROCESSING MACROS
       <a href="docelement.html#TOC_ADDITIONAL">Additional table of contents control macros</a>
 
 <a name="40">+++ Letter (correspondence) macros</a>
-    <a href="letters.html#DATE">DATE</a>     -- letter's date
-    <a href="letters.html#FROM">FROM</a>     -- letter's addresser
-    <a href="letters.html#TO">TO</a>       -- letter's addressee
-    <a href="letters.html#GREETING">GREETING</a> -- letter's salutation
-    <a href="letters.html#CLOSING">CLOSING</a>  -- letter's closing salutation
-    <a href="letters.html#NO_SUITE">NO_SUITE</a> -- turn printing of &quot;next page number&quot; off or on
+    <a href="letters.html#DATE">DATE</a>            -- letter's date
+    <a href="letters.html#FROM">FROM</a>            -- letter's addresser
+    <a href="letters.html#TO">TO</a>              -- letter's addressee
+    <a href="letters.html#GREETING">GREETING</a>        -- letter's salutation
+    <a href="letters.html#CLOSING">CLOSING</a>         -- letter's closing salutation
+    <a href="letters.html#CLOSING_INDENT">CLOSING_INDENT</a>  -- indentation of the closing salutation
+    <a href="letters.html#SIGNATURE_SPACE">SIGNATURE_SPACE</a> -- room to leave for the signature
+    <a href="letters.html#NO_SUITE">NO_SUITE</a>        -- turn printing of &quot;next page number&quot; off or on
 
 <a name="41">+++ Changing global print style parameters after START</a>
     <a href="docprocessing.html#DOC_LEFT_MARGIN">DOC_LEFT_MARGIN</a>  -- left margin of everything on the page
diff --git a/contrib/mom/momdoc/reserved.html b/contrib/mom/momdoc/reserved.html
index 9e011558..cdcad30d 100644
--- a/contrib/mom/momdoc/reserved.html
+++ b/contrib/mom/momdoc/reserved.html
@@ -985,13 +985,15 @@ FOOTER_CENTER_FT      HDRFTR_CENTER_FONT
 
 +++LETTER MACROS+++
 
-CLOSING      Closing (i.e. Yours truly,)
-DATE         Date for letters
-FROM         Addresser's name and address
-GREETING     Full salutation (e.g. Dear John Smith,)
-NO_SUITE     Remove suite page numbers from bottom of letter pages
-TO           Addressee's name and address
-ALL_DONE     .em (the "end macro") for letters
+CLOSING         Closing (i.e. Yours truly,)
+CLOSING_INDENT  Left indent of CLOSING
+DATE            Date for letters
+FROM            Addresser's name and address
+GREETING        Full salutation (e.g. Dear John Smith,)
+NO_SUITE        Remove suite page numbers from bottom of letter pages
+SIGNATURE_SPACE Amount of room to leave for signature
+TO              Addressee's name and address
+ALL_DONE        .em (the "end macro") for letters
 
 +++SUPPORT+++
 
@@ -1966,6 +1968,7 @@ $CL_DEPTH                        Circle (ellipse) depth
 $CL_INDENT                       Circle (ellipse) left margin starting position
 $CL_WEIGHT                       Circle (ellipse) rule weight
 $CL_WIDTH                        Circle (ellipse) width
+$CLOSE_INDENT                    Argument passed to CLOSING_INDENT
 $CODE_FAM                        Family to use with CODE
 $COLOR_SCHEME                    Color scheme arg passed to NEWCOLOR
 $COPY_STYLE                      DRAFT or FINAL
@@ -2311,6 +2314,7 @@ $SH_FAM                          Family to use in subheads
 $SH_FT                           Font to use in subheads
 $SH_SIZE_CHANGE                  ps in/decrease of subheads*
 $SH_COLOR                        Subhead color
+$SIG_SPACE                       Arg passed to macro, SIGNATURE_SPACE
 $SUBTITLE                        Concatenated args passed to SUBTITLE
 $SUBTITLE_&lt;n&gt;              Subtitle items for doc header
 $SUBTITLE_COLOR                  Color of subtitle
diff --git a/contrib/mom/momdoc/typesetting.html b/contrib/mom/momdoc/typesetting.html
index 6dddde51..7719925a 100644
--- a/contrib/mom/momdoc/typesetting.html
+++ b/contrib/mom/momdoc/typesetting.html
@@ -139,7 +139,7 @@ macro that accomplishes the same thing.
 standalone package, independent of the
 <a href="docprocessing.html#DOCPROCESSING">document processing macros</a>.
 With them, you can typeset on-the-fly.  Book covers, your best
-friend's résumé, a poster for a lost dog &mdash; none of these requires
+friend's r�sum�, a poster for a lost dog &mdash; none of these requires
 structured document processing (page headers, paragraphs, heads,
 footnotes, etc).  What they do demand is precise control over every
 element on the page.  The typesetting macros give you that control.
@@ -1065,7 +1065,7 @@ found in the description of the <strong>FAMILY</strong> macro.
 <a name="FALLBACK_FONT"><h3><u>Fallback font</u></h3></a>
 
 <p>
-<nobr>Macro: <strong>FALLBACK_FONT</strong> <kbd>&lt;fallback font&gt; [ ABORT | WARN ] | ABORT | WARN</kbd></nobr>
+<nobr>Macro: <strong>FALLBACK_FONT</strong> <kbd>&lt;fallback font&gt; [ ABORT | WARN ]</kbd></nobr>
 </p>
 
 <p>
@@ -4625,7 +4625,7 @@ seem expedient, it's better to use tabs, or actually change the
 left margin or the line length. <strong>Mom</strong>'s indenting
 macros are flexible and powerful, but easy to get tangled up
 in.  Personally, I don't use them much, except for cutarounds and
-multi-level lists à la html, at which they excel.
+multi-level lists � la html, at which they excel.
 </p>
 
 <p>
diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac
index ca9ae2da..4fdf9bbb 100644
--- a/contrib/mom/om.tmac
+++ b/contrib/mom/om.tmac
@@ -5134,9 +5134,29 @@ y\\R'#DESCENDER \\n[.cdp]'
 .    br
 .    nr #CLOSING 1
 .    di CLOSING
-.    LEFT
 .END
 \#
+\# CLOSING INDENT
+\# --------------
+\# *Argument:
+\#   <amount to indent closing from left margin>
+\# *Function:
+\#   Defines string $CLOSE_INDENT for use in macro, ALL_DONE.
+\#
+.MAC CLOSING_INDENT END
+.    ds $CLOSE_INDENT \\$1
+.END
+\#
+\# SIGNATURE_SPACE
+\# ---------------
+\# *Argument:
+\#   <amount of space to leave for signature>
+\# *Function:
+\#   Defines string $SIG_SPACE for use in macro, ALL_DONE.
+\#
+.MAC SIGNATURE_SPACE END
+.    ds $SIG_SPACE \\$1
+.END
 \#
 \# NO SUITE
 \# --------
@@ -16597,18 +16617,18 @@ E\\R'#CAP_HEIGHT \\n[.cht]'
 .    FOOTERS OFF
 .    PAGINATION OFF
 .    if \\n[#DOC_TYPE]=4 \{\
-.       br
 .       if !'\\n(.z'' \{ .di \}
 .       IQ CLEAR
 .       TQ
-.       TAB_SET 1 \\n[#DOC_L_LENGTH]u/2u \\n[#DOC_L_LENGTH]u/2u LEFT
-.       ALD \\n[#DOC_LEAD]u*2u
-.       TAB 1
+.       ie !'\\*[$CLOSE_INDENT]'' \{ .IL \\*[$CLOSE_INDENT] \}
+.       el \{ .IL \\n[#DOC_L_LENGTH]u/2u \}
+.       SP
 .       if \\n[#CLOSING] \{\
-.          nf
 .          CLOSING
+.          br
 .       \}
-.       ALD \\n[#DOC_LEAD]u*3u
+.       ie !'\\*[$SIG_SPACE]'' \{ .ALD \\*[$SIG_SPACE] \}
+.       el \{ .SP 3v \}
 .       PRINT \\*[$AUTHOR_1]
 .    \}
 .    DO_FOOTER