branch master updated: No special warning for accent command needing braces

[Patrice Dumas]

This is an automated email from the git hooks/post-receive script.

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 3eaf9f3d63 No special warning for accent command needing braces
3eaf9f3d63 is described below

commit 3eaf9f3d633ad229d712546ee3edaa3f5133740b
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Aug 27 11:56:32 2022 +0200

    No special warning for accent command needing braces
    
    * tp/Texinfo/ParserNonXS.pm (_parse_texi),
    tp/Texinfo/XS/parsetexi/parser.c(process_remaining_on_line): use the
    same error message for accent command requiring braces as for other
    brace commands.
---
 ChangeLog                                          |  9 ++++++
 tp/Texinfo/ParserNonXS.pm                          | 11 ++++----
 tp/Texinfo/XS/parsetexi/parser.c                   | 14 +++++-----
 tp/t/results/coverage/accents_errors.pl            |  8 +++---
 tp/t/results/coverage/at_after_accent_command.pl   |  8 +++---
 .../plaintext_tests/invalid_accent_punctuation.pl  |  4 +--
 tp/t/results/value/value_after_accent.pl           |  8 +++---
 tp/tests/layout/res_parser/formatting/formatting.2 | 32 +++++++++++-----------
 .../layout/res_parser/formatting_chm/formatting.2  | 32 +++++++++++-----------
 .../res_parser/formatting_docbook/formatting.2     | 32 +++++++++++-----------
 .../formatting_enable_encoding/formatting.2        | 32 +++++++++++-----------
 .../layout/res_parser/formatting_epub/formatting.2 | 32 +++++++++++-----------
 .../res_parser/formatting_epub_nodes/formatting.2  | 32 +++++++++++-----------
 .../res_parser/formatting_exotic/formatting.2      | 32 +++++++++++-----------
 .../res_parser/formatting_fr_icons/formatting.2    | 32 +++++++++++-----------
 .../layout/res_parser/formatting_html/formatting.2 | 32 +++++++++++-----------
 .../res_parser/formatting_html32/formatting.2      | 32 +++++++++++-----------
 .../formatting_html_no_texi2html/formatting.2      | 32 +++++++++++-----------
 .../res_parser/formatting_html_nodes/formatting.2  | 32 +++++++++++-----------
 .../layout/res_parser/formatting_info/formatting.2 | 32 +++++++++++-----------
 .../res_parser/formatting_inline_css/formatting.2  | 32 +++++++++++-----------
 .../res_parser/formatting_latex/formatting.2       | 32 +++++++++++-----------
 .../formatting_macro_expand/formatting.2           | 32 +++++++++++-----------
 .../res_parser/formatting_mathjax/formatting.2     | 32 +++++++++++-----------
 .../res_parser/formatting_nodes/formatting.2       | 32 +++++++++++-----------
 .../formatting_numerical_entities/formatting.2     | 32 +++++++++++-----------
 .../res_parser/formatting_plaintext/formatting.2   | 32 +++++++++++-----------
 .../res_parser/formatting_rawtext/formatting.2     | 32 +++++++++++-----------
 .../formatting_regions/formatting_regions.2        | 32 +++++++++++-----------
 .../res_parser/formatting_textcontent/formatting.2 | 32 +++++++++++-----------
 .../formatting_weird_quotes/formatting.2           | 32 +++++++++++-----------
 .../res_parser/formatting_xhtml/formatting.2       | 32 +++++++++++-----------
 .../layout/res_parser/formatting_xml/formatting.2  | 32 +++++++++++-----------
 .../res_parser/formatting_singular/formatting.2    | 32 +++++++++++-----------
 34 files changed, 467 insertions(+), 459 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cb7c3bdb95..042e4294b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2022-08-27  Patrice Dumas  <pertusus@free.fr>
+
+       No special warning for accent command needing braces
+
+       * tp/Texinfo/ParserNonXS.pm (_parse_texi),
+       tp/Texinfo/XS/parsetexi/parser.c(process_remaining_on_line): use the
+       same error message for accent command requiring braces as for other
+       brace commands.
+
 2022-08-27  Patrice Dumas  <pertusus@free.fr>
 
        Handle different accent commands and brace commands more similarly
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 9d16b016e2..9acf263a1d 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -4238,12 +4238,7 @@ sub _parse_texi($$$)
                  __("command `\@%s' must not be followed by new line"),
                  $current->{'cmdname'}), $source_info);
             }
-          } elsif ($line =~ /^\@/) {
-            $self->_line_error(sprintf(
-              __("use braces to give a command as an argument to \@%s"),
-                $current->{'cmdname'}), $source_info);
-            $current = $current->{'parent'};
-          } elsif ($line =~ s/^(.)//) {
+          } elsif ($line =~ s/^([^@])//) {
             print STDERR "ACCENT \@$current->{'cmdname'}\n"
               if ($self->{'DEBUG'});
             my $following_arg = {'type' => 'following_arg',
@@ -4258,6 +4253,10 @@ sub _parse_texi($$$)
                                  $source_info);
             }
             $current = $current->{'parent'};
+          } else {
+            $self->_line_error(sprintf(__("\@%s expected braces"),
+                               $current->{'cmdname'}), $source_info);
+            $current = $current->{'parent'};
           }
           next;
         } else {
diff --git a/tp/Texinfo/XS/parsetexi/parser.c b/tp/Texinfo/XS/parsetexi/parser.c
index bd8bd66c75..7b4520dfad 100644
--- a/tp/Texinfo/XS/parsetexi/parser.c
+++ b/tp/Texinfo/XS/parsetexi/parser.c
@@ -1468,13 +1468,7 @@ superfluous_arg:
                  }
                line = p;
             }
-          else if (*line == '@')
-            {
-              line_error ("use braces to give a command as an argument "
-                          "to @%s", command_name(current->cmd));
-              current = current->parent;
-            }
-          else if (*line != '\0' && *line != '\n' && *line != '\r')
+          else if (*line != '\0' && *line != '@')
             {
               ELEMENT *e, *e2;
               debug ("ACCENT");
@@ -1495,6 +1489,12 @@ superfluous_arg:
               line++;
               current = current->parent;
             }
+          else
+            {
+              line_error ("@%s expected braces",
+                          command_name(current->cmd));
+              current = current->parent;
+            }
           goto funexit;
         }
       else
diff --git a/tp/t/results/coverage/accents_errors.pl 
b/tp/t/results/coverage/accents_errors.pl
index 71d56709e7..916639bee5 100644
--- a/tp/t/results/coverage/accents_errors.pl
+++ b/tp/t/results/coverage/accents_errors.pl
@@ -290,12 +290,12 @@ $result_errors{'accents_errors'} = [
     'type' => 'warning'
   },
   {
-    'error_line' => 'use braces to give a command as an argument to @ringaccent
+    'error_line' => '@ringaccent expected braces
 ',
     'file_name' => '',
     'line_nr' => 3,
     'macro' => '',
-    'text' => 'use braces to give a command as an argument to @ringaccent',
+    'text' => '@ringaccent expected braces',
     'type' => 'error'
   },
   {
@@ -308,12 +308,12 @@ $result_errors{'accents_errors'} = [
     'type' => 'warning'
   },
   {
-    'error_line' => 'use braces to give a command as an argument to @~
+    'error_line' => '@~ expected braces
 ',
     'file_name' => '',
     'line_nr' => 7,
     'macro' => '',
-    'text' => 'use braces to give a command as an argument to @~',
+    'text' => '@~ expected braces',
     'type' => 'error'
   }
 ];
diff --git a/tp/t/results/coverage/at_after_accent_command.pl 
b/tp/t/results/coverage/at_after_accent_command.pl
index 265ad5fbc6..1c79507ad9 100644
--- a/tp/t/results/coverage/at_after_accent_command.pl
+++ b/tp/t/results/coverage/at_after_accent_command.pl
@@ -80,21 +80,21 @@ $result_texts{'at_after_accent_command'} = '*@. ^@.
 
 $result_errors{'at_after_accent_command'} = [
   {
-    'error_line' => 'use braces to give a command as an argument to @ringaccent
+    'error_line' => '@ringaccent expected braces
 ',
     'file_name' => '',
     'line_nr' => 1,
     'macro' => '',
-    'text' => 'use braces to give a command as an argument to @ringaccent',
+    'text' => '@ringaccent expected braces',
     'type' => 'error'
   },
   {
-    'error_line' => 'use braces to give a command as an argument to @^
+    'error_line' => '@^ expected braces
 ',
     'file_name' => '',
     'line_nr' => 1,
     'macro' => '',
-    'text' => 'use braces to give a command as an argument to @^',
+    'text' => '@^ expected braces',
     'type' => 'error'
   }
 ];
