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

[Peter Schaffter]

CVSROOT:        /sources/groff
Module name:    groff
Changes by:     Peter Schaffter <PTPi>  13/08/24 22:28:00

Modified files:
        contrib/mom    : BUGS ChangeLog om.tmac 
        contrib/mom/momdoc: refer.html toc.html 

Log message:
        Fixed tbl bug (overprinting 1st two lines when tables span pages).
        Fixed AUTOLEAD to retain its value after START.
        Fixed PDF_IMAGE and .IL/.IR/.IB placement bug.
        Restored reserved.html to toc.html of docs.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/BUGS?cvsroot=groff&r1=1.54&r2=1.55
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/ChangeLog?cvsroot=groff&r1=1.81&r2=1.82
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/om.tmac?cvsroot=groff&r1=1.73&r2=1.74
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/momdoc/refer.html?cvsroot=groff&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/momdoc/toc.html?cvsroot=groff&r1=1.44&r2=1.45

Patches:
Index: BUGS
===================================================================
RCS file: /sources/groff/groff/contrib/mom/BUGS,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- BUGS        7 Jun 2013 15:19:57 -0000       1.54
+++ BUGS        24 Aug 2013 22:27:59 -0000      1.55
@@ -22,6 +22,19 @@
 
 ====================================================================
 
+Version 2.0-a_1
+===============
+
+Tables that span pages overprinting first two lines of table on new
+pages.
+---Fixed---
+
+PDF_IMAGE not respecting .IL, .IR, or .IB.
+---Fixed---
+
+AUTOLEAD not sticking after .START.
+---Fixed---
+
 Version 2.0-a
 =============
 

Index: ChangeLog
===================================================================
RCS file: /sources/groff/groff/contrib/mom/ChangeLog,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -b -r1.81 -r1.82
--- ChangeLog   20 Aug 2013 08:22:09 -0000      1.81
+++ ChangeLog   24 Aug 2013 22:27:59 -0000      1.82
@@ -1,3 +1,7 @@
+* Sat Aug 24 2013
+
+o Restored reserved.html to toc.html in docs.
+
 * Tue Aug 20 2013
 
 o Integrate mom.7 into the man-page groff_mom.7

Index: om.tmac
===================================================================
RCS file: /sources/groff/groff/contrib/mom/om.tmac,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- om.tmac     12 Aug 2013 04:40:11 -0000      1.73
+++ om.tmac     24 Aug 2013 22:27:59 -0000      1.74
@@ -5840,6 +5840,10 @@
 .    \}
 .\" This diversion is to get a value for #FN_AUTOLEAD
 .    di NULL
