groff-commit
[Top][All Lists]
Advanced

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

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


From: Peter Schaffter
Subject: [Groff-commit] groff/contrib/mom ChangeLog om.tmac momdoc/appe...
Date: Tue, 07 Jul 2009 03:00:17 +0000

CVSROOT:        /sources/groff
Module name:    groff
Changes by:     Peter Schaffter <PTPi>  09/07/07 03:00:15

Modified files:
        contrib/mom    : ChangeLog om.tmac 
        contrib/mom/momdoc: appendices.html intro.html letters.html 
                            macrolist.html reserved.html 
                            typesetting.html 

Log message:
        o Added CLOSING_INDENT and SIGNATURE_SPACE to DOCTYPE LETTER macros.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/ChangeLog?cvsroot=groff&r1=1.63&r2=1.64
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/om.tmac?cvsroot=groff&r1=1.52&r2=1.53
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/momdoc/appendices.html?cvsroot=groff&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/momdoc/intro.html?cvsroot=groff&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/momdoc/letters.html?cvsroot=groff&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/momdoc/macrolist.html?cvsroot=groff&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/momdoc/reserved.html?cvsroot=groff&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/momdoc/typesetting.html?cvsroot=groff&r1=1.24&r2=1.25

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/groff/groff/contrib/mom/ChangeLog,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- ChangeLog   15 Jun 2009 03:01:23 -0000      1.63
+++ ChangeLog   7 Jul 2009 03:00:11 -0000       1.64
@@ -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

Index: om.tmac
===================================================================
RCS file: /sources/groff/groff/contrib/mom/om.tmac,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- om.tmac     15 Jun 2009 03:01:23 -0000      1.52
+++ om.tmac     7 Jul 2009 03:00:12 -0000       1.53
@@ -5134,9 +5134,29 @@
 .    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 @@
 .    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

Index: momdoc/appendices.html
===================================================================
RCS file: /sources/groff/groff/contrib/mom/momdoc/appendices.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- momdoc/appendices.html      5 Jan 2009 20:33:53 -0000       1.15
+++ momdoc/appendices.html      7 Jul 2009 03:00:14 -0000       1.16
@@ -525,7 +525,7 @@
         <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>

Index: momdoc/intro.html
===================================================================
RCS file: /sources/groff/groff/contrib/mom/momdoc/intro.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- momdoc/intro.html   5 Jan 2009 20:33:53 -0000       1.17
+++ momdoc/intro.html   7 Jul 2009 03:00:14 -0000       1.18
@@ -296,7 +296,7 @@
 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 @@
 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 @@
 <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>

Index: momdoc/letters.html
===================================================================
RCS file: /sources/groff/groff/contrib/mom/momdoc/letters.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- momdoc/letters.html 5 Jan 2009 20:33:53 -0000       1.13
+++ momdoc/letters.html 7 Jul 2009 03:00:14 -0000       1.14
@@ -529,6 +529,53 @@
 </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"/>

Index: momdoc/macrolist.html
===================================================================
RCS file: /sources/groff/groff/contrib/mom/momdoc/macrolist.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- momdoc/macrolist.html       15 Jun 2009 03:01:24 -0000      1.14
+++ momdoc/macrolist.html       7 Jul 2009 03:00:15 -0000       1.15
@@ -412,6 +412,8 @@
     <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>

Index: momdoc/reserved.html
===================================================================
RCS file: /sources/groff/groff/contrib/mom/momdoc/reserved.html,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- momdoc/reserved.html        15 Jun 2009 03:01:24 -0000      1.35
+++ momdoc/reserved.html        7 Jul 2009 03:00:15 -0000       1.36
@@ -986,10 +986,12 @@
 +++LETTER MACROS+++
 
 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
 
@@ -1966,6 +1968,7 @@
 $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_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

Index: momdoc/typesetting.html
===================================================================
RCS file: /sources/groff/groff/contrib/mom/momdoc/typesetting.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- momdoc/typesetting.html     15 Jun 2009 03:01:24 -0000      1.24
+++ momdoc/typesetting.html     7 Jul 2009 03:00:15 -0000       1.25
@@ -139,7 +139,7 @@
 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 @@
 <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 @@
 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>




reply via email to

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