summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--contrib/mom/BUGS25
-rw-r--r--contrib/mom/ChangeLog27
-rw-r--r--contrib/mom/NEWS10
-rw-r--r--contrib/mom/momdoc/docelement.html5
-rw-r--r--contrib/mom/momdoc/goodies.html2
-rw-r--r--contrib/mom/momdoc/headfootpage.html6
-rw-r--r--contrib/mom/momdoc/inlines.html29
-rw-r--r--contrib/mom/momdoc/refer.html7
-rw-r--r--contrib/mom/momdoc/reserved.html2
-rw-r--r--contrib/mom/momdoc/toc.html4
-rw-r--r--contrib/mom/om.tmac95
11 files changed, 160 insertions, 52 deletions
diff --git a/contrib/mom/BUGS b/contrib/mom/BUGS
index 03c658e2..c4931423 100644
--- a/contrib/mom/BUGS
+++ b/contrib/mom/BUGS
@@ -25,13 +25,36 @@ Also, please--no html email. That, too, gets nuked.
========================================================================
Version 1.5
===========
+DROPCAP not printing the dropcap letter at all in PRINTSTYLE
+TYPEWRITE, nor when DROPCAP is used (accidentally?) after a legal
+"first" paragraph.
+---FIXED---
+
+DROPCAP going into an infinite loop when groff called with the
+-Tascii switch.
+---FIXED---
+
+SHIFT_LIST, when used anywhere but with a top-level list, is killing
+list indents for every list level *returned to* afterward.
+---Fixed---
+
+TOC page number for heads and subheads that get bumped to next page
+(because of .ne) off by 1.
+---Fixed---
+
+Moving backwards in nested lists not setting the proper indent.
+---Fixed---
+
+Default linebreak color missing in om.tmac.
+---Fixed---
+
Some links in macrolist.html not pointing to html "name" owing to
missing # in link names.
---Fixed---
Version 1.4-b
=============
-Linelengths and indents not always being respected in LIST.
+Line lengths and indents not always being respected in LIST.
---Fixed---
CAPS OFF, called inline with \*[CAPS OFF] not working.
diff --git a/contrib/mom/ChangeLog b/contrib/mom/ChangeLog
index d2b04686..15999075 100644
--- a/contrib/mom/ChangeLog
+++ b/contrib/mom/ChangeLog
@@ -1,3 +1,29 @@
+* Wed Sep 12 2007
+
+o Fixed an oversight in DROPCAP that meant when DROPCAP needed to
+ be ignored, the dropcap letter itself was dropped from running
+ text altogether, instead of printing as a normal part of text.
+
+o Added an .if n clause to DROPCAP to prevent mom from going into
+ an infinite loop when groff invoked with the -Tascii switch.
+
+* Wed Jul 25 2007
+
+o Did a couple of doc fixes.
+
+o Added vpt checks at the top of all the graphical object macros.
+ Basically, only turn vpt's off and on again if they're already enabled.
+
+* Wed Feb 14 2007
+
+o Moved .ne requests in HEAD and SUBHEAD to top of respective
+ macros, fixing bug that was gathering the wrong page number for
+ head and subhead toc entries.
+
+* Fri Nov 24 2006
+
+o Added a default linebreak color (black)
+
* Thu Sep 28 2006
o Fixed missing #'s in linknames in macrolist.html.
@@ -105,7 +131,6 @@ o Added missing .rm $AUTHORS to .AUTHOR. .as $AUTHORS now always
o Added a missing </nobr> tag to docelement.html.
-------------------------------------------------------------------------
* Sat Jun 10 2006
o In header and footer routines, changed all .FAMILY calls when
diff --git a/contrib/mom/NEWS b/contrib/mom/NEWS
index d212fb71..f5b6afb0 100644
--- a/contrib/mom/NEWS
+++ b/contrib/mom/NEWS
@@ -5,6 +5,10 @@
are permitted in any medium without royalty provided the copyright
notice and this notice are preserved.
+Release 1.5-a
+-------------
+Bugfix release (see BUGS, Version 1.5).
+
Release 1.5
-----------
Macros have been added to facilitate the drawing of common
@@ -41,9 +45,9 @@ control macro allows setting users' prefered fixed-width fonts.
Additionally, CODE can now be called inline.
New inline escapes, \*[UC] and \*[LC], have been added to allow
-inline capitalization. This is particularly useful when users want
-to pass a header/footer left-center-right part one of mom's
-"reserved" strings and want the string capitlized (or not) in the
+inline capitalization. This is particularly useful when users
+want to pass a header/footer left-center-right part one of mom's
+"reserved" strings and want the string capitalized (or not) in the
header/footer.
For more details, see ChangeLog as well as the documentation.
diff --git a/contrib/mom/momdoc/docelement.html b/contrib/mom/momdoc/docelement.html
index 12fd719d..e68c2646 100644
--- a/contrib/mom/momdoc/docelement.html
+++ b/contrib/mom/momdoc/docelement.html
@@ -5189,7 +5189,10 @@ Some examples:
the gap between the string and the underline to 3 points
.ENDNOTE_STRING_UNDERLINE DOUBLE .75 3p
- - turn double-underlining on; set the rule weight to 3 points
+ - turn double-underlining on; set the rule weight to 3/4 of
+ a point; set the gap between the string and the upper
+ underline to 3 points; leave the gap between the upper
+ and the lower underline at the default
.ENDNOTE_STRING_UNDERLINE DOUBLE 1.5 1.5p 1.5p
- turn double-underlining on; set the rule weight to 1-1/2
diff --git a/contrib/mom/momdoc/goodies.html b/contrib/mom/momdoc/goodies.html
index 6e4169bc..1d633096 100644
--- a/contrib/mom/momdoc/goodies.html
+++ b/contrib/mom/momdoc/goodies.html
@@ -827,7 +827,7 @@ for <strong>UNDERSCORE</strong>.
</p>
<p>
-If your font is monospaced one, like Courier, or you're using the
+If your font is monospaced, like Courier, or you're using the
document processing macro
<a href="#PRINTSTYLE">PRINTSTYLE TYPEWRITE</a>,
<strong>UNDERLINE</strong> allows you to underline words and
diff --git a/contrib/mom/momdoc/headfootpage.html b/contrib/mom/momdoc/headfootpage.html
index 068bb954..d0074d00 100644
--- a/contrib/mom/momdoc/headfootpage.html
+++ b/contrib/mom/momdoc/headfootpage.html
@@ -915,8 +915,8 @@ can be designed to your own specifications.
</ul>
<li><a href="#HDRFTR_RIGHT">HEADER_RIGHT</a></li>
<li><a href="#RESERVED_STRINGS">Using mom's &quot;reserved&quot; strings in header/footer definitions</a>
- (e.g. <kbd>\E*[$TITLE]</kbd> when you want the title,
- <kbd>\E*[$AUTHOR]</kbd> when you want the author, etc.)
+ (e.g. <kbd>\*[$TITLE]</kbd> when you want the title,
+ <kbd>\*[$AUTHOR]</kbd> when you want the author, etc.)
</li>
<li><a href="#PAGE_NUMBER_SYMBOL">Replacing header left, centre or right with the page number</a></li>
<li><a href="#PAGE_NUMBER_INCL">Including the page number in header left, centre or right</a></li>
@@ -1135,7 +1135,7 @@ Then, you'd prepare <strong>mom</strong> for the next document:
</pre>
Then, you'd redefine the header centre string using the reserved
-string <kbd>\E*[$TITLE]</kbd>, like this:
+string <kbd>\*[$TITLE]</kbd>, like this:
<pre>
.HEADER_CENTER "\E*[$TITLE]"
diff --git a/contrib/mom/momdoc/inlines.html b/contrib/mom/momdoc/inlines.html
index 66d981c9..493cac10 100644
--- a/contrib/mom/momdoc/inlines.html
+++ b/contrib/mom/momdoc/inlines.html
@@ -188,8 +188,8 @@ and/or
<a href="headfootpage.html#HDRFTR_RECTOVERSO">verso</a>
HEADERS or FOOTERS, or in the strings passed to
<a href="headfootpage.html#HEADERS_AND_FOOTERS">HEADERS_AND_FOOTERS</a>,
-you must enter the inlines beginning with <kbd>\*E</kbd>
-rather than just <kbd>\*</kbd>.
+you must enter the inlines beginning with <kbd>\E*</kbd>
+rather than just <kbd>\*</kbd>, e.g. <kbd>\E*[BD]</kbd>.
</p>
<!-- -INLINE_SIZE_MOM- -->
@@ -267,8 +267,9 @@ and/or
<a href="headfootpage.html#HDRFTR_RECTOVERSO">verso</a>
HEADERS or FOOTERS, or in the strings passed to
<a href="headfootpage.html#HEADERS_AND_FOOTERS">HEADERS_AND_FOOTERS</a>,
-you must enter the inline beginning with <kbd>\*E</kbd>
-rather than just <kbd>\*</kbd>.
+you <strong>must</strong> use the form <kbd>\*S[&lt;n&gt;]</kbd>
+and enter the inline beginning with <kbd>\E*</kbd>, like this:
+<kbd>\E*S[&lt;+|-&gt;&lt;n&gt;]</kbd>.
</p>
<p>
@@ -380,8 +381,10 @@ and/or
<a href="headfootpage.html#HDRFTR_RECTOVERSO">verso</a>
HEADERS or FOOTERS, or in the strings passed to
<a href="headfootpage.html#HEADERS_AND_FOOTERS">HEADERS_AND_FOOTERS</a>,
-you must enter the inline beginning with <kbd>\*E</kbd>
-rather than just <kbd>\*</kbd>.
+you <strong>must</strong> use the forms <kbd>\E*[BU&lt;n&gt;]</kbd>
+and <kbd>\E*[FU&lt;n&gt;]</kbd> (i.e. with no space), and enter the
+inline beginning with <kbd>\E*</kbd> rather than just <kbd>\*</kbd>,
+e.g. <kbd>\E*[BU4]</kbd>.
</p>
<p>
@@ -434,7 +437,7 @@ puts 12 points of space between <strong>1.</strong> and
<strong>NOTE:</strong> For backward compatibility, the forms
<pre>
- \*[BP.25]...\*[BP12.75] Move backward .25...12.75 points
+ \*[BP.25]...\*[BP12.75] Move backward .25...12.75 points
\*[FP.25]...\*[FP12.75] Move forward .25...12.75 points
</pre>
@@ -458,8 +461,10 @@ and/or
<a href="headfootpage.html#HDRFTR_RECTOVERSO">verso</a>
HEADERS or FOOTERS, or in the strings passed to
<a href="headfootpage.html#HEADERS_AND_FOOTERS">HEADERS_AND_FOOTERS</a>,
-you must enter the inline beginning with <kbd>\*E</kbd>
-rather than just <kbd>\*</kbd>.
+you <strong>must</strong> use the forms <kbd>\E*[BP&lt;n&gt;]</kbd>
+and <kbd>\E*[FP&lt;n&gt;]</kbd> (i.e. with no space), and enter the
+inline beginning with <kbd>\E*</kbd> rather than just <kbd>\*</kbd>,
+e.g. <kbd>\E*[BP.755]</kbd>.
</p>
<!-- -INLINE_VERTICAL_MOM- -->
@@ -529,8 +534,10 @@ and/or
<a href="headfootpage.html#HDRFTR_RECTOVERSO">verso</a>
HEADERS or FOOTERS, or in the strings passed to
<a href="headfootpage.html#HEADERS_AND_FOOTERS">HEADERS_AND_FOOTERS</a>,
-you must enter the inline beginning with <kbd>\*E</kbd>
-rather than just <kbd>\*</kbd>.
+you <strong>must</strong> use the forms <kbd>\E*[ALD&lt;n&gt;]</kbd>
+and <kbd>\E*[RLD&lt;n&gt;]</kbd> (i.e. with no space), and enter the
+inline beginning with <kbd>\E*</kbd> rather than just <kbd>\*</kbd>,
+e.g. <kbd>\E*[ALD.5]</kbd>.
</p>
<!-- -INLINE_B_MOM- -->
diff --git a/contrib/mom/momdoc/refer.html b/contrib/mom/momdoc/refer.html
index 8bfaeeff..c60822a6 100644
--- a/contrib/mom/momdoc/refer.html
+++ b/contrib/mom/momdoc/refer.html
@@ -174,7 +174,7 @@ The first step in using <strong>refer</strong> with
<strong>mom</strong> is setting up your bibliographic database. The
database is a file containing separate entries for each reference
you want to access from your <strong>mom</strong> files. The file
-is <em>not</em> a &quot; file&quot;; it is a separate database. You
+is <em>not</em> a &quot;mom file&quot;; it is a separate database. You
may set up individual databases for individual documents, or create
a large database that contains all the references you'll ever need.
</p>
@@ -1751,7 +1751,10 @@ Some examples:
the gap between the string and the underline to 3 points
.BIBLIOGRAPHY_STRING_UNDERLINE DOUBLE .75 3p
- - turn double-underlining on; set the rule weight to 3 points
+ - turn double-underlining on; set the rule weight to 3/4 of
+ a point; set the gap between the string and the upper
+ underline to 3 points; leave the gap between the upper
+ and the lower underline at the default
.BIBLIOGRAPHY_STRING_UNDERLINE DOUBLE 1.5 1.5p 1.5p
- turn double-underlining on; set the rule weight to 1-1/2
diff --git a/contrib/mom/momdoc/reserved.html b/contrib/mom/momdoc/reserved.html
index 1e8e1126..6009d20f 100644
--- a/contrib/mom/momdoc/reserved.html
+++ b/contrib/mom/momdoc/reserved.html
@@ -334,6 +334,8 @@ p Output line horiz position at end of
#R_MARGIN Right margin
#RESTORE_PREV_INDENT Tells LIST OFF what kind of indent was active
prior to first invocation of LIST
+#RESTORE_TRAP Did we have to disable traps? Used in
+ graphical object macros (boolean)
#RESTORE_SQ Instructs SMARTQUOTES to restore smartquotes if
SMARTQUOTES invoked without an arg
#RLD RLD value
diff --git a/contrib/mom/momdoc/toc.html b/contrib/mom/momdoc/toc.html
index d9a13a99..22c5c4ef 100644
--- a/contrib/mom/momdoc/toc.html
+++ b/contrib/mom/momdoc/toc.html
@@ -18,13 +18,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 -- Table of Contents</title>
+<title>Mom, version 1.5-a -- Table of Contents</title>
</head>
<body bgcolor="#dfdfdf">
<!-- ==================================================================== -->
-<h1 align="center"><u>Table of Contents for mom, version 1.5</u></h1>
+<h1 align="center"><u>Table of Contents for mom, version 1.5-a</u></h1>
<p>
The table of contents has grown quite large. If you've been using
diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac
index 086ed81a..ea01101c 100644
--- a/contrib/mom/om.tmac
+++ b/contrib/mom/om.tmac
@@ -21,8 +21,8 @@ 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.5
------------
+Version 1.5-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
nothing left to take away.
@@ -2734,13 +2734,29 @@ to a macro means that any argument turns the feature off.
\# EXT has no effect on running type.
\#
.MAC DROPCAP END
-. if #IGNORE \{ .return \}
+. if \\n[#IGNORE]=1 \{\
+. PRINT \\$1\c
+. return
+. \}
. br
+. if n \{\
+. PRINT \\$1\c
+. return
+. \}
. if \\n[#DOCS] \{\
-. if \\n[#PRINT_STYLE]=1 \{ .return \}
+. if \\n[#PRINT_STYLE]=1 \{\
+. PRINT \\$1\c
+. return
+. \}
. if \\n[#PRINT_STYLE]=2 \{\
-. if \\n[#PP_STYLE]=2 \{ .return \}
-. if \\n[#PP]>1 \{ .return \}
+. if \\n[#PP_STYLE]=2 \{\
+. PRINT \\$1\c
+. return
+. \}
+. if \\n[#PP]>1 \{\
+. PRINT \\$1\c
+. return
+. \}
. ti 0
. \}
. \}
@@ -2850,7 +2866,10 @@ to a macro means that any argument turns the feature off.
\# RULE_WEIGHT.
\#
.MAC DRH END
-. vpt 0
+. if \\n[.vpt]=1 \{\
+. vpt 0
+. nr #RESTORE_TRAP 1
+. \}
. ie !\\n[#NO_ADVANCE]=1 \{ .br \}
. el \{\
. sp -1v
@@ -2931,7 +2950,10 @@ to a macro means that any argument turns the feature off.
. nr #RULE_WEIGHT_ADJ \\n[#SAVED_WEIGHT_ADJ]
. rr #SAVED_WEIGHT
. rr #SAVED_WEIGHT_ADJ
-. vpt 1
+. if \\n[#RESTORE_TRAP]=1 \{\
+. vpt 1
+. rr #RESTORE_TRAP
+. \}
.END
\#
\#
@@ -2984,7 +3006,10 @@ to a macro means that any argument turns the feature off.
\# .gcolor.
\#
.MAC DRV END
-. vpt 0
+. if \\n[.vpt]=1 \{\
+. vpt 0
+. nr #RESTORE_TRAP 1
+. \}
. ie !\\n[#NO_ADVANCE]=1 \{ .br \}
. el \{\
. sp -1v
@@ -3036,7 +3061,10 @@ to a macro means that any argument turns the feature off.
. gcolor
. nr #RULE_WEIGHT \\n[#SAVED_WEIGHT]
. nr #RULE_WEIGHT_ADJ \\n[#SAVED_WEIGHT_ADJ]
-. vpt 1
+. if \\n[#RESTORE_TRAP]=1 \{\
+. vpt 1
+. rr #RESTORE_TRAP
+. \}
.END
\#
\# BOXES - DBX
@@ -3053,7 +3081,10 @@ to a macro means that any argument turns the feature off.
\# arg given, the rule weight is the one set by RULE_WEIGHT.
\#
.MAC DBX END
-. vpt 0
+. if \\n[.vpt]=1 \{\
+. vpt 0
+. nr #RESTORE_TRAP 1
+. \}
. ie !\\n[#NO_ADVANCE]=1 \{ .br \}
. el \{\
. sp -1v
@@ -3132,7 +3163,10 @@ to a macro means that any argument turns the feature off.
. nr #WEIGHT_ADJ \\n[#SAVED_WEIGHT_ADJ]
. rr #SAVED_WEIGHT
. rr #SAVED_WEIGHT_ADJ
-. vpt 1
+. if \\n[#RESTORE_TRAP]=1 \{\
+. vpt 1
+. rr #RESTORE_TRAP
+. \}
.END
\#
\#
@@ -3151,7 +3185,10 @@ to a macro means that any argument turns the feature off.
\# RULE_WEIGHT.
\#
.MAC DCL END
-. vpt 0
+. if \\n[.vpt]=1 \{\
+. vpt 0
+. nr #RESTORE_TRAP 1
+. \}
. ie !\\n[#NO_ADVANCE]=1 \{ .br \}
. el \{\
. sp -1v
@@ -3232,7 +3269,10 @@ to a macro means that any argument turns the feature off.
. nr #WEIGHT_ADJ \\n[#SAVED_WEIGHT_ADJ]
. rr #SAVED_WEIGHT
. rr #SAVED_WEIGHT_ADJ
-. vpt 1
+. if \\n[#RESTORE_TRAP]=1 \{\
+. vpt 1
+. rr #RESTORE_TRAP
+. \}
.END
\#
\#
@@ -5076,7 +5116,7 @@ y\\R'#DESCENDER \\n[.cdp]'
\# the macro whose style is to be changed.
\#
.MAC _FAMILY END
-. if '\\$0'AUTHOR_FAMILY' .ds $AUTHOR_FAM \\$1
+. if '\\$0'AUTHOR_FAMILY'
. if '\\$0'BIBLIOGRAPHY_FAMILY' .ds $BIB_FAM \\$1
. if '\\$0'BIBLIOGRAPHY_STRING_FAMILY' .ds $BIB_STRING_FAM \\$1
. if '\\$0'BLOCKQUOTE_FAMILY' .ds $BQUOTE_FAM \\$1
@@ -5856,7 +5896,8 @@ y\\R'#DESCENDER \\n[.cdp]'
. if '\\*[$EPI_OFFSET_VALUE]'' \{ .EPIGRAPH_INDENT 3 \}
. \}
.\" +Linebreaks
-. if !d$LINEBREAK_CHAR \{ .LINEBREAK_CHAR * 3 3p \}
+. if !d$LINEBREAK_CHAR \{ .LINEBREAK_CHAR * 3 3p \}
+. if !d$LINEBREAK_COLOR \{ .LINEBREAK_COLOR black \}
.\" +Footnotes
. if !r#FN_RULE_LENGTH \{ .FOOTNOTE_RULE_LENGTH 4P \}
. if !r#FN_RULE_ADJ \{ .FOOTNOTE_RULE_ADJ 3p \}
@@ -6086,7 +6127,6 @@ y\\R'#DESCENDER \\n[.cdp]'
. \}
. if \\n[#COVER]=1 \{\
. ie !'\\*[$AUTHOR_COVER_1]'' \{\
-.ab \\*[$AUTHOR_COVER_1] \\*[$AUTHOR_COVER_2]
. nr #AUTHORS \\n[#AUTHOR_COVER_NUM]
. nr #NEXT_AUTHOR 0 1
. while \\n[#AUTHORS]>\\n[#NEXT_AUTHOR] \{\
@@ -8973,6 +9013,7 @@ y\\R'#DESCENDER \\n[.cdp]'
. \}
. \}
. if '\\$0'HEADER_RULE' \{\
+. nr #HEADERS_ON 1
. ie '\\$1'' \{\
. nr #HEADER_RULE 1
. nr #HDRFTR_RULE 1
@@ -8983,6 +9024,7 @@ y\\R'#DESCENDER \\n[.cdp]'
. \}
. \}
. if '\\$0'FOOTER_RULE' \{\
+. nr #FOOTERS_ON 1
. ie '\\$1'' \{\
. nr #FOOTER_RULE 1
. nr #HDRFTR_RULE 1
@@ -10331,6 +10373,11 @@ y\\R'#DESCENDER \\n[.cdp]'
\#
.MAC HEAD END
. br
+. if \\n[#PRINT_STYLE]=1 \{ .ne \\n[#NUM_ARGS]+2 \}
+. if \\n[#PRINT_STYLE]=2 \{\
+. ie \\n[#HEAD_SPACE] \{ .ne \\n[#NUM_ARGS]+3 \}
+. el \{ .ne \\n[#NUM_ARGS]+2 \}
+. \}
.\" Collect head for TOC.
. nr #ARG_NUM 0 1
. nr #TOC_ENTRY_PN \\n%+\\n[#PAGE_NUM_ADJ]
@@ -10400,11 +10447,6 @@ y\\R'#DESCENDER \\n[.cdp]'
.\" Process head
. nr #HEAD 1
. ev HEAD
-. if \\n[#PRINT_STYLE]=1 \{ .ne \\n[#NUM_ARGS]+2 \}
-. if \\n[#PRINT_STYLE]=2 \{\
-. ie \\n[#HEAD_SPACE] \{ .ne \\n[#NUM_ARGS]+3 \}
-. el \{ .ne \\n[#NUM_ARGS]+2 \}
-. \}
. ll \\n[#L_LENGTH]u
. ta \\n(.lu
. if \\n[#COLUMNS] \{\
@@ -10563,6 +10605,7 @@ y\\R'#DESCENDER \\n[.cdp]'
\#
.MAC SUBHEAD END
. br
+. ne \\n[#NUM_ARGS]+2
.\" Collect subhead for TOC.
. nr #ARG_NUM 0 1
. nr #TOC_ENTRY_PN \\n%+\\n[#PAGE_NUM_ADJ]
@@ -10633,7 +10676,6 @@ y\\R'#DESCENDER \\n[.cdp]'
. if r#QUOTE \{ .rr #QUOTE \}
. if r#Q_AT_TOP \{ .rr #Q_AT_TOP \}
. ev SUBHEAD
-. ne \\n[#NUM_ARGS]+2
. ll \\n[#L_LENGTH]u
. ta \\n(.lu
. if \\n[#COLUMNS] \{\
@@ -15886,8 +15928,7 @@ E\\R'#CAP_HEIGHT \\n[.cht]'
\#
.MAC SHIFT_LIST END
. nr #SHIFT_LIST\\n[#DEPTH] (\\$1)
-. nr #LIST_INDENT\\n[#DEPTH] \\n[#L_INDENT]+\\n[#SHIFT_LIST\\n[#DEPTH]]
-. nr #L_INDENT \\n[#LIST_INDENT\\n[#DEPTH]]
+. nr #L_INDENT +\\n[#SHIFT_LIST\\n[#DEPTH]]
.END
\#
\#
@@ -16005,8 +16046,8 @@ E\\R'#CAP_HEIGHT \\n[.cht]'
. nr #QUIT 1
. return
. \}
-. nr #L_INDENT \\n[#LIST_INDENT\\n-[#DEPTH]]
-. nr #HL_INDENT \\n[#HL_INDENT\\n[#DEPTH]]
+. nr #L_INDENT -\\n[#LIST_INDENT\\n[#DEPTH]]+\\n[#SHIFT_LIST\\n[#DEPTH]]
+. nr #HL_INDENT \\n[#HL_INDENT\\n-[#DEPTH]]
.END
\#
\# ====================================================================