PTPi pushed a commit to branch master
in repository groff.
commit 925cdedae98b0ccbeedb3140095d4a4d7068b409
Author: Peter Schaffter <pe...@schaffter.ca>
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 <g.branden.robin...@gmail.com>
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
