[groff] 01/01: [mom]: doc updates for version 2.6_d

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit bc124d708af0a8492f0a501d32b8377fe03b9e2c
Author: Peter Schaffter 
AuthorDate: Sun Sep 1 17:06:54 2024 -0400

[mom]: doc updates for version 2.6_d
---
 contrib/mom/momdoc/images.html| 221 --
 contrib/mom/momdoc/macrolist.html |  17 ++-
 contrib/mom/momdoc/refer.html |   2 +-
 contrib/mom/momdoc/toc.html   |   4 +-
 4 files changed, 107 insertions(+), 137 deletions(-)

diff --git a/contrib/mom/momdoc/images.html b/contrib/mom/momdoc/images.html
index de1bbc206..dfb230c6b 100644
--- a/contrib/mom/momdoc/images.html
+++ b/contrib/mom/momdoc/images.html
@@ -44,11 +44,6 @@ FDL in the main directory of the groff source package.
 
   Inserting images and graphics
   
-Image conversion and file processing
-
-  PDF
-  EPS
-
 The PDF_IMAGE macro
 
   PDF_IMAGE_FRAME—set parameters 
for image frames
@@ -125,42 +120,25 @@ FDL in the main directory of the groff source package.
 Inserting images and graphics
 
 
-In order to include images in mom documents, the images must be in
-either PDF (.pdf) or EPS (.eps) format.  Each format requires its own
-macro, but both take the same arguments, and in the same order.
-
-
-
-Please note that there are differences in the way the files
-containing PDF and EPS images must be processed, hence documents may
-not contain a mix.
-
-
-Image conversion and file processing
-
-
-When your image files are not in PDF or EPS format—jpgs,
-for example—you must convert them before including them in
-a mom document.  Any utility for converting images may used.  The
-ImageMagick suite of programmes, present on most GNU/Linux
-systems, contains convert, which is simple and effective.
-
-
-PDF
-
-
-Assuming a jpg image, conversion to PDF is done like this:
+Mom's macro for embedding images in PDF files, PDF_IMAGE, accepts
+all common image formats except EPS (.eps), which requires
+conversion to something else (pdf, jpg, png...) for use in PDF
+documents.  Use the convert utility from the imagemagick
+suite of tools:
 
 
-  convert <image>.jpg <image>.pdf
+  convert <image>.eps <image>.pdf
 
-Any image type supported by convert may be converted this
-way.
+If the output is to PostScript, no conversion is necessary and the
+PSPIC
+macro must be used rather than PDF_IMAGE.
 
 
+Image conversion and file processing
+
 
-Mom files containing PDF images must be processed using
-groff’s pdf driver.  Use of
+Mom files containing images in any format other than eps must be
+processed using groff’s pdf driver.  Use of
 pdfmom
 is strongly recommended, which natively invokes the pdf driver.
 
@@ -169,31 +147,6 @@ is strongly recommended, which natively invokes the pdf 
driver.
 
 
 
-EPS
-
-
-Assuming a jpg image, conversion to EPS is done like this:
-
-
-  convert <image>.jpg <image>.eps
-
-Any image type supported by convert may be converted this
-way.  There have been reports of trouble with PostScript level 2
-images, so don’t save your images in this format.
-
-
-
-Mom files containing EPS images must be processed using
-groff’s postscript driver.  Use of
-pdfmom,
-which can be told to use the postscript driver, is strongly
-recommended.
-
-
-  pdfmom -Tps doc.mom > doc.pdf
-
-
-
 
 
 
@@ -205,7 +158,7 @@ Macro: PDF_IMAGE \
 
 [ -L | -C | -R | -I <indent> ] \
 
-<pdf image file> <width> <height> [ SCALE <factor> ] \
+<image file> [ <width> <height> ] [ SCALE <factor> ] \
 
 [ ADJUST +|-<vertical adjustment> ] [ NO_SHIM ] [ NO_FLEX ] \
 
@@ -228,30 +181,27 @@ require a
 
 
 
-
+
 Note:
-Mom files with embedded PDF images must be processed with
-pdfmom doc.mom > doc.pdf.  Arguments may be broken
-into several lines using the “line-continued” backslash
-(\), as shown above.
+Originally created for embedding pdf images—hence the
+name—PDF_IMAGE accepts image files of any type: pdf,
+jpg, jp2, png, pam, gif, tiff...  If output is to PostScript,
+image files must be converted to Encapsulated PostScript (eps) and
+embedded using
+PSPIC.
+
+Dependencies:
+For image types other than pdf, imagemagick and perlmagick must be
+installed.
 
 
 
-
-Unlike
-PSPIC,
-which it resembles, PDF_IMAGE requires that the pdf image’s
-dimensions (the bounding box,
-see below)
-be supplied each time it’s called.
-
-
 
 The first optional argument tells mom how to align the image
 horizontally, with -L, -C, and -R
 standing for left, centre and right respectively.  If you need more
 precise placement, the -I argument allows you to give an
-indent from the left margin.  Thus, to indent a PDF image 6
+indent from the left margin.  Thus, to indent an image 6
 picas
 from the left margin
 
@@ -262,29 +212,34 @@ If you omit the first argument, the image will be centred.
 
 
 
-<pdf image> must be in PDF format, with a .pdf
-extension.  If it is not, mom will abort with a 

[groff] 01/01: [mom]: Version 2.6_d

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 7065f9ee51d4378261a3edeaa9f717ad63d7fae9
Author: Peter Schaffter 
AuthorDate: Sun Sep 1 16:50:45 2024 -0400

[mom]: Version 2.6_d

Includes changes that allow gropdf/pdfpic to embed images in
formats other than pdf.
---
 contrib/mom/ChangeLog |  9 ++
 contrib/mom/NEWS  |  5 +++
 contrib/mom/om.tmac   | 88 ---
 3 files changed, 76 insertions(+), 26 deletions(-)

diff --git a/contrib/mom/ChangeLog b/contrib/mom/ChangeLog
index 8233bb696..50108468b 100644
--- a/contrib/mom/ChangeLog
+++ b/contrib/mom/ChangeLog
@@ -1,3 +1,12 @@
+2024-09-01
+
+   * om.tmac: version 2.6_d; incorporates changes to gropdf/pdfpic
+   that permit inclusion of images in formats other than pdf into
+   PDF documents.
+
+   The tarball on mom's download page will remain pinned at
+   2.6_c pending release of groff 1.24.
+
 2024-08-26
 
* om.tmac: Fix first line of columns after first falling one
diff --git a/contrib/mom/NEWS b/contrib/mom/NEWS
index dccf41003..678a0a261 100644
--- a/contrib/mom/NEWS
+++ b/contrib/mom/NEWS
@@ -5,6 +5,11 @@
 are permitted in any medium without royalty provided the copyright
 notice and this notice are preserved.
 
+Release 2.6_d
+-
+Removes need to convert images to PDF or EPS for inclusion in mom
+documents.  Most common image formats are now acceptable.
+
 Release 2.6_c
 -
 Adds LEAD argument to HEADING_STYLE to control leading of multi-line
diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac
index 18be4c510..d2656e155 100644
--- a/contrib/mom/om.tmac
+++ b/contrib/mom/om.tmac
@@ -20,7 +20,7 @@ for more details.
 You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-Version 2.6_c
+Version 2.6_d
 -
 Antoine de St-Exupéry asserted that elegance in engineering is
 achieved not when there is nothing left to add, but when there is
@@ -53,7 +53,7 @@ extensions, and float management).
 .if (\n[.x]\n[.y] < 118) \
 .   ab [mom]: You need GNU troff version 1.18 or higher to run this version of 
mom.
 \# Mom version
-.ds version 2.6_c
+.ds version 2.6_d
 .if dVERSION \{\
 .   ab [mom]: Version \*[version]
 .\}
@@ -545,7 +545,7 @@ end
 .\}
 .END
 \#
-.FALLBACK_FONT CR ABORT
+.if !n .FALLBACK_FONT CR ABORT
 \#
 \# FAMILY
 \# --
@@ -4324,6 +4324,7 @@ y\R'#DESCENDER \\n[.cdp]'
 .  nr #IGNORE_COLUMNS 1
 .  nr #RULE_WEIGHT 500
 .  char \[em] --
+.  char \[en] \~\[mi]\~
 .  tr `'
 .  tr \[lq]"
 .  tr \[rq]"
@@ -4397,12 +4398,14 @@ y\R'#DESCENDER \\n[.cdp]'
 \#
 .MAC TYPEWRITER_FAMILY END
 .ds $TYPEWRITER_FAM \\$1
+.TYPEWRITER
 .END
 \#
 .ALIAS TYPEWRITER_FAM TYPEWRITER_FAMILY
 \#
 .MAC TYPEWRITER_SIZE END
 .ds $TYPEWRITER_PS \\$1
+.TYPEWRITER
 .END
 \#
 .MAC TYPEWRITER END
@@ -23705,23 +23708,27 @@ No room to start \\*[MN-pos] margin note 
#\\n[MN-curr] on page \\n[#P].
 \# -
 \# *Arguments:
 \#   [ -L -| -R | -C | -I  ] \
-\#\
+\#  [   ] \
 \# [ SCALE  ] [ ADJUST +|- ] [ TARGET  
] \
 \# [ NO_SHIM ] [ NO_FLEX ]
 \# *Function:
-\#   Allows embedding of PDF images with the same arguments as PSPIC
-\#   plus SCALE and ADJUST options.
+\#   Embeds images in PDF files.
 \# *Notes:
-\#  are required.
+\#must be in a format known to imagemagick.
+\#   If run in unsafe mode,  and  are not required.
+\#   In safe mode, the dimensions must be given.
 \#
 .MAC PDF_IMAGE END
-.if \\n[#DOCS]=1 \
-.   ie \\n[#PP]=0 .PP
-.   el .br
+.if \\n[.u] .nr #FILLED 1
+.nf
 .if !'\\n[.z]'FLOAT*DIV' \{\
 .   nr pdf-img:float 1
 .   FLOAT
 .\}
+.if \\n[#FILLED] \{\
+.   fi
+.   rr #FILLED
+.\}
 .PDF_TARGET fig:\\n+[lists*target]
 .nr float*img 1
 .ds ev-current \\n[.ev]
@@ -23743,18 +23750,26 @@ No room to start \\*[MN-pos] margin note 
#\\n[MN-curr] on page \\n[#P].
 .   shift
 .\}
 .ds pdf-img:file \\$1
-.ds pdf-img@file \\$1
-.substring pdf-img@file -1 -3
-.if !'\\*[pdf-img@file]'pdf' \{\
-.   tm1 "[mom]: Image file '\\*[pdf-img:file]' at line \\n[.c] not found, 
or not a PDF image.
-.   ab   [mom]: Aborting '\\n[.F]' at \\$0, line \\n[.c].
+.CHECK_IMAGE_FORMAT \\*[pdf-img:file]
+.ie \\n[.U] \{\
+.   ie \B'\\$2' \{\
+.  nr pdf-img:width \\$2
+.  nr pdf-img:depth \\$3
+.  shift 3
+.   \}
+.   el \{\
+.  pdfpic@get-image-dimensions \\*[pdf-img:file]
+.  nr pdf-img:width \\n[pdfpic*width]
+.  nr pdf-img:depth \\n[pdfpic*height]
+.  shift 1
+.   \}
 .\}
-.nr pdf-img:width \\$2
-.nr pdf-img:depth \\$3
-.shift 3
-.nr loop-counter \\n[#

[groff] 01/01: Incorporates Deri James' patch to remove 'can't transparently embed...' messages.

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 00c9aa366f78396480de01ac65b6c84533ce10a9
Author: Peter Schaffter 
AuthorDate: Mon Aug 26 12:26:41 2024 -0400

Incorporates Deri James' patch to remove 'can't transparently embed...' 
messages.

Initializes pdfbx-pre-ll register for #IBR in BoxStart.

Code cleanup.
---
 contrib/mom/BUGS|  4 
 contrib/mom/om.tmac | 39 ---
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/contrib/mom/BUGS b/contrib/mom/BUGS
index f03fe2d7f..649f409ae 100644
--- a/contrib/mom/BUGS
+++ b/contrib/mom/BUGS
@@ -23,6 +23,10 @@ the Subject line or you risk my spam filters nuking your 
message.
 
 Version 2.6_c
 =
+First line of columns after first falling one line lower than column
+top.
+---Fixed---
+
 Prevailing quad not always being restored after exiting lists.
 ---Fixed---
 
diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac
index eb1c10181..18be4c510 100644
--- a/contrib/mom/om.tmac
+++ b/contrib/mom/om.tmac
@@ -2409,11 +2409,11 @@ end
 .   ds COND \
 \R'#PT_SIZE_IN_UNITS \En[.ps]'\
 \R'#CONDENSE 1'\
-\R'#COND_WIDTH (\En[#PT_SIZE_IN_UNITS]u*\E*[$COND_PERCENT]u)/100'\
-\Es[\En[#COND_WIDTH]u]\EH'\En[#PT_SIZE_IN_UNITS]u'
+\R'#COND_WIDTH (\En[#PT_SIZE_IN_UNITS]*\E*[$COND_PERCENT])/100'\
+\s[\En[#COND_WIDTH]u]\H'\En[#PT_SIZE_IN_UNITS]u'
 .   ds COND_FOR_SUP \
-\R'#COND_WIDTH (\En[#SUP_PT_SIZE]u*\E*[$COND_PERCENT]u)/100'\
-\Es[\En[#COND_WIDTH]u]\H'\En[#SUP_PT_SIZE]u'
+\R'#COND_WIDTH (\En[#SUP_PT_SIZE]*\E*[$COND_PERCENT])/100'\
+\s[\En[#COND_WIDTH]u]\H'\En[#SUP_PT_SIZE]u'
 .\}
 .if '\\$0'EXTEND' \{\
 .   ds $EXT_PERCENT \\$1
@@ -2424,18 +2424,18 @@ end
 .   ds EXT \
 \R'#PT_SIZE_IN_UNITS \En[.ps]'\
 \R'#EXTEND 1'\
-\R'#EXT_WIDTH (\En[#PT_SIZE_IN_UNITS]u*\E*[$EXT_PERCENT]u)/100'\
-\Es[\En[#EXT_WIDTH]u]\EH'\En[#PT_SIZE_IN_UNITS]u'
+\R'#EXT_WIDTH (\En[#PT_SIZE_IN_UNITS]*\E*[$EXT_PERCENT])/100'\
+\s[\En[#EXT_WIDTH]u]\H'\En[#PT_SIZE_IN_UNITS]u'
 .   ds EXT_FOR_SUP \
-\R'#EXT_WIDTH (\En[#SUP_PT_SIZE]u*\E*[$EXT_PERCENT]u)/100'\
-\Es[\En[#EXT_WIDTH]u]\H'\En[#EXT_PT_SIZE]u'
+\R'#EXT_WIDTH (\En[#SUP_PT_SIZE]*\E*[$EXT_PERCENT])/100'\
+\s[\En[#EXT_WIDTH]u]\H'\En[#EXT_PT_SIZE]u'
 .\}
 .END
 \#
 .ds CONDX \
-\ER'#CONDENSE 0'\Es[0]\R'#PT_SIZE_IN_UNITS \En[.ps]'\H'\En[#PT_SIZE_IN_UNITS]u'
+\R'#CONDENSE 0'\s[0]\R'#PT_SIZE_IN_UNITS \En[.ps]'\H'\En[#PT_SIZE_IN_UNITS]u'
 .ds EXTX  \
-\ER'#EXTEND   0'\Es[0]\R'#PT_SIZE_IN_UNITS \En[.ps]'\H'\En[#PT_SIZE_IN_UNITS]u'
+\R'#EXTEND 0'\s[0]\R'#PT_SIZE_IN_UNITS \En[.ps]'\H'\En[#PT_SIZE_IN_UNITS]u'
 \#
 \# +++PAD LINES+++ (insert space)
 \#
@@ -4910,7 +4910,7 @@ y\R'#DESCENDER \\n[.cdp]'
 .ds $AUTHOR \\*[$AUTHOR_1]
 .substring $AUTHORS 0 -2
 .ds PDF_AUTHORS \\*[$AUTHORS]
-.pdfmomclean PDF_AUTHORS
+.if '\\*[.T]'ps' .pdfmomclean PDF_AUTHORS
 .nop \!x X ps:exec [/Author (\\*[PDF_AUTHORS]) /DOCINFO pdfmark
 .END
 .
@@ -8206,7 +8206,6 @@ $\\*[DOC_]COVERTITLE_\\n+[#\\*[DOC_]COVERTITLE_NUM] 
\\$\\n[#\\*[DOC_]COVERTITLE_
 .   if \\n[#ADVANCE_FROM_TOP]=0 \
 .  if \\n[#DOC_HEADER]=1 \
 . if !\\n[#DOCHEADER_NO_SHIM] .SHIM_1
-.if \\n[#COLUMNS] .mk dc
 .FAMILY \\*[$DOC_FAM]
 .QUAD \\*[$DOC_QUAD]
 .CLEANUP_DEFAULTS
@@ -8258,6 +8257,7 @@ $\\*[DOC_]COVERTITLE_\\n+[#\\*[DOC_]COVERTITLE_NUM] 
\\$\\n[#\\*[DOC_]COVERTITLE_
 .   if !\\n[#ADVANCE_FROM_TOP] .sp -1
 .   pdfpagenumbering \\*[$PDF_PN_FORMAT] . \\n[#PDF_PN]
 .\}
+.if \\n[#COLUMNS] .mk dc
 .END
 \#
 .MAC RR_ADVANCE_FROM_TOP END
@@ -10238,7 +10238,7 @@ Shimming must be disabled with NO_SHIM before using 
FLEX.
 .  ds pdfbx-cap-adj \\*[$CAP_HEIGHT]
 .  ps
 .  sp |\\n[t]u-\\n[#LEAD_AT_FOOTER]u
-.  sp (\\*[wt\\n[stack]]/2)u+\\*[pdfbx-cap-adj]+\\*[gap\\n[stack]]u
+.  sp (\\*[wt\\n[stack]]/2u)+\\*[pdfbx-cap-adj]+\\*[gap\\n[stack]]u
 .  ch FOOTER \\n[#VFP\\n[stack]]u
 .   \}
 .\}
@@ -10604,9 +10604,9 @@ Shimming must be disabled with NO_SHIM before using 
FLEX.
 . if \\n[#BIBLIOGRAPHY] .sp |\\n[bc]u-\\n[#BIB_LEAD]u
 .  \}
 .  el \{\
-.vs \\n[#LEAD_AT_FOOTER]u
-.rt \\n[dc]u
-.nr flex-spaces 0
+. vs \\n[#LEAD_AT_FOOTER]u
+. rt \\n[dc]u
+. nr flex-spaces 0
 .  \}
 .  if d page-\\n%@\\n[#COL_NUM] \{\
 . rr #NO_FLEX
@@ -23532,13 +23532,13 @@ No room to start \\*[MN-pos] margin note 
#\\n[MN-curr] on page \\n[#P].
 .  el .nr LEVEL_REQ \\n[CURRENT_LE

[groff] 01/01: [mom]:[momdoc]: Minuscule html formatting change.

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit a77fbf8fd6d6d4ff05d88f6ede9ac694b116ada1
Author: Peter Schaffter 
AuthorDate: Tue Apr 30 13:09:39 2024 -0400

[mom]:[momdoc]: Minuscule html formatting change.
---
 contrib/mom/momdoc/goodies.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/contrib/mom/momdoc/goodies.html b/contrib/mom/momdoc/goodies.html
index 7c39e1488..26960285d 100644
--- a/contrib/mom/momdoc/goodies.html
+++ b/contrib/mom/momdoc/goodies.html
@@ -1658,7 +1658,6 @@ trust shall never be put out.”
 
 
 
-
 
 
 Play the man, Master Ridley; we

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 02/02: [mom]: Update BUGS

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit d0b1004f60b4242d4ce54c62afce55276bcdba6f
Author: Peter Schaffter 
AuthorDate: Thu Apr 18 14:16:28 2024 -0400

[mom]: Update BUGS
---
 contrib/mom/BUGS | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/contrib/mom/BUGS b/contrib/mom/BUGS
index b5b5063f3..f03fe2d7f 100644
--- a/contrib/mom/BUGS
+++ b/contrib/mom/BUGS
@@ -21,7 +21,7 @@ the Subject line or you risk my spam filters nuking your 
message.
 
 
 
-Version 2.6_d
+Version 2.6_c
 =
 Prevailing quad not always being restored after exiting lists.
 ---Fixed---
@@ -32,7 +32,11 @@ stop).
 
 CAPTION without LABEL when CAPTION_AFTER_LABEL is enabled not
 respecting captioned material's width and quad.
Fixed--
+---Fixed---
+
+ITEM's  argument not being respected at document start and at
+tops of page.
+---Fixed---
 
 Version 2.6_a
 =

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/02: [mom]: Fixes ITEM spacing at document start and top of page.

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit d9b2bd63084a4ba144dc6274460ae8d05a0a527a
Author: Peter Schaffter 
AuthorDate: Thu Apr 18 13:48:48 2024 -0400

[mom]: Fixes ITEM spacing at document start and top of page.
---
 contrib/mom/om.tmac | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac
index c7d20272e..eb1c10181 100644
--- a/contrib/mom/om.tmac
+++ b/contrib/mom/om.tmac
@@ -16629,6 +16629,7 @@ E\\R'#CAP_HEIGHT \\n[.cht]'
 \#   receive the text of an item.
 \#
 .MAC ITEM END
+.if \\n[#START]+\\n[@TOP]>0 .RESTORE_SPACE
 .ie \\n[#NUM_ARGS]=2 .sp \\$2
 .el \
 .   if \B'\\$1' .sp \\$1

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: [mom]: Amend examples/README.txt and README-fr.txt

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit e103a6e61c0a7da21b2b211e6b3254730b85acd4
Author: Peter Schaffter 
AuthorDate: Mon Apr 15 15:24:01 2024 -0400

[mom]: Amend examples/README.txt and README-fr.txt

Instruct use of -K utf8 rather than -k to process example files that
contain accented characters.
---
 contrib/mom/examples/README-fr.txt |  8 
 contrib/mom/examples/README.txt| 12 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/contrib/mom/examples/README-fr.txt 
b/contrib/mom/examples/README-fr.txt
index 5b1b4346c..84a98629d 100644
--- a/contrib/mom/examples/README-fr.txt
+++ b/contrib/mom/examples/README-fr.txt
@@ -22,9 +22,9 @@ avec pdfmom(1).
 pdfmom mom-pdf.mom > mom-pdf.pdf
 pdfmom sample_docs.mom > sample_docs.pdf
 pdfmom slide-demo.mom > slide-demo.pdf
-pdfmom -k letter.mom > letter.pdf
-pdfmom -k mon_premier_doc.mom > mon_premier_doc.pdf
-pdfmom -k typesetting.mom > typesetting.pdf
+pdfmom -K utf8 letter.mom > letter.pdf
+pdfmom -K utf8 mon_premier_doc.mom > mon_premier_doc.pdf
+pdfmom -K utf8 typesetting.mom > typesetting.pdf
 
 Les fichiers
 
@@ -84,7 +84,7 @@ transition sont disponibles pour tous les lecteurs PDF.
 Le fichier mon_premier_doc.mom est un exemple simple en français
 montrant l'utilisation d'éléments de formattage courants: titres de
 section, paragraphes, listes, table des matières et liens PDF
-cliquables. Il doit être généré avec l'option -k du fait de la
+cliquables. Il doit être généré avec l'option -K utf8 du fait de la
 présence de caractères accentués.
 
 Un certain nombre de réglages ont également été changés pour ce
diff --git a/contrib/mom/examples/README.txt b/contrib/mom/examples/README.txt
index 851a9a27a..4e4115702 100644
--- a/contrib/mom/examples/README.txt
+++ b/contrib/mom/examples/README.txt
@@ -21,9 +21,9 @@ files with pdfmom(1).
 pdfmom mom-pdf.mom > mom-pdf.pdf
 pdfmom sample_docs.mom > sample_docs.pdf
 pdfmom slide-demo.mom > slide-demo.pdf
-pdfmom -k letter.mom > letter.pdf
-pdfmom -k mon_premier_doc.mom > mon_premier_doc.pdf
-pdfmom -k typesetting.mom > typesetting.pdf
+pdfmom -K utf8 letter.mom > letter.pdf
+pdfmom -K utf8 mon_premier_doc.mom > mon_premier_doc.pdf
+pdfmom -K utf8 typesetting.mom > typesetting.pdf
 
 The files themselves
 
@@ -77,9 +77,9 @@ all PDF readers.
 ***mon_premier_doc.mom***
 
 The file, mon_premier_doc.mom, is a simple example in French showing
-the use of common elements: section headings, paragraphs, lists, table
-of contents and clickable links.  It should be generated with option -k
-as there are some accented letters.
+the use of common elements: section headings, paragraphs, lists,
+table of contents and clickable links.  It should be generated with
+the option -K utf8 as there are some accented letters.
 
 A few settings were also changed for this French document:
 ATTRIBUTE_STRING is used to replace "by" by "par" in the document

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: [mom]: Minor style tweaks to mom-pdf.mom.

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 66d28337296a7acf082957f41fd991598cd1ff2c
Author: Peter Schaffter 
AuthorDate: Wed Feb 21 16:08:35 2024 -0500

[mom]: Minor style tweaks to mom-pdf.mom.
---
 contrib/mom/examples/mom-pdf.mom | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/contrib/mom/examples/mom-pdf.mom b/contrib/mom/examples/mom-pdf.mom
index 1803571a0..d3411f93b 100644
--- a/contrib/mom/examples/mom-pdf.mom
+++ b/contrib/mom/examples/mom-pdf.mom
@@ -405,7 +405,7 @@ can remove the window title by issuing
 .COD ".PDF_TITLE \[dq]\[dq] \e\[dq] ie. with a blank argument
 .IBQ
 .FLOAT off
-.SP .5v
+\#.SP .5v
 .HEADING 1 NAMED toc "Tables of Contents"
 .RLD .5v
 .HEADING 2 NAMED toc:gen "Generating a Table of Contents 
@@ -559,8 +559,11 @@ or \[groff]\~\[-Tps]\~\[-mpdfmark]:
 is not supported.  The TOC appears at the end of the document;
 \[psselect] must be used to re-order pages.
 .ITEM
+.RW .08
+.WS -2
 If a link crosses a page boundary, it will stop being a clickable
 hotspot on subsequent pages.
+.RW 0
 .ITEM
 When establishing whether PDF outline levels are
 .PDF_LINK open-close SUFFIX , "open or closed"
@@ -603,8 +606,8 @@ is not compatible with
 underlining (e.g., of italics)
 .ITEM
 generally produces larger files; these can be reduced by piping
-the output through \[ps2pdf]\*[B]
-.sp -1.25v
+the output through \[ps2pdf]
+.SP -1.25v
 .BOX OUTLINED black SHADED grey90 WEIGHT 1p INSET 6p
 .JUSTIFY
 \*[BD]Note:\*[PREV] Owing to a known bug, PDF files piped through

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: [mom]: Update docs for 2.6_c.

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 5459417e16e6f35ec9f85b7e28d708c6e8061db6
Author: Peter Schaffter 
AuthorDate: Wed Feb 21 16:07:20 2024 -0500

[mom]: Update docs for 2.6_c.
---
 contrib/mom/momdoc/docelement.html | 12 
 contrib/mom/momdoc/toc.html|  4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/contrib/mom/momdoc/docelement.html 
b/contrib/mom/momdoc/docelement.html
index 43f79d49f..18639bbd3 100644
--- a/contrib/mom/momdoc/docelement.html
+++ b/contrib/mom/momdoc/docelement.html
@@ -1320,6 +1320,7 @@ which may be given in any order:
   FAMILY <family> \
   FONT   <font> \
   SIZE   <+|-size> \
+  LEAD   <+|-points> \
   QUAD   <direction> \
   COLOR  <colour> \
   UNDERSCORE  <weight> <gap> | NO_UNDERSCORE \
@@ -1353,6 +1354,17 @@ ending in _FAMILY, _FONT, _SIZE, _QUAD, or _COLOR.  See
 Arguments to the control macros.
 
 
+
+LEAD allows you to adjust the
+leading
+of multi-line headings.  Pass LEAD the number of points
+by which you wish to increase or decrease the leading, preceded by a
+plus (+) or minus (-) sign.  Note that there is no need to append
+the
+unit of measure
+p to the argument.
+
+
 
 UNDERSCORE and UNDERSCORE2 require that a
 weight for the underscore be given, in points (decimal fractions
diff --git a/contrib/mom/momdoc/toc.html b/contrib/mom/momdoc/toc.html
index 0aa274602..c4bacb6a3 100644
--- a/contrib/mom/momdoc/toc.html
+++ b/contrib/mom/momdoc/toc.html
@@ -20,7 +20,7 @@ FDL in the main directory of the groff source package.
 
 
   
-  Mom, version 2.6_b -- Table of Contents
+  Mom, version 2.6_c -- Table of Contents
   
 
 
@@ -31,7 +31,7 @@ FDL in the main directory of the groff source package.
 
 
   
-mom, version 2.6_b
+mom, version 2.6_c
   
 
 Table of Contents

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: [mom]:[om.tmac]:Improve pdfbox handling around headings.

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 9bc11965534995683009a9daee8c5de32968d1a4
Author: Peter Schaffter 
AuthorDate: Wed Feb 21 16:01:56 2024 -0500

[mom]:[om.tmac]:Improve pdfbox handling around headings.

Add LEAD to HEADING_STYLE args.

Bug fixes (see BUGS).
Update BUGS, ChangeLog, NEWS.
---
 contrib/mom/BUGS  | 13 +++
 contrib/mom/ChangeLog | 12 +++
 contrib/mom/NEWS  |  5 +++
 contrib/mom/om.tmac   | 99 +--
 4 files changed, 95 insertions(+), 34 deletions(-)

diff --git a/contrib/mom/BUGS b/contrib/mom/BUGS
index fb20de2e9..b5b5063f3 100644
--- a/contrib/mom/BUGS
+++ b/contrib/mom/BUGS
@@ -21,6 +21,19 @@ the Subject line or you risk my spam filters nuking your 
message.
 
 
 
+Version 2.6_d
+=
+Prevailing quad not always being restored after exiting lists.
+---Fixed---
+
+Quitting indents not always restoring .ta \n[.l]u (right margin tab
+stop).
+---Fixed---
+
+CAPTION without LABEL when CAPTION_AFTER_LABEL is enabled not
+respecting captioned material's width and quad.
+---Fixed--
+
 Version 2.6_a
 =
 Document line lengths other than the default not being respected
diff --git a/contrib/mom/ChangeLog b/contrib/mom/ChangeLog
index 79b8cb68b..b54a7d74b 100644
--- a/contrib/mom/ChangeLog
+++ b/contrib/mom/ChangeLog
@@ -1,3 +1,10 @@
+2024-02-21  Deri James 
+
+   * pdfmom.pl: Accrete `-k` and `-K` options to groff instead of
+   letting one clobber the other.  See message at
+   <https://lists.gnu.org/archive/html/groff/2024-02/msg00059.html>
+   and follow-ups.
+
 2024-01-31  G. Branden Robinson 
 
* examples/test-mom.sh.in: Fix code style/diagnostic nits.
@@ -5,6 +12,11 @@
prerequisites.  Kill trailing whitespace.  Add Vim editor aid
comment.
 
+2024-02-17
+
+   * om.tmac: Improve pdfbox handling around headings.  LEAD argument
+   added to HEADING_STYLE.
+
 2024-01-22
 
* om.tmac (2.6_b): Add macro PDF_OUTLINE_PN (control pdf outline page
diff --git a/contrib/mom/NEWS b/contrib/mom/NEWS
index e08514325..dccf41003 100644
--- a/contrib/mom/NEWS
+++ b/contrib/mom/NEWS
@@ -5,6 +5,11 @@
 are permitted in any medium without royalty provided the copyright
 notice and this notice are preserved.
 
+Release 2.6_c
+-
+Adds LEAD argument to HEADING_STYLE to control leading of multi-line
+headings.
+
 Release 2.6_b
 -
 PDF outline panel page numbers now map to printed page numbers.
diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac
index d3b5002a8..299cbc949 100644
--- a/contrib/mom/om.tmac
+++ b/contrib/mom/om.tmac
@@ -20,7 +20,7 @@ for more details.
 You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-Version 2.6_b
+Version 2.6_c
 -
 Antoine de St-Exupéry asserted that elegance in engineering is
 achieved not when there is nothing left to add, but when there is
@@ -53,7 +53,7 @@ extensions, and float management).
 .if (\n[.x]\n[.y] < 118) \
 .   ab [mom]: You need GNU troff version 1.18 or higher to run this version of 
mom.
 \# Mom version
-.ds version 2.6_b
+.ds version 2.6_c
 .if dVERSION \{\
 .   ab [mom]: Version \*[version]
 .\}
@@ -660,7 +660,7 @@ end
 .  vs \\n[.ps]u+\\n[#AUTOLEADING]u
 .   \}
 .\}
-.if \\n[pdfbx-running]=1 \{\
+.if \\n[pdfbx-running] \{\
 .   nr #VS_DIFF \\n[#SAVED_VS]-\\n[.v]
 .   ch FOOTER \\n[#VARIABLE_FOOTER_POS]u+\\n[#VS_DIFF]u
 .\}
@@ -702,7 +702,7 @@ end
 .\}
 .nr #SAVED_VS \\n[.v]
 .vs \\$1
-.if \\n[pdfbx-running]=1 \{\
+.if \\n[pdfbx-running] \{\
 .   nr #VS_DIFF \\n[#SAVED_VS]-\\n[.v]
 .   ch FOOTER \\n[#VARIABLE_FOOTER_POS]u+\\n[#VS_DIFF]u
 .\}
@@ -1446,7 +1446,6 @@ end
 \#   Justifies text left and right.
 \#
 .MAC JUSTIFY END
-\#.if r pdfbx-top 'sp -1
 .if \\n[#TAB_ACTIVE]=0 \{\
 .   nr #QUAD 1
 .   ds $RESTORE_QUAD_VALUE \\*[$QUAD_VALUE]
@@ -1472,13 +1471,13 @@ end
 \#
 .MAC QUAD END
 .if r pdfbx-top \{\
-'   sp -1
+.   sp -1
 .   rr pdfbx-top
 .\}
 .\" The QUAD in PP adds an unwanted linespace after a HEADING at the
 .\" top of a pdf box because of this .br, so HEADING assigns the
 .\" tmp register "bx-top\n[stack]" to inhibit it.
-.ie !r pdfbx-top\\n[stack] .br
+.ie !\\n[pdfbx-top\\n[stack]] 'br
 .el .rr pdfbx-top\\n[stack]
 .if \\n[#COVERTEXT_PP] \
 .   ds $RESTORE_DOC_QUAD \\*[$QUAD_VALUE]
@@ -3527,7 +3526,7 @@ end
 .ie \\n[#IN_ITEM] .nr #L_INDENT -\\n[#IN_ITEM_L_INDENT]
 .el \{\
 .   br
-.   ie \\n[pdfbx-running]=1 \
+.   ie \\n[pdfbx-running] \
 .  ie !r pdfbx-clear \{\
 . in \\*[wt\\n[stack]]+\\*[gap\\n[stack]]u+\\n[#IL_ACTIV

[groff] 01/01: [pdfmom.pl]: Accrete `-k` and `-K` options to groff

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit bfc55cf250267d84ece913c010e3a4b425bc8367
Author: Peter Schaffter 
AuthorDate: Wed Feb 21 15:47:43 2024 -0500

[pdfmom.pl]: Accrete `-k` and `-K` options to groff
---
 src/devices/gropdf/pdfmom.pl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/devices/gropdf/pdfmom.pl b/src/devices/gropdf/pdfmom.pl
index 1c24d85b9..dc0d96087 100644
--- a/src/devices/gropdf/pdfmom.pl
+++ b/src/devices/gropdf/pdfmom.pl
@@ -68,18 +68,18 @@ while (my $c=shift)
 {
if (length($c) > 2)
{
-   $preconv=$c;
+   $preconv.=" $c";
}
else
{
-   $preconv=$c;
+   $preconv.=" $c";
$preconv.=shift;
}
next;
 }
 elsif (substr($c,0,2) eq '-k')
 {
-   $preconv=$c;
+   $preconv.=" $c";
next;
 }
 elsif ($c eq '-Z')

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: [mom]: Version 2.6_b, update docs

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 1fa4894ffcd84e7b2673fdbbb32102b5748563b6
Author: Peter Schaffter 
AuthorDate: Mon Jan 22 14:52:45 2024 -0500

[mom]: Version 2.6_b, update docs
---
 contrib/mom/momdoc/headfootpage.html   | 90 --
 contrib/mom/momdoc/images.html |  6 +-
 contrib/mom/momdoc/macrolist.html  |  3 +
 contrib/mom/momdoc/tables-of-contents.html | 19 +++
 contrib/mom/momdoc/toc.html|  4 +-
 contrib/mom/momdoc/typesetting.html|  2 +-
 contrib/mom/momdoc/version-2.html  |  8 +++
 7 files changed, 120 insertions(+), 12 deletions(-)

diff --git a/contrib/mom/momdoc/headfootpage.html 
b/contrib/mom/momdoc/headfootpage.html
index 1c11ab14f..fc83a4b15 100644
--- a/contrib/mom/momdoc/headfootpage.html
+++ b/contrib/mom/momdoc/headfootpage.html
@@ -102,6 +102,7 @@ FDL in the main directory of the groff source package.
 
   Pagination macros
   Pagination control macros and 
defaults
+  PDF outline page numbering
 
 Inserting blank pages into a document
 
@@ -1996,11 +1997,11 @@ L "^\E*[$AUTHOR]#\*[PAGE#]^"
 Pagination
 
 
-By default, mom paginates documents.  Page numbers
-appear in the bottom margin of the page, centred between two hyphens.
-As with all elements of mom’s document processing,
-most aspects of pagination style can be altered to suit your taste
-with control macros.
+By default, mom paginates documents.  Page numbers appear in the
+bottom margin of the page, centred between two hyphens.  As with
+all elements of mom’s document processing, most aspects of
+pagination style can be altered to suit your taste with control
+macros.
 
 
 
@@ -2014,6 +2015,7 @@ with control macros.
   DRAFT_WITH_PAGENUMBER – 
attach draft/revision information to page numbers
   PAGENUMBER_STRING – user-defined 
page number string
   Pagination control macros and 
defaults
+  PDF outline page numbering
 
 
 
@@ -2269,6 +2271,84 @@ If, for some reason, you want to turn page number 
hyphens back
 on, invoke the macro without an argument.
 
 
+PDF outline page 
numbering
+
+
+Prior to mom 2.6_b, the document outline panel of PDF viewers
+displayed the physical page numbers of mom documents, not the
+printed page number.  As of 2.6_b, entries in the outline panel show
+the printed page number.  Furthermore, null pages (e.g. cover and
+title pages) are no longer given a page number in the outline.
+
+
+
+Though rare, you may at times want to control the PDF outline page
+numbering, which is accomplished with the
+PDF_OUTLINE_PN
+macro.
+
+
+
+
+Note:
+You must be running a version of groff > 1.23 or have recently
+built groff from sources in order for the outline page numbers
+to reflect the printed page numbers, as described above, and for
+PDF_OUTLINE_PN to work.
+
+
+
+
+PDF_OUTLINE_PN
+
+
+
+Macro: PDF_OUTLINE_PN SUSPEND | RESUME
+
+Macro: PDF_OUTLINE_PN [FORMAT 
<format>] [PREFIX <prefix>] [PAGE 
<pagenumber>]
+
+
+
+PDF outline page numbering may be suspended or resumed by calling
+PDF_OUTLINE_PN with the appropriate argument.
+
+
+
+If you wish to change the numbering format, add a prefix to the page
+number, or hard set an outline page number, supply one or more of
+the additional keywords with arguments.
+
+
+FORMAT
+
+
+FORMAT may be one of
+
+
+
+D (digit)
+R (roman numeral, caps)
+r (roman numeral, lower case)
+A (alphabetic, caps)
+a (alphabetic, lower case)
+
+
+PREFIX
+
+
+PREFIX may be anything you like, for example
+“A-” to add a prefix to the outline page
+numbering of an Appendix. PREFIX must not contain
+spaces.
+
+
+PAGE
+
+
+PAGE is the page number you want to appear in the
+outline.
+
+
 
 
 Inserting blank pages into a 
document
diff --git a/contrib/mom/momdoc/images.html b/contrib/mom/momdoc/images.html
index dc1837fc1..de1bbc206 100644
--- a/contrib/mom/momdoc/images.html
+++ b/contrib/mom/momdoc/images.html
@@ -2957,8 +2957,6 @@ Arguments:
 
   TITLE_QUAD LEFT | CENTER | RIGHT \
 
-  TOC_HEADER_UNDERSCORE default = none
-
   TITLE_COLOR <color> \
 
   PN_FAMILY <family> \
@@ -3226,7 +3224,7 @@ require that the box be started beforehand.  Boxed 
pre-processor
 material must be fully enclosed by BOX / BOX OFF, as
 in this recipe for a one-off boxed pic diagram:
 
-.BOX
+.BOX PIC
 .PS
 <pic commands>
 .PE
@@ -3269,7 +3267,7 @@ The colour may be
   or
   XCOLOR
   
-  an RGB hexadecimal string beginning with (e.g. #FF)
+  an RGB hexadecimal string beginning with # (e.g. #FF)
 
 
 
diff --git a/contrib/mom/momdoc/macrolist.html 
b/contrib/mom/momdoc/macrolist.html
index 81ebd7cb6..ed2f33021 100644
--- a/contrib/mom/momdoc/macrolist.html
+++ b/contrib/mom/momdoc/macrolist.html
@@ -1436,6 +1436,9 @@ elsewhere in the documentation.
 
  DRAFT_WITH_PAGENUMBER--
 attach draft/revision to page number
 
+
+ PDF_OUTLINE_PN--
 change page numbers in the pdf outline
+
 
 
 
diff --git a/contrib/mom/momdoc/tables

[groff] 01/01: [mom]: Version 2.6_b, update example files

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 8388779261a4643b7643fd8882a6b1473163d14b
Author: Peter Schaffter 
AuthorDate: Mon Jan 22 14:51:42 2024 -0500

[mom]: Version 2.6_b, update example files
---
 contrib/mom/examples/copyright-chapter.mom | 4 +++-
 contrib/mom/examples/copyright-default.mom | 7 ---
 contrib/mom/examples/mom-pdf.mom   | 4 ++--
 contrib/mom/examples/sample_docs.mom   | 5 -
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/contrib/mom/examples/copyright-chapter.mom 
b/contrib/mom/examples/copyright-chapter.mom
index 261c7122d..cf70e3912 100644
--- a/contrib/mom/examples/copyright-chapter.mom
+++ b/contrib/mom/examples/copyright-chapter.mom
@@ -59,7 +59,9 @@ the first chapter.
 .   \" get printed because docheader is disabled.
 .NO_TOC_ENTRY   \" So copyright page is not included in the TOC
 .
-.START  \" Begin example copyright page
+.START \" Begin copyright page
+.PDF_OUTLINE_PN SUSPEND  \" So copyright page has no pagenumber in the pdf 
outline
+.\" Outline page numbering resumes after the next START
 All rights reserved.  No part of this publication may be reproduced,
 distributed, or transmitted in any form or by any means, including
 photocopying, recording, or other electronic or mechanical methods,
diff --git a/contrib/mom/examples/copyright-default.mom 
b/contrib/mom/examples/copyright-default.mom
index 25a428fbb..d447c6542 100644
--- a/contrib/mom/examples/copyright-default.mom
+++ b/contrib/mom/examples/copyright-default.mom
@@ -7,7 +7,7 @@
 \# notice and this notice are preserved.
 \#
 .ig
-***Template for created a copyright page, DOCTYPE DEFAULT***
+***Template for creating a copyright page, DOCTYPE DEFAULT***
 
 Mom documents comprised of titled sections using DOCTYPE DEFAULT
 (e.g. a collection of articles or a book of short stories by
@@ -55,10 +55,11 @@ the first (titled) section of the document.
 .
 .TITLE "Copyright" \" Required for PDF viewer outline; does not
 .  \" get printed because docheader is disabled.
-.
 .NO_TOC_ENTRY  \" So copyright page is not included in the TOC
 .
-.START \" Begin copyright page
+.START \" Begin copyright page
+.PDF_OUTLINE_PN SUSPEND  \" So copyright page has no pagenumber in the pdf 
outline
+.\" Outline page numbering resumes after the next START
 All rights reserved.  No part of this publication may be reproduced,
 distributed, or transmitted in any form or by any means, including
 photocopying, recording, or other electronic or mechanical methods,
diff --git a/contrib/mom/examples/mom-pdf.mom b/contrib/mom/examples/mom-pdf.mom
index 15cf6dfff..1803571a0 100644
--- a/contrib/mom/examples/mom-pdf.mom
+++ b/contrib/mom/examples/mom-pdf.mom
@@ -140,7 +140,7 @@ If not, see:
 .\"
 .NO_SHIM \" Use flex spacing
 .START
-.\"
+.
 .SP .5c
 .HEADING 1 NAMED intro "Introduction"
 .PP
@@ -405,7 +405,7 @@ can remove the window title by issuing
 .COD ".PDF_TITLE \[dq]\[dq] \e\[dq] ie. with a blank argument
 .IBQ
 .FLOAT off
-\#.SP .5v
+.SP .5v
 .HEADING 1 NAMED toc "Tables of Contents"
 .RLD .5v
 .HEADING 2 NAMED toc:gen "Generating a Table of Contents 
diff --git a/contrib/mom/examples/sample_docs.mom 
b/contrib/mom/examples/sample_docs.mom
index f9b293346..29bd1beef 100644
--- a/contrib/mom/examples/sample_docs.mom
+++ b/contrib/mom/examples/sample_docs.mom
@@ -124,6 +124,7 @@
 \#
 .AUTO_RELOCATE_TOC \" Move table of contents to the top of the doc
 .SPACE_TOC_ITEMS   \" Prettify TOC spacing
+.TOC_PADDING 1 \" Only one placeholder for page numbers
 \#
 \# Begin the document
 \#
@@ -298,6 +299,7 @@ nonumy eirmod tempor invidunt ut labore et do\%lo\%re magna.
 .CHAPTER_TITLE_SIZE +5
 .CHAPTER_TITLE_SPACE +3p
 .START
+.SP -1
 .EPIGRAPH BLOCK
 Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam
 nonumy eirmod tempor invidunt ut labore et do\%lo\%re magna ali\%quyam erat,
@@ -311,6 +313,7 @@ sed diam voluptua.
 \#
 \*[ROM]\[em]Joseph E. Blough
 .EPIGRAPH OFF
+.SP -1
 .PP
 Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam
 nonumy eirmod tempor invidunt ut labore et do\%lo\%re magna ali\%quyam erat,
@@ -474,7 +477,7 @@ Impact of Serial vs. Aleatoric Music\*[RLD1]"
 \#
 .COLUMNS 2 1P+6p \" Set in two columns
 \#
-\# Being the document
+\# Begin the document
 \#
 .START
 .PP

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: [mom]: Version 2.6_b, incorporate pdfpagenumbering

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 5a5f6cd4117bc009cd5c0e8b0b8ea7fbf29a15f7
Author: Peter Schaffter 
AuthorDate: Mon Jan 22 14:48:07 2024 -0500

[mom]: Version 2.6_b, incorporate pdfpagenumbering

* correctly maps printed page numbers to the PDF outline
* adds new macro PDF_OUTLINE_PN
* adds new macro TOC_MARGINS
* code cleanup and trival refactoring
---
 contrib/mom/BUGS  |   6 ++
 contrib/mom/ChangeLog |   5 ++
 contrib/mom/NEWS  |   6 ++
 contrib/mom/om.tmac   | 159 +++---
 4 files changed, 141 insertions(+), 35 deletions(-)

diff --git a/contrib/mom/BUGS b/contrib/mom/BUGS
index 39e680a95..fb20de2e9 100644
--- a/contrib/mom/BUGS
+++ b/contrib/mom/BUGS
@@ -21,6 +21,12 @@ the Subject line or you risk my spam filters nuking your 
message.
 
 
 
+Version 2.6_a
+=
+Document line lengths other than the default not being respected
+during toc formatting.
+---Fixed---
+
 Version 2.6
 ===
 QUOTE and BLOCKQUOTE offsets misaligned across columns.
diff --git a/contrib/mom/ChangeLog b/contrib/mom/ChangeLog
index fe2b05a68..835f703da 100644
--- a/contrib/mom/ChangeLog
+++ b/contrib/mom/ChangeLog
@@ -1,3 +1,8 @@
+2024-01-22
+
+   * om.tmac (2.6_b): Add macro PDF_OUTLINE_PN (control pdf outline page
+   numbering).  Add macro TOC_MARGINS (set toc margins explicitly).
+
 2023-11-15
 
* om.tmac: Fix QUOTE and BLOCKQUOTE offsets being misaligned
diff --git a/contrib/mom/NEWS b/contrib/mom/NEWS
index 64c63c983..e08514325 100644
--- a/contrib/mom/NEWS
+++ b/contrib/mom/NEWS
@@ -5,6 +5,12 @@
 are permitted in any medium without royalty provided the copyright
 notice and this notice are preserved.
 
+Release 2.6_b
+-
+PDF outline panel page numbers now map to printed page numbers.
+Macro PDF_OUTLINE_PN has been added; allows for controlling of PDF
+outline page numbering.
+
 Release 2.6
 ---
 Refinements to Table of Contents to allow for multi-line heading
diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac
index c7f3fb0d2..d3b5002a8 100644
--- a/contrib/mom/om.tmac
+++ b/contrib/mom/om.tmac
@@ -20,7 +20,7 @@ for more details.
 You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-Version 2.6_a
+Version 2.6_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
@@ -53,7 +53,7 @@ extensions, and float management).
 .if (\n[.x]\n[.y] < 118) \
 .   ab [mom]: You need GNU troff version 1.18 or higher to run this version of 
mom.
 \# Mom version
-.ds version 2.6_a
+.ds version 2.6_b
 .if dVERSION \{\
 .   ab [mom]: Version \*[version]
 .\}
@@ -5916,8 +5916,8 @@ SMALLCAPS takes precedence.
 .   B_MARGIN \\n[#FOOTER_MARGIN]u+\\n[#FOOTER_GAP]u
 .if !\\n[#HEADER_RULE_GAP] .HEADER_RULE_GAP 4p
 .if !\\n[#FOOTER_RULE_GAP] .FOOTER_RULE_GAP 4p
-.if !r #HDRFTR_RULE .HDRFTR_RULE
-.if !r #PAGE_NUM_SET.PAGENUMBER 1
+.if !r #HDRFTR_RULE  .HDRFTR_RULE
+.if !r #PAGE_NUM_SET .PAGENUMBER 1
 .\" Read in number registers and strings for type parameters
 .nr #DOC_L_MARGIN \\n[#L_MARGIN]
 .nr #DOC_L_LENGTH \\n[#L_LENGTH]
@@ -6094,6 +6094,12 @@ SMALLCAPS takes precedence.
 .  rm label-type
 .  rm spec-type
 .   \}
+.\" Default TOC margins
+.   if !\\n[#TOC_MARGINS_SET] \{\
+.  nr #TOC_MARGINS_SET 1
+.  nr #TOC_L_MARGIN \\n[#L_MARGIN]
+.  nr #TOC_L_LENGTH \\n[#L_LENGTH]
+.   \}
 .\" String defaults for both PRINTSTYLEs
 .ie \\n[#DOC_TYPE]=1 \{\
 .   ie '\\*[$DOCTITLE]'' \{\
@@ -7206,10 +7212,7 @@ $\\*[DOC_]COVERTITLE_\\n+[#\\*[DOC_]COVERTITLE_NUM] 
\\$\\n[#\\*[DOC_]COVERTITLE_
 .   evc 0
 \!. if n[#\\*[DOC_]COVERTEXT_ONLY] \
 .  sp |n[#T_MARGIN]u-n[#DOC_LEAD]u
-\!. ie !\\n[#\\*[DOC_]COVERTEXT_START_POS] \{\
-\!.sp |\\n[.p]u/3u-1v
-\!. \}
-\!. el \{\
+\!. if \\n[#\\*[DOC_]COVERTEXT_START_POS] \{\
 \!.vs 0
 \!.sp |0i
 \!.vs n[#DOC_LEAD]u+*[$\\*[DOC_]COVER_LEAD_ADJ]
@@ -7440,6 +7443,7 @@ $\\*[DOC_]COVERTITLE_\\n+[#\\*[DOC_]COVERTITLE_NUM] 
\\$\\n[#\\*[DOC_]COVERTITLE_
 .   rr #COLUMNS
 .\}
 .ds PDF_BM
+.if '\\*[.T]'pdf' .pdfpagenumbering
 .ie '\\$0'DO_DOC_COVER' \{\
 .   ds  DOC_  DOC_
 .   nr #DOC_COVER_DONE 1
@@ -7461,11 +7465,11 @@ $\\*[DOC_]COVERTITLE_\\n+[#\\*[DOC_]COVERTITLE_NUM] 
\\$\\n[#\\*[DOC_]COVERTITLE_
 .if \\n[.ns] .rs
 .if '\\$0'DO_COVER' \{\
 .   if \\n[TOC.RELOCATE]==5 \
-.  if !rTOC_BH .TOC_BEFORE_HERE
+.  if !\\n[TOC_BH] .TOC_BEFORE_HERE
 .\}
 .if '\\$0'DO_DOC_COVER' \{\
 .   if \\n[TOC.R

[groff] 01/01: [mom]: Trivial corrections.

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit e75abcce6399a85326d488109ce343a9fec462e8
Author: Peter Schaffter 
AuthorDate: Wed Nov 15 19:33:40 2023 -0500

[mom]: Trivial corrections.
---
 contrib/mom/momdoc/docprocessing.html | 9 +++--
 contrib/mom/momdoc/toc.html   | 4 ++--
 contrib/mom/momdoc/version-2.html | 2 ++
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/contrib/mom/momdoc/docprocessing.html 
b/contrib/mom/momdoc/docprocessing.html
index 4d09553f5..007ca41c0 100644
--- a/contrib/mom/momdoc/docprocessing.html
+++ b/contrib/mom/momdoc/docprocessing.html
@@ -969,13 +969,18 @@ and
 to accomplish the same thing.
 
 
-Table of Contents exceptions
+Table of Contents and PDF outline 
exceptions
 
 Except for standalone documents (i.e. non-collated documents such
 as essays), the TITLE string appears as an entry in the Table of
 Contents.  If you would like a document section not to appear in the
 Table of Contents (e.g. the copyright page), invoke the macro
-.NO_TOC_ENTRY after .TITLE.
+.NO_TOC_ENTRY after .TITLE.  Equally, if you
+want the PDF outline to omit a title entry, invoke
+.SKIP_PDF_OUTLINE after .TITLE.  This is
+particularly useful if your document has a title page but no
+docheader, beginning instead with a
+HEADING.
 
 
 
diff --git a/contrib/mom/momdoc/toc.html b/contrib/mom/momdoc/toc.html
index 9ba15a168..9fd78733d 100644
--- a/contrib/mom/momdoc/toc.html
+++ b/contrib/mom/momdoc/toc.html
@@ -20,7 +20,7 @@ FDL in the main directory of the groff source package.
 
 
   
-  Mom, version 2.6 -- Table of Contents
+  Mom, version 2.6_a -- Table of Contents
   
 
 
@@ -31,7 +31,7 @@ FDL in the main directory of the groff source package.
 
 
   
-mom, version 2.6
+mom, version 2.6_a
   
 
 Table of Contents
diff --git a/contrib/mom/momdoc/version-2.html 
b/contrib/mom/momdoc/version-2.html
index bd1cb8d3a..d904d602b 100644
--- a/contrib/mom/momdoc/version-2.html
+++ b/contrib/mom/momdoc/version-2.html
@@ -122,6 +122,8 @@ papersize within the source file without the corresponding 
need for
 -P-p<papersize> on the command line.
 
 
+The install-font.sh script
+
 
 Lastly, while not strictly part of mom, a bash script,
 install-font.sh, has been posted at the

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: [mom]: Fix quote/blockquote indents across columns

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit e8346bed529532d8da751eef638fde4d27a64df1
Author: Peter Schaffter 
AuthorDate: Wed Nov 15 19:31:20 2023 -0500

[mom]: Fix quote/blockquote indents across columns
---
 contrib/mom/BUGS|  8 
 contrib/mom/om.tmac | 33 +
 2 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/contrib/mom/BUGS b/contrib/mom/BUGS
index c6fb167aa..39e680a95 100644
--- a/contrib/mom/BUGS
+++ b/contrib/mom/BUGS
@@ -21,6 +21,14 @@ the Subject line or you risk my spam filters nuking your 
message.
 
 
 
+Version 2.6
+===
+QUOTE and BLOCKQUOTE offsets misaligned across columns.
+---Fixed---
+
+PDF_IMAGE starting one line too low during bare metal typesetting.
+---Fixed---
+
 Version 2.5_d
 =
 PDF_IMAGE: captions not being attached to labels when MLA enabled.
diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac
index b81221dcd..c7f3fb0d2 100644
--- a/contrib/mom/om.tmac
+++ b/contrib/mom/om.tmac
@@ -20,8 +20,8 @@ for more details.
 You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-Version 2.6

+Version 2.6_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.
@@ -53,7 +53,7 @@ extensions, and float management).
 .if (\n[.x]\n[.y] < 118) \
 .   ab [mom]: You need GNU troff version 1.18 or higher to run this version of 
mom.
 \# Mom version
-.ds version 2.6
+.ds version 2.6_a
 .if dVERSION \{\
 .   ab [mom]: Version \*[version]
 .\}
@@ -4799,6 +4799,12 @@ y\R'#DESCENDER \\n[.cdp]'
 .\}
 .END
 \#
+\# Keep TITLE out of pdf outline
+\#
+.MAC SKIP_PDF_OUTLINE END
+.nr #SKIP_PDF_OUTLINE 1
+.END
+\#
 .MAC SUBTITLE END \"Document sub-title
 .ie \\n[#NUM_ARGS]=0 \{\
 .   if \\n[#DOC_COVER_SUBTITLE_NUM] \
@@ -8043,7 +8049,9 @@ $\\*[DOC_]COVERTITLE_\\n+[#\\*[DOC_]COVERTITLE_NUM] 
\\$\\n[#\\*[DOC_]COVERTITLE_
 .\}
 .if !\\n[#TOC] \{\
 .   if !'\\*[$TOC_TITLE_ITEM]'' \{\
-.  PDF_BOOKMARK 1 \\*[$TOC_TITLE_ITEM]
+.  if !\\n[#SKIP_PDF_OUTLINE] \
+. PDF_BOOKMARK 1 \\*[$TOC_TITLE_ITEM]
+.  if r #SKIP_PDF_OUTLINE .rr #SKIP_PDF_OUTLINE
 .  if !r #NO_TOC_ENTRY .TITLE_TO_TOC
 .  if r #NO_TOC_ENTRY  .rr #NO_TOC_ENTRY
 .   \}
@@ -10634,12 +10642,12 @@ Shimming must be disabled with NO_SHIM before using 
FLEX.
 .el \
 .   nr #Q_OFFSET \\n[#L_MARGIN]+\\*[$Q_OFFSET_VALUE]
 .if \\n[#COLUMNS] \{\
-.   ie \\n[#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]
+.   ie \\n[#\\*[BQ]_OFFSET_VALUE] .nr #\\*[BQ]_OFFSET \
+\\n[#COL_\\n[#COL_NUM]_L_MARGIN]+(\\n[#PP_INDENT]*\\n[#\\*[BQ]_OFFSET_VALUE])
+.   el .nr #\\*[BQ]_OFFSET \
+\\n[#COL_\\n[#COL_NUM]_L_MARGIN]+\\*[$\\*[BQ]_OFFSET_VALUE]
 .\}
-.po \\n[#Q_OFFSET]u
+.po \\n[#\\*[BQ]_OFFSET]u
 . \}
 .  \}
 .  if \\n[#EPIGRAPH] \{\
@@ -12700,7 +12708,7 @@ Shimming must be disabled with NO_SHIM before using 
FLEX.
 .   nr #\\*[BQ]_OFFSET \
 \\n[#L_MARGIN]+(\\n[#PP_INDENT]*\\n[#\\*[BQ]_OFFSET_VALUE])
 .if \\n[#COLUMNS] \{\
-.   ie r#\\*[BQ]_OFFSET_VALUE \
+.   ie \\n[#\\*[BQ]_OFFSET_VALUE] \
 .  nr #\\*[BQ]_OFFSET \
 \\n[#COL_\\n[#COL_NUM]_L_MARGIN]+(\\n[#PP_INDENT]*\\n[#\\*[BQ]_OFFSET_VALUE])
 .   el .nr #\\*[BQ]_OFFSET \
@@ -23649,8 +23657,9 @@ No room to start \\*[MN-pos] margin note #\\n[MN-curr] 
on page \\n[#P].
 \#  are required.
 \#
 .MAC PDF_IMAGE END
-.ie \\n[#PP]=0 .PP
-.el .br
+.if \\n[#DOCS]=1 \
+.   ie \\n[#PP]=0 .PP
+.   el .br
 .if !'\\n[.z]'FLOAT*DIV' \{\
 .   nr pdf-img:float 1
 .   FLOAT

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: [mom]: Version 2.6 doc updates

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit aaae0cb84d5b6c498886ae2c76bb29712b2d9bac
Author: Peter Schaffter 
AuthorDate: Thu Sep 14 15:46:30 2023 -0400

[mom]: Version 2.6 doc updates
---
 contrib/mom/momdoc/cover.html  |  2 +-
 contrib/mom/momdoc/tables-of-contents.html | 43 +-
 contrib/mom/momdoc/toc.html|  4 +--
 3 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/contrib/mom/momdoc/cover.html b/contrib/mom/momdoc/cover.html
index 7efee1f8d..a904066cb 100644
--- a/contrib/mom/momdoc/cover.html
+++ b/contrib/mom/momdoc/cover.html
@@ -227,7 +227,7 @@ block using mom’s typesetting macros to format the 
text.
 
 Doc-cover and cover data—that is to say, the strings passed to
 reference macros that appear on doc cover and cover
-pages—does not persist after
+pages—do not persist after
 START,
 however the formatting of the various parts (TITLE, AUTHOR,
 COPYRIGHT, etc.) does.
diff --git a/contrib/mom/momdoc/tables-of-contents.html 
b/contrib/mom/momdoc/tables-of-contents.html
index 1f9affbdc..0a6e1c583 100644
--- a/contrib/mom/momdoc/tables-of-contents.html
+++ b/contrib/mom/momdoc/tables-of-contents.html
@@ -906,14 +906,11 @@ Macro: PAD_TOC_CHAPTER_NUMBERS <number of chap
 Alias: PAD_TOC_SECTION_NUMBERS
 
 
-
 
-If the number of chapters or major sections
-(DOCTYPE DEFAULT)
-exceeds 9, you can have mom pad the numbers so the rightmost
-numerals of the chapter numbers align.  Simply invoke
-PAD_TOC_CHAPTER_NUMBERS with the number of chapters in
-the document.
+If the number of chapters or major sections exceeds 9, you can have
+mom pad the numbers so the rightmost numerals of the chapter numbers
+align.  Simply invoke PAD_TOC_CHAPTER_NUMBERS with the
+number of chapters in the document.
 
 
 
@@ -931,6 +928,38 @@ With padding:
 
 
 
+
+
+
+
+Macro: PAD_TOC_HEAD_NUMBERS <number of 
first-level headings>
+
+
+
+If the number of first-level headings in a chapter or major section
+exceeds 9 and you have head numbering enabled (see
+Heading Control and Defaults),
+you can have mom pad the numbers in the Table of Contents so the
+rightmost numerals of first-level headings align.  Simply invoke
+PAD_TOC_HEAD_NUMBERS with the number of first-level
+headings in the document.
+
+
+
+Without padding:
+
+
+  9. First-level heading.100
+  10. First-level heading123
+
+With padding:
+
+
+   9. First-level heading100
+  10. First-level heading123
+
+
+
 
 
 
diff --git a/contrib/mom/momdoc/toc.html b/contrib/mom/momdoc/toc.html
index 627375185..1a07693a3 100644
--- a/contrib/mom/momdoc/toc.html
+++ b/contrib/mom/momdoc/toc.html
@@ -20,7 +20,7 @@ FDL in the main directory of the groff source package.
 
 
   
-  Mom, version 2.5_d -- Table of Contents
+  Mom, version 2.6 -- Table of Contents
   
 
 
@@ -31,7 +31,7 @@ FDL in the main directory of the groff source package.
 
 
   
-mom, version 2.5_d
+mom, version 2.6
   
 
 Table of Contents

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: [mom]: Version 2.6 released

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 4905320fa26d8fbeb2b2da9bdd6c3dc8c85815e5
Author: Peter Schaffter 
AuthorDate: Thu Sep 14 15:43:30 2023 -0400

[mom]: Version 2.6 released

Table of contents and internal color management revamped.
---
 contrib/mom/BUGS  |   4 +
 contrib/mom/ChangeLog |   4 +
 contrib/mom/NEWS  |   5 ++
 contrib/mom/om.tmac   | 234 ++
 4 files changed, 137 insertions(+), 110 deletions(-)

diff --git a/contrib/mom/BUGS b/contrib/mom/BUGS
index 111ab542a..1a2d373d3 100644
--- a/contrib/mom/BUGS
+++ b/contrib/mom/BUGS
@@ -26,6 +26,10 @@ Version 2.5_d
 PDF_IMAGE: captions not being attached to labels when MLA enabled.
 ---Fixed---
 
+Very long heading entries overprinting TOC page numbers instead of
+breaking to a new line.
+---Fixed---
+
 Version 2.5_c
 =
 
diff --git a/contrib/mom/ChangeLog b/contrib/mom/ChangeLog
index 9f1c69a51..08f362cf9 100644
--- a/contrib/mom/ChangeLog
+++ b/contrib/mom/ChangeLog
@@ -1,3 +1,7 @@
+2023-09-14
+
+   * Version 2.6 released
+
 2023-08-26
 
* om.tmac (PDF_IMAGE): Fix captions not attaching to PDF_IMAGE
diff --git a/contrib/mom/NEWS b/contrib/mom/NEWS
index d7cf82add..7e5f1503a 100644
--- a/contrib/mom/NEWS
+++ b/contrib/mom/NEWS
@@ -5,6 +5,11 @@
 are permitted in any medium without royalty provided the copyright
 notice and this notice are preserved.
 
+Release 2.6
+---
+Refinements to Table of Contents to allow for multi-line heading
+entries.  Colour management has also been slightly refactored.
+
 Release 2.5
 ---
 Addition of shaded backgrounds, frames, and page colour.
diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac
index b0fd1ef55..e099bcbc4 100644
--- a/contrib/mom/om.tmac
+++ b/contrib/mom/om.tmac
@@ -20,8 +20,8 @@ for more details.
 You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-Version 2.5_d
--
+Version 2.6
+---
 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.
@@ -53,7 +53,7 @@ extensions, and float management).
 .if (\n[.x]\n[.y] < 118) \
 .   ab [mom]: You need GNU troff version 1.18 or higher to run this version of 
mom.
 \# Mom version
-.ds version 2.5_d
+.ds version 2.6
 .if dVERSION \{\
 .   ab [mom]: Version \*[version]
 .\}
@@ -1934,7 +1934,6 @@ end
 .ds BLACK   \m[black]
 .ds white   \m[white]
 .ds WHITE   \m[white]
-.ds default black
 \#
 \# =
 \#
@@ -2844,17 +2843,12 @@ end
 .ds $RL_WEIGHT \\$1
 .ds $RL_INDENT \\$2
 .ds $RL_LENGTH \\$3
-.ie !'\\$4'' .ds $RL_COLOR  \\$4
-.el \{\
-.   ie '\\n[.m]'' .ds $RL_COLOR \\*[default]
-.   el .ds $RL_COLOR \\n[.m]
-.\}
 .nr #SAVED_WEIGHT \\n[#RULE_WEIGHT]
 .nr #SAVED_WEIGHT_ADJ \\n[#RULE_WEIGHT_ADJ]
 .di NULL
 .   if \\n[#NUM_ARGS]>=1 .RULE_WEIGHT \\*[$RL_WEIGHT]
 .di
-.COLOR \\*[$RL_COLOR]
+.if !'\\$4'' .gcolor \\$4
 .ie \\n[#NUM_ARGS]=0 \{\
 .   ie \\n[#INDENT_ACTIVE] \{\
 .  nr #RESTORE_L_LENGTH \\n[.l]
@@ -2899,7 +2893,7 @@ end
 .   if \\n[#NOFILL_MODE]=3 .CENTER
 .   if \\n[#NOFILL_MODE]=5 .RIGHT
 .\}
-.gcolor
+.gcolor default
 .nr #RULE_WEIGHT \\n[#SAVED_WEIGHT]
 .nr #RULE_WEIGHT_ADJ \\n[#SAVED_WEIGHT_ADJ]
 .rr #SAVED_WEIGHT
@@ -2969,16 +2963,10 @@ end
 .ds $RL_WEIGHT \\$1
 .ds $RL_INDENT \\$2
 .ds $RL_DEPTH  \\$3
-.ie !'\\$4'' \
-.   ds $RL_COLOR  \\$4
-.el \{\
-.   ie '\\n[.m]'' .ds $RL_COLOR \\*[default]
-.   el .ds $RL_COLOR \\n[.m]
-.\}
+.if !'\\$4'' .gcolor \\$4
 .nr #SAVED_WEIGHT \\n[#RULE_WEIGHT]
 .nr #SAVED_WEIGHT_ADJ \\n[#RULE_WEIGHT_ADJ]
 .RULE_WEIGHT \\*[$RL_WEIGHT]
-.COLOR \\*[$RL_COLOR]
 \Z'\D't \\n[#RULE_WEIGHT]''\
 \h'\\*[$RL_INDENT]+\\n[#RULE_WEIGHT]u+\\n[#RULE_WEIGHT_ADJ]u'\
 \D'l 0 \\*[$RL_DEPTH]'\
@@ -2995,7 +2983,7 @@ end
 .   if \\n[#NOFILL_MODE]=3 .CENTER
 .   if \\n[#NOFILL_MODE]=5 .RIGHT
 .\}
-.gcolor
+.gcolor default
 .nr #RULE_WEIGHT \\n[#SAVED_WEIGHT]
 .nr #RULE_WEIGHT_ADJ \\n[#SAVED_WEIGHT_ADJ]
 .if \\n[#RESTORE_TRAP]=1 \{\
@@ -3048,10 +3036,7 @@ end
 .   ie d$\\$5_FILL .ds $BX_COLOR \\*[$\\$5_FILL]
 .   el .ds $BX_COLOR \\$5
 .\}
-.el \{\
-.   ie '\\n[.m]'' .ds $BX_COLOR \\*[default]
-.   el .ds $BX_COLOR \\n[.m]
-.\}
+.el .ds $BX_COLOR default
 .nr #SAVED_WEIGHT \\n[#RULE_WEIGHT]
 .nr #SAVED_WEIGHT_ADJ \\n[#WEIGHT_ADJ]
 .if !'\\$1'SOLID' .RULE_WEIGHT \\*[$BX_WEIGHT]
@@ -3064,14 +3

[groff] 01/01: [mom]: Fixes captions not attaching to PDF_IMAGE labels.

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 11016d37f1e16fa71407f9802b105c016263128c
Author: Peter Schaffter 
AuthorDate: Sat Aug 26 14:25:38 2023 -0400

[mom]: Fixes captions not attaching to PDF_IMAGE labels.
---
 contrib/mom/BUGS| 5 +
 contrib/mom/om.tmac | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/contrib/mom/BUGS b/contrib/mom/BUGS
index 6e7a8281e..111ab542a 100644
--- a/contrib/mom/BUGS
+++ b/contrib/mom/BUGS
@@ -21,6 +21,11 @@ the Subject line or you risk my spam filters nuking your 
message.
 
 
 
+Version 2.5_d
+=
+PDF_IMAGE: captions not being attached to labels when MLA enabled.
+---Fixed---
+
 Version 2.5_c
 =
 
diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac
index 4ac9ff3a2..b0fd1ef55 100644
--- a/contrib/mom/om.tmac
+++ b/contrib/mom/om.tmac
@@ -23635,7 +23635,8 @@ No room to start \\*[MN-pos] margin note #\\n[MN-curr] 
on page \\n[#P].
 \#  are required.
 \#
 .MAC PDF_IMAGE END
-.br
+.ie \\n[#PP]=0 .PP
+.el .br
 .if !'\\n[.z]'FLOAT*DIV' \{\
 .   nr pdf-img:float 1
 .   FLOAT
@@ -23868,7 +23869,7 @@ No room to start \\*[MN-pos] margin note #\\n[MN-curr] 
on page \\n[#P].
 .   nr pdf-img*label-lead-diff \\n[lead-pre-label]-\\n[.v]
 .   sp -.5+\\*[$CAP_HEIGHT]+\\n[pdf-img*label-lead-diff]u
 .   if !'\\*[pdf-img*label-space]'' .sp \\*[pdf-img*label-space]
-.   if \\n[pdfbx-running] \{\
+.   if r pdfbx-running \{\
 .  in -(\\*[wt\\n[stack]])+\\*[gap\\n[stack]]u
 .  ll -(\\*[wt\\n[stack]])+\\*[gap\\n[stack]]u
 .   \}

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: [mom]: Fixes savannah bug #64561

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 743e01b1b2238576772d399126f77a9957fc8017
Author: Peter Schaffter 
AuthorDate: Wed Aug 16 17:26:25 2023 -0400

[mom]: Fixes savannah bug #64561

Also corrects ".if r [T" to ".if \\n[[T]" in macro ][.
---
 contrib/mom/om.tmac | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac
index adb7508ce..4ac9ff3a2 100644
--- a/contrib/mom/om.tmac
+++ b/contrib/mom/om.tmac
@@ -12170,7 +12170,7 @@ Shimming must be disabled with NO_SHIM before using 
FLEX.
 .   if \\n[#EXTEND]=1 \{\
 \E*[EXT]\c
 .   \}
-.nr #Q_PP +1
+.   nr #Q_PP +1
 .\}
 .\" This takes care of multi-paragraph dialogue, where each para
 .\" is introduced by an open quote whereas the previous para has
@@ -12281,7 +12281,8 @@ Shimming must be disabled with NO_SHIM before using 
FLEX.
 .ie \\n[@TOP] \
 .   br
 .el 'br
-.if \\n[#PP]>0 .rr #START
+.ie \\n[#PP]>0 .rr #START
+.el .nr #PP 1 1
 .if '\\n[.z]'FLOAT*DIV' .nr Q-float 1
 .if \\n[#LINENUMBERS]=1 \{\
 .   nr #LINENUMBERS 2
@@ -12445,7 +12446,7 @@ Shimming must be disabled with NO_SHIM before using 
FLEX.
 .  SMARTQUOTES
 .   \}
 .   if \\n[#QUOTE] .sp -1
-.   if \\n[pdfbx-end] .if !\\n[#QUOTE] .sp -1
+.   if \\n[pdfbx-end] .if !\\n[#QUOTE] 'sp
 .\}
 .END
 \#
@@ -22252,7 +22253,7 @@ does not fit on page \\n[pgnum]\\*[col-num].
 .  ds ref*spec!4 i A m p T2 B G O C I D P O n
 .   \}
 .\}
-.if r [T \{\
+.if \\n[[T] \{\
 .   als [T1 [T
 .   als [T2 [T
 .\}

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: [mom:om.tmac]: Fixes color bug in graphical objects

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 925cdedae98b0ccbeedb3140095d4a4d7068b409
Author: Peter Schaffter 
AuthorDate: Thu Jun 15 18:10:18 2023 -0400

[mom:om.tmac]: Fixes color bug in graphical objects

Bug introduced in the previous commit; an empty .m in graphical object
macros caused internal COLOR calls fail.
---
 contrib/mom/ChangeLog |  2 +-
 contrib/mom/om.tmac   | 20 
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/contrib/mom/ChangeLog b/contrib/mom/ChangeLog
index cc9dc9384..82e5dbb61 100644
--- a/contrib/mom/ChangeLog
+++ b/contrib/mom/ChangeLog
@@ -1,6 +1,6 @@
 2023-06-15
 
-   * om.tmac: Encose all calls to \D't n' in \Z
+   * om.tmac: Enclose all calls to \D't n' in \Z
 
 2023-03-01  G. Branden Robinson 
 
diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac
index 0b4702002..adb7508ce 100644
--- a/contrib/mom/om.tmac
+++ b/contrib/mom/om.tmac
@@ -2845,7 +2845,10 @@ end
 .ds $RL_INDENT \\$2
 .ds $RL_LENGTH \\$3
 .ie !'\\$4'' .ds $RL_COLOR  \\$4
-.el  .ds $RL_COLOR \\n[.m]
+.el \{\
+.   ie '\\n[.m]'' .ds $RL_COLOR \\*[default]
+.   el .ds $RL_COLOR \\n[.m]
+.\}
 .nr #SAVED_WEIGHT \\n[#RULE_WEIGHT]
 .nr #SAVED_WEIGHT_ADJ \\n[#RULE_WEIGHT_ADJ]
 .di NULL
@@ -2968,7 +2971,10 @@ end
 .ds $RL_DEPTH  \\$3
 .ie !'\\$4'' \
 .   ds $RL_COLOR  \\$4
-.el .ds $RL_COLOR \\n[.m]
+.el \{\
+.   ie '\\n[.m]'' .ds $RL_COLOR \\*[default]
+.   el .ds $RL_COLOR \\n[.m]
+.\}
 .nr #SAVED_WEIGHT \\n[#RULE_WEIGHT]
 .nr #SAVED_WEIGHT_ADJ \\n[#RULE_WEIGHT_ADJ]
 .RULE_WEIGHT \\*[$RL_WEIGHT]
@@ -3042,7 +3048,10 @@ end
 .   ie d$\\$5_FILL .ds $BX_COLOR \\*[$\\$5_FILL]
 .   el .ds $BX_COLOR \\$5
 .\}
-.el .ds $BX_COLOR \\n[.m]
+.el \{\
+.   ie '\\n[.m]'' .ds $BX_COLOR \\*[default]
+.   el .ds $BX_COLOR \\n[.m]
+.\}
 .nr #SAVED_WEIGHT \\n[#RULE_WEIGHT]
 .nr #SAVED_WEIGHT_ADJ \\n[#WEIGHT_ADJ]
 .if !'\\$1'SOLID' .RULE_WEIGHT \\*[$BX_WEIGHT]
@@ -3129,7 +3138,10 @@ end
 .   ie d$\\$5_FILL .ds $CL_COLOR \\*[$\\$5_FILL]
 .   el .ds $CL_COLOR \\$5
 .\}
-.el .ds $CL_COLOR \\n[.m]
+.el \{\
+.   ie '\\n[.m]'' .ds $CL_COLOR \\*[default]
+.   el .ds $CL_COLOR \\n[.m]
+.\}
 .nr #SAVED_WEIGHT \\n[#RULE_WEIGHT]
 .nr #SAVED_WEIGHT_ADJ \\n[#WEIGHT_ADJ]
 .if !'\\$1'SOLID' .RULE_WEIGHT \\*[$CL_WEIGHT]

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: [momdoc]: Emend "Supported preprocessors" intro to include grap(1).

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 61038400e9316e01f6a6f67137cf259137dbc7cb
Author: Peter Schaffter 
AuthorDate: Thu Jun 15 14:42:26 2023 -0400

[momdoc]: Emend "Supported preprocessors" intro to include grap(1).
---
 contrib/mom/momdoc/images.html | 2 +-
 contrib/mom/momdoc/toc.html| 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/contrib/mom/momdoc/images.html b/contrib/mom/momdoc/images.html
index 4624c997e..dc1837fc1 100644
--- a/contrib/mom/momdoc/images.html
+++ b/contrib/mom/momdoc/images.html
@@ -1282,7 +1282,7 @@ with the CAPTION argument.
 
 
 Mom offers full support for the eqn (equations), pic
-(diagrams), grap (graphs), tbl (tables), and
+(diagrams), grap (graphs), tbl (tables) and
 refer (bibliographies/citations) preprocessors, including
 captions, labelling, autolabelling, and inclusion in the Lists of
 Equations, Figures, and Tables.
diff --git a/contrib/mom/momdoc/toc.html b/contrib/mom/momdoc/toc.html
index 3c64723c3..627375185 100644
--- a/contrib/mom/momdoc/toc.html
+++ b/contrib/mom/momdoc/toc.html
@@ -20,7 +20,7 @@ FDL in the main directory of the groff source package.
 
 
   
-  Mom, version 2.5_c -- Table of Contents
+  Mom, version 2.5_d -- Table of Contents
   
 
 
@@ -31,7 +31,7 @@ FDL in the main directory of the groff source package.
 
 
   
-mom, version 2.5_c
+mom, version 2.5_d
   
 
 Table of Contents

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: [mom]: version 2.5_d

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 4049123662d7765c47a3eab3ce12815ec9658b08
Author: Peter Schaffter 
AuthorDate: Thu Jun 15 14:33:46 2023 -0400

[mom]: version 2.5_d

Fixes to
  PAGEWIDTH: restore #R_MARGIN check.
  Graphical objects: enclose all instances of \D't in \Z.
  UNDERSCORE: fix placement of delimiters in UNDERSCORE/UNDERSCORE2.
---
 contrib/mom/BUGS   |  6 +++
 contrib/mom/ChangeLog  |  4 ++
 contrib/mom/momdoc/images.html | 14 +++
 contrib/mom/om.tmac| 84 --
 4 files changed, 56 insertions(+), 52 deletions(-)

diff --git a/contrib/mom/BUGS b/contrib/mom/BUGS
index 89b734a92..6e7a8281e 100644
--- a/contrib/mom/BUGS
+++ b/contrib/mom/BUGS
@@ -21,6 +21,12 @@ the Subject line or you risk my spam filters nuking your 
message.
 
 
 
+Version 2.5_c
+=
+
+#R_MARGIN not being respected in PAGEWIDTH.
+---Fixed---
+
 Version 2.5_b
 =
 PAGINATE not restoring page numbers after being disabled.
diff --git a/contrib/mom/ChangeLog b/contrib/mom/ChangeLog
index d84417708..cc9dc9384 100644
--- a/contrib/mom/ChangeLog
+++ b/contrib/mom/ChangeLog
@@ -1,3 +1,7 @@
+2023-06-15
+
+   * om.tmac: Encose all calls to \D't n' in \Z
+
 2023-03-01  G. Branden Robinson 
 
[mom]: Generate test script even if we'll skip it.
diff --git a/contrib/mom/momdoc/images.html b/contrib/mom/momdoc/images.html
index 5909c7541..4624c997e 100644
--- a/contrib/mom/momdoc/images.html
+++ b/contrib/mom/momdoc/images.html
@@ -1281,19 +1281,19 @@ with the CAPTION argument.
 Preprocessor support
 
 
-Mom offers full support for the eqn (equations),
-pic (diagrams), tbl (tables), and refer
-(bibliographies/citations) preprocessors, including captions,
-labelling, autolabelling, and inclusion in the Lists of Equations,
-Figures, and Tables.
+Mom offers full support for the eqn (equations), pic
+(diagrams), grap (graphs), tbl (tables), and
+refer (bibliographies/citations) preprocessors, including
+captions, labelling, autolabelling, and inclusion in the Lists of
+Equations, Figures, and Tables.
 
 
 
 Other than refer, which is discussed at length in the Bibliographies and references section, it is
 beyond the scope of this documentation to cover full preprocessor
-usage.  Consult the manpages eqn(1), pic(1), and
-tbl(1) for instructions.
+usage.  Consult the manpages eqn(1), pic(1),
+grap(1) and tbl(1) for instructions.
 
 
 
diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac
index d92258160..0b4702002 100644
--- a/contrib/mom/om.tmac
+++ b/contrib/mom/om.tmac
@@ -20,7 +20,7 @@ for more details.
 You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-Version 2.5_c
+Version 2.5_d
 -
 Antoine de St-Exupéry asserted that elegance in engineering is
 achieved not when there is nothing left to add, but when there is
@@ -53,7 +53,7 @@ extensions, and float management).
 .if (\n[.x]\n[.y] < 118) \
 .   ab [mom]: You need GNU troff version 1.18 or higher to run this version of 
mom.
 \# Mom version
-.ds version 2.5_c
+.ds version 2.5_d
 .if dVERSION \{\
 .   ab [mom]: Version \*[version]
 .\}
@@ -295,7 +295,7 @@ end
 .br
 .nr #PAGE_WIDTH \\$1
 .if !r#L_MARGIN .L_MARGIN \\n[.o]
-.R_MARGIN 1i
+.if !r#R_MARGIN .R_MARGIN 1i
 .if '\\*[.T]'pdf' \X'papersize=\\n[#PAGE_WIDTH]z,\\n[#PAGE_LENGTH]z'\c
 .END
 \#
@@ -2136,7 +2136,7 @@ end
 \v'\\*[$UNDERSCORE_GAP]+\\n[#UNDERSCORE_WEIGHT_ADJ]u'\
 \D'l \\n[#TEXT_WIDTH]u 0'\
 \Z'\D't \\n[#RULE_WEIGHT]''\
-\v'-(\\*[$UNDERSCORE_GAP]+\\n[#UNDERSCORE_WEIGHT_ADJ]u)\\*[$SUFFIX]'
+\v'-(\\*[$UNDERSCORE_GAP]+\\n[#UNDERSCORE_WEIGHT_ADJ]u)'\\*[$SUFFIX]
 .\}
 .nr #UNDERSCORE_WEIGHT \\n[#SAVED_UNDERSCORE_WEIGHT]
 .nr #UNDERSCORE_WEIGHT_ADJ \\n[#SAVED_UNDERSCORE_WEIGHT_ADJ]
@@ -2211,7 +2211,7 @@ end
 \v'\\*[$RULE_GAP]+\\n[#UNDERSCORE_WEIGHT]u'\
 \D'l \\n[#TEXT_WIDTH]u 0'\
 \Z'\D't \\n[#RULE_WEIGHT]''\
-\v'-(\\*[$UNDERSCORE_GAP]+\\*[$RULE_GAP])-(\\n[#UNDERSCORE_WEIGHT]u*2u)\\*[$SUFFIX]'
+\v'-(\\*[$UNDERSCORE_GAP]+\\*[$RULE_GAP])-(\\n[#UNDERSCORE_WEIGHT]u*2u)'\\*[$SUFFIX]
 .\}
 .nr #UNDERSCORE_WEIGHT \\n[#SAVED_UNDERSCORE_WEIGHT]
 .nr #UNDERSCORE_WEIGHT_ADJ \\n[#SAVED_UNDERSCORE_WEIGHT_ADJ]
@@ -2836,10 +2836,8 @@ end
 \#   described horizontal rule.
 \# *Notes:
 \#   Rules are drawn left-to-right, from the baseline down, and
-\#   return to their point of origin.  Color must be set in the
-\#   macro; otherwise the color will be black, regardless of current
-\#   .gcolor.  If no arg given (full measure rule), the rule weight
-\#   is the one set by RULE_WEIGHT.
+\#   return to the

[groff] 01/01: [mom]: Fix trivial typos in copyright example files

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit e3824d611be904bad22176f4f4eb282a5352509d
Author: Peter Schaffter 
AuthorDate: Fri Mar 31 12:06:01 2023 -0400

[mom]: Fix trivial typos in copyright example files
---
 contrib/mom/examples/copyright-chapter.mom | 2 +-
 contrib/mom/examples/copyright-default.mom | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/mom/examples/copyright-chapter.mom 
b/contrib/mom/examples/copyright-chapter.mom
index fa537d88a..261c7122d 100644
--- a/contrib/mom/examples/copyright-chapter.mom
+++ b/contrib/mom/examples/copyright-chapter.mom
@@ -14,7 +14,7 @@ the START macro to begin each chapter, and the COLLATE macro 
to join
 it to the subsequent chapter.
 .
 A copyright page (also called an edition page), which is not a
-chapter, should be be treated as a DOCTYPE DEFAULT.  The text of
+chapter, should be treated as a DOCTYPE DEFAULT.  The text of
 the copyright page is entered after START and joined to the first
 chapter (DOCTYPE CHAPTER) with COLLATE.
 .
diff --git a/contrib/mom/examples/copyright-default.mom 
b/contrib/mom/examples/copyright-default.mom
index 9fbea09f0..25a428fbb 100644
--- a/contrib/mom/examples/copyright-default.mom
+++ b/contrib/mom/examples/copyright-default.mom
@@ -14,7 +14,7 @@ Mom documents comprised of titled sections using DOCTYPE 
DEFAULT
 different authors) require the START macro to begin each new
 section, and the COLLATE macro to join it to the subsequent section.
 .
-A copyright page (also called an edition page) should be be treated
+A copyright page (also called an edition page) should be treated
 as a titled section.  The text of the copyright page is entered
 after START and joined to the next major section (i.e. the beginning
 of a document's content) with COLLATE.

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: [mom]: Doc fix: remove broken link.

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit be3697781a78d4382f400c824c0efb96d32d61bf
Author: Peter Schaffter 
AuthorDate: Fri Feb 24 21:49:28 2023 -0500

[mom]: Doc fix: remove broken link.
---
 contrib/mom/momdoc/typesetting.html | 11 ---
 1 file changed, 11 deletions(-)

diff --git a/contrib/mom/momdoc/typesetting.html 
b/contrib/mom/momdoc/typesetting.html
index 57f0d192f..51d199e85 100644
--- a/contrib/mom/momdoc/typesetting.html
+++ b/contrib/mom/momdoc/typesetting.html
@@ -312,17 +312,6 @@ Please read the
 for information on ensuring groff respects your PAGELENGTH.
 
 
-
-
-Important: PAGELENGTH and the
-corresponding
-PAGEWIDTH
-are not intended for use with the document processing macros.  See
-here
-for more information.
-
-
-
 
 
 

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: [groff] [mom]: Add PREFIX and SUFFIX args to UNDERSCORE(2)

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit b8c87776edbacc9edfabf464aa7a77605ad4fe2c
Author: Peter Schaffter 
AuthorDate: Thu Feb 2 18:10:30 2023 -0500

[groff] [mom]: Add PREFIX and SUFFIX args to UNDERSCORE(2)

Prevents initial and terminating punctuation of underscored or
double-underscored text from being underscored.

Update ChangeLog and docs.
---
 contrib/mom/ChangeLog   |  6 +++-
 contrib/mom/momdoc/goodies.html | 63 -
 contrib/mom/om.tmac | 57 +++--
 3 files changed, 96 insertions(+), 30 deletions(-)

diff --git a/contrib/mom/ChangeLog b/contrib/mom/ChangeLog
index f96bdfe08..6fd29d2ff 100644
--- a/contrib/mom/ChangeLog
+++ b/contrib/mom/ChangeLog
@@ -1,6 +1,10 @@
+2023-02-02
+   * om.tmac (UNDERSCORE, UNDERSCORE2): Add PREFIX and SUFFIX
+   arguments so surrounding punctuation can be protected from
+   underscoring.
 
 2023-01-16
-   * om.tmac (PRINSTYLE): Abort with message if nroff is called on
+   * om.tmac (PRINTSTYLE): Abort with message if nroff is called on
a document using PRINTSTYLE TYPESET.
 
Fixes <https://savannah.gnu.org/bugs/?63581>.  Thanks to Gene
diff --git a/contrib/mom/momdoc/goodies.html b/contrib/mom/momdoc/goodies.html
index 00e2db037..7c39e1488 100644
--- a/contrib/mom/momdoc/goodies.html
+++ b/contrib/mom/momdoc/goodies.html
@@ -696,11 +696,11 @@ would do the trick.
 
 
 
-Macro: UNDERSCORE [ <distance below 
baseline> ] "<string>"
+Macro: UNDERSCORE [ <distance below 
baseline> ] [ PREFIX <prefix> ] [ SUFFIX <suffix> ] 
"<string>"
 
 
 
-• Optional argument requires a unit of measure
+• <distance below baseline> requires a unit of measure
 
 
 
@@ -710,7 +710,7 @@ required
 The string must be enclosed in double-quotes, like this:
 
 
-  .UNDERSCORE "Unmonitored monopolies breed high prices and poor products."
+  .UNDERSCORE "Unmonitored monopolies breed high prices and poor products"
 
 If you wish to change the distance of the rule from the baseline,
 use the optional argument
@@ -718,7 +718,7 @@ use the optional argument
 (with a unit of measure).
 
 
-  .UNDERSCORE 3p "Unmonitored monopolies breed high prices and poor products."
+  .UNDERSCORE 3p "Unmonitored monopolies breed high prices and poor products"
 
 The above places the upper edge of the underscore 3 points below the
 baseline.
@@ -732,6 +732,19 @@ negative value to the distance argument.
 
 
 
+
+PREFIX and SUFFIX allow you to add
+non-underscored punctuation (or other glyphs) to the beginning
+and/or end of the underscored string.  If the argument to either
+PREFIX or SUFFIX contains spaces, surround the
+argument with double-quotes.  For example, the following underscores
+the text string but not the surrounding punctuation.
+
+
+  .UNDERSCORE PREFIX ( SUFFIX .) "Unmonitored monopolies breed high prices and 
poor products"
+
+
+
 
 
 Note:
@@ -806,8 +819,9 @@ rather than
   .UNDERSCORE "\*[red]text to underscore\*[black]"
 
 The latter will render the text in red but the underscore in black.
-You can use this to create truly rainbow effects if you want, e.g.
-text in red, underscore in blue, and prevailing type in black:
+You can, of course, use this to create rainbow effects if that's
+what you want, e.g. text in red, underscore in blue, and prevailing
+type in black:
 
 
   .UNDERSCORE "\*[red]text to underscore\*[blue]"
@@ -822,11 +836,14 @@ text in red, underscore in blue, and prevailing type in 
black:
 
 
 
-Macro: UNDERSCORE2 [ <distance below 
baseline> [ <distance between rules> ] ] 
"<string>"
+Macro: UNDERSCORE2 [ <distance below 
baseline> [ <distance between rules> ]  [ PREFIX <prefix> ] [ 
SUFFIX <suffix> ]  "<string>"
 
 
 
-• Optional arguments require a unit of measure
+• <distance below baseline>
+and
+<distance between rules>
+require a unit of measure
 
 
 
@@ -836,7 +853,7 @@ the required
 The string must be enclosed in double-quotes, like this:
 
 
-  .UNDERSCORE2 "Unmonitored monopolies breed high prices and poor products."
+  .UNDERSCORE2 "Unmonitored monopolies breed high prices and poor products"
 
 The default distance between the two rules is 2 points, measured
 from the bottom edge of the upper rule to the top edge of the lower
@@ -851,7 +868,7 @@ use the optional argument
 (with a unit of measure), e.g.
 
 
-  .UNDERSCORE2 3p "Unmonitored monopolies breed high prices and poor products."
+  .UNDERSCORE2 3p "Unmonitored monopolies breed high prices and poor products"
 
 which places the upper edge of the first rule of the double
 underscore 3 points below the baseline.
@@ -861,19 +878,37 @@ underscore 3 points below the baseline.
 If you wish to ch

[groff] 01/01: Fix oopsie

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit a398a90e1b426abdb62e66cfb6fb00e384e47733
Author: Peter Schaffter 
AuthorDate: Sat Jan 21 13:48:14 2023 -0500

Fix oopsie
---
 contrib/mom/momdoc/color.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/mom/momdoc/color.html b/contrib/mom/momdoc/color.html
index 84cdcdb02..f53b5c031 100644
--- a/contrib/mom/momdoc/color.html
+++ b/contrib/mom/momdoc/color.html
@@ -221,7 +221,7 @@ could enter one of the following:
   .NEWCOLOR YELLOW #00 \"or ## or "1 1 0"
   .NEWCOLOR YELLOW RGB #00 \"or ## or "1 1 0"
   .NEWCOLOR YELLOW CMY #FF \"or ## or "0 0 1"
-  .NEWCOLOR YELLOW CMYK #00FF  \"or ## or "0 0 1 0"
+  .NEWCOLOR YELLOW CMYK #FF00  \"or ## or "0 0 1 0"
 
 After you’ve told mom about a colour, you can then get her to
 set text in that colour either with the

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: [mom]: docs: Fix typos.

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 04e867e679a2c9ed1e01c6718f662e43b44f5524
Author: Peter Schaffter 
AuthorDate: Mon Jan 16 09:59:08 2023 -0500

[mom]: docs: Fix typos.
---
 contrib/mom/examples/typesetting.mom |  2 +-
 contrib/mom/momdoc/appendices.html   |  2 +-
 contrib/mom/momdoc/color.html|  4 ++--
 contrib/mom/momdoc/docelement.html   |  4 ++--
 contrib/mom/momdoc/images.html   |  2 +-
 contrib/mom/momdoc/intro.html|  2 +-
 contrib/mom/momdoc/reserved.html |  6 +++---
 contrib/mom/momdoc/toc.html  |  4 ++--
 contrib/mom/momdoc/typesetting.html  | 29 -
 contrib/mom/momdoc/version-2.html|  2 +-
 10 files changed, 14 insertions(+), 43 deletions(-)

diff --git a/contrib/mom/examples/typesetting.mom 
b/contrib/mom/examples/typesetting.mom
index 4c3e4c9a2..e273611f6 100644
--- a/contrib/mom/examples/typesetting.mom
+++ b/contrib/mom/examples/typesetting.mom
@@ -439,7 +439,7 @@ text.
 .COMMENT
 Now, set up the indented bullet-point sublist.  The PAD line
 says: move forward 12 points (1 pica), then mark off a string
-tab (ST3) that's the length of the bullet character; move foward
+tab (ST3) that's the length of the bullet character; move forward
 another three points, then make the next string tab (ST4) the
 length of remainder of the line.
 .COMMENT OFF
diff --git a/contrib/mom/momdoc/appendices.html 
b/contrib/mom/momdoc/appendices.html
index cdd675e4f..964a2ab25 100644
--- a/contrib/mom/momdoc/appendices.html
+++ b/contrib/mom/momdoc/appendices.html
@@ -302,7 +302,7 @@ UBL=  Ultra Black
 UBLI   =  Ultra Black Italic
 UBLCD  =  Ultra Black Condensed
 UBLCDI =  Ultra Black Condensed Italic
-UBLEX  =  Ultra Black Exteneded
+UBLEX  =  Ultra Black Extended
 UBLEXI =  Ultra Black Extended Italic
 
 SC =  Small Caps Roman
diff --git a/contrib/mom/momdoc/color.html b/contrib/mom/momdoc/color.html
index 9d2c3bd47..84cdcdb02 100644
--- a/contrib/mom/momdoc/color.html
+++ b/contrib/mom/momdoc/color.html
@@ -220,8 +220,8 @@ could enter one of the following:
 
   .NEWCOLOR YELLOW #00 \"or ## or "1 1 0"
   .NEWCOLOR YELLOW RGB #00 \"or ## or "1 1 0"
-  .NEWCOLOR YELLOW CYM #00FF00 \"or ## or "0 1 0"
-  .NEWCOLOR YELLOW CYMK #00FF  \"or ## or "0 0 1 0"
+  .NEWCOLOR YELLOW CMY #FF \"or ## or "0 0 1"
+  .NEWCOLOR YELLOW CMYK #00FF  \"or ## or "0 0 1 0"
 
 After you’ve told mom about a colour, you can then get her to
 set text in that colour either with the
diff --git a/contrib/mom/momdoc/docelement.html 
b/contrib/mom/momdoc/docelement.html
index ff1ba5164..43f79d49f 100644
--- a/contrib/mom/momdoc/docelement.html
+++ b/contrib/mom/momdoc/docelement.html
@@ -2718,7 +2718,7 @@ PRINTSTYLE TYPESET and PRINTSTYLE TYPEWRITE.
 CODE_SIZE works a little differently from the other _SIZE macros
 (see Arguments to the control
 macros).  The argument you pass it is a percentage of the
-prevailing document point size.  It does not require a pre-pended
+prevailing document point size.  It does not require a prepended
 plus (+) or minus (-) sign, nor an appended
 percent sign (%).  Thus, if you want the point size of your CODE 
font to be
 90% of the prevailing document point size, you enter:
@@ -3316,7 +3316,7 @@ With no argument, .RESET_LIST resets an 
incrementing
 enumerator to 1, A, a, I or i depending on the style of enumerator.
 If you pass .RESET_LIST a
 numeric argument,
-it represents the starting postion for an incrementing enumerator.  In
+it represents the starting position for an incrementing enumerator.  In
 the example above, .RESET_LIST 4 starts the second
 alpha-ed list at d).
 
diff --git a/contrib/mom/momdoc/images.html b/contrib/mom/momdoc/images.html
index 6921aaedb..5909c7541 100644
--- a/contrib/mom/momdoc/images.html
+++ b/contrib/mom/momdoc/images.html
@@ -1409,7 +1409,7 @@ or
 NO_FLEX,
 or by passing the NO_SHIM or NO_FLEX argument
 to .TS.  In either case, you will still likely want to
-adjust the spacing around with table with the AJUST
+adjust the spacing around with table with the ADJUST
 argument to .TS.  Tables inside floats should be adjusted
 with the ADJUST argument to
 FLOAT,
diff --git a/contrib/mom/momdoc/intro.html b/contrib/mom/momdoc/intro.html
index 5c9aa8c00..3e256311f 100644
--- a/contrib/mom/momdoc/intro.html
+++ b/contrib/mom/momdoc/intro.html
@@ -315,7 +315,7 @@ I’m more interested in getting mom users up and 
running.
 
 Groff has ancillary programmes (pre-processors) for generating
 tables (tbl), diagrams (pic), and
-equations (eqn), which may be used in conjuction
+equations (eqn), which may be used in conjunction
 with mom.  The manuals describing their usage are found at:
 
 
diff --git a/contrib/mom/momdoc/reserved.html b/contrib/mom/momdoc/reserved.ht

[groff] 01/01: [mom]: om.tmac: Fixes pagination, fixes nroff output incompatibility

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 6d6fb22cb10d1bfba618b2e75a59b8c59e764b5e
Author: Peter Schaffter 
AuthorDate: Mon Jan 16 09:52:19 2023 -0500

[mom]: om.tmac: Fixes pagination, fixes nroff output incompatibility

If nroff is called on a file containing PRINTSTYLE TYPESET, abort
with a warning the PRINTSTYLE TYPEWRITE must be used.

Update BUGS, ChangeLog, NEWS
---
 contrib/mom/BUGS  |  9 ++---
 contrib/mom/ChangeLog | 19 ---
 contrib/mom/NEWS  |  6 +++---
 contrib/mom/om.tmac   | 24 +++-
 4 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/contrib/mom/BUGS b/contrib/mom/BUGS
index 376b29b58..89b734a92 100644
--- a/contrib/mom/BUGS
+++ b/contrib/mom/BUGS
@@ -23,6 +23,9 @@ the Subject line or you risk my spam filters nuking your 
message.
 
 Version 2.5_b
 =
+PAGINATE not restoring page numbers after being disabled.
+---Fixed---
+
 Sentence space not being restored after a terminating REF.
 ---Fixed---
 
@@ -285,7 +288,7 @@ Forced floats not advancing on the page after output if the 
float is
 forced to the next page, causing running text to overprint.
 ---Fixed---
 
-Text after defered floats not being shimmed properly.
+Text after deferred floats not being shimmed properly.
 ---Fixed---
 
 Tables that span pages overprinting first two lines of table on new
@@ -401,7 +404,7 @@ Version 1.5-b
 Use of \E*[UC] and \E*[LC] inside strings for HDRFTR_RECTO and
 HDRFTR_VERSO breaking headers.
 ---Not fixable.  CAPS option added to HDRFTR_RECTO/VERSO to
-   accomodate situations where capitalized reserved
+   accommodate situations where capitalized reserved
strings(\*[$TITLE], \*[$AUTHOR], etc) are desired.---
 
 COLLATE depositing a blank page if last output line before it falls
@@ -799,7 +802,7 @@ FOOTNOTE, whether in column mode or not, was using
 #FN_COUNT_FOR_COLS for all footnote markers and handling.
 ---Fixed---
 
-Deferred footnotes that occured on the second to last page of
+Deferred footnotes that occurred on the second to last page of
 documents not printing.
 ---Fixed---
 
diff --git a/contrib/mom/ChangeLog b/contrib/mom/ChangeLog
index 0701464a8..cc5494c62 100644
--- a/contrib/mom/ChangeLog
+++ b/contrib/mom/ChangeLog
@@ -1,3 +1,8 @@
+
+2023-01-16
+   * om.tac (PRINSTYLE): Abort with message if nroff is called on a
+   document using PRINTSTYLE TYPESET.
+
 2022-11-16
 
* om.tmac (PAPER): Adjust #R_MARGIN to work with papersize.tmac.
@@ -103,7 +108,7 @@
 
* templates added for setting up copyright pages
 
-   * updated mom.am to include the templates when buliding
+   * updated mom.am to include the templates when building
pdfs in mom/examples
 
 2018-11-24
@@ -308,7 +313,7 @@
 
 * Thu Sep 20 2012
 
-   o Simplify enviroment handling.
+   o Simplify environment handling.
 
 * Fri Aug 31 2012
 
@@ -326,7 +331,7 @@
 
 * Thu Sep 8 2011
 
-   o Added register #SUBHEAD, analagous to #HEAD, to fix excessive
+   o Added register #SUBHEAD, analogous to #HEAD, to fix excessive
spacing between SUBHEADs and SUBSUBHEADs.
 
 * Sun Feb 20 2011
@@ -1041,7 +1046,7 @@
footnotes, both "normal" footnotes and footnotes that occur inside
QUOTE, BLOCKQUOTE and EPIGRAPH.
 
-   o Addtion of font "styles" to om.tmac, plus changes to the FAMILY
+   o Addition of font "styles" to om.tmac, plus changes to the FAMILY
and FT macros to manage them.  New section in the doc appendices
on adding fonts and managing the new font styles.
 
@@ -1055,7 +1060,7 @@
used in justified text.
 
o NEWPAGE, which used to be an alias for .bp, has been moved into
-   its own macro, in order to make it more responsive to some unusal
+   its own macro, in order to make it more responsive to some unusual
situations.
 
o Some changes to elvis_syn.new, including that the file
@@ -1332,7 +1337,7 @@
 
o Changed .ne in .HEAD when PRINTSTYLE TYPESET from 5 to 4.  With
5, heads required at least 2 lines of text underneath or they'd be
-   defered to the next page, which created too much whitespace at the
+   deferred to the next page, which created too much whitespace at the
end of the page.  Heads will now be processed on the same page if
the head plus at least one line of text underneath fits.  I figure
it's easier for the user to break to a new page manually if this
@@ -1656,7 +1661,7 @@
 
o String tabs weren't working as advertised when set from within a
tab.  Fixed.  Two new registers added: #ST_OFFSET and #IN_TAB.
-   String tabs now behave poperly and intuitively when set within
+   String tabs now behave properly and intuitively when set within
tabs.
 
o Added a note to docs about surrounding \w'...' escape with
diff --gi

[groff] 01/01: [mom]: Adjust PAPER to work with papersize.tmac

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit ac1fbe277660750e8caaf3f2b38a1149cf79aabc
Author: Peter Schaffter 
AuthorDate: Wed Nov 16 11:39:27 2022 -0500

[mom]: Adjust PAPER to work with papersize.tmac
---
 contrib/mom/ChangeLog | 4 
 contrib/mom/om.tmac   | 7 +--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/contrib/mom/ChangeLog b/contrib/mom/ChangeLog
index 13485cdc4..0701464a8 100644
--- a/contrib/mom/ChangeLog
+++ b/contrib/mom/ChangeLog
@@ -1,3 +1,7 @@
+2022-11-16
+
+   * om.tmac (PAPER): Adjust #R_MARGIN to work with papersize.tmac.
+
 2022-10-23  G. Branden Robinson 
 
* om.tmac (FORCE_RECTO): Use backslash before newline when
diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac
index a9365ff18..6cb69b2df 100644
--- a/contrib/mom/om.tmac
+++ b/contrib/mom/om.tmac
@@ -295,7 +295,7 @@ end
 .br
 .nr #PAGE_WIDTH \\$1
 .if !r#L_MARGIN .L_MARGIN \\n[.o]
-.if !r#R_MARGIN .R_MARGIN 1i
+.R_MARGIN 1i
 .if '\\*[.T]'pdf' \X'papersize=\\n[#PAGE_WIDTH]z,\\n[#PAGE_LENGTH]z'\c
 .END
 \#
@@ -4166,6 +4166,7 @@ y\R'#DESCENDER \\n[.cdp]'
 \#   LANDSCAPE may be given after papersize arg.
 \#
 .MAC PAPER END
+.vs 0
 .ds $PAPER \\$1
 .if '\\*[$PAPER]'LETTER' \{\
 .   PAGEWIDTH  8.5i
@@ -4230,7 +4231,9 @@ y\R'#DESCENDER \\n[.cdp]'
 .   as $PAPER " LANDSCAPE\"
 .\}
 .if !r#L_MARGIN .L_MARGIN \\n[.o]
-.if !r#R_MARGIN .R_MARGIN 1i
+.if !r#R_MARGIN .R_MARGIN \\n[#PAGE_WIDTH]u-\\n[#L_MARGIN]u-1i
+.if '\\*[.T]'pdf' .br
+.vs
 .END
 \#
 \# 

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: [mom]: Amend INCLUDE entry

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 73880f41c31c724193b008e21f5e78ac08d6dbcb
Author: Peter Schaffter 
AuthorDate: Fri Nov 4 12:12:48 2022 -0400

[mom]: Amend INCLUDE entry

Amend INDLUDE entry to specify that .so must be used if soelim is to
be called.
---
 contrib/mom/momdoc/docprocessing.html | 33 +
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/contrib/mom/momdoc/docprocessing.html 
b/contrib/mom/momdoc/docprocessing.html
index 349c18bc0..4d09553f5 100644
--- a/contrib/mom/momdoc/docprocessing.html
+++ b/contrib/mom/momdoc/docprocessing.html
@@ -725,7 +725,7 @@ here to change mom’s document defaults (paper size, 
margins,
 family, point size, line space, rag, etc), or any of the document
 processing
 control macros.
-This is the style-sheet section of a document, and
+This is the stylesheet section of a document, and
 must come after the
 PRINTSTYLE
 directive.  Failure to observe this condition will result in
@@ -2624,19 +2624,19 @@ adjusted to fill pages fully to the bottom margin.
 Type & formatting 
parameters before START
 
   Behaviour of the typesetting macros before 
START
-  
+  
 List of meanings
 Special note on LEFT, RIGHT and CENTER
-Including (sourcing) style sheets and files
 Initializing colours
   
+  Including (sourcing) style sheets and files
   DOC_LEAD_ADJUST – adjust 
linespacing to fill pages and align bottom margins
   DOCHEADER
-  
+  
 Docheader control
   
   COLUMNS
-  
+  
 COL_NEXT
 COL_BREAK
   
@@ -2789,7 +2789,7 @@ or .CENTER immediately after every invocation 
of the tag.
 
 If you routinely make the same changes to mom’s defaults in
 order to create similar documents in a similar style—in other
-words, you need a template— you can create style-sheet files
+words, you need a template— you can create stylesheet files
 and include, or “source”, them into your mom documents
 with the macro .INCLUDE.  The right place for such style
 sheets is after
@@ -2835,7 +2835,7 @@ you’re working, you simply enter the filename after
 .INCLUDE.  If the file’s in another directory, you must
 provide a full path name to it.  For example, if you’re working in
 a directory called /home/joe/stories and your
-style-sheet is in /home/joe/style-sheets, the above
+stylesheet is in /home/joe/stylesheets, the above
 example would have to look like this:
 
 
@@ -2843,7 +2843,7 @@ example would have to look like this:
   .AUTHOR "Joe Blow
   .PRINTSTYLE TYPESET
   \#
-  .INCLUDE/home/joe/style-sheets/head-template
+  .INCLUDE/home/joe/stylesheets/head-template
   \#
   .START
 
@@ -2860,9 +2860,18 @@ well.
 
 
 
-Experts:
-INCLUDE is an alias for the groff request, .so.  Mix
-’n’ match with impunity.
+Note:
+INCLUDE is an alias for the groff request .so.  If the
+sourced file contains material that requires pre-processing (e.g.
+a table made with tbl(1) or non-English characters), use
+.so rather than INCLUDE and invoke pdfmom thus:
+
+
+  soelim file.mom | pdfmom [flags] > file.pdf
+
+soelim only looks for lines that begin with .so,
+which furthermore must not have any space between the period and
+the “s”.
 
 
 
@@ -2921,7 +2930,7 @@ nor in the string arguments given to
 HEADING.
 Use, rather, the
 control macros
-mom provides to automatically colourize these elements.
+mom provides to automatically colourise these elements.
 
 
 

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: [mom]: Restore user sentence spacing after terminating call to REF.

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit c6201c82a98751abb191249b963d0327586a34f7
Author: Peter Schaffter 
AuthorDate: Fri Nov 4 12:07:46 2022 -0400

[mom]: Restore user sentence spacing after terminating call to REF.
---
 contrib/mom/BUGS| 3 +++
 contrib/mom/om.tmac | 6 ++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/contrib/mom/BUGS b/contrib/mom/BUGS
index bc686cbeb..376b29b58 100644
--- a/contrib/mom/BUGS
+++ b/contrib/mom/BUGS
@@ -23,6 +23,9 @@ the Subject line or you risk my spam filters nuking your 
message.
 
 Version 2.5_b
 =
+Sentence space not being restored after a terminating REF.
+---Fixed---
+
 CODE  not always correctly restoring point size of text
 afterwards.
 ---Fixed---
diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac
index 83a23cafe..a9365ff18 100644
--- a/contrib/mom/om.tmac
+++ b/contrib/mom/om.tmac
@@ -22284,10 +22284,8 @@ does not fit on page \\n[pgnum]\\*[col-num].
 \# up to +8.  User's sentence spacing is reset in FOOTNOTES and ENDNOTES.
 \#
 .de ref*build
-.if \\n[#PRINT_STYLE]=2 \{\
-.   ds $RESTORE_SS_VAR \\*[$SS_VAR]
-.   SS +8
-.\}
+.if \\n[#PRINT_STYLE]=2 \
+.   if (\\n[#FN_REF]+\\n[#EN_REF])>0 .SS +8
 .rm ref*string
 .while \\n[.$] \{\
 .   if d [\\$1 \{\

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/03: [mom]: Fixes CODE not restoring point size correctly

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 647db0a45ac302b97fa39b503384fc80cd6772d4
Author: Peter Schaffter 
AuthorDate: Fri Sep 2 18:51:58 2022 -0400

[mom]: Fixes CODE  not restoring point size correctly

* The point size was being stored in a number register instead of a
  string.

* Also updates BUGS
---
 contrib/mom/BUGS| 4 
 contrib/mom/om.tmac | 8 
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/contrib/mom/BUGS b/contrib/mom/BUGS
index 2ab897425..bc686cbeb 100644
--- a/contrib/mom/BUGS
+++ b/contrib/mom/BUGS
@@ -23,6 +23,10 @@ the Subject line or you risk my spam filters nuking your 
message.
 
 Version 2.5_b
 =
+CODE  not always correctly restoring point size of text
+afterwards.
+---Fixed---
+
 BLANKPAGE broken when columns are enabled.
 ---Fixed---
 
diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac
index 7b9e39652..b36129ece 100644
--- a/contrib/mom/om.tmac
+++ b/contrib/mom/om.tmac
@@ -12373,7 +12373,7 @@ Shimming must be disabled with NO_SHIM before using 
FLEX.
 .  if \\n[#CODE_COLOR]=1 .COLOR \\*[$CODE_COLOR]
 .  char ' \[aq]
 .  if !\\n[#CODE_SIZE_ADJ]=0 \{\
-. nr #RESTORE_SIZE \\n[.s]
+. ds $RESTORE_SIZE \\n[.s]
 . ps \\n[#PT_SIZE]u*\\n[#CODE_SIZE_ADJ]u/100u
 .  \}
 .  if \\n[#SQ_ON] \{\
@@ -12383,9 +12383,9 @@ Shimming must be disabled with NO_SHIM before using 
FLEX.
 .   \}
 .\}
 .el \{\
-.   fam \\*[#RESTORE_FAM]
-.   ft  \\*[#RESTORE_FT]
-.   if !\\n[#CODE_SIZE_ADJ]=0 .ps \\n[#RESTORE_SIZE]
+.   fam \\*[$RESTORE_FAM]
+.   ft  \\*[$RESTORE_FT]
+.   if !\\n[#CODE_SIZE_ADJ]=0 .ps \\*[$RESTORE_SIZE]
 .   rm $RESTORE_FAM
 .   rm $RESTORE_FT
 .   rm $RESTORE_SIZE

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 03/03: [mom]: Amends section "Add the font to the download file"

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 255202a3061b263caa1efec8602ca105fbbcdf6e
Author: Peter Schaffter 
AuthorDate: Fri Sep 2 19:02:23 2022 -0400

[mom]: Amends section "Add the font to the download file"

* Instructs user to copy the system devps download file to the
  local devps directory before adding fonts to it.
---
 contrib/mom/momdoc/appendices.html | 26 +-
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/contrib/mom/momdoc/appendices.html 
b/contrib/mom/momdoc/appendices.html
index 6dc956f3e..cdd675e4f 100644
--- a/contrib/mom/momdoc/appendices.html
+++ b/contrib/mom/momdoc/appendices.html
@@ -655,9 +655,10 @@ Make a note of the internal name.
  • Add the font to the download file
 
 
-If it does not already exist, create a
-file called ‘download’ in
-<prefix>/site-font/devps/.
+If a file called ‘download’ is not already present in
+<prefix>/site-font/devps/,
+copy over the one found in
+<prefix>/<version>/font/devps/.
 
 
 
@@ -681,13 +682,20 @@ contain
  • Updating the gropdf download file
 
 
-If you’re running a recent version of groff that includes the
-native pdf device (gropdf), you must update the
-<prefix>/site-font/devpdf/ download file
-as well, which is found in
-<prefix>/site-font/devpdf/.  If it does not
-exist, create it.
+If you’re running a recent version of groff that includes
+the native pdf device (gropdf), you must update the
+<prefix>/site-font/devpdf/download
+file as well.  If it does not exist, create it.
+
+
+
+
+Note:
+Start with a blank ‘download’ file.  Do not copy
+over the ‘download’ file from
+<prefix>/<version>/font/devpdf/.
 
+
 
 
 The instructions for registering fonts in the

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 02/03: [mom]: Fixes missing parameter to \*[SIZE] at line 457.

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 192048f145c405bb447c1026460e429947f01fcc
Author: Peter Schaffter 
AuthorDate: Fri Sep 2 19:00:40 2022 -0400

[mom]: Fixes missing parameter to \*[SIZE] at line 457.
---
 contrib/mom/examples/mom-pdf.mom | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/mom/examples/mom-pdf.mom b/contrib/mom/examples/mom-pdf.mom
index 581174d15..15cf6dfff 100644
--- a/contrib/mom/examples/mom-pdf.mom
+++ b/contrib/mom/examples/mom-pdf.mom
@@ -454,7 +454,7 @@ the \*[cod]TOP\*[codx] argument.
 BEFORE_DOCCOVER
 AFTER_DOCCOVER
 BEFORE_COVER
-AFTER_COVER\*[SIZE]
+AFTER_COVER\*[SIZE +.7]
 .SP .25v
 .ILQ
 .JUSTIFY

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: [mom]: Update appendices.html

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 2aa5335247dcf40ca1cea9c098520357aa1c34b2
Author: Peter Schaffter 
AuthorDate: Sat Aug 20 18:31:17 2022 -0400

[mom]: Update appendices.html

Reverts previous commit,  emends wording.
---
 contrib/mom/momdoc/appendices.html | 162 +
 1 file changed, 56 insertions(+), 106 deletions(-)

diff --git a/contrib/mom/momdoc/appendices.html 
b/contrib/mom/momdoc/appendices.html
index ae768f473..6dc956f3e 100644
--- a/contrib/mom/momdoc/appendices.html
+++ b/contrib/mom/momdoc/appendices.html
@@ -24,7 +24,7 @@ FDL in the main directory of the groff source package.
   
 
 
-
+
 
 
 
@@ -75,6 +75,7 @@ to the directory in which groff is installed, typically
 
 (if you’ve built groff from source).
 
+
 
 <version> refers to the groff version number, which
 can be found, if necessary, by typing
@@ -82,9 +83,7 @@ can be found, if necessary, by typing
 
   groff -v
 
-at the command line.  Groff installations usually make a symlink to
-the current version so ‘current’ may be used instead of
-the literal version number.
+at the command line.
 
 
 
@@ -417,7 +416,7 @@ your type would come out in Courier Roman!
   1. Acquire the font
   2. Prepare to convert the font to the correct 
format
   
-TTF/OTF fonts
+TTF fonts
 Type 1 fonts
   
   3. Convert the font and put it in the right 
place
@@ -428,7 +427,8 @@ your type would come out in Courier Roman!
 Updating the gropdf download file
   
   Naming groff fonts
-  Automate the whole process – the 
install-font script
+  Automate the whole process – the 
install-font script
+  
 
 
 
@@ -436,11 +436,7 @@ your type would come out in Courier Roman!
 
 There are a number of ways to approach making fonts available
 to groff.  These instructions aren’t meant to cover all
-possibilities, merely one.  What's more, they're meant for users
-wanting to understand what's involved.  The much simpler way
-is the
-install-font.sh
-script, which automates the whole process.
+possibilities, merely one.
 
 
 
@@ -470,7 +466,7 @@ to the way their distro operates.
 
   
 Locate the groff directory,
-site-font.  The exact location is
+site-font.  The exact location is
 difficult to predict, owing to differences between distros and
 whether you’re using a pre-packaged groff or have built
 it from source.  Some typical locations are:
@@ -481,11 +477,10 @@ to the way their distro operates.
   /etc/groff/
 
 If you can’t find the site-font directory, locate
-groff’s site-tmac directory, and,
-as root, create site-font in the same directory.  E.g., if you
-find site-tmac in /usr/share/groff/,
-create site-font in
-/usr/share/groff/
+groff’s site-tmac directory, and, as root,
+create site-font in the same directory.  Eg, if you find
+site-tmac in /usr/share/groff/, create site-font in
+/usr/share/groff/
 
 
   sudo mkdir site-font
@@ -523,10 +518,10 @@ Generate($fontname + ".pfa");
 Step 1: Acquire the font
 
 
-The most commonly available types of fonts are PostScript Type1
-(extension .pfb), TrueType (extension .ttf), and OpenType.  All
-can be made available to groff.  There are many websites holding
-collections of all three.
+The two most commonly available types of fonts are PostScript Type1
+(extension .pfb) and TrueType (extension .ttf).  Either can be made
+available to groff.  There are many websites holding collections of
+both.
 
 
 Step 2: Prepare to convert the font to 
the correct format
@@ -536,11 +531,11 @@ Change into the directory holding the new font.
 
 
 
-For convenience in the next step, make a symbolic link to
-the file 'text.map':
+For convenience in the next step, make a symbolic link to 
+the file 'textmap':
 
 
-  ln -s <prefix>/<version>/font/devps/generate/text.map .
+  ln -s <prefix>/<version>/font/devps/generate/textmap .
 
 See
 here
@@ -562,14 +557,14 @@ directory, make links to the files 'generate-t42.pe' and
 Step 3: Convert the font and put it in 
the right place
 
 
-TrueType (.ttf) and OpenType (.otf) fonts need to be converted to
-.t42.  Type 1 fonts (.pfb) need to be converted to .pfa.
+TrueType fonts (.ttf) need to be converted to .t42.  Type 1 fonts
+(.pfa, .pfb) need to be converted to .pfa.
 
 
- • TTF/OTF Fonts
+ • Converting TTF Fonts
 
 
-For .ttf and .otf fonts, run
+For .ttf fonts, run
 
 
   fontforge -script generate-t42.pe <file>.ttf
@@ -578,7 +573,7 @@ This will create three new files with the extensions .t42, 
.pfa, and
 .afm.  Next, run
 
 
-  afmtodit <afm file> text.map <groff font>
+  afmtodit <afm file> textmap <groff font>
 
 This will create a groff font with the name you give.  (See
 here
@@ -587,17 +582,17 @@ for advice on naming groff fonts.)
 
 
 Move the .t42 and groff font files to
-<prefix>/site-font/de

[groff] 01/01: [mom]: Doc fix headfootpage.html: Clarify use of DIVIDER arg to BLANKPAGE

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit aefda9c9a9a0f3525849011f8c02c9a41c05b811
Author: Peter Schaffter 
AuthorDate: Wed Aug 17 19:14:11 2022 -0400

[mom]: Doc fix
headfootpage.html: Clarify use of DIVIDER arg to BLANKPAGE
---
 contrib/mom/momdoc/headfootpage.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/mom/momdoc/headfootpage.html 
b/contrib/mom/momdoc/headfootpage.html
index 3abee522e..1c11ab14f 100644
--- a/contrib/mom/momdoc/headfootpage.html
+++ b/contrib/mom/momdoc/headfootpage.html
@@ -2299,7 +2299,7 @@ one blank page, you have to tell mom:
 The optional argument DIVIDER must be given if
 you’re inserting a blank page before the start of major
 document sections (chapters, endnotes, bibliographies,
-or table of contents, provided the table of contents is not being
+or tables of contents–provided the table of contents is not being
 autorelocated).
 Without the DIVIDER argument, mom simply
 inserts the blank pages and prepares the next page to receive

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: [mom]: Doc fixes appendices.html: amend font installation instructions stylesheet.css: disable ligatures tables-of-contents: trivial clarification typesetting.html: amend and correct wo

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 53a0f2c05a3a477f8be555fee2e12ab74f8cc68e
Author: Peter Schaffter 
AuthorDate: Wed Aug 17 18:46:16 2022 -0400

[mom]: Doc fixes
appendices.html: amend font installation instructions
stylesheet.css: disable ligatures
tables-of-contents: trivial clarification
typesetting.html: amend and correct wording of ALD/RLD/SPACE.
---
 contrib/mom/momdoc/appendices.html | 101 ++---
 contrib/mom/momdoc/stylesheet.css  |   4 +-
 contrib/mom/momdoc/tables-of-contents.html |   4 +-
 contrib/mom/momdoc/typesetting.html|  78 +++---
 4 files changed, 137 insertions(+), 50 deletions(-)

diff --git a/contrib/mom/momdoc/appendices.html 
b/contrib/mom/momdoc/appendices.html
index d063e5d99..ae768f473 100644
--- a/contrib/mom/momdoc/appendices.html
+++ b/contrib/mom/momdoc/appendices.html
@@ -24,7 +24,7 @@ FDL in the main directory of the groff source package.
   
 
 
-
+
 
 
 
@@ -82,7 +82,9 @@ can be found, if necessary, by typing
 
   groff -v
 
-at the command line.
+at the command line.  Groff installations usually make a symlink to
+the current version so ‘current’ may be used instead of
+the literal version number.
 
 
 
@@ -415,7 +417,7 @@ your type would come out in Courier Roman!
   1. Acquire the font
   2. Prepare to convert the font to the correct 
format
   
-TTF fonts
+TTF/OTF fonts
 Type 1 fonts
   
   3. Convert the font and put it in the right 
place
@@ -434,7 +436,11 @@ your type would come out in Courier Roman!
 
 There are a number of ways to approach making fonts available
 to groff.  These instructions aren’t meant to cover all
-possibilities, merely one.
+possibilities, merely one.  What's more, they're meant for users
+wanting to understand what's involved.  The much simpler way
+is the
+install-font.sh
+script, which automates the whole process.
 
 
 
@@ -475,9 +481,10 @@ to the way their distro operates.
   /etc/groff/
 
 If you can’t find the site-font directory, locate
-groff’s site-tmac directory, and, as root,
-create site-font in the same directory.  Eg, if you find
-site-tmac in /usr/share/groff/, create site-font in
+groff’s site-tmac directory, and,
+as root, create site-font in the same directory.  E.g., if you
+find site-tmac in /usr/share/groff/,
+create site-font in
 /usr/share/groff/
 
 
@@ -516,10 +523,10 @@ Generate($fontname + ".pfa");
 Step 1: Acquire the font
 
 
-The two most commonly available types of fonts are PostScript Type1
-(extension .pfb) and TrueType (extension .ttf).  Either can be made
-available to groff.  There are many websites holding collections of
-both.
+The most commonly available types of fonts are PostScript Type1
+(extension .pfb), TrueType (extension .ttf), and OpenType.  All
+can be made available to groff.  There are many websites holding
+collections of all three.
 
 
 Step 2: Prepare to convert the font to 
the correct format
@@ -537,8 +544,8 @@ the file 'text.map':
 
 See
 here
-for an explanation of <prefix>
-and <version>.
+for an explanation of <prefix>
+and <version>.
 
 
 
@@ -555,14 +562,14 @@ directory, make links to the files 'generate-t42.pe' and
 Step 3: Convert the font and put it in 
the right place
 
 
-TrueType fonts (.ttf) need to be converted to .t42.  Type 1 fonts
-(.pfb) need to be converted to .pfa.
+TrueType (.ttf) and OpenType (.otf) fonts need to be converted to
+.t42.  Type 1 fonts (.pfb) need to be converted to .pfa.
 
 
- • TTF Fonts
+ • TTF/OTF Fonts
 
 
-For .ttf fonts, run
+For .ttf and .otf fonts, run
 
 
   fontforge -script generate-t42.pe <file>.ttf
@@ -648,7 +655,21 @@ Make a note of the internal name.
  • Add the font to the download file
 
 
-Open the file <prefix>/<version>/font/devps/download.
+If you are installing fonts in site-font for the first time, copy
+the file
+
+
+  <prefix>/<version>/font/devps/download
+
+to
+
+
+  <prefix>/site-font/devps/
+
+
+
+
+Open <prefix>/site-font/devps/download.
 In it you will see lines of the form
 
 
@@ -669,7 +690,7 @@ is really
 
 
 
-
+
 The download file maps the internal names used by groff to the
 actual fonts.  To add your new font to the download file, append a
 line containing the internal name, followed by a tab (make sure your
@@ -690,12 +711,42 @@ contain
  • Updating the gropdf download file
 
 
-If you’re running a recent version of groff that includes the
-native pdf device (gropdf), you must update its download file as
-well, which is found in <prefix>/<version>/font/devpdf/.
-The instructions are identical to those above, but with one important
-difference: all lines must begin with a tab character.  Thus, using
-our Optima example, your devpdf download line for the same font is
+If you’re running a recent version of groff that
+i

[groff] 01/01: [mom]: Addendum to BLANKPAGE entry in docs.

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit f9800d6a25f021ae6edf6bf445435229782aa75c
Author: Peter Schaffter 
AuthorDate: Sat Aug 6 14:39:15 2022 -0400

[mom]: Addendum to BLANKPAGE entry in docs.
---
 contrib/mom/momdoc/headfootpage.html | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/contrib/mom/momdoc/headfootpage.html 
b/contrib/mom/momdoc/headfootpage.html
index ee115f454..3abee522e 100644
--- a/contrib/mom/momdoc/headfootpage.html
+++ b/contrib/mom/momdoc/headfootpage.html
@@ -2300,7 +2300,7 @@ The optional argument DIVIDER must be given if
 you’re inserting a blank page before the start of major
 document sections (chapters, endnotes, bibliographies,
 or table of contents, provided the table of contents is not being
-autorelocated.
+autorelocated).
 Without the DIVIDER argument, mom simply
 inserts the blank pages and prepares the next page to receive
 running text.
@@ -2314,6 +2314,14 @@ of which pages are recto/verso if recto/verso printing 
has been
 enabled.
 
 
+
+
+Note:
+Do not use BLANKPAGE before TOC if the table of contents is being
+autorelocated.
+
+
+
 
 
 

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: [mom]: Fixes broken BLANKPAGE when columns are enabled.

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 04dd6ce2869d190f943b3c373b4dd3d4bf9e3efa
Author: Peter Schaffter 
AuthorDate: Sat Aug 6 13:11:22 2022 -0400

[mom]: Fixes broken BLANKPAGE when columns are enabled.
---
 contrib/mom/BUGS |  3 +++
 contrib/mom/momdoc/headfootpage.html | 12 +++-
 contrib/mom/om.tmac  | 15 ---
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/contrib/mom/BUGS b/contrib/mom/BUGS
index e18d1af28..2ab897425 100644
--- a/contrib/mom/BUGS
+++ b/contrib/mom/BUGS
@@ -23,6 +23,9 @@ the Subject line or you risk my spam filters nuking your 
message.
 
 Version 2.5_b
 =
+BLANKPAGE broken when columns are enabled.
+---Fixed---
+
 Registers #FROM_COVERTITLE and #FROM_DOC_COVERTITLE not being
 cleared in macro COLLATE.
 ---Fixed---
diff --git a/contrib/mom/momdoc/headfootpage.html 
b/contrib/mom/momdoc/headfootpage.html
index 488bf0418..ee115f454 100644
--- a/contrib/mom/momdoc/headfootpage.html
+++ b/contrib/mom/momdoc/headfootpage.html
@@ -2296,11 +2296,13 @@ one blank page, you have to tell mom:
 
   .BLANKPAGE 1
 
-The optional argument, DIVIDER, must be given if
-you’re inserting a blank page before the start of any new
-document section (i.e. a new chapter, or endnotes, a bibliography,
-or table of contents).  Without the DIVIDER argument, mom
-simply inserts the blank pages and prepares the next page to receive
+The optional argument DIVIDER must be given if
+you’re inserting a blank page before the start of major
+document sections (chapters, endnotes, bibliographies,
+or table of contents, provided the table of contents is not being
+autorelocated.
+Without the DIVIDER argument, mom simply
+inserts the blank pages and prepares the next page to receive
 running text.
 
 
diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac
index 0277e83c3..7b9e39652 100644
--- a/contrib/mom/om.tmac
+++ b/contrib/mom/om.tmac
@@ -467,7 +467,7 @@ end
 .ie !\\n[#DOCS]=1 \
 .   if \\n[#B_MARGIN_SET]=1 .DO_B_MARGIN
 .el \{\
-.   if \\n[#COLUMNS]=1 .nr #COL_NUM \\n[#NUM_COLS]
+.   if (\\n[#COLUMNS]=1):(\\n[#COLUMNS]=2) .nr #COL_NUM \\n[#NUM_COLS]
 .   if !\\n[#FN_DEPTH] \{\
 .  ch FN_OVERFLOW_TRAP
 .  nr #RESET_FN_OVERFLOW_TRAP 1
@@ -10545,7 +10545,10 @@ Shimming must be disabled with NO_SHIM before using 
FLEX.
 .\}
 .nr @TOP 1
 .ie \\n[#COLUMNS]=1 \{\
-.   ie (\\n[#COL_NUM]=\\n[#NUM_COLS]):(\\n[#NEWPAGE]=1) .DO_FOOTER
+.   ie (\\n[#COL_NUM]=\\n[#NUM_COLS]):(\\n[#NEWPAGE]=1) \{\
+.  rr #NEWPAGE
+.  DO_FOOTER
+.   \}
 .   el \{\
 .  ie (\\n[#ENDNOTES]=1):(\\n[#BIBLIOGRAPHY]=1) \{\
 . if \\n[#ENDNOTES] .sp |\\n[ec]u-\\n[#EN_LEAD]u
@@ -17359,6 +17362,7 @@ E\\R'#CAP_HEIGHT \\n[.cht]'
 .  nr #RESTORE_PN_V_POS \\n[#PAGE_NUM_V_POS]
 .  PAGINATION OFF
 .   \}
+.   if \\n[#COLUMNS]=1 .nr #COLUMNS +1
 .   NEWPAGE \" Break to blank page
 .   nop \&
 .   br
@@ -17373,7 +17377,8 @@ E\\R'#CAP_HEIGHT \\n[.cht]'
 .   \}
 .   if !'\\$1'DIVIDER' .if \\n[#HEADERS_WERE_ON] .HEADERS
 .\}
-.NEWPAGE
+.if \\n[#COLUMNS]=2 .nr #COLUMNS -1
+.NEWPAGE \" Break to text page
 .ie '\\$1'DIVIDER' \{\
 .   if \\n[#BLANKPAGE_AFTER_DEFER] .bp
 .   if \\n[#FOOTERS_WERE_ON] .FOOTERS
@@ -17395,8 +17400,11 @@ E\\R'#CAP_HEIGHT \\n[.cht]'
 .   \}
 .   if '\\$1'NULL' \{\
 .  if \\n[#FOOTERS_WERE_ON] .FOOTERS
+.  if \\n[#RESTORE_PN_V_POS]=2 \
+. nr #PAGE_NUM_V_POS \\n[#RESTORE_PN_V_POS]
 .  if \\n[#PAGE_NUM_V_POS]=2 \
 . if \\n[#PAGINATE_WAS_ON] .PAGINATE
+.  nr #PAGE_NUM_ADJ -\\n[#HOW_MANY]
 .   \}
 .\}
 .if \\n[#PAGINATE]=1 \
@@ -17410,6 +17418,7 @@ E\\R'#CAP_HEIGHT \\n[.cht]'
 .rr #HEADERS_WERE_ON
 .rr #FOOTERS_WERE_ON
 .rr #PAGINATE_WAS_ON
+.rr #RESTORE_PN_V_POS
 .END
 \#
 \# FLOATS

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: [mom]: BUGS recommit; removes conflict markers.

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit b462657d4aa63a111d34ce5a08315c8214b5be2f
Author: Peter Schaffter 
AuthorDate: Wed Aug 3 18:42:12 2022 -0400

[mom]: BUGS recommit; removes conflict markers.
---
 contrib/mom/BUGS | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/contrib/mom/BUGS b/contrib/mom/BUGS
index deee8368c..e18d1af28 100644
--- a/contrib/mom/BUGS
+++ b/contrib/mom/BUGS
@@ -23,12 +23,9 @@ the Subject line or you risk my spam filters nuking your 
message.
 
 Version 2.5_b
 =
-<<<<<<< Updated upstream
 Registers #FROM_COVERTITLE and #FROM_DOC_COVERTITLE not being
 cleared in macro COLLATE.
 ---Fixed---
-===
->>>>>>> Stashed changes
 
 DROPCAP not calculating distance to FOOTER trap correctly.
 ---Fixed---

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/02: [mom]: Clear #FROM_COVERTITLE and #FROM_DOC_COVERTITLE in COLLATE

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 185ce2c309f7ac328c33de5b95efe952fa870193
Author: Peter Schaffter 
AuthorDate: Wed Aug 3 17:25:30 2022 -0400

[mom]: Clear #FROM_COVERTITLE and #FROM_DOC_COVERTITLE in COLLATE
---
 contrib/mom/BUGS| 3 +++
 contrib/mom/om.tmac | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/contrib/mom/BUGS b/contrib/mom/BUGS
index 5e32febbd..e18d1af28 100644
--- a/contrib/mom/BUGS
+++ b/contrib/mom/BUGS
@@ -23,6 +23,9 @@ the Subject line or you risk my spam filters nuking your 
message.
 
 Version 2.5_b
 =
+Registers #FROM_COVERTITLE and #FROM_DOC_COVERTITLE not being
+cleared in macro COLLATE.
+---Fixed---
 
 DROPCAP not calculating distance to FOOTER trap correctly.
 ---Fixed---
diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac
index 66ee80f37..0277e83c3 100644
--- a/contrib/mom/om.tmac
+++ b/contrib/mom/om.tmac
@@ -17134,6 +17134,8 @@ E\\R'#CAP_HEIGHT \\n[.cht]'
 .MISC
 .rr #COVER_TITLE
 .rr #DOC_COVER_TITLE
+.rr #FROM_COVERTITLE
+.rr #FROM_DOC_COVERTITLE
 .rr #MISC
 .rr #COVER_MISC
 .rr #DOC_COVER_MISC

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 02/02: [mom]: Update BUGS

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit dd38d390c58c460690d72a5f470d03adbb17d73f
Author: Peter Schaffter 
AuthorDate: Wed Aug 3 17:33:49 2022 -0400

[mom]: Update BUGS
---
 contrib/mom/BUGS | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/contrib/mom/BUGS b/contrib/mom/BUGS
index e18d1af28..deee8368c 100644
--- a/contrib/mom/BUGS
+++ b/contrib/mom/BUGS
@@ -23,9 +23,12 @@ the Subject line or you risk my spam filters nuking your 
message.
 
 Version 2.5_b
 =
+<<<<<<< Updated upstream
 Registers #FROM_COVERTITLE and #FROM_DOC_COVERTITLE not being
 cleared in macro COLLATE.
 ---Fixed---
+===
+>>>>>>> Stashed changes
 
 DROPCAP not calculating distance to FOOTER trap correctly.
 ---Fixed---

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: [mom] Fixes erroneous depth calculation in DROPCAP.

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 256e61ffc66380066a8afcc99391a959de50b555
Author: Peter Schaffter 
AuthorDate: Wed Jul 27 15:07:08 2022 -0400

[mom] Fixes erroneous depth calculation in DROPCAP.
---
 contrib/mom/BUGS| 5 +
 contrib/mom/om.tmac | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/contrib/mom/BUGS b/contrib/mom/BUGS
index 4c7a587a..5757a07a 100644
--- a/contrib/mom/BUGS
+++ b/contrib/mom/BUGS
@@ -21,6 +21,11 @@ the Subject line or you risk my spam filters nuking your 
message.
 
 
 
+Version 2.5_b
+=
+DROPCAP not calculating distance to FOOTER trap correctly.
+---Fixed---
+
 Version 2.5
 ===
 
diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac
index f5a8d157..66ee80f3 100644
--- a/contrib/mom/om.tmac
+++ b/contrib/mom/om.tmac
@@ -2677,7 +2677,7 @@ end
 .\}
 .if d$DC_ADJUST .ps \\*[$DC_ADJUST]p
 .nr #DC_LINES +1
-.if \\n[#DC_LINES]v>\\n[.t] \{\
+.if (\\n[#DC_LINES]v-1v)>(\\n[.t]-1) \{\
 .   nr pgnum \\n%+\\n[#PAGE_NUM_ADJ] 1
 .   if \\n[#COLUMNS]=1 .ds col-num ", column \\n[#COL_NUM]
 .   tm1 \

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: [mom] Fixes handling of LINEBREAK at page transitions. Adds warning if input contains tbl(1) data but '-t' not given on the command line.

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 2f4432718c50ac6cd59491366fb470f0d92f87ba
Author: Peter Schaffter 
AuthorDate: Mon Jul 25 14:51:53 2022 -0400

[mom] Fixes handling of LINEBREAK at page transitions.
Adds warning if input contains tbl(1) data but '-t' not given on the 
command line.
---
 contrib/mom/ChangeLog   |  5 +
 contrib/mom/momdoc/toc.html |  4 ++--
 contrib/mom/om.tmac | 16 +---
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/contrib/mom/ChangeLog b/contrib/mom/ChangeLog
index f1e0470f..76ae030a 100644
--- a/contrib/mom/ChangeLog
+++ b/contrib/mom/ChangeLog
@@ -1,3 +1,8 @@
+2022-05-31
+
+   * Make mom emit a warning and abort when tbl(1) data present
+   without a corresponding -t on the command line.
+
 2022-05-20  G. Branden Robinson 
 
* momdoc/appendices.html: Reflect file rename in groff
diff --git a/contrib/mom/momdoc/toc.html b/contrib/mom/momdoc/toc.html
index ef6bcf44..7cd6a427 100644
--- a/contrib/mom/momdoc/toc.html
+++ b/contrib/mom/momdoc/toc.html
@@ -20,7 +20,7 @@ FDL in the main directory of the groff source package.
 
 
   
-  Mom, version 2.5_a -- Table of Contents
+  Mom, version 2.5_b -- Table of Contents
   
 
 
@@ -31,7 +31,7 @@ FDL in the main directory of the groff source package.
 
 
   
-mom, version 2.5_a
+mom, version 2.5_b
   
 
 Table of Contents
diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac
index f10e8910..f5a8d157 100644
--- a/contrib/mom/om.tmac
+++ b/contrib/mom/om.tmac
@@ -20,7 +20,7 @@ for more details.
 You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-Version 2.5_a
+Version 2.5_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
@@ -53,7 +53,7 @@ extensions, and float management).
 .if (\n[.x]\n[.y] < 118) \
 .   ab [mom]: You need GNU troff version 1.18 or higher to run this version of 
mom.
 \# Mom version
-.ds version 2.5_a
+.ds version 2.5_b
 .if dVERSION \{\
 .   ab [mom]: Version \*[version]
 .\}
@@ -11825,7 +11825,12 @@ Shimming must be disabled with NO_SHIM before using 
FLEX.
 \#
 .MAC LINEBREAK END
 .if r #Q_AT_TOP .rr #Q_AT_TOP
-.ie  '\\*[$LINEBREAK_CHAR]'' .sp 2
+.if \\n[@TOP] .RESTORE_SPACE
+.ie '\\*[$LINEBREAK_CHAR]'' \{\
+.   br
+.   nop \&
+.   sp
+.\}
 .el \{\
 .   ie \\n[#END_QUOTE] .
 .   el .sp
@@ -20586,6 +20591,11 @@ E\\R'#CAP_HEIGHT \\n[.cht]'
 .END
 \#
 .MAC TE END
+.if !r TW \{\
+.   tm1 "[mom]: '\\n[.F]' contains tbl(1) data but '-t' flag is missing 
from
+.   tm1 "the command line.
+.   ab Aborting.
+.\}
 .ev tbl*end \" Needed because of .ad changes
 .evc \\*[ev-current] 
 .nh

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: 2.5_a doc fixes and updates.

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 9e1f67c9f7b0eda150e3fa1ed61d988be0068db3
Author: Peter Schaffter 
AuthorDate: Mon Dec 13 14:58:36 2021 -0500

2.5_a doc fixes and updates.

* LEFT_HANG entry re-written to reflect changes in the macro
---
 contrib/mom/momdoc/goodies.html | 142 
 contrib/mom/momdoc/macrolist.html   |  12 +--
 contrib/mom/momdoc/toc.html |   4 +-
 contrib/mom/momdoc/typesetting.html |  16 +++-
 4 files changed, 134 insertions(+), 40 deletions(-)

diff --git a/contrib/mom/momdoc/goodies.html b/contrib/mom/momdoc/goodies.html
index 5200873..b80dd8e 100644
--- a/contrib/mom/momdoc/goodies.html
+++ b/contrib/mom/momdoc/goodies.html
@@ -1571,67 +1571,149 @@ with .CENTER_BLOCK/.CENTER_BLOCK OFF (or 
QUIT,
 
 
 
-Macro: LEFT_HANG <character>
+Macro: LEFT_HANG <character> [ 
<gutter> ]
 
+
+• left-hung characters
+
 
 
 Inline: \*[HANG <character>]
 
+
+• right-hung characters
+
 
+
+Hung characters, frequently punctuation, fall outside the left or
+right margin.  Their purpose is usually to fine-tune justification.
+Consider the following:
+
+
+
+“Play the man, Master Ridley; we
+shall this day light such a candle,
+by God's grace, in England, as I
+trust shall never be put out.”
+
+
+  
+
+
+“
+
+
+
+
+
+
+Play the man, Master Ridley; we
+shall this day light such a candle,
+by God's grace, in England, as I
+trust shall never be put out.”
+
+
+
+
 
 
-LEFT_HANG hangs its argument to the left of the left margin.
-If enclosed in double-quotes, the argument may contain local
-horizontal motions.
+In the right hand example, the opening double-quote hangs outside
+the left margin, creating a uniform left margin for the text.
 
 
+Left hung characters
+
 
-Input text after LEFT_HANG must begin by repeating the text of the
-argument, including horizontal motions.  If the hung character is
-a left double-quote, \[lq] must be used in the argument
-and the usual keyboard double-quote (") used for the
-input text so as not to confuse SMARTQUOTES.
+LEFT_HANG hangs its first argument, the character to be hung, to
+the left of the left margin.  The optional second argument lets you
+specify an amount of space to insert between the hung character and
+the text.
 
 
 
+Input text after LEFT_HANG must begin with the character to be hung
+PLUS a
+horizontal motion
+corresponding to <gutter> if one was given.
+If the hung character is a left double-quote, \[lq]
+must be used as the argument to LEFT_HANG and the usual keyboard
+double-quote (") entered as the input text so as not to
+confuse
+SMARTQUOTES
 The following example demonstrates:
 
 
-  .LEFT_HANG "\[lq]\*[FU3]"
-  "\*[FU3]This line will have its opening double-quote
-  plus three kern units of space hung outside the
-  left margin."
+  .LEFT_HANG \[lq] 1p
+  "\*[FWD 1p]This line will have its opening double-quote
+  plus one point of space hung outside the left margin."
 
 
 
 
-The \*[HANG] inline escape hangs its single-character
-argument, typically a punctuation mark, outside the right margin of
-justified copy, like this:
-
-
-  This line will have its closing period hung outside
-  the right margin\*[HANG .]
-
-For the exceptionally fussy, \*[HANG] may
-also be used with centred text to centre the text visually without
-taking the hung punctuation into account.
+Note that what follows LEFT_HANG must be an input line and therefore
+it cannot be used to left-hang a
+HEADING
+character.
 
 
+
+
+Important:
+Versions of mom lower than 2.5_a that included LEFT_HANG required
+that the character and its gutter be entered as a single,
+concatenated argument, using horizontal motions to establish the
+gutter
+(e.g.
+FWD,
+BCK).
+Documents created with versions prior to 2.5_a may have to be
+updated.
+
+
+
+Right hung characters
+
 
+The \*[HANG c] inline escape hangs its argument outside
+the right margin of justified or quad right copy.  The argument may
+be a single character, or a single character preceded by a
+horizontal motion, effectively establishing a gutter between the
+right margin and the hung character:
+
+
+  This line will have its closing period hung outside
+  the right margin with a one point gutter\*[HANG \*[FWD 1p].]
+
 If the hung character is a right double-quote, "\[rq]"
-must be used as the argument (that is, the \[rq] character 
surrounded
-by double-quotes).  The double-quotes are required for all special
-characters of the form \[xx].
+must be used as the argument (that is, the \[rq]
+character surrounded by double-quotes).  The double-quotes are
+required for all special characters of the form
+\[name].
+Horizontal motion, if any, must fall inside the double-quotes:
+
+
+   ...and they all lived happily ever after.\*[HANG "\*[FWD 1p]\[rq]"]
+
 
 
 
 If the hung character is a hyphen,
-\*[HANG -] must come at the end of an
+\*[HANG -]
+mu

[groff] 01/01: 2.5_a bugfix release

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 7b493d6411997e0d294d282ca3d35b0da3271eb8
Author: Peter Schaffter 
AuthorDate: Mon Dec 13 14:46:20 2021 -0500

2.5_a bugfix release

* Fixes superfluous blank page when NEWPAGE is called in
  bare-metal documents that set an explicit B_MARGIN.

* LEFT_HANG rewritten; may require updating documents created with
  2.5 and earlier.

* Fixes COPYSTYLE not setting a default $CHAPTER_STRING.

* Updates BUGS.
---
 contrib/mom/BUGS| 10 +
 contrib/mom/om.tmac | 59 +++--
 2 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/contrib/mom/BUGS b/contrib/mom/BUGS
index 74b4893..4c7a587 100644
--- a/contrib/mom/BUGS
+++ b/contrib/mom/BUGS
@@ -27,6 +27,16 @@ Version 2.5
 Page offset not being restored correctly after CENTRE_BLOCK.
 ---Fixed---
 
+LEFT_HANG intermittently causing type to be raised out of position.
+---Fixed---
+
+$CHAPTER_STRING default not being set in COPYSTYLE.
+---Fixed---
+
+When using mom bare metal, NEWPAGE depositing a superfluous blank
+page unless B_MARGIN has been set explicitly.
+---Fixed---
+
 Version 2.4-4_e
 ===
 
diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac
index de73d60..f10e891 100644
--- a/contrib/mom/om.tmac
+++ b/contrib/mom/om.tmac
@@ -20,8 +20,8 @@ for more details.
 You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-Version 2.5

+Version 2.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.
@@ -53,7 +53,7 @@ extensions, and float management).
 .if (\n[.x]\n[.y] < 118) \
 .   ab [mom]: You need GNU troff version 1.18 or higher to run this version of 
mom.
 \# Mom version
-.ds version 2.5
+.ds version 2.5_a
 .if dVERSION \{\
 .   ab [mom]: Version \*[version]
 .\}
@@ -477,13 +477,15 @@ end
 .   if \\n[#FLEX_ACTIVE] \
 .  if !\\n[#NO_FLEX] \
 . tm .ds pre-newpage-\\n% \\n%@\\n[#COL_NUM]
-.if (\\n[@TOP]=0):(\\n[#END_COVER]=1) \
-.   bp
-.rr #END_COVER
-.if \\n[#RESET_FN_OVERFLOW_TRAP] \{\
-.   wh -\\n[#FN_OVERFLOW_TRAP_POS]u FN_OVERFLOW_TRAP
-.   rr #RESET_FN_OVERFLOW_TRAP_POS
-.   \}
+.ie \\n[#DOCS]=1 \{\
+.   if (\\n[@TOP]=0):(\\n[#END_COVER]=1) .bp
+.   rr #END_COVER
+.   if \\n[#RESET_FN_OVERFLOW_TRAP] \{\
+.  wh -\\n[#FN_OVERFLOW_TRAP_POS]u FN_OVERFLOW_TRAP
+.  rr #RESET_FN_OVERFLOW_TRAP_POS
+.  \}
+.\}
+.el .if !\\n[#B_MARGIN_SET]=1 .bp
 .END
 \#
 .ALIAS NEWSLIDE NEWPAGE
@@ -3687,28 +3689,15 @@ end
 \#   characters that have the form \[c].
 \#
 .MAC LEFT_HANG END
-.ie '\\$0'LEFT_HANG' \{\
-.   vpt 0
-.   sp -1
-.   nr #HANG \w'\\$1'
-.   in +\\n[#HANG]u
-.   ll +\\n[#HANG]u
-.   ie !\\n[.z] .po -\\n[#HANG]u
-.   el \!.po -\\n[#HANG]u
-.   ti -\\n[#HANG]u
-.   vpt
-.\}
-.el \{\
-.   vpt 0
-.   in
-.   ll
-.   po
-.   vpt
-.\}
+.nr hang-char-width \w'\\$1'
+.ds hang-char-gutter \\$2
+.ie '\\*[hang-char-gutter]'' \
+.   nr hang-char \\n[hang-char-width]
+.el \
+.   nr hang-char \\n[hang-char-width]+\\*[hang-char-gutter]
+\h'-\\n[hang-char]u'\c
 .END
 \#
-.ALIAS NO_HANG LEFT_HANG
-\#
 .MAC HANG END
 \c
 .if '\\$1'\[rq]' .nr #OPEN_CLOSE 0
@@ -4509,9 +4498,9 @@ y\R'#DESCENDER \\n[.cdp]'
 .   if !d$DRAFT .DRAFT 1
 .\}
 .if '\\*[$COPY_STYLE]'FINAL' .nr #COPY_STYLE 2
-.if !d$CHAPTER_STRING  .CHAPTER_STRING "Chapter"
-.if !d$DRAFT_STRING.DRAFT_STRING "Draft"
-.if !d$REVISION_STRING .REVISION_STRING "Rev."
+.if '\\*[$CHAPTER_STRING]''  .CHAPTER_STRING "Chapter"
+.if '\\*[$DRAFT_STRING]''.DRAFT_STRING "Draft"
+.if '\\*[$REVISION_STRING]'' .REVISION_STRING "Rev."
 .\" Default
 .if \\n[#DOC_TYPE]=1 \{\
 .   ie \\n[#COPY_STYLE]=1 \{\
@@ -11968,6 +11957,7 @@ Shimming must be disabled with NO_SHIM before using 
FLEX.
 .   el .ti \\n[#PP_INDENT]u
 .   return
 .\}
+.if \\n[#PP]>0 .br
 .if \\n[#DOC_TYPE]=4 \{\
 .   if !'\\n[.z]'' .di
 .   nr #TOTAL_FIELDS \\n[#FIELD]
@@ -12140,11 +12130,12 @@ Shimming must be disabled with NO_SHIM before using 
FLEX.
 .if r #QUOTE_4_HD .rr #QUOTE_4_HD
 .if r #LB_4_HD .rr #LB_4_HD
 .END
+\#
 \# 
 \#
 \# +++QUOTES+++
 \#
-\# ---Line for line quotes, i.e. poetry or code snippets---
+\# ---Line for line quotes, e.g. poetry or code snippets---
 \#
 \# UNDERLINE QUOTES
 \# 

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: Fixes div width issues in .css Cosmetic fixes to docelement.html and images.html.

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit f16bd3e60a97f66344c47c4c1c4b0d83548be8f3
Author: Peter Schaffter 
AuthorDate: Tue Oct 26 16:35:58 2021 -0400

Fixes div width issues in .css
Cosmetic fixes to docelement.html and images.html.
---
 contrib/mom/momdoc/docelement.html |  2 +-
 contrib/mom/momdoc/images.html | 23 ++-
 contrib/mom/momdoc/stylesheet.css  |  8 +++-
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/contrib/mom/momdoc/docelement.html 
b/contrib/mom/momdoc/docelement.html
index 1e03f86..161650f 100644
--- a/contrib/mom/momdoc/docelement.html
+++ b/contrib/mom/momdoc/docelement.html
@@ -40,7 +40,7 @@ FDL in the main directory of the groff source package.
 
 The document element tags
 
-
+
 
   Introduction to the document element 
tags
   Control macros – changing the tag 
defaults
diff --git a/contrib/mom/momdoc/images.html b/contrib/mom/momdoc/images.html
index ac9e7ac..8e38187 100644
--- a/contrib/mom/momdoc/images.html
+++ b/contrib/mom/momdoc/images.html
@@ -724,7 +724,28 @@ or
 
 
 
-Macro: FLOAT [ ADJUST +|-<amount> ] [ 
FORCE ] [ SPAN ] [ INDENT <value> ] [ CENTER ] [ RIGHT ] [ NO_SHIM] [ 
NO_FLEX ] | TARGET "<name>" | <anything>
+Macro: FLOAT <arguments> | 
<anything>
+
+Arguments:
+
+[ ADJUST +|-<amount> ] \
+
+[ FORCE ] \
+
+[ SPAN ] \
+
+[ INDENT <value> ] \
+
+[ CENTER ] \
+
+[ RIGHT ] \
+
+[ NO_SHIM] \
+
+[ NO_FLEX ] \
+
+[ TARGET "<name>" ]
+
 
 
 
diff --git a/contrib/mom/momdoc/stylesheet.css 
b/contrib/mom/momdoc/stylesheet.css
index 5e2c40b..2a71832 100644
--- a/contrib/mom/momdoc/stylesheet.css
+++ b/contrib/mom/momdoc/stylesheet.css
@@ -27,7 +27,7 @@ a:link.quick { text-decoration: underline; }
 
 .page /* Page setup: page color, size and border */
 {
-  width: 57% ;
+  width: 67% ;
   position: relative ;
   top: 12px ;
   bottom: 12px ;
@@ -206,13 +206,11 @@ div.rule-long /* precedes nav bar at bottom of page */
 .box-macro-args /* Macro name+args */
 {
   display: block ;
-  width: 736px ;
-  max-width: 736px ;
   border: solid 1px #302419 ;
   padding-top: 5px ;
   padding-bottom: 3px ;
-  padding-left: 12px ;
-  padding-right: 12px ;
+  padding-left: 15px ;
+  padding-right: 15px ;
   background-color: #ff ;
   white-space: nowrap ;
   overflow: auto ;

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: Macro TQ: removes FLOAT*DIV restriction from test for diversion

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 7f72c1e8663356877e08e9d42408d8c7fa1519f5
Author: Peter Schaffter 
AuthorDate: Mon Oct 25 12:39:55 2021 -0400

Macro TQ: removes FLOAT*DIV restriction from test for diversion
---
 contrib/mom/om.tmac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac
index c47b351..de73d60 100644
--- a/contrib/mom/om.tmac
+++ b/contrib/mom/om.tmac
@@ -1834,7 +1834,7 @@ end
 .   rm $ST\\n[#LOOP]_FILL
 .\}
 .rr #LOOP
-.ie '\\n[.z]'FLOAT*DIV' \{\
+.ie !'\\n[.z]'' \{\
 \!. po \\n[#L_MARGIN]u
 \!. ll \\n[#L_LENGTH]u
 .\}

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: Update BUGS.

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 5ce0b292b9a2dc7dc7e70e09b5532d1fd011
Author: Peter Schaffter 
AuthorDate: Sun Oct 10 13:43:49 2021 -0400

Update BUGS.
---
 contrib/mom/BUGS | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/contrib/mom/BUGS b/contrib/mom/BUGS
index 4369477..74b4893 100644
--- a/contrib/mom/BUGS
+++ b/contrib/mom/BUGS
@@ -21,6 +21,12 @@ the Subject line or you risk my spam filters nuking your 
message.
 
 
 
+Version 2.5
+===
+
+Page offset not being restored correctly after CENTRE_BLOCK.
+---Fixed---
+
 Version 2.4-4_e
 ===
 

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/02: Remove superfluous left double-quote.

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 40602ec5374a7462230f734bf88f508337c4910a
Author: Peter Schaffter 
AuthorDate: Sun Oct 10 13:38:14 2021 -0400

Remove superfluous left double-quote.
---
 contrib/mom/momdoc/images.html | 20 +---
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/contrib/mom/momdoc/images.html b/contrib/mom/momdoc/images.html
index efc10f5..fe33eb4 100644
--- a/contrib/mom/momdoc/images.html
+++ b/contrib/mom/momdoc/images.html
@@ -3446,20 +3446,9 @@ Macro: PAGE_COLOR  
<color> | OFF | off
 
 
 When you invoke PAGE_COLOR with a color argument, the
-current and subsequent pages turn the colour you request.  If
+current and subsequent pages turn the colour you request.  If
 more than one instance of PAGE_COLOR appears before a page break,
-only the last applies.
-
-
-
-When you invoke PAGE_COLOR with OFF or off,
-the next and subsequent pages are restored to white.  It is
-therefore possible to colour a single page and disable colouring for
-the next page by putting the two PAGE_COLOR invocations on adjacent
-lines:
-
-  .PAGE_COLOR antiquewhite
-  .PAGE_COLOR OFF
+including PAGE_COLOR OFF, only the last applies.
 
 
 
@@ -3467,8 +3456,9 @@ lines:
 Note:
 Unlike other
 toggle macros,
-PAGE_COLOR requires the use of OFF or off to
-terminate it rather than an arbitrary string.
+PAGE_COLOR requires the use of OFF or off
+to terminate it rather than an arbitrary string (QUIT, X,
+END, etc.)
 
 
 

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 02/02: Fix doc entry for PAGE_COLOR.

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 1275f3d9d2944a487a2567b79e053c5b7f2126be
Author: Peter Schaffter 
AuthorDate: Sun Oct 10 13:41:09 2021 -0400

Fix doc entry for PAGE_COLOR.
---
 contrib/mom/momdoc/refer.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/mom/momdoc/refer.html b/contrib/mom/momdoc/refer.html
index 24dd532..5fbf910 100644
--- a/contrib/mom/momdoc/refer.html
+++ b/contrib/mom/momdoc/refer.html
@@ -631,7 +631,7 @@ Chronicles to find a specific quote
   .] 168)
   A new sentence...
 
-results in ““...aluminum roaches and iron crickets.” 
(Bradbury 168)  A new sentence...”
+results in “...aluminum roaches and iron crickets.” (Bradbury 168)  A 
new sentence...”
 (which is excruciatingly correct MLA style).  The
 “[” before martian chronicles tells
 refer to print the opening parenthesis; any text immediately

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: Update slide-demo.mom

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 45f9d23af1a2af2d9ec8dc4e7fd314b76e1c7b23
Author: Peter Schaffter 
AuthorDate: Sun Oct 10 13:26:25 2021 -0400

Update slide-demo.mom

Updates slide-demo.mom for revised gropdf Deri James committed on
2021-10-10 (commit fedbf6ff9d3b84320b88c3a0ec8c951d6c07623a).
---
 contrib/mom/examples/slide-demo.mom | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/mom/examples/slide-demo.mom 
b/contrib/mom/examples/slide-demo.mom
index d9edf65..989ce5a 100644
--- a/contrib/mom/examples/slide-demo.mom
+++ b/contrib/mom/examples/slide-demo.mom
@@ -76,9 +76,9 @@
 .\" Make first slide black.
 .\" If printing, remove to save ink.
 .SLIDE_COLOR black
-.SLIDE_COLOR off
 .
 .START
+.SLIDE_COLOR off
 .
 .ADD_SPACE 9p
 .IB 8P
@@ -285,8 +285,8 @@ The SLIDE_COLOR macro lets you colour
 the whole slide (q.v.)\*[HANG .]
 .BOX off
 .
-.SLIDE_COLOR off
 .NEWSLIDE "Box 1 . O"
+.SLIDE_COLOR off
 .
 .ADD_SPACE 9p
 .

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: mom 2.5: update example files to include BOX and PAGE_COLOR

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit af394eb17b525fa465b8f2ca49d246ee46335e67
Author: Peter Schaffter 
AuthorDate: Mon Oct 4 15:18:59 2021 -0400

mom 2.5: update example files to include BOX and PAGE_COLOR
---
 contrib/mom/examples/mom-pdf.mom| 100 
 contrib/mom/examples/slide-demo.mom |  66 ++--
 2 files changed, 92 insertions(+), 74 deletions(-)

diff --git a/contrib/mom/examples/mom-pdf.mom b/contrib/mom/examples/mom-pdf.mom
index 53cd729..581174d 100644
--- a/contrib/mom/examples/mom-pdf.mom
+++ b/contrib/mom/examples/mom-pdf.mom
@@ -40,12 +40,12 @@
 .PT_SIZE  10.5
 .AUTOLEAD 3
 .PARA_INDENT 0  \" No indent because we're spacing paragraphs.
-.\" Copyright notice
 .COVERTEXT
 .SP .5v
 .QUAD CENTER
 .HY off
 .IB 8P
+.\" Copyright notice
 This file is part of groff.
 .SP .5v
 Groff is free software.  You can redistribute it
@@ -99,24 +99,24 @@ If not, see:
 .\"
 .FOOTNOTE_SIZE -1
 .\" Character definitions for program names, opts, etc.
-.char \[ghostscript]  \*[BD]ghostscript\*[PREV]
-.char \[groff]\*[BD]groff\*[PREV]
-.char \[gropdf]   \*[BD]gropdf\*[PREV]
-.char \[grops]\*[BD]grops\*[PREV]
-.char \[man]  \*[BD]man\*[PREV]
-.char \[-mom] \*[BD]\-mom\*[PREV]
-.char \[mom]  \*[BD]mom\*[PREV]
-.char \[-mpdfmark]\*[BD]\-mpdfmark\*[PREV]
-.char \[ms]   \*[BD]ms\*[PREV]
-.char \[pdfmom]   \*[BD]pdfmom\*[PREV]
-.char \[pdfroff]  \*[BD]pdfroff\*[PREV]
-.char \[-P-e] \*[BD]\-P\-e\*[PREV]
-.char \[-P-p]  \*[BD]\-P\-p\*[PREV]
-.char \[ps2pdf]   \*[BD]ps2pdf\*[PREV]
-.char \[psselect] \*[BD]psselect\*[PREV]
-.char \[-T]   \*[BD]\-T\*[PREV]
-.char \[-Tpdf]\*[BD]\-Tpdf\*[PREV]
-.char \[-Tps] \*[BD]\-Tps\*[PREV]
+.char \[ghostscript] \*[BD]ghostscript\*[PREV]
+.char \[groff]   \*[BD]groff\*[PREV]
+.char \[gropdf]  \*[BD]gropdf\*[PREV]
+.char \[grops]   \*[BD]grops\*[PREV]
+.char \[man] \*[BD]man\*[PREV]
+.char \[-mom]\*[BD]\-mom\*[PREV]
+.char \[mom] \*[BD]mom\*[PREV]
+.char \[-mpdfmark]   \*[BD]\-mpdfmark\*[PREV]
+.char \[ms]  \*[BD]ms\*[PREV]
+.char \[pdfmom]  \*[BD]pdfmom\*[PREV]
+.char \[pdfroff] \*[BD]pdfroff\*[PREV]
+.char \[-P-e]\*[BD]\-P\-e\*[PREV]
+.char \[-P-p] \*[BD]\-P\-p\*[PREV]
+.char \[ps2pdf]  \*[BD]ps2pdf\*[PREV]
+.char \[psselect]\*[BD]psselect\*[PREV]
+.char \[-T]  \*[BD]\-T\*[PREV]
+.char \[-Tpdf]   \*[BD]\-Tpdf\*[PREV]
+.char \[-Tps]\*[BD]\-Tps\*[PREV]
 .\" Strings for inline code
 .ds cod  \E*[CODE]\&\E*[COND]
 .ds codx \E*[CONDX]\E*[CODE off]\&
@@ -128,13 +128,6 @@ If not, see:
 . nop \*[COND]\\$*\*[CONDX]
 . QUOTE OFF
 ..
-.\" Note box
-.de BOX-NOTE
-. ie \\n[#NUM_ARGS]=1 .DBX .5 0 \\n[.l]u \\$1
-. el .DBX .5 0 \\$1 \\$2
-. ALD 15p
-. IB 6p
-..
 .\" Table of contents
 .TOC_PADDING 2
 .SPACE_TOC_ITEMS
@@ -145,7 +138,7 @@ If not, see:
 .\"
 .DOCHEADER_ADVANCE 5c \" Begin docheader this distance down from top of page
 .\"
-.NO_SHIM
+.NO_SHIM \" Use flex spacing
 .START
 .\"
 .SP .5c
@@ -191,7 +184,7 @@ of PDF features available in \[mom].
 .COD "pdfmom doc.mom > doc.pdf
 One reason to prefer using the native PDF driver (via \[pdfmom] or
 \[-Tpdf]) is that papersizes set within mom source files (see
-.PDF_WWW_LINK 
http://www.schaffter.ca/mom/momdoc/typesetting.html#page-setup-intro SUFFIX ) \
+.PDF_WWW_LINK 
https://www.schaffter.ca/mom/momdoc/typesetting.html#page-setup-intro SUFFIX ) \
   "paper and page setup macros"
 do not require a corresponding \[-P-p] flag on the
 command line.
@@ -299,12 +292,12 @@ used as the text.  If hotlink text is given and ends in
 URL.  If it ends in \*[cod]\[dq]+\[dq]\*[codx]\*[BU9], the URL is
 surrounded by quotes.  As an example,
 .RW 0
-.COD "\&.PDF_WWW_LINK http://www.schaffter.ca/mom/momdoc/toc.html
+.COD "\&.PDF_WWW_LINK https://www.schaffter.ca/mom/momdoc/toc.html
 would open mom's online documentation at
-.PDF_WWW_LINK http://www.schaffter.ca/mom/momdoc/toc.html SUFFIX "." 
+.PDF_WWW_LINK https://www.schaffter.ca/mom/momdoc/toc.html SUFFIX "." 
 The same, with \*[cod]\[dq]here\[dq]\*[codx] supplied as
 hotlink text, lets you click
-.PDF_WWW_LINK http://www.schaffter.ca/mom/momdoc/toc.html "here"
+.PDF_WWW_LINK https://www.schaffter.ca/mom/momdoc/toc.html "here"
 instead.
 .HEADING 2 NAMED colour  "Assigning a colour to links"
 .PP
@@ -312,9 +305,9 @@ The colour of links is set with
 .COD "\&.PDF_LINK_COLOR  |  |  | <#rrggbb>
 where \*[cod]\*[codx] or \*[cod]\*[codx] are the names
 of colours already initialized with
-.PDF_WWW_LINK http://www.schaffter.ca/mom/m

[groff] 01/01: mom 2.5: add doc entries for BOX and PAGE_COLOR

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 36b60c9ccc74f2a21f0756172831a2b2c27b
Author: Peter Schaffter 
AuthorDate: Mon Oct 4 15:09:01 2021 -0400

mom 2.5: add doc entries for BOX and PAGE_COLOR
---
 contrib/mom/momdoc/images.html | 591 -
 1 file changed, 529 insertions(+), 62 deletions(-)

diff --git a/contrib/mom/momdoc/images.html b/contrib/mom/momdoc/images.html
index b24377c..efc10f5 100644
--- a/contrib/mom/momdoc/images.html
+++ b/contrib/mom/momdoc/images.html
@@ -45,12 +45,12 @@ FDL in the main directory of the groff source package.
   Inserting images and graphics
   
 Image conversion and file processing
-
+
   PDF
   EPS
 
 The PDF_IMAGE macro
-
+
   PDF_IMAGE_FRAME—set parameters 
for image frames
 
 The PSPIC macro
@@ -59,7 +59,7 @@ FDL in the main directory of the groff source package.
   
 The FLOAT macro
 Labelling and captioning floats
-   
+   
LABEL
CAPTION

@@ -67,20 +67,20 @@ FDL in the main directory of the groff source package.
   Preprocessor support
   
 tbl
-
+
   .TS / .TH / .TE macros and arguments
 
 eqn
-  
+  
 .EQ / .EN macros and arguments
   
 pic
-
+
   .PS / .PE macros and arguments
-  PIC_TEXT_STYLE—set parameters 
for text used in diagrams
+  PIC_TEXT_STYLE—set parameters 
for text in diagrams
 
 grap
-
+
 
 refer
   
@@ -89,7 +89,7 @@ FDL in the main directory of the groff source package.
   AUTOLABEL
   SET_AUTOLABEL
   CAPTION_AFTER_LABEL
-  CAPTIONS / LABELS / 
SOURCES—set style parameters for each
+  CAPTIONS / LABELS / 
SOURCES—set parameters for each
   MLA
 
   Lists of Figures, Tables, and Equations
@@ -97,11 +97,28 @@ FDL in the main directory of the groff source package.
   Placement of Lists
   Macros to generate Lists
   Formatting and style parameters for 
Lists
-  
+  
 LISTS_STYLE
   
   
-
+  Shaded backgrounds and frames (boxes)
+
+  Introduction and description
+  The BOX macro
+  Additional notes on box usage and 
behaviour
+
+ QUOTE, BLOCKQUOTE, EPIGRAPH, FLOAT
+ CODE
+ Description of boxed BLOCKQUOTEs and 
EPIGRAPHs
+ 
+   Leftover box syndrome
+ 
+ Slides
+ Footnotes
+
+  Page colour
+
+  
 
 
 
@@ -178,16 +195,18 @@ recommended.
 
 
 
-
+
 
 
 PDF_IMAGE
 
 
 
-Macro: PDF_IMAGE [ -L | -C | -R | -I 
<indent> ] \
+Macro: PDF_IMAGE \
+
+[ -L | -C | -R | -I <indent> ] \
 
-<pdf image> <width> <height> [ SCALE <factor> ] \
+<pdf image file> <width> <height> [ SCALE <factor> ] \
 
 [ ADJUST +|-<vertical adjustment> ] [ NO_SHIM ] [ NO_FLEX ] \
 
@@ -321,11 +340,11 @@ enabled, which it is by default.  Shimming ensures that 
running text
 after the image falls properly on the page’s
 baseline grid,
 but can result in slightly unequal spacing above and below
-(correctible with the ADJUST argument).
+(correctable with the ADJUST argument).
 NO_SHIM is useful when you have several images on the
 page and there are visible differences in the spacing beneath them
 as a result of shimming.  To ensure a flush bottom margin, the last
-image on the page should be shimmed, ie should not be given the
+image on the page should be shimmed, i.e. should not be given the
 NO_SHIM argument.
 
 
@@ -339,7 +358,7 @@ enabled. NO_FLEX is useful when you have several 
images
 on the page and you want to distribute excess vertical
 whitespace on the page amongst other flex-spacing points on the
 page.  If there are no others, the final image should be
-flex-spaced, ie not given the NO_FLEX argument.
+flex-spaced, i.e. not given the NO_FLEX argument.
 
 
 FRAME
@@ -401,7 +420,7 @@ When
 is enabled and the document is processed with
 pdfmom,
 the target name can be used to generate the target’s label
-number in running text if it is entered as a groff string, ie of the
+number in running text if it is entered as a groff string, i.e. of the
 form \*[name].  For example, if you create a target named
 “foo” for a pdf image whose autolabel number would be 3,
 entering
@@ -638,6 +657,19 @@ start on one page and finish on the next.
 
 
 
+Floats always begin in
+no-fill mode.
+Text entered immediately after FLOAT will be set line-for-line
+unless a
+JUSTIFY
+or
+QUAD L|R|C
+precedes it.  Alternatively, any macro that sets a quad direction
+may be used, e.g.
+PP.
+
+
+
 Floats always deposit a break before they begin, which means the
 line beforehand will not be
 filled.
@@ -744,7 +776,7 @@ the space allotted to it by the specified amount.
 unit of measure
 appended.  ADJUST gives you precise control over
 the vertical centering of floats, allowing you to compensate f

[groff] 01/01: mom 2.5: update BUGS, ChangeLog, NEWS

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 070d977ef737e6c2c213f3290935383bb65e49df
Author: Peter Schaffter 
AuthorDate: Mon Oct 4 15:05:54 2021 -0400

mom 2.5: update BUGS, ChangeLog, NEWS
---
 contrib/mom/BUGS  | 17 +
 contrib/mom/ChangeLog |  7 +++
 contrib/mom/NEWS  |  8 ++--
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/contrib/mom/BUGS b/contrib/mom/BUGS
index 85b9679..4369477 100644
--- a/contrib/mom/BUGS
+++ b/contrib/mom/BUGS
@@ -21,6 +21,23 @@ the Subject line or you risk my spam filters nuking your 
message.
 
 
 
+Version 2.4-4_e
+===
+
+LANDSCAPE arg to PAPER not being appended to $PAPER so PAPER 
+isn't picking it up when PAPER is called at the top of DEFAULTS. 
+---Fixed---
+
+BLANKPAGE with NULL arg printing incorrect page number when page
+numbering is restored.
+---Fixed---
+
+BLANKPAGE with DIVIDER arg spitting out one too many pages.
+---Fixed---
+
+Hyphens appearing mid-line in runon footnotes.
+---Fixed---
+
 Version 2.4-4_b
 ===
 SMALLCAPS introducing a small indent equal to a wordspace when
diff --git a/contrib/mom/ChangeLog b/contrib/mom/ChangeLog
index c187f46..3a937a5 100644
--- a/contrib/mom/ChangeLog
+++ b/contrib/mom/ChangeLog
@@ -1,3 +1,10 @@
+2021-10-04
+
+   * version 2.5 release (see NEWS)
+
+   * removed orphaned stubs for abandoned cutaround feature from
+   om.tmac
+
 2019-12-26
 
* added PREFIX_CHAPTER argument to HEADING_STYLE
diff --git a/contrib/mom/NEWS b/contrib/mom/NEWS
index d0dd283..2279a90 100644
--- a/contrib/mom/NEWS
+++ b/contrib/mom/NEWS
@@ -5,9 +5,13 @@
 are permitted in any medium without royalty provided the copyright
 notice and this notice are preserved.
 
-Release 2.4
+Release 2.5
 ---
-General bug fix release, with an overhaul of float, image, and
+Addition of shaded backgrounds, frames, and page colour.
+
+Releases 2.4 — 2.4-4_e
+--
+General bug fix releases, with an overhaul of float, image, and
 pre-processor handling to correct inconsistencies in spacing,
 indents, labels, and captions.  Corrects page numbering issue in
 "Lists of..." when pre-processor material is floated and defered.

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: mom 2.5 release

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit b84ed3b75c9657fce3da12ca77aefd8d122d473e
Author: Peter Schaffter 
AuthorDate: Mon Oct 4 14:55:08 2021 -0400

mom 2.5 release

Adds shaded backgrounds, frames, and page colour.
Removes orphaned cutaround stubs from om.tmac.
Improves spacing of pic and its labels/captions.
---
 contrib/mom/om.tmac | 1670 ++-
 1 file changed, 1257 insertions(+), 413 deletions(-)

diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac
index 46868ac..c47b351 100644
--- a/contrib/mom/om.tmac
+++ b/contrib/mom/om.tmac
@@ -20,8 +20,8 @@ for more details.
 You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-Version 2.4-4_e

+Version 2.5
+---
 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.
@@ -53,7 +53,7 @@ extensions, and float management).
 .if (\n[.x]\n[.y] < 118) \
 .   ab [mom]: You need GNU troff version 1.18 or higher to run this version of 
mom.
 \# Mom version
-.ds version 2.4-4_e
+.ds version 2.5
 .if dVERSION \{\
 .   ab [mom]: Version \*[version]
 .\}
@@ -652,7 +652,16 @@ end
 .  nr #RESET_TRAPS 1
 .   \}
 .\}
-.el .if \\n[#AUTO_LEAD] .vs \\n[.ps]u+\\n[#AUTOLEADING]u
+.el \{\
+.   if \\n[#AUTO_LEAD] \{\
+.  nr #SAVED_VS \\n[.v]
+.  vs \\n[.ps]u+\\n[#AUTOLEADING]u
+.   \}
+.\}
+.if \\n[pdfbx-running]=1 \{\
+.   nr #VS_DIFF \\n[#SAVED_VS]-\\n[.v]
+.   ch FOOTER \\n[#VARIABLE_FOOTER_POS]u+\\n[#VS_DIFF]u
+.\}
 .END
 \#
 \# SIZE (inline)
@@ -689,7 +698,12 @@ end
 .   rr #AUTOLEAD_VALUE
 .   rr #AUTOLEADING
 .\}
+.nr #SAVED_VS \\n[.v]
 .vs \\$1
+.if \\n[pdfbx-running]=1 \{\
+.   nr #VS_DIFF \\n[#SAVED_VS]-\\n[.v]
+.   ch FOOTER \\n[#VARIABLE_FOOTER_POS]u+\\n[#VS_DIFF]u
+.\}
 .if !\\n[#START] \
 .   if \\n[.t]<\\n[.v] 'bp
 .END
@@ -1430,6 +1444,7 @@ end
 \#   Justifies text left and right.
 \#
 .MAC JUSTIFY END
+\#.if r pdfbx-top 'sp -1
 .if \\n[#TAB_ACTIVE]=0 \{\
 .   nr #QUAD 1
 .   ds $RESTORE_QUAD_VALUE \\*[$QUAD_VALUE]
@@ -1454,7 +1469,15 @@ end
 \#   mode is enabled.
 \#
 .MAC QUAD END
-.br
+.if r pdfbx-top \{\
+'   sp -1
+.   rr pdfbx-top
+.\}
+.\" The QUAD in PP adds an unwanted linespace after a HEADING at the
+.\" top of a pdf box because of this .br, so HEADING assigns the
+.\" tmp register "bx-top\n[stack]" to inhibit it.
+.ie !r pdfbx-top\\n[stack] .br
+.el .rr pdfbx-top\\n[stack]
 .if \\n[#COVERTEXT_PP] \
 .   ds $RESTORE_DOC_QUAD \\*[$QUAD_VALUE]
 .ds $QUAD_VALUE \\$1
@@ -2786,8 +2809,8 @@ end
 \#   Rules are drawn left-to-right, from the baseline down, and
 \#   return to their point of origin.  Color must be set in the
 \#   macro; otherwise the color will be black, regardless of current
-\#   .gcolor.  If no arg given, the rule weight is the one set by
-\#   RULE_WEIGHT.
+\#   .gcolor.  If no arg given (full measure rule), the rule weight
+\#   is the one set by RULE_WEIGHT.
 \#
 .MAC DRH END
 .GRAPHICAL_OBJ
@@ -2954,22 +2977,41 @@ end
 \# BOXES - DBX
 \# ---
 \# *Arguments:
-\#| SOLID>[  ]
+\#   |SOLID  |FULL_MEASURE  [  ]
 \# *Function:
 \#   Draws described box.
 \# *Notes:
 \#   Boxes are drawn left-to-right, from the baseline down, and
 \#   return to their point of origin.  Box rules are drawn from the
 \#   perimeter inwards.  Color must be set in the macro; otherwise
-\#   the color will be black, regardless of current .gcolor.  If no
-\#   arg given, the rule weight is the one set by RULE_WEIGHT.
+\#   the color will be black, regardless of current .gcolor.
 \#
 .MAC DBX END
 .GRAPHICAL_OBJ
 .ie '\\$1'SOLID' .nr #BX_SOLID 1
-.el  .ds $BX_WEIGHT \\$1
+.el .ds $BX_WEIGHT \\$1
 .ds $BX_INDENT \\$2
-.ds $BX_WIDTH  \\$3
+.ie '\\$3'FULL_MEASURE' \{\
+.   ie 
(\\n[#INDENT_LEFT_ACTIVE]+\\n[#INDENT_RIGHT_ACTIVE]+\\n[#INDENT_BOTH_ACTIVE])=0 
\{\
+.  nr #WIDTH \\n[.l]
+.  ds $BX_WIDTH \\n[#WIDTH]u
+.   \}
+.   el \{\
+.  if \\n[#INDENT_LEFT_ACTIVE] \{\
+. nr #WIDTH \\n[.l]-\\n[#L_INDENT]
+. ds $BX_WIDTH \\n[#WIDTH]u
+.  \}
+.  if \\n[#INDENT_RIGHT_ACTIVE] \{\
+. nr #WIDTH \\n[.l]
+. ds $BX_WIDTH \\n[#WIDTH]u
+.  \}
+.  if \\n[#INDENT_BOTH_ACTIVE] \{\
+. nr #WIDTH \\n[.l]-(\\n[#BL_INDENT])
+. ds $BX_WIDTH \\n[#WIDTH]u
+.  \}
+.   \}
+.\}
+.el .ds $BX_WIDTH \\$3
 .ds $BX_DEPTH  \\$4
 .ie !'\\$5'' \{\
 .   ie d$\\$5_FILL .ds $BX_COLOR \\*[$\\$5_FILL]
@@ -3023,7 +3065

[groff] 01/02: Use explicit dimensions for paper size.

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 79646c36bae11d289a94682a8c19ac0843151498
Author: Peter Schaffter 
AuthorDate: Sat Jan 30 14:30:36 2021 -0500

Use explicit dimensions for paper size.

Use explicit dimensions for paper size in PRINTSTYLE and DEFAULTS
instead of $PAPER.
---
 contrib/mom/om.tmac | 16 +---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac
index 0cc2c87..f32a9ba 100644
--- a/contrib/mom/om.tmac
+++ b/contrib/mom/om.tmac
@@ -20,7 +20,7 @@ for more details.
 You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-Version 2.4-4_d
+Version 2.4-4_e
 ---
 Antoine de St-Exupéry asserted that elegance in engineering is
 achieved not when there is nothing left to add, but when there is
@@ -54,7 +54,7 @@ extensions, and float management).
 .if (\n[.x]\n[.y] < 118) \
 .   ab [mom]: You need GNU troff version 1.18 or higher to run this version of 
mom.
 \# Mom version
-.ds version 2.4-4_d
+.ds version 2.4-4_e
 .if dVERSION \{\
 .   ab [mom]: Version \*[version]
 .\}
@@ -4179,7 +4179,10 @@ y\R'#DESCENDER \\n[.cdp]'
 \#
 .MAC PRINTSTYLE END
 .if !\\n[#COLLATE]=1 \{\
-.   if !d$PAPER .PAPER LETTER
+.   if !d$PAPER \{\
+.  PAGELENGTH 11i
+.  PAGEWIDTH  8.5i
+.   \}
 .   if '\\$1'TYPEWRITE' \{\
 .  nr #PRINT_STYLE 1
 .  if !\\n[#DOC_TYPE]=4 \{\
@@ -5758,6 +5761,13 @@ SMALLCAPS takes precedence.
 \#   $REVISION_STRING are in the COPYSTYLE macro.
 \#
 .MAC DEFAULTS END
+.if !\\n[#DOC_TYPE]=5 \{\
+.   ie !d $PAPER \{\
+.  PAGEWIDITH \\n[#PAGE_WIDTH]u
+.  PAGELENGTH \\n[.p]u
+.   \}
+.   el .PAPER \\*[$PAPER]
+.\}
 .if !\\n[#DOC_TYPE] .DOCTYPE DEFAULT
 .if !r #CH_NUM .nr #CH_NUM 1 
 .ie \\n[#PAGENUM_STYLE_SET] .PAGENUM_STYLE \\*[$PAGENUM_STYLE]

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 02/02: Update documentation version number.

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 49f8f40ca2f3cf99f463b8f79dcb304c555f6272
Author: Peter Schaffter 
AuthorDate: Sat Jan 30 14:33:22 2021 -0500

Update documentation version number.
---
 contrib/mom/momdoc/toc.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/mom/momdoc/toc.html b/contrib/mom/momdoc/toc.html
index 5632b4c..ed0b645 100644
--- a/contrib/mom/momdoc/toc.html
+++ b/contrib/mom/momdoc/toc.html
@@ -20,7 +20,7 @@ FDL in the main directory of the groff source package.
 
 
   
-  Mom, version 2.4-4_d -- Table of Contents
+  Mom, version 2.4-4_e -- Table of Contents
   
 
 
@@ -31,7 +31,7 @@ FDL in the main directory of the groff source package.
 
 
   
-mom, version 2.4-4_d
+mom, version 2.4-4_e
   
 
 Table of Contents

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: Doc fixes.

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 7bb53f135a4ad69956be1c45689d0eb05cc18de1
Author: Peter Schaffter 
AuthorDate: Thu Jan 21 13:17:29 2021 -0500

Doc fixes.

Correct miscellaneous typos and style nits.

Add strikethrough tip to UNDERSCORE.

Remove mention of comments being stripped from om.tmac during build.

Add para concerning use of Zapf Dingbats font and accessing
undefined characters in it.
---
 contrib/mom/momdoc/docelement.html  |  2 +-
 contrib/mom/momdoc/goodies.html | 14 +++---
 contrib/mom/momdoc/inlines.html |  6 +++---
 contrib/mom/momdoc/intro.html   |  9 -
 contrib/mom/momdoc/toc.html |  4 ++--
 contrib/mom/momdoc/typesetting.html | 13 +
 gnulib  |  2 +-
 7 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/contrib/mom/momdoc/docelement.html 
b/contrib/mom/momdoc/docelement.html
index 4f14784..7db22d9 100644
--- a/contrib/mom/momdoc/docelement.html
+++ b/contrib/mom/momdoc/docelement.html
@@ -1906,7 +1906,7 @@ and a vertical adjustment factor.
 
 
 The first argument is any valid groff character (e.g., *
-[an asterisk], \[dg] [a dagger], \f[ZD]\N'141\fP
+[an asterisk], \[dg] [a dagger], \f[ZD]\N'141'\fP
 [an arbitrary character from Zapf Dingbats], \l'4P' [a
 4-pica long rule]). Mom sets the character centred on the current
 line length.  (See man groff_char for a list of all
diff --git a/contrib/mom/momdoc/goodies.html b/contrib/mom/momdoc/goodies.html
index ddff28e..6bf3a5d 100644
--- a/contrib/mom/momdoc/goodies.html
+++ b/contrib/mom/momdoc/goodies.html
@@ -714,7 +714,7 @@ required
 The string must be enclosed in double-quotes, like this:
 
 
-  .UNDERSCORE "Unmonitored monopolies breed high prices and poor 
products." 
+  .UNDERSCORE "Unmonitored monopolies breed high prices and poor products."
 
 If you wish to change the distance of the rule from the baseline,
 use the optional argument
@@ -722,14 +722,22 @@ use the optional argument
 (with a unit of measure).
 
 
-  .UNDERSCORE 3p "Unmonitored monopolies breed high prices and poor 
products." 
+  .UNDERSCORE 3p "Unmonitored monopolies breed high prices and poor products."
 
-The above places upper edge of the underscore 3 points below the
+The above places the upper edge of the underscore 3 points below the
 baseline.
 
 
 
 
+Tip:
+UNDERSCORE can also be used for strikethrough effects by supplying a
+negative value to the distance argument.
+
+
+
+
+
 Note:
 UNDERSCORE does not work across line breaks in output copy, which is
 to say that you can’t underscore a multi-line passage simply
diff --git a/contrib/mom/momdoc/inlines.html b/contrib/mom/momdoc/inlines.html
index be3e06d..39efd3a 100644
--- a/contrib/mom/momdoc/inlines.html
+++ b/contrib/mom/momdoc/inlines.html
@@ -623,10 +623,10 @@ the input line in previous tab, like this:
 Full measure rules
 
 I find I often need rules drawn to the full measure of the current line
-or tab length.  The official way to do this is \l'\n[.lu]',
+or tab length.  The official way to do this is \l'\n[.l]u',
 which is annoying to type, and doesn’t mean a whole heck of a lot if
 you’re new to groff.  The inline, \*[RULE], is a simple
-replacement for \l'\n[.lu]'.  Use it whenever you need
+replacement for \l'\n[.l]u'.  Use it whenever you need
 a rule drawn to the full measure of the current line or tab length, for
 example:
 
@@ -1027,7 +1027,7 @@ For a complete list of special characters and glyphs (ie 
just
 about anything you’d ever want to appear on the printed
 page, including mathematical symbols, accented characters, unusual
 ligatures and letters unique to various European languages), consult
-man groff-char.
+man groff_char.
 
 
 
diff --git a/contrib/mom/momdoc/intro.html b/contrib/mom/momdoc/intro.html
index 014a265..b8feca2 100644
--- a/contrib/mom/momdoc/intro.html
+++ b/contrib/mom/momdoc/intro.html
@@ -336,15 +336,6 @@ addition to what’s contained in this documentation.
 
 
 
-
-
-Addendum: The main macro file, om.tmac, is 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
-mom’s homepage.
-
-
-
 
 
 How to read macro arguments
diff --git a/contrib/mom/momdoc/toc.html b/contrib/mom/momdoc/toc.html
index b136ff9..5632b4c 100644
--- a/contrib/mom/momdoc/toc.html
+++ b/contrib/mom/momdoc/toc.html
@@ -20,7 +20,7 @@ FDL in the main directory of the groff source package.
 
 
   
-  Mom, version 2.4-4_c -- Table of Contents
+  Mom, version 2.4-4_d -- Table of Contents
   
 
 
@@ -31,7 +31,7 @@ FDL in the main directory of the groff source package.
 
 
   
-mom, version 2.4-4_c
+mom, version 2.4-4_d
   
 
 Table of Contents
diff --git a/contrib/mom/momdoc/typesetting.html 
b/contrib/mom/momdoc/typesetting.html
index c2

[groff] 01/02: Update mom copyright rile.

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit e568a2de816238f1e6fcd1c91f49c90b31cd46d4
Author: Peter Schaffter 
AuthorDate: Thu Jan 21 13:07:18 2021 -0500

Update mom copyright rile.
---
 contrib/mom/copyright | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/mom/copyright b/contrib/mom/copyright
index cbcc0cb..04c09d9 100644
--- a/contrib/mom/copyright
+++ b/contrib/mom/copyright
@@ -9,7 +9,7 @@ K1L 7A3
 
 
 The groff macro file om.tmac and the html documentation pertaining to
-it are Copyright (C) 2004-2020 Peter Schaffter.
+it are Copyright (C) 2004-2021 Peter Schaffter.
 
 om.tmac is issued under the GNU General Public License, a full copy of
 which can be had at

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 02/02: Fix .ss calls, move misplaced .na

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit f44f573d2bbdf66355cc9e4d46d771c7d66a552f
Author: Peter Schaffter 
AuthorDate: Thu Jan 21 13:09:59 2021 -0500

Fix .ss calls, move misplaced .na

Amend instances of (\n[.ss]-\n[.ss]) as 2nd arg to .ss to just "0".

Move .na in macro EQ to correct position (i.e. after capturing \n[.j]).
---
 contrib/mom/om.tmac | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac
index ad9fcad..0cc2c87 100644
--- a/contrib/mom/om.tmac
+++ b/contrib/mom/om.tmac
@@ -20,7 +20,7 @@ for more details.
 You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-Version 2.4-4_c
+Version 2.4-4_d
 ---
 Antoine de St-Exupéry asserted that elegance in engineering is
 achieved not when there is nothing left to add, but when there is
@@ -54,7 +54,7 @@ extensions, and float management).
 .if (\n[.x]\n[.y] < 118) \
 .   ab [mom]: You need GNU troff version 1.18 or higher to run this version of 
mom.
 \# Mom version
-.ds version 2.4-4_c
+.ds version 2.4-4_d
 .if dVERSION \{\
 .   ab [mom]: Version \*[version]
 .\}
@@ -1976,7 +1976,7 @@ end
 .ds $SAVED_SS_VAR \\*[$SS_VAR]
 .ie '\\$1'' \{\
 .   nr #UNDERLINE_ON 1
-.   ss \\n[.ss] (\\n[.ss]-\\n[.ss])
+.   ss \\n[.ss] 0
 .   ie !n .nop \X'ps: exec \\n[_w] \\n[_d] decorline'\c
 .   el .cu 1000
 .\}
@@ -2001,7 +2001,7 @@ end
 .MAC UL END
 \c
 .ds $SAVED_SS_VAR \\*[$SS_VAR]
-.ss \\n[.ss] (\\n[.ss]-\\n[.ss])
+.ss \\n[.ss] 0
 .ie !'\\n[.z]'' \{\
 \c
 .   ie !n \{\
@@ -3326,7 +3326,7 @@ end
 \#
 .MAC SS END
 .ds $SS_VAR \\$1
-.ie '\\$1'0' .ss \\n[.ss] (\\n[.ss]-\\n[.ss])
+.ie '\\$1'0' .ss \\n[.ss] 0
 .el \{\
 .   ie '\\$1'DEFAULT' .ss \\n[.ss]
 .   el.ss \\n[.ss] \\*[$SS_VAR]
@@ -20977,10 +20977,10 @@ does not fit on page \\n[pgnum]\\*[col-num].
 .   if !\\n[pgnum] .nr pgnum \\n%+\\n[#PAGE_NUM_ADJ]
 .   br
 .   if \\n[.u] .nr fill 1
-.   na
 .   rr float*eqn
 .   if '\\n[.z]'FLOAT*DIV' .nr float*eqn 1
 .   nr eqn*restore-adj \\n[.j]
+.   na
 .   if !\\n[continued] \{\
 .  PDF_TARGET eqn:\\n+[lists*target]
 .  rr eqn*type

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: Fix SMALLCAPS indenting slightly when called after PP. Update BUGS and version number in html docs.

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit e73226432845a4694bcd7fdd10a373b24bb223ed
Author: Peter Schaffter 
AuthorDate: Tue Jun 9 14:04:32 2020 -0400

Fix SMALLCAPS indenting slightly when called after PP.
Update BUGS and version number in html docs.
---
 contrib/mom/BUGS|  6 ++
 contrib/mom/momdoc/toc.html |  4 ++--
 contrib/mom/om.tmac | 44 +++-
 3 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/contrib/mom/BUGS b/contrib/mom/BUGS
index 9d72dd3..85b9679 100644
--- a/contrib/mom/BUGS
+++ b/contrib/mom/BUGS
@@ -21,6 +21,12 @@ the Subject line or you risk my spam filters nuking your 
message.
 
 
 
+Version 2.4-4_b
+===
+SMALLCAPS introducing a small indent equal to a wordspace when
+called after PP.
+---Fixed---
+
 Version 2.4-4_a
 ===
 BIBLIOGRAPHY_SPACING not being respected.
diff --git a/contrib/mom/momdoc/toc.html b/contrib/mom/momdoc/toc.html
index 7f63e30..b136ff9 100644
--- a/contrib/mom/momdoc/toc.html
+++ b/contrib/mom/momdoc/toc.html
@@ -20,7 +20,7 @@ FDL in the main directory of the groff source package.
 
 
   
-  Mom, version 2.4-4_b -- Table of Contents
+  Mom, version 2.4-4_c -- Table of Contents
   
 
 
@@ -31,7 +31,7 @@ FDL in the main directory of the groff source package.
 
 
   
-mom, version 2.4-4_b
+mom, version 2.4-4_c
   
 
 Table of Contents
diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac
index c8e6a69..ad9fcad 100644
--- a/contrib/mom/om.tmac
+++ b/contrib/mom/om.tmac
@@ -20,7 +20,7 @@ for more details.
 You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-Version 2.4-4_b
+Version 2.4-4_c
 ---
 Antoine de St-Exupéry asserted that elegance in engineering is
 achieved not when there is nothing left to add, but when there is
@@ -54,7 +54,7 @@ extensions, and float management).
 .if (\n[.x]\n[.y] < 118) \
 .   ab [mom]: You need GNU troff version 1.18 or higher to run this version of 
mom.
 \# Mom version
-.ds version 2.4-4_b
+.ds version 2.4-4_c
 .if dVERSION \{\
 .   ab [mom]: Version \*[version]
 .\}
@@ -1973,7 +1973,6 @@ end
 .END
 \#
 .MAC UNDERLINE END
-\c
 .ds $SAVED_SS_VAR \\*[$SS_VAR]
 .ie '\\$1'' \{\
 .   nr #UNDERLINE_ON 1
@@ -3940,28 +3939,31 @@ end
 \#   SMALLCAPS has no inline escape eqiv. to \*[UC].
 \#
 .MAC SMALLCAPS END
-.if \\n[.int] .nop \& \c
-.nr sc*size \\n[.ps]*\\n[sc*factor]/1000
-.if \\n[sc*wt-adj] .nr sc*wt-adj-factor \\n[sc*size]*\\n[sc*wt-adj]/1000
-.if \\n[sc*extend] .nr sc*extend-factor \\n[sc*size]*\\n[sc*extend]/1000
-.ie '\\$1'' \{\
-.   nr #SMALLCAPS_ON 1
-.   nr #LOOP 0 1
-.   while \\n+[#LOOP]<=58 \{\
-.  char \\*[$c\\n[#LOOP]] \
+.if \\n[#PRINT_STYLE]=2 \{\
+.   if !\\n[.u] \
+.  if \\n[.int] .nop \& \c
+.   nr sc*size \\n[.ps]*\\n[sc*factor]/1000
+.   if \\n[sc*wt-adj] .nr sc*wt-adj-factor \\n[sc*size]*\\n[sc*wt-adj]/1000
+.   if \\n[sc*extend] .nr sc*extend-factor \\n[sc*size]*\\n[sc*extend]/1000
+.   ie '\\$1'' \{\
+.  nr #SMALLCAPS_ON 1
+.  nr #LOOP 0 1
+.  while \\n+[#LOOP]<=58 \{\
+. char \\*[$c\\n[#LOOP]] \
 \Z'\s[\\n[sc*size]u+\\n[sc*extend-factor]u]\H'-\\n[sc*extend-factor]u'\
 \\*[$C\\n[#LOOP]]'\
 \h'\\n[sc*wt-adj-factor]u'\\*[$C\\n[#LOOP]]\s[0]
+.  \}
+.   \}
+.   el \{\
+.  nr #LOOP 0 1
+.  while \\n+[#LOOP]<=58 \{\
+. rchar \\*[$c\\n[#LOOP]]
+. \}
+. rr sc*wt-adj-factor
+. rr sc*extend-factor
+. rr #SMALLCAPS_ON
 .   \}
-.\}
-.el \{\
-.   nr #LOOP 0 1
-.   while \\n+[#LOOP]<=58 \{\
-.  rchar \\*[$c\\n[#LOOP]]
-.  \}
-.  rr sc*wt-adj-factor
-.  rr sc*extend-factor
-.  rr #SMALLCAPS_ON
 .\}
 .END
 \#

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: Corrections to font installation documentation

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 217a58f34b0a8185bebfe38e2e65155b9aa03a70
Author: Peter Schaffter 
AuthorDate: Tue Apr 14 15:33:31 2020 -0400

Corrections to font installation documentation

Update version number in toc.html.
---
 contrib/mom/momdoc/appendices.html | 6 +++---
 contrib/mom/momdoc/toc.html| 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/contrib/mom/momdoc/appendices.html 
b/contrib/mom/momdoc/appendices.html
index 7e7f359..9bdab31 100644
--- a/contrib/mom/momdoc/appendices.html
+++ b/contrib/mom/momdoc/appendices.html
@@ -595,7 +595,7 @@ may safely remove it.  You may also safely remove the .afm 
file.
 For .pfb fonts, run
 
 
-  fontforge -script generate-pfa.pe <file>.ttf
+  fontforge -script generate-pfa.pe <file>.pfb
 
 This will create two new files with the extensions .pfa, and .afm.
 Next, run
@@ -619,8 +619,8 @@ to the devpdf directory.  Start by changing into the
 then:
 
 
-  ln -s <prefix>/<version>/font/devps/<file>.pfa .
-  ln -s <prefix>/<version>/font/devps/<groff font> .
+  ln -s <prefix>/<site-font>/devps/<file>.pfa .
+  ln -s <prefix>/<site-font>/devps/<groff font> .
 
 You may safely remove the .afm file.
 
diff --git a/contrib/mom/momdoc/toc.html b/contrib/mom/momdoc/toc.html
index 92e1be6..7f63e30 100644
--- a/contrib/mom/momdoc/toc.html
+++ b/contrib/mom/momdoc/toc.html
@@ -20,7 +20,7 @@ FDL in the main directory of the groff source package.
 
 
   
-  Mom, version 2.4-4_a -- Table of Contents
+  Mom, version 2.4-4_b -- Table of Contents
   
 
 
@@ -31,7 +31,7 @@ FDL in the main directory of the groff source package.
 
 
   
-mom, version 2.4-4_a
+mom, version 2.4-4_b
   
 
 Table of Contents

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: Simplify and fix bibliography spacing.

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit bf34df2416304aad6fe108cd7278f07f2e43479a
Author: Peter Schaffter 
AuthorDate: Tue Apr 14 15:30:37 2020 -0400

Simplify and fix bibliography spacing.

Update BUGS file.
---
 contrib/mom/BUGS|  5 +
 contrib/mom/om.tmac | 19 ---
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/contrib/mom/BUGS b/contrib/mom/BUGS
index 559ddde..9d72dd3 100644
--- a/contrib/mom/BUGS
+++ b/contrib/mom/BUGS
@@ -21,6 +21,11 @@ the Subject line or you risk my spam filters nuking your 
message.
 
 
 
+Version 2.4-4_a
+===
+BIBLIOGRAPHY_SPACING not being respected.
+---Fixed---
+
 Version 2.4-4
 =
 Default PAPER settings overwriting user-entered PAGEWIDTH,
diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac
index 493f1ea..c8e6a69 100644
--- a/contrib/mom/om.tmac
+++ b/contrib/mom/om.tmac
@@ -20,7 +20,7 @@ for more details.
 You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-Version 2.4-4_a
+Version 2.4-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
@@ -54,7 +54,7 @@ extensions, and float management).
 .if (\n[.x]\n[.y] < 118) \
 .   ab [mom]: You need GNU troff version 1.18 or higher to run this version of 
mom.
 \# Mom version
-.ds version 2.4-4_a
+.ds version 2.4-4_b
 .if dVERSION \{\
 .   ab [mom]: Version \*[version]
 .\}
@@ -15265,23 +15265,12 @@ E\\R'#CAP_HEIGHT \\n[.cht]'
 \# *Argument:
 \#   
 \# *Function:
-\#   Gets value for #BIB_SPACE in units.
+\#   Gets value for $BIB_SPACE.
 \# *Notes:
 \#   Requires a unit of measure.
 \#
 .MAC BIBLIOGRAPHY_SPACING END
 .ds $BIB_SPACE \\$1
-.if \\n[#BIB_LEAD]=0 \{\
-.   nr #DEFER_BIB_SPACING 1
-.   return
-.\}
-.ds $EVAL_BIB_SPACE \\*[$BIB_SPACE]
-.substring $EVAL_BIB_SPACE -1
-.ie '\\*[$EVAL_BIB_SPACE]'v' \{\
-.   substring $BIB_SPACE 0 0
-.   nr #BIB_SPACE \\n[#BIB_LEAD]*\\*[$BIB_SPACE]
-.\}
-.el .nr #BIB_SPACE (\\$1)
 .END
 \#
 \# Bibliography (user space macro)
@@ -21959,7 +21948,7 @@ does not fit on page \\n[pgnum]\\*[col-num].
 .\" Part of workaround for refer spitting out a blank page if the
 .\" last ref falls on the bottom line.
 \\*[ref*string]\R'ref*num*first-pass +1'\?\R'ref*num +1'\?
-.sp \\n[#BIB_SPACE]u
+.sp \\*[$BIB_SPACE]
 .ie \\n[#BIB_LIST]=0 .in
 .el .IL -\\n[#REF_BIB_INDENT]u
 .nn 0

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: Doc fixes for 2.4-4_a

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 8c914bfae669b8d8e31771fb452671b93b13a807
Author: Peter Schaffter 
AuthorDate: Sun Mar 29 18:50:29 2020 -0400

Doc fixes for 2.4-4_a
---
 contrib/mom/momdoc/docprocessing.html |  6 +++---
 contrib/mom/momdoc/inlines.html   |  2 +-
 contrib/mom/momdoc/macrolist.html | 10 --
 contrib/mom/momdoc/toc.html   |  4 ++--
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/contrib/mom/momdoc/docprocessing.html 
b/contrib/mom/momdoc/docprocessing.html
index 7e4873a..f9da30e 100644
--- a/contrib/mom/momdoc/docprocessing.html
+++ b/contrib/mom/momdoc/docprocessing.html
@@ -633,9 +633,9 @@ reference information (metadata).  The reference macros are:
   SUBTITLE
   AUTHOR
   CHAPTER – chapter number
-  CHAPTER_TITLE – chapter name
-  DRAFT – the draft number
-  REVISION – the revision number
+  CHAPTER_TITLE
+  DRAFT – draft number
+  REVISION – revision number
 
 
 
diff --git a/contrib/mom/momdoc/inlines.html b/contrib/mom/momdoc/inlines.html
index c01f260..43b0d13 100644
--- a/contrib/mom/momdoc/inlines.html
+++ b/contrib/mom/momdoc/inlines.html
@@ -1049,7 +1049,7 @@ ligatures and letters unique to various European 
languages), consult
   Left double-quote   \[lq]
   Right double-quote  \[rq]
   Open (left) single-quote\[oq]
-  Close (right) single-quote  \[oq]
+  Close (right) single-quote  \[cq]
   Bullet  \[bu]
   Ballot box  \[sq]
   One-quarter \[14]
diff --git a/contrib/mom/momdoc/macrolist.html 
b/contrib/mom/momdoc/macrolist.html
index fe165dd..3770563 100644
--- a/contrib/mom/momdoc/macrolist.html
+++ b/contrib/mom/momdoc/macrolist.html
@@ -723,7 +723,7 @@ elsewhere in the documentation.
 NUMBER_BLOCKQUOTE_LINES--
 numbering of BLOCKQUOTE lines on/off
 
 
-Control 
macros-- numbering of BLOCKQUOTE lines on/off
+Control 
macros
 
 
 
@@ -748,6 +748,12 @@ elsewhere in the documentation.
 +++ TYPEWRITE control macros
 
 
+TYPEWRITER_FAMILYalternative
 to Courier
+
+
+TYPEWRITER_SIZEpoint 
size of typewriter font
+
+
 UNDERLINE_ITALIC--
  underlining of italics on
 
 
@@ -851,7 +857,7 @@ elsewhere in the documentation.
 +++ Blockquotes (cited passages of 
text)
 
 
-BLOCKQUOTE-- set longer 
passages of cited text
+BLOCKQUOTE-- set 
passages of cited text
 
 
 Control macros-- 
change default blockquote style
diff --git a/contrib/mom/momdoc/toc.html b/contrib/mom/momdoc/toc.html
index 5859bec..92e1be6 100644
--- a/contrib/mom/momdoc/toc.html
+++ b/contrib/mom/momdoc/toc.html
@@ -20,7 +20,7 @@ FDL in the main directory of the groff source package.
 
 
   
-  Mom, version 2.4-4 -- Table of Contents
+  Mom, version 2.4-4_a -- Table of Contents
   
 
 
@@ -31,7 +31,7 @@ FDL in the main directory of the groff source package.
 
 
   
-mom, version 2.4-4
+mom, version 2.4-4_a
   
 
 Table of Contents

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: Update BUGS file.

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 94118d1f6e003ac41646e75c4bbb2523036d871e
Author: Peter Schaffter 
AuthorDate: Sun Mar 29 18:48:29 2020 -0400

Update BUGS file.

Mark as fixed the bugs reported for 2.4-4.
---
 contrib/mom/BUGS | 9 +
 1 file changed, 9 insertions(+)

diff --git a/contrib/mom/BUGS b/contrib/mom/BUGS
index d4d76b6..559ddde 100644
--- a/contrib/mom/BUGS
+++ b/contrib/mom/BUGS
@@ -21,6 +21,15 @@ the Subject line or you risk my spam filters nuking your 
message.
 
 
 
+Version 2.4-4
+=
+Default PAPER settings overwriting user-entered PAGEWIDTH,
+PAGELENGTH, and PAGE.
+---Fixed---
+
+QUOTE and BLOCKQUOTE indents shifting after page breaks.
+---Fixed---
+
 Version 2.4-3
 =
 TYPEWRITE: Inline \*[PREV] calling \*[ULX] without explicitly

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: Fix QUOTE/BLOCKQUOTE indents; fix default PAPER

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 40a3799c6ae508d9037864f5e5442e95ab451462
Author: Peter Schaffter 
AuthorDate: Sun Mar 29 18:44:04 2020 -0400

Fix QUOTE/BLOCKQUOTE indents; fix default PAPER

Fixes problem of quote indents not suriving page breaks.
Fixes PAGE, PAGEWIDTH, PAGELENGTH being overwritten by default PAPER
setting.
---
 contrib/mom/om.tmac | 21 +
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac
index a3238d1..493f1ea 100644
--- a/contrib/mom/om.tmac
+++ b/contrib/mom/om.tmac
@@ -20,8 +20,8 @@ for more details.
 You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-Version 2.4-4
--
+Version 2.4-4_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.
@@ -54,7 +54,7 @@ extensions, and float management).
 .if (\n[.x]\n[.y] < 118) \
 .   ab [mom]: You need GNU troff version 1.18 or higher to run this version of 
mom.
 \# Mom version
-.ds version 2.4-4
+.ds version 2.4-4_a
 .if dVERSION \{\
 .   ab [mom]: Version \*[version]
 .\}
@@ -5756,10 +5756,6 @@ SMALLCAPS takes precedence.
 \#   $REVISION_STRING are in the COPYSTYLE macro.
 \#
 .MAC DEFAULTS END
-.if !\\n[#DOC_TYPE]=5 \{\
-.   ie !d $PAPER .PAPER LETTER
-.   el .PAPER \\*[$PAPER]
-.\}
 .if !\\n[#DOC_TYPE] .DOCTYPE DEFAULT
 .if !r #CH_NUM .nr #CH_NUM 1 
 .ie \\n[#PAGENUM_STYLE_SET] .PAGENUM_STYLE \\*[$PAGENUM_STYLE]
@@ -10108,10 +10104,10 @@ Shimming must be disabled with NO_SHIM before using 
FLEX.
 .if \\n[#QUOTE] \{\
 .   ie \\n[#TAB_ACTIVE] .TAB \\n[#CURRENT_TAB]
 .   el \{\
-.  ie \\n[#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
+.  ie \\n[#\\*[BQ]_OFFSET_VALUE] .nr #\\*[BQ]_OFFSET \
+\\n[#L_MARGIN]+(\\n[#PP_INDENT]*\\n[#\\*[BQ]_OFFSET_VALUE])
+.  el .nr #\\*[BQ]_OFFSET \\n[#L_MARGIN]+\\*[$\\*[BQ]_OFFSET_VALUE]
+.  po \\n[#\\*[BQ]_OFFSET]u
 .   \}
 .   if \\n[#PRINT_STYLE]=2 .sp \\n[#Q_LEAD_DIFF]u
 .\}
@@ -18080,7 +18076,8 @@ E\\R'#CAP_HEIGHT \\n[.cht]'
 \#
 \# Set up a default papersize of US letter
 \#
-.PAPER LETTER
+.PAGEWIDTH 8.5i
+.PAGELENGTH 11i
 \#
 \# 
 \#

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: Update version number in toc.html

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 12733e8595837bcf43fda1aaeef03ab31d43aa2b
Author: Peter Schaffter 
Date:   Thu Jan 2 21:05:12 2020 -0500

Update version number in toc.html
---
 contrib/mom/momdoc/toc.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/mom/momdoc/toc.html b/contrib/mom/momdoc/toc.html
index 9fe4413..5859bec 100644
--- a/contrib/mom/momdoc/toc.html
+++ b/contrib/mom/momdoc/toc.html
@@ -20,7 +20,7 @@ FDL in the main directory of the groff source package.
 
 
   
-  Mom, version 2.4-3 -- Table of Contents
+  Mom, version 2.4-4 -- Table of Contents
   
 
 
@@ -31,7 +31,7 @@ FDL in the main directory of the groff source package.
 
 
   
-mom, version 2.4-3
+mom, version 2.4-4
   
 
 Table of Contents

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/06: mom 2.4-4 release

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 18d8b9bf3ab35fe330c6cc71ea5c336f6ad5f4a9
Author: Peter Schaffter 
Date:   Thu Jan 2 20:01:45 2020 -0500

mom 2.4-4 release

Change all instances of .ul to .cu.
Add TOC_HEADING and associated _STYLE macro.
Add arg. PREFIX_CHAPTER_NUMBER to macro HEADING_STYLE.
Remove unused string $REF_STYLE.
Bug fixes -- see BUGS (2.4-3).
Update copyright info.
---
 contrib/mom/om.tmac | 362 +++-
 1 file changed, 243 insertions(+), 119 deletions(-)

diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac
index 69ed0ce..a3238d1 100644
--- a/contrib/mom/om.tmac
+++ b/contrib/mom/om.tmac
@@ -1,7 +1,7 @@
 .ig
 Mom -- a typesetting/document-processing macro set for groff.
 
-Copyright (C) 2002-2018  Free Software Foundation, Inc.
+Copyright (C) 2002-2020  Free Software Foundation, Inc.
  Written by Peter Schaffter 
  PDF integration contributed by Deri James 
 
@@ -20,7 +20,7 @@ for more details.
 You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-Version 2.4-3
+Version 2.4-4
 -
 Antoine de St-Exupéry asserted that elegance in engineering is
 achieved not when there is nothing left to add, but when there is
@@ -54,7 +54,7 @@ extensions, and float management).
 .if (\n[.x]\n[.y] < 118) \
 .   ab [mom]: You need GNU troff version 1.18 or higher to run this version of 
mom.
 \# Mom version
-.ds version 2.4-3
+.ds version 2.4-4
 .if dVERSION \{\
 .   ab [mom]: Version \*[version]
 .\}
@@ -1979,13 +1979,13 @@ end
 .   nr #UNDERLINE_ON 1
 .   ss \\n[.ss] (\\n[.ss]-\\n[.ss])
 .   ie !n .nop \X'ps: exec \\n[_w] \\n[_d] decorline'\c
-.   el .ul 1000
+.   el .cu 1000
 .\}
 .el \{\
 .   nr #UNDERLINE_ON 0
 .   if !'\\*[$SAVED_SS_VAR]'' .SS \\*[$SAVED_SS_VAR]
 .   ie !n .nop \X'ps: exec decornone'\c
-.   el .ul 0
+.   el .cu 0
 .\}
 .END
 \#
@@ -2011,7 +2011,7 @@ end
 .   \}
 .   el \{\
 \?\R'#UNDERLINE_ON 1'\?\c
-.  ul 1000
+.  cu 1000
 .   \}
 .\}
 .el \{\
@@ -2021,7 +2021,7 @@ end
 .   \}
 .   el \{\
 \R'#UNDERLINE_ON 1'\c
-.  ul 1000
+.  cu 1000
 .   \}
 .\}
 .END
@@ -2037,7 +2037,7 @@ end
 .   \}
 .   el \{\
 \?\R'#UNDERLINE_ON 0'\?\c
-.  ul 0
+.  cu 0
 .   \}
 .\}
 .el \{\
@@ -2047,7 +2047,7 @@ end
 .   \}
 .   el \{\
 .  nr #UNDERLINE_ON 0
-.  ul 0
+.  cu 0
 .   \}
 .\}
 .END
@@ -3330,7 +3330,7 @@ end
 .ie '\\$1'0' .ss \\n[.ss] (\\n[.ss]-\\n[.ss])
 .el \{\
 .   ie '\\$1'DEFAULT' .ss \\n[.ss]
-.   el.ss \\n[.ss] (0+\\*[$SS_VAR])
+.   el.ss \\n[.ss] \\*[$SS_VAR]
 .\}
 .END
 \#
@@ -4210,12 +4210,14 @@ y\R'#DESCENDER \\n[.cdp]'
 .  nr #BOLDER_UNITS 0
 .  nr #CONDENSE 0
 .  nr #EXTEND 0
-.  if !\\n[#ITALIC_MEANS_ITALIC] .rm IT
+.  if !\\n[#ITALIC_MEANS_ITALIC] \{\
+. rm IT
+. rm PREV
+. UNDERLINE_ITALIC
+.  \}
 .  rm BD
 .  rm BDI
-.  if !\\n[#ITALIC_MEANS_ITALIC] .rm PREV
 .  if !\\n[#SLANT_MEANS_SLANT]   .UNDERLINE_SLANT
-.  if !\\n[#ITALIC_MEANS_ITALIC] .UNDERLINE_ITALIC
 .  if !\\n[#UNDERLINE_QUOTES].UNDERLINE_QUOTES
 .  nr #IGNORE_COLUMNS 1
 .  nr #RULE_WEIGHT 500
@@ -4353,7 +4355,7 @@ y\R'#DESCENDER \\n[.cdp]'
 .   rm PREV
 .   ds ROM  \E*[ULX]
 .   ds IT   \E*[UL]
-.   ds PREV \E*[ULX]
+.   ds PREV \f[P]\E*[ULX]
 .\}
 .END
 \#
@@ -5779,10 +5781,8 @@ SMALLCAPS takes precedence.
 .if !r #DOC_HEADER .DOCHEADER
 .if !r #HEADERS_ON .HEADERS
 .if !r #PAGINATE   .PAGINATE
-.\"
 .if !r #HEADER_MARGIN .HEADER_MARGIN 4P+6p
 .if !r #HEADER_GAP.HEADER_GAP 3P
-.\"
 .if \\n[#FOOTERS_ON] \{\
 .   HEADERS OFF
 .   ie \\n[#PAGINATE] \
@@ -5820,7 +5820,10 @@ SMALLCAPS takes precedence.
 .   rm $SAVED_DOC_FAM
 .\}
 .el .ds $DOC_FAM \\*[$FAMILY]
-.nr #DOC_PT_SIZE  \\n[#PT_SIZE]
+.ie !r #DOC_PT_SIZE .nr #DOC_PT_SIZE \\n[#PT_SIZE]
+.el \
+.   if !\\n[#DOC_PT_SIZE]=\\n[#PT_SIZE] \
+.  nr #DOC_PT_SIZE \\n[#PT_SIZE]
 .if \\n[#TOC]  .nr #DOC_PT_SIZE \\n[#TOC_PS]
 .if \\n[#ENDNOTES] .nr #DOC_PT_SIZE \\n[#EN_PS]
 .if \\n[#BIBLIOGRAPHY] .nr #DOC_PT_SIZE \\n[#BIB_PS]
@@ -6485,6 +6488,14 @@ SMALLCAPS takes precedence.
 .   ds $TOC_HEAD_\\n[#HD_LEVEL]_FAM \\*[$TOC_FAM]
 .\}
 .if '\\*[$TOC_TITLE_FAM]'' .TOC_TITLE_FAMILY \\*[$DOC_FAM]
+.\" TOC heading (single, non-pagenumbered line insertion)
+.if !d $TOC_HEADING_FAM   .

[groff] 05/06: Mom 2.4-4 update test-mom.sh.in

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit b305db494ec94570c885da68643921298843db08
Author: Peter Schaffter 
Date:   Thu Jan 2 20:25:33 2020 -0500

Mom 2.4-4 update test-mom.sh.in

Add two files to the list: copyright-chapter, copyright-default.
Update copyright info.
---
 contrib/mom/examples/test-mom.sh.in | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/contrib/mom/examples/test-mom.sh.in 
b/contrib/mom/examples/test-mom.sh.in
index 0841b37..84149ad 100644
--- a/contrib/mom/examples/test-mom.sh.in
+++ b/contrib/mom/examples/test-mom.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2018- Free Software Foundation, Inc.
+# Copyright (C) 2018-2020 Free Software Foundation, Inc.
 # 
 # This file is part of groff.
 # 
@@ -29,6 +29,8 @@ list="
   sample_docs.pdf
   slide-demo.pdf
   typesetting.pdf
+  copyright-chapter.pdf
+  copyright-default.pdf
   "
 
 if test "$have_urw_fonts" != "yes"; then
@@ -72,6 +74,8 @@ check_number_pages "$examplesdir/mon_premier_doc.pdf" 5
 check_number_pages "$examplesdir/sample_docs.pdf" 12
 check_number_pages "$examplesdir/slide-demo.pdf" 27
 check_number_pages "$examplesdir/typesetting.pdf" 3
+check_number_pages "$examplesdir/copyright-chapter.pdf" 5
+check_number_pages "$examplesdir/copyright-default.pdf" 5
 
 check_has_images "$examplesdir/typesetting.pdf"
 check_has_images "$examplesdir/slide-demo.pdf"

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 04/06: Mom 2.4-4 update copyrights in /examples.

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 816f568d0dfb4845aa2f35122c31cc788c3ff2ad
Author: Peter Schaffter 
Date:   Thu Jan 2 20:22:41 2020 -0500

Mom 2.4-4 update copyrights in /examples.
---
 contrib/mom/examples/README-fr.txt | 10 +-
 contrib/mom/examples/README.txt| 10 +-
 contrib/mom/examples/copyright-chapter.mom |  2 +-
 contrib/mom/examples/copyright-default.mom |  2 +-
 contrib/mom/examples/elvis_syntax  |  2 +-
 contrib/mom/examples/elvis_syntax.new  |  2 +-
 contrib/mom/examples/letter.mom|  2 +-
 contrib/mom/examples/mom-pdf.mom   |  2 +-
 contrib/mom/examples/mom.vim   |  2 +-
 contrib/mom/examples/mon_premier_doc.mom   |  2 +-
 contrib/mom/examples/sample_docs.mom   |  2 +-
 contrib/mom/examples/slide-demo.mom| 12 +++-
 contrib/mom/examples/typesetting.mom   |  2 +-
 13 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/contrib/mom/examples/README-fr.txt 
b/contrib/mom/examples/README-fr.txt
index 79f7e22..5b1b434 100644
--- a/contrib/mom/examples/README-fr.txt
+++ b/contrib/mom/examples/README-fr.txt
@@ -1,9 +1,9 @@
- -*- mode: text; coding: utf-8; -*-
-Copyright (C) 2014-2018 Free Software Foundation, Inc.
+-*- mode: text; coding: utf-8; -*-
+Copyright (C) 2014-2020 Free Software Foundation, Inc.
 
-Copying and distribution of this file, with or without modification,
-are permitted in any medium without royalty provided the copyright
-notice and this notice are preserved.
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.
 
 
 
diff --git a/contrib/mom/examples/README.txt b/contrib/mom/examples/README.txt
index 31f2f50..851a9a2 100644
--- a/contrib/mom/examples/README.txt
+++ b/contrib/mom/examples/README.txt
@@ -1,9 +1,9 @@
--*- mode: text; coding: utf-8; -*-
-Copyright (C) 2004-2018 Free Software Foundation, Inc.
+-*- mode: text; coding: utf-8; -*-
+Copyright (C) 2004-2020 Free Software Foundation, Inc.
 
-Copying and distribution of this file, with or without modification,
-are permitted in any medium without royalty provided the copyright
-notice and this notice are preserved.
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.
 
 
 
diff --git a/contrib/mom/examples/copyright-chapter.mom 
b/contrib/mom/examples/copyright-chapter.mom
index e536652..fa537d8 100644
--- a/contrib/mom/examples/copyright-chapter.mom
+++ b/contrib/mom/examples/copyright-chapter.mom
@@ -1,6 +1,6 @@
 .\" -*- mode: text; coding: utf-8; -*-
 \#
-\# Copyright (C) 2019 Free Software Foundation, Inc.
+\# Copyright (C) 2019-2020 Free Software Foundation, Inc.
 \#
 \# Copying and distribution of this file, with or without modification,
 \# are permitted in any medium without royalty provided the copyright
diff --git a/contrib/mom/examples/copyright-default.mom 
b/contrib/mom/examples/copyright-default.mom
index c0eca76..9fbea09 100644
--- a/contrib/mom/examples/copyright-default.mom
+++ b/contrib/mom/examples/copyright-default.mom
@@ -1,6 +1,6 @@
 .\" -*- mode: text; coding: utf-8; -*-
 \#
-\# Copyright (C) 2019 Free Software Foundation, Inc.
+\# Copyright (C) 2019-2020 Free Software Foundation, Inc.
 \#
 \# Copying and distribution of this file, with or without modification,
 \# are permitted in any medium without royalty provided the copyright
diff --git a/contrib/mom/examples/elvis_syntax 
b/contrib/mom/examples/elvis_syntax
index 68a0c35..b5735bf 100644
--- a/contrib/mom/examples/elvis_syntax
+++ b/contrib/mom/examples/elvis_syntax
@@ -1,4 +1,4 @@
-" Copyright (C) 2004-2018 Free Software Foundation, Inc.
+" Copyright (C) 2004-2020 Free Software Foundation, Inc.
 "
 " Copying and distribution of this file, with or without modification,
 " are permitted in any medium without royalty provided the copyright
diff --git a/contrib/mom/examples/elvis_syntax.new 
b/contrib/mom/examples/elvis_syntax.new
index fd63275..5dadecc 100644
--- a/contrib/mom/examples/elvis_syntax.new
+++ b/contrib/mom/examples/elvis_syntax.new
@@ -1,4 +1,4 @@
-" Copyright (C) 2004-2018 Free Software Foundation, Inc.
+" Copyright (C) 2004-2020 Free Software Foundation, Inc.
 "
 " Copying and distribution of this file, with or without modification,
 " are permitted in any medium without royalty provided the copyright
diff --git a/contrib/mom/examples/letter.mom b/contrib/mom/examples/letter.mom
index 1d1eac5..6e1a0c0 100644
--- a/contrib/mom/examples/letter.mom
+++ b/contrib/mom/examples/letter.mom
@@ -1,6 +1,6 @@
 .\&qu

[groff] 06/06: Mom 2.4-4 doc updates

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 1c789884e6e0af96d663bb3fc4687288a61bdd17
Author: Peter Schaffter 
Date:   Thu Jan 2 20:29:08 2020 -0500

Mom 2.4-4 doc updates

General doc fixes and emendations.
Add entry for TOC_HEADING and associated _STYLE macros.
Update copyright info.
---
 contrib/mom/momdoc/appendices.html |   2 +-
 contrib/mom/momdoc/color.html  |  72 +++---
 contrib/mom/momdoc/cover.html  |   2 +-
 contrib/mom/momdoc/definitions.html|   2 +-
 contrib/mom/momdoc/docelement.html |  82 +--
 contrib/mom/momdoc/docprocessing.html  | 154 +
 contrib/mom/momdoc/goodies.html|   2 +-
 contrib/mom/momdoc/graphical.html  |   2 +-
 contrib/mom/momdoc/headfootpage.html   |  20 ++--
 contrib/mom/momdoc/images.html |   2 +-
 contrib/mom/momdoc/inlines.html|   2 +-
 contrib/mom/momdoc/intro.html  |   2 +-
 contrib/mom/momdoc/letters.html|   2 +-
 contrib/mom/momdoc/macrolist.html  |  14 ++-
 contrib/mom/momdoc/rectoverso.html |   2 +-
 contrib/mom/momdoc/refer.html  |   2 +-
 contrib/mom/momdoc/reserved.html   |   2 +-
 contrib/mom/momdoc/stylesheet.css  |   2 +-
 contrib/mom/momdoc/tables-of-contents.html |  47 -
 contrib/mom/momdoc/toc.html|   5 +-
 contrib/mom/momdoc/typesetting.html|   2 +-
 contrib/mom/momdoc/using.html  |   2 +-
 contrib/mom/momdoc/version-2.html  |   2 +-
 23 files changed, 311 insertions(+), 115 deletions(-)

diff --git a/contrib/mom/momdoc/appendices.html 
b/contrib/mom/momdoc/appendices.html
index 6fe71fc..7e7f359 100644
--- a/contrib/mom/momdoc/appendices.html
+++ b/contrib/mom/momdoc/appendices.html
@@ -2,7 +2,7 @@
 
 
 
-Invoking a color
+Invoking a colour
 
 
 
-Macro: COLOR <colorname>
+Macro: COLOR <colourname>
 
 
 
-Inline: \*[<colorname>]
+Inline: \*[<colourname>]
 
 
 
@@ -444,7 +444,7 @@ or
 XCOLOR,
 you use either the macro COLOR or the
 inline escape,
-\*[<colorname>], to cause mom to
+\*[<colourname>], to cause mom to
 set subsequent text in that colour.  See the
 example,
 above, which shows both in action.
@@ -453,7 +453,7 @@ above, which shows both in action.
 
 
 Note:
-You can use the \*[<colorname>] inline escape in
+You can use the \*[<colourname>] inline escape in
 any
 document processing
 macro that takes a
@@ -464,7 +464,7 @@ subsequent invocations of that particular macro to be 
colourized.
 
 
 
-Furthermore, if you use \*[<colorname>] in the
+Furthermore, if you use \*[<colourname>] in the
 string argument passed to
 HEAD,
 SUBHEAD
@@ -480,8 +480,8 @@ invoking the appropriate
 
 
 
-For colorizing underscored text, see
-Colorizing underscored text
+For colourizing underscored text, see
+Colourizing underscored text
 in the notes at the end of
 UNDERSCORE.
 
diff --git a/contrib/mom/momdoc/cover.html b/contrib/mom/momdoc/cover.html
index 363e306..ad4ea16 100644
--- a/contrib/mom/momdoc/cover.html
+++ b/contrib/mom/momdoc/cover.html
@@ -2,7 +2,7 @@
 
diff --git a/contrib/mom/momdoc/docprocessing.html 
b/contrib/mom/momdoc/docprocessing.html
index a15b79f..7e4873a 100644
--- a/contrib/mom/momdoc/docprocessing.html
+++ b/contrib/mom/momdoc/docprocessing.html
@@ -2,7 +2,7 @@
 
@@ -1839,9 +1928,9 @@ for how mom outputs each part of the page header.)
 
 Note: version 2.1 change
 
-DOCTYPE NAMED "string" no longer accepts a color argument
-after "string".  Setting the color of the string is now
-done with DOCTYPE_COLOR <color>.  Default
+DOCTYPE NAMED "string" no longer accepts a colour argument
+after "string".  Setting the colour of the string is now
+done with DOCTYPE_COLOR <colour>.  Default
 underscoring of "string" in the docheader and on covers
 has been removed.  Use DOCTYPE_UNDERLINE,
 DOC_COVER_DOCTYPE_UNDERLINE and/or
@@ -2358,7 +2447,7 @@ To turn underlining of quotes back on, use 
UNDERLINE_QUOTES without
 an argument.
 
 
-
+
 While most of the
 control macros
 have no effect on PRINTSTYLE TYPEWRITE, there
@@ -2368,9 +2457,27 @@ is an important exception:
 particularly useful for reducing the point size of
 headers/footers should they become crowded (quite likely to
 happen if the title of your document is long and your
-COPYSTYLE
-is DRAFT).
+COPYSTYLE
+is DRAFT
+
+
+Please note that colour is disabled if your
+PRINTSTYLE
+is TYPEWRITE.  If you would like it enabled, for example
+so PDF links are colourzed, invoke the groff
+primitive
+'.color' after PRINTSTYLE.
 
+
+
+Finally, note that colour is disabled for TYPEWRITE.  If
+you would like it enabled, for example so PDF links are colourized,
+invoke the groff
+primitive
+'.color' after PRINTSTYLE.
+
+
 
 
 
@@ -2787,7 +2894,7 @@ The macro
 COLOR

[groff] 02/06: Mom 2.4-4 copyrights updated.

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 1c89525f79b3f76f711c8a2c19673cb249abc433
Author: Peter Schaffter 
Date:   Thu Jan 2 20:08:07 2020 -0500

Mom 2.4-4 copyrights updated.
---
 contrib/mom/BUGS  | 35 ++-
 contrib/mom/ChangeLog | 11 +--
 contrib/mom/NEWS  |  2 +-
 contrib/mom/TODO  |  2 +-
 contrib/mom/copyright |  2 +-
 contrib/mom/mom.am|  2 +-
 6 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/contrib/mom/BUGS b/contrib/mom/BUGS
index e77f1dc..d4d76b6 100644
--- a/contrib/mom/BUGS
+++ b/contrib/mom/BUGS
@@ -1,5 +1,5 @@
 -*- text -*-
-Copyright 2004-2018 Free Software Foundation, Inc.
+Copyright 2004-2020 Free Software Foundation, Inc.
 
 Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
@@ -21,6 +21,39 @@ the Subject line or you risk my spam filters nuking your 
message.
 
 
 
+Version 2.4-3
+=
+TYPEWRITE: Inline \*[PREV] calling \*[ULX] without explicitly
+returning to TYPEWRITER font.
+---Fixed---
+
+%u field in refer databases not triggering ref*type 0 (Internet
+reference).
+---Fixed---
+
+Idem field of refer databases overwriting first occurrence of author
+name.
+---Fixed---
+
+Captions not fully respecting TYPEWRITE.
+---Fixed---
+
+COVERTEXT not fully respecting TYPEWRITE.
+---Fixed---
+
+Changes to font family inside a COVERTEXT block not being reset to
+default document family when the block is terminated.
+---Fixed---
+
+Unwanted linespace before labels above tables.
+---Fixed---
+
+Label number of AUTOLABEL_TABLES incrementing by 2 instead of 1.
+---Fixed---
+
+Page number of the page before a bibliography not printing.
+---Fixed---
+
 Version 2.4-1
 =
 tbl not respecting pre-tbl fill mode.
diff --git a/contrib/mom/ChangeLog b/contrib/mom/ChangeLog
index 63a85cb..0d17f4b 100644
--- a/contrib/mom/ChangeLog
+++ b/contrib/mom/ChangeLog
@@ -1,9 +1,16 @@
+2019-12-26
+
+   * added PREFIX_CHAPTER argument to HEADING_STYLE
+
+   * added TOC_HEADING; single line, non-pagenumbered insertions into
+   the TOC
+
 2019-11-03
 
* templates added for setting up copyright pages
 
-  * updated mom.am to include the templates when buliding
-pdfs in mom/examples
+   * updated mom.am to include the templates when buliding
+   pdfs in mom/examples
 
 2018-11-24
 
diff --git a/contrib/mom/NEWS b/contrib/mom/NEWS
index a5fd76b..d0dd283 100644
--- a/contrib/mom/NEWS
+++ b/contrib/mom/NEWS
@@ -1,5 +1,5 @@
 -*- text -*-
-Copyright (C) 2004-2018  Free Software Foundation, Inc.
+Copyright (C) 2004-2020 Free Software Foundation, Inc.
 
 Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
diff --git a/contrib/mom/TODO b/contrib/mom/TODO
index d558eb7..d9bb257 100644
--- a/contrib/mom/TODO
+++ b/contrib/mom/TODO
@@ -1,5 +1,5 @@
 -*- txt -*-
-Copyright 2004-2018 Free Software Foundation, Inc.
+Copyright 2004-2020 Free Software Foundation, Inc.
 
 Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
diff --git a/contrib/mom/copyright b/contrib/mom/copyright
index 80dd4c8..cbcc0cb 100644
--- a/contrib/mom/copyright
+++ b/contrib/mom/copyright
@@ -9,7 +9,7 @@ K1L 7A3
 
 
 The groff macro file om.tmac and the html documentation pertaining to
-it are Copyright (C) 2004-2019 Peter Schaffter.
+it are Copyright (C) 2004-2020 Peter Schaffter.
 
 om.tmac is issued under the GNU General Public License, a full copy of
 which can be had at
diff --git a/contrib/mom/mom.am b/contrib/mom/mom.am
index 22a9e77..18224c8 100644
--- a/contrib/mom/mom.am
+++ b/contrib/mom/mom.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2018 Free Software Foundation, Inc.
+# Copyright (C) 2002-2020 Free Software Foundation, Inc.
 #  Written by Werner Lemberg (w...@gnu.org)
 #  Automake migration by Bertrand Garrigues
 #

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 03/06: Mom 2.4-4 amend mom manpage

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit a958874f3bd304932f02ef42c2a3da453e2c5dae
Author: Peter Schaffter 
Date:   Thu Jan 2 20:09:39 2020 -0500

Mom 2.4-4 amend mom manpage

Add explicit "Exit multi-columns" to MCX entry.
---
 contrib/mom/groff_mom.7.man | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/contrib/mom/groff_mom.7.man b/contrib/mom/groff_mom.7.man
index 2aedead..4918b8d 100644
--- a/contrib/mom/groff_mom.7.man
+++ b/contrib/mom/groff_mom.7.man
@@ -13,7 +13,7 @@ language, part of \(lqgroff\(rq
 .\" Legal Terms
 .\" 
 .\"
-.\" Copyright (C) 2002-2018 Free Software Foundation, Inc.
+.\" Copyright (C) 2002-2020 Free Software Foundation, Inc.
 .\"
 .\" This file is part of mom, which is part of groff, the GNU roff
 .\" type-setting system.
@@ -2327,6 +2327,9 @@ Optional argument requires a unit of measure.
 .RS
 .
 .P
+Exit multi-columns.
+.
+.P
 .B .MCX
 takes you out of any
 .I tab

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: Emendations to images.html

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit b4005379a501b6f912eee0bf7670e059b2eaf0e6
Author: Peter Schaffter 
Date:   Tue Dec 17 16:50:28 2019 -0500

Emendations to images.html

Some autolabelling facilities require pdfmom(1) from groff 1.22.4.
---
 contrib/mom/momdoc/images.html | 39 ++-
 1 file changed, 26 insertions(+), 13 deletions(-)

diff --git a/contrib/mom/momdoc/images.html b/contrib/mom/momdoc/images.html
index 29345a1..2a72adc 100644
--- a/contrib/mom/momdoc/images.html
+++ b/contrib/mom/momdoc/images.html
@@ -187,7 +187,7 @@ recommended.
 
 Macro: PDF_IMAGE [ -L | -C | -R | -I 
<indent> ] \
 
-<image-file.pdf> <width> <height> [ SCALE <factor> ] \
+<pdf image> <width> <height> [ SCALE <factor> ] \
 
 [ ADJUST +|-<vertical adjustment> ] [ NO_SHIM ] [ NO_FLEX ] \
 
@@ -212,8 +212,10 @@ require a
 
 
 Note:
-Arguments may be broken into several lines using the
-“line-continued” backslash (\), as shown above.
+Mom files with embedded PDF images must be processed with
+pdfmom doc.mom > doc.pdf.  Arguments may be broken
+into several lines using the “line-continued” backslash
+(\), as shown above.
 
 
 
@@ -223,7 +225,7 @@ Unlike
 which it resembles, PDF_IMAGE requires that the pdf image’s
 dimensions (the bounding box,
 see below)
-be supplied each time it’s called.
+be supplied each time it’s called.
 
 
 
@@ -389,6 +391,11 @@ linked to from other places in the file (with PDF_LINK; see
 
 
 
+Please note: The following functionality is available
+only with groff 1.22.4 or later.
+
+
+
 When
 autolabelling
 is enabled and the document is processed with
@@ -409,15 +416,6 @@ labels, the same string in, say, chapter 5 would produce 
the pdf
 link “Figure 5.3”.
 
 
-
-Remember that mom files with embedded PDF images must be processed
-with
-
-
- pdfmom doc.mom > doc.pdf
-
-
-
 
 
 Note: Version 2.0-c change
@@ -1650,6 +1648,11 @@ linked to from other places in the file (with PDF_LINK; 
see
 
 
 
+Please note: The following functionality is available
+only with groff 1.22.4 or later.
+
+
+
 When
 autolabelling
 is enabled and the document is processed with
@@ -1914,6 +1917,11 @@ linked to from other places in the file (with PDF_LINK; 
see
 
 
 
+Please note: The following functionality is available
+only with groff 1.22.4 or later.
+
+
+
 When
 autolabelling
 is enabled and the document is processed with
@@ -2203,6 +2211,11 @@ be linked to from other places in the file (with 
PDF_LINK; see
 
 
 
+Please note: The following functionality is available
+only with groff 1.22.4 or later.
+
+
+
 When
 autolabelling
 is enabled and the document is processed with

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: Updated copyright page address.

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit a1ea012d885064f81a5f260031556fe3ad537ba0
Author: Peter Schaffter 
Date:   Sun Nov 3 18:26:40 2019 -0500

Updated copyright page address.
---
 contrib/mom/copyright | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/contrib/mom/copyright b/contrib/mom/copyright
index aee4b03..80dd4c8 100644
--- a/contrib/mom/copyright
+++ b/contrib/mom/copyright
@@ -2,14 +2,14 @@
 AUTHOR
 --
 Peter Schaffter (pe...@schaffter.ca)
-3-355 Lafontaine Ave
+6-331 Mona Ave
 Vanier (ON) CANADA
-K1L 6X6
+K1L 7A3
 
 
 
 The groff macro file om.tmac and the html documentation pertaining to
-it are Copyright (C) 2004-2018 Peter Schaffter.
+it are Copyright (C) 2004-2019 Peter Schaffter.
 
 om.tmac is issued under the GNU General Public License, a full copy of
 which can be had at

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: Update README files (English & French) in mom/examples.

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 0491f59575c2ba5542f9ee3634b10b664d22ddd3
Author: Peter Schaffter 
Date:   Sun Nov 3 18:20:48 2019 -0500

Update README files (English & French) in mom/examples.

Reflects addition of copyright page examples.
---
 contrib/mom/examples/README-fr.txt | 6 ++
 contrib/mom/examples/README.txt| 6 ++
 2 files changed, 12 insertions(+)

diff --git a/contrib/mom/examples/README-fr.txt 
b/contrib/mom/examples/README-fr.txt
index ddf572b..79f7e22 100644
--- a/contrib/mom/examples/README-fr.txt
+++ b/contrib/mom/examples/README-fr.txt
@@ -96,6 +96,12 @@ le paramètre de configuration INDENT_FIRST_PARAS est activé 
afin
 d'indenter le premier paragraphe de chaque section -- ceci est l'usage
 en typographie française.
 
+***copyright-default.mom/copyright-chapter.mom***
+
+Deux fichiers qui montrent la bonne façon d'insérer une page des
+droits d'auteur dans les documents créés avec mom.  "Default" est
+pour DOCTYPE DEFAULT; "chapter" est pour DOCTYPE CHAPTER.
+
 ***mom-pdf.mom***
 
 Le manuel "Producing PDFs with mom and groff".
diff --git a/contrib/mom/examples/README.txt b/contrib/mom/examples/README.txt
index 633f089..31f2f50 100644
--- a/contrib/mom/examples/README.txt
+++ b/contrib/mom/examples/README.txt
@@ -89,6 +89,12 @@ TOC_HEADER_STRING is used to modity the Table of Content 
title to
 indent the first paragraph of a section -- this is the usual
 convention in French typesetting.
 
+***copyright-default.mom/copyright-chapter.mom***
+
+These two files demonstrate the correct way to insert a copyright
+page into mom documents.  "Default" is for DOCTYPE DEFAULT;
+"chapter" is for DOCTYPE CHAPTER.
+
 ***mom-pdf.mom***
 
 The manual, Producing PDFs with mom and groff.

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/04: Mom version 2.4-3, main macro file

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 957c036d5d867fba8902d1af0815c1fc5194e76f
Author: Peter Schaffter 
Date:   Sun Nov 3 16:33:23 2019 -0500

Mom version 2.4-3, main macro file

Improve orthogonality of COVER and DOC_COVER.
Add NO_TOC_ENTRY macro.
---
 contrib/mom/om.tmac | 96 +++--
 1 file changed, 72 insertions(+), 24 deletions(-)

diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac
index cfe1acb..69ed0ce 100644
--- a/contrib/mom/om.tmac
+++ b/contrib/mom/om.tmac
@@ -20,7 +20,7 @@ for more details.
 You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-Version 2.4-2
+Version 2.4-3
 -
 Antoine de St-Exupéry asserted that elegance in engineering is
 achieved not when there is nothing left to add, but when there is
@@ -54,7 +54,7 @@ extensions, and float management).
 .if (\n[.x]\n[.y] < 118) \
 .   ab [mom]: You need GNU troff version 1.18 or higher to run this version of 
mom.
 \# Mom version
-.ds version 2.4-2
+.ds version 2.4-3
 .if dVERSION \{\
 .   ab [mom]: Version \*[version]
 .\}
@@ -6528,6 +6528,7 @@ SMALLCAPS takes precedence.
 .if '\\*[$\\*[$PRFX]\\*[$TTL_AUTH]_1]'' \{\
 .   if !'\\*[$\\*[$PRFX]DOC\\*[$TTL_AUTH]_1]'' \
 .  ds $\\*[$PRFX]\\*[$TTL_AUTH]_1 "\&"
+.   if !'\\*[$AUTHOR_1]'' .rm $PRFX
 .\}
 .if !'\\*[$\\*[$PRFX]\\*[$TTL_AUTH]_1]'' \{\
 .   if '\\$0'DO_SUBTITLE' \{\
@@ -6537,8 +6538,9 @@ SMALLCAPS takes precedence.
 .  \}
 .   \}
 .   if !\\n[#PRINT_STYLE]=1 \{\
-\#.  if (\\n[#COVER]=1):(\\n[#DOC_COVER]=1) \
-\#. rn $PRFX $PRFX_SAVED
+.  if (\\n[#COVER]=1):(\\n[#DOC_COVER]=1) \
+. if !'\\*[$PRFX]'SUB' \
+.rn $PRFX $PRFX_SAVED
 .  fam  \\*[$\\*[$COVER_TYPE]\\*[$PRFX]\\*[$TTL_AUTH]_FAM]
 .  ft   \\*[$\\*[$COVER_TYPE]\\*[$PRFX]\\*[$TTL_AUTH]_FT]
 .  ps \
@@ -6553,10 +6555,10 @@ SMALLCAPS takes precedence.
 . COLOR \\*[$\\*[$COVER_TYPE]\\*[$PRFX]\\*[$TTL_AUTH]_COLOR]
 .  if \\n[#\\*[$COVER_TYPE]\\*[$PRFX]\\*[$TTL_AUTH]_CAPS]=1 .CAPS
 .  if \\n[#\\*[$COVER_TYPE]\\*[$PRFX]\\*[$TTL_AUTH]_SMALLCAPS]=1 
.SMALLCAPS
-\#.  if (\\n[#COVER]=1):(\\n[#DOC_COVER]=1) \
-\#. rn $PRFX_SAVED $PRFX
-.   if \\n[#\\*[DOC_]COVER_TITLE]=2 \
-.  ds $PRFX DOC
+.  if (\\n[#COVER]=1):(\\n[#DOC_COVER]=1) \
+. rn $PRFX_SAVED $PRFX
+.  if \\n[#\\*[DOC_]COVER_TITLE]=2 \
+. ds $PRFX DOC
 .   \}
 .   if \\n[#\\*[DOC_]COVER_SUB] \{\
 .  rr #\\*[DOC_]COVER_SUB
@@ -6914,11 +6916,20 @@ SMALLCAPS takes precedence.
 .   ds DOC_ DOC_
 .\}
 .el .nr #COVER 1
-.nr #ARG_NUM 0 1
-.nr #COVER_ITEM \\n[#NUM_ARGS]  \"loop count
-.if \\n[#NUM_ARGS]=1 \
+.if \\n[#NUM_ARGS]=1 \{\
 .   if '\\$1'\\*[DOC_]COVERTEXT' \
 .  nr #\\*[DOC_]COVERTEXT_ONLY 1
+.\}
+.if \\n[#NUM_ARGS]=3 \{\
+.   if '\\$1'\\*[DOC_]COVERTEXT' \
+.  if '\\$2'PDF_OUTLINE_LABEL' \
+. nr #\\*[DOC_]COVERTEXT_ONLY 1
+.   if '\\$1'PDF_OUTLINE_LABEL' \
+.  if '\\$2'\\*[DOC_]COVERTEXT' \
+. nr #\\*[DOC_]COVERTEXT_ONLY 1
+.\}
+.nr #ARG_NUM 0 1
+.nr #COVER_ITEM \\n[#NUM_ARGS]  \"loop count
 .while \\n+[#ARG_NUM]<=\\n[#COVER_ITEM] \{\
 .   if '\\$1'DOCTITLE' \{\
 .  nr #\\*[DOC_]COVER_TITLE 2
@@ -6962,6 +6973,10 @@ SMALLCAPS takes precedence.
 .  nr #\\*[DOC_]COVER_AUTHOR 1
 .  shift
 .   \}
+.   if '\\$1'EDITOR' \{\
+.  nr #\\*[DOC_]COVER_AUTHOR 1
+.  shift
+.   \}
 .   if '\\$1'DOCTYPE' \{\
 .  nr #\\*[DOC_]COVER_DOCTYPE 1
 .  shift
@@ -7004,10 +7019,9 @@ SMALLCAPS takes precedence.
 \#
 .MAC COVERTITLE END
 .rm DOC_
-.if '\\$0'DOC_COVERTITLE' \{\
+.if '\\$0'DOC_COVERTITLE' \
 .   ds DOC_ DOC_
-.   nr #FROM_\\*[DOC_]COVERTITLE 1
-.\}
+.nr #FROM_\\*[DOC_]COVERTITLE 1
 .ie \\n[#NUM_ARGS]=0 \{\
 .   nr argc 0 1
 .   while \\n+[argc]<=3 \{\
@@ -7072,6 +7086,8 @@ $\\*[DOC_]COVERTITLE_\\n+[#\\*[DOC_]COVERTITLE_NUM] 
\\$\\n[#\\*[DOC_]COVERTITLE_
 .   nr #COVERTEXT_PP 1
 .   di \\*[DOC_]COVER_TEXT
 .   ev 1
+\!. if n[#\\*[DOC_]COVERTEXT_ONLY] \
+.  sp |n[#T_MARGIN]u-n[#DOC_LEAD]u
 \!. ie !\\n[#\\*[DOC_]COVERTEXT_START_POS] \{\
 \!.sp |\\n[.p]u/3u-1v
 \!. \}
@@ -7493,10 +7509,16 @@ $\\*[DOC_]COVERTITLE_\\n+[#\\*[DOC_]COVERTITLE_NUM] 
\\$\\n[#\\*[DOC_]COVERTITLE_
 .   \}
 .   PDF_BOOKMARK 1 \\*[$PD

[groff] 02/04: Add new example files (.mom) to mom/examples.

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit ed00efdff6e599e55b35c996167d734c1dbab8cb
Author: Peter Schaffter 
Date:   Sun Nov 3 17:54:12 2019 -0500

Add new example files (.mom) to mom/examples.

Templates for setting up copyright pages (edition pages).
---
 contrib/mom/examples/copyright-chapter.mom | 160 +
 contrib/mom/examples/copyright-default.mom | 149 +++
 2 files changed, 309 insertions(+)

diff --git a/contrib/mom/examples/copyright-chapter.mom 
b/contrib/mom/examples/copyright-chapter.mom
new file mode 100644
index 000..e536652
--- /dev/null
+++ b/contrib/mom/examples/copyright-chapter.mom
@@ -0,0 +1,160 @@
+.\" -*- mode: text; coding: utf-8; -*-
+\#
+\# Copyright (C) 2019 Free Software Foundation, Inc.
+\#
+\# Copying and distribution of this file, with or without modification,
+\# are permitted in any medium without royalty provided the copyright
+\# notice and this notice are preserved.
+\#
+.ig
+***Template for creating a copyright page, DOCTYPE CHAPTER***
+.
+Mom documents comprised of chapters using DOCTYPE CHAPTER require
+the START macro to begin each chapter, and the COLLATE macro to join
+it to the subsequent chapter.
+.
+A copyright page (also called an edition page), which is not a
+chapter, should be be treated as a DOCTYPE DEFAULT.  The text of
+the copyright page is entered after START and joined to the first
+chapter (DOCTYPE CHAPTER) with COLLATE.
+.
+Copyright pages are not identified by a title or heading, however
+they require a TITLE in order to be included in PDF viewer outlines
+and the Table of Contents.  Supplying '.TITLE "Copyright"'
+but disabling the DOCHEADER achieves both these requirements.
+.
+Pagination should also be disabled for the copyright page.  Both
+docheader and pagination should be re-enabled before the START of
+the first chapter.
+..
+.
+.\" Cover setup
+.
+.\" By default, mom uses the last TITLE macro before START for the
+.\" title that appears on the cover.  Since the TITLE is "Copyright,"
+.\" mom needs to be told explicitly to use a different title.
+.
+.\" Cover and PDF viewer setup
+.
+.DOCTITLE "Book Title"
+.TITLE DOC_COVER \
+  "\*[$DOCTITLE]" \" Title for the cover page
+.AUTHOR \
+  "Book Author"
+.DOC_COVER \
+  TITLE AUTHOR
+.PDF_TITLE  \
+  "DOCTYPE CHAPTER with copyright page" \" For PDF viewer titlebar
+.
+.\" Copyright page setup
+.
+.PRINTSTYLE TYPESET
+.DOCTYPEDEFAULT \" Copyright page is not a chapter.
+.
+.DOCHEADER  off 1i  \" Turn off docheader for copyright page.
+.   \" Begin text 1 inch from page top.
+.PAGINATION off \" Disable pagination for copyright page.
+.
+.TITLE "Copyright"  \" Required for the PDF viewer outline; does not
+.   \" get printed because docheader is disabled.
+.NO_TOC_ENTRY   \" So copyright page is not included in the TOC
+.
+.START  \" Begin example copyright page
+All rights reserved.  No part of this publication may be reproduced,
+distributed, or transmitted in any form or by any means, including
+photocopying, recording, or other electronic or mechanical methods,
+without the prior written permission of the publisher, except
+in the case of brief quotations embodied in critical reviews
+and certain other noncommercial uses permitted by copyright
+law.  For permission requests, write to the publisher, addressed
+“Attention: Permissions Coordinator,” at the address below.
+.SP
+.LEFT
+Copyright \[co]2019 Copyright Holder
+.SP
+Additional information...
+.TOC_AFTER_HERE \" Place TOC after copyright page.
+.
+.COLLATE
+.
+.\" Chapter setup
+.
+.DOCTYPE CHAPTER  \" Begin using DOCTYPE CHAPTER.
+.TITLE \
+  "\*[$DOCTITLE]" \" Needed for page headers.
+. \" Only required before first chapter.
+.CHAPTER 1
+.CHAPTER_TITLE \
+  "Sample Chapter"
+.DOCHEADER\" Re-enable docheader.
+.PAGINATE \" Re-enable pagination.
+.PAGENUMBER 1
+.
+.START \" Begin first chapter.
+.PP
+Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Sed at
+ante.  Mauris eleifend, quam a vulputate dictum, massa quam dapibus
+leo, eget vulputate orci purus ut lorem.  In fringilla mi in ligula.
+Pellentesque aliquam quam vel dolor.  Nunc adipiscing.  Sed quam odio,
+tempus ac, aliquam molestie, varius ac, tellus.  Vestibulum ut nulla
+aliquam risus rutrum interdum.  Pellentesque lorem.  Curabitur sit
+amet erat quis risus feugiat viverra.  Pellentesque augue justo,
+sagittis et, lacinia at, venenatis non, arcu.  Nunc nec libero.  In
+cursus dictum risus.  Etiam tristique nisl a nulla.  Ut a orci.
+Curabitur dolor nunc, egestas at, accumsan at, malesuada nec, magna.
+.PP
+Nulla facilisi.  Nunc volutpat.  Vestibulum ante ipsum primis in
+f

[groff] 03/04: Update mom.am to build copyright template examples.

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit e80baeaf2654feee6e69c489ea763d11968153aa
Author: Peter Schaffter 
Date:   Sun Nov 3 17:56:39 2019 -0500

Update mom.am to build copyright template examples.

Update ChangeLog.
---
 contrib/mom/ChangeLog | 7 +++
 contrib/mom/mom.am| 8 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/contrib/mom/ChangeLog b/contrib/mom/ChangeLog
index 25c3f8c..63a85cb 100644
--- a/contrib/mom/ChangeLog
+++ b/contrib/mom/ChangeLog
@@ -1,3 +1,10 @@
+2019-11-03
+
+   * templates added for setting up copyright pages
+
+  * updated mom.am to include the templates when buliding
+pdfs in mom/examples
+
 2018-11-24
 
* version 2.4 release (see NEWS)
diff --git a/contrib/mom/mom.am b/contrib/mom/mom.am
index 57ae357..5507256 100644
--- a/contrib/mom/mom.am
+++ b/contrib/mom/mom.am
@@ -85,7 +85,9 @@ MOMEXAMPLEFILES=\
   contrib/mom/examples/penguin.ps \
   contrib/mom/examples/penguin.pdf \
   contrib/mom/examples/mom.vim \
-  contrib/mom/examples/slide-demo.mom
+  contrib/mom/examples/slide-demo.mom \
+  contrib/mom/examples/copyright-default.mom \
+  contrib/mom/examples/copyright-chapter.mom
 if BUILD_EXAMPLES
 momexampledir = $(exampledir)/mom
 dist_momexample_DATA = $(MOMEXAMPLEFILES)
@@ -100,7 +102,9 @@ MOMPROCESSEDEXAMPLEFILES = \
   contrib/mom/examples/mon_premier_doc.pdf \
   contrib/mom/examples/sample_docs.pdf \
   contrib/mom/examples/typesetting.pdf \
-  contrib/mom/examples/slide-demo.pdf
+  contrib/mom/examples/slide-demo.pdf \
+  contrib/mom/examples/copyright-default.pdf \
+  contrib/mom/examples/copyright-chapter.pdf \
 momprocessedexampledir = $(exampledir)/mom
 nodist_momprocessedexample_DATA = $(MOMPROCESSEDEXAMPLEFILES)
 

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 04/04: Replace errant apostrophes.

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 80c52b201cac1de7fb27b10117eb99458bcbaa85
Author: Peter Schaffter 
Date:   Sun Nov 3 17:59:52 2019 -0500

Replace errant apostrophes.

Replace typewriter apostrophes with ’ html entity.
---
 contrib/mom/momdoc/appendices.html |  12 +--
 contrib/mom/momdoc/color.html  |  26 +++
 contrib/mom/momdoc/cover.html  |   6 +-
 contrib/mom/momdoc/docelement.html |  54 +++---
 contrib/mom/momdoc/docprocessing.html  |  93 +--
 contrib/mom/momdoc/goodies.html|  10 +--
 contrib/mom/momdoc/graphical.html  |  25 ---
 contrib/mom/momdoc/headfootpage.html   |   6 +-
 contrib/mom/momdoc/images.html | 116 ++---
 contrib/mom/momdoc/inlines.html|  24 +++---
 contrib/mom/momdoc/letters.html|   4 +-
 contrib/mom/momdoc/macrolist.html  |   3 +
 contrib/mom/momdoc/refer.html  |  10 +--
 contrib/mom/momdoc/reserved.html   |   2 +-
 contrib/mom/momdoc/tables-of-contents.html |  12 +--
 contrib/mom/momdoc/toc.html|  16 ++--
 contrib/mom/momdoc/typesetting.html|   6 +-
 contrib/mom/momdoc/using.html  |   6 +-
 18 files changed, 242 insertions(+), 189 deletions(-)

diff --git a/contrib/mom/momdoc/appendices.html 
b/contrib/mom/momdoc/appendices.html
index 847c208..6fe71fc 100644
--- a/contrib/mom/momdoc/appendices.html
+++ b/contrib/mom/momdoc/appendices.html
@@ -542,7 +542,7 @@ and <version>.
 
 
 
-In addition, unless you're installing fonts from your home
+In addition, unless you’re installing fonts from your home
 directory, make links to the files 'generate-t42.pe' and
 'generate-pfa.pe'.
 
@@ -583,7 +583,7 @@ Move the .t42 and groff font files to
 
 
 
-If you're running a recent version of groff that includes
+If you’re running a recent version of groff that includes
 the native pdf device (gropdf), move the .pfa file to
 <prefix>/<version>/font/devpdf/.  If not, you
 may safely remove it.  You may also safely remove the .afm file.
@@ -611,7 +611,7 @@ for advice on naming groff fonts.)
 
 
 
-If you're running a recent version of groff that includes the
+If you’re running a recent version of groff that includes the
 native pdf device (gropdf), link the .pfa and groff font files,
 now in <prefix>/<site-font>/devps/,
 to the devpdf directory.  Start by changing into the
@@ -689,7 +689,7 @@ contain
  • Updating the gropdf download file
 
 
-If you're running a recent version of groff that includes the
+If you’re running a recent version of groff that includes the
 native pdf device (gropdf), you must update its download file as
 well, which is found in <prefix>/<version>/font/devpdf/.
 The instructions are identical to those above, but with one important
@@ -744,7 +744,7 @@ to use it.
 
 
 
-For example, the font, Goudy Stout, isn't really part of the
+For example, the font, Goudy Stout, isn’t really part of the
 Goudy family, and while "stout" describes it, Stout is not a
 recognized font style.  Therefore, its groff name could simply be
 GoudyStout, and whenever you needed it, you could call it with
@@ -877,7 +877,7 @@ If you want to visit mom’s website, you’ll find 
a link
 to it at
 
 
-  http://www.schaffter.ca
+  https://www.schaffter.ca
 
 The site contains links to some of my fiction, all of which was
 typeset with mom and groff.
diff --git a/contrib/mom/momdoc/color.html b/contrib/mom/momdoc/color.html
index d5d5910..40c6293 100644
--- a/contrib/mom/momdoc/color.html
+++ b/contrib/mom/momdoc/color.html
@@ -66,7 +66,7 @@ with the name of the colour you want.
 
 For example, say you want to have the name “Jack” in the
 sentence “All work and no play makes Jack a dull boy”
-appear in yellow.  You'd begin by telling mom about the colour,
+appear in yellow.  You’d begin by telling mom about the colour,
 yellow.  There are two ways of doing this; see
 NEWCOLOR
 and
@@ -75,7 +75,7 @@ for a full explanation of the difference between the two.
 
 
 
-If you use XCOLOR, you'd enter this:
+If you use XCOLOR, you’d enter this:
 
 
   .XCOLOR yellow
@@ -89,8 +89,8 @@ If you use NEWCOLOR, you might enter:
 
 
 After “defining” (or “initializing”) the
-colour “yellow”, you'd colourize the name, Jack, either
-with an inline escape
+colour “yellow”, you’d colourize the name, Jack,
+either with an inline escape
 
 
   All work and no play makes \*[yellow]Jack\*[black] a dull boy.
@@ -224,8 +224,8 @@ could enter one of the following:
   .NEWCOLOR YELLOW CYM #00FF00 \"or ## or "0 1 0"
   .NEWCOLOR YELLOW CYMK #00FF  \"or ## or "0 0 1 0"
 
-After you've told mom about a colour, you can then get her to set
-text in that colour either with the
+After you’ve told mo

[groff] 01/01: mom 2.4-2 updated BUGS file

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 324977c587494aff242f8d4e63be09572a2c748e
Author: Peter Schaffter 
Date:   Tue Oct 22 16:35:00 2019 -0400

mom 2.4-2 updated BUGS file
---
 contrib/mom/BUGS | 9 +
 1 file changed, 9 insertions(+)

diff --git a/contrib/mom/BUGS b/contrib/mom/BUGS
index 4875fdf..e77f1dc 100644
--- a/contrib/mom/BUGS
+++ b/contrib/mom/BUGS
@@ -21,6 +21,15 @@ the Subject line or you risk my spam filters nuking your 
message.
 
 
 
+Version 2.4-1
+=
+tbl not respecting pre-tbl fill mode.
+---Fixed---
+
+COVER and DOC_COVER not always capturing pertinent title and
+copyright.
+---Fixed---
+
 Version 2.4
 ===
 BIBLIOGRAPHY output broken.

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: mom 2.4-2 doc fixes

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit ae11569808ea0a19d5fbe04831fe07451c13d4ac
Author: Peter Schaffter 
Date:   Tue Oct 22 16:29:09 2019 -0400

mom 2.4-2 doc fixes
---
 contrib/mom/momdoc/appendices.html| 7 +++
 contrib/mom/momdoc/color.html | 2 +-
 contrib/mom/momdoc/cover.html | 4 ++--
 contrib/mom/momdoc/docprocessing.html | 9 -
 contrib/mom/momdoc/toc.html   | 4 ++--
 5 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/contrib/mom/momdoc/appendices.html 
b/contrib/mom/momdoc/appendices.html
index 21a7a15..847c208 100644
--- a/contrib/mom/momdoc/appendices.html
+++ b/contrib/mom/momdoc/appendices.html
@@ -359,8 +359,7 @@ top, you’ll see lines of the form
 
 Simply add your new font style by imitating what you see, above,
 and plugging in your new font style (having, of course, 
-added the font to groff, correctly named).
-directory; see
+added the font to groff, correctly named); see
 Step-by-step instructions).
 
 
@@ -757,10 +756,10 @@ GoudyStout, and whenever you needed it, you could call it 
with
 
 A bash script to make the entire process of installing fonts a
 painless no-brainer has been posted online at
-http://www.schaffter.ca/mom/install-font";>http://www.schaffter.ca/mom/install-font.
+https://www.schaffter.ca/mom/bin/install-font.sh";>https://www.schaffter.ca/mom/bin/install-font.sh.
 Be sure to make the script executable
 (chmod 755 install-font)
-after you download it, then type ./install-font -H for
+after you download it, then type ./install-font.sh -H for
 usage.
 
 
diff --git a/contrib/mom/momdoc/color.html b/contrib/mom/momdoc/color.html
index c03ceb4..d5d5910 100644
--- a/contrib/mom/momdoc/color.html
+++ b/contrib/mom/momdoc/color.html
@@ -194,7 +194,7 @@ The second argument, which is entirely optional, is the
 colour.  Valid arguments are
 
 
-  RBG   (3 components: red green blue)
+  RGB   (3 components: red green blue)
   CYM   (3 components: cyan yellow magenta)
   CMYK  (4 components: cyan magenta yellow black)
   GRAY  (1 component)
diff --git a/contrib/mom/momdoc/cover.html b/contrib/mom/momdoc/cover.html
index 5c815a9..b08dc9b 100644
--- a/contrib/mom/momdoc/cover.html
+++ b/contrib/mom/momdoc/cover.html
@@ -203,12 +203,12 @@ be included in the pagination scheme (even though no page 
numbers
 appear), you must tell mom that’s what you want by invoking
 
 
-  .DOC_COVERS_COUNT_PAGES
+  .DOC_COVER_COUNTS_PAGES
 
 or
 
 
-  .COVERS_COUNT_PAGES
+  .COVER_COUNTS_PAGES
 
 
 
diff --git a/contrib/mom/momdoc/docprocessing.html 
b/contrib/mom/momdoc/docprocessing.html
index 573f54d..853da60 100644
--- a/contrib/mom/momdoc/docprocessing.html
+++ b/contrib/mom/momdoc/docprocessing.html
@@ -1474,7 +1474,7 @@ Macro: COPYRIGHT [COVER | 
DOC_COVER] "<co
 
 
 
-The argument passed to COPYRIGHT is only used on cover or doc cover
+The required argument to COPYRIGHT is only used on cover or doc cover
 pages, and then only if the argument COPYRIGHT is passed to
 COVER
 or
@@ -1484,10 +1484,9 @@ COPYRIGHT; mom puts it in for you.
 
 
 
-If the optional argument, COVER or DOC_COVER,
-is given to COPYRIGHT, the string argument represents the copyright
-information that will appear on cover or document cover pages (see
-the
+The optional argument, COVER or DOC_COVER,
+should only be used if you have both a doc cover and a cover and want
+differing copyright information on each (see the
 Introduction to cover pages
 for a description of the difference between “document
 covers” and “covers”).  Thus, it is possible to
diff --git a/contrib/mom/momdoc/toc.html b/contrib/mom/momdoc/toc.html
index 1631624..1a79b56 100644
--- a/contrib/mom/momdoc/toc.html
+++ b/contrib/mom/momdoc/toc.html
@@ -20,7 +20,7 @@ FDL in the main directory of the groff source package.
 
 
   
-  Mom, version 2.4-1 -- Table of Contents
+  Mom, version 2.4-2 -- Table of Contents
   
 
 
@@ -31,7 +31,7 @@ FDL in the main directory of the groff source package.
 
 
   
-mom, version 2.4-1
+mom, version 2.4-2
   
 
 Table of Contents

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: 2.4-2 bugfix release

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit b5e1d975c2753cc32c0f6aa6720f12a4074bc938
Author: Peter Schaffter 
Date:   Tue Oct 22 16:23:43 2019 -0400

2.4-2 bugfix release

Fixes to COVER and DOC_COVER to capture titles and copyright
consistently and correctly.

Fixes tbl(1) integration so it maintains pre-tbl fill mode in
multi-line table cells.
---
 contrib/mom/om.tmac | 55 +++--
 1 file changed, 37 insertions(+), 18 deletions(-)

diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac
index a8ec8af..cfe1acb 100644
--- a/contrib/mom/om.tmac
+++ b/contrib/mom/om.tmac
@@ -20,7 +20,7 @@ for more details.
 You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-Version 2.4-1
+Version 2.4-2
 -
 Antoine de St-Exupéry asserted that elegance in engineering is
 achieved not when there is nothing left to add, but when there is
@@ -54,7 +54,7 @@ extensions, and float management).
 .if (\n[.x]\n[.y] < 118) \
 .   ab [mom]: You need GNU troff version 1.18 or higher to run this version of 
mom.
 \# Mom version
-.ds version 2.4-1
+.ds version 2.4-2
 .if dVERSION \{\
 .   ab [mom]: Version \*[version]
 .\}
@@ -4809,8 +4809,10 @@ y\R'#DESCENDER \\n[.cdp]'
 .MAC COPYRIGHT END  \"For use on cover pages only
 .   ie \\n[#NUM_ARGS]=1 \
 .   ds $COVER_COPYRIGHT \[co]\\$1
-.el \
+.el \{\
+.   if '\\$1'COVER' .ds $COVER_COPYRIGHT \[co]\\$2
 .   if '\\$1'DOC_COVER' .ds $DOC_COVER_COPYRIGHT \[co]\\$2
+.\}
 .END
 \#
 .MAC COPYRIGHT_V_ADJUST END
@@ -6523,6 +6525,10 @@ SMALLCAPS takes precedence.
 .MAC DO_TITLE_OR_AUTHOR END
 .ie '\\$0'DO_AUTHORS' .ds $TTL_AUTH AUTHOR
 .el .ds $TTL_AUTH TITLE
+.if '\\*[$\\*[$PRFX]\\*[$TTL_AUTH]_1]'' \{\
+.   if !'\\*[$\\*[$PRFX]DOC\\*[$TTL_AUTH]_1]'' \
+.  ds $\\*[$PRFX]\\*[$TTL_AUTH]_1 "\&"
+.\}
 .if !'\\*[$\\*[$PRFX]\\*[$TTL_AUTH]_1]'' \{\
 .   if '\\$0'DO_SUBTITLE' \{\
 .  if '\\*[$PRFX]'\\*[DOC_]COVER_SUB' \{\
@@ -6549,6 +6555,8 @@ SMALLCAPS takes precedence.
 .  if \\n[#\\*[$COVER_TYPE]\\*[$PRFX]\\*[$TTL_AUTH]_SMALLCAPS]=1 
.SMALLCAPS
 \#.  if (\\n[#COVER]=1):(\\n[#DOC_COVER]=1) \
 \#. rn $PRFX_SAVED $PRFX
+.   if \\n[#\\*[DOC_]COVER_TITLE]=2 \
+.  ds $PRFX DOC
 .   \}
 .   if \\n[#\\*[DOC_]COVER_SUB] \{\
 .  rr #\\*[DOC_]COVER_SUB
@@ -7337,7 +7345,7 @@ $\\*[DOC_]COVERTITLE_\\n+[#\\*[DOC_]COVERTITLE_NUM] 
\\$\\n[#\\*[DOC_]COVERTITLE_
 .   if \\n[#\\*[DOC_]COVER_COLOR]=1 \
 .  COLOR \\*[$\\*[DOC_]COVER_COLOR]
 .\\*[DOC_]COVER_H_POS
-.if \\n[#\\*[DOC_]COVER_TITLE]=2 .ds DOC DOC
+.if (\\n[#\\*[DOC_]COVER_TITLE]=1):(\\n[#\\*[DOC_]COVER_TITLE]=2) .ds DOC 
DOC
 .fam \\*[$\\*[DOC_]COVER_\\*[DOC]TITLE_FAM]
 .ft  \\*[$\\*[DOC_]COVER_\\*[DOC]TITLE_FT]
 .ps  \\*[$\\*[DOC_]COVER_\\*[DOC]TITLE_SIZE_CHANGE]
@@ -7626,6 +7634,8 @@ $\\*[DOC_]COVERTITLE_\\n+[#\\*[DOC_]COVERTITLE_NUM] 
\\$\\n[#\\*[DOC_]COVERTITLE_
 .   rr #COPYRIGHT_V_POS
 .\}
 .if \\n[#\\*[DOC_]COVER_COPYRIGHT]=1 \{\
+.   if '\\*[$\\*[DOC_]COVER_COPYRIGHT]'' \
+.  ds $\\*[DOC_]COVER_COPYRIGHT \\*[$COVER_COPYRIGHT]
 .   QUAD \\*[$\\*[DOC_]COVER_COPYRIGHT_QUAD]
 .   if \\n[#\\*[DOC_]COVER_COPYRIGHT_COLOR]=1 \
 .  COLOR \\*[$\\*[DOC_]COVER_COPYRIGHT_COLOR]
@@ -7689,7 +7699,6 @@ $\\*[DOC_]COVERTITLE_\\n+[#\\*[DOC_]COVERTITLE_NUM] 
\\$\\n[#\\*[DOC_]COVERTITLE_
 .   if \\n[TOC.RELOCATE]==4 \
 .  if !rTOC_BH .TOC_AFTER_HERE
 .\}
-.if '\\$0'DO_DOC_COVER' .rm DOC_
 .END_COVER
 .END
 \#
@@ -7706,7 +7715,7 @@ $\\*[DOC_]COVERTITLE_\\n+[#\\*[DOC_]COVERTITLE_NUM] 
\\$\\n[#\\*[DOC_]COVERTITLE_
 .rr #NEWPAGE
 .rr #SKIP
 .if \\n[#PAGINATION_WAS_ON]=1 .nr % +1
-.ie \\n[#\\*[DOC]COVER_BLANKPAGE]=1 \{\
+.ie \\n[#\\*[DOC_]COVER_BLANKPAGE]=1 \{\
 .   if \\n[TOC.RELOCATE] \
 .  if !\\n[#TOC_BH] .TOC_AFTER_HERE
 .\" Without the empty PDF_BOOKMARK, (doc)cover BLANKPAGE causes
@@ -7715,8 +7724,9 @@ $\\*[DOC_]COVERTITLE_\\n+[#\\*[DOC_]COVERTITLE_NUM] 
\\$\\n[#\\*[DOC_]COVERTITLE_
 .   PDF_BOOKMARK 1
 .   nop \&
 .   bp
-.   rr #\\*[DOC]COVER_BLANKPAGE
+.   rr #\\*[DOC_]COVER_BLANKPAGE
 .   if !\\n[#\\*[DOC]COVERS_COUNT]=1 .nr % -2
+.   rm DOC_
 .\}
 .el \
 .   if !\\n[#\\*[DOC]COVERS_COUNT]=1 .nr #PAGE_NUM_ADJ -1
@@ -8574,8 +8584,16 @@ Shimming must be disabled with NO_SHIM before using FLEX.
 \#   Forces doccover and cover pages to recto
 \#
 .MAC FORCE_RECTO END
-.ie '\\$1'' .nr #FORCE_RECTO 1
-.el .rr #FORCE_RECTO
+.ie '\\$1'' \{

[groff] 01/01: Improve float deferral checks

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 00d50b2ba6483adb8f4b5252e5e1d4f7f2fff6b2
Author: Peter Schaffter 
Date:   Thu Aug 15 14:02:59 2019 -0400

Improve float deferral checks
---
 contrib/mom/om.tmac | 18 ++
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac
index ee31e69..a8ec8af 100644
--- a/contrib/mom/om.tmac
+++ b/contrib/mom/om.tmac
@@ -20,8 +20,8 @@ for more details.
 You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-Version 2.4

+Version 2.4-1
+-
 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.
@@ -54,7 +54,7 @@ extensions, and float management).
 .if (\n[.x]\n[.y] < 118) \
 .   ab [mom]: You need GNU troff version 1.18 or higher to run this version of 
mom.
 \# Mom version
-.ds version 2.4
+.ds version 2.4-1
 .if dVERSION \{\
 .   ab [mom]: Version \*[version]
 .\}
@@ -1076,7 +1076,7 @@ end
 .\}
 .if '\\$0'ADD_SPACE' \{\
 .   vpt 0
-.   nr #ALD (u;\\$1)
+.   nr #ALD \\$1
 .   rs
 .   nop \&
 .   br
@@ -17117,7 +17117,7 @@ E\\R'#CAP_HEIGHT \\n[.cht]'
 .   rr pic*top-lead-diff
 .   rr float*pic
 .\}
-.if \\n[float*img] \{\
+.if \\n[float*img:1] \{\
 .   ie \\n[#COLUMNS] \
 .  sp |\\n[dc]u
 .   el \
@@ -17127,6 +17127,7 @@ E\\R'#CAP_HEIGHT \\n[.cht]'
 .  rr pdf-img:frame
 .   \}
 .\}
+.if \\n[defers] .rr defers
 .nr loop-count  0 1
 .nr new-defer   0 1
 .while \\n+[loop-count]<=\\n[defer-count] \{\
@@ -17144,8 +17145,9 @@ E\\R'#CAP_HEIGHT \\n[.cht]'
 .  ch FN_OVERFLOW_TRAP -\\n[#FN_OVERFLOW_TRAP_POS]u
 .   \}
 .   ie !\\n[float-span:\\n[loop-count]] \{\
-.  ie 
((\\n[float-depth:\\n[loop-count]]-\\n[.v])>\\n[.t]):(\\n[D-float:\\n[loop-count]]>\\n[.t])
 \{\
+.  ie 
((\\n[float-depth:\\n[loop-count]]-\\n[.v])>\\n[.t]):(\\n[D-float:\\n[loop-count]]>\\n[.t]):(\\n[defers]=1)
 \{\
 .\" Insufficient space, defer to next page
+. nr defers 1
 . rn FLOAT*DIV:\\n[loop-count] NEW*FLOAT*DIV:\\n+[new-defer]
 . rnn float-depth:\\n[loop-count] new-float-depth:\\n[new-defer]
 . rnn D-float:\\n[loop-count] new-D-float:\\n[new-defer]
@@ -17196,7 +17198,7 @@ E\\R'#CAP_HEIGHT \\n[.cht]'
 .rr #TMP_PAGE_OFFSET
 .ch FOOTER \\n[#VARIABLE_FOOTER_POS]u
 .ch FN_OVERFLOW_TRAP -\\n[#FN_OVERFLOW_TRAP_POS]u
-.if !\\n[.t]=1 .if \\n[.t]<\\n[.v] .bp
+.if \\n[float-depth:1]>\\n[.t] .bp
 .ie !\\n[#NO_SHIM] .SHIM
 .el \{\
 .   if !\\n[#NO_FLEX] \
@@ -17235,7 +17237,7 @@ E\\R'#CAP_HEIGHT \\n[.cht]'
 \#
 .MAC output-float END
 .if \\n[float*img] \{\
-.   nr no-top-space:1 1
+.   if \\n[loop-count]=1 .nr no-top-space:1 1
 .\}
 .vpt 0
 .if \\n[.ns] \{\

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: Doc fixes.

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 8d5492610c9780e3fd7c369f22b2f4036b7fe1f6
Author: Peter Schaffter 
Date:   Thu Aug 15 14:05:38 2019 -0400

Doc fixes.
---
 contrib/mom/momdoc/cover.html   | 22 ++
 contrib/mom/momdoc/goodies.html | 15 +++
 contrib/mom/momdoc/toc.html |  4 ++--
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/contrib/mom/momdoc/cover.html b/contrib/mom/momdoc/cover.html
index e18a1c3..5c815a9 100644
--- a/contrib/mom/momdoc/cover.html
+++ b/contrib/mom/momdoc/cover.html
@@ -504,10 +504,10 @@ will print
 
 
 
-Macro: DOC_COVERTEXT <toggle>
+Macro: DOC_COVERTEXT [START <starting 
position>] <toggle>
 
 
-Macro: COVERTEXT <toggle>
+Macro: COVERTEXT [START <starting 
position>] <toggle>
 
 
 
@@ -548,16 +548,22 @@ is the only allowed document element tag.
 
 If you do not instruct mom to put anything on doc-cover or cover
 pages except DOC_COVERTEXT or COVERTEXT, the
-cover text will begin at the document’s top margin.  You must
+cover text will begin at the document’s top margin.
+Equally, if only COPYRIGHT and/or MISC are
+to go on the pages, cover text begins at the top margin.  In all
+other cases, cover text begins below the last element on the page
+(excluding COPYRIGHT or MISC), separated by a blank line.
+
+
+
+If you wish to change the starting position of the text, you must
 use
 SP
 or
 ALD
-to move it further down the page.  Equally, if only
-COPYRIGHT and/or MISC are to go on the pages,
-cover text begins at the top margin.  In all other cases, cover text
-begins below the last element on the page (excluding COPYRIGHT or
-MISC), separated by a blank line.
+to move it further down the page.  Alternatively, you may use the
+optional START argument to give a precise location for the text to
+begin.
 
 
 
diff --git a/contrib/mom/momdoc/goodies.html b/contrib/mom/momdoc/goodies.html
index 24c1a27..046e07d 100644
--- a/contrib/mom/momdoc/goodies.html
+++ b/contrib/mom/momdoc/goodies.html
@@ -524,6 +524,21 @@ not
 
   \*[UC]All work and no play makes Jack a dull boy\*[LC].
 
+Conversely, an initial period must come before
+\*[UC], or be preceded by \&, like this:
+
+
+  .\*[UC]start\*[LC] is used to begin document processing.
+
+or
+
+  \*[UC]\&.start\*[LC] is used to begin document processing.
+
+Upon output, either will produce
+
+
+  START is used to begin document processing.
+
 
 
 
diff --git a/contrib/mom/momdoc/toc.html b/contrib/mom/momdoc/toc.html
index eb1df1d..1631624 100644
--- a/contrib/mom/momdoc/toc.html
+++ b/contrib/mom/momdoc/toc.html
@@ -20,7 +20,7 @@ FDL in the main directory of the groff source package.
 
 
   
-  Mom, version 2.4 -- Table of Contents
+  Mom, version 2.4-1 -- Table of Contents
   
 
 
@@ -31,7 +31,7 @@ FDL in the main directory of the groff source package.
 
 
   
-mom, version 2.4
+mom, version 2.4-1
   
 
 Table of Contents

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 03/03: Clarify use of BIBLIOGRAPHY_HEADER_CENTER

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 255f4ce6d9e2db9a6625724813379438b665aca7
Author: Peter Schaffter 
Date:   Tue Dec 18 15:30:40 2018 -0500

Clarify use of BIBLIOGRAPHY_HEADER_CENTER
---
 contrib/mom/momdoc/refer.html | 38 +++---
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/contrib/mom/momdoc/refer.html b/contrib/mom/momdoc/refer.html
index 7dffb6d..bd814c0 100644
--- a/contrib/mom/momdoc/refer.html
+++ b/contrib/mom/momdoc/refer.html
@@ -1837,9 +1837,11 @@ on bibliography pages.  Chapters get treated differently 
in that,
 by default, mom does not print the header/footer centre string
 (normally the chapter number or chapter title.)  In most cases, this
 is what you want.  However, should you not want mom to remove the
-centre string from the bibliography pages headers/footers, invoke
+centre string from the bibliography pages headers/footers, or you
+would like her to add one in cases where there hasn't been one
+before (e.g. DOCTYPE DEFAULT) invoke
 .BIBLIOGRAPHY_HEADER_CENTER
-with no argument. 
+with no argument.
 
 
 
@@ -1848,26 +1850,29 @@ An important change you may want to make is to put the 
word
 do so, invoke
 
 
+  .BIBLIOGRAPHY_HEADER_CENTER
   .HEADER_CENTER "Bibliography"
 
 or
 
+  .BIBLIOGRAPHY_FOOTER_CENTER
   .FOOTER_CENTER "Bibliography"
 
-prior to invoking .BIBLIOGRAPHY.
+prior to invoking .BIBLIOGRAPHY.  
 
 
-
+
 
-Note:
-If your
-DOCTYPE
-is CHAPTER, you must also invoke
-
-
-  BIBLIOGRAPHY_HEADER_CENTER
+Important:
+Unless you have a running centre string in your headers or footers, you must 
invoke
+
+  .BIBLIOGRAPHY_HEADER_CENTER
+
+or
+
+  .BIBLIOGRAPHY_FOOTER_CENTER
 
-for the BIBLIOGRAPHY_HEADER_CENTER to appear.
+in order for the centre string to appear, as demonstrated above.
 
 
 
@@ -1882,9 +1887,12 @@ If your
 DOCTYPE
 is CHAPTER and you want mom to include a centre
 string in the headers/footers that appear on bibliography
-pages, invoke .BIBLIOGRAPHY_HEADER_CENTER (or
-.BIBLIOGRAPHY_FOOTER_CENTER) with no argument.
-Mom’s default is NOT to print the centre string.
+pages, or if you do not have a running header/footer
+centre string in the body of the document, invoke
+.BIBLIOGRAPHY_HEADER_CENTER (or
+.BIBLIOGRAPHY_FOOTER_CENTER) with no argument before
+defining the centre string .  Mom’s default is NOT to print the
+centre string.
 
 
 

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/03: Fix broken BIBLIOGRAPHY output

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 8e93939c8fef3454fb8af54d503236d3a5ed0374
Author: Peter Schaffter 
Date:   Tue Dec 18 15:16:12 2018 -0500

Fix broken BIBLIOGRAPHY output

In LIST macro (the culprit), split pre-list quad check into two
clauses.
---
 contrib/mom/om.tmac | 30 --
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac
index 9790b1b..ee31e69 100644
--- a/contrib/mom/om.tmac
+++ b/contrib/mom/om.tmac
@@ -9176,7 +9176,7 @@ Shimming must be disabled with NO_SHIM before using FLEX.
 \#
 .MAC HDRFTR_CENTER END
 .nr #USER_DEF_HDRFTR_CENTER 1
-.if '\\$0'FOOTER_CENTER' \{\
+.if '\\$0'HEADER_CENTER' \{\
 .   ds $HDRFTR_CENTER_OLD \\*[$HDRFTR_CENTER]
 .   ds $HDRFTR_CENTER_NEW \\$1
 .\}
@@ -12628,7 +12628,7 @@ Shimming must be disabled with NO_SHIM before using 
FLEX.
 .  el .sp \\n[#DOC_LEAD]u+\\n[#Q_LEAD_DIFF]u
 .   \}
 .   el \{\
-.  sp \\n[#DOC_LEAD]u
+.  if '\\*[$QUOTE_TYPE]'Q' .sp \\n[#DOC_LEAD]u
 .  if \\n[@TOP] .rs
 .   \}
 .   ie \\n[#Q_LEAD_REAL] \
@@ -14938,7 +14938,7 @@ E\\R'#CAP_HEIGHT \\n[.cht]'
 .  ps \\n[#\\*[EN-OR-BIB]_PS]u\\*[$\\*[EN-OR-BIB]_STRING_SIZE_CHANGE]
 .  vs  \\n[#\\*[EN-OR-BIB]_LEAD]u
 .   \}
-.   substring $\\*[$EN-OR-BIB]_STRING_QUAD 0 0
+.   substring $\\*[EN-OR-BIB]_STRING_QUAD 0 0
 .   if '\\*[$\\*[EN-OR-BIB]_STRING_QUAD]'L' .LEFT
 .   if '\\*[$\\*[EN-OR-BIB]_STRING_QUAD]'C' .CENTER
 .   if '\\*[$\\*[EN-OR-BIB]_STRING_QUAD]'R' .RIGHT
@@ -15956,13 +15956,23 @@ E\\R'#CAP_HEIGHT \\n[.cht]'
 .\}
 .ds pre-list-quad \\*[$QUAD_VALUE]
 .substring pre-list-quad 0 0
-.if !'\\n[.z]'LIST*DIV' \{\
-.   if '\\*[pre-list-quad]'C' .nr #LIST_CENTER 1
-.   if '\\*[pre-list-quad]'R' .nr #LIST_RIGHT 1
-.   nr #PRE_LIST_QUAD \\n[.j]
-.   di LIST*DIV
-\!. nr #IN_LIST 1
-.   ad l
+.if '\\*[pre-list-quad]'C' \{\
+.   if !'\\n[.z]'LIST*DIV' \{\
+.  nr #PRE_LIST_QUAD \\n[.j]
+.  nr #LIST_CENTER 1
+.  if !'\\n[.z]'LIST*DIV' .di LIST*DIV
+\!.nr #IN_LIST 1
+.  ad l
+.   \}
+.\}
+.if '\\*[pre-list-quad]'R' \{\
+.   if !'\\n[.z]'LIST*DIV' \{\
+.  nr #PRE_LIST_QUAD \\n[.j]
+.  nr #LIST_RIGHT 1
+.  if !'\\n[.z]'LIST*DIV' .di LIST*DIV
+\!.nr #IN_LIST 1
+.  ad l
+.   \}
 .\}
 .ie \\n[#NUM_ARGS]=0 \{\
 .   nr #ARGS_TO_LIST 1 \" So default behaves as if LIST BULLET

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 02/03: Update BUGS file

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit b67a262ce870a205f094454f2929ef04d253857f
Author: Peter Schaffter 
Date:   Tue Dec 18 15:29:25 2018 -0500

Update BUGS file
---
 contrib/mom/BUGS | 5 +
 1 file changed, 5 insertions(+)

diff --git a/contrib/mom/BUGS b/contrib/mom/BUGS
index adf9862..4875fdf 100644
--- a/contrib/mom/BUGS
+++ b/contrib/mom/BUGS
@@ -21,6 +21,11 @@ the Subject line or you risk my spam filters nuking your 
message.
 
 
 
+Version 2.4
+===
+BIBLIOGRAPHY output broken.
+---Fixed---
+
 Version 2.3
 ===
 .PS/.PE not working at start of documents without a preceding .PP.

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: Trivial doc fixes.

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 35c8ecc4e75042bf4b08119ab68c98eaad857cca
Author: Peter Schaffter 
Date:   Mon Dec 10 13:59:37 2018 -0500

Trivial doc fixes.
---
 contrib/mom/momdoc/docprocessing.html | 2 +-
 contrib/mom/momdoc/macrolist.html | 1 -
 contrib/mom/momdoc/stylesheet.css | 6 +++---
 contrib/mom/momdoc/version-2.html | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/contrib/mom/momdoc/docprocessing.html 
b/contrib/mom/momdoc/docprocessing.html
index 199a96d..573f54d 100644
--- a/contrib/mom/momdoc/docprocessing.html
+++ b/contrib/mom/momdoc/docprocessing.html
@@ -3034,7 +3034,7 @@ caps, smallcaps and underscoring.
 Change the family of the whole 
docheader
 Change the colour of the whole 
docheader
 Change the leading of the whole 
docheader
-Change the quad direction whole the 
docheader
+Change the quad direction of the 
docheader
   
   
   2. Part by part changes
diff --git a/contrib/mom/momdoc/macrolist.html 
b/contrib/mom/momdoc/macrolist.html
index 4b5d0db..2c39e0e 100644
--- a/contrib/mom/momdoc/macrolist.html
+++ b/contrib/mom/momdoc/macrolist.html
@@ -76,7 +76,6 @@ elsewhere in the documentation.
 
   Reference macros (metadata)
   Document type and initial defaults
-  Document type and initial defaults
     – Slides
   TYPEWRITE control macros
   Vertical whitespace management
diff --git a/contrib/mom/momdoc/stylesheet.css 
b/contrib/mom/momdoc/stylesheet.css
index 1574f27..ff3315f 100644
--- a/contrib/mom/momdoc/stylesheet.css
+++ b/contrib/mom/momdoc/stylesheet.css
@@ -376,7 +376,7 @@ ul.mini-toc-centered
 {
   float: left ;
   width: 32% ;
-  height: 52em ;
+  height: 55em ;
   padding-bottom: 9px;
   background-color: #ded4bd ;
   margin-right: 2% ;
@@ -385,7 +385,7 @@ ul.mini-toc-centered
 {
   float: left ;
   width: 32% ;
-  height: 52em ;
+  height: 55em ;
   padding-bottom: 9px;
   background-color: #ded4bd ;
   margin-right: 2% ;
@@ -394,7 +394,7 @@ ul.mini-toc-centered
 {
   float: left ;
   width: 32% ;
-  height: 52em ;
+  height: 55em ;
   padding-bottom: 9px;
   background-color: #ded4bd ;
   margin-bottom: 24px ;
diff --git a/contrib/mom/momdoc/version-2.html 
b/contrib/mom/momdoc/version-2.html
index 3feb379..d3908e2 100644
--- a/contrib/mom/momdoc/version-2.html
+++ b/contrib/mom/momdoc/version-2.html
@@ -169,7 +169,7 @@ integral part of the present documentation.  In addition, 
the mom
 source file for the manual can be found in
 
 
-  /usr/local/share/doc/groff-1.21/examples/mom
+  /usr/local/share/doc/groff-<version>/examples/mom
 
 or
 

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: Remove erroneous "revised by" attribution.

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit fced8b936946cd63f25c0c02791e40ac9cd969f9
Author: Peter Schaffter 
Date:   Mon Dec 10 13:57:39 2018 -0500

Remove erroneous "revised by" attribution.
---
 contrib/mom/groff_mom.7.man | 4 
 1 file changed, 4 deletions(-)

diff --git a/contrib/mom/groff_mom.7.man b/contrib/mom/groff_mom.7.man
index aa3f451..6cb2bcd 100644
--- a/contrib/mom/groff_mom.7.man
+++ b/contrib/mom/groff_mom.7.man
@@ -3352,10 +3352,6 @@ after NEWPAGE, like this:
 was written by
 .MT peter@\:schaffter.ca
 Peter Schaffter
-.ME
-and revised by
-.MT wl@\:gnu.org
-Werner Lemberg
 .ME .
 .
 PDF support was provided by

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: Revise texinfo mom macros entry.

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit cb2b3e8e1a8d46d4c8951cc9795f2b7a1341cf4a
Author: Peter Schaffter 
Date:   Mon Dec 10 13:52:25 2018 -0500

Revise texinfo mom macros entry.

Add pointers to local and remote html documentation.
---
 doc/groff.texi | 32 +---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/doc/groff.texi b/doc/groff.texi
index a6d1260..8ec0a5e 100644
--- a/doc/groff.texi
+++ b/doc/groff.texi
@@ -4649,11 +4649,37 @@ command line).
 
 @c XXX documentation
 @c XXX this is a placeholder until we get stuff knocked into shape
-See the @cite{groff_mom(7)} man page (type @command{man groff_mom} at
-the command line), which gives a short overview and a link to its
-extensive documentation in HTML format.
+The main documentation files for the @file{mom} macros are in html
+format.  Additional, useful documentation is in pdf format.  See the
+groff(1) manpage "Collection of Installation Directories" for their
+location.
 
+@itemize @bullet
+@item
+@file{toc.html}
+@noindent
+Entry point to the full mom manual.
+
+@item
+@file{macrolist.html}
+@noindent
+Hyperlinked index of macros with brief descriptions, arranged by
+category.
+
+@item
+@file{mom-pdf.pdf}
+@noindent
+PDF features and usage.
+@end itemize
+
+The mom macros are in active development between groff releases.
+The most recent version, along with up-to-date documentation, is
+available at @uref{http://www.schaffter.ca/mom/mom-05.html}.
 
+The @cite{groff_mom(7)} manual page (type @command{man groff_mom}
+at the command line) contains a partial list of available macros,
+however their usage is best understood by consulting the html
+documentation.
 
 @c =
 @c =

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: Change example tbl header

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 156e227316a26685273008dbdabb7c2eaaf4a172
Author: Peter Schaffter 
Date:   Mon Nov 26 11:24:46 2018 -0500

Change example tbl header

Removes problem of kerned \[de] rendering poorly in some pdf viewers.
---
 contrib/mom/examples/slide-demo.mom | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/contrib/mom/examples/slide-demo.mom 
b/contrib/mom/examples/slide-demo.mom
index e1b9c81..2dc4439 100644
--- a/contrib/mom/examples/slide-demo.mom
+++ b/contrib/mom/examples/slide-demo.mom
@@ -286,8 +286,7 @@ typesetting macros, including preprocessors and image 
insertion\*[HANG .]
 tab(^) allbox;
 c c
 n n.
-\*[darkred]\s[-.5]\*[DOWN .5p]Year^Mean \*[UP .5p]\
-(\*[BU6]\[de]\*[FU4]C)\s[0]\*[blue2]
+\*[darkred]\s[-.5]\*[DOWN .5p]Year^Mean Temp.\s[0]\*[blue2]
 _
 .TH
 \*[cyan4]\fB2015^28.3\*[blue2]

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: Doc updates for verson 2.4.

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit f5c4e7fef397188c5036877bcfbf19989e8570d7
Author: Peter Schaffter 
Date:   Sat Nov 24 15:47:20 2018 -0500

Doc updates for verson 2.4.
---
 contrib/mom/momdoc/cover.html  |   6 +-
 contrib/mom/momdoc/images.html | 110 ++---
 contrib/mom/momdoc/macrolist.html  |  42 +++
 contrib/mom/momdoc/tables-of-contents.html |   8 +++
 contrib/mom/momdoc/toc.html|   4 +-
 5 files changed, 128 insertions(+), 42 deletions(-)

diff --git a/contrib/mom/momdoc/cover.html b/contrib/mom/momdoc/cover.html
index 444ebf7..e18a1c3 100644
--- a/contrib/mom/momdoc/cover.html
+++ b/contrib/mom/momdoc/cover.html
@@ -404,7 +404,7 @@ what you want on the cover page:
 
 
 Please note that in all cases, if you have passed
-a reference macro one of the optional arguments,
+a reference macro one of the optional arguments
 DOC_COVER or COVER (e.g.
 .TITLE DOC_COVER "Title"), mom will print the
 appropriate string on the appropriate cover page.  Thus,
@@ -556,8 +556,8 @@ or
 to move it further down the page.  Equally, if only
 COPYRIGHT and/or MISC are to go on the pages,
 cover text begins at the top margin.  In all other cases, cover text
-begins below the last element on the page, separated by a blank
-line.
+begins below the last element on the page (excluding COPYRIGHT or
+MISC), separated by a blank line.
 
 
 
diff --git a/contrib/mom/momdoc/images.html b/contrib/mom/momdoc/images.html
index 4dae389..15ecbd7 100644
--- a/contrib/mom/momdoc/images.html
+++ b/contrib/mom/momdoc/images.html
@@ -428,10 +428,11 @@ which is to say that if an image doesn’t fit on the 
output
 page, she will defer it to the top of the next page while continuing
 to process
 running text.
-ADJUST is ignored whenever an image is deferred, except
-when moving from column to column on the same page, when the image
-may need to be optically adjusted.  Subsequent images that do not
-fit, if any, are output in order immediately after the first.
+ADJUST is ignored whenever an image is the first to be
+deferred, except when moving from column to column on the same page,
+when the image may need to be optically adjusted.  Subsequent images
+that do not fit, if any, are output in order immediately after the
+first.
 
 
 
@@ -692,7 +693,7 @@ or
 
 
 
-Macro: FLOAT [ ADJUST +|-<amount> ] [ 
FORCE ] [ SPAN ] [ NO_SHIM] [ NO_FLEX ] | TARGET "<name>" | 
<anything>
+Macro: FLOAT [ ADJUST +|-<amount> ] [ 
FORCE ] [ SPAN ] [ INDENT <value> ] [ CENTER ] [ RIGHT ] [ NO_SHIM] [ 
NO_FLEX ] | TARGET "<name>" | <anything>
 
 
 
@@ -702,12 +703,41 @@ FLOAT is intended for use with the document processing 
macros only.
 
 
 
+
+
+Note:
+As a general rule, avoid consecutive floats that have no intervening
+running text.
+Rather, wrap all the material into a single float.
+
+
+
+
+
+Note:
+Deferred floats are output with the left indent that was in effect
+when they were input.  If you do not want this behaviour, disable
+the indent prior to inputting the float and re-enable it afterward.
+
+
+
+
+
+Note:
+Mom treats pic pre-processor directives and pdf images as
+floats so it is not necessary to wrap them inside FLOAT unless
+additional material is included in what is floated.
+
+
+
 
 To begin a float, simply invoke .FLOAT and follow it with
 whatever you want the float to contain.  When you’re done,
 invoke .FLOAT OFF (or QUIT, END, X, etc).
 
 
+'ADJUST'
+
 
 The optional ADJUST argument tells mom to raise
 (+) or lower (-) the float within
@@ -724,6 +754,14 @@ floats.
 
 
 
+ADJUST is ignored for the first float deferred to
+a following page but respected for subsequent deferred floats
+output immediately afterward.
+
+
+'FORCE'
+
+
 The FORCE argument instructs mom to output the float
 exactly where it occurs in the input file.  With FORCE,
 mom immediately breaks to a new page to output the float if it does
@@ -733,10 +771,13 @@ page), there are circumstances where it may be desirable.
 
 
 
-ADJUST is ignored whenever a float is deferred to
-the following page.
+If you need to force a page break after completion of a float that
+has been deferred to a subsequent page, insert \!.bp
+immediately before terminating the float.
 
 
+'SPAN'
+
 
 The SPAN argument tells mom that a float, if deferred,
 may carry onto multiple pages.  Please note that SPAN may
@@ -745,6 +786,30 @@ a warning should this occur.  Unboxed tables, on the other 
hand, are
 acceptable within floats that are given the SPAN argument.
 
 
+'INDENT'
+
+
+INDENT allows you to indent a float from the left margin
+by a specified value.  The value must have a
+(unit of measure
+appended to it.
+
+
+'CENTER'
+
+
+CENTER instructs mom to center a float if it is not
+already centered by default.
+
+
+'RIGHT'
+
+
+RIGHT instructs mom

[groff] 01/01: Trivial fixes to example files.

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit f01d899a91a4aca54580ebb3e10f662f43154ecb
Author: Peter Schaffter 
Date:   Sat Nov 24 15:45:48 2018 -0500

Trivial fixes to example files.
---
 contrib/mom/examples/mom-pdf.mom | 6 +-
 contrib/mom/examples/mon_premier_doc.mom | 2 +-
 contrib/mom/examples/sample_docs.mom | 1 -
 contrib/mom/examples/typesetting.mom | 1 -
 4 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/contrib/mom/examples/mom-pdf.mom b/contrib/mom/examples/mom-pdf.mom
index dbf7665..17c0b4c 100644
--- a/contrib/mom/examples/mom-pdf.mom
+++ b/contrib/mom/examples/mom-pdf.mom
@@ -332,7 +332,6 @@ links.
 .PP
 The default colour can be restored by calling
 \*[cod]PDF_LINK_COLOR\*[codx] with no parameter.
-.SP -1
 .FLOAT
 .JUSTIFY
 .BOX-NOTE 3P
@@ -404,7 +403,6 @@ to accomplish this is
 .COD "\&.PDF_TITLE\ \[dq]\[dq]
 It can take any text, so the viewer window title need not be the
 same as the document's title.
-.SP -1
 .FLOAT
 .JUSTIFY
 .BOX-NOTE 4P+8p
@@ -613,7 +611,6 @@ underlining (e.g., of italics)
 .ITEM
 generally produces larger files; these can be reduced by piping
 the output through \[ps2pdf]\*[B]
-.SP -1
 .FLOAT
 .QUAD LEFT
 .BR_AT_LINE_KERN
@@ -628,8 +625,7 @@ their metadata, notably the window title set with
 .SP .75
 .FLOAT off
 .ITEM
-is newer code with less testing\c
-.EL
+is newer code with less testing
 .LIST OFF
 .TOC
 .\" Local Variables:
diff --git a/contrib/mom/examples/mon_premier_doc.mom 
b/contrib/mom/examples/mon_premier_doc.mom
index c02ce14..ffb1b19 100644
--- a/contrib/mom/examples/mon_premier_doc.mom
+++ b/contrib/mom/examples/mon_premier_doc.mom
@@ -11,7 +11,7 @@
 \# 
 .TITLE "Mon Premier Document"
 .AUTHOR "Cicéron"
-
+.
 .DOCTYPEDEFAULT
 .PRINTSTYLE TYPESET
 .
diff --git a/contrib/mom/examples/sample_docs.mom 
b/contrib/mom/examples/sample_docs.mom
index 0fa616e..5c25a2a 100644
--- a/contrib/mom/examples/sample_docs.mom
+++ b/contrib/mom/examples/sample_docs.mom
@@ -488,7 +488,6 @@ amet.  Consetetur sadipscing elitr, sed diam nonumy.  
Eirmod tempor
 invidunt ut labore et do\%lo\%re magna ali\%quyam erat.  Sed diam voluptua
 at vero eos et accusam et justo.
 \#
-.if \n[#PRINT_STYLE]=2 .sp 1p \" A little tweak
 .BLOCKQUOTE
 Stet clita kasd gubergren, no sea takimata sanctus est lorem.
 Ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy
diff --git a/contrib/mom/examples/typesetting.mom 
b/contrib/mom/examples/typesetting.mom
index 77153d8..a35b237 100644
--- a/contrib/mom/examples/typesetting.mom
+++ b/contrib/mom/examples/typesetting.mom
@@ -313,7 +313,6 @@ This example demonstrates the use of left and hanging 
indents for
 simple enumerated lists.  Nested lists are possible, as the example
 shows; however, the more complex the nesting, the wiser it becomes
 to use (string) tabs, as seen in Example 4.
-.RLD 1v  \" Move upwards 1/2 linespace
 .DBX .5 0 \n[.l]u 2P+9p   \" Draw box; \n[.l]u means "the current line length"
 .IB 6p\" Indent from both left and right margins
 .ALD 14p

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: Updates

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit b94cee738ad6bc84d49d1ecd9eafadcdd5a8c37f
Author: Peter Schaffter 
Date:   Sat Nov 24 15:43:57 2018 -0500

Updates
---
 contrib/mom/ChangeLog | 6 +-
 contrib/mom/NEWS  | 7 +++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/contrib/mom/ChangeLog b/contrib/mom/ChangeLog
index 7d5e2a9..25c3f8c 100644
--- a/contrib/mom/ChangeLog
+++ b/contrib/mom/ChangeLog
@@ -1,6 +1,10 @@
+2018-11-24
+
+   * version 2.4 release (see NEWS)
+
 2018-09-05
 
-  * improved grap support
+   * improved grap support
 
 2018-03-04
 
diff --git a/contrib/mom/NEWS b/contrib/mom/NEWS
index 89df285..a5fd76b 100644
--- a/contrib/mom/NEWS
+++ b/contrib/mom/NEWS
@@ -5,6 +5,13 @@
 are permitted in any medium without royalty provided the copyright
 notice and this notice are preserved.
 
+Release 2.4
+---
+General bug fix release, with an overhaul of float, image, and
+pre-processor handling to correct inconsistencies in spacing,
+indents, labels, and captions.  Corrects page numbering issue in
+"Lists of..." when pre-processor material is floated and defered.
+
 Release 2.3
 ---
 Addition of DOCTYPE SLIDES and associated macros

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: Fix indent conflicts with nested lists. Simplify parsing for quad values. Fix cover handling. Avoid adding shim space when calculating only. Correct bugs in float handling: spacing, ind

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 1b83d12de04c7ae7b42386cadbbe9f7c0b7bafd0
Author: Peter Schaffter 
Date:   Sat Nov 24 13:36:37 2018 -0500

Fix indent conflicts with nested lists.
Simplify parsing for quad values.
Fix cover handling.
Avoid adding shim space when calculating only.
Correct bugs in float handling: spacing, indents, defers.
Add INDENT arg to FLOAT.
Correct printed page number in "Lists of..." when referring to deferred 
floats.
Correct inconsistencies in tbl handling (floated and non-floated): spacing, 
indents, labels, captions.
Tweak formatting of "Lists of..."
---
 contrib/mom/om.tmac | 1323 ---
 1 file changed, 834 insertions(+), 489 deletions(-)

diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac
index e92ae72..9790b1b 100644
--- a/contrib/mom/om.tmac
+++ b/contrib/mom/om.tmac
@@ -20,8 +20,8 @@ for more details.
 You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-Version 2.3-a
--
+Version 2.4
+---
 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.
@@ -54,7 +54,7 @@ extensions, and float management).
 .if (\n[.x]\n[.y] < 118) \
 .   ab [mom]: You need GNU troff version 1.18 or higher to run this version of 
mom.
 \# Mom version
-.ds version 2.3-a
+.ds version 2.4
 .if dVERSION \{\
 .   ab [mom]: Version \*[version]
 .\}
@@ -461,7 +461,10 @@ end
 .   if \\n[#NUM_ARGS]>0 \
 .   pdftransition PAGE \\$1
 .\}
-.if !\\n[defer] .nr #NEWPAGE 1
+.if !\\n[defer] \{\
+.   nr #NEWPAGE 1
+.   rr tbl*no-print-header
+.\}
 .ie !\\n[#DOCS]=1 \
 .   if \\n[#B_MARGIN_SET]=1 .DO_B_MARGIN
 .el \{\
@@ -1907,7 +1910,7 @@ end
 .ds BLACK   \m[black]
 .ds white   \m[white]
 .ds WHITE   \m[white]
-.ds default \m[black]
+.ds default black
 \#
 \# =
 \#
@@ -2604,11 +2607,13 @@ end
 .  return
 .   \}
 .   if \\n[#PRINT_STYLE]=2 \{\
+.  sp -1
 .  if \\n[#PP_STYLE]=2 \{\
 . PRINT \\$1\c
 . return
 .  \}
 .  if \\n[#PP]>1 \{\
+. if \\n[#PP_INDENT] .ti \\n[#PP_INDENT]u
 . PRINT \\$1\c
 . return
 .  \}
@@ -2629,7 +2634,7 @@ end
 .\}
 .if '\\$3'COND' .CONDENSE \\$4
 .if '\\$3'EXT' .EXTEND \\$4
-.if !r#DC_GUT .nr #DC_GUT (3p)
+.if !r#DC_GUT .nr #DC_GUT 3p
 .ie \\n[#DOCS] .ds $RESTORE_FAM \\*[$DOC_FAM]
 .el .ds $RESTORE_FAM \\n[.fam]
 .ie \\n[#DOCS] .ds $RESTORE_FT  \\*[$PP_FT]
@@ -3447,10 +3452,13 @@ end
 .   br
 .   in 0
 .   rr #INDENT_LEFT_ACTIVE
+.   nr #L_INDENT_ILX \\n[#L_INDENT]
 .\}
 .if '\\$1'CLEAR' \{\
 .   rr #L_INDENT
 .   rr #INDENT_STYLE_LEFT
+.   rr #L_INDENT_ILX
+.   rr #INDENT_ACTIVE
 .\}
 .END
 \#
@@ -4790,7 +4798,7 @@ y\R'#DESCENDER \\n[.cdp]'
 "\\*[$\\*[COVER_]AUTHOR_\\n[#\\*[COVER_]AUTHOR_NUM]], \"
 .\}
 .ds $AUTHOR \\*[$AUTHOR_1]
-.if !'\\*[$AUTHORS]'' .substring $AUTHORS 0 -3
+.substring $AUTHORS 0 -2
 .ds PDF_AUTHORS \\*[$AUTHORS]
 .pdfmomclean PDF_AUTHORS
 .nop \!x X ps:exec [/Author (\\*[PDF_AUTHORS]) /DOCINFO pdfmark
@@ -5078,11 +5086,14 @@ y\R'#DESCENDER \\n[.cdp]'
 .MAC CLOSING END
 .if '\\*[$SIG_SPACE]'' .ds $SIG_SPACE 3v
 .ie ( (2v+\\*[$SIG_SPACE]) > \\n[.t] ) \{\
-.   ch HEADER
-.   ch FOOTER
-.   br
-.   tm1 "[mom]: Insufficient room for \\$0 and signature line.
-.   ab   [mom]: Aborting '\\n[.F]'.
+.   ie !\\n[@TOP] \{\
+.  ch HEADER
+.  ch FOOTER
+.  br
+.  tm1 "[mom]: Insufficient room for \\$0 and signature line.
+.  ab   [mom]: Terminating '\\n[.F]' before closing.
+.   \}
+.   el .sp
 .\}
 .el .br
 .nr #CLOSING 1
@@ -5539,13 +5550,11 @@ SMALLCAPS takes precedence.
 .   if '\\$1'QUAD' \{\
 .  shift
 .  ie '\\*[$STYLE_TYPE]'QUOTE' \{\
-.  if '\\$1'L'  .QUOTE_LEFT
-.  if '\\$1'LEFT'   .QUOTE_LEFT
-.  if '\\$1'C'  .QUOTE_CENTER
-.  if '\\$1'CENTER' .QUOTE_CENTER
-.  if '\\$1'CENTRE' .QUOTE_CENTER
-.  if '\\$1'R'  .QUOTE_RIGHT
-.  if '\\$1'RIGHT'  .QUOTE_RIGHT
+.  ds $QUAD_TYPE \\$1
+.  substring $QUAD_TYPE 0 0
+.  if '\\*[$QUAD_TYPE]'L' .QUOTE_LEFT
+.  if '\\

[groff] 01/01: Make outputting LIST*DIV conditional.

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 32839f782efd42b2081c7a3c03faf07441fe9250
Author: Peter Schaffter 
Date:   Wed Sep 12 23:08:57 2018 -0400

Make outputting LIST*DIV conditional.
---
 contrib/mom/om.tmac | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac
index 7e06088..61ced60 100644
--- a/contrib/mom/om.tmac
+++ b/contrib/mom/om.tmac
@@ -16546,8 +16546,10 @@ E\\R'#CAP_HEIGHT \\n[.cht]'
 .   po +\\n[#LIST_OFFSET_VALUE]u
 .   if \\n[.u] .nr #FILLED 1
 .   nf
-.   LIST*DIV
-.   rm LIST*DIV
+.   if dLIST*DIV \{\
+.  LIST*DIV
+.  rm LIST*DIV
+.   \}
 .   if \\n[#FILLED] .fi
 .   if !\\n[#PRE_LIST_QUAD]=\\n[.j] .ad \\n[#PRE_LIST_QUAD]
 .   rr #FILLED

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/01: QUIT_LISTS: add missing left bracket around .z

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit f7b9ea1bf4ac87278bbd4a0cd81b8faf4141bc46
Author: Peter Schaffter 
Date:   Wed Sep 12 12:11:03 2018 -0400

QUIT_LISTS: add missing left bracket around .z
---
 contrib/mom/om.tmac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac
index 5f763f8..7e06088 100644
--- a/contrib/mom/om.tmac
+++ b/contrib/mom/om.tmac
@@ -16527,7 +16527,7 @@ E\\R'#CAP_HEIGHT \\n[.cht]'
 \#
 .MAC QUIT_LISTS END
 .   br
-.   if '\\n.z]'LIST*DIV' \{\
+.   if '\\n[.z]'LIST*DIV' \{\
 \!.rr #IN_LIST
 .  di
 .   \}

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit