groff-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[groff] 27/36: [mm]: Don't die if 1C called in 1-column context.


From: G. Branden Robinson
Subject: [groff] 27/36: [mm]: Don't die if 1C called in 1-column context.
Date: Tue, 17 Jan 2023 20:45:14 -0500 (EST)

gbranden pushed a commit to branch master
in repository groff.

commit fa8b4ecf303e01160e70c01ea44bce06da91b99f
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Mon Jan 16 17:07:20 2023 -0600

    [mm]: Don't die if 1C called in 1-column context.
    
    * contrib/mm/m.tmac (1C): Warn and return early instead of bombing out
      if called when multiple columnation is inactive.  A no-op should not
      be a fatal error.
---
 contrib/mm/ChangeLog | 6 ++++++
 contrib/mm/m.tmac    | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/contrib/mm/ChangeLog b/contrib/mm/ChangeLog
index 8aad39f6e..5c12cf7b9 100644
--- a/contrib/mm/ChangeLog
+++ b/contrib/mm/ChangeLog
@@ -1,3 +1,9 @@
+2023-01-16  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       * m.tmac (1C): Warn and return early instead of bombing out if
+       called when multiple columnation is inactive.  A no-op should
+       not be a fatal error.
+
 2023-01-16  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * m.tmac (@abort): Introduce macro for internal errors,
diff --git a/contrib/mm/m.tmac b/contrib/mm/m.tmac
index 95fcacfda..31f22e7c2 100644
--- a/contrib/mm/m.tmac
+++ b/contrib/mm/m.tmac
@@ -1592,8 +1592,11 @@ numeric; got '\\$1'
 ..
 .\" An argument disables the page-break.
 .de 1C
+.if \\n[pg*cols-per-page]<=1 \{\
+.      @warning \\$0: multicolumn mode not active
+.      return
+.\}
 .br
-.if \\n[pg*cols-per-page]<=1 .@error "1C: multicolumn mode not active"
 .nr pg*cols-per-page 1
 .nr pg*column-sep 0
 .nr pg*column-size \\n[@ll]



reply via email to

[Prev in Thread] Current Thread [Next in Thread]