PTPi pushed a commit to branch master
in repository groff.
commit 33019731eb5d2c79035b2b352ba77dbe0790f0e3
Author: Peter Schaffter <[email protected]>
AuthorDate: Fri Oct 30 13:52:51 2026 -0400
[mom]: Restore previous f/gcolor explicitly after drawing graphical objects.
---
contrib/mom/om.tmac | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac
index 0eaef58be..9f7d61f21 100644
--- a/contrib/mom/om.tmac
+++ b/contrib/mom/om.tmac
@@ -2861,6 +2861,7 @@ end
. di NULL
. if \\n[#NUM_ARGS]>=1 .RULE_WEIGHT \\*[$RL_WEIGHT]
. di
+. ds $PREV_COLOR \\n[.m]
. if !'\\$4'' .gcolor \\$4
. ie \\n[#NUM_ARGS]=0 \{\
. ds $RL_INDENT 0
@@ -2895,7 +2896,8 @@ end
\Z'\D't \\n[#SAVED_RULE_WEIGHT]''
. rr #RESTORE_L_LENGTH
. \}
-. gcolor default
+. gcolor \\*[$PREV_COLOR]
+. rm $PREV_COLOR
. if \\n[#FILLED]=1 \{\
. if \\n[#FILL_MODE]=\\n[#ADJ_L] .QUAD LEFT
. if \\n[#FILL_MODE]=\\n[#ADJ_B] .JUSTIFY
@@ -2975,6 +2977,7 @@ end
. ds $RL_WEIGHT \\$1
. ds $RL_INDENT \\$2
. ds $RL_DEPTH \\$3
+. ds $PREV_COLOR \\n[.m]
. if !'\\$4'' .gcolor \\$4
. nr #SAVED_RULE_WEIGHT \\n[#RULE_WEIGHT]
. nr #SAVED_WEIGHT_ADJ \\n[#RULE_WEIGHT_ADJ]
@@ -2983,7 +2986,7 @@ end
\h'\\*[$RL_INDENT]+\\n[#RULE_WEIGHT_ADJ]u'\
\D'l 0 \\*[$RL_DEPTH]'\
\Z'\D't \\n[#SAVED_RULE_WEIGHT]''
-. gcolor default
+. gcolor \\*[$PREV_COLOR]
. if \\n[#FILLED]=1 \{\
. if \\n[#FILL_MODE]=\\n[#ADJ_L] .QUAD LEFT
. if \\n[#FILL_MODE]=\\n[#ADJ_B] .JUSTIFY
@@ -3063,6 +3066,7 @@ end
. rr #BX_SOLID
. \}
. el \{\
+. ds $PREV_COLOR \\n[.m]
. gcolor \\*[$BX_COLOR]
\Z'\D't \\n[#RULE_WEIGHT]''\
\h'\\*[$BX_INDENT]+\\n[#RULE_WEIGHT]u'\
@@ -3071,7 +3075,7 @@ end
\v'-\\n[#WEIGHT_ADJ]u'\
\Z'\D't \\n[#SAVED_RULE_WEIGHT]''
. \}
-. gcolor default
+. gcolor \\*[$PREV_COLOR]
. if \\n[#FILLED]=1 \{\
. if \\n[#FILL_MODE]=\\n[#ADJ_L] .QUAD LEFT
. if \\n[#FILL_MODE]=\\n[#ADJ_B] .JUSTIFY
@@ -3153,6 +3157,7 @@ end
. rr #CL_SOLID
. \}
. el \{\
+. ds $PREV_COLOR \\n[.m]
. gcolor \\*[$CL_COLOR]
\Z'\D't \\n[#RULE_WEIGHT]''\
\h'\\*[$CL_INDENT]+\\n[#RULE_WEIGHT]u'\
@@ -3160,7 +3165,7 @@ end
\D'e \\*[$CL_WIDTH]-\\n[#RULE_WEIGHT]u \\*[$CL_DEPTH]-\\n[#RULE_WEIGHT]u'\
\v'-(\\*[$CL_DEPTH]/2u)'\
\Z'\D't \\n[#SAVED_RULE_WEIGHT]''
-. gcolor default
+. gcolor \\*[$PREV_COLOR]
. \}
. if \\n[#FILLED]=1 \{\
. if \\n[#FILL_MODE]=\\n[#ADJ_L] .QUAD LEFT
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
