Use the same adjustment mode numbers as "troff" uses by copying them from it.
Makes them independent of the implementation details.
Signed-off-by: Bjarni Ingi Gislason <bjarn...@simnet.is>
---
contrib/mom/om.tmac | 65 +++++++++++++++++++++++++++------------------
1 file changed, 39 insertions(+), 26 deletions(-)
diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac
index 619da9851..5caf65876 100644
--- a/contrib/mom/om.tmac
+++ b/contrib/mom/om.tmac
@@ -2791,6 +2791,19 @@ end
. ch DROPCAP_OFF
.END
\#
+\# Define used adjustment modes as "troff" uses it
+.nr saved_adjustment \n[.j]
+.ad b
+.nr DEFINED_ADJUSTMENT_B \n[.j]
+.ad c
+.nr DEFINED_ADJUSTMENT_C \n[.j]
+.ad l
+.nr DEFINED_ADJUSTMENT_L \n[.j]
+.ad r
+.nr DEFINED_ADJUSTMENT_R] \n[.j]
+.ad \n[saved_adjustment]
+.rr saved_adjustment
+\#
\# =====================================================================
\#
\# +++GRAPHICAL OBJECTS+++
@@ -2813,8 +2826,8 @@ end
. \}
. el \{\
. nr #NOFILL 1
-. if \\n[.ce]>0 .nr #NOFILL_MODE 3
-. if \\n[.rj]>0 .nr #NOFILL_MODE 5
+. if \\n[.ce]>0 .nr #NOFILL_MODE \\n[DEFINED_ADJUSTMENT_C]
+. if \\n[.rj]>0 .nr #NOFILL_MODE \\n[DEFINED_ADJUSTMENT_R]
. ce 0
. rj 0
. \}
@@ -2883,16 +2896,16 @@ end
. \}
. gcolor default
. if \\n[#FILLED]=1 \{\
-. if \\n[#FILL_MODE]=0 .QUAD LEFT
-. if \\n[#FILL_MODE]=1 .JUSTIFY
-. if \\n[#FILL_MODE]=3 .QUAD CENTER
-. if \\n[#FILL_MODE]=5 .QUAD RIGHT
+. if \\n[#FILL_MODE]=\\n[DEFINED_ADJUSTMENT_L] .QUAD LEFT
+. if \\n[#FILL_MODE]=\\n[DEFINED_ADJUSTMENT_B] .JUSTIFY
+. if \\n[#FILL_MODE]=\\n[DEFINED_ADJUSTMENT_C] .QUAD CENTER
+. if \\n[#FILL_MODE]=\\n[DEFINED_ADJUSTMENT_R] .QUAD RIGHT
. rr #FILLED
. \}
. sp -1v
. if \\n[#NOFILL]=1 \{\
-. if \\n[#NOFILL_MODE]=3 .CENTER
-. if \\n[#NOFILL_MODE]=5 .RIGHT
+. if \\n[#NOFILL_MODE]=\\n[DEFINED_ADJUSTMENT_C] .CENTER
+. if \\n[#NOFILL_MODE]=\\n[DEFINED_ADJUSTMENT_R] .RIGHT
. \}
. nr #RULE_WEIGHT \\n[#SAVED_RULE_WEIGHT]
. nr #RULE_WEIGHT_ADJ \\n[#SAVED_WEIGHT_ADJ]
@@ -2971,16 +2984,16 @@ end
\Z'\D't \\n[#SAVED_RULE_WEIGHT]''
. gcolor default
. if \\n[#FILLED]=1 \{\
-. if \\n[#FILL_MODE]=0 .QUAD LEFT
-. if \\n[#FILL_MODE]=1 .JUSTIFY
-. if \\n[#FILL_MODE]=3 .QUAD CENTER
-. if \\n[#FILL_MODE]=5 .QUAD RIGHT
+. if \\n[#FILL_MODE]=\\n[DEFINED_ADJUSTMENT_L] .QUAD LEFT
+. if \\n[#FILL_MODE]=\\n[DEFINED_ADJUSTMENT_B] .JUSTIFY
+. if \\n[#FILL_MODE]=\\n[DEFINED_ADJUSTMENT_C] .QUAD CENTER
+. if \\n[#FILL_MODE]=\\n[DEFINED_ADJUSTMENT_R] .QUAD RIGHT
. rr #FILLED
. \}
. sp -1v
. if \\n[#NOFILL]=1 \{\
-. if \\n[#NOFILL_MODE]=3 .CENTER
-. if \\n[#NOFILL_MODE]=5 .RIGHT
+. if \\n[#NOFILL_MODE]=\\n[DEFINED_ADJUSTMENT_C] .CENTER
+. if \\n[#NOFILL_MODE]=\\n[DEFINED_ADJUSTMENT_R] .RIGHT
. \}
. nr #RULE_WEIGHT \\n[#SAVED_WEIGHT]
. nr #RULE_WEIGHT_ADJ \\n[#SAVED_WEIGHT_ADJ]
@@ -3059,16 +3072,16 @@ end
. \}
. gcolor default
. if \\n[#FILLED]=1 \{\
-. if \\n[#FILL_MODE]=0 .QUAD LEFT
-. if \\n[#FILL_MODE]=1 .JUSTIFY
-. if \\n[#FILL_MODE]=3 .QUAD CENTER
-. if \\n[#FILL_MODE]=5 .QUAD RIGHT
+. if \\n[#FILL_MODE]=\\n[DEFINED_ADJUSTMENT_L] .QUAD LEFT
+. if \\n[#FILL_MODE]=\\n[DEFINED_ADJUSTMENT_B] .JUSTIFY
+. if \\n[#FILL_MODE]=\\n[DEFINED_ADJUSTMENT_C] .QUAD CENTER
+. if \\n[#FILL_MODE]=\\n[DEFINED_ADJUSTMENT_R] .QUAD RIGHT
. rr #FILLED
. \}
. sp -1v
. if \\n[#NOFILL]=1 \{\
-. if \\n[#NOFILL_MODE]=3 .CENTER
-. if \\n[#NOFILL_MODE]=5 .RIGHT
+. if \\n[#NOFILL_MODE]=\\n[DEFINED_ADJUSTMENT_C] .CENTER
+. if \\n[#NOFILL_MODE]=\\n[DEFINED_ADJUSTMENT_R] .RIGHT
. \}
. nr #RULE_WEIGHT \\n[#SAVED_WEIGHT]
. nr #WEIGHT_ADJ \\n[#SAVED_WEIGHT_ADJ]
@@ -3149,16 +3162,16 @@ end
. gcolor default
. \}
. if \\n[#FILLED]=1 \{\
-. if \\n[#FILL_MODE]=0 .QUAD LEFT
-. if \\n[#FILL_MODE]=1 .JUSTIFY
-. if \\n[#FILL_MODE]=3 .QUAD CENTER
-. if \\n[#FILL_MODE]=5 .QUAD RIGHT
+. if \\n[#FILL_MODE]=\\n[DEFINED_ADJUSTMENT_L] .QUAD LEFT
+. if \\n[#FILL_MODE]=\\n[DEFINED_ADJUSTMENT_B] .JUSTIFY
+. if \\n[#FILL_MODE]=\\n[DEFINED_ADJUSTMENT_C] .QUAD CENTER
+. if \\n[#FILL_MODE]=\\n[DEFINED_ADJUSTMENT_R] .QUAD RIGHT
. rr #FILLED
. \}
. sp -1v
. if \\n[#NOFILL]=1 \{\
-. if \\n[#NOFILL_MODE]=3 .CENTER
-. if \\n[#NOFILL_MODE]=5 .RIGHT
+. if \\n[#NOFILL_MODE]=\\n[DEFINED_ADJUSTMENT_C] .CENTER
+. if \\n[#NOFILL_MODE]=\\n[DEFINED_ADJUSTMENT_R] .RIGHT
. \}
. nr #RULE_WEIGHT \\n[#SAVED_WEIGHT]
. nr #WEIGHT_ADJ \\n[#SAVED_WEIGHT_ADJ]
--
2.47.2
>From c5ca540b5f4678a0039678af2dd2aa462fcfbbbf Mon Sep 17 00:00:00 2001
From: Bjarni Ingi Gislason <bjarn...@simnet.is>
Date: Thu, 22 May 2025 22:36:48 +0000
Subject: [PATCH] Subject: [mom] om.tmac: do not use hardcoded adjustment mode
numbers (.j)
Use the same adjustment mode numbers as "troff" uses by copying them from it.
Makes them independent of the implementation details.
Signed-off-by: Bjarni Ingi Gislason <bjarn...@simnet.is>
---
contrib/mom/om.tmac | 65 +++++++++++++++++++++++++++------------------
1 file changed, 39 insertions(+), 26 deletions(-)
diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac
index 619da9851..5caf65876 100644
--- a/contrib/mom/om.tmac
+++ b/contrib/mom/om.tmac
@@ -2791,6 +2791,19 @@ end
. ch DROPCAP_OFF
.END
\#
+\# Define used adjustment modes as "troff" uses it
+.nr saved_adjustment \n[.j]
+.ad b
+.nr DEFINED_ADJUSTMENT_B \n[.j]
+.ad c
+.nr DEFINED_ADJUSTMENT_C \n[.j]
+.ad l
+.nr DEFINED_ADJUSTMENT_L \n[.j]
+.ad r
+.nr DEFINED_ADJUSTMENT_R] \n[.j]
+.ad \n[saved_adjustment]
+.rr saved_adjustment
+\#
\# =====================================================================
\#
\# +++GRAPHICAL OBJECTS+++
@@ -2813,8 +2826,8 @@ end
. \}
. el \{\
. nr #NOFILL 1
-. if \\n[.ce]>0 .nr #NOFILL_MODE 3
-. if \\n[.rj]>0 .nr #NOFILL_MODE 5
+. if \\n[.ce]>0 .nr #NOFILL_MODE \\n[DEFINED_ADJUSTMENT_C]
+. if \\n[.rj]>0 .nr #NOFILL_MODE \\n[DEFINED_ADJUSTMENT_R]
. ce 0
. rj 0
. \}
@@ -2883,16 +2896,16 @@ end
. \}
. gcolor default
. if \\n[#FILLED]=1 \{\
-. if \\n[#FILL_MODE]=0 .QUAD LEFT
-. if \\n[#FILL_MODE]=1 .JUSTIFY
-. if \\n[#FILL_MODE]=3 .QUAD CENTER
-. if \\n[#FILL_MODE]=5 .QUAD RIGHT
+. if \\n[#FILL_MODE]=\\n[DEFINED_ADJUSTMENT_L] .QUAD LEFT
+. if \\n[#FILL_MODE]=\\n[DEFINED_ADJUSTMENT_B] .JUSTIFY
+. if \\n[#FILL_MODE]=\\n[DEFINED_ADJUSTMENT_C] .QUAD CENTER
+. if \\n[#FILL_MODE]=\\n[DEFINED_ADJUSTMENT_R] .QUAD RIGHT
. rr #FILLED
. \}
. sp -1v
. if \\n[#NOFILL]=1 \{\
-. if \\n[#NOFILL_MODE]=3 .CENTER
-. if \\n[#NOFILL_MODE]=5 .RIGHT
+. if \\n[#NOFILL_MODE]=\\n[DEFINED_ADJUSTMENT_C] .CENTER
+. if \\n[#NOFILL_MODE]=\\n[DEFINED_ADJUSTMENT_R] .RIGHT
. \}
. nr #RULE_WEIGHT \\n[#SAVED_RULE_WEIGHT]
. nr #RULE_WEIGHT_ADJ \\n[#SAVED_WEIGHT_ADJ]
@@ -2971,16 +2984,16 @@ end
\Z'\D't \\n[#SAVED_RULE_WEIGHT]''
. gcolor default
. if \\n[#FILLED]=1 \{\
-. if \\n[#FILL_MODE]=0 .QUAD LEFT
-. if \\n[#FILL_MODE]=1 .JUSTIFY
-. if \\n[#FILL_MODE]=3 .QUAD CENTER
-. if \\n[#FILL_MODE]=5 .QUAD RIGHT
+. if \\n[#FILL_MODE]=\\n[DEFINED_ADJUSTMENT_L] .QUAD LEFT
+. if \\n[#FILL_MODE]=\\n[DEFINED_ADJUSTMENT_B] .JUSTIFY
+. if \\n[#FILL_MODE]=\\n[DEFINED_ADJUSTMENT_C] .QUAD CENTER
+. if \\n[#FILL_MODE]=\\n[DEFINED_ADJUSTMENT_R] .QUAD RIGHT
. rr #FILLED
. \}
. sp -1v
. if \\n[#NOFILL]=1 \{\
-. if \\n[#NOFILL_MODE]=3 .CENTER
-. if \\n[#NOFILL_MODE]=5 .RIGHT
+. if \\n[#NOFILL_MODE]=\\n[DEFINED_ADJUSTMENT_C] .CENTER
+. if \\n[#NOFILL_MODE]=\\n[DEFINED_ADJUSTMENT_R] .RIGHT
. \}
. nr #RULE_WEIGHT \\n[#SAVED_WEIGHT]
. nr #RULE_WEIGHT_ADJ \\n[#SAVED_WEIGHT_ADJ]
@@ -3059,16 +3072,16 @@ end
. \}
. gcolor default
. if \\n[#FILLED]=1 \{\
-. if \\n[#FILL_MODE]=0 .QUAD LEFT
-. if \\n[#FILL_MODE]=1 .JUSTIFY
-. if \\n[#FILL_MODE]=3 .QUAD CENTER
-. if \\n[#FILL_MODE]=5 .QUAD RIGHT
+. if \\n[#FILL_MODE]=\\n[DEFINED_ADJUSTMENT_L] .QUAD LEFT
+. if \\n[#FILL_MODE]=\\n[DEFINED_ADJUSTMENT_B] .JUSTIFY
+. if \\n[#FILL_MODE]=\\n[DEFINED_ADJUSTMENT_C] .QUAD CENTER
+. if \\n[#FILL_MODE]=\\n[DEFINED_ADJUSTMENT_R] .QUAD RIGHT
. rr #FILLED
. \}
. sp -1v
. if \\n[#NOFILL]=1 \{\
-. if \\n[#NOFILL_MODE]=3 .CENTER
-. if \\n[#NOFILL_MODE]=5 .RIGHT
+. if \\n[#NOFILL_MODE]=\\n[DEFINED_ADJUSTMENT_C] .CENTER
+. if \\n[#NOFILL_MODE]=\\n[DEFINED_ADJUSTMENT_R] .RIGHT
. \}
. nr #RULE_WEIGHT \\n[#SAVED_WEIGHT]
. nr #WEIGHT_ADJ \\n[#SAVED_WEIGHT_ADJ]
@@ -3149,16 +3162,16 @@ end
. gcolor default
. \}
. if \\n[#FILLED]=1 \{\
-. if \\n[#FILL_MODE]=0 .QUAD LEFT
-. if \\n[#FILL_MODE]=1 .JUSTIFY
-. if \\n[#FILL_MODE]=3 .QUAD CENTER
-. if \\n[#FILL_MODE]=5 .QUAD RIGHT
+. if \\n[#FILL_MODE]=\\n[DEFINED_ADJUSTMENT_L] .QUAD LEFT
+. if \\n[#FILL_MODE]=\\n[DEFINED_ADJUSTMENT_B] .JUSTIFY
+. if \\n[#FILL_MODE]=\\n[DEFINED_ADJUSTMENT_C] .QUAD CENTER
+. if \\n[#FILL_MODE]=\\n[DEFINED_ADJUSTMENT_R] .QUAD RIGHT
. rr #FILLED
. \}
. sp -1v
. if \\n[#NOFILL]=1 \{\
-. if \\n[#NOFILL_MODE]=3 .CENTER
-. if \\n[#NOFILL_MODE]=5 .RIGHT
+. if \\n[#NOFILL_MODE]=\\n[DEFINED_ADJUSTMENT_C] .CENTER
+. if \\n[#NOFILL_MODE]=\\n[DEFINED_ADJUSTMENT_R] .RIGHT
. \}
. nr #RULE_WEIGHT \\n[#SAVED_WEIGHT]
. nr #WEIGHT_ADJ \\n[#SAVED_WEIGHT_ADJ]
--
2.47.2
