groff-commit
[Top][All Lists]
Advanced

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

[groff] 06/07: [troff]: Tweak \X-related diagnostic messages.


From: G. Branden Robinson
Subject: [groff] 06/07: [troff]: Tweak \X-related diagnostic messages.
Date: Sat, 2 Oct 2021 14:14:27 -0400 (EDT)

gbranden pushed a commit to branch master
in repository groff.

commit 65737d48ad7e75353a67e4f408bb68bc5d5b0773
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Sun Oct 3 03:45:38 2021 +1100

    [troff]: Tweak \X-related diagnostic messages.
    
    * src/roff/troff/input.cpp (encode_char): Update diagnostic messages to
      not presume the identity of the escape character; continues 9be3f8e3
      (4 June).
---
 ChangeLog                | 6 ++++++
 src/roff/troff/input.cpp | 6 ++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 55e92e0..13bb9d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2021-10-03  G. Branden Robinson <g.branden.robinson@gmail.com>
 
+       * src/roff/troff/input.cpp (encode_char): Update diagnostic
+       messages to not presume the identity of the escape character;
+       continues 9be3f8e3 (4 June).
+
+2021-10-03  G. Branden Robinson <g.branden.robinson@gmail.com>
+
        * src/devices/grotty/tty.cpp (tty_printer:special_link): Tighten
        code slightly by taking advantage of preprocessor string literal
        concatenation.
diff --git a/src/roff/troff/input.cpp b/src/roff/troff/input.cpp
index 700399b..57d0354 100644
--- a/src/roff/troff/input.cpp
+++ b/src/roff/troff/input.cpp
@@ -5431,13 +5431,15 @@ static void encode_char(macro *mac, char c)
       else if (strcmp("ti", sc) == 0)
        mac->append('^');
       else
-       error("special character '%1' cannot be used within \\X", sc);
+       error("special character '%1' cannot be used within device"
+             " control escape sequence", sc);
     }
     else if (!(tok.is_hyphen_indicator()
               || tok.is_dummy()
               || tok.is_transparent_dummy()
               || tok.is_zero_width_break()))
-      error("%1 is invalid within \\X", tok.description());
+      error("%1 is invalid within device control escape sequence",
+           tok.description());
   }
   else {
     if ((font::use_charnames_in_special) && (c == '\\')) {



reply via email to

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