diff options
| -rw-r--r-- | contrib/mom/BUGS | 10 | ||||
| -rw-r--r-- | contrib/mom/ChangeLog | 5 | ||||
| -rw-r--r-- | contrib/mom/momdoc/goodies.html | 13 | ||||
| -rw-r--r-- | contrib/mom/momdoc/inlines.html | 43 | ||||
| -rw-r--r-- | contrib/mom/momdoc/reserved.html | 16 | ||||
| -rw-r--r-- | contrib/mom/momdoc/toc.html | 4 | ||||
| -rw-r--r-- | contrib/mom/momdoc/typesetting.html | 114 | ||||
| -rw-r--r-- | contrib/mom/om.tmac | 35 |
8 files changed, 196 insertions, 44 deletions
diff --git a/contrib/mom/BUGS b/contrib/mom/BUGS index 8afa9eab..f549f8aa 100644 --- a/contrib/mom/BUGS +++ b/contrib/mom/BUGS @@ -15,6 +15,16 @@ Also, please--no html email. That, too, gets nuked. ======================================================================== +Version 1.2 +=========== + +.PAD not co-operating with mom's fontstyles, esp. when a full +family+fontstyle is given to .FT. +---Fixed--- + +.DROPCAP -- ditto the above. +---Fixed--- + Version 1.1.9 ============= diff --git a/contrib/mom/ChangeLog b/contrib/mom/ChangeLog index e7f4ec19..ca963769 100644 --- a/contrib/mom/ChangeLog +++ b/contrib/mom/ChangeLog @@ -1,3 +1,8 @@ +*Aug 21 2004 + +o Removed superfluous second arguments from strings UP, DOWN, FWD + and BCK + *Aug 8 2004 o Version changed from the 1.1.x series to 1.2. All of the diff --git a/contrib/mom/momdoc/goodies.html b/contrib/mom/momdoc/goodies.html index 3723d8f9..0974b7bf 100644 --- a/contrib/mom/momdoc/goodies.html +++ b/contrib/mom/momdoc/goodies.html @@ -688,9 +688,20 @@ groff's line drawing function, <a href="inlines.html#INLINE_LINEDRAWING_GROFF">\l</a> could be used.) <p> +Please note that the use of <kbd>.EL</kbd> after <kbd>.PAD</kbd> +in this example assumes that either +<a href="typesetting.html#QUAD">QUAD L | R | C | J</a> +or +<a href="typesetting.html#JUSTIFY">JUSTIFY</a> +are in effect. <strong>EL</strong> does not work after +<strong>PAD</strong> in +<a href="definitions.html#TERMS_NOFILL">nofill</a> +modes (i.e. +<a href="typesetting.html#LRC">.LEFT, .RIGHT or .CENTER</a>). +<p> <pre> .LL 30P - .PAD "Date\*[ST1]#\*[ST1X]Signature\*[ST2]###\*[ST2X]" + .PAD "Date \*[ST1]#\*[ST1X] Signature \*[ST2]###\*[ST2X]" .EL .ST 1 J .ST 2 J diff --git a/contrib/mom/momdoc/inlines.html b/contrib/mom/momdoc/inlines.html index 50e197b8..ec866c5d 100644 --- a/contrib/mom/momdoc/inlines.html +++ b/contrib/mom/momdoc/inlines.html @@ -362,8 +362,15 @@ For example, moves the hyphen in the telephone number up by 1 point, then moves back down by the same amount. <p> -<strong>NOTE:</strong> For backward compatibility, the following are -also available: +<strong>NOTE: \*[UP]</strong> and <strong>\*[DOWN]</strong> do not +work with the inline escape, +<a href="#INLINE_RULE_MOM">\*[RULE]</a>. +See +<a href="#RULE_EXCEPTION">here</a> +for details. +<p> +<strong>ADDITIONAL NOTE:</strong> For backward compatibility, the +following are also available: <p> <table valign="baseline" cellpadding="10" summary="inlinevertical"> <tr> @@ -435,7 +442,27 @@ macro and (See the <a href="goodies.html#PAD_EXAMPLE">example</a> provided with <strong>PAD</strong>.) +<a name="RULE_EXCEPTION"></a> +<p> +Please also note that the inline escapes +<a href="#UP">\*[UP]</a> +and +<a href="#DOWN">\*[DOWN]</a> +cannot be used in conjunction with <strong>\*[RULE]</strong>. This +doesn't work: +<p> +<pre> + \*[DOWN 2p]\*[RULE]\*[UP 2p] +</pre> + +This does: <p> +<pre> + .ALD 2p + \*[RULE] + .RLD 2p +</pre> + See groff's <a href="#INLINE_LINEDRAWING_GROFF">Horizontal line drawing function</a> for more information on drawing horizontal rules. @@ -653,12 +680,12 @@ Here follows a short list of commonly-used special characters available via inline escapes. If you're not sure of the meaning of some of these characters, consult the <a href="definitions.html#TERMS">Definitions of Terms</a>. -For a more complete list, consult the section <em>Special -Character Names</em> at the end of the <em>Tutorial Examples</em> -in <strong>cstr54</strong>, available -<a href="http://www.kohala.com/start/troff/">here</a>, -the groff <strong>info</strong> documentation, or better yet, <kbd>man -groff_char</kbd>. +<p> +For a complete list of special characters and glyphs (i.e. just +about anything you'd ever want to appear on the printed page, +including mathematical symbols, accented characters, unusual +ligatures and letters unique to various European languages), consult +<kbd>man groff_char</kbd>. <p> <pre> CHARACTER ESCAPE SEQUENCE diff --git a/contrib/mom/momdoc/reserved.html b/contrib/mom/momdoc/reserved.html index 99c80e6c..8d048b41 100644 --- a/contrib/mom/momdoc/reserved.html +++ b/contrib/mom/momdoc/reserved.html @@ -212,9 +212,6 @@ c column mark #EXT_WIDTH Width of pseudo-extended type (pointsize x $EXT_PERCENT) #FILL_MODE Are we in fill mode (i.e. \n(.u=1)? (toggle) -#FONT_FOR_PAD Used to ensure that the font in effect prior - to PAD is restored at the start of every - iteration of $PAD_STRING #H_INDENT Value of left indent when IH #HL_INDENT Value of the hang when IH #HYPHENATE Hyphenation on? (toggle) @@ -332,11 +329,24 @@ $FAMILY_FOR_PAD Used to ensure that the family in effect prior to PAD is restored at the start of every iteration of $PAD_STRING $FONT Font +$FONT_FOR_PAD Used to ensure that the font in effect prior + to PAD is restored at the start of every + iteration of $PAD_STRING $PAD_MARKER Character to mark off padding in PAD $PAD_STRING Arg passed to PAD $QUAD_VALUE Quad value (left, right, centre, justify) $QUOTE0 Open quotation marks $QUOTE1 Close quotation marks +$RESTORE_COND Restores the pseudo-condense value in effect + prior to DROPCAP +$RESTORE_EXT Restores the pseudo-extend value in effect + prior to DROPCAP +$RESTORE_FAM Used to restore the family in effect + prior to DROPCAP +$RESTORE_FT Used to restore the font/fontstyle in effect + prior to DROPCAP +$RESTORE_PT_SIZE Used to restore the point size of normal + running text after a dropcap $RESTORE_QUAD_VALUE Quad value for use in restoring L, R, C, J (after tabs) $SAVED_STYLE Current style, if there is one (used in FAMILY) diff --git a/contrib/mom/momdoc/toc.html b/contrib/mom/momdoc/toc.html index 84394748..0a37f2b0 100644 --- a/contrib/mom/momdoc/toc.html +++ b/contrib/mom/momdoc/toc.html @@ -2,13 +2,13 @@ <html> <head> <meta http-equiv="content-type" content="text/html;charset=iso-8859-1"> -<title>Mom, version 1.1.9 -- Table of Contents</title> +<title>Mom, version 1.2-a -- Table of Contents</title> </head> <body bgcolor="#dfdfdf"> <!====================================================================> -<h1 align="center"><u>Table of Contents for mom, version 1.2</u></h1> +<h1 align="center"><u>Table of Contents for mom, version 1.2-a</u></h1> The table of contents has grown quite large. If you've been using <strong>mom</strong> for a while, you might prefer the diff --git a/contrib/mom/momdoc/typesetting.html b/contrib/mom/momdoc/typesetting.html index 6c976f7a..d0ccb295 100644 --- a/contrib/mom/momdoc/typesetting.html +++ b/contrib/mom/momdoc/typesetting.html @@ -1272,8 +1272,9 @@ You can use either, or mix 'n' match with impunity. Macro: <strong>EL</strong> <br> <em>*In nofill modes (LEFT, RIGHT, CENTER), you must terminate the -line preceding EL with the \c inline escape. See the -<a href="#EL_NOTE">NOTE</a>, +line preceding EL with the \c inline escape. Furthermore, in +nofill modes, EL does not work after the PAD macro. See the +<a href="#EL_NOTES">NOTES</a>, below.</em> <p> @@ -1326,7 +1327,8 @@ you don't have to recalculate the extra space. from Compugraphic), which is covered in the section <a href="#ALDRLD">Vertical movement</a>. <p> -<a name="EL_NOTE"><strong>NOTE:</strong></a> +<a name="EL_NOTES"><strong>NOTES:</strong></a> +<p> In versions of mom prior to 1.1.9, <strong>EL</strong> did not always work as advertised on the last <a name="TERMS_OUTPUTLINE">output line</a> @@ -1364,10 +1366,31 @@ or <a href="#JUSTIFY">JUSTIFY</a>), the <strong>\c</strong> must not be used. <p> -If <strong>EL</strong> is used after a macro or a groff -<a href="definitions.html#TERMS_PRIMITIVES">primitive</a>, -you don't have to worry about this, regardless of the fill mode. -Just type <kbd>.EL</kbd> +If <strong>EL</strong> is used after most macros or groff +<a href="definitions.html#TERMS_PRIMITIVES">primitives</a> +(see the exception, below), you don't have to worry about this, +regardless of the fill mode. Just type <kbd>.EL</kbd> +<p> +<strong>Exception: EL</strong> does not work after the +<a href="goodies.html#PAD">PAD</a> +macro when you're in a nofill mode. If you require +<strong>EL</strong> functionality after <strong>PAD</strong> while +in a nofill mode, you have to perform its function +"manually", e.g. +<p> +<pre> + .CENTER \" CENTER is a nofill mode + .PAD "#\*[ST1]A line of text\*[ST1X]#" + .TRAP OFF -+ + .SP -1v | - a "manual" EL + .TRAP -+ + .ST 1 L + .TAB 1 + .ALD 2p + \*[RULE] + .RLD 2p + .TQ +</pre> <p> <!---SP---> @@ -3065,7 +3088,19 @@ before setting up tabs with <strong>TAB_SET</strong>, or <a name="INLINE_ST"><h3><u>Mark positions of string tabs</u></h3></a> <br> Inlines: <strong>\*[ST<number>]...\*[ST<number>X]</strong> - +<br> +<em>*<a href="definitions.html#TERMS_QUAD">Quad</a> +direction must be LEFT or JUSTIFY (see +<a href="#QUAD">QUAD</a> +and +<a href="#JUSTIFY">JUSTIFY</a>) +or the +<a name="definitions.html#TERMS_NOFILL">no-fill mode</a> +set to +<a href="#LRC">LEFT</a>. +Please see +<a href="#IMPORTANT">IMPORTANT</a>, +below.</em> <p> String tabs need to be marked off with <a href="definitions.html#TERMS_INLINES">inline escapes</a> @@ -3105,12 +3140,65 @@ printing, use the <a href="#SILENT">SILENT</a> macro. <p> -<strong>IMPORTANT:</strong> Do not try to set up string tabs on -a line that is broken with +<a name="IMPORTANT"><strong>IMPORTANT:</strong></a> +Owing to the way groff processes +<a href="definitions.html#TERMS_INPUTLINE">input lines</a> +and turns them into +<a href="definitions.html#TERMS_OUTPUTLINE">output lines</a>, +it is not possible for <strong>mom</strong> to "guess" the +correct starting position of string tabs marked off in lines that +are centered or set flush right. +<p> +Equally, she cannot guess the starting position if a line is fully +justified and broken with <a href="#SPREAD">SPREAD</a>. -<strong>Mom</strong> calculates string tab positions and lengths -as she reads the input line, not after the line has undergone -manipulations to the word spacing. +<p> +In other words, in order to use string tabs, +<a href="#LRC">LEFT</a> +must be active, or, if +<a href="#QUAD">QUAD LEFT</a> +or +<a href="#JUSTIFY">JUSTIFY</a> +are active, the line on which the string tabs are marked must be +broken "manually" with +<a href="#BR">BR</a> +(but not +<a href="#SPREAD">SPREAD</a>). +<p> +To circumvent this behaviour, I recommend using the +<a href="goodies.html#PAD">PAD</a> +to set up string tabs in centered or flush right lines. Say, for +example, you want to use a string tab to underscore the text of a +centered line with a thick rule. Rather than this, +<p> +<pre> + .CENTER + \*[ST1]A line of text\*[ST1X]\c + .EL + .ST 1 + .TAB 1 + .PT_SIZE 24 + .ALD 3p + \*[RULE] + .RLD 3p + .TQ +</pre> + +you should do: +<p> +<pre> + .QUAD CENTER + .PAD "#\*[ST1]A line of text\*[ST1X]#" + .EL + .ST 1 + .TAB 1 + .PT_SIZE 24 + .ALD 3p + \*[RULE] \" Note that you can't use \*[UP ] or \*[DOWN] with \*[RULE] + .RLD 3p + .TQ +</pre> + <p> <!---ST---> diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac index b445505e..b72a6e9f 100644 --- a/contrib/mom/om.tmac +++ b/contrib/mom/om.tmac @@ -23,8 +23,8 @@ .\" .\" .\" -\# Version 1.2 -\# ----------- +\# Version 1.2-a +\# ------------- \# \# Antoine de St-Exupéry asserted that elegance in engineering is \# achieved not when there is nothing left to add, but when there is @@ -687,8 +687,8 @@ \# preferred methods for inline horizontal movements are now \# \*[BCK <n><unit>] and \*[FWD <n><unit>]. \# -.ds BCK \h'-\\$1\\$2' -.ds FWD \h'\\$1\\$2' +.ds BCK \h'-\\$1' +.ds FWD \h'\\$1' \# .ds BP.25 \h'-.25' .ds BP.5 \h'-.5' @@ -986,11 +986,11 @@ \# The strings \*[ALD.25]...\*[ALD12.75] and their corresponding \# \*[RLD] forms have been left in for backward compatibility with \# documents created using mom-1.1.3c or earlier. The prefered -\# methods of advancing and reversing on the page inline are \*[UP <n><unit>] -\# and \*[DOWN <n><unit>]. +\# methods of advancing and reversing on the page inline are +\# \*[UP <n><unit>] and \*[DOWN <n><unit>]. \# -.ds DOWN \v'\\$1\\$2' -.ds UP \v'-\\$1\\$2' +.ds DOWN \v'\\$1' +.ds UP \v'-\\$1' \# .ds ALD.25 \v'.25p' .ds ALD.5 \v'.5p' @@ -2335,32 +2335,33 @@ . if !d$PAD_MARKER \{ .ds $PAD_MARKER # \} . char \\*[$PAD_MARKER] \R'#PAD_COUNT \En[#PAD_COUNT]+1' . ds $FAMILY_FOR_PAD \\n[.fam] -. nr #FONT_FOR_PAD \\n(.f +. fp \\n[.fp] \\*[$FONT] +. ds $FONT_FOR_PAD \\*[$FONT] . nr #SIZE_FOR_PAD \\n[.ps] . ds $PAD_STRING \\$1 . as $PAD_STRING \Ekp . di PAD_STRING . fam \\*[$FAMILY_FOR_PAD] -\\f\\n[#FONT_FOR_PAD]\\s[\\n[#SIZE_FOR_PAD]u]\\*[$PAD_STRING] +\\f[\\*[$FONT_FOR_PAD]]\\s[\\n[#SIZE_FOR_PAD]u]\\*[$PAD_STRING] . br . di . char \\*[$PAD_MARKER] \R'#SPACE_TO_END \En(.l-\Enp'\R'#PAD_SPACE \En[#SPACE_TO_END]/\En[#PAD_COUNT]' . di PAD_STRING . fam \\*[$FAMILY_FOR_PAD] -\\f\\n[#FONT_FOR_PAD]\\s[\\n[#SIZE_FOR_PAD]u]\\*[$PAD_STRING] +\\f]\\*[$FONT_FOR_PAD]]\\s[\\n[#SIZE_FOR_PAD]u]\\*[$PAD_STRING] . br . di . char \\*[$PAD_MARKER] \h'\En[#PAD_SPACE]u' . ie \\n[#SILENT] \{\ . SILENT . fam \\*[$FAMILY_FOR_PAD] -\\f\\n[#FONT_FOR_PAD]\\s[\\n[#SIZE_FOR_PAD]u]\\*[$PAD_STRING] +\\f[\\*[$FONT_FOR_PAD]]\\s[\\n[#SIZE_FOR_PAD]u]\\*[$PAD_STRING] . br . SILENT OFF . \} . el \{\ . fam \\*[$FAMILY_FOR_PAD] -\\f\\n[#FONT_FOR_PAD]\\s[\\n[#SIZE_FOR_PAD]u]\\*[$PAD_STRING] +\\f[\\*[$FONT_FOR_PAD]]\\s[\\n[#SIZE_FOR_PAD]u]\\*[$PAD_STRING] . br . \} . if \\n[#FILL_MODE]=1 \{\ @@ -2517,14 +2518,14 @@ . if '\\$3'EXT' \{ .EXTEND \\$4 \} . if !r#DC_GUT \{ .nr #DC_GUT (3p) \} . ds $RESTORE_FAM \\n[.fam] -. nr #RESTORE_FT \\n(.f +. ds $RESTORE_FT \\*[$FONT] . nr #RESTORE_PT_SIZE \\n[#PT_SIZE] . nr #RESTORE_INDENT \\n(.i . SIZESPECS . nr #DC_HEIGHT \\n[#DC_LINES]*\\n[#LEAD]+\\n[#CAP_HEIGHT] . ie !d$DC_FAM \{ .FAM \\n[.fam] \} . el \{ .FAM \\*[$DC_FAM] \} -. ie !d$DC_FT \{ .FT \\n(.f \} +. ie !d$DC_FT \{ .FT \\*[$FONT] \} . el \{ .FT \\*[$DC_FT] \} . while \\n[#GET_DC_HEIGHT]<\\n[#DC_HEIGHT] \{\ . ps \\n[#PT_SIZE]u+100u @@ -2556,7 +2557,7 @@ . if '\\$3'EXT' \{ \E*[EXTX]\c \} . rt \\nxu . FAM \\*[$RESTORE_FAM] -. FT \\n[#RESTORE_FT] +. FT \\*[$RESTORE_FT] . ps \\n[#RESTORE_PT_SIZE]u . CONDENSE \\*[$RESTORE_COND] . EXTEND \\*[$RESTORE_EXT] @@ -2567,7 +2568,7 @@ . rm $RESTORE_COND . rm $RESTORE_EXT . rm $RESTORE_FAM -. rr #RESTORE_FT +. rm $RESTORE_FT . rr #RESTORE_PT_SIZE . rr #RESTORE_INDENT . rr #DC_HEIGHT |