[Groff-commit] groff/contrib/mom BUGS om.tmac momdoc/reserved....

[Peter Schaffter]

CVSROOT:        /sources/groff
Module name:    groff
Changes by:     Peter Schaffter <PTPi>  09/08/01 19:27:32

Modified files:
        contrib/mom    : BUGS om.tmac 
        contrib/mom/momdoc: reserved.html 

Log message:
        Fixed .ILX when called within .ITEM.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/BUGS?cvsroot=groff&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/om.tmac?cvsroot=groff&r1=1.54&r2=1.55
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/momdoc/reserved.html?cvsroot=groff&r1=1.36&r2=1.37

Patches:
Index: BUGS
===================================================================
RCS file: /sources/groff/groff/contrib/mom/BUGS,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- BUGS        15 Jun 2009 03:01:23 -0000      1.42
+++ BUGS        1 Aug 2009 19:27:31 -0000       1.43
@@ -21,6 +21,12 @@
 --Peter Schaffter
 
 ========================================================================
+Version 1.5-d
+=============
+
+ILX not quitting left indents set within ITEM.
+---Fixed----
+
 Version 1.5-c
 =============
 

Index: om.tmac
===================================================================
RCS file: /sources/groff/groff/contrib/mom/om.tmac,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- om.tmac     10 Jul 2009 00:20:39 -0000      1.54
+++ om.tmac     1 Aug 2009 19:27:32 -0000       1.55
@@ -3665,6 +3665,7 @@
 .       in \\n[#L_INDENT]u
 .       ta \\n(.lu-\\n[#L_INDENT]u
 .    \}
+.    if \\n[#IN_ITEM] .nr #IN_ITEM_L_INDENT +(\\$1)
 .END
 \#
 \#
@@ -3774,9 +3775,12 @@
 \# +++INDENTS OFF+++
 \#
 .MAC ILX END
+.    ie \\n[#IN_ITEM] \{ .nr #L_INDENT -\\n[#IN_ITEM_L_INDENT] \}
+.    el \{\
 .    br
 .    in 0
 .    rr #INDENT_LEFT_ACTIVE
+.    \}
 .    if '\\$1'CLEAR' \{\
 .       rr #L_INDENT
 .       rr #INDENT_STYLE_LEFT
@@ -5602,7 +5606,7 @@
 .    if !r#FOOTER_MARGIN     \{ .FOOTER_MARGIN 3P \}
 .    if !r#FOOTER_GAP        \{ .FOOTER_GAP    3P \}
 .    if !r#B_MARGIN          \{ .B_MARGIN 
\\n[#FOOTER_MARGIN]u+\\n[#FOOTER_GAP]u \}
-.    if (\\n[#FOOTER_MARGIN]+\\n(.v)>\\n[#B_MARGIN] \{\
+.    if (\\n[#FOOTER_MARGIN]+\\n[.v]>=\\n[#B_MARGIN] \{\
 .       tm1 "[mom]: Your chosen bottom margin for running text is too close to 
the footer margin.
 .       tm1 "       No footers or bottom-of-page page numbers will be printed.
 .       tm1 "       Please reset B_MARGIN or FOOTER_MARGIN to allow enough 
space.
@@ -15706,7 +15710,9 @@
 .       nr #KERN_WAS_ON 1
 .       KERN OFF
 .    \}
+.    rr #IN_ITEM
 .    IL
+.    nr #IN_ITEM 1
 .    ll \\n[#CURRENT_L_LENGTH]u \" Set ll again because IL turns IB off.
 .    TRAP OFF
 .    HI \\n[#HL_INDENT\\n[#DEPTH]]u
@@ -16115,6 +16121,8 @@
 .   rr #RESTORE_PREV_INDENT
 .   rr #ORIG_L_LENGTH
 .   rr #CURRENT_L_LENGTH
+.   rr #IN_ITEM
+.   rr #IN_ITEM_L_INDENT
 .END
 \#
 \#

Index: momdoc/reserved.html
===================================================================
RCS file: /sources/groff/groff/contrib/mom/momdoc/reserved.html,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- momdoc/reserved.html        7 Jul 2009 03:00:15 -0000       1.36
+++ momdoc/reserved.html        1 Aug 2009 19:27:32 -0000       1.37
@@ -264,6 +264,8 @@
                         (boolean)
 #HYPHEN_ADJ             Amount by which to raise hyphens surrounding page 
numbers
 #HYPHENATE              Hyphenation on? (boolean)
+#IN_ITEM                Are we in a list item? (boolean)
+#IN_ITEM_L_INDENT       Value passed to IL if #IN_ITEM=1
 #IN_TAB                 Are we in a tab? (boolean)
                         Set in macro TAB; used in ST to determine
                         whether to add #ST_OFFSET to #ST&lt;n&gt;_OFFSET