diff --git a/tp/t/results/plaintext_tests/invalid_accent_punctuation.pl 
b/tp/t/results/plaintext_tests/invalid_accent_punctuation.pl
index c66c331d96..b5c2af25e2 100644
--- a/tp/t/results/plaintext_tests/invalid_accent_punctuation.pl
+++ b/tp/t/results/plaintext_tests/invalid_accent_punctuation.pl
@@ -53,12 +53,12 @@ $result_texts{'invalid_accent_punctuation'} = 'a. ^@';
 
 $result_errors{'invalid_accent_punctuation'} = [
   {
-    'error_line' => 'use braces to give a command as an argument to @^
+    'error_line' => '@^ expected braces
 ',
     'file_name' => '',
     'line_nr' => 1,
     'macro' => '',
-    'text' => 'use braces to give a command as an argument to @^',
+    'text' => '@^ expected braces',
     'type' => 'error'
   }
 ];
diff --git a/tp/t/results/value/value_after_accent.pl 
b/tp/t/results/value/value_after_accent.pl
index de86c47124..f509227585 100644
--- a/tp/t/results/value/value_after_accent.pl
+++ b/tp/t/results/value/value_after_accent.pl
@@ -98,21 +98,21 @@ $result_texts{'value_after_accent'} = '*a
 
 $result_errors{'value_after_accent'} = [
   {
-    'error_line' => 'use braces to give a command as an argument to @ringaccent
+    'error_line' => '@ringaccent expected braces
 ',
     'file_name' => '',
     'line_nr' => 2,
     'macro' => '',
-    'text' => 'use braces to give a command as an argument to @ringaccent',
+    'text' => '@ringaccent expected braces',
     'type' => 'error'
   },
   {
-    'error_line' => 'use braces to give a command as an argument to @~
+    'error_line' => '@~ expected braces
 ',
     'file_name' => '',
     'line_nr' => 3,
     'macro' => '',
-    'text' => 'use braces to give a command as an argument to @~',
+    'text' => '@~ expected braces',
     'type' => 'error'
   }
 ];
diff --git a/tp/tests/layout/res_parser/formatting/formatting.2 
b/tp/tests/layout/res_parser/formatting/formatting.2
index d0e3f83329..cdcd0bed8f 100644
--- a/tp/tests/layout/res_parser/formatting/formatting.2
+++ b/tp/tests/layout/res_parser/formatting/formatting.2
@@ -14,11 +14,11 @@ formatting.texi:22: warning: @inforef is obsolete (possibly 
involving @mymacro)
 formatting.texi:22: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:22: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:22: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:22: @, expected braces (possibly involving @mymacro)
+formatting.texi:22: @, expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:22: @' expected braces (possibly involving @mymacro)
+formatting.texi:22: @' expected braces (possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -82,11 +82,11 @@ formatting.texi:32: warning: @inforef is obsolete (possibly 
involving @mymacro)
 formatting.texi:32: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:32: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:32: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:32: @, expected braces (possibly involving @mymacro)
+formatting.texi:32: @, expected braces (possibly involving @mymacro)
 formatting.texi:32: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:32: @' expected braces (possibly involving @mymacro)
+formatting.texi:32: @' expected braces (possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -149,11 +149,11 @@ formatting.texi:68: warning: @inforef is obsolete 
(possibly involving @mymacro)
 formatting.texi:68: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:68: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:68: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:68: @, expected braces (possibly involving @mymacro)
+formatting.texi:68: @, expected braces (possibly involving @mymacro)
 formatting.texi:68: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:68: @' expected braces (possibly involving @mymacro)
+formatting.texi:68: @' expected braces (possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -229,11 +229,11 @@ formatting.texi:73: warning: @inforef is obsolete 
(possibly involving @mymacro)
 formatting.texi:73: unmatched `@end' (possibly involving @mymacro)
 formatting.texi:73: unmatched `@end' (possibly involving @mymacro)
 formatting.texi:73: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:73: @, expected braces (possibly involving @mymacro)
+formatting.texi:73: @, expected braces (possibly involving @mymacro)
 formatting.texi:73: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:73: @' expected braces (possibly involving @mymacro)
+formatting.texi:73: @' expected braces (possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting.2 
b/tp/tests/layout/res_parser/formatting_chm/formatting.2
index 5ffd2a596c..61c3085b46 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting.2
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting.2
@@ -14,11 +14,11 @@ formatting.texi:22: warning: @inforef is obsolete (possibly 
involving @mymacro)
 formatting.texi:22: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:22: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:22: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:22: @, expected braces (possibly involving @mymacro)
+formatting.texi:22: @, expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:22: @' expected braces (possibly involving @mymacro)
+formatting.texi:22: @' expected braces (possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -82,11 +82,11 @@ formatting.texi:32: warning: @inforef is obsolete (possibly 
involving @mymacro)
 formatting.texi:32: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:32: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:32: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:32: @, expected braces (possibly involving @mymacro)
+formatting.texi:32: @, expected braces (possibly involving @mymacro)
 formatting.texi:32: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:32: @' expected braces (possibly involving @mymacro)
+formatting.texi:32: @' expected braces (possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -149,11 +149,11 @@ formatting.texi:68: warning: @inforef is obsolete 
(possibly involving @mymacro)
 formatting.texi:68: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:68: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:68: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:68: @, expected braces (possibly involving @mymacro)
+formatting.texi:68: @, expected braces (possibly involving @mymacro)
 formatting.texi:68: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:68: @' expected braces (possibly involving @mymacro)
+formatting.texi:68: @' expected braces (possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -229,11 +229,11 @@ formatting.texi:73: warning: @inforef is obsolete 
(possibly involving @mymacro)
 formatting.texi:73: unmatched `@end' (possibly involving @mymacro)
 formatting.texi:73: unmatched `@end' (possibly involving @mymacro)
 formatting.texi:73: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:73: @, expected braces (possibly involving @mymacro)
+formatting.texi:73: @, expected braces (possibly involving @mymacro)
 formatting.texi:73: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:73: @' expected braces (possibly involving @mymacro)
+formatting.texi:73: @' expected braces (possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
diff --git a/tp/tests/layout/res_parser/formatting_docbook/formatting.2 
b/tp/tests/layout/res_parser/formatting_docbook/formatting.2
index 3887d08db0..0ab7469490 100644
--- a/tp/tests/layout/res_parser/formatting_docbook/formatting.2
+++ b/tp/tests/layout/res_parser/formatting_docbook/formatting.2
@@ -14,11 +14,11 @@ formatting.texi:22: warning: @inforef is obsolete (possibly 
involving @mymacro)
 formatting.texi:22: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:22: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:22: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:22: @, expected braces (possibly involving @mymacro)
+formatting.texi:22: @, expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:22: @' expected braces (possibly involving @mymacro)
+formatting.texi:22: @' expected braces (possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -82,11 +82,11 @@ formatting.texi:32: warning: @inforef is obsolete (possibly 
involving @mymacro)
 formatting.texi:32: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:32: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:32: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:32: @, expected braces (possibly involving @mymacro)
+formatting.texi:32: @, expected braces (possibly involving @mymacro)
 formatting.texi:32: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:32: @' expected braces (possibly involving @mymacro)
+formatting.texi:32: @' expected braces (possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -149,11 +149,11 @@ formatting.texi:68: warning: @inforef is obsolete 
(possibly involving @mymacro)
 formatting.texi:68: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:68: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:68: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:68: @, expected braces (possibly involving @mymacro)
+formatting.texi:68: @, expected braces (possibly involving @mymacro)
 formatting.texi:68: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:68: @' expected braces (possibly involving @mymacro)
+formatting.texi:68: @' expected braces (possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -229,11 +229,11 @@ formatting.texi:73: warning: @inforef is obsolete 
(possibly involving @mymacro)
 formatting.texi:73: unmatched `@end' (possibly involving @mymacro)
 formatting.texi:73: unmatched `@end' (possibly involving @mymacro)
 formatting.texi:73: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:73: @, expected braces (possibly involving @mymacro)
+formatting.texi:73: @, expected braces (possibly involving @mymacro)
 formatting.texi:73: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:73: @' expected braces (possibly involving @mymacro)
+formatting.texi:73: @' expected braces (possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
diff --git a/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.2 
b/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.2
index d0e3f83329..cdcd0bed8f 100644
--- a/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.2
+++ b/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.2
@@ -14,11 +14,11 @@ formatting.texi:22: warning: @inforef is obsolete (possibly 
involving @mymacro)
 formatting.texi:22: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:22: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:22: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:22: @, expected braces (possibly involving @mymacro)
+formatting.texi:22: @, expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:22: @' expected braces (possibly involving @mymacro)
+formatting.texi:22: @' expected braces (possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -82,11 +82,11 @@ formatting.texi:32: warning: @inforef is obsolete (possibly 
involving @mymacro)
 formatting.texi:32: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:32: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:32: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:32: @, expected braces (possibly involving @mymacro)
