diff options
| author | PTPi <PTPi> | 2009-06-15 03:01:23 +0000 |
|---|---|---|
| committer | PTPi <PTPi> | 2009-06-15 03:01:23 +0000 |
| commit | 68d79799edfbdd3643c02e4c5cda2fd91ab8814b (patch) | |
| tree | 39ff42482d8ba68ea0c47c67bfd111fbc3b2af20 /contrib | |
| parent | 71826809e5c309abdd89660a981cb9fcf6e9d6ee (diff) | |
| download | groff-68d79799edfbdd3643c02e4c5cda2fd91ab8814b.tar.gz | |
o Doc fixes and updates
o DROPCAP handling changed; uses local vertical motions now instead
of .mk/.rt.
o Added macro SUPERSCRIPT_RAISE_AMOUNT.
o Added registers and strings to keep track of .RW and .EW and the
amounts passed to them.
o Various bug fixes (see BUGS)
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/mom/BUGS | 17 | ||||
| -rw-r--r-- | contrib/mom/ChangeLog | 26 | ||||
| -rw-r--r-- | contrib/mom/momdoc/cover.html | 4 | ||||
| -rw-r--r-- | contrib/mom/momdoc/definitions.html | 3 | ||||
| -rw-r--r-- | contrib/mom/momdoc/docelement.html | 57 | ||||
| -rw-r--r-- | contrib/mom/momdoc/goodies.html | 79 | ||||
| -rw-r--r-- | contrib/mom/momdoc/graphical.html | 8 | ||||
| -rw-r--r-- | contrib/mom/momdoc/inlines.html | 2 | ||||
| -rw-r--r-- | contrib/mom/momdoc/macrolist.html | 128 | ||||
| -rw-r--r-- | contrib/mom/momdoc/rectoverso.html | 17 | ||||
| -rw-r--r-- | contrib/mom/momdoc/reserved.html | 14 | ||||
| -rw-r--r-- | contrib/mom/momdoc/toc.html | 4 | ||||
| -rw-r--r-- | contrib/mom/momdoc/typemacdoc.html | 9 | ||||
| -rw-r--r-- | contrib/mom/momdoc/typesetting.html | 6 | ||||
| -rw-r--r-- | contrib/mom/om.tmac | 164 |
15 files changed, 403 insertions, 135 deletions
diff --git a/contrib/mom/BUGS b/contrib/mom/BUGS index f1801667..8ac35e2a 100644 --- a/contrib/mom/BUGS +++ b/contrib/mom/BUGS @@ -24,6 +24,23 @@ Also, please--no html email. That, too, gets nuked. Version 1.5-c ============= +COVER_COUNTS_PAGES incrementing pagenum by 1 too many. +---Fixed--- + +HEADER/FOOTER_RECTO strings vanishing when the default CAPS option +is turned off. +---Fixed--- + +TQ not removing QUAD arg from cleared tabs. +---Fixed--- + +DROPCAP_OFF trap remaining in effect after dropcap has been +processed. +---Fixed--- + +PARAHEAD_SIZE 0 resulting in 0-sized type! +---Fixed--- + 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. diff --git a/contrib/mom/ChangeLog b/contrib/mom/ChangeLog index d33edce9..309a8ed1 100644 --- a/contrib/mom/ChangeLog +++ b/contrib/mom/ChangeLog @@ -1,3 +1,23 @@ +* Sun Jun 14 2009 + +o DROPCAP handling changed; uses local vertical motions now instead + of .mk/.rt. + +o Added macro SUPERSCRIPT_RAISE_AMOUNT + +o Added registers and strings to keep track of .RW and .EW and the + amounts passed to them. + +* Sat May 2 2009 + +o Fixed error in docs: COVERS_COUNT_PAGES changed to + COVER_COUNTS_PAGES. Ditto DOC_COVERS_COUNT_PAGES. + +* Fri May 1 2009 + +o Fixed PARAHEAD size so it properly adds the value of + \*[$PH_SIZE_CHANGE] to \n[#DOC_LEAD]. + * Sat Jan 17 2009 o Changed FAMILY, FT and PT_SIZE requests in DO_COVER to groff @@ -19,8 +39,6 @@ o Added possibility of quadding docheader left or right, as well as 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. @@ -32,8 +50,6 @@ o Doc fixes in toc.html o Control of null pagenumbering of covers passed to \n%; formerly handled by \n[#PAGE_NUM_ADJ] -==================================================================== - * Tue Dec 23 2008 o Added a CAPS option to HDRFTR_RECTO and HDRFTR_VERSO to allow @@ -81,8 +97,6 @@ o Removed spurious 'sp |\\n[MN-curr-pos]u from MNbottom-right, prior o Added missing spaced paras bit in blockquotes. -==================================================================== - * Tue Jan 22 2008 o Fixed indent handling of refer items in endnotes. diff --git a/contrib/mom/momdoc/cover.html b/contrib/mom/momdoc/cover.html index 8abeee37..3182d084 100644 --- a/contrib/mom/momdoc/cover.html +++ b/contrib/mom/momdoc/cover.html @@ -637,8 +637,8 @@ same way as <a name="COUNT"></a> <p> -<strong>COVERS_COUNT_PAGES</strong> and -<strong>DOC_COVERS_COUNT_PAGES</strong> are toggle macros, hence +<strong>COVER_COUNTS_PAGES</strong> and +<strong>DOC_COVER_COUNTS_PAGES</strong> are toggle macros, hence invoking them by themselves means that <strong>mom</strong> will consider cover and doc cover pages in the pagination scheme; invoking them with any argument (<strong>OFF, NO, X</strong>, diff --git a/contrib/mom/momdoc/definitions.html b/contrib/mom/momdoc/definitions.html index 042af917..ef762803 100644 --- a/contrib/mom/momdoc/definitions.html +++ b/contrib/mom/momdoc/definitions.html @@ -736,7 +736,8 @@ or concept you're not familiar with. c (centimetres) m (ems) n (ens) - v (the current leading (line space)) + u (machine units) + v (the current leading [line space]) </pre> <p> diff --git a/contrib/mom/momdoc/docelement.html b/contrib/mom/momdoc/docelement.html index 8d308a66..7bdfefcc 100644 --- a/contrib/mom/momdoc/docelement.html +++ b/contrib/mom/momdoc/docelement.html @@ -1482,8 +1482,9 @@ to introduce paragraphs below heads or subheads. If you wish, By default, paraheads are joined to the body of a paragraph, slightly indented (provided the paragraph is not a "first" paragraph as defined in -<a href="#PARA_INDENT_FIRST">Indenting initial paragraphs</a>). -In +<a href="#PARA_INDENT_FIRST">Indenting initial paragraphs</a>) +and separated from the body of the paragraph by a small amount of +horizontal space. In <a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPESET</a>, they are set bold italic, slightly larger than paragraph text. In <a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPEWRITE</a>, @@ -1495,6 +1496,20 @@ If these defaults don't suit you, you can change them with the parahead control macros. </p> +<p> +<strong>Tip:</strong> If you really need a heading level below +subhead (a sub-subhead) that isn't joined to the body of a +paragraph, you can trick <strong>PARAHEAD</strong> into giving you +one by creating a paragraph that contains only a parahead, like this: + +<pre> + .PP + .PARAHEAD "My Sub-Subhead" + .PP + <text> +</pre> +</p> + <!-- -PARAHEAD- --> <hr width="66%" align="left"/> @@ -1532,6 +1547,7 @@ there are macros to manage parahead numbering. <ol> <li><a href="#PARAHEAD_GENERAL">Family/font/size/color</a></li> <li><a href="#PARAHEAD_INDENT">Indent</a></li> + <li><a href="#PARAHEAD_SPACE">Horizontal space</a></li> <li><a href="#NUMBER_PARAHEADS">Numbering</a></li> <li><a href="#RESET_PARAHEAD_NUMBER">Reset parahead numbering</a></li> </ol> @@ -1596,7 +1612,40 @@ are not indented unless you turn on. </p> -<a name="NUMBER_PARAHEADS"><h4><u>3. Number paraheads — NUMBER_PARAHEADS</u></h4></a> +<a name="PARAHEAD_SPACE"><h4><u>3. Horizontal space</u></h4></a> + +<p> +The default amount of horizontal space between a parahead and the +text that begins the body of a paragraph is 2/3 of an +<a href="definitions.html#TERMS_EM">em</a> +for +<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPESET</a>) +and 1 +<a href="definitions.html#TERMS_FIGURESPACE">figure space</a> +for +<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPEWRITE</a>). +</p> + +<p> +The default for <strong>TYPEWRITE</strong> is fixed, but if the +default for <strong>TYPESET</strong> doesn't suit you, you can +change it with the macro, <strong>PARAHEAD_SPACE</strong>. +</p> +<p> +<strong>PARAHEAD_SPACE</strong> takes just one argument: the amount +of space you want, with a +<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a> +appended. Thus, if you want the horizontal space between a parahead +and the start of paragraph text to be 6 +<a href="definitions.html#TERMS_PICASPOINTS">points</a>, +you'd do: + +<pre> + .PARAHEAD_SPACE 6p +</pre> +</p> + +<a name="NUMBER_PARAHEADS"><h4><u>4. Number paraheads — NUMBER_PARAHEADS</u></h4></a> <p> If you'd like your paraheads numbered, simply invoke @@ -1627,7 +1676,7 @@ if you'd like chapter numbers prepended to the paragraph head numbers. </p> -<a name="RESET_PARAHEAD_NUMBER"><h4><u>4. Reset paragraph head numbering — RESET_PARAHEAD_NUMBER</u></h4></a> +<a name="RESET_PARAHEAD_NUMBER"><h4><u>5. Reset paragraph head numbering — RESET_PARAHEAD_NUMBER</u></h4></a> <p> Should you wish to reset the parahead number to "1", invoke diff --git a/contrib/mom/momdoc/goodies.html b/contrib/mom/momdoc/goodies.html index fddce21c..e809dde2 100644 --- a/contrib/mom/momdoc/goodies.html +++ b/contrib/mom/momdoc/goodies.html @@ -49,6 +49,7 @@ nearly indispensable) routines to simplify typesetting. <li><a href="#CAPS">CAPS</a> (convert to upper case)</li> <li><a href="#STRING">STRING</a> (user-definable strings)</li> <li><a href="#ESC_CHAR">ESC_CHAR</a> (change to escape character to something other than a backslash)</li> + <li><a href="#SIZESPECS">SIZESPECS</a> (get cap-height, x-height and descender depth of a font)</li> <li><strong>Underscore/underline</strong></li> <ul> <li><a href="#UNDERSCORE">UNDERSCORE</a> (single underscore)</li> @@ -152,6 +153,21 @@ Note that in <strong>ALIAS</strong>, you do NOT include the period </p> <p> +<strong>Tip:</strong> A particularly good candidate for +<strong>ALIAS</strong> is the macro, +<a href="typesetting.html#PS">PT_SIZE</a>. +A more natural name for it (at least to old-school phototypesetters) +would simply be PS, but PS conflicts with the <strong>eqn</strong> +equation preprocessor and thus <strong>mom</strong> uses the longer +form. However, if you're not using <strong>eqn</strong>, you can +happily rename <strong>PT_SIZE</strong> to <strong>PS</strong>: + +<pre> + .ALIAS PS PT_SIZE +</pre> +</p> + +<p> <strong>NOTE:</strong> If you use <strong>ALIAS</strong> a lot, and always for the same things, consider creating an aliases file of the form @@ -586,6 +602,46 @@ character to the backslash. <kbd>.ec</kbd>. Mix 'n' match the two with impunity. </p> +<!-- -SIZESPECS- --> + +<hr width="33%" align="left"/> + +<a name="SIZESPECS"><h3><u>Get cap-height, x-height and descender depth of a font</u></h3></a> + +<p> +<nobr>Macro: <strong>SIZESPECS</strong></nobr> +</p> + +<p> +Whenever you need to get the +<a href="definitions.html#TERMS_CAPHEIGHT">cap-height</a>, +<a href="definitions.html#TERMS_XHEIGHT">x-height</a> +or +<a href="definitions.html#TERMS_DESCENDER">descender</a> +depth of type at the current point size, invoke +<kbd>.SIZESPECS</kbd>, which takes no argument. The dimensions are +stored in the string registers <strong>\*[$CAP_HEIGHT]</strong>, +<strong>\*[$X_HEIGHT]</strong> and <strong>\*[$DESCENDER]</strong>, +respectively, in +<a href="definitions.html#TERMS_UNITS">machine units</a> +to which the +<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>, +<strong>u</strong>, is already appended. +</p> + +<p> +Thus, if you wanted to advance 2 inches from your current position +on the page plus the cap-height of the current point size of type + +<pre> + .PT_SIZE <n> + .SIZESPECS + .ALD 2i+\*[$CAP_HEIGHT] +</pre> + +would do the trick. +</p> + <!-- -UNDERSCORE- --> <hr width="33%" align="left"/> @@ -1354,7 +1410,7 @@ smaller. <p> If you'd like your drop cap colourized, simply invoke -<strong>DROPCAP_COLOR</strong> with the name of a colour you've already +<kbd>.DROPCAP_COLOR</kbd> with the name of a colour you've already created ("initialized") with <a href="color.html#NEWCOLOR">NEWCOLOR</a> or @@ -1426,6 +1482,27 @@ Of course, anyone who wishes to contribute a subscript routine to lifetime, but in all lifetimes to come. </p> +<h4><a name="SUP_RAISE"><u>SUPERSCRIPT RAISE AMOUNT</u></a></h4> + +<p> +By default, <strong>mom</strong> raises superscripts 1/3 of an +<a href="definitions.html#TERMS_EMS">em</a> +above the baseline. If you're not happy with this default, you can +change it by invoking <strong>SUPERSCRIPT_RAISE_AMOUNT</strong> with +the amount you want them raised. A +<a name="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a> +must be appended directly to the amount. Thus, you want +superscripts raised by 3 +<a href="definitions.html#TERMS_PICASPOINTS">points</a> +instead of 1/3 em, you'd +do + +<pre> + .SUPERSCRIPT_RAISE_AMOUNT 3p +</pre> +and all subsequent superscripts would be raised by 3 points. +</p> + <hr/> <a href="inlines.html#TOP">Next</a> diff --git a/contrib/mom/momdoc/graphical.html b/contrib/mom/momdoc/graphical.html index e12aa9ab..1f57b1c5 100644 --- a/contrib/mom/momdoc/graphical.html +++ b/contrib/mom/momdoc/graphical.html @@ -563,10 +563,10 @@ Additionally, if you want the circle yellow: <p> Circles (ellipses) are drawn from the baseline down, from left to right, and from the perimeter <em>inward</em>. "From the -perimeter inward" means that if you request a box weight of six -points, the 6-point rule used to draw the outline of the circle or -ellipse falls entirely <em>within</em> the dimensions of the circle -or ellipse. +perimeter inward" means that if you request a circle weight of +six points, the 6-point rule used to draw the outline of the circle +or ellipse falls entirely <em>within</em> the dimensions of the +circle or ellipse. </p> <p> diff --git a/contrib/mom/momdoc/inlines.html b/contrib/mom/momdoc/inlines.html index 75b645fc..d197f739 100644 --- a/contrib/mom/momdoc/inlines.html +++ b/contrib/mom/momdoc/inlines.html @@ -730,7 +730,7 @@ It takes a single argument: the weight of the rule in <em>but without the</em> <a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a> <strong><kbd>p</kbd></strong> <em>attached</em>. Thus, to set the weight of rules -drawm with <kbd>\*[RULE]</kbd> to 1-1/4 points, you'd do +drawn with <kbd>\*[RULE]</kbd> to 1-1/4 points, you'd do <pre> .RULE_WEIGHT 1.25 diff --git a/contrib/mom/momdoc/macrolist.html b/contrib/mom/momdoc/macrolist.html index 3b0669c0..74bc28ad 100644 --- a/contrib/mom/momdoc/macrolist.html +++ b/contrib/mom/momdoc/macrolist.html @@ -46,34 +46,35 @@ references found elsewhere in the documentation. <pre> TYPESETTING MACROS DOCUMENT PROCESSING MACROS ================== ========================== -<a href="#1">Paper size, margins, line length</a> <a href="#18">Reference macros</a> -<a href="#2">Family, font, point size</a> <a href="#19">General document formatting directives</a> -<a href="#3">Font modifications</a> <a href="#20">Line numbering</a> -<a href="#4">Linespacing (leading)</a> <a href="#21">Set documents in columns</a> -<a href="#5">Justification, quad, breaking lines</a> <a href="#22">TYPEWRITE control macros</a> -<a href="#6">Hyphenation</a> <a href="#23">Initiate document processing</a> -<a href="#7">Word and sentence spacing</a> <a href="#24">Epigraphs</a> -<a href="#8">Kerning, ligatures, smartquotes</a> <a href="#25">Main heads</a> -<a href="#9">Horizontal/vertical motions, columns</a> <a href="#26">Subheads</a> -<a href="#10">Indents</a> <a href="#27">Paragraph heads</a> -<a href="#11">Tabs</a> <a href="#28">Paragraphs</a> -<a href="#12">Underscoring, underlining</a> <a href="#29">Quotes (line by line verbatim quotes)</a> -<a href="#13">Superscipts</a> <a href="#30">Blockquotes (cited passages of text)</a> -<a href="#14">Nested lists</a> <a href="#32">Author linebreaks (section breaks)</a> -<a href="#15">Colour</a> <a href="#33">Document termination string</a> -<a href="#16">Dropcaps</a> <a href="#34">Footnotes</a> -<a href="#17">Utilities</a> <a href="#35">Endnotes</a> - <a href="#36">Margin notes</a> - <a href="#37">Bibliographic references</a> - <a href="#38">Tables of contents</a> - <a href="#39">Letter (correspondence) macros</a> - <a href="#40">Changing global print style parameters after START</a> - <a href="#41">Managing a document's first-page header</a> - <a href="#42">Managing page headers and footers</a> - <a href="#43">Recto/verso page headers and footers</a> - <a href="#44">Pagination</a> - <a href="#45">Document and section cover (title) pages</a> - <a href="#46">Utilities</a> +<a href="#1">Paper size, margins, line length</a> <a href="#19">Reference macros</a> +<a href="#2">Family, font, point size</a> <a href="#20">General document formatting directives</a> +<a href="#3">Font modifications</a> <a href="#21">Line numbering</a> +<a href="#4">Linespacing (leading)</a> <a href="#22">Set documents in columns</a> +<a href="#5">Justification, quad, breaking lines</a> <a href="#23">TYPEWRITE control macros</a> +<a href="#6">Hyphenation</a> <a href="#24">Initiate document processing</a> +<a href="#7">Word and sentence spacing</a> <a href="#25">Epigraphs</a> +<a href="#8">Kerning, ligatures, smartquotes</a> <a href="#26">Main heads</a> +<a href="#9">Horizontal/vertical motions, columns</a> <a href="#27">Subheads</a> +<a href="#10">Indents</a> <a href="#28">Paragraph heads</a> +<a href="#11">Tabs</a> <a href="#29">Paragraphs</a> +<a href="#12">Underscoring, underlining</a> <a href="#30">Quotes (line by line verbatim quotes)</a> +<a href="#13">Superscipts</a> <a href="#31">Blockquotes (cited passages of text)</a> +<a href="#14">Nested lists</a> <a href="#32">Code snippets (inserting bits of programming code)</a> +<a href="#15">Colour</a> <a href="#33">Author linebreaks (section breaks)</a> +<a href="#16">Dropcaps</a> <a href="#34">Document termination string</a> +<a href="#17">Utilities</a> <a href="#35">Footnotes</a> +<a href="#18">Graphical Objects</a> <a href="#36">Endnotes</a> + <a href="#37">Margin notes</a> + <a href="#38">Bibliographic references</a> + <a href="#39">Tables of contents</a> + <a href="#40">Letter (correspondence) macros</a> + <a href="#41">Changing global print style parameters after START</a> + <a href="#42">Managing a document's first-page header (the "docheader")</a> + <a href="#43">Managing page headers and footers</a> + <a href="#44">Recto/verso page headers and footers</a> + <a href="#45">Pagination</a> + <a href="#46">Document and section cover (title) pages</a> + <a href="#47">Utilities</a> </pre> <hr/> @@ -196,6 +197,7 @@ TYPESETTING MACROS <a href="goodies.html#SUP">\*[SUP]...\*[SUPX]</a> -- set characters superscript (inline) <a href="goodies.html#SUP">\*[CONDSUP]...\*[CONDSUPX]</a> -- set pseudo condensed characters superscript (inline) <a href="goodies.html#SUP">\*[EXTSUP]...\*[EXTSUPX]</a> -- set pseudo extended characters superscript (inline) + <a href="goodies.html#SUP_RAISE">SUPERSCRIPT_RAISE_AMOUNT</a> -- set vertical raise of superscript <a name="14">+++ Nested lists</a> <a href="docelement.html#LIST">LIST</a> -- initiate a nested list @@ -219,6 +221,7 @@ TYPESETTING MACROS <a href="goodies.html#DROPCAP_GUTTER">DROPCAP_GUTTER</a> -- adjust space between a dropcap and regular text <a name="17">+++ Utilities</a> + <a href="goodies.html#ALIAS">ALIAS</a> -- give a macro a new name <a href="goodies.html#CAPS">CAPS</a> -- set type all caps <a href="goodies.html#SILENT">COMMENT</a> -- silently embed comments in a document <a href="goodies.html#ESC_CHAR">ESC_CHAR</a> -- change the default escape character @@ -228,8 +231,17 @@ TYPESETTING MACROS <a href="goodies.html#PAD">PAD</a> -- insert equalized regions of whitespace into a line <a href="goodies.html#PAD_MARKER">PAD_MARKER</a> -- change the character that identifes padding locations <a href="inlines.html#INLINE_RULE_MOM">\*[RULE]</a> -- draw a full measure rule + <a href="goodies.html#SIZESPECS">SIZESPECS</a> -- get cap-height, x-height and descender depth of a font <a href="goodies.html#SILENT">SILENT</a> -- turn output processing off or on <a href="goodies.html#TRAP">TRAP</a> -- enable or disable page position traps + +<a name="18">+++ Graphical objects</a> + <a href="graphical.html#DRH">DRH</a> -- draw a horizontal rule + <a href="graphical.html#DRV">DRV</a> -- draw a vertical rule + <a href="graphical.html#DBX">DBX</a> -- draw a box + <a href="graphical.html#DCL">DCL</a> -- draw a circle (ellipse) + <a href="inlines.html#RULE_WEIGHT">RULE_WEIGHT</a> -- set weight of rules drawn with \*[RULE] + <a href="docelement.html#PSPIC">PSPIC</a> -- insert a PostScript image </pre> <hr width="66%" align="left"/> @@ -238,7 +250,7 @@ TYPESETTING MACROS DOCUMENT PROCESSING MACROS ========================== -<a name="18">+++ Reference macros</a> +<a name="19">+++ Reference macros</a> <a href="docprocessing.html#TITLE">TITLE</a> -- document title <a href="docprocessing.html#DOCTITLE">DOCTITLE</a> -- overall document title (if different from TITLE) <a href="docelement.html#ENDNOTE_TITLE">ENDNOTE_TITLE</a> -- document/chapter identification string for endnotes @@ -256,37 +268,37 @@ DOCUMENT PROCESSING MACROS <a href="docprocessing.html#REVISION">REVISION</a> -- document's revision number <a href="docprocessing.html#REVISION_STRING">REVISION_STRING</a> -- what to use in place of "Revision" -<a name="19">+++ General document formatting directives</a> +<a name="20">+++ General document formatting directives</a> <a href="docprocessing.html#DOCTYPE">DOCTYPE</a> -- general document type <a href="docprocessing.html#COPYSTYLE">COPYSTYLE</a> -- draft or final copy <a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE</a> -- typeset or "typewritten" -<a name="20">+++ Line numbering</a> +<a name="21">+++ Line numbering</a> <a href="docelement.html#NUMBER_LINES">NUMBER_LINES</a> -- turn automatic line numbering on or off <a href="docelement.html#NUMBER_LINES_CONTROL">Control macros</a> <a href="docelement.html#NUMBER_QUOTE_LINES">NUMBER_QUOTE_LINES</a> -- turn numbering of lines inside QUOTE on or off <a href="docelement.html#NUMBER_BLOCKQUOTE_LINES">NUMBER_BLOCKQUOTE_LINES</a> -- turn numbering of lines inside BLOCKQUOTE on or off -<a name="21">+++ Set documents in columns</a> +<a name="22">+++ Set documents in columns</a> <a href="docprocessing.html#COLUMNS">COLUMNS</a> <a href="docprocessing.html#COL_NEXT">COL_NEXT</a> <a href="docprocessing.html#COL_BREAK">COL_BREAK</a> -<a name="22">+++ TYPEWRITE control macros</a> +<a name="23">+++ TYPEWRITE control macros</a> <a href="docprocessing.html#TYPEWRITE_CONTROL">UNDERLINE_ITALIC</a> -- turn underlining of italics on <a href="docprocessing.html#UNDERLINE_QUOTES">UNDERLINE_QUOTES</a> -- turn underlining of line for line quotes on or off <a href="docprocessing.html#TYPEWRITE_CONTROL">ITALIC_MEANS_ITALIC</a> -- turn underlining of italics off (use italics) <a href="docprocessing.html#TYPEWRITE_CONTROL">UNDERLINE_SLANT</a> -- turn underlining of pseudo italics on <a href="docprocessing.html#TYPEWRITE_CONTROL">SLANT_MEANS_SLANT</a> -- turn underlining of pseudo italics off (use pseudo italics) -<a name="23">+++ Initiate document processing</a> +<a name="24">+++ Initiate document processing</a> <a href="docprocessing.html#START">START</a> -- begin document processing -<a name="24">+++ Epigraphs</a> +<a name="25">+++ Epigraphs</a> <a href="docelement.html#EPIGRAPH">EPIGRAPH</a> -- set an epigraph underneath the docheader <a href="docelement.html#EPIGRAPH_CONTROL">Control macros</a> -- change default style of epigraphs -<a name="25">+++ Main heads</a> +<a name="26">+++ Main heads</a> <a href="docelement.html#HEAD">HEAD</a> -- set a main head <a href="docelement.html#HEAD_GENERAL">Control macros</a> -- change default style of heads <a href="docelement.html#HEAD_SPACE">HEAD_SPACE</a> -- control spacing around heads @@ -294,21 +306,21 @@ DOCUMENT PROCESSING MACROS <a href="docelement.html#PREFIX_CHAPTER_NUMBER">PREFIX_CHAPTER_NUMBER</a> -- prefix chapter number to head numbering scheme <a href="docelement.html#RESET_HEAD_NUMBER">RESET_HEAD_NUMBER</a> -- reset head number to "1" -<a name="26">+++ Subheads</a> +<a name="27">+++ Subheads</a> <a href="docelement.html#SUBHEAD">SUBHEAD</a> -- set a subhead <a href="docelement.html#SUBHEAD_GENERAL">Control macros</a> -- change default style of subheads <a href="docelement.html#NUMBER_SUBHEADS">NUMBER_SUBHEADS</a> -- number subheads <a href="docelement.html#PREFIX_CHAPTER_NUMBER">PREFIX_CHAPTER_NUMBER</a> -- prefix chapter number to subhead numbering scheme <a href="docelement.html#RESET_SUBHEAD_NUMBER">RESET_SUBHEAD_NUMBER</a> -- reset subhead number to "1" -<a name="27">+++ Paragraph heads</a> +<a name="28">+++ Paragraph heads</a> <a href="docelement.html#PARAHEAD">PARAHEAD</a> -- set a paragraph head (joined to body of paragraph) <a href="docelement.html#PARAHEAD_GENERAL">Control macros</a> -- change default style of paraheads <a href="docelement.html#NUMBER_PARAHEADS">NUMBER_PARAHEADS</a> -- number paraheads <a href="docelement.html#PREFIX_CHAPTER_NUMBER">PREFIX_CHAPTER_NUMBER</a> -- prefix chapter number to parahead numbering scheme <a href="docelement.html#RESET_PARAHEAD_NUMBER">RESET_PARAHEAD_NUMBER</a> -- reset parahead number to "1" -<a name="28">+++ Paragraphs</a> +<a name="29">+++ Paragraphs</a> <a href="docelement.html#PP">PP</a> -- set a paragraph <a href="docelement.html#PP_CONTROL">Paragraph style</a> -- managing paragraph style concerns <a href="docelement.html#PP_FONT">PP_FONT</a> -- globally change the font used in regular paragraphs @@ -316,32 +328,32 @@ DOCUMENT PROCESSING MACROS <a href="docelement.html#INDENT_FIRST_PARAS">INDENT_FIRST_PARAS</a> -- indenting of paragraph first-lines on or off <a href="docelement.html#PP_SPACE">PARA_SPACE</a> -- spacing of paragraphs (single blank line) on or off -<a name="29">+++ Quotes (line by line verbatim quotes)</a> +<a name="30">+++ Quotes (line by line verbatim quotes)</a> <a href="docelement.html#QUOTE">QUOTE</a> -- set cited text line by line <a href="docelement.html#QUOTE_GENERAL">Control macros</a> -- change default style of quotes <a href="docelement.html#ALWAYS_FULLSPACE_QUOTES">ALWAYS_FULLSPACE_QUOTES</a> -- control spacing around quotes <a href="docelement.html#BREAK_QUOTE">BREAK_QUOTE</a> -- deprecated -<a name="30">+++ Blockquotes (cited passages of text)</a> +<a name="31">+++ Blockquotes (cited passages of text)</a> <a href="docelement.html#BLOCKQUOTE">BLOCKQUOTE</a> -- set longer passages of cited text <a href="docelement.html#BLOCKQUOTE_GENERAL">Control macros</a> -- change default style of blockquotes <a href="docelement.html#ALWAYS_FULLSPACE_QUOTES">ALWAYS_FULLSPACE_QUOTES</a> -- control spacing around quotes <a href="docelement.html#BREAK_QUOTE">BREAK_BLOCKQUOTE</a> -- deprecated -<a name="31">+++ Code snippets</a> +<a name="32">+++ Code snippets</a> <a href="docelement.html#CODE">CODE</a> -- set a code snippet -<a name="32">+++ Author linebreaks (section breaks)</a> +<a name="33">+++ Author linebreaks (section breaks)</a> <a href="docelement.html#LINEBREAK">LINEBREAK</a> -- insert an author linebreak (section break) <a href="docelement.html#LINEBREAK_CHAR">LINEBREAK_CHAR</a> -- character to use for author linebreaks <a href="docelement.html#LINEBREAK_COLOR">LINEBREAK_COLOR</a> -- colour of author linebreak character -<a name="33">+++ Document termination string</a> +<a name="34">+++ Document termination string</a> <a href="docelement.html#FINIS">FINIS</a> -- insert a document termination string (e.g. --END--) <a href="docelement.html#FINIS_STRING">FINIS_STRING</a> -- set the document termination string <a href="docelement.html#FINIS_COLOR">FINIS_COLOR</a> -- set the document termination string colour -<a name="34">+++ Footnotes</a> +<a name="35">+++ Footnotes</a> <a href="docelement.html#FOOTNOTE">FOOTNOTE</a> -- set a footnote <a href="docelement.html#FOOTNOTE_GENERAL">Control macros</a> -- change default style of footnotes <a href="docelement.html#FOOTNOTE_MARKERS">FOOTNOTE_MARKERS</a> -- turn footnote markers on or off @@ -354,23 +366,24 @@ DOCUMENT PROCESSING MACROS begin on a new line; only for use with footnotes identified by document line number) -<a name="35">+++ Endnotes</a> +<a name="36">+++ Endnotes</a> <a href="docelement.html#ENDNOTE">ENDNOTE</a> -- set an endnote <a href="docelement.html#EN-MARK">\*[EN-MARK]</a> -- mark initial line of a range of line numbers (for use with line numbered endnotes) <a href="docelement.html#ENDNOTES">ENDNOTES</a> -- output endnotes pages <a href="docelement.html#ENDNOTE_CONTROL">Control macros</a> -- change just about anything to do with endnotes <a href="docelement.html#ENDNOTES_GENERAL">Endnotes pages general style control</a> + <a href="docelement.html#ENDNOTES_PAGINATION">Pagination of endnotes</a> <a href="docelement.html#ENDNOTES_HEADER_CONTROL">Endotes pages header/footer control</a> <a href="docelement.html#ENDNOTES_MAIN_TITLE">Endnotes pages main title control</a> <a href="docelement.html#ENDNOTES_MAIN_TITLE">Endnotes pages document/section identification control</a> <a href="docelement.html#ENDNOTES_NUMBERING">Endnote identification style</a> -<a name="36">+++ Margin notes</a> +<a name="37">+++ Margin notes</a> <a href="docelement.html#MN_INIT">MN_INIT</a> -- initialize margin notes <a href="docelement.html#MN">MN</a> -- set a margin note -<a name="37">+++ Bibliographic references</a> +<a name="38">+++ Bibliographic references</a> <a href="refer.html#REF">REF</a> -- begin a bibliographic reference <a href="refer.html#FOOTNOTE_REFS">FOOTNOTE_REFS</a> -- place bibliographic references in footnotes <a href="refer.html#ENDNOTE_REFS">ENDNOTE_REFS</a> -- place bibliographic references in endnotes @@ -384,7 +397,7 @@ DOCUMENT PROCESSING MACROS <a href="refer.html#BIBLIO_HEADER_CONTROL">Bibliography pages header/footer control</a> <a href="refer.html#BIBLIO_MAIN_TITLE">Bibliography pages main head control</a> -<a name="38">+++ Tables of contents</a> +<a name="39">+++ Tables of contents</a> <a href="docelement.html#TOC">TOC</a> <a href="docelement.html#TOC_CONTROL">Control macros</a> -- change just about anything to do with table of contents pages <a href="docelement.html#TOC_GENERAL">Table of contents general style control</a> @@ -393,7 +406,7 @@ DOCUMENT PROCESSING MACROS <a href="docelement.html#TOC_STYLE">Changing the style of the different table of contents entry types</a> <a href="docelement.html#TOC_ADDITIONAL">Additional table of contents control macros</a> -<a name="39">+++ Letter (correspondence) 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 @@ -401,7 +414,7 @@ DOCUMENT PROCESSING MACROS <a href="letters.html#CLOSING">CLOSING</a> -- letter's closing salutation <a href="letters.html#NO_SUITE">NO_SUITE</a> -- turn printing of "next page number" off or on -<a name="40">+++ Changing global print style parameters after START</a> +<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 <a href="docprocessing.html#DOC_RIGHT_MARGIN">DOC_RIGHT_MARGIN</a> -- right margin of everything on the page <a href="docprocessing.html#DOC_LINE_LENGTH">DOC_LINE_LENGTH</a> -- document's base line length @@ -410,11 +423,11 @@ DOCUMENT PROCESSING MACROS <a href="docprocessing.html#DOC_LEAD">DOC_LEAD</a> -- document's base lead <a href="docprocessing.html#DOC_QUAD">DOC_QUAD</a> -- document's base quad directions -<a name="41">+++ Managing a document's first-page header</a> +<a name="42">+++ Managing a document's first-page header</a> <a href="docprocessing.html#DOCHEADER">DOCHEADER</a> -- document first-page header on or off <a href="docprocessing.html#DOCHEADER_CONTROL_INDEX">Control macros</a> -- change default style of docheader elements -<a name="42">+++ Managing page headers and footers</a> +<a name="43">+++ Managing page headers and footers</a> <a href="headfootpage.html#HEADERS">HEADERS</a> -- turn page headers on or off <a href="headfootpage.html#FOOTERS">FOOTERS</a> -- turn page footers on or off <a href="headfootpage.html#HEADERS_AND_FOOTERS">HEADERS_AND_FOOTERS</a> -- enable or disable generation of both headers and footers @@ -426,7 +439,7 @@ DOCUMENT PROCESSING MACROS <a href="headfootpage.html#VERTICAL">Vertical placement</a> -- vertical location of headers and/or footers <a href="headfootpage.html#SEPARATOR_RULE">Separator rule</a> -- manage the header/footer separator rule -<a name="43">+++ Recto/verso page headers and footers</a> +<a name="44">+++ Recto/verso page headers and footers</a> <a href="rectoverso.html#RECTO_VERSO">RECTO_VERSO</a> -- turn recto/verso headers and/or footers on or off <a href="rectoverso.html#SWITCH_HDRFTR">SWITCH_HEADERS</a> -- switch recto or verso header <a href="rectoverso.html#SWITCH_HDRFTR">SWITCH_FOOTERS</a> -- switch recto or verso footer @@ -435,7 +448,7 @@ DOCUMENT PROCESSING MACROS <a href="headfootpage.html#HDRFTR_RECTOVERSO">FOOTER_RECTO</a> -- string that constitutes a recto footer <a href="headfootpage.html#HDRFTR_RECTOVERSO">FOOTER_VERSO</a> -- string that constitutes a recto footer -<a name="44">+++ Pagination</a> +<a name="45">+++ Pagination</a> <a href="headfootpage.html#PAGINATE">PAGINATE</a> -- pagination on or off <a href="headfootpage.html#PAGINATE_CONTROL">Control macros</a> -- change default style for pagination <a href="headfootpage.html#PAGENUMBER">PAGENUMBER</a> -- user-defined (starting) page number @@ -443,14 +456,15 @@ DOCUMENT PROCESSING MACROS <a href="headfootpage.html#PAGENUM_ON_FIRST_PAGE">PAGENUM_ON_FIRST_PAGE</a> -- when footers are enabled <a href="headfootpage.html#DRAFT_WITH_PAGENUMBER">DRAFT_WITH_PAGENUMBER</a> -- attach draft/revision information to page numbers -<a name="45">+++ Document and section cover (title) pages</a> +<a name="46">+++ Document and section cover (title) pages</a> <a href="cover.html#COVER">COVER</a> -- information to include in a section cover <a href="cover.html#COVER">DOC_COVER</a> -- information to include in a document cover <a href="cover.html#ON_OFF">COVERS</a> -- turn printing of section covers on or off <a href="cover.html#ON_OFF">DOC_COVERS</a> -- turn printing of document covers on or off <a href="cover.html#COVER_CONTROL_INDEX">Control macros</a> -- change style defaults for covers -<a name="46">+++ Utilities</a> +<a name="47">+++ Utilities</a> + <a href="typemacdoc.html#ADD_SPACE">ADD_SPACE</a> -- add space to the top of a page <a href="docelement.html#BLANK_PAGE">BLANKPAGE</a> -- output one or more blank pages <a href="docprocessing.html#DOC_LEAD_ADJUST">DOC_LEAD_ADJUST</a> -- adjust document linespacing (lead) to fill pages <a href="rectoverso.html#COLLATE">COLLATE</a> -- join documents or chapters of a document together diff --git a/contrib/mom/momdoc/rectoverso.html b/contrib/mom/momdoc/rectoverso.html index c9d635b1..5eb7f013 100644 --- a/contrib/mom/momdoc/rectoverso.html +++ b/contrib/mom/momdoc/rectoverso.html @@ -283,6 +283,23 @@ that require their own titles, looks like this: </p> <p> +<strong>Tip:</strong> If the last +<a href="definitions.html#TERMS_OUTPUTLINE">output line</a> +of a document before <strong>COLLATE</strong> falls too close to +the bottom margin for running text, <strong>mom</strong> may output +a blank page with only a header or footer between collated +documents. In order to avoid this, I recommend always preceding +<strong>COLLATE</strong> with +<a href="typesetting.html#EL">.EL</a>, +like this + +<pre> + .EL + .COLLATE +</pre> +</p> + +<p> <strong>NOTE:</strong> See the <a href="#CAUTION">two words of caution</a>, above. diff --git a/contrib/mom/momdoc/reserved.html b/contrib/mom/momdoc/reserved.html index b3751603..9e011558 100644 --- a/contrib/mom/momdoc/reserved.html +++ b/contrib/mom/momdoc/reserved.html @@ -201,6 +201,8 @@ RW Reduce white -- tighten overall line kern SILENT Don't print lines till SILENT OFF SIZESPECS Get cap-height, x-height and descender depth for current point size +SUPERSCRIPT_RAISE_AMOUNT + Change default vertical displacement of superscripts TRAP Turn traps off or on +++DIVERSIONS+++ @@ -248,6 +250,7 @@ c column mark #DC_LINES Number of lines for dropcap #DEGREES # of degrees slant for pseudo-italic #ENUMERATOR<n> Number register enumerator for depth <n> in lists +#EW Is EW in effect? (boolean) #EXT_WIDTH Width of pseudo-extended type (pointsize x $EXT_PERCENT) #EXTEND Are we in pseudo-extend mode? (boolean) @@ -341,6 +344,7 @@ p Output line horiz position at end of #RLD RLD value #RULE_WEIGHT Weight given to RULE_WEIGHT #RULE_WEIGHT_ADJ RULE_WEIGHT/2 +#RW Is RW in effect? (boolean) #SHIFT_LIST<n> Value to add to #LIST_INDENT<n> for shifted lists #SILENT Is silent on? (boolean) #SIZE_FOR_PAD Used to ensure that the size in effect prior @@ -408,6 +412,7 @@ $DC_FT Drop cap font $DROPCAP The dropcap letter $ENUMERATOR<n> String enumerator for depth <n> in lists $ENUMERATOR_TYPE<n> Type of enumerator used in LIST<n> +$EW Value passed to EW $EXT_PERCENT Percentage by which to pseudo-extend type $FAMILY Family $FAMILY_FOR_PAD Used to ensure that the family in effect prior @@ -439,6 +444,7 @@ $RESTORE_QUAD_VALUE Quad value for use in restoring L, R, C, J (after tabs) $RESTORE_SQ The smartquoting string last passed to SMARTQUOTES $RULE_GAP Distance between underscore rules +$RW Value passed to RW $SAVED_STYLE Current style, if there is one (used in FAMILY) $SAVED_UNDERSCORE_GAP Temporarily holds string in $UNDERSCORE_GAP $SEPARATOR<n> Separator for depth <n> in lists @@ -447,6 +453,9 @@ $ST<n>_FILL Always QUAD if QUAD passed to ST <n> ST\n[#LOOP] Used to initialize string tab markers (1-19) ST\n[#LOOP]X Used to initialize string tab markers (1-19) $ST<n>_QUAD_DIR Quad direction supplied to ST for <n> +$SUP_LOWER Vertical displacement amount of superscripts +$SUP_RAISE Vertical displacement amount of superscripts +$SUP_RAISE_AMOUNT Argument passed to SUPERSCRIPT_RAISE_AMOUNT $TAB_NUMBER Argument passed to TAB macro to call TAB# macro created in TAB_SET $UNDERSCORE_GAP Distance between text and underscore rule @@ -2256,6 +2265,11 @@ $PAGE_NUM_SIZE_CHANGE ps in/decrease of page numbers $PAPER Paper size (LETTER, A4, LEGAL); default=LETTER $PH_COLOR Parahead color +$PH_FAM Parahead family +$PH_FT Parahead font +$PH_SIZE_CHANGE ps in/decrease of paraheads +$PH_SPACE Amount of horizontal space between a parahead + and the start of paragraph text $PP_FT Font used in paragraphs $RESTORE_PAGENUM_STYLE Hold previous page numbering style $ROMAN_WIDTH<n> The digit(s) appended by user to ROMAN or diff --git a/contrib/mom/momdoc/toc.html b/contrib/mom/momdoc/toc.html index 81d9a076..e78b6e7d 100644 --- a/contrib/mom/momdoc/toc.html +++ b/contrib/mom/momdoc/toc.html @@ -19,13 +19,13 @@ FDL in the main directory of the groff source package. <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="content-type" content="text/html;charset=iso-8859-1"/> -<title>Mom, version 1.5-c -- Table of Contents</title> +<title>Mom, version 1.5-d -- Table of Contents</title> </head> <body bgcolor="#dfdfdf"> <!-- ==================================================================== --> -<h1 align="center"><u>Table of Contents for mom, version 1.5-c</u></h1> +<h1 align="center"><u>Table of Contents for mom, version 1.5-d</u></h1> <p> The table of contents has grown quite large. If you've been using diff --git a/contrib/mom/momdoc/typemacdoc.html b/contrib/mom/momdoc/typemacdoc.html index 01bb3db4..b95844fa 100644 --- a/contrib/mom/momdoc/typemacdoc.html +++ b/contrib/mom/momdoc/typemacdoc.html @@ -268,10 +268,11 @@ If you need the space, you must use the macro, <p> <strong>ADD_SPACE</strong> takes as its single argument the distance -you want <strong>mom</strong> to advance from the normal baseline -position at the top of the page. A -<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a> -is required. +you want <strong>mom</strong> to advance <em>from the normal +baseline position</em> at the top of any page after the first +(i.e. the one on which the docheader is normally printed). A <a +href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a> is +required. </p> <p> diff --git a/contrib/mom/momdoc/typesetting.html b/contrib/mom/momdoc/typesetting.html index ed1d56fd..6dddde51 100644 --- a/contrib/mom/momdoc/typesetting.html +++ b/contrib/mom/momdoc/typesetting.html @@ -2098,9 +2098,9 @@ your work to assess the effect of <strong>WS</strong>. <a name="WS_USAGE"></a> <p> -<strong>WS</strong> takes as its argument a whole number preceded -by a plus or minus sign. Therefore, to decrease the word space -slightly, you might enter +<strong>WS</strong> takes as its argument a number (decimal +fractions are allowed) preceded by a plus or minus sign. Therefore, +to decrease the word space slightly, you might enter <pre> .WS -4 diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac index 8674bafd..ca9ae2da 100644 --- a/contrib/mom/om.tmac +++ b/contrib/mom/om.tmac @@ -21,7 +21,7 @@ for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. -Version 1.5-c +Version 1.5-d ------------- Antoine de St-Exupéry asserted that elegance in engineering is achieved not when there is nothing left to add, but when there is @@ -874,6 +874,10 @@ to a macro means that any argument turns the feature off. . ie \\n[#JUSTIFY]=1 \{ .brp \} . el \{ .br \} . \} +. rr #EW +. rm $EW +. nr #RW 1 +. ds $RW \\$1 . tkf \\n(.f 1 -\\$1 1 -\\$1 .END \# @@ -883,6 +887,10 @@ to a macro means that any argument turns the feature off. . ie \\n[#JUSTIFY]=1 \{ .brp \} . el \{ .br \} . \} +. rr #RW +. rm $RW +. nr #EW 1 +. ds $EW \\$1 . tkf \\n(.f 1 \\$1 1 \\$1 .END \# @@ -1744,6 +1752,11 @@ to a macro means that any argument turns the feature off. . br . rr #TAB_ACTIVE . rr #IN_TAB +. nr #LOOP 0 1 +. while \\n+[#LOOP]<20 \{\ +. rm $ST\\n[#LOOP]_FILL +.\} +. rr #LOOP . po \\n[#L_MARGIN]u . ll \\n[#L_LENGTH]u . ta \\n(.lu @@ -2355,36 +2368,54 @@ to a macro means that any argument turns the feature off. .ds $UNDERSCORE_GAP 2p \# \# -\# SUPERSCRIPT INLINES -\# ------------------- +\# SUPERSCRIPT +\# ----------- \# *Function: -\# Prints everything after invocation as superscript. +\# Prints everything after inline invocation as superscript. \# *Notes: \# \*[SUP] and \*[SUPX] turn superscript on and off respectively. \# If running type is pseudo-condensed/expanded, invoke the superscript \# strings as \*[CONDSUP] or \*[EXTSUP] and turn off with \*[CONDSUPX] \# and \*[EXTSUPX] respectively. \# +\# Default raise/lower amount +.ds $SUP_RAISE \v'-.3m' +.ds $SUP_LOWER \v'.3m' +\# +\# SUPERSCRIPT RAISE +\# ----------------- +\# *Argument: +\# <amount to raise superscript> +\# *Function: +\# Defines strings $SUP_RAISE and $SUP_LOWER for use with \*[SUP], +\# \*[CONDSUP] and \*[EXTSUP]. +\# +.MAC SUPERSCRIPT_RAISE_AMOUNT END +. ds $SUP_RAISE_AMOUNT \\$1 +. ds $SUP_RAISE \v'-\\*[$SUP_RAISE_AMOUNT]' +. ds $SUP_LOWER \v'\\*[$SUP_RAISE_AMOUNT]' +.END +\# .ds SUP \ \R'#PT_SIZE_IN_UNITS \En[.ps]'\ \R'#SUP_PT_SIZE \En[#PT_SIZE_IN_UNITS]u*6u/10u'\ -\s[\En[#PT_SIZE_IN_UNITS]u]\v'-.26m'\s[\En[#SUP_PT_SIZE]u] +\s[\En[#PT_SIZE_IN_UNITS]u]\\*[$SUP_RAISE]\s[\En[#SUP_PT_SIZE]u] \# -.ds SUPX \s[\En[#PT_SIZE_IN_UNITS]u]\v'.26m' +.ds SUPX \s[\En[#PT_SIZE_IN_UNITS]u]\\*[$SUP_LOWER] \# .ds CONDSUP \ \R'#PT_SIZE_IN_UNITS \En[.ps]'\ \R'#SUP_PT_SIZE \En[#PT_SIZE_IN_UNITS]u*6u/10u'\ -\s[\En[#PT_SIZE_IN_UNITS]u]\v'-.3m'\s[\En[#SUP_PT_SIZE]u]\E*[COND_FOR_SUP] +\s[\En[#PT_SIZE_IN_UNITS]u]\\*[$SUP_RAISE]\s[\En[#SUP_PT_SIZE]u]\E*[COND_FOR_SUP] \# -.ds CONDSUPX \s[\En[#PT_SIZE_IN_UNITS]u]\v'.3m'\E*[COND] +.ds CONDSUPX \s[\En[#PT_SIZE_IN_UNITS]u]\\*[$SUP_LOWER]\E*[COND] \# .ds EXTSUP \ \R'#PT_SIZE_IN_UNITS \En[.ps]'\ \R'#SUP_PT_SIZE \En[#PT_SIZE_IN_UNITS]u*6u/10u'\ -\s[\En[#PT_SIZE_IN_UNITS]u]\v'-.3m'\s[\En[#SUP_PT_SIZE]u]\E*[EXT_FOR_SUP] +\s[\En[#PT_SIZE_IN_UNITS]u]\\*[$SUP_RAISE]\s[\En[#SUP_PT_SIZE]u]\E*[EXT_FOR_SUP] \# -.ds EXTSUPX \s[\En[#PT_SIZE_IN_UNITS]u]\v'.3m'\E*[EXT] +.ds EXTSUPX \s[\En[#PT_SIZE_IN_UNITS]u]\\*[$SUP_LOWER]\E*[EXT] \# \# \# SLANT @@ -2751,9 +2782,9 @@ to a macro means that any argument turns the feature off. . \} . if \\n[#DOCS] \{\ . if \\n[#PRINT_STYLE]=1 \{\ -. PRINT \\$1\c -. return -. \} +. PRINT \\$1\c +. return +. \} . if \\n[#PRINT_STYLE]=2 \{\ . if \\n[#PP_STYLE]=2 \{\ . PRINT \\$1\c @@ -2797,30 +2828,37 @@ to a macro means that any argument turns the feature off. . nr #GET_DC_HEIGHT \\n[#CAP_HEIGHT] .\} . if d$DC_ADJUST \{ .ps \\*[$DC_ADJUST]p \} -. mk x -. sp \\n[#DC_LINES]v -. if \\n[#DOCS]=1 \{ .SHIM \} +. nr #DC_LINES +1 . ie \\n[#DC_COLOR]=1 \{\ . ie !'\\$3'' \{\ -. ie '\\$3'COND' \{ .PRINT \m[\\*[$DC_COLOR]]\\*[COND]\\*[$DROPCAP]\\*[CONDX]\m[] \} -. el \{ .PRINT \m[\\*[$DC_COLOR]]\\*[EXT]\\*[$DROPCAP]\\*[EXTX]\m[] \} +. ie '\\$3'COND' \{ .PRINT \\*[DOWN \\n[#DC_LINES]v]\m[\\*[$DC_COLOR]]\\*[COND]\\*[$DROPCAP]\\*[CONDX]\m[]\\*[UP \\n[#DC_LINES]v] \} +. el \{ .PRINT \\*[DOWN \\n[#DC_LINES]v]\m[\\*[$DC_COLOR]]\\*[EXT]\\*[$DROPCAP]\\*[EXTX]\m[]\\*[UP \\n[#DC_LINES]v] \} . \} -. el \{ .PRINT \m[\\*[$DC_COLOR]]\\*[$DROPCAP]\m[] \} +. el \{ .PRINT \\*[DOWN \\n[#DC_LINES]v]\m[\\*[$DC_COLOR]]\\*[$DROPCAP]\m[]\\*[UP \\n[#DC_LINES]v] \} . \} . el \{\ . ie !'\\$3'' \{\ -. ie '\\$3'COND' \{ .PRINT \\*[COND]\\*[$DROPCAP]\\*[CONDX] \} -. el \{ .PRINT \\*[EXT]\\*[$DROPCAP]\\*[EXTX] \} +. ie '\\$3'COND' \{ .PRINT \\*[DOWN \\n[#DC_LINES]v]\\*[COND]\\*[$DROPCAP]\\*[CONDX]\\*[UP \\n[#DC_LINES]v] \} +. el \{ .PRINT \\*[DOWN \\n[#DC_LINES]v]\\*[EXT]\\*[$DROPCAP]\\*[EXTX]\\*[UP \\n[#DC_LINES]v] \} . \} -. el \{ .PRINT \m[\\*[$DC_COLOR]]\\*[$DROPCAP]\m[] \} +. el \{ .PRINT \\*[DOWN \\n[#DC_LINES]v]\m[\\*[$DC_COLOR]]\\*[$DROPCAP]\m[]\\*[UP \\n[#DC_LINES]v] \} . \} . if '\\$3'COND' \{ \E*[COND] \} . if '\\$3'EXT' \{ \E*[EXT] \} -. ie \\n(.i \{ .in +\w'\\*[$DROPCAP]'u+\\n[#DC_GUT]u \} -. el \{ .in \w'\\*[$DROPCAP]'u+\\n[#DC_GUT]u \} +. ie \\n(.i \{\ +. vs 0 +. br +. in +\w'\\*[$DROPCAP]'u+\\n[#DC_GUT]u +. vs +. \} +. el \{\ +. vs 0 +. br +. in \w'\\*[$DROPCAP]'u+\\n[#DC_GUT]u +. vs +. \} . if '\\$3'COND' \{ \E*[CONDX]\c \} . if '\\$3'EXT' \{ \E*[EXTX]\c \} -. rt \\nxu . FAM \\*[$RESTORE_FAM] . FT \\*[$RESTORE_FT] . ps \\n[#RESTORE_PT_SIZE]u @@ -2851,6 +2889,7 @@ to a macro means that any argument turns the feature off. \# .MAC DROPCAP_OFF END ' in \\n[#RESTORE_INDENT]u +. ch DROPCAP_OFF .END \# \# ===================================================================== @@ -4158,6 +4197,9 @@ E\\R'#CAP_HEIGHT \\n[.cht]' e\\R'#X_HEIGHT \\n[.cht]' y\\R'#DESCENDER \\n[.cdp]' . br +. ds $CAP_HEIGHT \\n[#CAP_HEIGHT]u +. ds $X_HEIGHT \\n[#X_HEIGHT]u +. ds $DESCENDER \\n[#DESCENDER]u . di .END \# @@ -5710,10 +5752,11 @@ y\\R'#DESCENDER \\n[.cdp]' . if !r#FN_RULE_LENGTH \{ .FOOTNOTE_RULE_LENGTH 2i \} .\" +Paragraph heads . if !r#PH_INDENT \{ .PARAHEAD_INDENT \\n[#PP_INDENT]u/2u \} +. if !d$PH_SPACE \{ .PARAHEAD_SPACE .6m \} .\" +Endnotes . if !r#EN_PP_INDENT \{ .ENDNOTE_PARA_INDENT \\n[#PP_INDENT] \} .\" +Footnotes -. if !r#FN_RULE_ADJ \{ .FOOTNOTE_RULE_ADJ 6p \} +. if !r#FN_RULE_ADJ \{ .FOOTNOTE_RULE_ADJ 6p \} .\" +Slant stuff . if !r#SLANT_MEANS_SLANT \{\ . ie \\n[#UNDERLINE_SLANT]=1 \{ .UNDERLINE_SLANT \} @@ -7071,8 +7114,7 @@ y\\R'#DESCENDER \\n[.cdp]' .\} . \} . \} -. if \\n[#DOCCOVERS_COUNT]=1 \{ .nr #PAGE_NUM_ADJ +1 \} -. nr #DOCCOVER_END 1 + nr #DOCCOVER_END 1 . END_COVER . \} .\" Cover @@ -7395,7 +7437,6 @@ y\\R'#DESCENDER \\n[.cdp]' .\} . \} . \} -. if \\n[#COVERS_COUNT]=1 \{ .nr #PAGE_NUM_ADJ +1 \} . nr #COVER_END 1 . END_COVER . \} @@ -9098,8 +9139,13 @@ y\\R'#DESCENDER \\n[.cdp]' . if '\\$1'R' \{ .nr #USERDEF_HDRFTR_RECTO_QUAD 3 \} . if '\\$1'RIGHT' \{ .nr #USERDEF_HDRFTR_RECTO_QUAD 3 \} . shift -. if '\\$1'CAPS' \{ .nr #HDRFTR_RECTO_CAPS 1 \} -. ds $USERDEF_HDRFTR_RECTO \\$2 +. ie '\\$1'CAPS' \{\ +. nr #HDRFTR_RECTO_CAPS 1 +. ds $USERDEF_HDRFTR_RECTO \\$2 +. \} +. el \{\ +. ds $USERDEF_HDRFTR_RECTO \\$1 +. \} .END \# \# @@ -9124,9 +9170,13 @@ y\\R'#DESCENDER \\n[.cdp]' . if '\\$1'CENTRE' \{ .nr #USERDEF_HDRFTR_VERSO_QUAD 2 \} . if '\\$1'R' \{ .nr #USERDEF_HDRFTR_VERSO_QUAD 3 \} . if '\\$1'RIGHT' \{ .nr #USERDEF_HDRFTR_VERSO_QUAD 3 \} -. shift -. if '\\$1'CAPS' \{ .nr #HDRFTR_VERSO_CAPS 1 \} -. ds $USERDEF_HDRFTR_VERSO \\$2 +. ie '\\$1'CAPS' \{\ +. nr #HDRFTR_VERSO_CAPS 1 +. ds $USERDEF_HDRFTR_VERSO \\$2 +. \} +. el \{\ +. ds $USERDEF_HDRFTR_VERSO \\$1 +. \} .END \# \# PRINT FOOTER ON FIRST PAGE @@ -10843,6 +10893,19 @@ y\\R'#DESCENDER \\n[.cdp]' . nr #PH_INDENT (\\$1) .END \# +\# PARAHEAD SPACE +\# -------------- +\# *Argument: +\# <amount of horizontal space between parahead and paragraph text> +\# *Function: +\# Creates or modifies string $PH_SPACE. +\# *Notes: +\# Default is .6m for TYPESET and \0 (1 digit space) for TYPEWRITE. +\# +.MAC PARAHEAD_SPACE END +. ds $PH_SPACE \\$1 +.END +\# \# \# PARAHEAD \# -------- @@ -10961,7 +11024,7 @@ y\\R'#DESCENDER \\n[.cdp]' . if \\n[#PRINT_STYLE]=2 \{\ . FAM \\*[$PH_FAM] . FT \\*[$PH_FT] -. PT_SIZE \\*[$PH_SIZE_CHANGE] +. PT_SIZE \\n[#DOC_PT_SIZE]u\\*[$PH_SIZE_CHANGE] . if \\n[#PH_COLOR]=1 \{ .COLOR \\*[$PH_COLOR] \} . ie \\n[#NUMBER_PH] \{\ . ie \\n[#PREFIX_CH_NUM]=1 \{\ @@ -10972,25 +11035,25 @@ y\\R'#DESCENDER \\n[.cdp]' . \} . if \\n[#NUMBER_HEAD] \{\ . ie \\n[#NUMBER_SH] \{\ -. PRINT "\R'#NUMBERED 1'\\*[$CH_NUM]\\n[#HEAD_NUM].\\n[#SH_NUM].\\n+[#PH_NUM].\0\\$1\h'.6m'\c" +. PRINT "\R'#NUMBERED 1'\\*[$CH_NUM]\\n[#HEAD_NUM].\\n[#SH_NUM].\\n+[#PH_NUM].\0\\$1\h'\\*[$PH_SPACE]'\c" . \} . el \{\ -. PRINT "\R'#NUMBERED 1'\\*[$CH_NUM]\\n[#HEAD_NUM].\\n+[#PH_NUM].\0\\$1\h'.6m'\c" +. PRINT "\R'#NUMBERED 1'\\*[$CH_NUM]\\n[#HEAD_NUM].\\n+[#PH_NUM].\0\\$1\h'\\*[$PH_SPACE]'\c" . \} . \} . ie \\n[#NUMBER_SH] \{\ . if !\\n[#NUMBERED] \{\ -. PRINT "\\*[$CH_NUM]\\n[#SH_NUM].\\n+[#PH_NUM].\0\\$1\h'.6m'\c" +. PRINT "\\*[$CH_NUM]\\n[#SH_NUM].\\n+[#PH_NUM].\0\\$1\h'\\*[$PH_SPACE]'\c" . \} . \} . el \{\ . if !\\n[#NUMBERED] \{\ -. PRINT "\\*[$CH_NUM]\\n+[#PH_NUM].\0\\$1\h'.6m'\c" +. PRINT "\\*[$CH_NUM]\\n+[#PH_NUM].\0\\$1\h'\\*[$PH_SPACE]'\c" . \} . \} . \} . el \{\ -. PRINT "\\$1\h'.6m'\c" +. PRINT "\\$1\h'\\*[$PH_SPACE]'\c" . \} . \} . FAMILY \\*[$DOC_FAM] @@ -17151,18 +17214,19 @@ E\\R'#CAP_HEIGHT \\n[.cht]' \# \# Support aliases \# -.ALIAS COL_BREAK COL_NEXT -.ALIAS DOC_COVER_ADVANCE COVER_ADVANCE -.ALIAS DOC_COVER COVER -.ALIAS DOC_COVERS COVERS -.ALIAS DOC_COVER_LEAD COVER_LEAD -.ALIAS DOC_COVERTITLE COVERTITLE -.ALIAS DO_DOC_COVER DO_COVER -.ALIAS PRINT_FOOTNOTE_RULE FOOTNOTE_RULE +.ALIAS COL_BREAK COL_NEXT +.ALIAS DOC_COVER_ADVANCE COVER_ADVANCE +.ALIAS DOC_COVER COVER +.ALIAS DOC_COVER_COUNTS_PAGES COVER_COUNTS_PAGES +.ALIAS DOC_COVERS COVERS +.ALIAS DOC_COVER_LEAD COVER_LEAD +.ALIAS DOC_COVERTITLE COVERTITLE +.ALIAS DO_DOC_COVER DO_COVER +.ALIAS PRINT_FOOTNOTE_RULE FOOTNOTE_RULE \# \# Miscellaneous aliases -.ALIAS SECTION LINEBREAK -.ALIAS SECTION_CHAR LINEBREAK_CHAR +.ALIAS SECTION LINEBREAK +.ALIAS SECTION_CHAR LINEBREAK_CHAR \# \# Miscellaneous macros to take care of backward compatibility \# ----------------------------------------------------------- |