diff options
Diffstat (limited to 'contrib/mom')
| -rw-r--r-- | contrib/mom/BUGS | 16 | ||||
| -rw-r--r-- | contrib/mom/ChangeLog | 19 | ||||
| -rw-r--r-- | contrib/mom/NEWS | 15 | ||||
| -rw-r--r-- | contrib/mom/momdoc/appendices.html | 6 | ||||
| -rw-r--r-- | contrib/mom/momdoc/docelement.html | 149 | ||||
| -rw-r--r-- | contrib/mom/momdoc/docprocessing.html | 23 | ||||
| -rw-r--r-- | contrib/mom/momdoc/intro.html | 6 | ||||
| -rw-r--r-- | contrib/mom/momdoc/reserved.html | 10 | ||||
| -rw-r--r-- | contrib/mom/momdoc/toc.html | 4 | ||||
| -rw-r--r-- | contrib/mom/om.tmac | 293 |
10 files changed, 456 insertions, 85 deletions
diff --git a/contrib/mom/BUGS b/contrib/mom/BUGS index 784d13e5..e6bd75ef 100644 --- a/contrib/mom/BUGS +++ b/contrib/mom/BUGS @@ -18,6 +18,22 @@ Also, please--no html email. That, too, gets nuked. --Peter Schaffter ======================================================================== +Version 1.4-a +============= +In collated documents, when using a different HEADER_FAMILY, +if BLANKPAGE <n> is given after COLLATE (but before START) all +subsequent text is set in the HEADER_FAMILY face rather than the +standard text face. +---Fixed--- + +Document title identification string missing on endnotes pages when +the endnote marker style is LINE. +---Fixed--- + +Space between endnote items on endnotes output pages not being +inserted. +---Fixed--- + Version 1.4 =========== Invoking .FOOTERS isn't automatically putting pagination in the top diff --git a/contrib/mom/ChangeLog b/contrib/mom/ChangeLog index 4131ae62..a4f6e63d 100644 --- a/contrib/mom/ChangeLog +++ b/contrib/mom/ChangeLog @@ -1,7 +1,23 @@ * Sat Jun 10 2006 -o Makefile.sub: Strip om.tmac before installation. +o In header and footer routines, changed all .FAMILY calls when + .PRINTSTYLE TYPESET to .fam +o Fixed DOC_FAMILY so that PARAHEAD_FAMILY and LINENUMBER_FAMILY + are properly set to the new value. + +* Fri Jun 9 2006 + +o Re-worked .QUOTE_INDENT so that users can pass it an absolute + value (by adding a scaling indicator to the arg) instead of just + a value relative to the paragraph indent. Fixes bug (oversight?) + that meant QUOTES and BLOCKQUOTES got no indent at all if the + PP_INDENT was 0. Fixed EPIGRAPH_INDENT similarly. + +o Added missing default ENDNOTE_LINENUMBER_FAMILY and _FONT to + DEFAULTS. + +------------------------------------------------------------------------ * Thu Jun 8 2006 o Changed distance of the underscores used in docheaders when @@ -52,7 +68,6 @@ o In the documentation, removed the section stating that setting o Updated documentation entry for TOCs to include instructions for using psselect. ------------------------------------------------------------------------- * Sat May 20 2006 o Added string $PRE_CODE_FAM to CODE; fixes bug that kept diff --git a/contrib/mom/NEWS b/contrib/mom/NEWS index 22450d19..cfb5be75 100644 --- a/contrib/mom/NEWS +++ b/contrib/mom/NEWS @@ -1,3 +1,18 @@ +Release 1.4-b +------------- +It is now possible to pass an absolute value to QUOTE_INDENT, +BLOCKQUOTE_INDENT and EPIGRAPH_INDENT. If an absolute value +is desired, the user simply appends a unit of measure (scaling +indicator) to the argument. If no unit of measure is appended, +the old behaviour is still observed (i.e. the numeric argument +represents the amount by which to multiply the paragraph indent to +arrive at the desired indent value). + +The main macro file, om.tmac, is now stripped of comments when +groff is built from sources. om.tmac in the sources themselves +still contains the comments, as do the tarballs posted on the mom +homepage. + Release 1.4-a ------------- Added a new macro, HEADERS_AND_FOOTERS, to allow having both diff --git a/contrib/mom/momdoc/appendices.html b/contrib/mom/momdoc/appendices.html index 6b5b63fc..716affff 100644 --- a/contrib/mom/momdoc/appendices.html +++ b/contrib/mom/momdoc/appendices.html @@ -653,6 +653,12 @@ heavily commented. A consistent, if idiosyncratic, indenting style is used as well, significantly improving readability. Anyone wanting to futz around with <strong>mom</strong>'s macros should be able to do so with a minimum of head scratching. +<p> +<strong>Addendum</strong> As of version 1.4-a, the main macro +file, om.tmac, is now stripped of comments when groff is built +from sources. om.tmac in the sources themselves still contains the +comments, as do the tarballs posted on <strong>mom</strong>'s +homepage. <br> <hr> diff --git a/contrib/mom/momdoc/docelement.html b/contrib/mom/momdoc/docelement.html index 33562e13..7b213e98 100644 --- a/contrib/mom/momdoc/docelement.html +++ b/contrib/mom/momdoc/docelement.html @@ -178,14 +178,21 @@ one point greater than the footnote's point size), do </pre> <h3><a name="CONTROL_INDENTS">Indents</a></h3> -Except for <strong>PARA_INDENT</strong>, the argument to the control -macros that end -in <strong>_INDENT</strong> is always a single digit (whole numbers -only; no decimal fractions) with no +Except for +<a href="docelement.html#PARA_INDENT">PARA_INDENT</a>, +the argument to the control +macros that end in <strong>_INDENT</strong> can take either a single +digit (whole numbers only; no decimal fractions) with <em>no</em> <a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a> -appended to it. The digit represents by how much you want the -size of the paragraph first-line indent multiplied to achieve the -correct indent for a particular tag. +appended to it, or a digit <em>with</em> a unit of measure appended. +<p> +A digit with <em>no</em> unit of measure appended represents by +how much you want your paragraph first-line indents (set with +<strong>PARA_INDENT</strong>) multiplied to achieve the correct +indent for a particular tag. +<p> +A digit <em>with</em> a unit of measure appended defines an +absolute indent, relative to nothing. <h3>Quad/justification style</h3> Control macros that end in <strong>_QUAD</strong> take the same @@ -373,11 +380,45 @@ See (The next two apply to "block" style epigraphs only) .EPIGRAPH_QUAD default = same as paragraphs -.EPIGRAPH_INDENT* default = para indent x 3 (for typeset), x 2 (for typewrite) +.EPIGRAPH_INDENT* (see below) *Indent here refers to the indent from both the left and right margins that centres the block style epigraph on the page. </pre> + +<a name="EPIGRAPH_INDENT"><h3><u>Epigraph indent</u></h3></a> +<p> +Prior to version 1.4-b, <strong>mom</strong> allowed +only the passing of an integer to the macro, +<strong>.EPIGRAPH_INDENT</strong>. The integer represented the +amount by which to multiply the argument passed to +<a href="#PARA_INDENT">PARA_INDENT</a> +to arrive at an indent for block style epigraphs. +<p> +As of version 1.4-b, you can now append a +<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a> +to the argument passed to <strong>.EPIGRAPH_INDENT</strong>, thus +setting an absolute indent, relative to nothing. The old behaviour +is still respected, though; in other words, if you pass +<strong>.EPIGRAPH_INDENT</strong> an integer with no unit of measure +appended, the integer represents the amount by which to multiply +<strong>.PARA_INDENT</strong> to arrive at an indent for block +style epigraphs. +<p> +Please note that if your <strong>PARA_INDENT</strong> +is 0 (i.e. no indenting of the first line of +paragraphs), you <em><strong>must</strong></em> set an +<strong>EPIGRAPH_INDENT</strong> yourself, with a unit of measure +appended to the argument. <strong>Mom</strong> has no default for +<strong>EPIGRAPH_INDENT</strong> if paragraph first lines are not being +indented. +<p> +The default value for <strong>.EPIGRAPH_INDENT</strong> is 3 (for +<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPESET</a>) +and 2 (for PRINTSTYLE +<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPEWRITE</a>). +<p> + <hr> <!====================================================================> @@ -679,10 +720,13 @@ paragraphs, <strong>PARA_INDENT</strong> also affects and <a href="#BLOCKQUOTE_INTRO">blockquotes</a>, whose overall indenting from the left and (where applicable) right -margins is relative to <strong>PARA_INDENT</strong>. Furthermore, the -first-line indent of paragraphs within these document elements (as well -as footnotes) is also relative to <strong>PARA_INDENT</strong> (always -1/2 of <strong>PARA_INDENT)</strong>), hence they are also affected. +margins is relative to <strong>PARA_INDENT</strong> if the +<strong>_INDENT</strong> control macro for these tags has no +<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a> +appended to it. Furthermore, the first-line indent of paragraphs +within these document elements (as well as footnotes) is +also relative to <strong>PARA_INDENT</strong> (always 1/2 of +<strong>PARA_INDENT)</strong>), hence they are also affected. <p> <strong>Mom</strong>'s default <strong>PARA_INDENT</strong> is 2 ems for @@ -1563,11 +1607,45 @@ See .QUOTE_SIZE default = +0 (i.e. same size as paragraph text) .QUOTE_AUTOLEAD default = none; leading of quotes is the same as paragraphs .QUOTE_COLOR default = black -<a name="QUOTE_INDENT">.QUOTE_INDENT default = paragraph indent x 3 (typeset); x 2 (typewrite)</a> - (note that this macro also sets the indents (left and right) - for blockquotes) +.QUOTE_INDENT (see below) </pre> +<a name="QUOTE_INDENT"><h3><u>Quote indent</u></h3></a> +<p> +Prior to version 1.4-b, <strong>mom</strong> allowed only the +passing of an integer to the macro, <strong>.QUOTE_INDENT</strong>. +The integer represented the amount by which to multiply the +argument passed to +<a href="#PARA_INDENT">PARA_INDENT</a> +to arrive at an indent for quotes (and blockquotes). +<p> +As of version 1.4-b, you can now append a +<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a> +to the argument passed to <strong>.QUOTE_INDENT</strong>, thus +setting an absolute indent, relative to nothing. The old behaviour +is still respected, though; in other words, if you pass +<strong>.QUOTE_INDENT</strong> an integer with no unit of measure +appended, the integer represents the amount by which to multiply +<strong>.PARA_INDENT</strong> to arrive at an indent for quotes (and +blockquotes). +<p> +Please note that if your <strong>PARA_INDENT</strong> is 0 +(i.e. no indenting of the first line of paragraphs), you +<em><strong>must</strong></em> set a <strong>QUOTE_INDENT</strong> +yourself, with a unit of measure appended to the +argument. <strong>Mom</strong> has no default for +<strong>QUOTE_INDENT</strong> if paragraph first lines are not being +indented. +<p> +The default value for <strong>.QUOTE_INDENT</strong> is 3 (for +<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPESET</a>) +and 2 (for PRINTSTYLE +<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPEWRITE</a>). +<p> +<strong>NOTE: QUOTE_INDENT</strong> also sets the indent for +<a href="#BLOCKQUOTE">BLOCKQUOTES</a>. +<p> + <a name="ALWAYS_FULLSPACE_QUOTES"><h3><u>2. Spacing above and below -- ALWAYS_FULLSPACE_QUOTES (typeset only)</u></h3></a> <p> If you'd like <strong>mom</strong> always to put a full linespace above @@ -1718,10 +1796,45 @@ See .BLOCKQUOTE_AUTOLEAD default = none; leading of blockquotes is the same as paragraphs .BLOCKQUOTE_COLOR default = black .BLOCKQUOTE_QUAD default = left -.BLOCKQUOTE_INDENT default = paragraph indent x 3 (typeset); x 2 (typewrite)</a> - (note that this macro also sets the left indent for quotes) +.BLOCKQUOTE_INDENT (see below) </pre> +<a name="BLOCKQUOTE_INDENT"><h3><u>Blockquote indent</u></h3></a> +<p> +Prior to version 1.4-b, <strong>mom</strong> allowed +only the passing of an integer to the macro, +<strong>.BLOCKQUOTE_INDENT</strong>. The integer represented the +amount by which to multiply the argument passed to +<a href="#PARA_INDENT">PARA_INDENT</a> +to arrive at an indent for blockquotes (and quotes). +<p> +As of version 1.4-b, you can now append a +<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a> +to the argument passed to <strong>.BLOCKQUOTE_INDENT</strong>, thus +setting an absolute indent, relative to nothing. The old behaviour +is still respected, though; in other words, if you pass +<strong>.BLOCKQUOTE_INDENT</strong> an integer with no unit of measure +appended, the integer represents the amount by which to multiply +<strong>.PARA_INDENT</strong> to arrive at an indent for blockquotes +(and quotes). +<p> +The default value for <strong>.BLOCKQUOTE_INDENT</strong> is 3 (for +<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPESET</a>) +and 2 (for PRINTSTYLE +<a href="docprocessing.html#PRINTSTYLE">PRINTSTYLE TYPEWRITE</a>). +<p> +Please note that if your <strong>PARA_INDENT</strong> +is 0 (i.e. no indenting of the first line of +paragraphs), you <em><strong>must</strong></em> set a +<strong>BLOCKQUOTE_INDENT</strong> yourself, with a unit of measure +appended to the argument. <strong>Mom</strong> has no default for +<strong>BLOCKQUOTE_INDENT</strong> if paragraph first lines are not +being indented. +<p> +<strong>NOTE: BLOCKQUOTE_INDENT</strong> also sets the indent for +<a href="#QUOTE">QUOTES</a>. +<p> + <a name="ALWAYS_FULLSPACE_QUOTES"><h3><u>2. Spacing above and below -- ALWAYS_FULLSPACE_QUOTES (typeset only)</u></h3></a> <p> If you'd like <strong>mom</strong> always to put a full linespace above @@ -3260,7 +3373,7 @@ is 2 <a href="definitions.html#TERMS_PICASPOINTS">points</a> or less (e.g your <a href="definitions.html#TERMS_PS">point size</a> -is 10 and your linespacing is 10, 11, or 12, lowering +is 10 and your linespacing is 10, 11, or 12), lowering <strong>mom</strong>'s default footnote rule adjustment will almost certainly give you nicer looking results than leaving the adjustment at the default. Furthermore, you can invoke diff --git a/contrib/mom/momdoc/docprocessing.html b/contrib/mom/momdoc/docprocessing.html index 1bce2a3b..d57b3f17 100644 --- a/contrib/mom/momdoc/docprocessing.html +++ b/contrib/mom/momdoc/docprocessing.html @@ -2501,11 +2501,24 @@ global changes to the basic type parameters of a document. <ul> <li>the argument is the same as for <a href="typesetting.html#FAMILY">FAMILY</a> - <li>globally changes the type family - <li>any page elements (e.g. - <a href="definitions.html#TERMS_HEADER">headers</a>, - page numbers, footnotes) whose families you wish to remain - at their old values must be reset with the appropriate + <li>globally changes the type family for + <ul> + <li>the <a href="definitions.html#TERMS_DOCHEADER">docheader</a> + <li>all <a href="docelement.html#INDEX_DOCELEMENT">document element tags</a>, including footnotes + <li><a href="definitions.html#TERMS_HEADER">headers and/or footers</a> + <li><a href="docelement.html#NUMBER_LINES_INTRO">line numbering</a> + <li><a href="headfootpage.html#PAGINATION">page numbering</a> + </ul> + <li>does <em>not</em> change the family of + <ul> + <li><a href="cover.html#DOC_COVER">document cover pages</a> + <li><a href="cover.html#COVER">cover pages</a> + <li><a href="docelement.html#ENDNOTE_INTRO">endnotes pages</a> + <li><a href="docelement.html#TOC_INTRO">table of contents</a> + </ul> + <li>any page elements (e.g. headers page numbers, footnotes) whose + families you wish to remain at their old values must be + reset with the appropriate <a href="docelement.html#DOCELEMENT_CONTROL">control macros</a> </ul> <br> diff --git a/contrib/mom/momdoc/intro.html b/contrib/mom/momdoc/intro.html index 4c6e3ebe..644f7925 100644 --- a/contrib/mom/momdoc/intro.html +++ b/contrib/mom/momdoc/intro.html @@ -291,6 +291,12 @@ description of its arguments, function and usage, which may give you information in addition to what's contained in this documentation. <p> +<strong>Addendum:</strong> As of version 1.4-a, the main macro +file, om.tmac, is now stripped of comments when groff is built +from sources. om.tmac in the sources themselves still contains +the comments, as do the tarballs posted on <strong>mom</strong>'s +homepage. +<p> <a name="MACRO_ARGS"> <h3><u>How to read macro arguments</u></h3> </a> diff --git a/contrib/mom/momdoc/reserved.html b/contrib/mom/momdoc/reserved.html index 180b51e6..3ebc8071 100644 --- a/contrib/mom/momdoc/reserved.html +++ b/contrib/mom/momdoc/reserved.html @@ -1768,11 +1768,19 @@ $EPI_AUTOLEAD Autolead value (decimals ok) of $EPI_COLOR Color of epigraphs $EPI_FAM Family to use in epigraphs $EPI_FT Font to use in epigraphs +$EPI_OFFSET_VALUE Arg passed to EPIGRAPH_INDENT if the + arg has a unit of measure appended to it $EPI_QUAD Quad in block-style epigraphs (justified or left) $EPI_SIZE_CHANGE ps in/decrease of epigraphs* $EVAL_BIB_SPACE Temporary string to find out if the arg to BIBLIOGRAPHY_SPACING ended in "v" +$EVAL_EI_ARG Temporary string to find out whether + the arg to EPIGRAPH_INDENT ended with + a unit of measure +$EVAL_QI_ARG Temporary string to find out whether + the arg to QUOTE_INDENT ended with + a unit of measure $FINIS_COLOR Color of FINIS string $FINIS_STRING What to print when FINIS macro is invoked @@ -1863,6 +1871,8 @@ $ROMAN_WIDTH The digit(s) appended to ROMAN or roman LIST args $Q_LN_GUTTER Gutter between linenumbers and quotes in quotes +$Q_OFFSET_VALUE Arg passed to QUOTE_INDENT if the + arg has a unit of measure appended to it $QUOTE_COLOR Quote (poetic) color $QUOTE_FAM Family to use for pquotes $QUOTE_FT Font to use for pquotes diff --git a/contrib/mom/momdoc/toc.html b/contrib/mom/momdoc/toc.html index 6f05ca78..0ae795a6 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.4-a -- Table of Contents</title> +<title>Mom, version 1.4-b -- Table of Contents</title> </head> <body bgcolor="#dfdfdf"> <!====================================================================> -<h1 align="center"><u>Table of Contents for mom, version 1.4-a</u></h1> +<h1 align="center"><u>Table of Contents for mom, version 1.4-b</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/om.tmac b/contrib/mom/om.tmac index 8c847451..cf77887d 100644 --- a/contrib/mom/om.tmac +++ b/contrib/mom/om.tmac @@ -21,7 +21,7 @@ You should have received a copy of the GNU General Public License along with groff; see the file COPYING. If not, write to the Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -Version 1.4-a +Version 1.4-b ------------- Antoine de St-Exupéry asserted that elegance in engineering is achieved not when there is nothing left to add, but when there is @@ -4687,10 +4687,11 @@ y\\R'#DESCENDER \\n[.cdp]' . \} . el \{ .ENDNOTE_TITLE "\\*[$TITLE]" \} . \} -. if !d$EN_TITLE_FAM \{ .ENDNOTE_TITLE_FAMILY \\*[$EN_FAM] \} -. if !d$EN_TITLE_QUAD \{ .ENDNOTE_TITLE_QUAD LEFT \} -. if !r#EN_TITLE_UNDERSCORE \{ .ENDNOTE_TITLE_UNDERSCORE \} -. if !d$EN_NUMBER_FAM \{ .ENDNOTE_NUMBER_FAMILY \\*[$EN_FAM] \} +. if !d$EN_TITLE_FAM \{ .ENDNOTE_TITLE_FAMILY \\*[$EN_FAM] \} +. if !d$EN_TITLE_QUAD \{ .ENDNOTE_TITLE_QUAD LEFT \} +. if !r#EN_TITLE_UNDERSCORE \{ .ENDNOTE_TITLE_UNDERSCORE \} +. if !d$EN_NUMBER_FAM \{ .ENDNOTE_NUMBER_FAMILY \\*[$EN_FAM] \} +. if !d$EN_LN_FAM \{ .ENDNOTE_LINENUMBER_FAMILY \\*[$EN_FAM] \} . if !r#EN_NUMBERS_ALIGN_LEFT \{\ . if !r#EN_NUMBERS_ALIGN_RIGHT \{ .ENDNOTE_NUMBERS_ALIGN_RIGHT 2 \} . \} @@ -4748,9 +4749,13 @@ y\\R'#DESCENDER \\n[.cdp]' . if \\n[#UNDERLINE_QUOTES]=1 \{ .UNDERLINE_QUOTES \} . if \\n[#UNDERLINE_QUOTES]=0 \{ .UNDERLINE_QUOTES OFF \} .\" +Quotes and blockquotes -. if !r#Q_OFFSET_VALUE \{ .QUOTE_INDENT 2 \} +. if !r#Q_OFFSET_VALUE \{\ +. if '\\*[$Q_OFFSET_VALUE]'' \{ .QUOTE_INDENT 2 \} +. \} .\" +Epigraphs -. if !r#EPI_OFFSET_VALUE \{ .EPIGRAPH_INDENT 2 \} +. if !r#EPI_OFFSET_VALUE \{\ +. if '\\*[$EPI_OFFSET_VALUE]'' \{ .EPIGRAPH_INDENT 2 \} +. \} .\" +Linebreaks . if !d$LINEBREAK_CHAR \{ .LINEBREAK_CHAR * 3 2p \} .\" +Footnotes @@ -4933,7 +4938,9 @@ y\\R'#DESCENDER \\n[.cdp]' . if !d$QUOTE_FAM \{ .QUOTE_FAMILY \\*[$DOC_FAM] \} . if !d$QUOTE_FT \{ .QUOTE_FONT I \} . if !d$QUOTE_SIZE_CHANGE \{ .QUOTE_SIZE +0 \} -. if !r#Q_OFFSET_VALUE \{ .QUOTE_INDENT 3 \} +. if !r#Q_OFFSET_VALUE \{\ +. if '\\*[$Q_OFFSET_VALUE]'' \{ .QUOTE_INDENT 3 \} +. \} .\" +Blockquotes .\" Note: the leading for quotes and blockquotes is set after .DEFAULTS in START . if !d$BQUOTE_FAM \{ .BLOCKQUOTE_FAMILY \\*[$DOC_FAM] \} @@ -4946,7 +4953,9 @@ y\\R'#DESCENDER \\n[.cdp]' . if !d$EPI_SIZE_CHANGE \{ .EPIGRAPH_SIZE -1.5 \} . if !r#EPI_AUTOLEAD \{ .EPIGRAPH_AUTOLEAD 2 \} . if !d$EPI_QUAD \{ .EPIGRAPH_QUAD \\*[$DOC_QUAD] \} -. if !r#EPI_OFFSET_VALUE \{ .EPIGRAPH_INDENT 3 \} +. if !r#EPI_OFFSET_VALUE \{\ +. if '\\*[$EPI_OFFSET_VALUE]'' \{ .EPIGRAPH_INDENT 3 \} +. \} .\" +Linebreaks . if !d$LINEBREAK_CHAR \{ .LINEBREAK_CHAR * 3 3p \} .\" +Footnotes @@ -4961,6 +4970,7 @@ y\\R'#DESCENDER \\n[.cdp]' . if !d$EN_TITLE_FT \{ .ENDNOTE_TITLE_FONT B \} . if !d$EN_TITLE_SIZE_CHANGE \{ .ENDNOTE_TITLE_SIZE +0 \} . if !d$EN_NUMBER_FT \{ .ENDNOTE_NUMBER_FONT B \} +. if !d$EN_LN_FT \{ .ENDNOTE_LINENUMBER_FONT R \} . if !d$EN_NUMBER_SIZE_CHANGE \{ .ENDNOTE_NUMBER_SIZE +0 \} . if !r#EN_PP_INDENT \{ .ENDNOTE_PARA_INDENT 1.5m \} .\" +Bibliography @@ -6630,17 +6640,20 @@ y\\R'#DESCENDER \\n[.cdp]' . br . ds $DOC_FAM \\$1 . ds $FAMILY \\*[$DOC_FAM] -. TITLE_FAMILY \\*[$DOC_FAM] -. SUBTITLE_FAMILY \\*[$DOC_FAM] . AUTHOR_FAMILY \\*[$DOC_FAM] -. DOCTYPE_FAMILY \\*[$DOC_FAM] -. HEAD_FAMILY \\*[$DOC_FAM] -. SUBHEAD_FAMILY \\*[$DOC_FAM] -. QUOTE_FAMILY \\*[$DOC_FAM] . BLOCKQUOTE_FAMILY \\*[$DOC_FAM] +. DOCHEADER_FAMILY \\*[$DOC_FAM] +. DOCTYPE_FAMILY \\*[$DOC_FAM] . EPIGRAPH_FAMILY \\*[$DOC_FAM] -. HDRFTR_FAMILY \\*[$DOC_FAM] . FOOTNOTE_FAMILY \\*[$DOC_FAM] +. HDRFTR_FAMILY \\*[$DOC_FAM] +. HEAD_FAMILY \\*[$DOC_FAM] +. LINENUMBER_FAMILY \\*[$DOC_FAM] +. PARAHEAD_FAMILY \\*[$DOC_FAM] +. QUOTE_FAMILY \\*[$DOC_FAM] +. SUBHEAD_FAMILY \\*[$DOC_FAM] +. SUBTITLE_FAMILY \\*[$DOC_FAM] +. TITLE_FAMILY \\*[$DOC_FAM] .END \# \# @@ -6877,7 +6890,17 @@ y\\R'#DESCENDER \\n[.cdp]' \# Default is 2 for TYPEWRITE, 3 for TYPESET. \# .MAC EPIGRAPH_INDENT END -. nr #EPI_OFFSET_VALUE \\$1 +. if r#EPI_OFFSET_VALUE \{ .rr #EPI_OFFSET_VALUE \} +. if !'\\*[$EPI_OFFSET_VALUE]'' \{ .rm $EPI_OFFSET_VALUE \} +. ds $EVAL_EI_ARG \\$1 +. substring $EVAL_EI_ARG -1 +. ie \B'\\*[$EVAL_EI_ARG]' \{\ +. nr #EPI_OFFSET_VALUE \\$1 +. \} +. el \{\ +. ds $EPI_OFFSET_VALUE \\$1 +. \} +. rm $EVAL_EI_ARG .END \# \# @@ -6980,19 +7003,39 @@ y\\R'#DESCENDER \\n[.cdp]' . ev EPIGRAPH . ie \\n[#START] \{\ . ie \\n[#COLUMNS] \{\ -. ll \\n[#L_LENGTH_FOR_EPI]u-(\\n[#PP_INDENT]u*(\\n[#EPI_OFFSET_VALUE]u*2u)) +. ie r#EPI_OFFSET_VALUE \{\ +. ll \\n[#L_LENGTH_FOR_EPI]u-(\\n[#PP_INDENT]u*(\\n[#EPI_OFFSET_VALUE]u*2u)) +. \} +. el \{\ +. ll \\n[#L_LENGTH_FOR_EPI]u-(\\*[$EPI_OFFSET_VALUE]u*2u) +. \} . ta \\n(.lu . \} . el \{\ -. ll \\n[#L_LENGTH]u-(\\n[#PP_INDENT]u*(\\n[#EPI_OFFSET_VALUE]u*2u)) +. ie r#EPI_OFFSET_VALUE \{\ +. ll \\n[#L_LENGTH]u-(\\n[#PP_INDENT]u*(\\n[#EPI_OFFSET_VALUE]u*2u)) +. \} +. el \{\ +. ll \\n[#L_LENGTH]u-(\\*[$EPI_OFFSET_VALUE]*2u) +. \} . ta \\n(.lu . \} . \} . el \{\ -. ll \\n[#L_LENGTH]u-(\\n[#PP_INDENT]u*(\\n[#EPI_OFFSET_VALUE]u*2u)) +. ie r#EPI_OFFSET_VALUE \{\ +. ll \\n[#L_LENGTH]u-(\\n[#PP_INDENT]u*(\\n[#EPI_OFFSET_VALUE]u*2u)) +. \} +. el \{\ +. ll \\n[#L_LENGTH]u-(\\*[$EPI_OFFSET_VALUE]*2u) +. \} . ta \\n(.lu . if \\n[#COLUMNS] \{\ -. ll \\n[#COL_L_LENGTH]u-(\\n[#PP_INDENT]u*(\\n[#EPI_OFFSET_VALUE]u*2u)) +. ie r#EPI_OFFSET_VALUE \{\ +. ll \\n[#COL_L_LENGTH]u-(\\n[#PP_INDENT]u*(\\n[#EPI_OFFSET_VALUE]u*2u)) +. \} +. el \{\ +. ll \\n[#COL_L_LENGTH]u-(\\*[$EPI_OFFSET_VALUE]*2u) +. \} . ta \\n(.lu . \} . CHECK_INDENT @@ -7138,9 +7181,15 @@ y\\R'#DESCENDER \\n[.cdp]' . \} . \} . if \\n[#EPIGRAPH]=2 \{\ -. nr #EPI_OFFSET \\n[#L_MARGIN]+(\\n[#PP_INDENT]*\\n[#EPI_OFFSET_VALUE]) +. ie r#EPI_OFFSET_VALUE \{\ +. nr #EPI_OFFSET \\n[#L_MARGIN]+(\\n[#PP_INDENT]*\\n[#EPI_OFFSET_VALUE]) +. \} +. el \{ .nr #EPI_OFFSET \\n[#L_MARGIN]+\\*[$EPI_OFFSET_VALUE] \} . if \\n[#COLUMNS] \{\ -. nr #EPI_OFFSET \\n[#COL_\\n[#COL_NUM]_L_MARGIN]+(\\n[#PP_INDENT]*\\n[#EPI_OFFSET_VALUE]) +. ie r#EPI_OFFSET_VALUE \{\ +. nr #EPI_OFFSET \\n[#COL_\\n[#COL_NUM]_L_MARGIN]+(\\n[#PP_INDENT]*\\n[#EPI_OFFSET_VALUE]) +. \} +. el \{ .nr #EPI_OFFSET \\n[#COL_\\n[#COL_NUM]_L_MARGIN]+\\*[$EPI_OFFSET_VALUE] \} . \} . po \\n[#EPI_OFFSET]u . \} @@ -7944,9 +7993,9 @@ y\\R'#DESCENDER \\n[.cdp]' . nr #PAGENUMBER \\n%+\\n[#PAGE_NUM_ADJ] . fc ^ # . if \\n[#PRINT_STYLE]=2 \{\ -. FAMILY \\*[$HDRFTR_FAM] -. FT R -. PT_SIZE \\n[#HDRFTR_PT_SIZE]u +. fam \\*[$HDRFTR_FAM] +. ft R +. ps \\n[#HDRFTR_PT_SIZE]u . if \\n[#HDRFTR_COLOR]=1 \{\ . nf . COLOR \\*[$HDRFTR_COLOR] @@ -8176,7 +8225,12 @@ y\\R'#DESCENDER \\n[.cdp]' . if \\n[#QUOTE] \{\ . ie \\n[#TAB_ACTIVE] \{ .TAB \\n[#CURRENT_TAB] \} . el \{\ -. nr #Q_OFFSET \\n[#L_MARGIN]+(\\n[#PP_INDENT]*\\n[#Q_OFFSET_VALUE]) +. ie r#Q_OFFSET_VALUE \{\ +. nr #Q_OFFSET \\n[#L_MARGIN]+(\\n[#PP_INDENT]*\\n[#Q_OFFSET_VALUE]) +. \} +. el \{\ +. nr #Q_OFFSET \\n[#L_MARGIN]+\\*[$Q_OFFSET_VALUE] +. \} . po \\n[#Q_OFFSET]u . \} . if \\n[#PRINTSTYLE]=2 \{ .ALD \\n[#Q_LEAD_DIFF]u \} @@ -8184,7 +8238,12 @@ y\\R'#DESCENDER \\n[.cdp]' . if \\n[#EPIGRAPH] \{\ . ie \\n[#TAB_ACTIVE] \{ .TAB \\n[#CURRENT_TAB] \} . el \{\ -. nr #EPI_OFFSET \\n[#L_MARGIN]+(\\n[#PP_INDENT]*\\n[#EPI_OFFSET_VALUE]) +. ie r#EPI_OFFSET_VALUE \{\ +. nr #EPI_OFFSET \\n[#L_MARGIN]+(\\n[#PP_INDENT]*\\n[#EPI_OFFSET_VALUE]) +. \} +. el \{\ +. nr #EPI_OFFSET \\n[#L_MARGIN]+\\*[$EPI_OFFSET_VALUE] +. \} . po \\n[#EPI_OFFSET]u . \} . \} @@ -8212,14 +8271,24 @@ y\\R'#DESCENDER \\n[.cdp]' . ll \\n[#COL_L_LENGTH]u . ta \\n(.lu . if \\n[#QUOTE] \{\ -. po +(\\n[#PP_INDENT]u*\\n[#Q_OFFSET_VALUE]u) +. ie r#Q_OFFSET_VALUE \{\ +. po +(\\n[#PP_INDENT]u*\\n[#Q_OFFSET_VALUE]u) +. \} +. el \{\ +. po +\\*[$Q_OFFSET_VALUE] +. \} . \} . if \\n[#EPIGRAPH] \{\ . if \\n[#EPI_ACTIVE] \{\ . ie \\n[#EPI_FITS] \{ . \} . el \{ .nr dc -\\n[#EPI_LEAD_DIFF] \} . \} -. po \\n[#COL_\\n[#COL_NUM]_L_MARGIN]u+(\\n[#PP_INDENT]u*\\n[#EPI_OFFSET_VALUE]u) +. ie r#EPI_OFFSET_VALUE \{\ +. po \\n[#COL_\\n[#COL_NUM]_L_MARGIN]u+(\\n[#PP_INDENT]u*\\n[#EPI_OFFSET_VALUE]u) +. \} +. el \{\ +. po \\n[#COL_\\n[#COL_NUM]_L_MARGIN]u+\\*[$EPI_OFFSET_VALUE] +. \} . \} . \} . if \\n[#RESET_FN_COUNTERS]=1 \{\ @@ -8425,16 +8494,40 @@ y\\R'#DESCENDER \\n[.cdp]' . if \\n[#QUOTE] \{\ . ie \\n[#TAB_ACTIVE] \{ .TAB \\n[#CURRENT_TAB] \} . el \{\ -. nr #Q_OFFSET \\n[#L_MARGIN]+(\\n[#PP_INDENT]*\\n[#Q_OFFSET_VALUE]) -. if \\n[#COLUMNS] \{ .nr #Q_OFFSET \\n[#COL_\\n[#COL_NUM]_L_MARGIN]+(\\n[#PP_INDENT]*\\n[#Q_OFFSET_VALUE]) \} +. ie r#Q_OFFSET_VALUE \{\ +. nr #Q_OFFSET \\n[#L_MARGIN]+(\\n[#PP_INDENT]*\\n[#Q_OFFSET_VALUE]) +. \} +. el \{\ +. nr #Q_OFFSET \\n[#L_MARGIN]+\\*[$Q_OFFSET_VALUE] +. \} +. if \\n[#COLUMNS] \{\ +. ie r#Q_OFFSET_VALUE \{\ +. nr #Q_OFFSET \\n[#COL_\\n[#COL_NUM]_L_MARGIN]+(\\n[#PP_INDENT]*\\n[#Q_OFFSET_VALUE]) +. \} +. el \{\ +. nr #Q_OFFSET \\n[#COL_\\n[#COL_NUM]_L_MARGIN]+\\*[$Q_OFFSET_VALUE] +. \} +. \} . po \\n[#Q_OFFSET]u . \} . \} . if \\n[#EPIGRAPH] \{\ . ie \\n[#TAB_ACTIVE] \{ .TAB \\n[#CURRENT_TAB] \} . el \{\ -. nr #EPI_OFFSET \\n[#L_MARGIN]+(\\n[#PP_INDENT]*\\n[#EPI_OFFSET_VALUE]) -. if \\n[#COLUMNS] \{ .nr #EPI_OFFSET \\n[#COL_\\n[#COL_NUM]_L_MARGIN]+(\\n[#PP_INDENT]*\\n[#EPI_OFFSET_VALUE]) \} +. ie r#EPI_OFFSET_VALUE \{\ +. nr #EPI_OFFSET \\n[#L_MARGIN]+(\\n[#PP_INDENT]*\\n[#EPI_OFFSET_VALUE]) +. \} +. el \{\ +. nr #EPI_OFFSET \\n[#L_MARGIN]+\\*[$EPI_OFFSET_VALUE] +. \} +. if \\n[#COLUMNS] \{\ +. ie r#EPI_OFFSET_VALUE \{\ +. nr #EPI_OFFSET \\n[#COL_\\n[#COL_NUM]_L_MARGIN]+(\\n[#PP_INDENT]*\\n[#EPI_OFFSET_VALUE]) +. \} +. el \{\ +. nr #EPI_OFFSET \\n[#COL_\\n[#COL_NUM]_L_MARGIN]+\\*[$EPI_OFFSET_VALUE] +. \} +. \} . po \\n[#EPI_OFFSET]u . \} . \} @@ -8489,11 +8582,11 @@ y\\R'#DESCENDER \\n[.cdp]' . TYPEWRITER . \} . if \\n[#PRINT_STYLE]=2 \{\ -. FAMILY \\*[$HDRFTR_FAM] -. FT R -. PT_SIZE \\n[#DOC_PT_SIZE]u\\*[$HDRFTR_SIZE_CHANGE] +. fam \\*[$HDRFTR_FAM] +. ft R +. ps \\n[#DOC_PT_SIZE]u\\*[$HDRFTR_SIZE_CHANGE] . \} -. LS \\n[#SAVED_LEAD]u +. vs \\n[#SAVED_LEAD]u . nr #HDRFTR_PT_SIZE \\n[#PT_SIZE] . if \\n[#CAPS_ON] \{\ . nr #CAPS_WAS_ON 1 @@ -9858,14 +9951,28 @@ y\\R'#DESCENDER \\n[.cdp]' \# QUOTE INDENT \# ------------ \# *Argument: -\# <value by which to multiply PP_INDENT for indented quoted text> +\# <integer> | <integer with unit of measure appended> \# *Function: \# Creates or modifies register #Q_OFFSET_VALUE. \# *Notes: -\# Default is 3 for typeset; 2 for typewrite +\# If just an integer given, value by which to multiply PARA_INDENT +\# to get quote indent. If integer with a unit of measure appended, +\# absolute value of quote indent. +\# +\# Default is 3 for typeset; 2 for typewrite. \# .MAC QUOTE_INDENT END -. nr #Q_OFFSET_VALUE \\$1 +. if r#Q_OFFSET_VALUE \{ .rr #Q_OFFSET_VALUE \} +. if !'\\*[$Q_OFFSET_VALUE]'' \{ .rm $Q_OFFSET_VALUE \} +. ds $EVAL_QI_ARG \\$1 +. substring $EVAL_QI_ARG -1 +. ie \B'\\*[$EVAL_QI_ARG]' \{\ +. nr #Q_OFFSET_VALUE \\$1 +. \} +. el \{\ +. ds $Q_OFFSET_VALUE \\$1 +. \} +. rm $EVAL_QI_ARG .END \# \# @@ -9914,6 +10021,17 @@ y\\R'#DESCENDER \\n[.cdp]' \# diverted so its depth can be measured (in DO_QUOTE) for determining \# how much space to put before and after. \# +\# QUOTE +\# ----- +\# *Arguments: +\# <none> | <anything> +\# *Function: +\# Indents quoted text on a line for line basis, or turns QUOTE off. +\# *Notes: +\# Owing to the need to bottom align TYPESET pages, quoted text gets +\# diverted so its depth can be measured (in DO_QUOTE) for determining +\# how much space to put before and after. +\# .MAC QUOTE END . br . if \\n[#LINENUMBERS]=1 \{\ @@ -9929,7 +10047,10 @@ y\\R'#DESCENDER \\n[.cdp]' . nr #IN_DIVER 1 . nr #QUOTE 1 . di P_QUOTE -. ll \\n[#L_LENGTH]u-(\\n[#PP_INDENT]u*\\n[#Q_OFFSET_VALUE]u) +. ie r#Q_OFFSET_VALUE \{\ +. ll \\n[#L_LENGTH]u-(\\n[#PP_INDENT]u*\\n[#Q_OFFSET_VALUE]u) +. \} +. el \{ .ll \\n[#L_LENGTH]u-\\*[$Q_OFFSET_VALUE] \} . if \\n[#LINENUMBERS]=2 \{\ . if \\n[#QUOTE_LN]=1 \{\ . nm \\n(ln "" \\*[$Q_LN_GUTTER] -3-\\*[$Q_LN_GUTTER] @@ -9937,7 +10058,12 @@ y\\R'#DESCENDER \\n[.cdp]' . \} . ta \\n(.lu . if \\n[#COLUMNS] \{\ -. ll \\n[#COL_L_LENGTH]u-(\\n[#PP_INDENT]u*\\n[#Q_OFFSET_VALUE]u) +. ie r#Q_OFFSET_VALUE \{\ +. ll \\n[#COL_L_LENGTH]u-(\\n[#PP_INDENT]u*\\n[#Q_OFFSET_VALUE]u) +. \} +. el \{\ +. ll \\n[#COL_L_LENGTH]u-\\*[$Q_OFFSET_VALUE] +. \} . ta \\n(.lu . \} . if \\n[#PRINT_STYLE]=1 \{\ @@ -10068,25 +10194,53 @@ y\\R'#DESCENDER \\n[.cdp]' . nr #PP_STYLE 2 . nr #Q_PP 0 . di B_QUOTE -. ll \\n[#L_LENGTH]u-(\\n[#PP_INDENT]u*(\\n[#Q_OFFSET_VALUE]u*2u)) +. ie r#Q_OFFSET_VALUE \{\ +. ll \\n[#L_LENGTH]u-(\\n[#PP_INDENT]u*(\\n[#Q_OFFSET_VALUE]u*2u)) +. \} +. el \{ .ll \\n[#L_LENGTH]u-(\\*[$Q_OFFSET_VALUE]*2u) \} . if \\n[#ENDNOTE] \{\ . if \\n[#EN_NUMBERS_ALIGN_RIGHT] \{\ -. ll \\n[#RESET_L_LENGTH]u-\\n[#EN_TEXT_INDENT]u-(\\n[#EN_PP_INDENT]u*(\\n[#Q_OFFSET_VALUE]u*2u)) +. ie r#Q_OFFSET_VALUE \{\ +. ll \\n[#RESET_L_LENGTH]u-\\n[#EN_TEXT_INDENT]u-(\\n[#EN_PP_INDENT]u*(\\n[#Q_OFFSET_VALUE]u*2u)) +. \} +. el \{\ +. ll \\n[#RESET_L_LENGTH]u-\\n[#EN_TEXT_INDENT]u-(\\*[$Q_OFFSET_VALUE]*2u) +. \} . \} . if \\n[#EN_NUMBERS_ALIGN_LEFT] \{\ -. ll \\n[#L_LENGTH]u-(\\n[#EN_PP_INDENT]u*(\\n[#Q_OFFSET_VALUE]u*2u)) +. ie r#Q_OFFSET_VALUE \{\ +. ll \\n[#L_LENGTH]u-(\\n[#EN_PP_INDENT]u*(\\n[#Q_OFFSET_VALUE]u*2u)) +. \} +. el \{\ +. ll \\n[#L_LENGTH]u-(\\*[$Q_OFFSET_VALUE]u*2u) +. \} . \} . \} . ta \\n(.lu . CHECK_INDENT . if \\n[#COLUMNS] \{\ -. ll \\n[#COL_L_LENGTH]u-(\\n[#PP_INDENT]u*(\\n[#Q_OFFSET_VALUE]u*2u)) +. ie r#Q_OFFSET_VALUE \{\ +. ll \\n[#COL_L_LENGTH]u-(\\n[#PP_INDENT]u*(\\n[#Q_OFFSET_VALUE]u*2u)) +. \} +. el \{\ +. ll \\n[#COL_L_LENGTH]u-(\\*[$Q_OFFSET_VALUE]*2u) +. \} . if \\n[#ENDNOTE] \{\ . if \\n[#EN_NUMBERS_ALIGN_RIGHT] \{\ -. ll \\n[#RESET_L_LENGTH]u-\\n[#EN_TEXT_INDENT]u-(\\n[#EN_PP_INDENT]u*(\\n[#Q_OFFSET_VALUE]u*2u)) +. ie r#Q_OFFSET_VALUE \{\ +. ll \\n[#RESET_L_LENGTH]u-\\n[#EN_TEXT_INDENT]u-(\\n[#EN_PP_INDENT]u*(\\n[#Q_OFFSET_VALUE]u*2u)) +. \} +. el \{\ +. ll \\n[#RESET_L_LENGTH]u-\\n[#EN_TEXT_INDENT]u-(\\*[$Q_OFFSET_VALUE]*2u) +. \} . \} . if \\n[#EN_NUMBERS_ALIGN_LEFT] \{\ -. ll \\n[#COL_L_LENGTH]u-(\\n[#EN_PP_INDENT]u*(\\n[#Q_OFFSET_VALUE]u*2u)) +. ie r#Q_OFFSET_VALUE \{\ +. ll \\n[#COL_L_LENGTH]u-(\\n[#EN_PP_INDENT]u*(\\n[#Q_OFFSET_VALUE]u*2u)) +. \} +. el \{\ +. ll \\n[#COL_L_LENGTH]u-(\\*[$Q_OFFSET_VALUE]*2u) +. \} . \} . \} . ta \\n(.lu @@ -10230,13 +10384,20 @@ y\\R'#DESCENDER \\n[.cdp]' . \} . \} . \} -. nr #Q_OFFSET \\n[#L_MARGIN]+(\\n[#PP_INDENT]*\\n[#Q_OFFSET_VALUE]) +. ie r#Q_OFFSET_VALUE \{\ +. nr #Q_OFFSET \\n[#L_MARGIN]+(\\n[#PP_INDENT]*\\n[#Q_OFFSET_VALUE]) +. \} +. el \{ .nr #Q_OFFSET \\n[#L_MARGIN]+\\*[$Q_OFFSET_VALUE] \} . if \\n[#COLUMNS] \{\ -. nr #Q_OFFSET \\n[#COL_\\n[#COL_NUM]_L_MARGIN]+(\\n[#PP_INDENT]*\\n[#Q_OFFSET_VALUE]) +. ie r#Q_OFFSET_VALUE \{\ +. nr #Q_OFFSET \\n[#COL_\\n[#COL_NUM]_L_MARGIN]+(\\n[#PP_INDENT]*\\n[#Q_OFFSET_VALUE]) +. \} +. el \{ .nr #Q_OFFSET \\n[#COL_\\n[#COL_NUM]_L_MARGIN]+\\*[$Q_OFFSET_VALUE] \} . \} . if !\\n[#ENDNOTE] \{ .po \\n[#Q_OFFSET]u \} . if \\n[#ENDNOTE] \{\ -. in +\\n[#EN_PP_INDENT]u*\\n[#Q_OFFSET_VALUE]u +. ie r#Q_OFFSET_VALUE \{ .in +\\n[#EN_PP_INDENT]u*\\n[#Q_OFFSET_VALUE]u \} +. el \{ .in +\\*[$Q_OFFSET_VALUE] \} . \} . ie \\n[#START]=1 \{\ . ie !\\n[#Q_LEAD_DIFF]<0 \{ .ALD \\n[#Q_SPACE_ADJ]u \} @@ -10304,8 +10465,10 @@ y\\R'#DESCENDER \\n[.cdp]' . \} . if \\n[#LINENUMBERS]=2 \{\ . nr #LINENUMBERS 1 -. ie \\n[#RESTORE_LN_NUM]=1 \{ .nm \\n[#NEXT_LN] \} -. el \{ .nm +0 \} +. if !\\n[#ENDNOTE] \{\ +. ie \\n[#RESTORE_LN_NUM]=1 \{ .nm \\n[#NEXT_LN] \} +. el \{ .nm +0 \} +. \} . \} . if \\n[#ENDNOTE] \{ .nr #FULLSPACE_QUOTES \\n[#RESET_QUOTE_SPACING] \} . if r#HEAD \{ .rr #HEAD \} @@ -10470,8 +10633,20 @@ y\\R'#DESCENDER \\n[.cdp]' . el \{ .ALD \\n[#DOC_LEAD]u \} . \} . \} -. nr #Q_OFFSET \\n[#L_MARGIN]+(\\n[#PP_INDENT]*\\n[#Q_OFFSET_VALUE]) -. if \\n[#COLUMNS] \{ .nr #Q_OFFSET \\n[#COL_\\n[#COL_NUM]_L_MARGIN]+(\\n[#PP_INDENT]*\\n[#Q_OFFSET_VALUE]) \} +. ie r#Q_OFFSET_VALUE \{\ +. nr #Q_OFFSET \\n[#L_MARGIN]+(\\n[#PP_INDENT]*\\n[#Q_OFFSET_VALUE]) +. \} +. el \{\ +. nr #Q_OFFSET \\n[#L_MARGIN]+\\*[$Q_OFFSET_VALUE] +. \} +. if \\n[#COLUMNS] \{\ +. ie r#Q_OFFSET_VALUE \{\ +. nr #Q_OFFSET \\n[#COL_\\n[#COL_NUM]_L_MARGIN]+(\\n[#PP_INDENT]*\\n[#Q_OFFSET_VALUE]) +. \} +. el \{\ +. nr #Q_OFFSET \\n[#COL_\\n[#COL_NUM]_L_MARGIN]+\\*[$Q_OFFSET_VALUE] +. \} +. \} . po \\n[#Q_OFFSET]u . if \\n[#QUOTE]=1 \{\ . nf @@ -12549,6 +12724,8 @@ E\\R'#CAP_HEIGHT \\n[.cht]' . \} . \} . if \\n[#EN_MARKER_STYLE]=2 \{\ +. ie r#EN_NUMBER \{ \\n+[#EN_NUMBER] \} +. el \{ .nr #EN_NUMBER 1 1 \} . if !\\n[#LINENUMBERS] \{\ . tm1 "[mom]: Line numbering must be enabled with NUMBER_LINES when . tm1 " ENDNOTE_MARKER_STYLE is LINE. @@ -12708,8 +12885,8 @@ E\\R'#CAP_HEIGHT \\n[.cht]' . \} . \} . el \{\ -. br -. in 0 +. sp +. in 0 . if \\n[#EN_MARKER_STYLE]=2 \{\ \!. in 0 . \} |