+formatting.texi:32: @, expected braces (possibly involving @mymacro)
 formatting.texi:32: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:32: @' expected braces (possibly involving @mymacro)
+formatting.texi:32: @' expected braces (possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -149,11 +149,11 @@ formatting.texi:68: warning: @inforef is obsolete 
(possibly involving @mymacro)
 formatting.texi:68: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:68: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:68: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:68: @, expected braces (possibly involving @mymacro)
+formatting.texi:68: @, expected braces (possibly involving @mymacro)
 formatting.texi:68: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:68: @' expected braces (possibly involving @mymacro)
+formatting.texi:68: @' expected braces (possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -229,11 +229,11 @@ formatting.texi:73: warning: @inforef is obsolete 
(possibly involving @mymacro)
 formatting.texi:73: unmatched `@end' (possibly involving @mymacro)
 formatting.texi:73: unmatched `@end' (possibly involving @mymacro)
 formatting.texi:73: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:73: @, expected braces (possibly involving @mymacro)
+formatting.texi:73: @, expected braces (possibly involving @mymacro)
 formatting.texi:73: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:73: @' expected braces (possibly involving @mymacro)
+formatting.texi:73: @' expected braces (possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
diff --git a/tp/tests/layout/res_parser/formatting_epub/formatting.2 
b/tp/tests/layout/res_parser/formatting_epub/formatting.2
index 3807464b1a..f5a76bd1ed 100644
--- a/tp/tests/layout/res_parser/formatting_epub/formatting.2
+++ b/tp/tests/layout/res_parser/formatting_epub/formatting.2
@@ -14,11 +14,11 @@ formatting.texi:22: warning: @inforef is obsolete (possibly 
involving @mymacro)
 formatting.texi:22: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:22: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:22: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:22: @, expected braces (possibly involving @mymacro)
+formatting.texi:22: @, expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:22: @' expected braces (possibly involving @mymacro)
+formatting.texi:22: @' expected braces (possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -82,11 +82,11 @@ formatting.texi:32: warning: @inforef is obsolete (possibly 
involving @mymacro)
 formatting.texi:32: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:32: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:32: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:32: @, expected braces (possibly involving @mymacro)
+formatting.texi:32: @, expected braces (possibly involving @mymacro)
 formatting.texi:32: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:32: @' expected braces (possibly involving @mymacro)
+formatting.texi:32: @' expected braces (possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -149,11 +149,11 @@ formatting.texi:68: warning: @inforef is obsolete 
(possibly involving @mymacro)
 formatting.texi:68: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:68: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:68: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:68: @, expected braces (possibly involving @mymacro)
+formatting.texi:68: @, expected braces (possibly involving @mymacro)
 formatting.texi:68: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:68: @' expected braces (possibly involving @mymacro)
+formatting.texi:68: @' expected braces (possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -229,11 +229,11 @@ formatting.texi:73: warning: @inforef is obsolete 
(possibly involving @mymacro)
 formatting.texi:73: unmatched `@end' (possibly involving @mymacro)
 formatting.texi:73: unmatched `@end' (possibly involving @mymacro)
 formatting.texi:73: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:73: @, expected braces (possibly involving @mymacro)
+formatting.texi:73: @, expected braces (possibly involving @mymacro)
 formatting.texi:73: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:73: @' expected braces (possibly involving @mymacro)
+formatting.texi:73: @' expected braces (possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
diff --git a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting.2 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting.2
index 3807464b1a..f5a76bd1ed 100644
--- a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting.2
+++ b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting.2
@@ -14,11 +14,11 @@ formatting.texi:22: warning: @inforef is obsolete (possibly 
involving @mymacro)
 formatting.texi:22: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:22: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:22: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:22: @, expected braces (possibly involving @mymacro)
+formatting.texi:22: @, expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:22: @' expected braces (possibly involving @mymacro)
+formatting.texi:22: @' expected braces (possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -82,11 +82,11 @@ formatting.texi:32: warning: @inforef is obsolete (possibly 
involving @mymacro)
 formatting.texi:32: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:32: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:32: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:32: @, expected braces (possibly involving @mymacro)
+formatting.texi:32: @, expected braces (possibly involving @mymacro)
 formatting.texi:32: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:32: @' expected braces (possibly involving @mymacro)
+formatting.texi:32: @' expected braces (possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -149,11 +149,11 @@ formatting.texi:68: warning: @inforef is obsolete 
(possibly involving @mymacro)
 formatting.texi:68: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:68: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:68: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:68: @, expected braces (possibly involving @mymacro)
+formatting.texi:68: @, expected braces (possibly involving @mymacro)
 formatting.texi:68: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:68: @' expected braces (possibly involving @mymacro)
+formatting.texi:68: @' expected braces (possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -229,11 +229,11 @@ formatting.texi:73: warning: @inforef is obsolete 
(possibly involving @mymacro)
 formatting.texi:73: unmatched `@end' (possibly involving @mymacro)
 formatting.texi:73: unmatched `@end' (possibly involving @mymacro)
 formatting.texi:73: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:73: @, expected braces (possibly involving @mymacro)
+formatting.texi:73: @, expected braces (possibly involving @mymacro)
 formatting.texi:73: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:73: @' expected braces (possibly involving @mymacro)
+formatting.texi:73: @' expected braces (possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
diff --git a/tp/tests/layout/res_parser/formatting_exotic/formatting.2 
b/tp/tests/layout/res_parser/formatting_exotic/formatting.2
index 1338c6eef7..d600e38590 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/formatting.2
+++ b/tp/tests/layout/res_parser/formatting_exotic/formatting.2
@@ -14,11 +14,11 @@ formatting.texi:22: warning: @inforef is obsolete (possibly 
involving @mymacro)
 formatting.texi:22: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:22: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:22: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:22: @, expected braces (possibly involving @mymacro)
+formatting.texi:22: @, expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:22: @' expected braces (possibly involving @mymacro)
+formatting.texi:22: @' expected braces (possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -82,11 +82,11 @@ formatting.texi:32: warning: @inforef is obsolete (possibly 
involving @mymacro)
 formatting.texi:32: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:32: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:32: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:32: @, expected braces (possibly involving @mymacro)
+formatting.texi:32: @, expected braces (possibly involving @mymacro)
 formatting.texi:32: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:32: @' expected braces (possibly involving @mymacro)
+formatting.texi:32: @' expected braces (possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -149,11 +149,11 @@ formatting.texi:68: warning: @inforef is obsolete 
(possibly involving @mymacro)
 formatting.texi:68: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:68: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:68: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:68: @, expected braces (possibly involving @mymacro)
+formatting.texi:68: @, expected braces (possibly involving @mymacro)
 formatting.texi:68: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:68: @' expected braces (possibly involving @mymacro)
+formatting.texi:68: @' expected braces (possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -229,11 +229,11 @@ formatting.texi:73: warning: @inforef is obsolete 
(possibly involving @mymacro)
 formatting.texi:73: unmatched `@end' (possibly involving @mymacro)
 formatting.texi:73: unmatched `@end' (possibly involving @mymacro)
 formatting.texi:73: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:73: @, expected braces (possibly involving @mymacro)
+formatting.texi:73: @, expected braces (possibly involving @mymacro)
 formatting.texi:73: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:73: @' expected braces (possibly involving @mymacro)
+formatting.texi:73: @' expected braces (possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
diff --git a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.2 
b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.2
index d0e3f83329..cdcd0bed8f 100644
--- a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.2
+++ b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.2
@@ -14,11 +14,11 @@ formatting.texi:22: warning: @inforef is obsolete (possibly 
involving @mymacro)
 formatting.texi:22: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:22: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:22: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:22: @, expected braces (possibly involving @mymacro)
+formatting.texi:22: @, expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:22: @' expected braces (possibly involving @mymacro)
+formatting.texi:22: @' expected braces (possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -82,11 +82,11 @@ formatting.texi:32: warning: @inforef is obsolete (possibly 
involving @mymacro)
 formatting.texi:32: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:32: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:32: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:32: @, expected braces (possibly involving @mymacro)
+formatting.texi:32: @, expected braces (possibly involving @mymacro)
 formatting.texi:32: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:32: @' expected braces (possibly involving @mymacro)
+formatting.texi:32: @' expected braces (possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -149,11 +149,11 @@ formatting.texi:68: warning: @inforef is obsolete 
(possibly involving @mymacro)
 formatting.texi:68: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:68: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:68: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:68: @, expected braces (possibly involving @mymacro)
+formatting.texi:68: @, expected braces (possibly involving @mymacro)
 formatting.texi:68: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:68: @' expected braces (possibly involving @mymacro)
