PTPi pushed a commit to branch master
in repository groff.
commit 88cb03de924a6b486dfa3b39e6b1a668a0f8057d
Author: Peter Schaffter <[email protected]>
Date: Mon Sep 11 11:58:53 2017 -0400
Check if #FLEX_ACTIVE before testing for @no-flex in macro FLOAT.
---
contrib/mom/om.tmac-u | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/contrib/mom/om.tmac-u b/contrib/mom/om.tmac-u
index 8295f9f..b92ff75 100644
--- a/contrib/mom/om.tmac-u
+++ b/contrib/mom/om.tmac-u
@@ -17078,11 +17078,13 @@ E\\R'#CAP_HEIGHT \\n[.cht]'
. \}
.\" Save depth of diversion here. The .da zeroes it.
. nr dn-save \\n[dn]
-. if !\\n[@no-flex] \{\
-. da FLOAT*DIV
-\!. FLEX
-\!. nr flexed 1
-. da
+. if \\n[#FLEX_ACTIVE] \{\
+. if !\\n[@no-flex] \{\
+. da FLOAT*DIV
+\!. FLEX
+\!. nr flexed 1
+. da
+. \}
. \}
. nr dn \\n[dn-save]
. rr dn-save
@@ -17134,11 +17136,13 @@ E\\R'#CAP_HEIGHT \\n[.cht]'
. \}
. \}
. nr dn-save \\n[dn]
-. if !\\n[@no-flex] \{\
-. da FLOAT*DIV
-\!. FLEX
-\!. nr flexed 1
-. da
+. if \\n[#FLEX_ACTIVE] \{\
+. if !\\n[@no-flex] \{\
+. da FLOAT*DIV
+\!. FLEX
+\!. nr flexed 1
+. da
+. \}
. \}
. nr dn \\n[dn-save]
. rr dn-save
_______________________________________________
Groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
