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

[Peter Schaffter]

CVSROOT:        /sources/groff
Module name:    groff
Changes by:     Peter Schaffter <PTPi>  13/09/13 20:06:37

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

Log message:
        Fixed QUOTE_INDENT when inside FLOAT.
        Fixed broke SMARTQUOTES OFF.
        Fixed DOCHEADER_LEAD so it's not reset to default after first
        chapter.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/BUGS?cvsroot=groff&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/om.tmac?cvsroot=groff&r1=1.76&r2=1.77
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/momdoc/docprocessing.html?cvsroot=groff&r1=1.43&r2=1.44

Patches:
Index: BUGS
===================================================================
RCS file: /sources/groff/groff/contrib/mom/BUGS,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- BUGS        13 Sep 2013 06:38:30 -0000      1.56
+++ BUGS        13 Sep 2013 20:06:36 -0000      1.57
@@ -25,6 +25,15 @@
 Version 2.0-a_1
 ===============
 
+QUOTE_INDENT not being respected in FLOAT.
+---Fixed---
+
+SMARTQUOTES OFF broken.
+---Fixed---
+
+DOCHEADER_LEAD being reset to default after first chapter.
+---Fixed---
+
 Forced floats that fit on the page causing floats on the next page
 to be treated as forced.
 ---Fixed---

Index: om.tmac
===================================================================
RCS file: /sources/groff/groff/contrib/mom/om.tmac,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -b -r1.76 -r1.77
--- om.tmac     13 Sep 2013 06:38:30 -0000      1.76
+++ om.tmac     13 Sep 2013 20:06:36 -0000      1.77
@@ -1254,89 +1254,96 @@
 .    \}
 .    ie '\\$1'' \{\
 .       nr #OPEN_CLOSE 0
-.       ds $QUOTE0 \\[lq]
-.       ds $QUOTE1 \\[rq]
+.       ds $QUOTE0 \[lq]
+.       ds $QUOTE1 \[rq]
 .       ds $RESTORE_SQ \\$1
 .    \}
 .    el \{\
 .       if '\\$1',,' \{\
 .          nr #ARGS_TO_SQ 1
-.          ds $QUOTE0 \\[Bq]
-.          ds $QUOTE1 \\[lq]
+.          ds $QUOTE0 \[Bq]
+.          ds $QUOTE1 \[lq]
 .          ds $RESTORE_SQ \\$1
 .       \}
 .       if '\\$1'<<' \{\
 .          nr #ARGS_TO_SQ 1
-.          ds $QUOTE0 \\[Fo]
-.          ds $QUOTE1 \\[Fc]
+.          ds $QUOTE0 \[Fo]
+.          ds $QUOTE1 \[Fc]
 .          ds $RESTORE_SQ \\$1
 .       \}
 .       if '\\$1'>>' \{\
 .          nr #ARGS_TO_SQ 1
-.          ds $QUOTE0 \\[Fc]
-.          ds $QUOTE1 \\[Fo]
+.          ds $QUOTE0 \[Fc]
+.          ds $QUOTE1 \[Fo]
 .          ds $RESTORE_SQ \\$1
 .       \}
 .       if '\\$1'DA' \{\
 .          nr #ARGS_TO_SQ 1
-.          ds $QUOTE0 \\[Fc]
-.          ds $QUOTE1 \\[Fo]
+.          ds $QUOTE0 \[Fc]
+.          ds $QUOTE1 \[Fo]
 .          ds $RESTORE_SQ \\$1
 .       \}
 .       if '\\$1'DE' \{\
 .          nr #ARGS_TO_SQ 1
-.          ds $QUOTE0 \\[Bq]
-.          ds $QUOTE1 \\[lq]
+.          ds $QUOTE0 \[Bq]
+.          ds $QUOTE1 \[lq]
 .          ds $RESTORE_SQ \\$1
 .       \}
 .       if '\\$1'ES' \{\
 .          nr #ARGS_TO_SQ 1
-.          ds $QUOTE0 \\[lq]
-.          ds $QUOTE1 \\[rq]
+.          ds $QUOTE0 \[lq]
+.          ds $QUOTE1 \[rq]
 .          ds $RESTORE_SQ \\$1
 .       \}
 .       if '\\$1'FR' \{\
 .          nr #ARGS_TO_SQ 1
-.          ds $QUOTE0 \\[Fo]\\|
-.          ds $QUOTE1 \\|\\[Fc]
+.          ds $QUOTE0 \[Fo]\|
+.          ds $QUOTE1 \|\[Fc]
 .          ds $RESTORE_SQ \\$1
 .       \}
 .       if '\\$1'IT' \{\
 .          nr #ARGS_TO_SQ 1
-.          ds $QUOTE0 \\[Fo]\\|
-.          ds $QUOTE1 \\|\\[Fc]
+.          ds $QUOTE0 \[Fo]\|
+.          ds $QUOTE1 \|\[Fc]
 .          ds $RESTORE_SQ \\$1
 .       \}
 .       if '\\$1'NL' \{\
 .          nr #ARGS_TO_SQ 1