+formatting.texi:68: @' expected braces (possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -229,11 +229,11 @@ formatting.texi:73: warning: @inforef is obsolete 
(possibly involving @mymacro)
 formatting.texi:73: unmatched `@end' (possibly involving @mymacro)
 formatting.texi:73: unmatched `@end' (possibly involving @mymacro)
 formatting.texi:73: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:73: @, expected braces (possibly involving @mymacro)
+formatting.texi:73: @, expected braces (possibly involving @mymacro)
 formatting.texi:73: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:73: @' expected braces (possibly involving @mymacro)
+formatting.texi:73: @' expected braces (possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
diff --git a/tp/tests/layout/res_parser/formatting_html/formatting.2 
b/tp/tests/layout/res_parser/formatting_html/formatting.2
index d0e3f83329..cdcd0bed8f 100644
--- a/tp/tests/layout/res_parser/formatting_html/formatting.2
+++ b/tp/tests/layout/res_parser/formatting_html/formatting.2
@@ -14,11 +14,11 @@ formatting.texi:22: warning: @inforef is obsolete (possibly 
involving @mymacro)
 formatting.texi:22: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:22: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:22: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:22: @, expected braces (possibly involving @mymacro)
+formatting.texi:22: @, expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:22: @' expected braces (possibly involving @mymacro)
+formatting.texi:22: @' expected braces (possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -82,11 +82,11 @@ formatting.texi:32: warning: @inforef is obsolete (possibly 
involving @mymacro)
 formatting.texi:32: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:32: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:32: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:32: @, expected braces (possibly involving @mymacro)
+formatting.texi:32: @, expected braces (possibly involving @mymacro)
 formatting.texi:32: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:32: @' expected braces (possibly involving @mymacro)
+formatting.texi:32: @' expected braces (possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -149,11 +149,11 @@ formatting.texi:68: warning: @inforef is obsolete 
(possibly involving @mymacro)
 formatting.texi:68: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:68: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:68: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:68: @, expected braces (possibly involving @mymacro)
+formatting.texi:68: @, expected braces (possibly involving @mymacro)
 formatting.texi:68: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:68: @' expected braces (possibly involving @mymacro)
+formatting.texi:68: @' expected braces (possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -229,11 +229,11 @@ formatting.texi:73: warning: @inforef is obsolete 
(possibly involving @mymacro)
 formatting.texi:73: unmatched `@end' (possibly involving @mymacro)
 formatting.texi:73: unmatched `@end' (possibly involving @mymacro)
 formatting.texi:73: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:73: @, expected braces (possibly involving @mymacro)
+formatting.texi:73: @, expected braces (possibly involving @mymacro)
 formatting.texi:73: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:73: @' expected braces (possibly involving @mymacro)
+formatting.texi:73: @' expected braces (possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
diff --git a/tp/tests/layout/res_parser/formatting_html32/formatting.2 
b/tp/tests/layout/res_parser/formatting_html32/formatting.2
index d0e3f83329..cdcd0bed8f 100644
--- a/tp/tests/layout/res_parser/formatting_html32/formatting.2
+++ b/tp/tests/layout/res_parser/formatting_html32/formatting.2
@@ -14,11 +14,11 @@ formatting.texi:22: warning: @inforef is obsolete (possibly 
involving @mymacro)
 formatting.texi:22: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:22: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:22: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:22: @, expected braces (possibly involving @mymacro)
+formatting.texi:22: @, expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:22: @' expected braces (possibly involving @mymacro)
+formatting.texi:22: @' expected braces (possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -82,11 +82,11 @@ formatting.texi:32: warning: @inforef is obsolete (possibly 
involving @mymacro)
 formatting.texi:32: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:32: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:32: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:32: @, expected braces (possibly involving @mymacro)
+formatting.texi:32: @, expected braces (possibly involving @mymacro)
 formatting.texi:32: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:32: @' expected braces (possibly involving @mymacro)
+formatting.texi:32: @' expected braces (possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -149,11 +149,11 @@ formatting.texi:68: warning: @inforef is obsolete 
(possibly involving @mymacro)
 formatting.texi:68: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:68: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:68: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:68: @, expected braces (possibly involving @mymacro)
+formatting.texi:68: @, expected braces (possibly involving @mymacro)
 formatting.texi:68: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:68: @' expected braces (possibly involving @mymacro)
+formatting.texi:68: @' expected braces (possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -229,11 +229,11 @@ formatting.texi:73: warning: @inforef is obsolete 
(possibly involving @mymacro)
 formatting.texi:73: unmatched `@end' (possibly involving @mymacro)
 formatting.texi:73: unmatched `@end' (possibly involving @mymacro)
 formatting.texi:73: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:73: @, expected braces (possibly involving @mymacro)
+formatting.texi:73: @, expected braces (possibly involving @mymacro)
 formatting.texi:73: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:73: @' expected braces (possibly involving @mymacro)
+formatting.texi:73: @' expected braces (possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
diff --git 
a/tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.2 
b/tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.2
index 1338c6eef7..d600e38590 100644
--- a/tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.2
+++ b/tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.2
@@ -14,11 +14,11 @@ formatting.texi:22: warning: @inforef is obsolete (possibly 
involving @mymacro)
 formatting.texi:22: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:22: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:22: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:22: @, expected braces (possibly involving @mymacro)
+formatting.texi:22: @, expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:22: @' expected braces (possibly involving @mymacro)
+formatting.texi:22: @' expected braces (possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -82,11 +82,11 @@ formatting.texi:32: warning: @inforef is obsolete (possibly 
involving @mymacro)
 formatting.texi:32: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:32: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:32: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:32: @, expected braces (possibly involving @mymacro)
+formatting.texi:32: @, expected braces (possibly involving @mymacro)
 formatting.texi:32: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:32: @' expected braces (possibly involving @mymacro)
+formatting.texi:32: @' expected braces (possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -149,11 +149,11 @@ formatting.texi:68: warning: @inforef is obsolete 
(possibly involving @mymacro)
 formatting.texi:68: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:68: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:68: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:68: @, expected braces (possibly involving @mymacro)
+formatting.texi:68: @, expected braces (possibly involving @mymacro)
 formatting.texi:68: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:68: @' expected braces (possibly involving @mymacro)
+formatting.texi:68: @' expected braces (possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -229,11 +229,11 @@ formatting.texi:73: warning: @inforef is obsolete 
(possibly involving @mymacro)
 formatting.texi:73: unmatched `@end' (possibly involving @mymacro)
 formatting.texi:73: unmatched `@end' (possibly involving @mymacro)
 formatting.texi:73: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:73: @, expected braces (possibly involving @mymacro)
+formatting.texi:73: @, expected braces (possibly involving @mymacro)
 formatting.texi:73: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:73: @' expected braces (possibly involving @mymacro)
+formatting.texi:73: @' expected braces (possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
diff --git a/tp/tests/layout/res_parser/formatting_html_nodes/formatting.2 
b/tp/tests/layout/res_parser/formatting_html_nodes/formatting.2
index d0e3f83329..cdcd0bed8f 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/formatting.2
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/formatting.2
@@ -14,11 +14,11 @@ formatting.texi:22: warning: @inforef is obsolete (possibly 
involving @mymacro)
 formatting.texi:22: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:22: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:22: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:22: @, expected braces (possibly involving @mymacro)
+formatting.texi:22: @, expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:22: @' expected braces (possibly involving @mymacro)
+formatting.texi:22: @' expected braces (possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -82,11 +82,11 @@ formatting.texi:32: warning: @inforef is obsolete (possibly 
involving @mymacro)
 formatting.texi:32: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:32: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:32: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:32: @, expected braces (possibly involving @mymacro)
+formatting.texi:32: @, expected braces (possibly involving @mymacro)
 formatting.texi:32: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:32: @' expected braces (possibly involving @mymacro)
+formatting.texi:32: @' expected braces (possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -149,11 +149,11 @@ formatting.texi:68: warning: @inforef is obsolete 
(possibly involving @mymacro)
 formatting.texi:68: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:68: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:68: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:68: @, expected braces (possibly involving @mymacro)
+formatting.texi:68: @, expected braces (possibly involving @mymacro)
 formatting.texi:68: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:68: @' expected braces (possibly involving @mymacro)
+formatting.texi:68: @' expected braces (possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -229,11 +229,11 @@ formatting.texi:73: warning: @inforef is obsolete 
(possibly involving @mymacro)
 formatting.texi:73: unmatched `@end' (possibly involving @mymacro)
 formatting.texi:73: unmatched `@end' (possibly involving @mymacro)
 formatting.texi:73: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:73: @, expected braces (possibly involving @mymacro)
+formatting.texi:73: @, expected braces (possibly involving @mymacro)
 formatting.texi:73: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:73: @' expected braces (possibly involving @mymacro)