+.       if \\n[#AUTO_LEAD] \{\
+.          nr #RESTORE_AUTO_LEAD 1
+.          nr #SAVED_AUTOLEAD_VALUE \\n[#AUTOLEAD_VALUE]
+.       \}
 .       ev NULL
 .       if \\n[#PRINT_STYLE]=1 \{\
 .          ps \\*[$TYPEWRITER_PS]
@@ -5854,6 +5858,10 @@
 .       if \\n[#PRINT_STYLE]=2 .LS \\n[#DOC_LEAD]u
 .       ev
 .    di
+.    if \\n[#RESTORE_AUTO_LEAD] \{\
+.       nr #AUTO_LEAD 1
+.       nr #AUTOLEAD_VALUE  \\n[#SAVED_AUTOLEAD_VALUE]
+.    \}
 .    ie !\\n[#COLLATE] \{\
 .\" DOC_LEAD adjusted (or not) here
 .       TRAPS
@@ -7279,7 +7287,12 @@
 .       nr #PP 0
 .    \}
 .    el \{\
+.       if \\n[#AUTO_LEAD] .nr #RESTORE_AUTO_LEAD 1
 .       if \\n[#PRINT_STYLE]=2 .LS \\n[#DOC_LEAD]u\\*[$DOCHEADER_LEAD_ADJ]
+.       if \\n[#RESTORE_AUTO_LEAD] \{\
+.          nr #AUTO_LEAD 1
+.          nr #AUTOLEAD_VALUE  \\n[#SAVED_AUTOLEAD_VALUE]
+.       \}
 .       nr #DOCHEADER_LEAD \\n[#LEAD]
 .\" Default doctype
 .       if \\n[#DOC_TYPE]=1 \{\
@@ -7464,7 +7477,9 @@
 .          \}
 .       \}
 .    \}
+.    if \\n[#AUTO_LEAD] .nr #RESTORE_AUTO_LEAD 1
 .    LS \\n[#DOC_LEAD]u
+.    if \\n[#RESTORE_AUTO_LEAD] .nr #AUTO_LEAD 1
 .    if \\n[#ADJ_DOC_LEAD]=1 \{\
 .       ie !r#ADVANCE_FROM_TOP \{\
 .          if \\n[#DOC_HEADER]=1 .SHIM
@@ -9372,6 +9387,10 @@
 .       rm float-adj:top
 .       rm float-adj:bottom
 .    \}
+.    if \\n[#TABLE] \{\
+.       rs
+.       sp
+.    \}
 .END
 \#
 \# ====================================================================
@@ -15795,6 +15814,7 @@
 \# Boxed tables don't play nice with vertical spacing.
 \# Compensation is applied in FLOAT.
 .MAC TS END
+.    nr #TABLE 1
 .    if '\\n[.z]'FLOAT*DIV' \{\
 .       if '\\$1'BOXED' \{\
 .          if !\\n[.d] .nr boxed-table 1
@@ -15804,6 +15824,7 @@
 .
 .MAC TE END
 .    if '\\n[.z]'FLOAT*DIV' .nr bx-tbl-depth \\n[.d]
+.    rr #TABLE
 .END
 \#
 \# FLOAT
@@ -18386,16 +18407,12 @@
 .    substring pos:tmp 0 0
 .    ie !'\\*[pos:tmp]'-' .ds pdf-img:pos -C
 .    el \{\
-.       ie '\\$1'-I' \{\
-.          shift
-.          ds pdf-img:ind \\$1
-.          ds pdf-img:pos -L
-.          shift
-.       \}
-.       el \{\
 .          ds pdf-img:pos \\$1
 .          shift
 .       \}
+.    if '\\*[pdf-img:pos]'-I' \{\
+.       nr pdf-img:ind \\$1
+.       shift
 .    \}
 .    ds pdf-img:file \\$1
 .    ds address@hidden \\$1
@@ -18440,10 +18457,20 @@
 .       ds pdf-img:adj    0
 .       ds pdf-img:bottom +
 .    \}
+.    if '\\*[pdf-img:pos]'-C' \{\
+.       nr pdf-img:ind (\\n[.ll]-\\n[pdf-img:width])/2
+.       if \\n[.in] .nr pdf-img:ind -(\\n[.in]/2)
+.    \}
+.    if '\\*[pdf-img:pos]'-R' \{\
+.       nr pdf-img:ind \\n[.ll]-\\n[pdf-img:width]
+.       if \\n[.in] .nr pdf-img:ind -\\n[.in]
+.    \}
 .    di PDF*IMAGE
 .    nf
-.    if d pdf-img:ind .ti \\*[pdf-img:ind]
-.    nop \X'pdf: pdfpic \\*[pdf-img:file] \\*[pdf-img:pos] \\n[pdf-img:width]z 
\\n[pdf-img:depth]z \\n[.ll]z'
+.    in 0
+.    if r pdf-img:ind .ti \\n[pdf-img:ind]u
+.    nop \X'pdf: pdfpic \\*[pdf-img:file] -L \\n[pdf-img:width]z 
\\n[pdf-img:depth]z'
+.    in
 .    di
 .    nr dn +\\n[pdf-img:depth]-1v
 .    nr pdf-img 1

Index: momdoc/refer.html
===================================================================
RCS file: /sources/groff/groff/contrib/mom/momdoc/refer.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- momdoc/refer.html   12 Aug 2013 04:40:11 -0000      1.17
+++ momdoc/refer.html   24 Aug 2013 22:27:59 -0000      1.18
@@ -656,7 +656,7 @@
   .], \fIChronicles\fP 168)
   A new sentence...
 </span>
-will produce &#8220;<span style="font-family: times; font-size: 105%; 
font-weight: bold">&#8220;...aluminum roaches and iron crickets.&#8221; 
(Bradbury, <i>Chronicles</i> 168) A new sentence...&#8221;</span>&#8221;.
+will produce &#8220;<span style="font-family: times; font-size: 105%; 
font-weight: bold">&#8220;...aluminum roaches and iron crickets.&#8221; 
(Bradbury, <i>Chronicles</i> 168) A new sentence...</span>&#8221;.
 </p>
 
 <div class="examples-container" style="margin-top: 1.5em; margin-bottom: 
1.5em;">

Index: momdoc/toc.html
===================================================================
RCS file: /sources/groff/groff/contrib/mom/momdoc/toc.html,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- momdoc/toc.html     12 Aug 2013 04:55:42 -0000      1.44
+++ momdoc/toc.html     24 Aug 2013 22:27:59 -0000      1.45
@@ -403,12 +403,13 @@
       <h3 id="quick" class="toc highlight"><a style="color: #6e70cc" 
href="macrolist.html#top">6. QUICK REFERENCE GUIDE</a></h3>
       <h3 id="appendices" class="toc" style="margin-top: .5em;"><a 
style="color: #6e70cc" href="appendices.html#top">7. APPENDICES</a></h3>
       <ul class="toc">
-      <li><a href="appendices.html#fonts">7.2 Adding fonts to groff</a>
+      <li><a href="appendices.html#fonts">7.1 Adding fonts to groff</a>
         <ul>
-          <li><a href="appendices.html#steps">7.2.1 Step-by-step 
instructions</a></li>
+          <li><a href="appendices.html#steps">7.1.1 Step-by-step 
instructions</a></li>
       </ul></li>
-      <li><a href="appendices.html#codenotes">7.3 Some reflections on 
mom</a></li>
-      <li><a href="appendices.html#contact">7.5 Contact the author</a></li>
+      <li><a href="appendices.html#codenotes">7.2 Some reflections on 
mom</a></li>
+      <li><a href="reserved.html">7.3 List of reserved words (macros, 
registers, strings)</a></li>
+      <li><a href="appendices.html#contact">7.4 Contact the author</a></li>
     </ul>
   </div>