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

2023-06-15 Thread 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

Reminder: master branch is frozen for non-documentary changes

2023-06-15 Thread G. Branden Robinson 
Hi folks,

Just a reminder that the master branch is supposed to be frozen for
non-documentary changes.  There have indeed been many commits to master
since 1.23.0.rc2, but they have become progressively restricted in
purpose--from bug fixes (roughly rc3), to build/portability fixes (up to
rc4), to documentation-only fixes (since rc4).

I've been in touch via private mail with Bertrand and he expects to tag
1.23.0 final in the next few days.  I will happily announce the
re-opening of master to general mayhem[1] after a brief interval to
convince ourselves that the final release isn't in fact a dud.  I dread
the sort of reviews Thomas Dickey gave to a series of Autoconf releases
about 20 years ago.[3]

There are several bug fixes I am eager to land, as noted earlier,[4] and
right now I am thinking a 1.23.1 release is more likely than not.  That
is compatible with general mayhem on master because what I propose to do
is create a 1.23.x branch and cherry-pick changes from master to that
branch, and tag the post-zero point releases on that branch.  During
that time I expect Bertrand and I to be proceeding with the FSF
paperwork to make me the GNU maintainer for groff.

What do y'all think of this plan?

Regards,
Branden

[1] That is, open to those exciting forms of mayhem that don't cause any
automated tests to fail.[2]

[2] With the usual exception of proving the validity of a newly added
regression test.

[3]

2.58 (2003-11-04) Administrative blunder.
2.57 (2002-12-03) Back up to beta quality! Within a few weeks a handful
  of serious bugs were reported, making it less useful
  than 2.52.
2.56 (2002-11-15) Fixes an administrative blunder.
2.55  Dead on arrival.
2.54 (2002-09-13) Do not use: it was not tested with other “make”
  programs than GNU make.
2.53 (2002-03-18) Too many initial bug reports to bother with. Features
  incomplete support for OS/2 EMX.
2.52 (2001-07-18) Moderately stable (beta quality).
2.51 (2001-07-17) Dead on arrival. The changelog around 2.51 does not
  mention that the associated config.guess/config.sub
  had a syntax error (it wrote extra text to the
  output). This was silently fixed in the 2.52 version.
2.50 (2001-05-21) Do not use (alpha quality). It is compatible with 2.13
  only for trivial configure.in's because the
  conventions for cached information were changed.

https://invisible-island.net/autoconf/autoconf.html

[4] https://lists.gnu.org/archive/html/groff/2023-06/msg6.html


signature.asc
Description: PGP signature
___
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).

2023-06-15 Thread 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

2023-06-15 Thread 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 .
 
-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 their point of origin.  If no arg given (full measure
+\#   rule), the rule weight is the one set by RULE_WEIGHT.
 \#
 .MAC DRH END
 .GRAPHICAL_OBJ
@@ -2847,7 +2845,7 @@ end