+formatting.texi:73: @' expected braces (possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
diff --git a/tp/tests/layout/res_parser/formatting_info/formatting.2 
b/tp/tests/layout/res_parser/formatting_info/formatting.2
index 6cf102e7dc..d8419664d6 100644
--- a/tp/tests/layout/res_parser/formatting_info/formatting.2
+++ b/tp/tests/layout/res_parser/formatting_info/formatting.2
@@ -14,11 +14,11 @@ formatting.texi:22: warning: @inforef is obsolete (possibly 
involving @mymacro)
 formatting.texi:22: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:22: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:22: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:22: @, expected braces (possibly involving @mymacro)
+formatting.texi:22: @, expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:22: @' expected braces (possibly involving @mymacro)
+formatting.texi:22: @' expected braces (possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -82,11 +82,11 @@ formatting.texi:32: warning: @inforef is obsolete (possibly 
involving @mymacro)
 formatting.texi:32: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:32: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:32: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:32: @, expected braces (possibly involving @mymacro)
+formatting.texi:32: @, expected braces (possibly involving @mymacro)
 formatting.texi:32: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:32: @' expected braces (possibly involving @mymacro)
+formatting.texi:32: @' expected braces (possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -149,11 +149,11 @@ formatting.texi:68: warning: @inforef is obsolete 
(possibly involving @mymacro)
 formatting.texi:68: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:68: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:68: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:68: @, expected braces (possibly involving @mymacro)
+formatting.texi:68: @, expected braces (possibly involving @mymacro)
 formatting.texi:68: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:68: @' expected braces (possibly involving @mymacro)
+formatting.texi:68: @' expected braces (possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -229,11 +229,11 @@ formatting.texi:73: warning: @inforef is obsolete 
(possibly involving @mymacro)
 formatting.texi:73: unmatched `@end' (possibly involving @mymacro)
 formatting.texi:73: unmatched `@end' (possibly involving @mymacro)
 formatting.texi:73: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:73: @, expected braces (possibly involving @mymacro)
+formatting.texi:73: @, expected braces (possibly involving @mymacro)
 formatting.texi:73: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:73: @' expected braces (possibly involving @mymacro)
+formatting.texi:73: @' expected braces (possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
diff --git a/tp/tests/layout/res_parser/formatting_inline_css/formatting.2 
b/tp/tests/layout/res_parser/formatting_inline_css/formatting.2
index d0e3f83329..cdcd0bed8f 100644
--- a/tp/tests/layout/res_parser/formatting_inline_css/formatting.2
+++ b/tp/tests/layout/res_parser/formatting_inline_css/formatting.2
@@ -14,11 +14,11 @@ formatting.texi:22: warning: @inforef is obsolete (possibly 
involving @mymacro)
 formatting.texi:22: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:22: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:22: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:22: @, expected braces (possibly involving @mymacro)
+formatting.texi:22: @, expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:22: @' expected braces (possibly involving @mymacro)
+formatting.texi:22: @' expected braces (possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -82,11 +82,11 @@ formatting.texi:32: warning: @inforef is obsolete (possibly 
involving @mymacro)
 formatting.texi:32: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:32: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:32: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:32: @, expected braces (possibly involving @mymacro)
+formatting.texi:32: @, expected braces (possibly involving @mymacro)
 formatting.texi:32: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:32: @' expected braces (possibly involving @mymacro)
+formatting.texi:32: @' expected braces (possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -149,11 +149,11 @@ formatting.texi:68: warning: @inforef is obsolete 
(possibly involving @mymacro)
 formatting.texi:68: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:68: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:68: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:68: @, expected braces (possibly involving @mymacro)
+formatting.texi:68: @, expected braces (possibly involving @mymacro)
 formatting.texi:68: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:68: @' expected braces (possibly involving @mymacro)
+formatting.texi:68: @' expected braces (possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -229,11 +229,11 @@ formatting.texi:73: warning: @inforef is obsolete 
(possibly involving @mymacro)
 formatting.texi:73: unmatched `@end' (possibly involving @mymacro)
 formatting.texi:73: unmatched `@end' (possibly involving @mymacro)
 formatting.texi:73: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:73: @, expected braces (possibly involving @mymacro)
+formatting.texi:73: @, expected braces (possibly involving @mymacro)
 formatting.texi:73: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:73: @' expected braces (possibly involving @mymacro)
+formatting.texi:73: @' expected braces (possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
diff --git a/tp/tests/layout/res_parser/formatting_latex/formatting.2 
b/tp/tests/layout/res_parser/formatting_latex/formatting.2
index e9dbb8679c..40da37a516 100644
--- a/tp/tests/layout/res_parser/formatting_latex/formatting.2
+++ b/tp/tests/layout/res_parser/formatting_latex/formatting.2
@@ -14,11 +14,11 @@ formatting.texi:22: warning: @inforef is obsolete (possibly 
involving @mymacro)
 formatting.texi:22: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:22: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:22: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:22: @, expected braces (possibly involving @mymacro)
+formatting.texi:22: @, expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:22: @' expected braces (possibly involving @mymacro)
+formatting.texi:22: @' expected braces (possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -81,11 +81,11 @@ formatting.texi:32: warning: @inforef is obsolete (possibly 
involving @mymacro)
 formatting.texi:32: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:32: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:32: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:32: @, expected braces (possibly involving @mymacro)
+formatting.texi:32: @, expected braces (possibly involving @mymacro)
 formatting.texi:32: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:32: @' expected braces (possibly involving @mymacro)
+formatting.texi:32: @' expected braces (possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -147,11 +147,11 @@ formatting.texi:68: warning: @inforef is obsolete 
(possibly involving @mymacro)
 formatting.texi:68: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:68: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:68: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:68: @, expected braces (possibly involving @mymacro)
+formatting.texi:68: @, expected braces (possibly involving @mymacro)
 formatting.texi:68: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:68: @' expected braces (possibly involving @mymacro)
+formatting.texi:68: @' expected braces (possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -226,11 +226,11 @@ formatting.texi:73: warning: @inforef is obsolete 
(possibly involving @mymacro)
 formatting.texi:73: unmatched `@end' (possibly involving @mymacro)
 formatting.texi:73: unmatched `@end' (possibly involving @mymacro)
 formatting.texi:73: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:73: @, expected braces (possibly involving @mymacro)
+formatting.texi:73: @, expected braces (possibly involving @mymacro)
 formatting.texi:73: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:73: @' expected braces (possibly involving @mymacro)
+formatting.texi:73: @' expected braces (possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
diff --git a/tp/tests/layout/res_parser/formatting_macro_expand/formatting.2 
b/tp/tests/layout/res_parser/formatting_macro_expand/formatting.2
index 3f17f0456b..342f746753 100644
--- a/tp/tests/layout/res_parser/formatting_macro_expand/formatting.2
+++ b/tp/tests/layout/res_parser/formatting_macro_expand/formatting.2
@@ -14,11 +14,11 @@ formatting.texi:22: warning: @inforef is obsolete (possibly 
involving @mymacro)
 formatting.texi:22: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:22: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:22: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:22: @, expected braces (possibly involving @mymacro)
+formatting.texi:22: @, expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:22: @' expected braces (possibly involving @mymacro)
+formatting.texi:22: @' expected braces (possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -82,11 +82,11 @@ formatting.texi:32: warning: @inforef is obsolete (possibly 
involving @mymacro)
 formatting.texi:32: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:32: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:32: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:32: @, expected braces (possibly involving @mymacro)
+formatting.texi:32: @, expected braces (possibly involving @mymacro)
 formatting.texi:32: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:32: @' expected braces (possibly involving @mymacro)
+formatting.texi:32: @' expected braces (possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -149,11 +149,11 @@ formatting.texi:68: warning: @inforef is obsolete 
(possibly involving @mymacro)
 formatting.texi:68: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:68: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:68: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:68: @, expected braces (possibly involving @mymacro)
+formatting.texi:68: @, expected braces (possibly involving @mymacro)
 formatting.texi:68: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:68: @' expected braces (possibly involving @mymacro)
+formatting.texi:68: @' expected braces (possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -229,11 +229,11 @@ formatting.texi:73: warning: @inforef is obsolete 
(possibly involving @mymacro)
 formatting.texi:73: unmatched `@end' (possibly involving @mymacro)
 formatting.texi:73: unmatched `@end' (possibly involving @mymacro)
 formatting.texi:73: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:73: @, expected braces (possibly involving @mymacro)
+formatting.texi:73: @, expected braces (possibly involving @mymacro)
 formatting.texi:73: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:73: @' expected braces (possibly involving @mymacro)