-.          ds $QUOTE0 \\[rq]
-.          ds $QUOTE1 \\[rq]
+.          ds $QUOTE0 \[rq]
+.          ds $QUOTE1 \[rq]
 .          ds $RESTORE_SQ \\$1
 .       \}
 .       if '\\$1'NO' \{\
 .          nr #ARGS_TO_SQ 1
-.          ds $QUOTE0 \\[Fo]
-.          ds $QUOTE1 \\[Fc]
+.          ds $QUOTE0 \[Fo]
+.          ds $QUOTE1 \[Fc]
 .          ds $RESTORE_SQ \\$1
 .       \}
 .       if '\\$1'PT' \{\
 .          nr #ARGS_TO_SQ 1
-.          ds $QUOTE0 \\[Fo]
-.          ds $QUOTE1 \\[Fc]
+.          ds $QUOTE0 \[Fo]
+.          ds $QUOTE1 \[Fc]
 .          ds $RESTORE_SQ \\$1
 .       \}
 .       if '\\$1'SV' \{\
 .          nr #ARGS_TO_SQ 1
-.          ds $QUOTE0 \\[Fc]
-.          ds $QUOTE1 \\[Fc]
+.          ds $QUOTE0 \[Fc]
+.          ds $QUOTE1 \[Fc]
 .          ds $RESTORE_SQ \\$1
 .       \}
 .    \}
 .    if !r#ARGS_TO_SQ \{\
-.       ds $QUOTE0 \\[lq]
-.       ds $QUOTE1 \\[rq]
+.       ie !'\\$1'' \{\
+.\" Turn smartquotes off
+.          ds $QUOTE0 \[dq]
+.          ds $QUOTE1 \[dq]
+.       \}
+.       el \{\
+.          ds $QUOTE0 \[lq]
+.          ds $QUOTE1 \[rq]
 .       nr #RESTORE_SQ 1
 .    \}
+.    \}
 .END
 \#
 .ds $QUOTE0 \[lq]
@@ -7505,7 +7512,6 @@
 .    nr #START 1
 .    if \\n[#DOC_HEADER]=1 .nr #DOC_HEADER 2
 .    rm $TOC_TITLE_ITEM
-.    rm $DOCHEADER_LEAD_ADJ
 .    rr #MISC_NUM
 .    rr #MISCS
 .    rr #NEXT_AUTHOR
@@ -11016,6 +11022,7 @@
 \#
 .MAC QUOTE END
 .    br
+.    if \\n[#PP]>0 .rr #START
 .    if \\n[#LINENUMBERS]=1 \{\
 .       nr #LINENUMBERS 2
 .       nr #NEXT_LN \\n[ln]
@@ -11454,7 +11461,10 @@
 \\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] \{\
+.       po \\n[#Q_OFFSET]u
+.       if '\\n[.z]'FLOAT*DIV' \!.po \\n[#Q_OFFSET]u
+.    \}
 .    if \\n[#ENDNOTE] \{\
 .       ie \\n[#Q_OFFSET_VALUE] .in +\\n[#EN_PP_INDENT]u*\\n[#Q_OFFSET_VALUE]u
 .       el .in +\\*[$Q_OFFSET_VALUE]
@@ -11547,7 +11557,10 @@
 .    rr #LINEBREAK
 .    nr #PP_STYLE  1
 .    nr #END_QUOTE 1
-.    if !\\n[#ENDNOTE] .po \\n[#L_MARGIN]u
+.    if !\\n[#ENDNOTE] \{\
+.       po \\n[#L_MARGIN]u
+.       if '\\n[.z]'FLOAT*DIV' \!.po \\n[#L_MARGIN]u
+.    \}
 .    if \\n[#ENDNOTE]  .in \\n[#EN_TEXT_INDENT]u
 .    if \\n[#COLUMNS] \{\
 .       if !\\n[#ENDNOTE] \{\
@@ -15566,6 +15579,7 @@
 .       if \\n[TOC_BH]=2 .pdfswitchtopage after MOM:TOC
 .    \}
 '    NEWPAGE
+.    if '\\n[.ev]'PAGE_TRANSITION' .ev
 .    if \\n[#DEFER_PAGINATION] .PAGINATE
 .    if !'\\*[$RESTORE_PAGENUM_STYLE]'' \{\
 .       PAGENUM_STYLE \\*[$RESTORE_PAGENUM_STYLE]

Index: momdoc/docprocessing.html
===================================================================
RCS file: /sources/groff/groff/contrib/mom/momdoc/docprocessing.html,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- momdoc/docprocessing.html   1 Feb 2013 08:12:27 -0000       1.43
+++ momdoc/docprocessing.html   13 Sep 2013 20:06:36 -0000      1.44
@@ -2563,8 +2563,10 @@
 you don&#8217;t like the way mom does things) and use
 <kbd>.DOCHEADER&nbsp;OFF</kbd> with its optional distance
 argument to ensure that the body of your document starts where
-you want.  You can even insert a PostScript image file (see <a
-href="docelement.html#pspic">PSPIC)</a>.
+you want.  You can even insert a PDF or PostScript image file (see
+<a href="images.html#pspic">PSPIC</a>).
+and
+<a href="images.html#pdf-image">PDF_IMAGE</a>).
 </p>
 </div>