[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: Handle different accent commands and brace comman
From: |
Patrice Dumas |
Subject: |
branch master updated: Handle different accent commands and brace commands more similarly |
Date: |
Sat, 27 Aug 2022 05:34:34 -0400 |
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 8013e0aeef Handle different accent commands and brace commands more
similarly
8013e0aeef is described below
commit 8013e0aeefc932d2783eac68a0e335aa9566990c
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Aug 27 11:34:20 2022 +0200
Handle different accent commands and brace commands more similarly
* tp/Texinfo/ParserNonXS.pm (_parse_texi),
tp/Texinfo/XS/parsetexi/parser.c(process_remaining_on_line): handle
accent commands more similarily to other brace commands, by treating
them the same when on @itemize line and ignoring spaces similarly.
Also treat accent commands with letters or one non letter character
more similarly, since TeX treat them the same too.
---
ChangeLog | 11 ++
tp/Texinfo/ParserNonXS.pm | 82 ++++-------
tp/Texinfo/XS/parsetexi/parser.c | 115 +++++++--------
tp/t/results/coverage/accents_errors.pl | 126 ++++++++++------
tp/t/results/coverage/commands.pl | 4 +-
.../results/coverage/lettered_accent_and_spaces.pl | 4 +-
tp/t/results/coverage/not_i_j_in_dotless.pl | 2 +-
.../coverage/spaces_after_braced_command.pl | 30 +++-
.../coverage_braces/no_brace_space_end_line.pl | 18 +++
tp/t/results/formats_encodings/accent.pl | 36 ++---
.../formats_encodings/accent_enable_encoding.pl | 18 +--
tp/t/results/formats_encodings/accentenc.pl | 36 ++---
.../formats_encodings/accentenc_enable_encoding.pl | 18 +--
tp/t/results/html_tests/itemize_arguments.pl | 32 +----
.../itemize_arguments/res_html/index.html | 4 +-
.../itemize_arguments_enable_encoding.pl | 32 +----
.../res_html/index.html | 4 +-
tp/t/results/itemize/accent_argument.pl | 23 +--
tp/t/results/itemize/empty_accent_argument.pl | 16 ++-
tp/t/results/macro/macro_in_accent.pl | 6 +-
tp/t/results/xtable/accent_on_table_line.pl | 16 +--
tp/tests/layout/res_parser/formatting/formatting.2 | 36 +++--
.../layout/res_parser/formatting/formatting.html | 28 ++--
.../layout/res_parser/formatting_chm/anchor.html | 2 -
.../layout/res_parser/formatting_chm/chapter.html | 16 +--
.../layout/res_parser/formatting_chm/chapter2.html | 2 -
.../layout/res_parser/formatting_chm/formatting.2 | 36 +++--
.../res_parser/formatting_chm/formatting.html | 14 +-
.../res_parser/formatting_chm/formatting_abt.html | 2 -
.../res_parser/formatting_chm/formatting_ovr.html | 2 -
.../res_parser/formatting_chm/formatting_toc.html | 2 -
.../layout/res_parser/formatting_chm/index.html | 2 -
.../formatting_chm/s_002d_002dect_002cion.html | 2 -
.../res_parser/formatting_chm/subsection.html | 2 -
...tion-_0060_0060simple_002ddouble_002d_002d.html | 2 -
...02d_002dfour_002d_002d_002d_002d_0027_0027.html | 2 -
.../res_parser/formatting_docbook/formatting.2 | 36 +++--
.../res_parser/formatting_docbook/formatting.xml | 8 --
.../formatting_enable_encoding/formatting.2 | 36 +++--
.../formatting_enable_encoding/formatting.html | 28 ++--
.../layout/res_parser/formatting_epub/formatting.2 | 36 +++--
.../EPUB/xhtml/chapter.xhtml | 16 +--
.../EPUB/xhtml/chapter2.xhtml | 2 -
.../EPUB/xhtml/formatting.xhtml | 14 +-
.../EPUB/xhtml/formatting_abt.xhtml | 2 -
.../EPUB/xhtml/formatting_fot.xhtml | 2 -
.../EPUB/xhtml/formatting_ovr.xhtml | 2 -
.../EPUB/xhtml/formatting_toc.xhtml | 2 -
.../res_parser/formatting_epub_nodes/formatting.2 | 36 +++--
.../EPUB/xhtml/chapter.xhtml | 16 +--
.../EPUB/xhtml/chapter2.xhtml | 2 -
.../EPUB/xhtml/formatting.xhtml | 14 +-
.../EPUB/xhtml/formatting_abt.xhtml | 2 -
.../EPUB/xhtml/formatting_fot.xhtml | 2 -
.../EPUB/xhtml/formatting_ovr.xhtml | 2 -
.../EPUB/xhtml/formatting_toc.xhtml | 2 -
.../EPUB/xhtml/s_002d_002dect_002cion.xhtml | 2 -
.../EPUB/xhtml/subsection.xhtml | 2 -
...ion-_0060_0060simple_002ddouble_002d_002d.xhtml | 2 -
...2d_002dfour_002d_002d_002d_002d_0027_0027.xhtml | 2 -
.../res_parser/formatting_exotic/anchor.html | 2 -
.../res_parser/formatting_exotic/chapter.html | 16 +--
.../res_parser/formatting_exotic/chapter2.html | 2 -
.../res_parser/formatting_exotic/formatting.2 | 36 +++--
.../formatting_exotic/formatting_abt.html | 2 -
.../formatting_exotic/formatting_ovr.html | 2 -
.../formatting_exotic/formatting_toc.html | 2 -
.../layout/res_parser/formatting_exotic/index.html | 2 -
.../formatting_exotic/s_002d_002dect_002cion.html | 2 -
.../res_parser/formatting_exotic/subsection.html | 2 -
...tion-_0060_0060simple_002ddouble_002d_002d.html | 2 -
...02d_002dfour_002d_002d_002d_002d_0027_0027.html | 2 -
.../res_parser/formatting_fr_icons/formatting.2 | 36 +++--
.../res_parser/formatting_fr_icons/formatting.html | 28 ++--
.../layout/res_parser/formatting_html/formatting.2 | 36 +++--
.../res_parser/formatting_html/formatting.html | 28 ++--
.../res_parser/formatting_html32/formatting.2 | 36 +++--
.../res_parser/formatting_html32/formatting.html | 28 ++--
.../formatting_html_no_texi2html/formatting.2 | 36 +++--
.../formatting_html_no_texi2html/formatting.html | 16 +--
.../res_parser/formatting_html_nodes/anchor.html | 2 -
.../res_parser/formatting_html_nodes/chapter.html | 16 +--
.../res_parser/formatting_html_nodes/chapter2.html | 2 -
.../res_parser/formatting_html_nodes/formatting.2 | 36 +++--
.../formatting_html_nodes/formatting_abt.html | 2 -
.../formatting_html_nodes/formatting_fot.html | 2 -
.../formatting_html_nodes/formatting_ovr.html | 2 -
.../formatting_html_nodes/formatting_toc.html | 2 -
.../res_parser/formatting_html_nodes/index.html | 14 +-
.../s_002d_002dect_002cion.html | 2 -
.../formatting_html_nodes/subsection.html | 2 -
...tion-_0060_0060simple_002ddouble_002d_002d.html | 2 -
...02d_002dfour_002d_002d_002d_002d_0027_0027.html | 2 -
.../layout/res_parser/formatting_info/formatting.2 | 36 +++--
.../res_parser/formatting_info/formatting.info | 158 ++++++++++-----------
.../res_parser/formatting_inline_css/formatting.2 | 36 +++--
.../formatting_inline_css/formatting.html | 28 ++--
.../res_parser/formatting_latex/formatting.2 | 36 +++--
.../res_parser/formatting_latex/formatting.tex | 30 ++--
.../formatting_macro_expand/formatting.2 | 36 +++--
.../res_parser/formatting_mathjax/formatting.2 | 36 +++--
.../res_parser/formatting_mathjax/formatting.html | 28 ++--
.../layout/res_parser/formatting_nodes/anchor.html | 2 -
.../res_parser/formatting_nodes/chapter.html | 16 +--
.../res_parser/formatting_nodes/chapter2.html | 2 -
.../res_parser/formatting_nodes/formatting.2 | 36 +++--
.../formatting_nodes/formatting_abt.html | 2 -
.../formatting_nodes/formatting_fot.html | 2 -
.../formatting_nodes/formatting_ovr.html | 2 -
.../formatting_nodes/formatting_toc.html | 2 -
.../layout/res_parser/formatting_nodes/index.html | 14 +-
.../formatting_nodes/s_002d_002dect_002cion.html | 2 -
.../res_parser/formatting_nodes/subsection.html | 2 -
...tion-_0060_0060simple_002ddouble_002d_002d.html | 2 -
...02d_002dfour_002d_002d_002d_002d_0027_0027.html | 2 -
.../formatting_numerical_entities/formatting.2 | 36 +++--
.../formatting_numerical_entities/formatting.html | 28 ++--
.../res_parser/formatting_plaintext/formatting.2 | 36 +++--
.../res_parser/formatting_plaintext/formatting.txt | 130 +++++++++--------
.../res_parser/formatting_rawtext/formatting.2 | 36 +++--
.../res_parser/formatting_rawtext/formatting.txt | 4 -
.../formatting_regions/formatting_regions.2 | 36 +++--
.../formatting_regions/formatting_regions.html | 28 ++--
.../res_parser/formatting_textcontent/formatting | 8 --
.../res_parser/formatting_textcontent/formatting.2 | 36 +++--
.../formatting_weird_quotes/formatting.2 | 36 +++--
.../formatting_weird_quotes/formatting.html | 28 ++--
.../res_parser/formatting_xhtml/formatting.2 | 36 +++--
.../res_parser/formatting_xhtml/formatting.html | 28 ++--
.../layout/res_parser/formatting_xml/formatting.2 | 36 +++--
.../res_parser/formatting_xml/formatting.xml | 24 ++--
.../res_parser/formatting_singular/anchor.html | 2 -
.../res_parser/formatting_singular/chapter.html | 16 +--
.../res_parser/formatting_singular/chapter2.html | 2 -
.../res_parser/formatting_singular/formatting.2 | 36 +++--
.../res_parser/formatting_singular/index.htm | 2 -
.../res_parser/formatting_singular/index.html | 2 -
.../s_002d_002dect_002cion.html | 2 -
.../res_parser/formatting_singular/sing_abt.htm | 2 -
.../res_parser/formatting_singular/sing_fot.htm | 2 -
.../res_parser/formatting_singular/sing_ovr.htm | 2 -
.../res_parser/formatting_singular/sing_toc.htm | 2 -
.../res_parser/formatting_singular/subsection.html | 2 -
...tion-_0060_0060simple_002ddouble_002d_002d.html | 2 -
...02d_002dfour_002d_002d_002d_002d_0027_0027.html | 2 -
145 files changed, 1376 insertions(+), 1229 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b346f8dace..cb7c3bdb95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2022-08-27 Patrice Dumas <pertusus@free.fr>
+
+ Handle different accent commands and brace commands more similarly
+
+ * tp/Texinfo/ParserNonXS.pm (_parse_texi),
+ tp/Texinfo/XS/parsetexi/parser.c(process_remaining_on_line): handle
+ accent commands more similarily to other brace commands, by treating
+ them the same when on @itemize line and ignoring spaces similarly.
+ Also treat accent commands with letters or one non letter character
+ more similarly, since TeX treat them the same too.
+
2022-08-27 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/ParserNonXS.pm (_parse_texi): set $command based on
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 61b469cd66..9d16b016e2 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -4214,28 +4214,29 @@ sub _parse_texi($$$)
and !$open_brace) {
print STDERR "BRACE command \@$current->{'cmdname'}, no brace\n"
if $self->{'DEBUG'};
+ # special case for @-command as argument of @itemize or @*table.
+ if (_command_with_command_as_argument($current->{'parent'})) {
+ print STDERR "FOR PARENT
\@$current->{'parent'}->{'parent'}->{'cmdname'} command_as_argument
$current->{'cmdname'}\n" if ($self->{'DEBUG'});
+ $current->{'type'} = 'command_as_argument' if (!$current->{'type'});
+ $current->{'parent'}->{'parent'}->{'extra'}->{'command_as_argument'}
+ = $current;
+ if ($current->{'cmdname'} eq 'kbd'
+ and _kbd_formatted_as_code($self,
$current->{'parent'}->{'parent'})) {
+
$current->{'parent'}->{'parent'}->{'extra'}->{'command_as_argument_kbd_code'} =
1;
+ }
+ $current = $current->{'parent'};
# now accent commands
- if ($accent_commands{$current->{'cmdname'}}) {
- # we should only warn for empty accent command. However, it is
- # already incorrect and warned just below, depending on the case
- #if (_command_with_command_as_argument($current->{'parent'})) {
- # $self->_command_warn($current, $source_info,
- # __("accent command `\@%s' not allowed as \@%s argument"),
- # $current->{'cmdname'},
- # $current->{'parent'}->{'parent'}->{'cmdname'});
- #}
+ } elsif ($accent_commands{$current->{'cmdname'}}) {
# Note that non ascii spaces do not count as spaces
- if ($line =~ /^[^\S\r\n]/) {
- if ($current->{'cmdname'} =~ /^[a-zA-Z]/) {
- $line =~ s/^([^\S\r\n]+)//;
- $current->{'extra'}->{'spaces'} = ''
- if (!defined($current->{'extra'}->{'spaces'}));
- $current->{'extra'}->{'spaces'} .= $1;
- } else {
+ if ($line =~ s/^(\s+)//) {
+ my $added_space = $1;
+ $current->{'extra'}->{'spaces'} = ''
+ if (!defined($current->{'extra'}->{'spaces'}));
+ $current->{'extra'}->{'spaces'} .= $added_space;
+ if ($added_space =~ /\n/) {
$self->_line_warn(sprintf(
- __("accent command `\@%s' must not be followed by whitespace"),
- $current->{'cmdname'}), $source_info);
- $current = $current->{'parent'};
+ __("command `\@%s' must not be followed by new line"),
+ $current->{'cmdname'}), $source_info);
}
} elsif ($line =~ /^\@/) {
$self->_line_error(sprintf(
@@ -4256,39 +4257,24 @@ sub _parse_texi($$$)
ord('@'), $current->{'cmdname'}, $1),
$source_info);
}
- if ($current->{'cmdname'} =~ /^[a-zA-Z]/) {
- $current->{'args'}->[-1]->{'type'} = 'space_command_arg';
- }
- $current = $current->{'parent'};
- } else { # The accent is at end of line
- # whitespace for commands with letter.
- print STDERR "STRANGE ACC \@$current->{'cmdname'}\n" if
($self->{'DEBUG'});
- $self->_line_warn(sprintf(
- __("accent command `\@%s' must not be followed by new line"),
- $current->{'cmdname'}), $source_info);
$current = $current->{'parent'};
}
next;
- # special case for @-command as argument of @itemize or @*table.
- } elsif (_command_with_command_as_argument($current->{'parent'})) {
- print STDERR "FOR PARENT
\@$current->{'parent'}->{'parent'}->{'cmdname'} command_as_argument
$current->{'cmdname'}\n" if ($self->{'DEBUG'});
- $current->{'type'} = 'command_as_argument' if (!$current->{'type'});
- $current->{'parent'}->{'parent'}->{'extra'}->{'command_as_argument'}
- = $current;
- if ($current->{'cmdname'} eq 'kbd'
- and _kbd_formatted_as_code($self,
$current->{'parent'}->{'parent'})) {
-
$current->{'parent'}->{'parent'}->{'extra'}->{'command_as_argument_kbd_code'} =
1;
- }
- $current = $current->{'parent'};
} else {
# ignore space after a braced @-command like TeX does
if ($self->{'IGNORE_SPACE_AFTER_BRACED_COMMAND_NAME'}
and $line =~ s/^(\s+)//) {
+ my $added_space = $1;
$current->{'extra'}->{'spaces'} = ''
if (!defined($current->{'extra'}->{'spaces'}));
- $current->{'extra'}->{'spaces'} .= $1;
- # FIXME temporary hack to get the same output as XS parser
- #$current->{'extra'}->{'spaces'} =~ s/\n\n/\n/;
+ $current->{'extra'}->{'spaces'} .= $added_space;
+ if ($added_space =~ /\n/) {
+ $self->_line_warn(sprintf(
+ __("command `\@%s' must not be followed by new line"),
+ $current->{'cmdname'}), $source_info);
+ # FIXME temporary hack to get the same output as XS parser
+ #$current->{'extra'}->{'spaces'} =~ s/\n\n/\n/;
+ }
next;
}
$self->_line_error(sprintf(__("\@%s expected braces"),
@@ -6878,16 +6864,10 @@ type.
=item following_arg
-This type is set for non-alphabetic accent @-commands that don't use braces
-but instead have their argument right after them, as
+This type is set for accent @-commands that don't use braces but instead
+have their argument after them, as
@~n
-
-=item space_command_arg
-
-This type is set for accent @-commands that don't use brace but instead
-have their argument after some space, as
-
@ringaccent A
=item definfoenclose_command
diff --git a/tp/Texinfo/XS/parsetexi/parser.c b/tp/Texinfo/XS/parsetexi/parser.c
index 4092ff898d..bd8bd66c75 100644
--- a/tp/Texinfo/XS/parsetexi/parser.c
+++ b/tp/Texinfo/XS/parsetexi/parser.c
@@ -1418,38 +1418,55 @@ superfluous_arg:
command container. */
else if (command_flags(current) & CF_brace && *line != '{')
{
- if (command_flags(current) & CF_accent)
+ if (command_with_command_as_argument (current->parent))
{
- if (strchr (whitespace_chars_except_newline, *line))
+ debug ("FOR PARENT @%s command_as_argument @%s",
+ command_name(current->parent->parent->cmd),
+ command_name(current->cmd));
+ if (!current->type)
+ current->type = ET_command_as_argument;
+ add_extra_element (current->parent->parent,
+ "command_as_argument", current);
+ if (current->cmd == CM_kbd
+ && kbd_formatted_as_code(current->parent->parent)) {
+ add_extra_integer (current->parent->parent,
+ "command_as_argument_kbd_code", 1);
+ }
+ current = current->parent;
+ }
+ else if (command_flags(current) & CF_accent)
+ {
+ if (strchr (whitespace_chars, *line))
{
- if (isalpha ((unsigned char) command_name(current->cmd)[0]))
- /* e.g. @dotaccent */
- {
- char *p; char *s;
- KEY_PAIR *k;
- p = line + strspn (line, whitespace_chars_except_newline);
- k = lookup_extra (current, "spaces");
- if (!k)
- {
- xasprintf (&s, "%.*s", (int) (p - line), line);
- add_extra_string (current, "spaces", s);
- }
- else
- {
- xasprintf (&s, "%s%.*s",
- (char *) k->value,
- (int) (p - line), p);
- free (k->value);
- k->value = (ELEMENT *) s;
- }
- line = p;
- }
- else
- {
- line_warn ("accent command `@%s' must not be followed "
- "by whitespace", command_name(current->cmd));
- current = current->parent;
- }
+ char *p; char *s;
+ int whitespaces_len;
+ KEY_PAIR *k;
+ whitespaces_len = strspn (line, whitespace_chars);
+ p = line + whitespaces_len;
+ k = lookup_extra (current, "spaces");
+ if (!k)
+ {
+ xasprintf (&s, "%.*s", (int) (p - line), line);
+ add_extra_string (current, "spaces", s);
+ }
+ else
+ {
+ xasprintf (&s, "%s%.*s",
+ (char *) k->value,
+ (int) (p - line), p);
+ free (k->value);
+ k->value = (ELEMENT *) s;
+ }
+ for (int i = 0; i < whitespaces_len; i++)
+ {
+ if (*(line + i) == '\n')
+ {
+ line_warn ("command `@%s' must not be followed by new
line",
+ command_name(current->cmd));
+ break;
+ }
+ }
+ line = p;
}
else if (*line == '@')
{
@@ -1473,45 +1490,22 @@ superfluous_arg:
line_error ("@dotless expects `i' or `j' as argument, "
"not `%c'", *line);
}
- if (isalpha ((unsigned char) command_name(current->cmd)[0]))
- e->type = ET_space_command_arg;
while (current->contents.number > 0)
destroy_element (pop_element_from_contents (current));
line++;
current = current->parent;
}
- else
- {
- debug ("STRANGE ACC");
- line_warn ("accent command `@%s' must not be followed by "
- "new line", command_name(current->cmd));
- current = current->parent;
- }
goto funexit;
}
- else if (command_with_command_as_argument (current->parent))
- {
- debug ("FOR PARENT @%s command_as_argument @%s",
- command_name(current->parent->parent->cmd),
- command_name(current->cmd));
- if (!current->type)
- current->type = ET_command_as_argument;
- add_extra_element (current->parent->parent,
- "command_as_argument", current);
- if (current->cmd == CM_kbd
- && kbd_formatted_as_code(current->parent->parent)) {
- add_extra_integer (current->parent->parent,
- "command_as_argument_kbd_code", 1);
- }
- current = current->parent;
- }
else
{
if (conf.ignore_space_after_braced_command_name)
{
char *p;
+ int whitespaces_len;
- p = line + strspn (line, whitespace_chars);
+ whitespaces_len = strspn (line, whitespace_chars);
+ p = line + whitespaces_len;
if (p != line)
{
char *s;
@@ -1531,6 +1525,15 @@ superfluous_arg:
free (k->value);
k->value = (ELEMENT *) s;
}
+ for (int i = 0; i < whitespaces_len; i++)
+ {
+ if (*(line + i) == '\n')
+ {
+ line_warn ("command `@%s' must not be followed by
new line",
+ command_name(current->cmd));
+ break;
+ }
+ }
line = p;
goto funexit;
}
diff --git a/tp/t/results/coverage/accents_errors.pl
b/tp/t/results/coverage/accents_errors.pl
index 25b942c50e..71d56709e7 100644
--- a/tp/t/results/coverage/accents_errors.pl
+++ b/tp/t/results/coverage/accents_errors.pl
@@ -16,8 +16,24 @@ $result_trees{'accents_errors'} = {
'text' => 'accent at end of line '
},
{
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'a'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'following_arg'
+ }
+ ],
'cmdname' => 'ringaccent',
'contents' => [],
+ 'extra' => {
+ 'spaces' => '
+'
+ },
'parent' => {},
'source_info' => {
'file_name' => '',
@@ -27,18 +43,26 @@ $result_trees{'accents_errors'} = {
},
{
'parent' => {},
- 'text' => '
-'
- },
- {
- 'parent' => {},
- 'text' => 'accent at end of line and spaces '
+ 'text' => 'ccent at end of line and spaces '
},
{
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'a'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'following_arg'
+ }
+ ],
'cmdname' => 'ringaccent',
'contents' => [],
'extra' => {
- 'spaces' => ' '
+ 'spaces' => '
+'
},
'parent' => {},
'source_info' => {
@@ -49,12 +73,7 @@ $result_trees{'accents_errors'} = {
},
{
'parent' => {},
- 'text' => '
-'
- },
- {
- 'parent' => {},
- 'text' => 'accent followed by '
+ 'text' => 'ccent followed by '
},
{
'cmdname' => '@',
@@ -100,8 +119,23 @@ $result_trees{'accents_errors'} = {
'text' => 'accent character with spaces '
},
{
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'f'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'following_arg'
+ }
+ ],
'cmdname' => '~',
'contents' => [],
+ 'extra' => {
+ 'spaces' => ' '
+ },
'parent' => {},
'source_info' => {
'file_name' => '',
@@ -111,7 +145,7 @@ $result_trees{'accents_errors'} = {
},
{
'parent' => {},
- 'text' => ' following.
+ 'text' => 'ollowing.
'
},
{
@@ -119,8 +153,24 @@ $result_trees{'accents_errors'} = {
'text' => 'accent character at end of line '
},
{
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'a'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'following_arg'
+ }
+ ],
'cmdname' => '~',
'contents' => [],
+ 'extra' => {
+ 'spaces' => '
+'
+ },
'parent' => {},
'source_info' => {
'file_name' => '',
@@ -130,12 +180,7 @@ $result_trees{'accents_errors'} = {
},
{
'parent' => {},
- 'text' => '
-'
- },
- {
- 'parent' => {},
- 'text' => 'accent character followed by '
+ 'text' => 'ccent character followed by '
},
{
'cmdname' => '@',
@@ -176,8 +221,12 @@ $result_trees{'accents_errors'} = {
'type' => 'document_root'
};
$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'accents_errors'}{'contents'}[0]{'contents'}[0];
+$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'accents_errors'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'accents_errors'}{'contents'}[0]{'contents'}[0];
$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
= $result_trees{'accents_errors'}{'contents'}[0]{'contents'}[0];
+$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
+$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
= $result_trees{'accents_errors'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
= $result_trees{'accents_errors'}{'contents'}[0]{'contents'}[0];
$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'parent'}
= $result_trees{'accents_errors'}{'contents'}[0]{'contents'}[0];
$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'parent'}
= $result_trees{'accents_errors'}{'contents'}[0]{'contents'}[0];
@@ -185,14 +234,16 @@
$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'pa
$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'parent'}
= $result_trees{'accents_errors'}{'contents'}[0]{'contents'}[0];
$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'parent'}
= $result_trees{'accents_errors'}{'contents'}[0]{'contents'}[0];
$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'parent'}
= $result_trees{'accents_errors'}{'contents'}[0]{'contents'}[0];
-$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[0]{'contents'}[10]{'parent'}
= $result_trees{'accents_errors'}{'contents'}[0]{'contents'}[0];
-$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[0]{'contents'}[11]{'parent'}
= $result_trees{'accents_errors'}{'contents'}[0]{'contents'}[0];
$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'accents_errors'}{'contents'}[0];
$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'accents_errors'}{'contents'}[0];
$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
= $result_trees{'accents_errors'}{'contents'}[0]{'contents'}[2];
+$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
+$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'accents_errors'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
= $result_trees{'accents_errors'}{'contents'}[0]{'contents'}[2];
$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
= $result_trees{'accents_errors'}{'contents'}[0]{'contents'}[2];
$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'parent'}
= $result_trees{'accents_errors'}{'contents'}[0]{'contents'}[2];
+$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0];
+$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'parent'}
= $result_trees{'accents_errors'}{'contents'}[0]{'contents'}[2]{'contents'}[4];
$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[2]{'contents'}[4]{'parent'}
= $result_trees{'accents_errors'}{'contents'}[0]{'contents'}[2];
$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[2]{'contents'}[5]{'parent'}
= $result_trees{'accents_errors'}{'contents'}[0]{'contents'}[2];
$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[2]{'contents'}[6]{'parent'}
= $result_trees{'accents_errors'}{'contents'}[0]{'contents'}[2];
@@ -200,7 +251,6 @@
$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[2]{'contents'}[7]{'pa
$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[2]{'contents'}[8]{'parent'}
= $result_trees{'accents_errors'}{'contents'}[0]{'contents'}[2];
$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[2]{'contents'}[9]{'parent'}
= $result_trees{'accents_errors'}{'contents'}[0]{'contents'}[2];
$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[2]{'contents'}[10]{'parent'}
= $result_trees{'accents_errors'}{'contents'}[0]{'contents'}[2];
-$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[2]{'contents'}[11]{'parent'}
= $result_trees{'accents_errors'}{'contents'}[0]{'contents'}[2];
$result_trees{'accents_errors'}{'contents'}[0]{'contents'}[2]{'parent'} =
$result_trees{'accents_errors'}{'contents'}[0];
$result_trees{'accents_errors'}{'contents'}[0]{'parent'} =
$result_trees{'accents_errors'};
@@ -214,32 +264,29 @@ accent character followed by @@ @~@.
';
-$result_texts{'accents_errors'} = 'accent at end of line *
-accent at end of line and spaces *
-accent followed by @ *.
+$result_texts{'accents_errors'} = 'accent at end of line a*ccent at end of
line and spaces a*ccent followed by @ *.
-accent character with spaces ~ following.
-accent character at end of line ~
-accent character followed by @ ~.
+accent character with spaces f~ollowing.
+accent character at end of line a~ccent character followed by @ ~.
';
$result_errors{'accents_errors'} = [
{
- 'error_line' => 'warning: accent command `@ringaccent\' must not be
followed by new line
+ 'error_line' => 'warning: command `@ringaccent\' must not be followed by
new line
',
'file_name' => '',
'line_nr' => 1,
'macro' => '',
- 'text' => 'accent command `@ringaccent\' must not be followed by new line',
+ 'text' => 'command `@ringaccent\' must not be followed by new line',
'type' => 'warning'
},
{
- 'error_line' => 'warning: accent command `@ringaccent\' must not be
followed by new line
+ 'error_line' => 'warning: command `@ringaccent\' must not be followed by
new line
',
'file_name' => '',
'line_nr' => 2,
'macro' => '',
- 'text' => 'accent command `@ringaccent\' must not be followed by new line',
+ 'text' => 'command `@ringaccent\' must not be followed by new line',
'type' => 'warning'
},
{
@@ -252,21 +299,12 @@ $result_errors{'accents_errors'} = [
'type' => 'error'
},
{
- 'error_line' => 'warning: accent command `@~\' must not be followed by
whitespace
-',
- 'file_name' => '',
- 'line_nr' => 5,
- 'macro' => '',
- 'text' => 'accent command `@~\' must not be followed by whitespace',
- 'type' => 'warning'
- },
- {
- 'error_line' => 'warning: accent command `@~\' must not be followed by new
line
+ 'error_line' => 'warning: command `@~\' must not be followed by new line
',
'file_name' => '',
'line_nr' => 6,
'macro' => '',
- 'text' => 'accent command `@~\' must not be followed by new line',
+ 'text' => 'command `@~\' must not be followed by new line',
'type' => 'warning'
},
{
diff --git a/tp/t/results/coverage/commands.pl
b/tp/t/results/coverage/commands.pl
index 77877683e4..7d7ea9a023 100644
--- a/tp/t/results/coverage/commands.pl
+++ b/tp/t/results/coverage/commands.pl
@@ -151,7 +151,7 @@ $result_trees{'commands'} = {
}
],
'parent' => {},
- 'type' => 'space_command_arg'
+ 'type' => 'following_arg'
}
],
'cmdname' => 'ringaccent',
@@ -603,7 +603,7 @@ $result_converted{'html_text'}->{'commands'} = '<p>@ TeX
ë î &a
';
-$result_converted{'xml'}->{'commands'} = '<para>&arobase; &tex; <spacecmd
type="nl"/><accent type="uml" bracketed="off">e</accent> <accent
type="circ"><dotless>i</dotless></accent> <accent type="tilde">a</accent>
<accent type="ring" spaces=" ">a</accent>
+$result_converted{'xml'}->{'commands'} = '<para>&arobase; &tex; <spacecmd
type="nl"/><accent type="uml" bracketed="off">e</accent> <accent
type="circ"><dotless>i</dotless></accent> <accent type="tilde">a</accent>
<accent type="ring" spaces=" " bracketed="off">a</accent>
</para>
<para><clicksequence>File <click command="arrow"/>
Open</clicksequence>&eosperiod;
<email><emailaddress>a</emailaddress><emailname spaces="
">b</emailname></email> <code>code --- -- \'\' ``</code>
diff --git a/tp/t/results/coverage/lettered_accent_and_spaces.pl
b/tp/t/results/coverage/lettered_accent_and_spaces.pl
index 0428060f96..3d2503cf16 100644
--- a/tp/t/results/coverage/lettered_accent_and_spaces.pl
+++ b/tp/t/results/coverage/lettered_accent_and_spaces.pl
@@ -21,7 +21,7 @@ $result_trees{'lettered_accent_and_spaces'} = {
}
],
'parent' => {},
- 'type' => 'space_command_arg'
+ 'type' => 'following_arg'
}
],
'cmdname' => 'ringaccent',
@@ -81,7 +81,7 @@
$result_converted{'html_text'}->{'lettered_accent_and_spaces'} = '<p>å
</p>';
-$result_converted{'xml'}->{'lettered_accent_and_spaces'} = '<para><accent
type="ring" spaces=" ">a</accent>
+$result_converted{'xml'}->{'lettered_accent_and_spaces'} = '<para><accent
type="ring" spaces=" " bracketed="off">a</accent>
</para>';
diff --git a/tp/t/results/coverage/not_i_j_in_dotless.pl
b/tp/t/results/coverage/not_i_j_in_dotless.pl
index 4c5cd4bd9e..683c92212a 100644
--- a/tp/t/results/coverage/not_i_j_in_dotless.pl
+++ b/tp/t/results/coverage/not_i_j_in_dotless.pl
@@ -21,7 +21,7 @@ $result_trees{'not_i_j_in_dotless'} = {
}
],
'parent' => {},
- 'type' => 'space_command_arg'
+ 'type' => 'following_arg'
}
],
'cmdname' => 'dotless',
diff --git a/tp/t/results/coverage/spaces_after_braced_command.pl
b/tp/t/results/coverage/spaces_after_braced_command.pl
index 354f25cb63..e4aca10515 100644
--- a/tp/t/results/coverage/spaces_after_braced_command.pl
+++ b/tp/t/results/coverage/spaces_after_braced_command.pl
@@ -168,7 +168,35 @@ v
TeX
';
-$result_errors{'spaces_after_braced_command'} = [];
+$result_errors{'spaces_after_braced_command'} = [
+ {
+ 'error_line' => 'warning: command `@samp\' must not be followed by new line
+',
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => '',
+ 'text' => 'command `@samp\' must not be followed by new line',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => 'warning: command `@TeX\' must not be followed by new line
+',
+ 'file_name' => '',
+ 'line_nr' => 6,
+ 'macro' => '',
+ 'text' => 'command `@TeX\' must not be followed by new line',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => 'warning: command `@TeX\' must not be followed by new line
+',
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => '',
+ 'text' => 'command `@TeX\' must not be followed by new line',
+ 'type' => 'warning'
+ }
+];
$result_floats{'spaces_after_braced_command'} = {};
diff --git a/tp/t/results/coverage_braces/no_brace_space_end_line.pl
b/tp/t/results/coverage_braces/no_brace_space_end_line.pl
index 4d958dae72..b72da30be5 100644
--- a/tp/t/results/coverage_braces/no_brace_space_end_line.pl
+++ b/tp/t/results/coverage_braces/no_brace_space_end_line.pl
@@ -128,6 +128,15 @@ TeXtext
Arg.';
$result_errors{'no_brace_space_end_line'} = [
+ {
+ 'error_line' => 'warning: command `@TeX\' must not be followed by new line
+',
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => '',
+ 'text' => 'command `@TeX\' must not be followed by new line',
+ 'type' => 'warning'
+ },
{
'error_line' => '@TeX expected braces
',
@@ -137,6 +146,15 @@ $result_errors{'no_brace_space_end_line'} = [
'text' => '@TeX expected braces',
'type' => 'error'
},
+ {
+ 'error_line' => 'warning: command `@code\' must not be followed by new line
+',
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => '',
+ 'text' => 'command `@code\' must not be followed by new line',
+ 'type' => 'warning'
+ },
{
'error_line' => '@code expected braces
',
diff --git a/tp/t/results/formats_encodings/accent.pl
b/tp/t/results/formats_encodings/accent.pl
index e8bf743438..618d40bf26 100644
--- a/tp/t/results/formats_encodings/accent.pl
+++ b/tp/t/results/formats_encodings/accent.pl
@@ -911,7 +911,7 @@ $result_trees{'accent'} = {
}
],
'parent' => {},
- 'type' => 'space_command_arg'
+ 'type' => 'following_arg'
}
],
'cmdname' => 'H',
@@ -983,7 +983,7 @@ $result_trees{'accent'} = {
}
],
'parent' => {},
- 'type' => 'space_command_arg'
+ 'type' => 'following_arg'
}
],
'cmdname' => 'dotaccent',
@@ -1055,7 +1055,7 @@ $result_trees{'accent'} = {
}
],
'parent' => {},
- 'type' => 'space_command_arg'
+ 'type' => 'following_arg'
}
],
'cmdname' => 'ringaccent',
@@ -1170,7 +1170,7 @@ $result_trees{'accent'} = {
}
],
'parent' => {},
- 'type' => 'space_command_arg'
+ 'type' => 'following_arg'
}
],
'cmdname' => 'u',
@@ -1242,7 +1242,7 @@ $result_trees{'accent'} = {
}
],
'parent' => {},
- 'type' => 'space_command_arg'
+ 'type' => 'following_arg'
}
],
'cmdname' => 'ubaraccent',
@@ -1314,7 +1314,7 @@ $result_trees{'accent'} = {
}
],
'parent' => {},
- 'type' => 'space_command_arg'
+ 'type' => 'following_arg'
}
],
'cmdname' => 'udotaccent',
@@ -1386,7 +1386,7 @@ $result_trees{'accent'} = {
}
],
'parent' => {},
- 'type' => 'space_command_arg'
+ 'type' => 'following_arg'
}
],
'cmdname' => 'v',
@@ -1458,7 +1458,7 @@ $result_trees{'accent'} = {
}
],
'parent' => {},
- 'type' => 'space_command_arg'
+ 'type' => 'following_arg'
}
],
'cmdname' => 'ogonek',
@@ -1530,7 +1530,7 @@ $result_trees{'accent'} = {
}
],
'parent' => {},
- 'type' => 'space_command_arg'
+ 'type' => 'following_arg'
}
],
'cmdname' => 'ogonek',
@@ -3359,25 +3359,25 @@ $result_converted{'xml'}->{'accent'} = '<node
name="Top-node" spaces=" "><nodena
</para>
<para>should be e=: <accent type="macr">e</accent> <accent type="macr"
bracketed="off">e</accent>
</para>
-<para>should be e<w>&textrsquo;</w>&textrsquo;: <accent
type="doubleacute">e</accent> <accent type="doubleacute" spaces=" ">e</accent>
+<para>should be e<w>&textrsquo;</w>&textrsquo;: <accent
type="doubleacute">e</accent> <accent type="doubleacute" spaces=" "
bracketed="off">e</accent>
</para>
-<para>should be e.: <accent type="dotaccent">e</accent> <accent
type="dotaccent" spaces=" ">e</accent>
+<para>should be e.: <accent type="dotaccent">e</accent> <accent
type="dotaccent" spaces=" " bracketed="off">e</accent>
</para>
-<para>should be e*: <accent type="ring">e</accent> <accent type="ring"
spaces=" ">e</accent>
+<para>should be e*: <accent type="ring">e</accent> <accent type="ring"
spaces=" " bracketed="off">e</accent>
</para>
<para>should be ee[: <accent type="tieaccent">ee</accent>
</para>
-<para>should be e(: <accent type="breve">e</accent> <accent type="breve"
spaces=" ">e</accent>
+<para>should be e(: <accent type="breve">e</accent> <accent type="breve"
spaces=" " bracketed="off">e</accent>
</para>
-<para>should be e_: <accent type="ubaraccent">e</accent> <accent
type="ubaraccent" spaces=" ">e</accent>
+<para>should be e_: <accent type="ubaraccent">e</accent> <accent
type="ubaraccent" spaces=" " bracketed="off">e</accent>
</para>
-<para>should be .e: <accent type="udotaccent">e</accent> <accent
type="udotaccent" spaces=" ">e</accent>
+<para>should be .e: <accent type="udotaccent">e</accent> <accent
type="udotaccent" spaces=" " bracketed="off">e</accent>
</para>
-<para>should be e<: <accent type="caron">e</accent> <accent type="caron"
spaces=" ">e</accent>
+<para>should be e<: <accent type="caron">e</accent> <accent type="caron"
spaces=" " bracketed="off">e</accent>
</para>
-<para>should be a; : <accent type="ogon">a</accent> <accent type="ogon"
spaces=" ">a</accent>
+<para>should be a; : <accent type="ogon">a</accent> <accent type="ogon"
spaces=" " bracketed="off">a</accent>
</para>
-<para>should be e; : <accent type="ogon">e</accent> <accent type="ogon"
spaces=" ">e</accent>
+<para>should be e; : <accent type="ogon">e</accent> <accent type="ogon"
spaces=" " bracketed="off">e</accent>
</para>
<para>upside down: ¿ ¡
</para>
diff --git a/tp/t/results/formats_encodings/accent_enable_encoding.pl
b/tp/t/results/formats_encodings/accent_enable_encoding.pl
index 68db41b004..d87346c84f 100644
--- a/tp/t/results/formats_encodings/accent_enable_encoding.pl
+++ b/tp/t/results/formats_encodings/accent_enable_encoding.pl
@@ -911,7 +911,7 @@ $result_trees{'accent_enable_encoding'} = {
}
],
'parent' => {},
- 'type' => 'space_command_arg'
+ 'type' => 'following_arg'
}
],
'cmdname' => 'H',
@@ -983,7 +983,7 @@ $result_trees{'accent_enable_encoding'} = {
}
],
'parent' => {},
- 'type' => 'space_command_arg'
+ 'type' => 'following_arg'
}
],
'cmdname' => 'dotaccent',
@@ -1055,7 +1055,7 @@ $result_trees{'accent_enable_encoding'} = {
}
],
'parent' => {},
- 'type' => 'space_command_arg'
+ 'type' => 'following_arg'
}
],
'cmdname' => 'ringaccent',
@@ -1170,7 +1170,7 @@ $result_trees{'accent_enable_encoding'} = {
}
],
'parent' => {},
- 'type' => 'space_command_arg'
+ 'type' => 'following_arg'
}
],
'cmdname' => 'u',
@@ -1242,7 +1242,7 @@ $result_trees{'accent_enable_encoding'} = {
}
],
'parent' => {},
- 'type' => 'space_command_arg'
+ 'type' => 'following_arg'
}
],
'cmdname' => 'ubaraccent',
@@ -1314,7 +1314,7 @@ $result_trees{'accent_enable_encoding'} = {
}
],
'parent' => {},
- 'type' => 'space_command_arg'
+ 'type' => 'following_arg'
}
],
'cmdname' => 'udotaccent',
@@ -1386,7 +1386,7 @@ $result_trees{'accent_enable_encoding'} = {
}
],
'parent' => {},
- 'type' => 'space_command_arg'
+ 'type' => 'following_arg'
}
],
'cmdname' => 'v',
@@ -1458,7 +1458,7 @@ $result_trees{'accent_enable_encoding'} = {
}
],
'parent' => {},
- 'type' => 'space_command_arg'
+ 'type' => 'following_arg'
}
],
'cmdname' => 'ogonek',
@@ -1530,7 +1530,7 @@ $result_trees{'accent_enable_encoding'} = {
}
],
'parent' => {},
- 'type' => 'space_command_arg'
+ 'type' => 'following_arg'
}
],
'cmdname' => 'ogonek',
diff --git a/tp/t/results/formats_encodings/accentenc.pl
b/tp/t/results/formats_encodings/accentenc.pl
index d746ffdfb4..5df0443d57 100644
--- a/tp/t/results/formats_encodings/accentenc.pl
+++ b/tp/t/results/formats_encodings/accentenc.pl
@@ -949,7 +949,7 @@ $result_trees{'accentenc'} = {
}
],
'parent' => {},
- 'type' => 'space_command_arg'
+ 'type' => 'following_arg'
}
],
'cmdname' => 'H',
@@ -1021,7 +1021,7 @@ $result_trees{'accentenc'} = {
}
],
'parent' => {},
- 'type' => 'space_command_arg'
+ 'type' => 'following_arg'
}
],
'cmdname' => 'dotaccent',
@@ -1093,7 +1093,7 @@ $result_trees{'accentenc'} = {
}
],
'parent' => {},
- 'type' => 'space_command_arg'
+ 'type' => 'following_arg'
}
],
'cmdname' => 'ringaccent',
@@ -1208,7 +1208,7 @@ $result_trees{'accentenc'} = {
}
],
'parent' => {},
- 'type' => 'space_command_arg'
+ 'type' => 'following_arg'
}
],
'cmdname' => 'u',
@@ -1280,7 +1280,7 @@ $result_trees{'accentenc'} = {
}
],
'parent' => {},
- 'type' => 'space_command_arg'
+ 'type' => 'following_arg'
}
],
'cmdname' => 'ubaraccent',
@@ -1352,7 +1352,7 @@ $result_trees{'accentenc'} = {
}
],
'parent' => {},
- 'type' => 'space_command_arg'
+ 'type' => 'following_arg'
}
],
'cmdname' => 'udotaccent',
@@ -1424,7 +1424,7 @@ $result_trees{'accentenc'} = {
}
],
'parent' => {},
- 'type' => 'space_command_arg'
+ 'type' => 'following_arg'
}
],
'cmdname' => 'v',
@@ -1496,7 +1496,7 @@ $result_trees{'accentenc'} = {
}
],
'parent' => {},
- 'type' => 'space_command_arg'
+ 'type' => 'following_arg'
}
],
'cmdname' => 'ogonek',
@@ -1568,7 +1568,7 @@ $result_trees{'accentenc'} = {
}
],
'parent' => {},
- 'type' => 'space_command_arg'
+ 'type' => 'following_arg'
}
],
'cmdname' => 'ogonek',
@@ -3407,25 +3407,25 @@ $result_converted{'xml'}->{'accentenc'} =
'<documentencoding encoding="ISO-8859-
</para>
<para>should be e=: <accent type="macr">e</accent> <accent type="macr"
bracketed="off">e</accent>
</para>
-<para>should be e<w>&textrsquo;</w>&textrsquo;: <accent
type="doubleacute">e</accent> <accent type="doubleacute" spaces=" ">e</accent>
+<para>should be e<w>&textrsquo;</w>&textrsquo;: <accent
type="doubleacute">e</accent> <accent type="doubleacute" spaces=" "
bracketed="off">e</accent>
</para>
-<para>should be e.: <accent type="dotaccent">e</accent> <accent
type="dotaccent" spaces=" ">e</accent>
+<para>should be e.: <accent type="dotaccent">e</accent> <accent
type="dotaccent" spaces=" " bracketed="off">e</accent>
</para>
-<para>should be e*: <accent type="ring">e</accent> <accent type="ring"
spaces=" ">e</accent>
+<para>should be e*: <accent type="ring">e</accent> <accent type="ring"
spaces=" " bracketed="off">e</accent>
</para>
<para>should be ee[: <accent type="tieaccent">ee</accent>
</para>
-<para>should be e(: <accent type="breve">e</accent> <accent type="breve"
spaces=" ">e</accent>
+<para>should be e(: <accent type="breve">e</accent> <accent type="breve"
spaces=" " bracketed="off">e</accent>
</para>
-<para>should be e_: <accent type="ubaraccent">e</accent> <accent
type="ubaraccent" spaces=" ">e</accent>
+<para>should be e_: <accent type="ubaraccent">e</accent> <accent
type="ubaraccent" spaces=" " bracketed="off">e</accent>
</para>
-<para>should be .e: <accent type="udotaccent">e</accent> <accent
type="udotaccent" spaces=" ">e</accent>
+<para>should be .e: <accent type="udotaccent">e</accent> <accent
type="udotaccent" spaces=" " bracketed="off">e</accent>
</para>
-<para>should be e<: <accent type="caron">e</accent> <accent type="caron"
spaces=" ">e</accent>
+<para>should be e<: <accent type="caron">e</accent> <accent type="caron"
spaces=" " bracketed="off">e</accent>
</para>
-<para>should be a; : <accent type="ogon">a</accent> <accent type="ogon"
spaces=" ">a</accent>
+<para>should be a; : <accent type="ogon">a</accent> <accent type="ogon"
spaces=" " bracketed="off">a</accent>
</para>
-<para>should be e; : <accent type="ogon">e</accent> <accent type="ogon"
spaces=" ">e</accent>
+<para>should be e; : <accent type="ogon">e</accent> <accent type="ogon"
spaces=" " bracketed="off">e</accent>
</para>
<para>upside down: ¿ ¡
</para>
diff --git a/tp/t/results/formats_encodings/accentenc_enable_encoding.pl
b/tp/t/results/formats_encodings/accentenc_enable_encoding.pl
index 6b6b8ad37e..d85f9427b7 100644
--- a/tp/t/results/formats_encodings/accentenc_enable_encoding.pl
+++ b/tp/t/results/formats_encodings/accentenc_enable_encoding.pl
@@ -943,7 +943,7 @@ $result_trees{'accentenc_enable_encoding'} = {
}
],
'parent' => {},
- 'type' => 'space_command_arg'
+ 'type' => 'following_arg'
}
],
'cmdname' => 'H',
@@ -1015,7 +1015,7 @@ $result_trees{'accentenc_enable_encoding'} = {
}
],
'parent' => {},
- 'type' => 'space_command_arg'
+ 'type' => 'following_arg'
}
],
'cmdname' => 'dotaccent',
@@ -1087,7 +1087,7 @@ $result_trees{'accentenc_enable_encoding'} = {
}
],
'parent' => {},
- 'type' => 'space_command_arg'
+ 'type' => 'following_arg'
}
],
'cmdname' => 'ringaccent',
@@ -1202,7 +1202,7 @@ $result_trees{'accentenc_enable_encoding'} = {
}
],
'parent' => {},
- 'type' => 'space_command_arg'
+ 'type' => 'following_arg'
}
],
'cmdname' => 'u',
@@ -1274,7 +1274,7 @@ $result_trees{'accentenc_enable_encoding'} = {
}
],
'parent' => {},
- 'type' => 'space_command_arg'
+ 'type' => 'following_arg'
}
],
'cmdname' => 'ubaraccent',
@@ -1346,7 +1346,7 @@ $result_trees{'accentenc_enable_encoding'} = {
}
],
'parent' => {},
- 'type' => 'space_command_arg'
+ 'type' => 'following_arg'
}
],
'cmdname' => 'udotaccent',
@@ -1418,7 +1418,7 @@ $result_trees{'accentenc_enable_encoding'} = {
}
],
'parent' => {},
- 'type' => 'space_command_arg'
+ 'type' => 'following_arg'
}
],
'cmdname' => 'v',
@@ -1490,7 +1490,7 @@ $result_trees{'accentenc_enable_encoding'} = {
}
],
'parent' => {},
- 'type' => 'space_command_arg'
+ 'type' => 'following_arg'
}
],
'cmdname' => 'ogonek',
@@ -1562,7 +1562,7 @@ $result_trees{'accentenc_enable_encoding'} = {
}
],
'parent' => {},
- 'type' => 'space_command_arg'
+ 'type' => 'following_arg'
}
],
'cmdname' => 'ogonek',
diff --git a/tp/t/results/html_tests/itemize_arguments.pl
b/tp/t/results/html_tests/itemize_arguments.pl
index 4a32e0a69c..0ce2d0af4a 100644
--- a/tp/t/results/html_tests/itemize_arguments.pl
+++ b/tp/t/results/html_tests/itemize_arguments.pl
@@ -2192,18 +2192,6 @@ $result_trees{'itemize_arguments'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'e'
- }
- ],
- 'parent' => {},
- 'type' => 'following_arg'
- }
- ],
'cmdname' => '^',
'contents' => [],
'parent' => {},
@@ -2215,7 +2203,7 @@ $result_trees{'itemize_arguments'} = {
},
{
'parent' => {},
- 'text' => ' '
+ 'text' => 'e '
},
{
'args' => [
@@ -2417,18 +2405,6 @@ $result_trees{'itemize_arguments'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'E'
- }
- ],
- 'parent' => {},
- 'type' => 'following_arg'
- }
- ],
'cmdname' => '^',
'contents' => [],
'parent' => {},
@@ -2440,7 +2416,7 @@ $result_trees{'itemize_arguments'} = {
},
{
'parent' => {},
- 'text' => ' '
+ 'text' => 'E '
},
{
'args' => [
@@ -5333,8 +5309,6 @@
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[36]{'contents'}[1]
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[36]{'extra'}{'end_command'}
=
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[36]{'contents'}[1];
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[36]{'parent'} =
$result_trees{'itemize_arguments'}{'contents'}[0];
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[37]{'parent'} =
$result_trees{'itemize_arguments'}{'contents'}[0];
-$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[38]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[38]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[38]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[38]{'args'}[0]{'contents'}[0];
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[38]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[38]{'args'}[0];
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[38]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[38]{'args'}[0];
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[38]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[38]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -5362,8 +5336,6 @@
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[38]{'contents'}[1]
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[38]{'extra'}{'end_command'}
=
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[38]{'contents'}[1];
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[38]{'parent'} =
$result_trees{'itemize_arguments'}{'contents'}[0];
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[39]{'parent'} =
$result_trees{'itemize_arguments'}{'contents'}[0];
-$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[40]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[40]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[40]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[40]{'args'}[0]{'contents'}[0];
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[40]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[40]{'args'}[0];
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[40]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[40]{'args'}[0];
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[40]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[40]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
diff --git a/tp/t/results/html_tests/itemize_arguments/res_html/index.html
b/tp/t/results/html_tests/itemize_arguments/res_html/index.html
index 98ccc2a3f5..16806829ad 100644
--- a/tp/t/results/html_tests/itemize_arguments/res_html/index.html
+++ b/tp/t/results/html_tests/itemize_arguments/res_html/index.html
@@ -99,11 +99,11 @@ ul.mark-tie {list-style-type: " "}
<li>item dots <small class="enddots">...</small> a
</li></ul>
-<ul class="itemize" style="list-style-type: '\00EA \00CA '">
+<ul class="itemize" style="list-style-type: '\0302 e \00CA '">
<li>item e ê <small class="sc">Ê</small>
</li></ul>
-<ul class="itemize" style="list-style-type: '\00CA \00CA '">
+<ul class="itemize" style="list-style-type: '\0302 E \00CA '">
<li>item E Ê <small class="sc">Ê</small>
</li></ul>
diff --git a/tp/t/results/html_tests/itemize_arguments_enable_encoding.pl
b/tp/t/results/html_tests/itemize_arguments_enable_encoding.pl
index 73c6d06995..c550d065da 100644
--- a/tp/t/results/html_tests/itemize_arguments_enable_encoding.pl
+++ b/tp/t/results/html_tests/itemize_arguments_enable_encoding.pl
@@ -2192,18 +2192,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'e'
- }
- ],
- 'parent' => {},
- 'type' => 'following_arg'
- }
- ],
'cmdname' => '^',
'contents' => [],
'parent' => {},
@@ -2215,7 +2203,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
},
{
'parent' => {},
- 'text' => ' '
+ 'text' => 'e '
},
{
'args' => [
@@ -2417,18 +2405,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'E'
- }
- ],
- 'parent' => {},
- 'type' => 'following_arg'
- }
- ],
'cmdname' => '^',
'contents' => [],
'parent' => {},
@@ -2440,7 +2416,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
},
{
'parent' => {},
- 'text' => ' '
+ 'text' => 'E '
},
{
'args' => [
@@ -5333,8 +5309,6 @@
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[36
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[36]{'extra'}{'end_command'}
=
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[36]{'contents'}[1];
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[36]{'parent'}
= $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[37]{'parent'}
= $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
-$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[38]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[38]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[38]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[38]{'args'}[0]{'contents'}[0];
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[38]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[38]{'args'}[0];
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[38]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[38]{'args'}[0];
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[38]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[38]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -5362,8 +5336,6 @@
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[38
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[38]{'extra'}{'end_command'}
=
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[38]{'contents'}[1];
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[38]{'parent'}
= $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[39]{'parent'}
= $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
-$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[40]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[40]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[40]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[40]{'args'}[0]{'contents'}[0];
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[40]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[40]{'args'}[0];
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[40]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[40]{'args'}[0];
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[40]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[40]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
diff --git
a/tp/t/results/html_tests/itemize_arguments_enable_encoding/res_html/index.html
b/tp/t/results/html_tests/itemize_arguments_enable_encoding/res_html/index.html
index 5ef97c776a..ccfa956793 100644
---
a/tp/t/results/html_tests/itemize_arguments_enable_encoding/res_html/index.html
+++
b/tp/t/results/html_tests/itemize_arguments_enable_encoding/res_html/index.html
@@ -99,11 +99,11 @@ ul.mark-tie {list-style-type: " "}
<li>item dots <small class="enddots">...</small> a
</li></ul>
-<ul class="itemize" style="list-style-type: 'ê Ê'">
+<ul class="itemize" style="list-style-type: '̂e Ê'">
<li>item e ê <small class="sc">Ê</small>
</li></ul>
-<ul class="itemize" style="list-style-type: 'Ê Ê'">
+<ul class="itemize" style="list-style-type: '̂E Ê'">
<li>item E Ê <small class="sc">Ê</small>
</li></ul>
diff --git a/tp/t/results/itemize/accent_argument.pl
b/tp/t/results/itemize/accent_argument.pl
index a05506dc88..6c6e28645f 100644
--- a/tp/t/results/itemize/accent_argument.pl
+++ b/tp/t/results/itemize/accent_argument.pl
@@ -14,18 +14,6 @@ $result_trees{'accent_argument'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'e'
- }
- ],
- 'parent' => {},
- 'type' => 'following_arg'
- }
- ],
'cmdname' => '~',
'contents' => [],
'parent' => {},
@@ -34,6 +22,10 @@ $result_trees{'accent_argument'} = {
'line_nr' => 1,
'macro' => ''
}
+ },
+ {
+ 'parent' => {},
+ 'text' => 'e'
}
],
'extra' => {
@@ -232,9 +224,8 @@ $result_trees{'accent_argument'} = {
],
'type' => 'document_root'
};
-$result_trees{'accent_argument'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'accent_argument'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'accent_argument'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'accent_argument'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'accent_argument'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'accent_argument'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'accent_argument'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'accent_argument'}{'contents'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'accent_argument'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'accent_argument'}{'contents'}[0]{'contents'}[0];
$result_trees{'accent_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'accent_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'accent_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'accent_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
@@ -281,13 +272,13 @@ $result_floats{'accent_argument'} = {};
-$result_converted{'plaintext'}->{'accent_argument'} = ' ẽ item
+$result_converted{'plaintext'}->{'accent_argument'} = ' ̃e item
ẽ item
';
-$result_converted{'html_text'}->{'accent_argument'} = '<ul class="itemize"
style="list-style-type: \'\\1EBD \'">
+$result_converted{'html_text'}->{'accent_argument'} = '<ul class="itemize"
style="list-style-type: \'\\0303 e\'">
<li>item
</li></ul>
diff --git a/tp/t/results/itemize/empty_accent_argument.pl
b/tp/t/results/itemize/empty_accent_argument.pl
index b1d9e4627a..db2a56b56c 100644
--- a/tp/t/results/itemize/empty_accent_argument.pl
+++ b/tp/t/results/itemize/empty_accent_argument.pl
@@ -21,7 +21,8 @@ $result_trees{'empty_accent_argument'} = {
'file_name' => '',
'line_nr' => 1,
'macro' => ''
- }
+ },
+ 'type' => 'command_as_argument'
}
],
'extra' => {
@@ -136,7 +137,8 @@ $result_trees{'empty_accent_argument'} = {
'file_name' => '',
'line_nr' => 5,
'macro' => ''
- }
+ },
+ 'type' => 'command_as_argument'
}
],
'extra' => {
@@ -391,21 +393,21 @@ item
$result_errors{'empty_accent_argument'} = [
{
- 'error_line' => 'use braces to give a command as an argument to @~
+ 'error_line' => 'warning: accent command `@~\' not allowed as @itemize
argument
',
'file_name' => '',
'line_nr' => 1,
'macro' => '',
- 'text' => 'use braces to give a command as an argument to @~',
- 'type' => 'error'
+ 'text' => 'accent command `@~\' not allowed as @itemize argument',
+ 'type' => 'warning'
},
{
- 'error_line' => 'warning: accent command `@~\' must not be followed by new
line
+ 'error_line' => 'warning: accent command `@~\' not allowed as @itemize
argument
',
'file_name' => '',
'line_nr' => 5,
'macro' => '',
- 'text' => 'accent command `@~\' must not be followed by new line',
+ 'text' => 'accent command `@~\' not allowed as @itemize argument',
'type' => 'warning'
},
{
diff --git a/tp/t/results/macro/macro_in_accent.pl
b/tp/t/results/macro/macro_in_accent.pl
index b3a2fa57f9..8bc96bd0e8 100644
--- a/tp/t/results/macro/macro_in_accent.pl
+++ b/tp/t/results/macro/macro_in_accent.pl
@@ -111,7 +111,7 @@ $result_trees{'macro_in_accent'} = {
}
],
'parent' => {},
- 'type' => 'space_command_arg'
+ 'type' => 'following_arg'
}
],
'cmdname' => 'ringaccent',
@@ -141,7 +141,7 @@ $result_trees{'macro_in_accent'} = {
}
],
'parent' => {},
- 'type' => 'space_command_arg'
+ 'type' => 'following_arg'
}
],
'cmdname' => 'ringaccent',
@@ -234,7 +234,7 @@ $result_trees{'macro_in_accent'} = {
}
],
'parent' => {},
- 'type' => 'space_command_arg'
+ 'type' => 'following_arg'
}
],
'cmdname' => 'ringaccent',
diff --git a/tp/t/results/xtable/accent_on_table_line.pl
b/tp/t/results/xtable/accent_on_table_line.pl
index 0556249b18..aad2df401a 100644
--- a/tp/t/results/xtable/accent_on_table_line.pl
+++ b/tp/t/results/xtable/accent_on_table_line.pl
@@ -27,7 +27,8 @@ $result_trees{'accent_on_table_line'} = {
'file_name' => '',
'line_nr' => 1,
'macro' => ''
- }
+ },
+ 'type' => 'command_as_argument'
}
],
'extra' => {
@@ -451,23 +452,14 @@ no at-command code acc brace
$result_errors{'accent_on_table_line'} = [
{
- 'error_line' => 'warning: accent command `@~\' must not be followed by new
line
+ 'error_line' => 'warning: accent command `@~\' not allowed as @table
argument
',
'file_name' => '',
'line_nr' => 1,
'macro' => '',
- 'text' => 'accent command `@~\' must not be followed by new line',
+ 'text' => 'accent command `@~\' not allowed as @table argument',
'type' => 'warning'
},
- {
- 'error_line' => 'table requires an argument: the formatter for @item
-',
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => '',
- 'text' => 'table requires an argument: the formatter for @item',
- 'type' => 'error'
- },
{
'error_line' => 'warning: accent command `@~\' not allowed as @table
argument
',
diff --git a/tp/tests/layout/res_parser/formatting/formatting.2
b/tp/tests/layout/res_parser/formatting/formatting.2
index 20af48db6b..d0e3f83329 100644
--- a/tp/tests/layout/res_parser/formatting/formatting.2
+++ b/tp/tests/layout/res_parser/formatting/formatting.2
@@ -13,20 +13,25 @@ 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: @inforef is obsolete (possibly involving @mymacro)
-formatting.texi:22: warning: accent command `@,' must not be followed by new
line (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: warning: accent 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: 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: @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)
formatting.texi:22: @dotless expects `i' or `j' as argument, not `a' (possibly
involving @mymacro)
+formatting.texi:22: warning: command `@U' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:22: @U expected braces (possibly involving @mymacro)
formatting.texi:22: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:22: non-hex digits in argument for @U: z (possibly involving
@mymacro)
formatting.texi:22: warning: fewer than four hex digits in argument for @U:
abc (possibly involving @mymacro)
formatting.texi:22: argument for @U exceeds Unicode maximum 0x10FFFF:
FFFFFFFFFFFFFF (possibly involving @mymacro)
formatting.texi:22: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
(possibly involving @mymacro)
+formatting.texi:22: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
+formatting.texi:22: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:22: @TeX expected braces (possibly involving @mymacro)
formatting.texi:22: unexpected @ (possibly involving @mymacro)
formatting.texi:22: @image missing filename argument (possibly involving
@mymacro)
@@ -76,20 +81,25 @@ 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: @inforef is obsolete (possibly involving @mymacro)
-formatting.texi:32: warning: accent command `@,' must not be followed by new
line (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: warning: accent 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: 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: @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)
formatting.texi:32: @dotless expects `i' or `j' as argument, not `a' (possibly
involving @mymacro)
+formatting.texi:32: warning: command `@U' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:32: @U expected braces (possibly involving @mymacro)
formatting.texi:32: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:32: non-hex digits in argument for @U: z (possibly involving
@mymacro)
formatting.texi:32: warning: fewer than four hex digits in argument for @U:
abc (possibly involving @mymacro)
formatting.texi:32: argument for @U exceeds Unicode maximum 0x10FFFF:
FFFFFFFFFFFFFF (possibly involving @mymacro)
formatting.texi:32: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
(possibly involving @mymacro)
+formatting.texi:32: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
+formatting.texi:32: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:32: @TeX expected braces (possibly involving @mymacro)
formatting.texi:32: unexpected @ (possibly involving @mymacro)
formatting.texi:32: @image missing filename argument (possibly involving
@mymacro)
@@ -138,20 +148,25 @@ 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: @inforef is obsolete (possibly involving @mymacro)
-formatting.texi:68: warning: accent command `@,' must not be followed by new
line (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: warning: accent 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: 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: @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)
formatting.texi:68: @dotless expects `i' or `j' as argument, not `a' (possibly
involving @mymacro)
+formatting.texi:68: warning: command `@U' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:68: @U expected braces (possibly involving @mymacro)
formatting.texi:68: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:68: non-hex digits in argument for @U: z (possibly involving
@mymacro)
formatting.texi:68: warning: fewer than four hex digits in argument for @U:
abc (possibly involving @mymacro)
formatting.texi:68: argument for @U exceeds Unicode maximum 0x10FFFF:
FFFFFFFFFFFFFF (possibly involving @mymacro)
formatting.texi:68: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
(possibly involving @mymacro)
+formatting.texi:68: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
+formatting.texi:68: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:68: @TeX expected braces (possibly involving @mymacro)
formatting.texi:68: unexpected @ (possibly involving @mymacro)
formatting.texi:68: @image missing filename argument (possibly involving
@mymacro)
@@ -213,20 +228,25 @@ formatting.texi:73: warning: @inforef is obsolete
(possibly involving @mymacro)
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: accent command `@,' must not be followed by new
line (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: warning: accent 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: 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: @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)
formatting.texi:73: @dotless expects `i' or `j' as argument, not `a' (possibly
involving @mymacro)
+formatting.texi:73: warning: command `@U' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:73: @U expected braces (possibly involving @mymacro)
formatting.texi:73: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:73: non-hex digits in argument for @U: z (possibly involving
@mymacro)
formatting.texi:73: warning: fewer than four hex digits in argument for @U:
abc (possibly involving @mymacro)
formatting.texi:73: argument for @U exceeds Unicode maximum 0x10FFFF:
FFFFFFFFFFFFFF (possibly involving @mymacro)
formatting.texi:73: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
(possibly involving @mymacro)
+formatting.texi:73: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
+formatting.texi:73: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:73: @TeX expected braces (possibly involving @mymacro)
formatting.texi:73: unexpected @ (possibly involving @mymacro)
formatting.texi:73: @image missing filename argument (possibly involving
@mymacro)
diff --git a/tp/tests/layout/res_parser/formatting/formatting.html
b/tp/tests/layout/res_parser/formatting/formatting.html
index 4de62f9992..d6cb2d9744 100644
--- a/tp/tests/layout/res_parser/formatting/formatting.html
+++ b/tp/tests/layout/res_parser/formatting/formatting.html
@@ -703,14 +703,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
@@ -1813,13 +1811,11 @@ html ''
<p>Somehow invalid use of @,:<br>
-@, ̧
-<br>
+@, ̧<br>
@,@"u ̧ü
</p>
<p>Invalid use of @’:<br>
-@’ ́
-<br>
+@’ ́<br>
@’@"u ́ü
</p>
<p><code class="code">@|</code>
@@ -2891,13 +2887,11 @@ html ''
<p>Somehow invalid use of @,:<br>
-@, ̧
-<br>
+@, ̧<br>
@,@"u ̧ü
</p>
<p>Invalid use of @’:<br>
-@’ ́
-<br>
+@’ ́<br>
@’@"u ́ü
</p>
<p><code class="code">@|</code>
@@ -4025,13 +4019,11 @@ html ''
<p>Somehow invalid use of @,:<br>
-@, ̧
-<br>
+@, ̧<br>
@,@"u ̧ü
</p>
<p>Invalid use of @’:<br>
-@’ ́
-<br>
+@’ ́<br>
@’@"u ́ü
</p>
<p><code class="code">@|</code>
@@ -5101,13 +5093,11 @@ html ''
<p>Somehow invalid use of @,:<br>
-@, ̧
-<br>
+@, ̧<br>
@,@"u ̧ü
</p>
<p>Invalid use of @’:<br>
-@’ ́
-<br>
+@’ ́<br>
@’@"u ́ü
</p>
<p><code class="code">@|</code>
@@ -6318,14 +6308,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
<code class="code">@|</code>
diff --git a/tp/tests/layout/res_parser/formatting_chm/anchor.html
b/tp/tests/layout/res_parser/formatting_chm/anchor.html
index 1e74500169..fe0aec441e 100644
--- a/tp/tests/layout/res_parser/formatting_chm/anchor.html
+++ b/tp/tests/layout/res_parser/formatting_chm/anchor.html
@@ -704,14 +704,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
diff --git a/tp/tests/layout/res_parser/formatting_chm/chapter.html
b/tp/tests/layout/res_parser/formatting_chm/chapter.html
index 428d3cc2e8..bbdd640b5e 100644
--- a/tp/tests/layout/res_parser/formatting_chm/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_chm/chapter.html
@@ -703,14 +703,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
@@ -1809,13 +1807,11 @@ html ''
<p>Somehow invalid use of @,:<br>
-@, ̧
-<br>
+@, ̧<br>
@,@"u ̧ü
</p>
<p>Invalid use of @’:<br>
-@’ ́
-<br>
+@’ ́<br>
@’@"u ́ü
</p>
<p><code class="code">@|</code>
@@ -2885,13 +2881,11 @@ html ''
<p>Somehow invalid use of @,:<br>
-@, ̧
-<br>
+@, ̧<br>
@,@"u ̧ü
</p>
<p>Invalid use of @’:<br>
-@’ ́
-<br>
+@’ ́<br>
@’@"u ́ü
</p>
<p><code class="code">@|</code>
@@ -4102,14 +4096,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
<code class="code">@|</code>
diff --git a/tp/tests/layout/res_parser/formatting_chm/chapter2.html
b/tp/tests/layout/res_parser/formatting_chm/chapter2.html
index a44c5e8986..6aecca5ed0 100644
--- a/tp/tests/layout/res_parser/formatting_chm/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_chm/chapter2.html
@@ -703,14 +703,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting.2
b/tp/tests/layout/res_parser/formatting_chm/formatting.2
index 1c84449a8a..5ffd2a596c 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting.2
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting.2
@@ -13,20 +13,25 @@ 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: @inforef is obsolete (possibly involving @mymacro)
-formatting.texi:22: warning: accent command `@,' must not be followed by new
line (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: warning: accent 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: 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: @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)
formatting.texi:22: @dotless expects `i' or `j' as argument, not `a' (possibly
involving @mymacro)
+formatting.texi:22: warning: command `@U' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:22: @U expected braces (possibly involving @mymacro)
formatting.texi:22: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:22: non-hex digits in argument for @U: z (possibly involving
@mymacro)
formatting.texi:22: warning: fewer than four hex digits in argument for @U:
abc (possibly involving @mymacro)
formatting.texi:22: argument for @U exceeds Unicode maximum 0x10FFFF:
FFFFFFFFFFFFFF (possibly involving @mymacro)
formatting.texi:22: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
(possibly involving @mymacro)
+formatting.texi:22: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
+formatting.texi:22: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:22: @TeX expected braces (possibly involving @mymacro)
formatting.texi:22: unexpected @ (possibly involving @mymacro)
formatting.texi:22: @image missing filename argument (possibly involving
@mymacro)
@@ -76,20 +81,25 @@ 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: @inforef is obsolete (possibly involving @mymacro)
-formatting.texi:32: warning: accent command `@,' must not be followed by new
line (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: warning: accent 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: 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: @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)
formatting.texi:32: @dotless expects `i' or `j' as argument, not `a' (possibly
involving @mymacro)
+formatting.texi:32: warning: command `@U' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:32: @U expected braces (possibly involving @mymacro)
formatting.texi:32: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:32: non-hex digits in argument for @U: z (possibly involving
@mymacro)
formatting.texi:32: warning: fewer than four hex digits in argument for @U:
abc (possibly involving @mymacro)
formatting.texi:32: argument for @U exceeds Unicode maximum 0x10FFFF:
FFFFFFFFFFFFFF (possibly involving @mymacro)
formatting.texi:32: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
(possibly involving @mymacro)
+formatting.texi:32: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
+formatting.texi:32: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:32: @TeX expected braces (possibly involving @mymacro)
formatting.texi:32: unexpected @ (possibly involving @mymacro)
formatting.texi:32: @image missing filename argument (possibly involving
@mymacro)
@@ -138,20 +148,25 @@ 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: @inforef is obsolete (possibly involving @mymacro)
-formatting.texi:68: warning: accent command `@,' must not be followed by new
line (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: warning: accent 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: 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: @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)
formatting.texi:68: @dotless expects `i' or `j' as argument, not `a' (possibly
involving @mymacro)
+formatting.texi:68: warning: command `@U' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:68: @U expected braces (possibly involving @mymacro)
formatting.texi:68: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:68: non-hex digits in argument for @U: z (possibly involving
@mymacro)
formatting.texi:68: warning: fewer than four hex digits in argument for @U:
abc (possibly involving @mymacro)
formatting.texi:68: argument for @U exceeds Unicode maximum 0x10FFFF:
FFFFFFFFFFFFFF (possibly involving @mymacro)
formatting.texi:68: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
(possibly involving @mymacro)
+formatting.texi:68: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
+formatting.texi:68: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:68: @TeX expected braces (possibly involving @mymacro)
formatting.texi:68: unexpected @ (possibly involving @mymacro)
formatting.texi:68: @image missing filename argument (possibly involving
@mymacro)
@@ -213,20 +228,25 @@ formatting.texi:73: warning: @inforef is obsolete
(possibly involving @mymacro)
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: accent command `@,' must not be followed by new
line (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: warning: accent 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: 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: @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)
formatting.texi:73: @dotless expects `i' or `j' as argument, not `a' (possibly
involving @mymacro)
+formatting.texi:73: warning: command `@U' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:73: @U expected braces (possibly involving @mymacro)
formatting.texi:73: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:73: non-hex digits in argument for @U: z (possibly involving
@mymacro)
formatting.texi:73: warning: fewer than four hex digits in argument for @U:
abc (possibly involving @mymacro)
formatting.texi:73: argument for @U exceeds Unicode maximum 0x10FFFF:
FFFFFFFFFFFFFF (possibly involving @mymacro)
formatting.texi:73: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
(possibly involving @mymacro)
+formatting.texi:73: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
+formatting.texi:73: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:73: @TeX expected braces (possibly involving @mymacro)
formatting.texi:73: unexpected @ (possibly involving @mymacro)
formatting.texi:73: @image missing filename argument (possibly involving
@mymacro)
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting.html
b/tp/tests/layout/res_parser/formatting_chm/formatting.html
index 600d64b9ff..60cf1340ac 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting.html
@@ -703,14 +703,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
@@ -1797,13 +1795,11 @@ html ''
<p>Somehow invalid use of @,:<br>
-@, ̧
-<br>
+@, ̧<br>
@,@"u ̧ü
</p>
<p>Invalid use of @’:<br>
-@’ ́
-<br>
+@’ ́<br>
@’@"u ́ü
</p>
<p><code class="code">@|</code>
@@ -2875,13 +2871,11 @@ html ''
<p>Somehow invalid use of @,:<br>
-@, ̧
-<br>
+@, ̧<br>
@,@"u ̧ü
</p>
<p>Invalid use of @’:<br>
-@’ ́
-<br>
+@’ ́<br>
@’@"u ́ü
</p>
<p><code class="code">@|</code>
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting_abt.html
b/tp/tests/layout/res_parser/formatting_chm/formatting_abt.html
index 55faec3ba0..bbf89a8df3 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting_abt.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting_abt.html
@@ -703,14 +703,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html
b/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html
index c3eccf2c51..30481b70f3 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html
@@ -703,14 +703,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html
b/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html
index 604b31e42d..af14e7b50a 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html
@@ -703,14 +703,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
diff --git a/tp/tests/layout/res_parser/formatting_chm/index.html
b/tp/tests/layout/res_parser/formatting_chm/index.html
index 25647296c7..4cc1530972 100644
--- a/tp/tests/layout/res_parser/formatting_chm/index.html
+++ b/tp/tests/layout/res_parser/formatting_chm/index.html
@@ -704,14 +704,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
diff --git
a/tp/tests/layout/res_parser/formatting_chm/s_002d_002dect_002cion.html
b/tp/tests/layout/res_parser/formatting_chm/s_002d_002dect_002cion.html
index 130cc966d5..6c7dbbb2b8 100644
--- a/tp/tests/layout/res_parser/formatting_chm/s_002d_002dect_002cion.html
+++ b/tp/tests/layout/res_parser/formatting_chm/s_002d_002dect_002cion.html
@@ -703,14 +703,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
diff --git a/tp/tests/layout/res_parser/formatting_chm/subsection.html
b/tp/tests/layout/res_parser/formatting_chm/subsection.html
index c8cd0249d0..18a6c64004 100644
--- a/tp/tests/layout/res_parser/formatting_chm/subsection.html
+++ b/tp/tests/layout/res_parser/formatting_chm/subsection.html
@@ -703,14 +703,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
diff --git
a/tp/tests/layout/res_parser/formatting_chm/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
b/tp/tests/layout/res_parser/formatting_chm/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
index 34f095378a..dbe7079d70 100644
---
a/tp/tests/layout/res_parser/formatting_chm/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
+++
b/tp/tests/layout/res_parser/formatting_chm/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
@@ -703,14 +703,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
diff --git
a/tp/tests/layout/res_parser/formatting_chm/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
b/tp/tests/layout/res_parser/formatting_chm/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
index 07f5b57bd5..a1998f2e79 100644
---
a/tp/tests/layout/res_parser/formatting_chm/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
+++
b/tp/tests/layout/res_parser/formatting_chm/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
@@ -703,14 +703,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
diff --git a/tp/tests/layout/res_parser/formatting_docbook/formatting.2
b/tp/tests/layout/res_parser/formatting_docbook/formatting.2
index 444e922aaa..3887d08db0 100644
--- a/tp/tests/layout/res_parser/formatting_docbook/formatting.2
+++ b/tp/tests/layout/res_parser/formatting_docbook/formatting.2
@@ -13,20 +13,25 @@ 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: @inforef is obsolete (possibly involving @mymacro)
-formatting.texi:22: warning: accent command `@,' must not be followed by new
line (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: warning: accent 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: 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: @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)
formatting.texi:22: @dotless expects `i' or `j' as argument, not `a' (possibly
involving @mymacro)
+formatting.texi:22: warning: command `@U' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:22: @U expected braces (possibly involving @mymacro)
formatting.texi:22: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:22: non-hex digits in argument for @U: z (possibly involving
@mymacro)
formatting.texi:22: warning: fewer than four hex digits in argument for @U:
abc (possibly involving @mymacro)
formatting.texi:22: argument for @U exceeds Unicode maximum 0x10FFFF:
FFFFFFFFFFFFFF (possibly involving @mymacro)
formatting.texi:22: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
(possibly involving @mymacro)
+formatting.texi:22: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
+formatting.texi:22: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:22: @TeX expected braces (possibly involving @mymacro)
formatting.texi:22: unexpected @ (possibly involving @mymacro)
formatting.texi:22: @image missing filename argument (possibly involving
@mymacro)
@@ -76,20 +81,25 @@ 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: @inforef is obsolete (possibly involving @mymacro)
-formatting.texi:32: warning: accent command `@,' must not be followed by new
line (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: warning: accent 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: 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: @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)
formatting.texi:32: @dotless expects `i' or `j' as argument, not `a' (possibly
involving @mymacro)
+formatting.texi:32: warning: command `@U' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:32: @U expected braces (possibly involving @mymacro)
formatting.texi:32: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:32: non-hex digits in argument for @U: z (possibly involving
@mymacro)
formatting.texi:32: warning: fewer than four hex digits in argument for @U:
abc (possibly involving @mymacro)
formatting.texi:32: argument for @U exceeds Unicode maximum 0x10FFFF:
FFFFFFFFFFFFFF (possibly involving @mymacro)
formatting.texi:32: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
(possibly involving @mymacro)
+formatting.texi:32: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
+formatting.texi:32: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:32: @TeX expected braces (possibly involving @mymacro)
formatting.texi:32: unexpected @ (possibly involving @mymacro)
formatting.texi:32: @image missing filename argument (possibly involving
@mymacro)
@@ -138,20 +148,25 @@ 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: @inforef is obsolete (possibly involving @mymacro)
-formatting.texi:68: warning: accent command `@,' must not be followed by new
line (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: warning: accent 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: 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: @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)
formatting.texi:68: @dotless expects `i' or `j' as argument, not `a' (possibly
involving @mymacro)
+formatting.texi:68: warning: command `@U' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:68: @U expected braces (possibly involving @mymacro)
formatting.texi:68: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:68: non-hex digits in argument for @U: z (possibly involving
@mymacro)
formatting.texi:68: warning: fewer than four hex digits in argument for @U:
abc (possibly involving @mymacro)
formatting.texi:68: argument for @U exceeds Unicode maximum 0x10FFFF:
FFFFFFFFFFFFFF (possibly involving @mymacro)
formatting.texi:68: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
(possibly involving @mymacro)
+formatting.texi:68: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
+formatting.texi:68: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:68: @TeX expected braces (possibly involving @mymacro)
formatting.texi:68: unexpected @ (possibly involving @mymacro)
formatting.texi:68: @image missing filename argument (possibly involving
@mymacro)
@@ -213,20 +228,25 @@ formatting.texi:73: warning: @inforef is obsolete
(possibly involving @mymacro)
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: accent command `@,' must not be followed by new
line (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: warning: accent 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: 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: @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)
formatting.texi:73: @dotless expects `i' or `j' as argument, not `a' (possibly
involving @mymacro)
+formatting.texi:73: warning: command `@U' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:73: @U expected braces (possibly involving @mymacro)
formatting.texi:73: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:73: non-hex digits in argument for @U: z (possibly involving
@mymacro)
formatting.texi:73: warning: fewer than four hex digits in argument for @U:
abc (possibly involving @mymacro)
formatting.texi:73: argument for @U exceeds Unicode maximum 0x10FFFF:
FFFFFFFFFFFFFF (possibly involving @mymacro)
formatting.texi:73: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
(possibly involving @mymacro)
+formatting.texi:73: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
+formatting.texi:73: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:73: @TeX expected braces (possibly involving @mymacro)
formatting.texi:73: unexpected @ (possibly involving @mymacro)
formatting.texi:73: @image missing filename argument (possibly involving
@mymacro)
diff --git a/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
b/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
index b661bf39bf..7123463e0f 100644
--- a/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
+++ b/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
@@ -731,14 +731,12 @@ docbook ''
@, ̧
-
@,@"u ̧ü
</para>
<para>Invalid use of @’:
@’ ́
-
@’@"u ́ü
</para>
<!-- should only appear in @*heading -->
@@ -1647,14 +1645,12 @@ docbook ''
@, ̧
-
@,@"u ̧ü
</para>
<para>Invalid use of @’:
@’ ́
-
@’@"u ́ü
</para>
<!-- should only appear in @*heading -->
@@ -2550,14 +2546,12 @@ docbook ''
@, ̧
-
@,@"u ̧ü
</para>
<para>Invalid use of @’:
@’ ́
-
@’@"u ́ü
</para>
<!-- should only appear in @*heading -->
@@ -3445,14 +3439,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
<!-- should only appear in @*heading -->
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 20af48db6b..d0e3f83329 100644
--- a/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.2
+++ b/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.2
@@ -13,20 +13,25 @@ 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: @inforef is obsolete (possibly involving @mymacro)
-formatting.texi:22: warning: accent command `@,' must not be followed by new
line (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: warning: accent 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: 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: @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)
formatting.texi:22: @dotless expects `i' or `j' as argument, not `a' (possibly
involving @mymacro)
+formatting.texi:22: warning: command `@U' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:22: @U expected braces (possibly involving @mymacro)
formatting.texi:22: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:22: non-hex digits in argument for @U: z (possibly involving
@mymacro)
formatting.texi:22: warning: fewer than four hex digits in argument for @U:
abc (possibly involving @mymacro)
formatting.texi:22: argument for @U exceeds Unicode maximum 0x10FFFF:
FFFFFFFFFFFFFF (possibly involving @mymacro)
formatting.texi:22: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
(possibly involving @mymacro)
+formatting.texi:22: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
+formatting.texi:22: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:22: @TeX expected braces (possibly involving @mymacro)
formatting.texi:22: unexpected @ (possibly involving @mymacro)
formatting.texi:22: @image missing filename argument (possibly involving
@mymacro)
@@ -76,20 +81,25 @@ 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: @inforef is obsolete (possibly involving @mymacro)
-formatting.texi:32: warning: accent command `@,' must not be followed by new
line (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: warning: accent 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: 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: @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)
formatting.texi:32: @dotless expects `i' or `j' as argument, not `a' (possibly
involving @mymacro)
+formatting.texi:32: warning: command `@U' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:32: @U expected braces (possibly involving @mymacro)
formatting.texi:32: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:32: non-hex digits in argument for @U: z (possibly involving
@mymacro)
formatting.texi:32: warning: fewer than four hex digits in argument for @U:
abc (possibly involving @mymacro)
formatting.texi:32: argument for @U exceeds Unicode maximum 0x10FFFF:
FFFFFFFFFFFFFF (possibly involving @mymacro)
formatting.texi:32: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
(possibly involving @mymacro)
+formatting.texi:32: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
+formatting.texi:32: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:32: @TeX expected braces (possibly involving @mymacro)
formatting.texi:32: unexpected @ (possibly involving @mymacro)
formatting.texi:32: @image missing filename argument (possibly involving
@mymacro)
@@ -138,20 +148,25 @@ 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: @inforef is obsolete (possibly involving @mymacro)
-formatting.texi:68: warning: accent command `@,' must not be followed by new
line (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: warning: accent 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: 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: @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)
formatting.texi:68: @dotless expects `i' or `j' as argument, not `a' (possibly
involving @mymacro)
+formatting.texi:68: warning: command `@U' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:68: @U expected braces (possibly involving @mymacro)
formatting.texi:68: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:68: non-hex digits in argument for @U: z (possibly involving
@mymacro)
formatting.texi:68: warning: fewer than four hex digits in argument for @U:
abc (possibly involving @mymacro)
formatting.texi:68: argument for @U exceeds Unicode maximum 0x10FFFF:
FFFFFFFFFFFFFF (possibly involving @mymacro)
formatting.texi:68: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
(possibly involving @mymacro)
+formatting.texi:68: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
+formatting.texi:68: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:68: @TeX expected braces (possibly involving @mymacro)
formatting.texi:68: unexpected @ (possibly involving @mymacro)
formatting.texi:68: @image missing filename argument (possibly involving
@mymacro)
@@ -213,20 +228,25 @@ formatting.texi:73: warning: @inforef is obsolete
(possibly involving @mymacro)
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: accent command `@,' must not be followed by new
line (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: warning: accent 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: 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: @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)
formatting.texi:73: @dotless expects `i' or `j' as argument, not `a' (possibly
involving @mymacro)
+formatting.texi:73: warning: command `@U' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:73: @U expected braces (possibly involving @mymacro)
formatting.texi:73: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:73: non-hex digits in argument for @U: z (possibly involving
@mymacro)
formatting.texi:73: warning: fewer than four hex digits in argument for @U:
abc (possibly involving @mymacro)
formatting.texi:73: argument for @U exceeds Unicode maximum 0x10FFFF:
FFFFFFFFFFFFFF (possibly involving @mymacro)
formatting.texi:73: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
(possibly involving @mymacro)
+formatting.texi:73: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
+formatting.texi:73: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:73: @TeX expected braces (possibly involving @mymacro)
formatting.texi:73: unexpected @ (possibly involving @mymacro)
formatting.texi:73: @image missing filename argument (possibly involving
@mymacro)
diff --git
a/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
b/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
index 27d2ed7712..508717dda0 100644
--- a/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
@@ -703,14 +703,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
@@ -1813,13 +1811,11 @@ html ''
<p>Somehow invalid use of @,:<br>
-@, ̧
-<br>
+@, ̧<br>
@,@"u ̧ü
</p>
<p>Invalid use of @’:<br>
-@’ ́
-<br>
+@’ ́<br>
@’@"u ́ü
</p>
<p><code class="code">@|</code>
@@ -2891,13 +2887,11 @@ html ''
<p>Somehow invalid use of @,:<br>
-@, ̧
-<br>
+@, ̧<br>
@,@"u ̧ü
</p>
<p>Invalid use of @’:<br>
-@’ ́
-<br>
+@’ ́<br>
@’@"u ́ü
</p>
<p><code class="code">@|</code>
@@ -4025,13 +4019,11 @@ html ''
<p>Somehow invalid use of @,:<br>
-@, ̧
-<br>
+@, ̧<br>
@,@"u ̧ü
</p>
<p>Invalid use of @’:<br>
-@’ ́
-<br>
+@’ ́<br>
@’@"u ́ü
</p>
<p><code class="code">@|</code>
@@ -5101,13 +5093,11 @@ html ''
<p>Somehow invalid use of @,:<br>
-@, ̧
-<br>
+@, ̧<br>
@,@"u ̧ü
</p>
<p>Invalid use of @’:<br>
-@’ ́
-<br>
+@’ ́<br>
@’@"u ́ü
</p>
<p><code class="code">@|</code>
@@ -6318,14 +6308,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
<code class="code">@|</code>
diff --git a/tp/tests/layout/res_parser/formatting_epub/formatting.2
b/tp/tests/layout/res_parser/formatting_epub/formatting.2
index c3ba7e43a2..3807464b1a 100644
--- a/tp/tests/layout/res_parser/formatting_epub/formatting.2
+++ b/tp/tests/layout/res_parser/formatting_epub/formatting.2
@@ -13,20 +13,25 @@ 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: @inforef is obsolete (possibly involving @mymacro)
-formatting.texi:22: warning: accent command `@,' must not be followed by new
line (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: warning: accent 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: 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: @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)
formatting.texi:22: @dotless expects `i' or `j' as argument, not `a' (possibly
involving @mymacro)
+formatting.texi:22: warning: command `@U' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:22: @U expected braces (possibly involving @mymacro)
formatting.texi:22: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:22: non-hex digits in argument for @U: z (possibly involving
@mymacro)
formatting.texi:22: warning: fewer than four hex digits in argument for @U:
abc (possibly involving @mymacro)
formatting.texi:22: argument for @U exceeds Unicode maximum 0x10FFFF:
FFFFFFFFFFFFFF (possibly involving @mymacro)
formatting.texi:22: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
(possibly involving @mymacro)
+formatting.texi:22: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
+formatting.texi:22: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:22: @TeX expected braces (possibly involving @mymacro)
formatting.texi:22: unexpected @ (possibly involving @mymacro)
formatting.texi:22: @image missing filename argument (possibly involving
@mymacro)
@@ -76,20 +81,25 @@ 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: @inforef is obsolete (possibly involving @mymacro)
-formatting.texi:32: warning: accent command `@,' must not be followed by new
line (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: warning: accent 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: 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: @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)
formatting.texi:32: @dotless expects `i' or `j' as argument, not `a' (possibly
involving @mymacro)
+formatting.texi:32: warning: command `@U' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:32: @U expected braces (possibly involving @mymacro)
formatting.texi:32: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:32: non-hex digits in argument for @U: z (possibly involving
@mymacro)
formatting.texi:32: warning: fewer than four hex digits in argument for @U:
abc (possibly involving @mymacro)
formatting.texi:32: argument for @U exceeds Unicode maximum 0x10FFFF:
FFFFFFFFFFFFFF (possibly involving @mymacro)
formatting.texi:32: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
(possibly involving @mymacro)
+formatting.texi:32: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
+formatting.texi:32: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:32: @TeX expected braces (possibly involving @mymacro)
formatting.texi:32: unexpected @ (possibly involving @mymacro)
formatting.texi:32: @image missing filename argument (possibly involving
@mymacro)
@@ -138,20 +148,25 @@ 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: @inforef is obsolete (possibly involving @mymacro)
-formatting.texi:68: warning: accent command `@,' must not be followed by new
line (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: warning: accent 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: 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: @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)
formatting.texi:68: @dotless expects `i' or `j' as argument, not `a' (possibly
involving @mymacro)
+formatting.texi:68: warning: command `@U' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:68: @U expected braces (possibly involving @mymacro)
formatting.texi:68: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:68: non-hex digits in argument for @U: z (possibly involving
@mymacro)
formatting.texi:68: warning: fewer than four hex digits in argument for @U:
abc (possibly involving @mymacro)
formatting.texi:68: argument for @U exceeds Unicode maximum 0x10FFFF:
FFFFFFFFFFFFFF (possibly involving @mymacro)
formatting.texi:68: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
(possibly involving @mymacro)
+formatting.texi:68: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
+formatting.texi:68: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:68: @TeX expected braces (possibly involving @mymacro)
formatting.texi:68: unexpected @ (possibly involving @mymacro)
formatting.texi:68: @image missing filename argument (possibly involving
@mymacro)
@@ -213,20 +228,25 @@ formatting.texi:73: warning: @inforef is obsolete
(possibly involving @mymacro)
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: accent command `@,' must not be followed by new
line (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: warning: accent 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: 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: @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)
formatting.texi:73: @dotless expects `i' or `j' as argument, not `a' (possibly
involving @mymacro)
+formatting.texi:73: warning: command `@U' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:73: @U expected braces (possibly involving @mymacro)
formatting.texi:73: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:73: non-hex digits in argument for @U: z (possibly involving
@mymacro)
formatting.texi:73: warning: fewer than four hex digits in argument for @U:
abc (possibly involving @mymacro)
formatting.texi:73: argument for @U exceeds Unicode maximum 0x10FFFF:
FFFFFFFFFFFFFF (possibly involving @mymacro)
formatting.texi:73: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
(possibly involving @mymacro)
+formatting.texi:73: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
+formatting.texi:73: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:73: @TeX expected braces (possibly involving @mymacro)
formatting.texi:73: unexpected @ (possibly involving @mymacro)
formatting.texi:73: @image missing filename argument (possibly involving
@mymacro)
diff --git
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter.xhtml
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter.xhtml
index 1958a4ec06..70cb3f4792 100644
---
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter.xhtml
@@ -704,14 +704,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
@@ -1809,13 +1807,11 @@ html ''
<p>Somehow invalid use of @,:<br/>
-@, ̧
-<br/>
+@, ̧<br/>
@,@"u ̧ü
</p>
<p>Invalid use of @’:<br/>
-@’ ́
-<br/>
+@’ ́<br/>
@’@"u ́ü
</p>
<p><code class="code">@|</code>
@@ -2885,13 +2881,11 @@ html ''
<p>Somehow invalid use of @,:<br/>
-@, ̧
-<br/>
+@, ̧<br/>
@,@"u ̧ü
</p>
<p>Invalid use of @’:<br/>
-@’ ́
-<br/>
+@’ ́<br/>
@’@"u ́ü
</p>
<p><code class="code">@|</code>
@@ -4102,14 +4096,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
<code class="code">@|</code>
diff --git
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
index 033d7f3c47..f72bd390d0 100644
---
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
@@ -704,14 +704,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
diff --git
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
index 7a5451733c..8a7c520c32 100644
---
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
@@ -704,14 +704,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
@@ -1796,13 +1794,11 @@ html ''
<p>Somehow invalid use of @,:<br/>
-@, ̧
-<br/>
+@, ̧<br/>
@,@"u ̧ü
</p>
<p>Invalid use of @’:<br/>
-@’ ́
-<br/>
+@’ ́<br/>
@’@"u ́ü
</p>
<p><code class="code">@|</code>
@@ -2874,13 +2870,11 @@ html ''
<p>Somehow invalid use of @,:<br/>
-@, ̧
-<br/>
+@, ̧<br/>
@,@"u ̧ü
</p>
<p>Invalid use of @’:<br/>
-@’ ́
-<br/>
+@’ ́<br/>
@’@"u ́ü
</p>
<p><code class="code">@|</code>
diff --git
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
index 65409fba45..fdee951fef 100644
---
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
@@ -704,14 +704,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
diff --git
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
index 8a6fe4982f..feb4045480 100644
---
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
@@ -704,14 +704,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
diff --git
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
index d9bdb27606..c1c67783a3 100644
---
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
@@ -704,14 +704,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
diff --git
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
index 63c6821e6a..839b5d4f5c 100644
---
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
@@ -704,14 +704,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
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 c3ba7e43a2..3807464b1a 100644
--- a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting.2
+++ b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting.2
@@ -13,20 +13,25 @@ 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: @inforef is obsolete (possibly involving @mymacro)
-formatting.texi:22: warning: accent command `@,' must not be followed by new
line (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: warning: accent 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: 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: @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)
formatting.texi:22: @dotless expects `i' or `j' as argument, not `a' (possibly
involving @mymacro)
+formatting.texi:22: warning: command `@U' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:22: @U expected braces (possibly involving @mymacro)
formatting.texi:22: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:22: non-hex digits in argument for @U: z (possibly involving
@mymacro)
formatting.texi:22: warning: fewer than four hex digits in argument for @U:
abc (possibly involving @mymacro)
formatting.texi:22: argument for @U exceeds Unicode maximum 0x10FFFF:
FFFFFFFFFFFFFF (possibly involving @mymacro)
formatting.texi:22: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
(possibly involving @mymacro)
+formatting.texi:22: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
+formatting.texi:22: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:22: @TeX expected braces (possibly involving @mymacro)
formatting.texi:22: unexpected @ (possibly involving @mymacro)
formatting.texi:22: @image missing filename argument (possibly involving
@mymacro)
@@ -76,20 +81,25 @@ 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: @inforef is obsolete (possibly involving @mymacro)
-formatting.texi:32: warning: accent command `@,' must not be followed by new
line (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: warning: accent 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: 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: @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)
formatting.texi:32: @dotless expects `i' or `j' as argument, not `a' (possibly
involving @mymacro)
+formatting.texi:32: warning: command `@U' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:32: @U expected braces (possibly involving @mymacro)
formatting.texi:32: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:32: non-hex digits in argument for @U: z (possibly involving
@mymacro)
formatting.texi:32: warning: fewer than four hex digits in argument for @U:
abc (possibly involving @mymacro)
formatting.texi:32: argument for @U exceeds Unicode maximum 0x10FFFF:
FFFFFFFFFFFFFF (possibly involving @mymacro)
formatting.texi:32: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
(possibly involving @mymacro)
+formatting.texi:32: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
+formatting.texi:32: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:32: @TeX expected braces (possibly involving @mymacro)
formatting.texi:32: unexpected @ (possibly involving @mymacro)
formatting.texi:32: @image missing filename argument (possibly involving
@mymacro)
@@ -138,20 +148,25 @@ 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: @inforef is obsolete (possibly involving @mymacro)
-formatting.texi:68: warning: accent command `@,' must not be followed by new
line (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: warning: accent 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: 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: @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)
formatting.texi:68: @dotless expects `i' or `j' as argument, not `a' (possibly
involving @mymacro)
+formatting.texi:68: warning: command `@U' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:68: @U expected braces (possibly involving @mymacro)
formatting.texi:68: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:68: non-hex digits in argument for @U: z (possibly involving
@mymacro)
formatting.texi:68: warning: fewer than four hex digits in argument for @U:
abc (possibly involving @mymacro)
formatting.texi:68: argument for @U exceeds Unicode maximum 0x10FFFF:
FFFFFFFFFFFFFF (possibly involving @mymacro)
formatting.texi:68: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
(possibly involving @mymacro)
+formatting.texi:68: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
+formatting.texi:68: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:68: @TeX expected braces (possibly involving @mymacro)
formatting.texi:68: unexpected @ (possibly involving @mymacro)
formatting.texi:68: @image missing filename argument (possibly involving
@mymacro)
@@ -213,20 +228,25 @@ formatting.texi:73: warning: @inforef is obsolete
(possibly involving @mymacro)
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: accent command `@,' must not be followed by new
line (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: warning: accent 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: 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: @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)
formatting.texi:73: @dotless expects `i' or `j' as argument, not `a' (possibly
involving @mymacro)
+formatting.texi:73: warning: command `@U' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:73: @U expected braces (possibly involving @mymacro)
formatting.texi:73: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:73: non-hex digits in argument for @U: z (possibly involving
@mymacro)
formatting.texi:73: warning: fewer than four hex digits in argument for @U:
abc (possibly involving @mymacro)
formatting.texi:73: argument for @U exceeds Unicode maximum 0x10FFFF:
FFFFFFFFFFFFFF (possibly involving @mymacro)
formatting.texi:73: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
(possibly involving @mymacro)
+formatting.texi:73: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
+formatting.texi:73: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:73: @TeX expected braces (possibly involving @mymacro)
formatting.texi:73: unexpected @ (possibly involving @mymacro)
formatting.texi:73: @image missing filename argument (possibly involving
@mymacro)
diff --git
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter.xhtml
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter.xhtml
index fedf8429a8..286e19aeeb 100644
---
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter.xhtml
@@ -704,14 +704,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
@@ -1810,13 +1808,11 @@ html ''
<p>Somehow invalid use of @,:<br/>
-@, ̧
-<br/>
+@, ̧<br/>
@,@"u ̧ü
</p>
<p>Invalid use of @’:<br/>
-@’ ́
-<br/>
+@’ ́<br/>
@’@"u ́ü
</p>
<p><code class="code">@|</code>
@@ -2886,13 +2882,11 @@ html ''
<p>Somehow invalid use of @,:<br/>
-@, ̧
-<br/>
+@, ̧<br/>
@,@"u ̧ü
</p>
<p>Invalid use of @’:<br/>
-@’ ́
-<br/>
+@’ ́<br/>
@’@"u ́ü
</p>
<p><code class="code">@|</code>
@@ -4103,14 +4097,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
<code class="code">@|</code>
diff --git
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
index dc2cdd078d..4c74c8e566 100644
---
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
@@ -704,14 +704,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
diff --git
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
index adeaf0874c..a3828e87c0 100644
---
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
@@ -704,14 +704,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
@@ -1798,13 +1796,11 @@ html ''
<p>Somehow invalid use of @,:<br/>
-@, ̧
-<br/>
+@, ̧<br/>
@,@"u ̧ü
</p>
<p>Invalid use of @’:<br/>
-@’ ́
-<br/>
+@’ ́<br/>
@’@"u ́ü
</p>
<p><code class="code">@|</code>
@@ -2876,13 +2872,11 @@ html ''
<p>Somehow invalid use of @,:<br/>
-@, ̧
-<br/>
+@, ̧<br/>
@,@"u ̧ü
</p>
<p>Invalid use of @’:<br/>
-@’ ́
-<br/>
+@’ ́<br/>
@’@"u ́ü
</p>
<p><code class="code">@|</code>
diff --git
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
index 9e770967cc..85a7a1d5e1 100644
---
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
@@ -704,14 +704,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
diff --git
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
index 31616f3a2b..c801ee709d 100644
---
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
@@ -704,14 +704,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
diff --git
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
index f606f90084..5b09269415 100644
---
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
@@ -704,14 +704,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
diff --git
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
index b5fa1cbf07..2cafe7079c 100644
---
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
@@ -704,14 +704,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
diff --git
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/s_002d_002dect_002cion.xhtml
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/s_002d_002dect_002cion.xhtml
index c3f8fb3b5e..8beeec5e00 100644
---
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/s_002d_002dect_002cion.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/s_002d_002dect_002cion.xhtml
@@ -704,14 +704,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
diff --git
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsection.xhtml
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsection.xhtml
index 09040c8890..bb51e66432 100644
---
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsection.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsection.xhtml
@@ -704,14 +704,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
diff --git
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-_0060_0060simple_002ddouble_002d_002d.xhtml
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-_0060_0060simple_002ddouble_002d_002d.xhtml
index 3a2b88c932..51a25e66f1 100644
---
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-_0060_0060simple_002ddouble_002d_002d.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-_0060_0060simple_002ddouble_002d_002d.xhtml
@@ -704,14 +704,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
diff --git
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.xhtml
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.xhtml
index 3216d42b99..2dc4906e60 100644
---
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.xhtml
@@ -704,14 +704,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
diff --git a/tp/tests/layout/res_parser/formatting_exotic/anchor.html
b/tp/tests/layout/res_parser/formatting_exotic/anchor.html
index c9e75360cb..4b3ffb9628 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/anchor.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/anchor.html
@@ -704,14 +704,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
diff --git a/tp/tests/layout/res_parser/formatting_exotic/chapter.html
b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
index fdab438fcd..636439364a 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
@@ -703,14 +703,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
@@ -1828,13 +1826,11 @@ html ''
<p>Somehow invalid use of @,:<br>
-@, ̧
-<br>
+@, ̧<br>
@,@"u ̧ü
</p>
<p>Invalid use of @’:<br>
-@’ ́
-<br>
+@’ ́<br>
@’@"u ́ü
</p>
<p><code class="code">@|</code>
@@ -2904,13 +2900,11 @@ html ''
<p>Somehow invalid use of @,:<br>
-@, ̧
-<br>
+@, ̧<br>
@,@"u ̧ü
</p>
<p>Invalid use of @’:<br>
-@’ ́
-<br>
+@’ ́<br>
@’@"u ́ü
</p>
<p><code class="code">@|</code>
@@ -4117,14 +4111,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
<code class="code">@|</code>
diff --git a/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
b/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
index 5731cf1fa3..0f703af188 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
@@ -703,14 +703,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
diff --git a/tp/tests/layout/res_parser/formatting_exotic/formatting.2
b/tp/tests/layout/res_parser/formatting_exotic/formatting.2
index 3ae3680e8e..1338c6eef7 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/formatting.2
+++ b/tp/tests/layout/res_parser/formatting_exotic/formatting.2
@@ -13,20 +13,25 @@ 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: @inforef is obsolete (possibly involving @mymacro)
-formatting.texi:22: warning: accent command `@,' must not be followed by new
line (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: warning: accent 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: 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: @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)
formatting.texi:22: @dotless expects `i' or `j' as argument, not `a' (possibly
involving @mymacro)
+formatting.texi:22: warning: command `@U' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:22: @U expected braces (possibly involving @mymacro)
formatting.texi:22: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:22: non-hex digits in argument for @U: z (possibly involving
@mymacro)
formatting.texi:22: warning: fewer than four hex digits in argument for @U:
abc (possibly involving @mymacro)
formatting.texi:22: argument for @U exceeds Unicode maximum 0x10FFFF:
FFFFFFFFFFFFFF (possibly involving @mymacro)
formatting.texi:22: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
(possibly involving @mymacro)
+formatting.texi:22: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
+formatting.texi:22: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:22: @TeX expected braces (possibly involving @mymacro)
formatting.texi:22: unexpected @ (possibly involving @mymacro)
formatting.texi:22: @image missing filename argument (possibly involving
@mymacro)
@@ -76,20 +81,25 @@ 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: @inforef is obsolete (possibly involving @mymacro)
-formatting.texi:32: warning: accent command `@,' must not be followed by new
line (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: warning: accent 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: 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: @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)
formatting.texi:32: @dotless expects `i' or `j' as argument, not `a' (possibly
involving @mymacro)
+formatting.texi:32: warning: command `@U' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:32: @U expected braces (possibly involving @mymacro)
formatting.texi:32: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:32: non-hex digits in argument for @U: z (possibly involving
@mymacro)
formatting.texi:32: warning: fewer than four hex digits in argument for @U:
abc (possibly involving @mymacro)
formatting.texi:32: argument for @U exceeds Unicode maximum 0x10FFFF:
FFFFFFFFFFFFFF (possibly involving @mymacro)
formatting.texi:32: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
(possibly involving @mymacro)
+formatting.texi:32: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
+formatting.texi:32: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:32: @TeX expected braces (possibly involving @mymacro)
formatting.texi:32: unexpected @ (possibly involving @mymacro)
formatting.texi:32: @image missing filename argument (possibly involving
@mymacro)
@@ -138,20 +148,25 @@ 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: @inforef is obsolete (possibly involving @mymacro)
-formatting.texi:68: warning: accent command `@,' must not be followed by new
line (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: warning: accent 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: 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: @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)
formatting.texi:68: @dotless expects `i' or `j' as argument, not `a' (possibly
involving @mymacro)
+formatting.texi:68: warning: command `@U' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:68: @U expected braces (possibly involving @mymacro)
formatting.texi:68: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:68: non-hex digits in argument for @U: z (possibly involving
@mymacro)
formatting.texi:68: warning: fewer than four hex digits in argument for @U:
abc (possibly involving @mymacro)
formatting.texi:68: argument for @U exceeds Unicode maximum 0x10FFFF:
FFFFFFFFFFFFFF (possibly involving @mymacro)
formatting.texi:68: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
(possibly involving @mymacro)
+formatting.texi:68: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
+formatting.texi:68: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:68: @TeX expected braces (possibly involving @mymacro)
formatting.texi:68: unexpected @ (possibly involving @mymacro)
formatting.texi:68: @image missing filename argument (possibly involving
@mymacro)
@@ -213,20 +228,25 @@ formatting.texi:73: warning: @inforef is obsolete
(possibly involving @mymacro)
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: accent command `@,' must not be followed by new
line (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: warning: accent 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: 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: @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)
formatting.texi:73: @dotless expects `i' or `j' as argument, not `a' (possibly
involving @mymacro)
+formatting.texi:73: warning: command `@U' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:73: @U expected braces (possibly involving @mymacro)
formatting.texi:73: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:73: non-hex digits in argument for @U: z (possibly involving
@mymacro)
formatting.texi:73: warning: fewer than four hex digits in argument for @U:
abc (possibly involving @mymacro)
formatting.texi:73: argument for @U exceeds Unicode maximum 0x10FFFF:
FFFFFFFFFFFFFF (possibly involving @mymacro)
formatting.texi:73: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
(possibly involving @mymacro)
+formatting.texi:73: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
+formatting.texi:73: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:73: @TeX expected braces (possibly involving @mymacro)
formatting.texi:73: unexpected @ (possibly involving @mymacro)
formatting.texi:73: @image missing filename argument (possibly involving
@mymacro)
diff --git a/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html
b/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html
index dc44d11845..c60df7bc58 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html
@@ -703,14 +703,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
diff --git a/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html
b/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html
index 71ab68a9d5..6f79ad5b6d 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html
@@ -703,14 +703,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
diff --git a/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html
b/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html
index c2ea43edfb..fd81c74c84 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html
@@ -703,14 +703,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
diff --git a/tp/tests/layout/res_parser/formatting_exotic/index.html
b/tp/tests/layout/res_parser/formatting_exotic/index.html
index 7575d664c3..ce10f52447 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/index.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/index.html
@@ -703,14 +703,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
diff --git
a/tp/tests/layout/res_parser/formatting_exotic/s_002d_002dect_002cion.html
b/tp/tests/layout/res_parser/formatting_exotic/s_002d_002dect_002cion.html
index 06fc8de2a7..b3e0c04bf8 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/s_002d_002dect_002cion.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/s_002d_002dect_002cion.html
@@ -703,14 +703,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
diff --git a/tp/tests/layout/res_parser/formatting_exotic/subsection.html
b/tp/tests/layout/res_parser/formatting_exotic/subsection.html
index dd795e3cf1..aba370c2dc 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/subsection.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/subsection.html
@@ -704,14 +704,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
diff --git
a/tp/tests/layout/res_parser/formatting_exotic/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
b/tp/tests/layout/res_parser/formatting_exotic/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
index f9d64cd0e3..db266a5771 100644
---
a/tp/tests/layout/res_parser/formatting_exotic/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
+++
b/tp/tests/layout/res_parser/formatting_exotic/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
@@ -704,14 +704,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
diff --git
a/tp/tests/layout/res_parser/formatting_exotic/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
b/tp/tests/layout/res_parser/formatting_exotic/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
index f5c64ed3f7..f6537662a6 100644
---
a/tp/tests/layout/res_parser/formatting_exotic/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
+++
b/tp/tests/layout/res_parser/formatting_exotic/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
@@ -704,14 +704,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
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 20af48db6b..d0e3f83329 100644
--- a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.2
+++ b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.2
@@ -13,20 +13,25 @@ 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: @inforef is obsolete (possibly involving @mymacro)
-formatting.texi:22: warning: accent command `@,' must not be followed by new
line (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: warning: accent 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: 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: @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)
formatting.texi:22: @dotless expects `i' or `j' as argument, not `a' (possibly
involving @mymacro)
+formatting.texi:22: warning: command `@U' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:22: @U expected braces (possibly involving @mymacro)
formatting.texi:22: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:22: non-hex digits in argument for @U: z (possibly involving
@mymacro)
formatting.texi:22: warning: fewer than four hex digits in argument for @U:
abc (possibly involving @mymacro)
formatting.texi:22: argument for @U exceeds Unicode maximum 0x10FFFF:
FFFFFFFFFFFFFF (possibly involving @mymacro)
formatting.texi:22: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
(possibly involving @mymacro)
+formatting.texi:22: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
+formatting.texi:22: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:22: @TeX expected braces (possibly involving @mymacro)
formatting.texi:22: unexpected @ (possibly involving @mymacro)
formatting.texi:22: @image missing filename argument (possibly involving
@mymacro)
@@ -76,20 +81,25 @@ 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: @inforef is obsolete (possibly involving @mymacro)
-formatting.texi:32: warning: accent command `@,' must not be followed by new
line (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: warning: accent 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: 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: @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)
formatting.texi:32: @dotless expects `i' or `j' as argument, not `a' (possibly
involving @mymacro)
+formatting.texi:32: warning: command `@U' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:32: @U expected braces (possibly involving @mymacro)
formatting.texi:32: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:32: non-hex digits in argument for @U: z (possibly involving
@mymacro)
formatting.texi:32: warning: fewer than four hex digits in argument for @U:
abc (possibly involving @mymacro)
formatting.texi:32: argument for @U exceeds Unicode maximum 0x10FFFF:
FFFFFFFFFFFFFF (possibly involving @mymacro)
formatting.texi:32: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
(possibly involving @mymacro)
+formatting.texi:32: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
+formatting.texi:32: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:32: @TeX expected braces (possibly involving @mymacro)
formatting.texi:32: unexpected @ (possibly involving @mymacro)
formatting.texi:32: @image missing filename argument (possibly involving
@mymacro)
@@ -138,20 +148,25 @@ 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: @inforef is obsolete (possibly involving @mymacro)
-formatting.texi:68: warning: accent command `@,' must not be followed by new
line (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: warning: accent 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: 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: @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)
formatting.texi:68: @dotless expects `i' or `j' as argument, not `a' (possibly
involving @mymacro)
+formatting.texi:68: warning: command `@U' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:68: @U expected braces (possibly involving @mymacro)
formatting.texi:68: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:68: non-hex digits in argument for @U: z (possibly involving
@mymacro)
formatting.texi:68: warning: fewer than four hex digits in argument for @U:
abc (possibly involving @mymacro)
formatting.texi:68: argument for @U exceeds Unicode maximum 0x10FFFF:
FFFFFFFFFFFFFF (possibly involving @mymacro)
formatting.texi:68: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
(possibly involving @mymacro)
+formatting.texi:68: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
+formatting.texi:68: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:68: @TeX expected braces (possibly involving @mymacro)
formatting.texi:68: unexpected @ (possibly involving @mymacro)
formatting.texi:68: @image missing filename argument (possibly involving
@mymacro)
@@ -213,20 +228,25 @@ formatting.texi:73: warning: @inforef is obsolete
(possibly involving @mymacro)
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: accent command `@,' must not be followed by new
line (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: warning: accent 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: 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: @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)
formatting.texi:73: @dotless expects `i' or `j' as argument, not `a' (possibly
involving @mymacro)
+formatting.texi:73: warning: command `@U' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:73: @U expected braces (possibly involving @mymacro)
formatting.texi:73: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:73: non-hex digits in argument for @U: z (possibly involving
@mymacro)
formatting.texi:73: warning: fewer than four hex digits in argument for @U:
abc (possibly involving @mymacro)
formatting.texi:73: argument for @U exceeds Unicode maximum 0x10FFFF:
FFFFFFFFFFFFFF (possibly involving @mymacro)
formatting.texi:73: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
(possibly involving @mymacro)
+formatting.texi:73: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
+formatting.texi:73: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:73: @TeX expected braces (possibly involving @mymacro)
formatting.texi:73: unexpected @ (possibly involving @mymacro)
formatting.texi:73: @image missing filename argument (possibly involving
@mymacro)
diff --git a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
index 3f309bf426..e3663f55ab 100644
--- a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
@@ -703,14 +703,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
@@ -1813,13 +1811,11 @@ html ''
<p>Somehow invalid use of @,:<br>
-@, ̧
-<br>
+@, ̧<br>
@,@"u ̧ü
</p>
<p>Invalid use of @’:<br>
-@’ ́
-<br>
+@’ ́<br>
@’@"u ́ü
</p>
<p><code class="code">@|</code>
@@ -2891,13 +2887,11 @@ html ''
<p>Somehow invalid use of @,:<br>
-@, ̧
-<br>
+@, ̧<br>
@,@"u ̧ü
</p>
<p>Invalid use of @’:<br>
-@’ ́
-<br>
+@’ ́<br>
@’@"u ́ü
</p>
<p><code class="code">@|</code>
@@ -4025,13 +4019,11 @@ html ''
<p>Somehow invalid use of @,:<br>
-@, ̧
-<br>
+@, ̧<br>
@,@"u ̧ü
</p>
<p>Invalid use of @’:<br>
-@’ ́
-<br>
+@’ ́<br>
@’@"u ́ü
</p>
<p><code class="code">@|</code>
@@ -5101,13 +5093,11 @@ html ''
<p>Somehow invalid use of @,:<br>
-@, ̧
-<br>
+@, ̧<br>
@,@"u ̧ü
</p>
<p>Invalid use of @’:<br>
-@’ ́
-<br>
+@’ ́<br>
@’@"u ́ü
</p>
<p><code class="code">@|</code>
@@ -6318,14 +6308,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
<code class="code">@|</code>
diff --git a/tp/tests/layout/res_parser/formatting_html/formatting.2
b/tp/tests/layout/res_parser/formatting_html/formatting.2
index 20af48db6b..d0e3f83329 100644
--- a/tp/tests/layout/res_parser/formatting_html/formatting.2
+++ b/tp/tests/layout/res_parser/formatting_html/formatting.2
@@ -13,20 +13,25 @@ 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: @inforef is obsolete (possibly involving @mymacro)
-formatting.texi:22: warning: accent command `@,' must not be followed by new
line (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: warning: accent 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: 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: @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)
formatting.texi:22: @dotless expects `i' or `j' as argument, not `a' (possibly
involving @mymacro)
+formatting.texi:22: warning: command `@U' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:22: @U expected braces (possibly involving @mymacro)
formatting.texi:22: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:22: non-hex digits in argument for @U: z (possibly involving
@mymacro)
formatting.texi:22: warning: fewer than four hex digits in argument for @U:
abc (possibly involving @mymacro)
formatting.texi:22: argument for @U exceeds Unicode maximum 0x10FFFF:
FFFFFFFFFFFFFF (possibly involving @mymacro)
formatting.texi:22: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
(possibly involving @mymacro)
+formatting.texi:22: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
+formatting.texi:22: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:22: @TeX expected braces (possibly involving @mymacro)
formatting.texi:22: unexpected @ (possibly involving @mymacro)
formatting.texi:22: @image missing filename argument (possibly involving
@mymacro)
@@ -76,20 +81,25 @@ 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: @inforef is obsolete (possibly involving @mymacro)
-formatting.texi:32: warning: accent command `@,' must not be followed by new
line (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: warning: accent 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: 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: @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)
formatting.texi:32: @dotless expects `i' or `j' as argument, not `a' (possibly
involving @mymacro)
+formatting.texi:32: warning: command `@U' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:32: @U expected braces (possibly involving @mymacro)
formatting.texi:32: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:32: non-hex digits in argument for @U: z (possibly involving
@mymacro)
formatting.texi:32: warning: fewer than four hex digits in argument for @U:
abc (possibly involving @mymacro)
formatting.texi:32: argument for @U exceeds Unicode maximum 0x10FFFF:
FFFFFFFFFFFFFF (possibly involving @mymacro)
formatting.texi:32: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
(possibly involving @mymacro)
+formatting.texi:32: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
+formatting.texi:32: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:32: @TeX expected braces (possibly involving @mymacro)
formatting.texi:32: unexpected @ (possibly involving @mymacro)
formatting.texi:32: @image missing filename argument (possibly involving
@mymacro)
@@ -138,20 +148,25 @@ 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: @inforef is obsolete (possibly involving @mymacro)
-formatting.texi:68: warning: accent command `@,' must not be followed by new
line (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: warning: accent 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: 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: @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)
formatting.texi:68: @dotless expects `i' or `j' as argument, not `a' (possibly
involving @mymacro)
+formatting.texi:68: warning: command `@U' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:68: @U expected braces (possibly involving @mymacro)
formatting.texi:68: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:68: non-hex digits in argument for @U: z (possibly involving
@mymacro)
formatting.texi:68: warning: fewer than four hex digits in argument for @U:
abc (possibly involving @mymacro)
formatting.texi:68: argument for @U exceeds Unicode maximum 0x10FFFF:
FFFFFFFFFFFFFF (possibly involving @mymacro)
formatting.texi:68: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
(possibly involving @mymacro)
+formatting.texi:68: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
+formatting.texi:68: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:68: @TeX expected braces (possibly involving @mymacro)
formatting.texi:68: unexpected @ (possibly involving @mymacro)
formatting.texi:68: @image missing filename argument (possibly involving
@mymacro)
@@ -213,20 +228,25 @@ formatting.texi:73: warning: @inforef is obsolete
(possibly involving @mymacro)
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: accent command `@,' must not be followed by new
line (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: warning: accent 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: 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: @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)
formatting.texi:73: @dotless expects `i' or `j' as argument, not `a' (possibly
involving @mymacro)
+formatting.texi:73: warning: command `@U' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:73: @U expected braces (possibly involving @mymacro)
formatting.texi:73: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:73: non-hex digits in argument for @U: z (possibly involving
@mymacro)
formatting.texi:73: warning: fewer than four hex digits in argument for @U:
abc (possibly involving @mymacro)
formatting.texi:73: argument for @U exceeds Unicode maximum 0x10FFFF:
FFFFFFFFFFFFFF (possibly involving @mymacro)
formatting.texi:73: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
(possibly involving @mymacro)
+formatting.texi:73: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
+formatting.texi:73: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:73: @TeX expected braces (possibly involving @mymacro)
formatting.texi:73: unexpected @ (possibly involving @mymacro)
formatting.texi:73: @image missing filename argument (possibly involving
@mymacro)
diff --git a/tp/tests/layout/res_parser/formatting_html/formatting.html
b/tp/tests/layout/res_parser/formatting_html/formatting.html
index 4de62f9992..d6cb2d9744 100644
--- a/tp/tests/layout/res_parser/formatting_html/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html/formatting.html
@@ -703,14 +703,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
@@ -1813,13 +1811,11 @@ html ''
<p>Somehow invalid use of @,:<br>
-@, ̧
-<br>
+@, ̧<br>
@,@"u ̧ü
</p>
<p>Invalid use of @’:<br>
-@’ ́
-<br>
+@’ ́<br>
@’@"u ́ü
</p>
<p><code class="code">@|</code>
@@ -2891,13 +2887,11 @@ html ''
<p>Somehow invalid use of @,:<br>
-@, ̧
-<br>
+@, ̧<br>
@,@"u ̧ü
</p>
<p>Invalid use of @’:<br>
-@’ ́
-<br>
+@’ ́<br>
@’@"u ́ü
</p>
<p><code class="code">@|</code>
@@ -4025,13 +4019,11 @@ html ''
<p>Somehow invalid use of @,:<br>
-@, ̧
-<br>
+@, ̧<br>
@,@"u ̧ü
</p>
<p>Invalid use of @’:<br>
-@’ ́
-<br>
+@’ ́<br>
@’@"u ́ü
</p>
<p><code class="code">@|</code>
@@ -5101,13 +5093,11 @@ html ''
<p>Somehow invalid use of @,:<br>
-@, ̧
-<br>
+@, ̧<br>
@,@"u ̧ü
</p>
<p>Invalid use of @’:<br>
-@’ ́
-<br>
+@’ ́<br>
@’@"u ́ü
</p>
<p><code class="code">@|</code>
@@ -6318,14 +6308,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
<code class="code">@|</code>
diff --git a/tp/tests/layout/res_parser/formatting_html32/formatting.2
b/tp/tests/layout/res_parser/formatting_html32/formatting.2
index 20af48db6b..d0e3f83329 100644
--- a/tp/tests/layout/res_parser/formatting_html32/formatting.2
+++ b/tp/tests/layout/res_parser/formatting_html32/formatting.2
@@ -13,20 +13,25 @@ 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: @inforef is obsolete (possibly involving @mymacro)
-formatting.texi:22: warning: accent command `@,' must not be followed by new
line (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: warning: accent 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: 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: @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)
formatting.texi:22: @dotless expects `i' or `j' as argument, not `a' (possibly
involving @mymacro)
+formatting.texi:22: warning: command `@U' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:22: @U expected braces (possibly involving @mymacro)
formatting.texi:22: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:22: non-hex digits in argument for @U: z (possibly involving
@mymacro)
formatting.texi:22: warning: fewer than four hex digits in argument for @U:
abc (possibly involving @mymacro)
formatting.texi:22: argument for @U exceeds Unicode maximum 0x10FFFF:
FFFFFFFFFFFFFF (possibly involving @mymacro)
formatting.texi:22: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
(possibly involving @mymacro)
+formatting.texi:22: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
+formatting.texi:22: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:22: @TeX expected braces (possibly involving @mymacro)
formatting.texi:22: unexpected @ (possibly involving @mymacro)
formatting.texi:22: @image missing filename argument (possibly involving
@mymacro)
@@ -76,20 +81,25 @@ 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: @inforef is obsolete (possibly involving @mymacro)
-formatting.texi:32: warning: accent command `@,' must not be followed by new
line (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: warning: accent 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: 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: @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)
formatting.texi:32: @dotless expects `i' or `j' as argument, not `a' (possibly
involving @mymacro)
+formatting.texi:32: warning: command `@U' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:32: @U expected braces (possibly involving @mymacro)
formatting.texi:32: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:32: non-hex digits in argument for @U: z (possibly involving
@mymacro)
formatting.texi:32: warning: fewer than four hex digits in argument for @U:
abc (possibly involving @mymacro)
formatting.texi:32: argument for @U exceeds Unicode maximum 0x10FFFF:
FFFFFFFFFFFFFF (possibly involving @mymacro)
formatting.texi:32: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
(possibly involving @mymacro)
+formatting.texi:32: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
+formatting.texi:32: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:32: @TeX expected braces (possibly involving @mymacro)
formatting.texi:32: unexpected @ (possibly involving @mymacro)
formatting.texi:32: @image missing filename argument (possibly involving
@mymacro)
@@ -138,20 +148,25 @@ 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: @inforef is obsolete (possibly involving @mymacro)
-formatting.texi:68: warning: accent command `@,' must not be followed by new
line (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: warning: accent 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: 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: @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)
formatting.texi:68: @dotless expects `i' or `j' as argument, not `a' (possibly
involving @mymacro)
+formatting.texi:68: warning: command `@U' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:68: @U expected braces (possibly involving @mymacro)
formatting.texi:68: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:68: non-hex digits in argument for @U: z (possibly involving
@mymacro)
formatting.texi:68: warning: fewer than four hex digits in argument for @U:
abc (possibly involving @mymacro)
formatting.texi:68: argument for @U exceeds Unicode maximum 0x10FFFF:
FFFFFFFFFFFFFF (possibly involving @mymacro)
formatting.texi:68: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
(possibly involving @mymacro)
+formatting.texi:68: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
+formatting.texi:68: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:68: @TeX expected braces (possibly involving @mymacro)
formatting.texi:68: unexpected @ (possibly involving @mymacro)
formatting.texi:68: @image missing filename argument (possibly involving
@mymacro)
@@ -213,20 +228,25 @@ formatting.texi:73: warning: @inforef is obsolete
(possibly involving @mymacro)
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: accent command `@,' must not be followed by new
line (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: warning: accent 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: 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: @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)
formatting.texi:73: @dotless expects `i' or `j' as argument, not `a' (possibly
involving @mymacro)
+formatting.texi:73: warning: command `@U' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:73: @U expected braces (possibly involving @mymacro)
formatting.texi:73: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:73: non-hex digits in argument for @U: z (possibly involving
@mymacro)
formatting.texi:73: warning: fewer than four hex digits in argument for @U:
abc (possibly involving @mymacro)
formatting.texi:73: argument for @U exceeds Unicode maximum 0x10FFFF:
FFFFFFFFFFFFFF (possibly involving @mymacro)
formatting.texi:73: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
(possibly involving @mymacro)
+formatting.texi:73: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
+formatting.texi:73: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:73: @TeX expected braces (possibly involving @mymacro)
formatting.texi:73: unexpected @ (possibly involving @mymacro)
formatting.texi:73: @image missing filename argument (possibly involving
@mymacro)
diff --git a/tp/tests/layout/res_parser/formatting_html32/formatting.html
b/tp/tests/layout/res_parser/formatting_html32/formatting.html
index 391f9c6a1a..463d25f32f 100644
--- a/tp/tests/layout/res_parser/formatting_html32/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html32/formatting.html
@@ -703,14 +703,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
@@ -1749,13 +1747,11 @@ html ''
<p>Somehow invalid use of @,:<br>
-@, ̧
-<br>
+@, ̧<br>
@,@"u ̧ü
</p>
<p>Invalid use of @':<br>
-@' ́
-<br>
+@' ́<br>
@'@"u ́ü
</p>
<p><code>@|</code>
@@ -2801,13 +2797,11 @@ html ''
<p>Somehow invalid use of @,:<br>
-@, ̧
-<br>
+@, ̧<br>
@,@"u ̧ü
</p>
<p>Invalid use of @':<br>
-@' ́
-<br>
+@' ́<br>
@'@"u ́ü
</p>
<p><code>@|</code>
@@ -3909,13 +3903,11 @@ html ''
<p>Somehow invalid use of @,:<br>
-@, ̧
-<br>
+@, ̧<br>
@,@"u ̧ü
</p>
<p>Invalid use of @':<br>
-@' ́
-<br>
+@' ́<br>
@'@"u ́ü
</p>
<p><code>@|</code>
@@ -4959,13 +4951,11 @@ html ''
<p>Somehow invalid use of @,:<br>
-@, ̧
-<br>
+@, ̧<br>
@,@"u ̧ü
</p>
<p>Invalid use of @':<br>
-@' ́
-<br>
+@' ́<br>
@'@"u ́ü
</p>
<p><code>@|</code>
@@ -6149,14 +6139,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
<code>@|</code>
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 3ae3680e8e..1338c6eef7 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
@@ -13,20 +13,25 @@ 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: @inforef is obsolete (possibly involving @mymacro)
-formatting.texi:22: warning: accent command `@,' must not be followed by new
line (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: warning: accent 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: 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: @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)
formatting.texi:22: @dotless expects `i' or `j' as argument, not `a' (possibly
involving @mymacro)
+formatting.texi:22: warning: command `@U' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:22: @U expected braces (possibly involving @mymacro)
formatting.texi:22: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:22: non-hex digits in argument for @U: z (possibly involving
@mymacro)
formatting.texi:22: warning: fewer than four hex digits in argument for @U:
abc (possibly involving @mymacro)
formatting.texi:22: argument for @U exceeds Unicode maximum 0x10FFFF:
FFFFFFFFFFFFFF (possibly involving @mymacro)
formatting.texi:22: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
(possibly involving @mymacro)
+formatting.texi:22: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
+formatting.texi:22: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:22: @TeX expected braces (possibly involving @mymacro)
formatting.texi:22: unexpected @ (possibly involving @mymacro)
formatting.texi:22: @image missing filename argument (possibly involving
@mymacro)
@@ -76,20 +81,25 @@ 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: @inforef is obsolete (possibly involving @mymacro)
-formatting.texi:32: warning: accent command `@,' must not be followed by new
line (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: warning: accent 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: 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: @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)
formatting.texi:32: @dotless expects `i' or `j' as argument, not `a' (possibly
involving @mymacro)
+formatting.texi:32: warning: command `@U' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:32: @U expected braces (possibly involving @mymacro)
formatting.texi:32: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:32: non-hex digits in argument for @U: z (possibly involving
@mymacro)
formatting.texi:32: warning: fewer than four hex digits in argument for @U:
abc (possibly involving @mymacro)
formatting.texi:32: argument for @U exceeds Unicode maximum 0x10FFFF:
FFFFFFFFFFFFFF (possibly involving @mymacro)
formatting.texi:32: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
(possibly involving @mymacro)
+formatting.texi:32: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
+formatting.texi:32: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:32: @TeX expected braces (possibly involving @mymacro)
formatting.texi:32: unexpected @ (possibly involving @mymacro)
formatting.texi:32: @image missing filename argument (possibly involving
@mymacro)
@@ -138,20 +148,25 @@ 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: @inforef is obsolete (possibly involving @mymacro)
-formatting.texi:68: warning: accent command `@,' must not be followed by new
line (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: warning: accent 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: 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: @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)
formatting.texi:68: @dotless expects `i' or `j' as argument, not `a' (possibly
involving @mymacro)
+formatting.texi:68: warning: command `@U' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:68: @U expected braces (possibly involving @mymacro)
formatting.texi:68: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:68: non-hex digits in argument for @U: z (possibly involving
@mymacro)
formatting.texi:68: warning: fewer than four hex digits in argument for @U:
abc (possibly involving @mymacro)
formatting.texi:68: argument for @U exceeds Unicode maximum 0x10FFFF:
FFFFFFFFFFFFFF (possibly involving @mymacro)
formatting.texi:68: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
(possibly involving @mymacro)
+formatting.texi:68: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
+formatting.texi:68: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:68: @TeX expected braces (possibly involving @mymacro)
formatting.texi:68: unexpected @ (possibly involving @mymacro)
formatting.texi:68: @image missing filename argument (possibly involving
@mymacro)
@@ -213,20 +228,25 @@ formatting.texi:73: warning: @inforef is obsolete
(possibly involving @mymacro)
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: accent command `@,' must not be followed by new
line (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: warning: accent 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: 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: @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)
formatting.texi:73: @dotless expects `i' or `j' as argument, not `a' (possibly
involving @mymacro)
+formatting.texi:73: warning: command `@U' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:73: @U expected braces (possibly involving @mymacro)
formatting.texi:73: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:73: non-hex digits in argument for @U: z (possibly involving
@mymacro)
formatting.texi:73: warning: fewer than four hex digits in argument for @U:
abc (possibly involving @mymacro)
formatting.texi:73: argument for @U exceeds Unicode maximum 0x10FFFF:
FFFFFFFFFFFFFF (possibly involving @mymacro)
formatting.texi:73: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
(possibly involving @mymacro)
+formatting.texi:73: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
+formatting.texi:73: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:73: @TeX expected braces (possibly involving @mymacro)
formatting.texi:73: unexpected @ (possibly involving @mymacro)
formatting.texi:73: @image missing filename argument (possibly involving
@mymacro)
diff --git
a/tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.html
b/tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.html
index da4f6fbe85..72d71ce1df 100644
--- a/tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.html
@@ -703,14 +703,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
@@ -1867,13 +1865,11 @@ html ''
<p>Somehow invalid use of @,:<br>
-@, ̧
-<br>
+@, ̧<br>
@,@"u ̧ü
</p>
<p>Invalid use of @’:<br>
-@’ ́
-<br>
+@’ ́<br>
@’@"u ́ü
</p>
<p><code class="code">@|</code>
@@ -2943,13 +2939,11 @@ html ''
<p>Somehow invalid use of @,:<br>
-@, ̧
-<br>
+@, ̧<br>
@,@"u ̧ü
</p>
<p>Invalid use of @’:<br>
-@’ ́
-<br>
+@’ ́<br>
@’@"u ́ü
</p>
<p><code class="code">@|</code>
@@ -4160,14 +4154,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
<code class="code">@|</code>
diff --git a/tp/tests/layout/res_parser/formatting_html_nodes/anchor.html
b/tp/tests/layout/res_parser/formatting_html_nodes/anchor.html
index 1e74500169..fe0aec441e 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/anchor.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/anchor.html
@@ -704,14 +704,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
diff --git a/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
b/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
index e7184f4e30..49157114df 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
@@ -703,14 +703,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
@@ -1829,13 +1827,11 @@ html ''
<p>Somehow invalid use of @,:<br>
-@, ̧
-<br>
+@, ̧<br>
@,@"u ̧ü
</p>
<p>Invalid use of @’:<br>
-@’ ́
-<br>
+@’ ́<br>
@’@"u ́ü
</p>
<p><code class="code">@|</code>
@@ -2905,13 +2901,11 @@ html ''
<p>Somehow invalid use of @,:<br>
-@, ̧
-<br>
+@, ̧<br>
@,@"u ̧ü
</p>
<p>Invalid use of @’:<br>
-@’ ́
-<br>
+@’ ́<br>
@’@"u ́ü
</p>
<p><code class="code">@|</code>
@@ -4122,14 +4116,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
<code class="code">@|</code>
diff --git a/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html
b/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html
index 9db4d6a75d..907ffa30d2 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html
@@ -703,14 +703,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
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 20af48db6b..d0e3f83329 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/formatting.2
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/formatting.2
@@ -13,20 +13,25 @@ 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: @inforef is obsolete (possibly involving @mymacro)
-formatting.texi:22: warning: accent command `@,' must not be followed by new
line (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: warning: accent 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: 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: @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)
formatting.texi:22: @dotless expects `i' or `j' as argument, not `a' (possibly
involving @mymacro)
+formatting.texi:22: warning: command `@U' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:22: @U expected braces (possibly involving @mymacro)
formatting.texi:22: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:22: non-hex digits in argument for @U: z (possibly involving
@mymacro)
formatting.texi:22: warning: fewer than four hex digits in argument for @U:
abc (possibly involving @mymacro)
formatting.texi:22: argument for @U exceeds Unicode maximum 0x10FFFF:
FFFFFFFFFFFFFF (possibly involving @mymacro)
formatting.texi:22: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
(possibly involving @mymacro)
+formatting.texi:22: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
+formatting.texi:22: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:22: @TeX expected braces (possibly involving @mymacro)
formatting.texi:22: unexpected @ (possibly involving @mymacro)
formatting.texi:22: @image missing filename argument (possibly involving
@mymacro)
@@ -76,20 +81,25 @@ 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: @inforef is obsolete (possibly involving @mymacro)
-formatting.texi:32: warning: accent command `@,' must not be followed by new
line (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: warning: accent 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: 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: @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)
formatting.texi:32: @dotless expects `i' or `j' as argument, not `a' (possibly
involving @mymacro)
+formatting.texi:32: warning: command `@U' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:32: @U expected braces (possibly involving @mymacro)
formatting.texi:32: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:32: non-hex digits in argument for @U: z (possibly involving
@mymacro)
formatting.texi:32: warning: fewer than four hex digits in argument for @U:
abc (possibly involving @mymacro)
formatting.texi:32: argument for @U exceeds Unicode maximum 0x10FFFF:
FFFFFFFFFFFFFF (possibly involving @mymacro)
formatting.texi:32: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
(possibly involving @mymacro)
+formatting.texi:32: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
+formatting.texi:32: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:32: @TeX expected braces (possibly involving @mymacro)
formatting.texi:32: unexpected @ (possibly involving @mymacro)
formatting.texi:32: @image missing filename argument (possibly involving
@mymacro)
@@ -138,20 +148,25 @@ 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: @inforef is obsolete (possibly involving @mymacro)
-formatting.texi:68: warning: accent command `@,' must not be followed by new
line (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: warning: accent 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: 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: @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)
formatting.texi:68: @dotless expects `i' or `j' as argument, not `a' (possibly
involving @mymacro)
+formatting.texi:68: warning: command `@U' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:68: @U expected braces (possibly involving @mymacro)
formatting.texi:68: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:68: non-hex digits in argument for @U: z (possibly involving
@mymacro)
formatting.texi:68: warning: fewer than four hex digits in argument for @U:
abc (possibly involving @mymacro)
formatting.texi:68: argument for @U exceeds Unicode maximum 0x10FFFF:
FFFFFFFFFFFFFF (possibly involving @mymacro)
formatting.texi:68: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
(possibly involving @mymacro)
+formatting.texi:68: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
+formatting.texi:68: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:68: @TeX expected braces (possibly involving @mymacro)
formatting.texi:68: unexpected @ (possibly involving @mymacro)
formatting.texi:68: @image missing filename argument (possibly involving
@mymacro)
@@ -213,20 +228,25 @@ formatting.texi:73: warning: @inforef is obsolete
(possibly involving @mymacro)
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: accent command `@,' must not be followed by new
line (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: warning: accent 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: 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: @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)
formatting.texi:73: @dotless expects `i' or `j' as argument, not `a' (possibly
involving @mymacro)
+formatting.texi:73: warning: command `@U' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:73: @U expected braces (possibly involving @mymacro)
formatting.texi:73: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:73: non-hex digits in argument for @U: z (possibly involving
@mymacro)
formatting.texi:73: warning: fewer than four hex digits in argument for @U:
abc (possibly involving @mymacro)
formatting.texi:73: argument for @U exceeds Unicode maximum 0x10FFFF:
FFFFFFFFFFFFFF (possibly involving @mymacro)
formatting.texi:73: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
(possibly involving @mymacro)
+formatting.texi:73: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
+formatting.texi:73: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:73: @TeX expected braces (possibly involving @mymacro)
formatting.texi:73: unexpected @ (possibly involving @mymacro)
formatting.texi:73: @image missing filename argument (possibly involving
@mymacro)
diff --git
a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_abt.html
b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_abt.html
index f5846e4efc..35eed03d69 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_abt.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_abt.html
@@ -703,14 +703,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
diff --git
a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_fot.html
b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_fot.html
index 692e9f8e8c..2324128fd4 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_fot.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_fot.html
@@ -703,14 +703,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
diff --git
a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_ovr.html
b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_ovr.html
index 74cb814557..8337632540 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_ovr.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_ovr.html
@@ -703,14 +703,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
diff --git
a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_toc.html
b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_toc.html
index da140c80ac..3f723d90c1 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_toc.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_toc.html
@@ -703,14 +703,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
diff --git a/tp/tests/layout/res_parser/formatting_html_nodes/index.html
b/tp/tests/layout/res_parser/formatting_html_nodes/index.html
index 09b499f72d..399ec29680 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/index.html
@@ -703,14 +703,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
@@ -1802,13 +1800,11 @@ html ''
<p>Somehow invalid use of @,:<br>
-@, ̧
-<br>
+@, ̧<br>
@,@"u ̧ü
</p>
<p>Invalid use of @’:<br>
-@’ ́
-<br>
+@’ ́<br>
@’@"u ́ü
</p>
<p><code class="code">@|</code>
@@ -2880,13 +2876,11 @@ html ''
<p>Somehow invalid use of @,:<br>
-@, ̧
-<br>
+@, ̧<br>
@,@"u ̧ü
</p>
<p>Invalid use of @’:<br>
-@’ ́
-<br>
+@’ ́<br>
@’@"u ́ü
</p>
<p><code class="code">@|</code>
diff --git
a/tp/tests/layout/res_parser/formatting_html_nodes/s_002d_002dect_002cion.html
b/tp/tests/layout/res_parser/formatting_html_nodes/s_002d_002dect_002cion.html
index 8a64ebff8c..2155358c4b 100644
---
a/tp/tests/layout/res_parser/formatting_html_nodes/s_002d_002dect_002cion.html
+++
b/tp/tests/layout/res_parser/formatting_html_nodes/s_002d_002dect_002cion.html
@@ -703,14 +703,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
diff --git a/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html
b/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html
index 023d65b4e6..14c058be39 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html
@@ -703,14 +703,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
diff --git
a/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
b/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
index 512e4afc8b..2d4991cde1 100644
---
a/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
+++
b/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
@@ -703,14 +703,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
diff --git
a/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
b/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
index 9ac3cc7d29..a1c88fc420 100644
---
a/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
+++
b/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
@@ -703,14 +703,12 @@ Somehow invalid use of @,:
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
diff --git a/tp/tests/layout/res_parser/formatting_info/formatting.2
b/tp/tests/layout/res_parser/formatting_info/formatting.2
index da876daf90..6cf102e7dc 100644
--- a/tp/tests/layout/res_parser/formatting_info/formatting.2
+++ b/tp/tests/layout/res_parser/formatting_info/formatting.2
@@ -13,20 +13,25 @@ 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: @inforef is obsolete (possibly involving @mymacro)
-formatting.texi:22: warning: accent command `@,' must not be followed by new
line (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: warning: accent 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: 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: @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)
formatting.texi:22: @dotless expects `i' or `j' as argument, not `a' (possibly
involving @mymacro)
+formatting.texi:22: warning: command `@U' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:22: @U expected braces (possibly involving @mymacro)
formatting.texi:22: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:22: non-hex digits in argument for @U: z (possibly involving
@mymacro)
formatting.texi:22: warning: fewer than four hex digits in argument for @U:
abc (possibly involving @mymacro)
formatting.texi:22: argument for @U exceeds Unicode maximum 0x10FFFF:
FFFFFFFFFFFFFF (possibly involving @mymacro)
formatting.texi:22: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
(possibly involving @mymacro)
+formatting.texi:22: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
+formatting.texi:22: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:22: @TeX expected braces (possibly involving @mymacro)
formatting.texi:22: unexpected @ (possibly involving @mymacro)
formatting.texi:22: @image missing filename argument (possibly involving
@mymacro)
@@ -76,20 +81,25 @@ 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: @inforef is obsolete (possibly involving @mymacro)
-formatting.texi:32: warning: accent command `@,' must not be followed by new
line (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: warning: accent 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: 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: @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)
formatting.texi:32: @dotless expects `i' or `j' as argument, not `a' (possibly
involving @mymacro)
+formatting.texi:32: warning: command `@U' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:32: @U expected braces (possibly involving @mymacro)
formatting.texi:32: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:32: non-hex digits in argument for @U: z (possibly involving
@mymacro)
formatting.texi:32: warning: fewer than four hex digits in argument for @U:
abc (possibly involving @mymacro)
formatting.texi:32: argument for @U exceeds Unicode maximum 0x10FFFF:
FFFFFFFFFFFFFF (possibly involving @mymacro)
formatting.texi:32: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
(possibly involving @mymacro)
+formatting.texi:32: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
+formatting.texi:32: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:32: @TeX expected braces (possibly involving @mymacro)
formatting.texi:32: unexpected @ (possibly involving @mymacro)
formatting.texi:32: @image missing filename argument (possibly involving
@mymacro)
@@ -138,20 +148,25 @@ 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: @inforef is obsolete (possibly involving @mymacro)
-formatting.texi:68: warning: accent command `@,' must not be followed by new
line (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: warning: accent 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: 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: @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)
formatting.texi:68: @dotless expects `i' or `j' as argument, not `a' (possibly
involving @mymacro)
+formatting.texi:68: warning: command `@U' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:68: @U expected braces (possibly involving @mymacro)
formatting.texi:68: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:68: non-hex digits in argument for @U: z (possibly involving
@mymacro)
formatting.texi:68: warning: fewer than four hex digits in argument for @U:
abc (possibly involving @mymacro)
formatting.texi:68: argument for @U exceeds Unicode maximum 0x10FFFF:
FFFFFFFFFFFFFF (possibly involving @mymacro)
formatting.texi:68: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
(possibly involving @mymacro)
+formatting.texi:68: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
+formatting.texi:68: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:68: @TeX expected braces (possibly involving @mymacro)
formatting.texi:68: unexpected @ (possibly involving @mymacro)
formatting.texi:68: @image missing filename argument (possibly involving
@mymacro)
@@ -213,20 +228,25 @@ formatting.texi:73: warning: @inforef is obsolete
(possibly involving @mymacro)
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: accent command `@,' must not be followed by new
line (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: warning: accent 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: 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: @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)
formatting.texi:73: @dotless expects `i' or `j' as argument, not `a' (possibly
involving @mymacro)
+formatting.texi:73: warning: command `@U' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:73: @U expected braces (possibly involving @mymacro)
formatting.texi:73: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:73: non-hex digits in argument for @U: z (possibly involving
@mymacro)
formatting.texi:73: warning: fewer than four hex digits in argument for @U:
abc (possibly involving @mymacro)
formatting.texi:73: argument for @U exceeds Unicode maximum 0x10FFFF:
FFFFFFFFFFFFFF (possibly involving @mymacro)
formatting.texi:73: argument for @U exceeds Unicode maximum 0x10FFFF: 110000
(possibly involving @mymacro)
+formatting.texi:73: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
+formatting.texi:73: warning: command `@TeX' must not be followed by new line
(possibly involving @mymacro)
formatting.texi:73: @TeX expected braces (possibly involving @mymacro)
formatting.texi:73: unexpected @ (possibly involving @mymacro)
formatting.texi:73: @image missing filename argument (possibly involving
@mymacro)
diff --git a/tp/tests/layout/res_parser/formatting_info/formatting.info
b/tp/tests/layout/res_parser/formatting_info/formatting.info
index 6488a38061..d13f10bd3a 100644
--- a/tp/tests/layout/res_parser/formatting_info/formatting.info
+++ b/tp/tests/layout/res_parser/formatting_info/formatting.info
@@ -2750,14 +2750,12 @@ cross ref name: (file name). '@inforef{}' *note ::
@, ̧
-
@,@"u ̧ü
Invalid use of @':
@' ́
-
@'@"u ́ü
@|
@@ -2896,14 +2894,14 @@ aaa"