+formatting.texi:73: @' expected braces (possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
diff --git a/tp/tests/layout/res_parser/formatting_mathjax/formatting.2 
b/tp/tests/layout/res_parser/formatting_mathjax/formatting.2
index d0e3f83329..cdcd0bed8f 100644
--- a/tp/tests/layout/res_parser/formatting_mathjax/formatting.2
+++ b/tp/tests/layout/res_parser/formatting_mathjax/formatting.2
@@ -14,11 +14,11 @@ formatting.texi:22: warning: @inforef is obsolete (possibly 
involving @mymacro)
 formatting.texi:22: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:22: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:22: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:22: @, expected braces (possibly involving @mymacro)
+formatting.texi:22: @, expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:22: @' expected braces (possibly involving @mymacro)
+formatting.texi:22: @' expected braces (possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -82,11 +82,11 @@ formatting.texi:32: warning: @inforef is obsolete (possibly 
involving @mymacro)
 formatting.texi:32: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:32: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:32: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:32: @, expected braces (possibly involving @mymacro)
+formatting.texi:32: @, expected braces (possibly involving @mymacro)
 formatting.texi:32: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:32: @' expected braces (possibly involving @mymacro)
+formatting.texi:32: @' expected braces (possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -149,11 +149,11 @@ formatting.texi:68: warning: @inforef is obsolete 
(possibly involving @mymacro)
 formatting.texi:68: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:68: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:68: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:68: @, expected braces (possibly involving @mymacro)
+formatting.texi:68: @, expected braces (possibly involving @mymacro)
 formatting.texi:68: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:68: @' expected braces (possibly involving @mymacro)
+formatting.texi:68: @' expected braces (possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -229,11 +229,11 @@ formatting.texi:73: warning: @inforef is obsolete 
(possibly involving @mymacro)
 formatting.texi:73: unmatched `@end' (possibly involving @mymacro)
 formatting.texi:73: unmatched `@end' (possibly involving @mymacro)
 formatting.texi:73: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:73: @, expected braces (possibly involving @mymacro)
+formatting.texi:73: @, expected braces (possibly involving @mymacro)
 formatting.texi:73: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:73: @' expected braces (possibly involving @mymacro)
+formatting.texi:73: @' expected braces (possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
diff --git a/tp/tests/layout/res_parser/formatting_nodes/formatting.2 
b/tp/tests/layout/res_parser/formatting_nodes/formatting.2
index d0e3f83329..cdcd0bed8f 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/formatting.2
+++ b/tp/tests/layout/res_parser/formatting_nodes/formatting.2
@@ -14,11 +14,11 @@ formatting.texi:22: warning: @inforef is obsolete (possibly 
involving @mymacro)
 formatting.texi:22: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:22: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:22: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:22: @, expected braces (possibly involving @mymacro)
+formatting.texi:22: @, expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:22: @' expected braces (possibly involving @mymacro)
+formatting.texi:22: @' expected braces (possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -82,11 +82,11 @@ formatting.texi:32: warning: @inforef is obsolete (possibly 
involving @mymacro)
 formatting.texi:32: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:32: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:32: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:32: @, expected braces (possibly involving @mymacro)
+formatting.texi:32: @, expected braces (possibly involving @mymacro)
 formatting.texi:32: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:32: @' expected braces (possibly involving @mymacro)
+formatting.texi:32: @' expected braces (possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -149,11 +149,11 @@ formatting.texi:68: warning: @inforef is obsolete 
(possibly involving @mymacro)
 formatting.texi:68: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:68: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:68: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:68: @, expected braces (possibly involving @mymacro)
+formatting.texi:68: @, expected braces (possibly involving @mymacro)
 formatting.texi:68: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:68: @' expected braces (possibly involving @mymacro)
+formatting.texi:68: @' expected braces (possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -229,11 +229,11 @@ formatting.texi:73: warning: @inforef is obsolete 
(possibly involving @mymacro)
 formatting.texi:73: unmatched `@end' (possibly involving @mymacro)
 formatting.texi:73: unmatched `@end' (possibly involving @mymacro)
 formatting.texi:73: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:73: @, expected braces (possibly involving @mymacro)
+formatting.texi:73: @, expected braces (possibly involving @mymacro)
 formatting.texi:73: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:73: @' expected braces (possibly involving @mymacro)
+formatting.texi:73: @' expected braces (possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
diff --git 
a/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.2 
b/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.2
index d0e3f83329..cdcd0bed8f 100644
--- a/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.2
+++ b/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.2
@@ -14,11 +14,11 @@ formatting.texi:22: warning: @inforef is obsolete (possibly 
involving @mymacro)
 formatting.texi:22: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:22: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:22: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:22: @, expected braces (possibly involving @mymacro)
+formatting.texi:22: @, expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:22: @' expected braces (possibly involving @mymacro)
+formatting.texi:22: @' expected braces (possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -82,11 +82,11 @@ formatting.texi:32: warning: @inforef is obsolete (possibly 
involving @mymacro)
 formatting.texi:32: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:32: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:32: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:32: @, expected braces (possibly involving @mymacro)
+formatting.texi:32: @, expected braces (possibly involving @mymacro)
 formatting.texi:32: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:32: @' expected braces (possibly involving @mymacro)
+formatting.texi:32: @' expected braces (possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -149,11 +149,11 @@ formatting.texi:68: warning: @inforef is obsolete 
(possibly involving @mymacro)
 formatting.texi:68: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:68: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:68: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:68: @, expected braces (possibly involving @mymacro)
+formatting.texi:68: @, expected braces (possibly involving @mymacro)
 formatting.texi:68: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:68: @' expected braces (possibly involving @mymacro)
+formatting.texi:68: @' expected braces (possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -229,11 +229,11 @@ formatting.texi:73: warning: @inforef is obsolete 
(possibly involving @mymacro)
 formatting.texi:73: unmatched `@end' (possibly involving @mymacro)
 formatting.texi:73: unmatched `@end' (possibly involving @mymacro)
 formatting.texi:73: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:73: @, expected braces (possibly involving @mymacro)
+formatting.texi:73: @, expected braces (possibly involving @mymacro)
 formatting.texi:73: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:73: @' expected braces (possibly involving @mymacro)
+formatting.texi:73: @' expected braces (possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
diff --git a/tp/tests/layout/res_parser/formatting_plaintext/formatting.2 
b/tp/tests/layout/res_parser/formatting_plaintext/formatting.2
index bc9c1b3ce3..aa896c1959 100644
--- a/tp/tests/layout/res_parser/formatting_plaintext/formatting.2
+++ b/tp/tests/layout/res_parser/formatting_plaintext/formatting.2
@@ -14,11 +14,11 @@ formatting.texi:22: warning: @inforef is obsolete (possibly 
involving @mymacro)
 formatting.texi:22: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:22: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:22: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:22: @, expected braces (possibly involving @mymacro)
+formatting.texi:22: @, expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:22: @' expected braces (possibly involving @mymacro)
+formatting.texi:22: @' expected braces (possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -82,11 +82,11 @@ formatting.texi:32: warning: @inforef is obsolete (possibly 
involving @mymacro)
 formatting.texi:32: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:32: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:32: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:32: @, expected braces (possibly involving @mymacro)
+formatting.texi:32: @, expected braces (possibly involving @mymacro)
 formatting.texi:32: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:32: @' expected braces (possibly involving @mymacro)
+formatting.texi:32: @' expected braces (possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -149,11 +149,11 @@ formatting.texi:68: warning: @inforef is obsolete 
(possibly involving @mymacro)
 formatting.texi:68: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:68: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:68: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:68: @, expected braces (possibly involving @mymacro)
+formatting.texi:68: @, expected braces (possibly involving @mymacro)
 formatting.texi:68: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:68: @' expected braces (possibly involving @mymacro)
+formatting.texi:68: @' expected braces (possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -229,11 +229,11 @@ formatting.texi:73: warning: @inforef is obsolete 
(possibly involving @mymacro)
 formatting.texi:73: unmatched `@end' (possibly involving @mymacro)
 formatting.texi:73: unmatched `@end' (possibly involving @mymacro)
 formatting.texi:73: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:73: @, expected braces (possibly involving @mymacro)
+formatting.texi:73: @, expected braces (possibly involving @mymacro)
 formatting.texi:73: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:73: @' expected braces (possibly involving @mymacro)
+formatting.texi:73: @' expected braces (possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
diff --git a/tp/tests/layout/res_parser/formatting_rawtext/formatting.2 
b/tp/tests/layout/res_parser/formatting_rawtext/formatting.2
index 3f17f0456b..342f746753 100644
--- a/tp/tests/layout/res_parser/formatting_rawtext/formatting.2
+++ b/tp/tests/layout/res_parser/formatting_rawtext/formatting.2
@@ -14,11 +14,11 @@ formatting.texi:22: warning: @inforef is obsolete (possibly 
involving @mymacro)
 formatting.texi:22: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:22: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:22: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:22: @, expected braces (possibly involving @mymacro)
+formatting.texi:22: @, expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:22: @' expected braces (possibly involving @mymacro)
+formatting.texi:22: @' expected braces (possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -82,11 +82,11 @@ formatting.texi:32: warning: @inforef is obsolete (possibly 
involving @mymacro)
 formatting.texi:32: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:32: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:32: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:32: @, expected braces (possibly involving @mymacro)
+formatting.texi:32: @, expected braces (possibly involving @mymacro)
 formatting.texi:32: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:32: @' expected braces (possibly involving @mymacro)
+formatting.texi:32: @' expected braces (possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -149,11 +149,11 @@ formatting.texi:68: warning: @inforef is obsolete 
(possibly involving @mymacro)
 formatting.texi:68: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:68: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:68: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:68: @, expected braces (possibly involving @mymacro)
+formatting.texi:68: @, expected braces (possibly involving @mymacro)
 formatting.texi:68: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:68: @' expected braces (possibly involving @mymacro)
+formatting.texi:68: @' expected braces (possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -229,11 +229,11 @@ formatting.texi:73: warning: @inforef is obsolete 
(possibly involving @mymacro)
 formatting.texi:73: unmatched `@end' (possibly involving @mymacro)
 formatting.texi:73: unmatched `@end' (possibly involving @mymacro)
 formatting.texi:73: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:73: @, expected braces (possibly involving @mymacro)
+formatting.texi:73: @, expected braces (possibly involving @mymacro)
 formatting.texi:73: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:73: @' expected braces (possibly involving @mymacro)
+formatting.texi:73: @' expected braces (possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
diff --git a/tp/tests/layout/res_parser/formatting_regions/formatting_regions.2 
b/tp/tests/layout/res_parser/formatting_regions/formatting_regions.2
index 438f7a808d..3b35799aee 100644
--- a/tp/tests/layout/res_parser/formatting_regions/formatting_regions.2
+++ b/tp/tests/layout/res_parser/formatting_regions/formatting_regions.2
@@ -14,11 +14,11 @@ formatting_regions.texi:28: warning: @inforef is obsolete 
(possibly involving @m
 formatting_regions.texi:28: warning: @inforef is obsolete (possibly involving 
@mymacro)
 formatting_regions.texi:28: warning: @inforef is obsolete (possibly involving 
@mymacro)
 formatting_regions.texi:28: warning: command `@,' must not be followed by new 
line (possibly involving @mymacro)
-formatting_regions.texi:28: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting_regions.texi:28: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting_regions.texi:28: @, expected braces (possibly involving @mymacro)
+formatting_regions.texi:28: @, expected braces (possibly involving @mymacro)
 formatting_regions.texi:28: warning: command `@'' must not be followed by new 
line (possibly involving @mymacro)
-formatting_regions.texi:28: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting_regions.texi:28: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting_regions.texi:28: @' expected braces (possibly involving @mymacro)
+formatting_regions.texi:28: @' expected braces (possibly involving @mymacro)
 formatting_regions.texi:28: @dotless expects `i' or `j' as argument, not 
`truc' (possibly involving @mymacro)
 formatting_regions.texi:28: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting_regions.texi:28: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -82,11 +82,11 @@ formatting_regions.texi:39: warning: @inforef is obsolete 
(possibly involving @m
 formatting_regions.texi:39: warning: @inforef is obsolete (possibly involving 
@mymacro)
 formatting_regions.texi:39: warning: @inforef is obsolete (possibly involving 
@mymacro)
 formatting_regions.texi:39: warning: command `@,' must not be followed by new 
line (possibly involving @mymacro)
-formatting_regions.texi:39: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting_regions.texi:39: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting_regions.texi:39: @, expected braces (possibly involving @mymacro)
+formatting_regions.texi:39: @, expected braces (possibly involving @mymacro)
 formatting_regions.texi:39: warning: command `@'' must not be followed by new 
line (possibly involving @mymacro)
-formatting_regions.texi:39: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting_regions.texi:39: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting_regions.texi:39: @' expected braces (possibly involving @mymacro)
+formatting_regions.texi:39: @' expected braces (possibly involving @mymacro)
 formatting_regions.texi:39: @dotless expects `i' or `j' as argument, not 
`truc' (possibly involving @mymacro)
 formatting_regions.texi:39: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting_regions.texi:39: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -149,11 +149,11 @@ formatting_regions.texi:46: warning: @inforef is obsolete 
(possibly involving @m
 formatting_regions.texi:46: warning: @inforef is obsolete (possibly involving 
@mymacro)
 formatting_regions.texi:46: warning: @inforef is obsolete (possibly involving 
@mymacro)
 formatting_regions.texi:46: warning: command `@,' must not be followed by new 
line (possibly involving @mymacro)
-formatting_regions.texi:46: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting_regions.texi:46: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting_regions.texi:46: @, expected braces (possibly involving @mymacro)
+formatting_regions.texi:46: @, expected braces (possibly involving @mymacro)
 formatting_regions.texi:46: warning: command `@'' must not be followed by new 
line (possibly involving @mymacro)
-formatting_regions.texi:46: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting_regions.texi:46: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting_regions.texi:46: @' expected braces (possibly involving @mymacro)
+formatting_regions.texi:46: @' expected braces (possibly involving @mymacro)
 formatting_regions.texi:46: @dotless expects `i' or `j' as argument, not 
`truc' (possibly involving @mymacro)
 formatting_regions.texi:46: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting_regions.texi:46: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -217,11 +217,11 @@ formatting_regions.texi:49: warning: @inforef is obsolete 
(possibly involving @m
 formatting_regions.texi:49: warning: @inforef is obsolete (possibly involving 
@mymacro)
 formatting_regions.texi:49: warning: @inforef is obsolete (possibly involving 
@mymacro)
 formatting_regions.texi:49: warning: command `@,' must not be followed by new 
line (possibly involving @mymacro)
-formatting_regions.texi:49: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting_regions.texi:49: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting_regions.texi:49: @, expected braces (possibly involving @mymacro)
+formatting_regions.texi:49: @, expected braces (possibly involving @mymacro)
 formatting_regions.texi:49: warning: command `@'' must not be followed by new 
line (possibly involving @mymacro)
-formatting_regions.texi:49: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting_regions.texi:49: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting_regions.texi:49: @' expected braces (possibly involving @mymacro)
+formatting_regions.texi:49: @' expected braces (possibly involving @mymacro)
 formatting_regions.texi:49: @dotless expects `i' or `j' as argument, not 
`truc' (possibly involving @mymacro)
 formatting_regions.texi:49: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting_regions.texi:49: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
diff --git a/tp/tests/layout/res_parser/formatting_textcontent/formatting.2 
b/tp/tests/layout/res_parser/formatting_textcontent/formatting.2
index 3f17f0456b..342f746753 100644
--- a/tp/tests/layout/res_parser/formatting_textcontent/formatting.2
+++ b/tp/tests/layout/res_parser/formatting_textcontent/formatting.2
@@ -14,11 +14,11 @@ formatting.texi:22: warning: @inforef is obsolete (possibly 
involving @mymacro)
 formatting.texi:22: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:22: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:22: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:22: @, expected braces (possibly involving @mymacro)
+formatting.texi:22: @, expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:22: @' expected braces (possibly involving @mymacro)
+formatting.texi:22: @' expected braces (possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -82,11 +82,11 @@ formatting.texi:32: warning: @inforef is obsolete (possibly 
involving @mymacro)
 formatting.texi:32: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:32: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:32: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:32: @, expected braces (possibly involving @mymacro)
+formatting.texi:32: @, expected braces (possibly involving @mymacro)
 formatting.texi:32: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:32: @' expected braces (possibly involving @mymacro)
+formatting.texi:32: @' expected braces (possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -149,11 +149,11 @@ formatting.texi:68: warning: @inforef is obsolete 
(possibly involving @mymacro)
 formatting.texi:68: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:68: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:68: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:68: @, expected braces (possibly involving @mymacro)
+formatting.texi:68: @, expected braces (possibly involving @mymacro)
 formatting.texi:68: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:68: @' expected braces (possibly involving @mymacro)
+formatting.texi:68: @' expected braces (possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -229,11 +229,11 @@ formatting.texi:73: warning: @inforef is obsolete 
(possibly involving @mymacro)
 formatting.texi:73: unmatched `@end' (possibly involving @mymacro)
 formatting.texi:73: unmatched `@end' (possibly involving @mymacro)
 formatting.texi:73: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:73: @, expected braces (possibly involving @mymacro)
+formatting.texi:73: @, expected braces (possibly involving @mymacro)
 formatting.texi:73: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:73: @' expected braces (possibly involving @mymacro)
+formatting.texi:73: @' expected braces (possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
diff --git a/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.2 
b/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.2
index d0e3f83329..cdcd0bed8f 100644
--- a/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.2
+++ b/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.2
@@ -14,11 +14,11 @@ formatting.texi:22: warning: @inforef is obsolete (possibly 
involving @mymacro)
 formatting.texi:22: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:22: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:22: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:22: @, expected braces (possibly involving @mymacro)
+formatting.texi:22: @, expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:22: @' expected braces (possibly involving @mymacro)
+formatting.texi:22: @' expected braces (possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -82,11 +82,11 @@ formatting.texi:32: warning: @inforef is obsolete (possibly 
involving @mymacro)
 formatting.texi:32: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:32: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:32: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:32: @, expected braces (possibly involving @mymacro)
+formatting.texi:32: @, expected braces (possibly involving @mymacro)
 formatting.texi:32: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:32: @' expected braces (possibly involving @mymacro)
+formatting.texi:32: @' expected braces (possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -149,11 +149,11 @@ formatting.texi:68: warning: @inforef is obsolete 
(possibly involving @mymacro)
 formatting.texi:68: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:68: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:68: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:68: @, expected braces (possibly involving @mymacro)
+formatting.texi:68: @, expected braces (possibly involving @mymacro)
 formatting.texi:68: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:68: @' expected braces (possibly involving @mymacro)
+formatting.texi:68: @' expected braces (possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -229,11 +229,11 @@ formatting.texi:73: warning: @inforef is obsolete 
(possibly involving @mymacro)
 formatting.texi:73: unmatched `@end' (possibly involving @mymacro)
 formatting.texi:73: unmatched `@end' (possibly involving @mymacro)
 formatting.texi:73: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:73: @, expected braces (possibly involving @mymacro)
+formatting.texi:73: @, expected braces (possibly involving @mymacro)
 formatting.texi:73: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:73: @' expected braces (possibly involving @mymacro)
+formatting.texi:73: @' expected braces (possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
diff --git a/tp/tests/layout/res_parser/formatting_xhtml/formatting.2 
b/tp/tests/layout/res_parser/formatting_xhtml/formatting.2
index d0e3f83329..cdcd0bed8f 100644
--- a/tp/tests/layout/res_parser/formatting_xhtml/formatting.2
+++ b/tp/tests/layout/res_parser/formatting_xhtml/formatting.2
@@ -14,11 +14,11 @@ formatting.texi:22: warning: @inforef is obsolete (possibly 
involving @mymacro)
 formatting.texi:22: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:22: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:22: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:22: @, expected braces (possibly involving @mymacro)
+formatting.texi:22: @, expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:22: @' expected braces (possibly involving @mymacro)
+formatting.texi:22: @' expected braces (possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -82,11 +82,11 @@ formatting.texi:32: warning: @inforef is obsolete (possibly 
involving @mymacro)
 formatting.texi:32: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:32: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:32: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:32: @, expected braces (possibly involving @mymacro)
+formatting.texi:32: @, expected braces (possibly involving @mymacro)
 formatting.texi:32: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:32: @' expected braces (possibly involving @mymacro)
+formatting.texi:32: @' expected braces (possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -149,11 +149,11 @@ formatting.texi:68: warning: @inforef is obsolete 
(possibly involving @mymacro)
 formatting.texi:68: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:68: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:68: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:68: @, expected braces (possibly involving @mymacro)
+formatting.texi:68: @, expected braces (possibly involving @mymacro)
 formatting.texi:68: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:68: @' expected braces (possibly involving @mymacro)
+formatting.texi:68: @' expected braces (possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -229,11 +229,11 @@ formatting.texi:73: warning: @inforef is obsolete 
(possibly involving @mymacro)
 formatting.texi:73: unmatched `@end' (possibly involving @mymacro)
 formatting.texi:73: unmatched `@end' (possibly involving @mymacro)
 formatting.texi:73: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:73: @, expected braces (possibly involving @mymacro)
+formatting.texi:73: @, expected braces (possibly involving @mymacro)
 formatting.texi:73: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:73: @' expected braces (possibly involving @mymacro)
+formatting.texi:73: @' expected braces (possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
diff --git a/tp/tests/layout/res_parser/formatting_xml/formatting.2 
b/tp/tests/layout/res_parser/formatting_xml/formatting.2
index 3f17f0456b..342f746753 100644
--- a/tp/tests/layout/res_parser/formatting_xml/formatting.2
+++ b/tp/tests/layout/res_parser/formatting_xml/formatting.2
@@ -14,11 +14,11 @@ formatting.texi:22: warning: @inforef is obsolete (possibly 
involving @mymacro)
 formatting.texi:22: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:22: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:22: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:22: @, expected braces (possibly involving @mymacro)
+formatting.texi:22: @, expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:22: @' expected braces (possibly involving @mymacro)
+formatting.texi:22: @' expected braces (possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -82,11 +82,11 @@ formatting.texi:32: warning: @inforef is obsolete (possibly 
involving @mymacro)
 formatting.texi:32: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:32: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:32: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:32: @, expected braces (possibly involving @mymacro)
+formatting.texi:32: @, expected braces (possibly involving @mymacro)
 formatting.texi:32: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:32: @' expected braces (possibly involving @mymacro)
+formatting.texi:32: @' expected braces (possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -149,11 +149,11 @@ formatting.texi:68: warning: @inforef is obsolete 
(possibly involving @mymacro)
 formatting.texi:68: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:68: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:68: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:68: @, expected braces (possibly involving @mymacro)
+formatting.texi:68: @, expected braces (possibly involving @mymacro)
 formatting.texi:68: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:68: @' expected braces (possibly involving @mymacro)
+formatting.texi:68: @' expected braces (possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -229,11 +229,11 @@ formatting.texi:73: warning: @inforef is obsolete 
(possibly involving @mymacro)
 formatting.texi:73: unmatched `@end' (possibly involving @mymacro)
 formatting.texi:73: unmatched `@end' (possibly involving @mymacro)
 formatting.texi:73: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:73: @, expected braces (possibly involving @mymacro)
+formatting.texi:73: @, expected braces (possibly involving @mymacro)
 formatting.texi:73: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:73: @' expected braces (possibly involving @mymacro)
+formatting.texi:73: @' expected braces (possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/formatting.2 
b/tp/tests/tex_html/res_parser/formatting_singular/formatting.2
index 9e3d041ed9..205df6ce60 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/formatting.2
+++ b/tp/tests/tex_html/res_parser/formatting_singular/formatting.2
@@ -14,11 +14,11 @@ formatting.texi:22: warning: @inforef is obsolete (possibly 
involving @mymacro)
 formatting.texi:22: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:22: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:22: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:22: @, expected braces (possibly involving @mymacro)
+formatting.texi:22: @, expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:22: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:22: @' expected braces (possibly involving @mymacro)
+formatting.texi:22: @' expected braces (possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:22: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -82,11 +82,11 @@ formatting.texi:32: warning: @inforef is obsolete (possibly 
involving @mymacro)
 formatting.texi:32: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:32: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:32: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:32: @, expected braces (possibly involving @mymacro)
+formatting.texi:32: @, expected braces (possibly involving @mymacro)
 formatting.texi:32: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:32: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:32: @' expected braces (possibly involving @mymacro)
+formatting.texi:32: @' expected braces (possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:32: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -149,11 +149,11 @@ formatting.texi:68: warning: @inforef is obsolete 
(possibly involving @mymacro)
 formatting.texi:68: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:68: warning: @inforef is obsolete (possibly involving @mymacro)
 formatting.texi:68: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:68: @, expected braces (possibly involving @mymacro)
+formatting.texi:68: @, expected braces (possibly involving @mymacro)
 formatting.texi:68: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:68: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:68: @' expected braces (possibly involving @mymacro)
+formatting.texi:68: @' expected braces (possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:68: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)
@@ -229,11 +229,11 @@ formatting.texi:73: warning: @inforef is obsolete 
(possibly involving @mymacro)
 formatting.texi:73: unmatched `@end' (possibly involving @mymacro)
 formatting.texi:73: unmatched `@end' (possibly involving @mymacro)
 formatting.texi:73: warning: command `@,' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @, 
(possibly involving @mymacro)
+formatting.texi:73: @, expected braces (possibly involving @mymacro)
+formatting.texi:73: @, expected braces (possibly involving @mymacro)
 formatting.texi:73: warning: command `@'' must not be followed by new line 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
-formatting.texi:73: use braces to give a command as an argument to @' 
(possibly involving @mymacro)
+formatting.texi:73: @' expected braces (possibly involving @mymacro)
+formatting.texi:73: @' expected braces (possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `truc' 
(possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `ij' 
(possibly involving @mymacro)
 formatting.texi:73: @dotless expects `i' or `j' as argument, not `--a' 
(possibly involving @mymacro)