[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: Use @cartouche argument as cartouche title in tex
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: Use @cartouche argument as cartouche title in texi2any |
|
Date: |
Tue, 20 Dec 2022 17:53:47 -0500 |
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 6de28d2066 Use @cartouche argument as cartouche title in texi2any
6de28d2066 is described below
commit 6de28d2066040582e983ba1f7db609598011e99d
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Tue Dec 20 23:49:59 2022 +0100
Use @cartouche argument as cartouche title in texi2any
* tp/Texinfo/Convert/DocBook.pm (_convert), tp/Texinfo/Convert/HTML.pm
(_convert_cartouche_command, _convert), tp/Texinfo/Convert/LaTeX.pm
(_set_environment_options), tp/Texinfo/Convert/Plaintext.pm
(_convert), tp/Texinfo/Convert/TexinfoMarkup.pm
(%commands_args_elements), tp/Texinfo/Convert/Text.pm (_convert),
tp/Texinfo/command_data.txt, util/texinfo.dtd: add an argument to
@cartouche. Format the @cartouche argument as the cartouche title.
Based on a report from Arnold Robbins.
* tp/t/02coverage.t: add @cartouche argument in cartouche and
comment_on_cartouche_line tests.
* tp/tests/coverage_macro.texi: add @cartouche with argument.
---
ChangeLog | 18 +
tp/Texinfo/Convert/DocBook.pm | 9 +
tp/Texinfo/Convert/HTML.pm | 18 +-
tp/Texinfo/Convert/LaTeX.pm | 12 +-
tp/Texinfo/Convert/Plaintext.pm | 13 +
tp/Texinfo/Convert/TexinfoMarkup.pm | 1 +
tp/Texinfo/Convert/Text.pm | 3 +-
tp/Texinfo/XS/parsetexi/commands.h | 1 +
tp/Texinfo/command_data.txt | 2 +-
tp/t/02coverage.t | 11 +-
tp/t/results/coverage/cartouche.pl | 120 ++-
tp/t/results/coverage/comment_on_cartouche_line.pl | 125 +++
tp/tests/coverage_macro.texi | 4 +
.../layout/res_parser/formatting/formatting.html | 29 +
.../layout/res_parser/formatting_chm/anchor.html | 3 +
.../layout/res_parser/formatting_chm/chapter.html | 19 +
.../layout/res_parser/formatting_chm/chapter2.html | 3 +
.../res_parser/formatting_chm/formatting.html | 13 +
.../res_parser/formatting_chm/formatting_abt.html | 3 +
.../res_parser/formatting_chm/formatting_ovr.html | 3 +
.../res_parser/formatting_chm/formatting_toc.html | 3 +
.../layout/res_parser/formatting_chm/index.html | 3 +
.../formatting_chm/s_002d_002dect_002cion.html | 3 +
.../res_parser/formatting_chm/subsection.html | 3 +
...tion-_0060_0060simple_002ddouble_002d_002d.html | 3 +
...02d_002dfour_002d_002d_002d_002d_0027_0027.html | 3 +
.../res_parser/formatting_docbook/formatting.xml | 12 +
.../formatting_enable_encoding/formatting.html | 29 +
.../EPUB/xhtml/chapter.xhtml | 19 +
.../EPUB/xhtml/chapter2.xhtml | 3 +
.../EPUB/xhtml/formatting.xhtml | 13 +
.../EPUB/xhtml/formatting_abt.xhtml | 3 +
.../EPUB/xhtml/formatting_fot.xhtml | 3 +
.../EPUB/xhtml/formatting_ovr.xhtml | 3 +
.../EPUB/xhtml/formatting_toc.xhtml | 3 +
.../EPUB/xhtml/chapter.xhtml | 19 +
.../EPUB/xhtml/chapter2.xhtml | 3 +
.../EPUB/xhtml/formatting.xhtml | 13 +
.../EPUB/xhtml/formatting_abt.xhtml | 3 +
.../EPUB/xhtml/formatting_fot.xhtml | 3 +
.../EPUB/xhtml/formatting_ovr.xhtml | 3 +
.../EPUB/xhtml/formatting_toc.xhtml | 3 +
.../EPUB/xhtml/s_002d_002dect_002cion.xhtml | 3 +
.../EPUB/xhtml/subsection.xhtml | 3 +
...ion-_0060_0060simple_002ddouble_002d_002d.xhtml | 3 +
...2d_002dfour_002d_002d_002d_002d_0027_0027.xhtml | 3 +
.../res_parser/formatting_exotic/anchor.html | 3 +
.../res_parser/formatting_exotic/chapter.html | 19 +
.../res_parser/formatting_exotic/chapter2.html | 3 +
.../formatting_exotic/formatting_abt.html | 3 +
.../formatting_exotic/formatting_ovr.html | 3 +
.../formatting_exotic/formatting_toc.html | 3 +
.../layout/res_parser/formatting_exotic/index.html | 3 +
.../formatting_exotic/s_002d_002dect_002cion.html | 3 +
.../res_parser/formatting_exotic/subsection.html | 3 +
...tion-_0060_0060simple_002ddouble_002d_002d.html | 3 +
...02d_002dfour_002d_002d_002d_002d_0027_0027.html | 3 +
.../res_parser/formatting_fr_icons/formatting.html | 29 +
.../res_parser/formatting_html/formatting.html | 29 +
.../res_parser/formatting_html32/formatting.html | 29 +
.../formatting_html_no_texi2html/formatting.html | 19 +
.../res_parser/formatting_html_nodes/anchor.html | 3 +
.../res_parser/formatting_html_nodes/chapter.html | 19 +
.../res_parser/formatting_html_nodes/chapter2.html | 3 +
.../formatting_html_nodes/formatting_abt.html | 3 +
.../formatting_html_nodes/formatting_fot.html | 3 +
.../formatting_html_nodes/formatting_ovr.html | 3 +
.../formatting_html_nodes/formatting_toc.html | 3 +
.../res_parser/formatting_html_nodes/index.html | 13 +
.../s_002d_002dect_002cion.html | 3 +
.../formatting_html_nodes/subsection.html | 3 +
...tion-_0060_0060simple_002ddouble_002d_002d.html | 3 +
...02d_002dfour_002d_002d_002d_002d_0027_0027.html | 3 +
.../res_parser/formatting_info/formatting.info | 840 +++++++++++----------
.../formatting.info | 840 +++++++++++----------
.../formatting_inline_css/formatting.html | 29 +
.../res_parser/formatting_latex/formatting.tex | 24 +
.../formatting_macro_expand/formatting.texi | 20 +
.../res_parser/formatting_mathjax/formatting.html | 29 +
.../layout/res_parser/formatting_nodes/anchor.html | 3 +
.../res_parser/formatting_nodes/chapter.html | 19 +
.../res_parser/formatting_nodes/chapter2.html | 3 +
.../formatting_nodes/formatting_abt.html | 3 +
.../formatting_nodes/formatting_fot.html | 3 +
.../formatting_nodes/formatting_ovr.html | 3 +
.../formatting_nodes/formatting_toc.html | 3 +
.../layout/res_parser/formatting_nodes/index.html | 13 +
.../formatting_nodes/s_002d_002dect_002cion.html | 3 +
.../res_parser/formatting_nodes/subsection.html | 3 +
...tion-_0060_0060simple_002ddouble_002d_002d.html | 3 +
...02d_002dfour_002d_002d_002d_002d_0027_0027.html | 3 +
.../formatting_numerical_entities/formatting.html | 29 +
.../res_parser/formatting_plaintext/formatting.txt | 805 ++++++++++----------
.../res_parser/formatting_rawtext/formatting.txt | 6 +
.../formatting_regions/formatting_regions.html | 29 +
.../formatting_sort_element_counts/formatting.html | 29 +
.../formatting_elt_counts.txt | 4 +-
.../res_parser/formatting_textcontent/formatting | 12 +
.../formatting_weird_quotes/formatting.html | 29 +
.../res_parser/formatting_xhtml/formatting.html | 29 +
.../res_parser/formatting_xml/formatting.xml | 20 +
.../res_parser/formatting_singular/anchor.html | 2 +
.../res_parser/formatting_singular/chapter.html | 15 +
.../res_parser/formatting_singular/chapter2.html | 2 +
.../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 +
util/texinfo.dtd | 3 +-
115 files changed, 2432 insertions(+), 1238 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a59d31ed76..f98ea2ab34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2022-12-20 Patrice Dumas <pertusus@free.fr>
+
+ Use @cartouche argument as cartouche title in texi2any
+
+ * tp/Texinfo/Convert/DocBook.pm (_convert), tp/Texinfo/Convert/HTML.pm
+ (_convert_cartouche_command, _convert), tp/Texinfo/Convert/LaTeX.pm
+ (_set_environment_options), tp/Texinfo/Convert/Plaintext.pm
+ (_convert), tp/Texinfo/Convert/TexinfoMarkup.pm
+ (%commands_args_elements), tp/Texinfo/Convert/Text.pm (_convert),
+ tp/Texinfo/command_data.txt, util/texinfo.dtd: add an argument to
+ @cartouche. Format the @cartouche argument as the cartouche title.
+ Based on a report from Arnold Robbins.
+
+ * tp/t/02coverage.t: add @cartouche argument in cartouche and
+ comment_on_cartouche_line tests.
+
+ * tp/tests/coverage_macro.texi: add @cartouche with argument.
+
2022-11-19 Werner Lemberg <wl@gnu.org>
* doc/texinfo.tex (\code, \dashnobreak): Use a \penalty to disable
diff --git a/tp/Texinfo/Convert/DocBook.pm b/tp/Texinfo/Convert/DocBook.pm
index b984065510..5b49ed613c 100644
--- a/tp/Texinfo/Convert/DocBook.pm
+++ b/tp/Texinfo/Convert/DocBook.pm
@@ -1545,6 +1545,15 @@ sub _convert($$;$)
push @format_elements, $format_element;
} elsif ($element->{'cmdname'} eq 'cartouche') {
push @format_elements, 'sidebar';
+ if ($element->{'args'} and $element->{'args'}->[0]
+ and $element->{'args'}->[0]->{'contents'}
+ and @{$element->{'args'}->[0]->{'contents'}}) {
+ my $title = $self->_convert(
+ {'contents' => $element->{'args'}->[0]->{'contents'}});
+ if ($title ne '') {
+ $appended .= '<title>'.$title.'</title>'."\n";
+ }
+ }
} elsif ($Texinfo::Commands::block_commands{$element->{'cmdname'}} eq
'format_raw') {
return '' if
(!$self->{'expanded_formats_hash'}->{$element->{'cmdname'}});
# the context is here only for the command, so this is forgotten
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index f3084548fa..38906f3ec2 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -4835,9 +4835,20 @@ sub _convert_cartouche_command($$$$$)
my $args = shift;
my $content = shift;
- if ($content =~ /\S/ and !$self->in_string()) {
+ return $content if ($self->in_string());
+
+ my $title_content = '';
+ if ($args->[0] and $args->[0]->{'normal'} ne '') {
+ $title_content = "<tr><th>\n". $args->[0]->{'normal'} ."</th></tr>";
+ }
+ my $cartouche_content = '';
+ if ($content =~ /\S/) {
+ $cartouche_content = "<tr><td>\n". $content ."</td></tr>";
+ }
+ if ($cartouche_content ne '' or $title_content ne '') {
return $self->html_attribute_class('table', [$cmdname])
- ." border=\"1\"><tr><td>\n". $content ."</td></tr></table>\n";
+ . " border=\"1\">${title_content}${cartouche_content}"
+ . "</table>\n";
}
return $content;
}
@@ -11167,7 +11178,8 @@ sub _convert($$;$)
and $element->{'parent'}->{'type'} eq 'table_term'))
or ($command_name eq 'quotation'
or $command_name eq 'smallquotation')
- or ($command_name eq 'float')) {
+ or $command_name eq 'float'
+ or $command_name eq 'cartouche') {
$args_formatted = [];
if ($element->{'args'}) {
my @args_specification;
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index 64e485bcc5..0fbe9c9dc2 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -2048,7 +2048,17 @@ sub _set_environment_options($$$)
my $element = shift;
if (exists($LaTeX_environment_options{$command})) {
- return $LaTeX_environment_options{$command};
+ my $option = $LaTeX_environment_options{$command};
+ if ($command eq 'cartouche'
+ and $element->{'args'} and $element->{'args'}->[0]
+ and $element->{'args'}->[0]->{'contents'}
+ and @{$element->{'args'}->[0]->{'contents'}}) {
+ $option
+ = {'mdframed' => $option->{'mdframed'}
+ . ', frametitle={' . $self->_convert({'contents'
+ => $element->{'args'}->[0]->{'contents'}}) .'}'};
+ }
+ return $option;
}
if ($command eq 'enumerate') {
diff --git a/tp/Texinfo/Convert/Plaintext.pm b/tp/Texinfo/Convert/Plaintext.pm
index 3879948b42..05eecde0cd 100644
--- a/tp/Texinfo/Convert/Plaintext.pm
+++ b/tp/Texinfo/Convert/Plaintext.pm
@@ -2580,6 +2580,19 @@ sub _convert($$)
if ($element->{'extra'} and $element->{'extra'}->{'node_content'}) {
$result .= $self->_anchor($element);
}
+ } elsif ($command eq 'cartouche') {
+ if ($element->{'args'} and $element->{'args'}->[0]
+ and $element->{'args'}->[0]->{'contents'}
+ and @{$element->{'args'}->[0]->{'contents'}}) {
+ my $prepended = $self->gdt('@center @b{{cartouche_arg}}',
+ {'cartouche_arg' => $element->{'args'}->[0]->{'contents'}});
+ $prepended->{'type'} = 'frenchspacing';
+ $result .= $self->convert_line($prepended);
+ $self->{'text_element_context'}->[-1]->{'counter'} +=
+ Texinfo::Convert::Unicode::string_width($result);
+ $self->{'empty_lines_count'} = 0 unless ($result eq '');
+ _add_lines_count($self, 1);
+ }
}
} elsif ($command eq 'node') {
$self->{'current_node'} = $element;
diff --git a/tp/Texinfo/Convert/TexinfoMarkup.pm
b/tp/Texinfo/Convert/TexinfoMarkup.pm
index 271c2c6b6b..cb533dfded 100644
--- a/tp/Texinfo/Convert/TexinfoMarkup.pm
+++ b/tp/Texinfo/Convert/TexinfoMarkup.pm
@@ -190,6 +190,7 @@ our %commands_args_elements = (
# * means that the previous element is variadic, ie can appear indefinitely
'example' => ['examplelanguage', 'examplearg', '*'],
'quotation' => ['quotationtype'],
+ 'cartouche' => ['cartouchetitle'],
'float' => ['floattype', 'floatname'],
'itemize' => ['itemprepend'],
'enumerate' => ['enumeratefirst'],
diff --git a/tp/Texinfo/Convert/Text.pm b/tp/Texinfo/Convert/Text.pm
index fdec83a30e..bfa7aec535 100644
--- a/tp/Texinfo/Convert/Text.pm
+++ b/tp/Texinfo/Convert/Text.pm
@@ -542,7 +542,8 @@ sub _convert($;$)
# block commands
} elsif ($element->{'cmdname'} eq 'quotation'
or $element->{'cmdname'} eq 'smallquotation'
- or $element->{'cmdname'} eq 'float') {
+ or $element->{'cmdname'} eq 'float'
+ or $element->{'cmdname'} eq 'cartouche') {
if ($element->{'args'}) {
foreach my $arg (@{$element->{'args'}}) {
my $converted_arg = _convert($arg, $options);
diff --git a/tp/Texinfo/XS/parsetexi/commands.h
b/tp/Texinfo/XS/parsetexi/commands.h
index 75f85f9128..5b71074bdd 100644
--- a/tp/Texinfo/XS/parsetexi/commands.h
+++ b/tp/Texinfo/XS/parsetexi/commands.h
@@ -137,6 +137,7 @@ void wipe_user_commands (void);
#define BLOCK_preformatted -12
/* not used in code but consistent with type in perl hash */
#define BLOCK_math -13
+#define BLOCK_other -14
/* Types of brace command (CF_brace). */
#define BRACE_arguments 1
diff --git a/tp/Texinfo/command_data.txt b/tp/Texinfo/command_data.txt
index 2e98620647..7d5346801a 100644
--- a/tp/Texinfo/command_data.txt
+++ b/tp/Texinfo/command_data.txt
@@ -524,7 +524,7 @@ flushright block,close_paragraph
indentedblock block,close_paragraph
smallindentedblock block,close_paragraph
-cartouche block,close_paragraph
+cartouche block,close_paragraph BLOCK_other 1
group block,close_paragraph
# region commands
diff --git a/tp/t/02coverage.t b/tp/t/02coverage.t
index 014efe91ee..be67f545c4 100644
--- a/tp/t/02coverage.t
+++ b/tp/t/02coverage.t
@@ -321,7 +321,12 @@ After quotation sp b a
['cartouche',
'@cartouche
in cartouche.
-@end cartouche'],
+@end cartouche
+
+@cartouche @emph{Title of box}
+Out of main text
+@end cartouche
+'],
['indentedblock',
'@indentedblock
indented block
@@ -333,6 +338,10 @@ Text
'@cartouche @c comment
in cartouche.
@end cartouche
+
+@cartouche @emph{Title of box} @c comment
+Out of main text
+@end cartouche
'],
['comment_on_group_line',
'@group @c comment
diff --git a/tp/t/results/coverage/cartouche.pl
b/tp/t/results/coverage/cartouche.pl
index 36261bc016..25d374c42d 100644
--- a/tp/t/results/coverage/cartouche.pl
+++ b/tp/t/results/coverage/cartouche.pl
@@ -38,6 +38,10 @@ $result_trees{'cartouche'} = {
'text' => 'cartouche'
}
],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
'type' => 'line_arg'
}
],
@@ -60,6 +64,90 @@ $result_trees{'cartouche'} = {
'line_nr' => 1,
'macro' => ''
}
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'Title of box'
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'emph',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'cartouche',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'Out of main text
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'cartouche'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'text_arg' => 'cartouche'
+ },
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ }
}
],
'type' => 'before_node_section'
@@ -70,10 +158,18 @@ $result_trees{'cartouche'} = {
$result_texis{'cartouche'} = '@cartouche
in cartouche.
-@end cartouche';
+@end cartouche
+
+@cartouche @emph{Title of box}
+Out of main text
+@end cartouche
+';
$result_texts{'cartouche'} = 'in cartouche.
+
+Title of box
+Out of main text
';
$result_errors{'cartouche'} = [];
@@ -84,27 +180,47 @@ $result_floats{'cartouche'} = {};
$result_converted{'plaintext'}->{'cartouche'} = 'in cartouche.
+
+ _Title of box_
+Out of main text
';
$result_converted{'html_text'}->{'cartouche'} = '<table class="cartouche"
border="1"><tr><td>
<p>in cartouche.
</p></td></tr></table>
+
+<table class="cartouche" border="1"><tr><th>
+<em class="emph">Title of box</em></th></tr><tr><td>
+<p>Out of main text
+</p></td></tr></table>
';
$result_converted{'xml'}->{'cartouche'} = '<cartouche endspaces=" ">
<para>in cartouche.
-</para></cartouche>';
+</para></cartouche>
+
+<cartouche spaces=" " endspaces=" "><cartouchetitle><emph>Title of
box</emph></cartouchetitle>
+<para>Out of main text
+</para></cartouche>
+';
$result_converted{'latex_text'}->{'cartouche'} =
'\\begin{mdframed}[style=Texinfocartouche]
in cartouche.
\\end{mdframed}
+
+\\begin{mdframed}[style=Texinfocartouche, frametitle={\\emph{Title of box}}]
+Out of main text
+\\end{mdframed}
';
$result_converted{'docbook'}->{'cartouche'} = '<sidebar><para>in cartouche.
+</para></sidebar>
+<sidebar><title><emphasis>Title of box</emphasis></title>
+<para>Out of main text
</para></sidebar>';
1;
diff --git a/tp/t/results/coverage/comment_on_cartouche_line.pl
b/tp/t/results/coverage/comment_on_cartouche_line.pl
index 946071a5f9..fc8bada810 100644
--- a/tp/t/results/coverage/comment_on_cartouche_line.pl
+++ b/tp/t/results/coverage/comment_on_cartouche_line.pl
@@ -81,6 +81,105 @@ $result_trees{'comment_on_cartouche_line'} = {
'line_nr' => 1,
'macro' => ''
}
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'Title of box'
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'emph',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'info' => {
+ 'comment_at_end' => {
+ 'args' => [
+ {
+ 'text' => ' comment
+',
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'c',
+ 'extra' => {
+ 'misc_args' => [
+ ' comment
+'
+ ]
+ }
+ },
+ 'spaces_after_argument' => ' '
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'cartouche',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'Out of main text
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'cartouche'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'text_arg' => 'cartouche'
+ },
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ }
}
],
'type' => 'before_node_section'
@@ -92,10 +191,17 @@ $result_trees{'comment_on_cartouche_line'} = {
$result_texis{'comment_on_cartouche_line'} = '@cartouche @c comment
in cartouche.
@end cartouche
+
+@cartouche @emph{Title of box} @c comment
+Out of main text
+@end cartouche
';
$result_texts{'comment_on_cartouche_line'} = 'in cartouche.
+
+Title of box
+Out of main text
';
$result_errors{'comment_on_cartouche_line'} = [];
@@ -106,28 +212,47 @@ $result_floats{'comment_on_cartouche_line'} = {};
$result_converted{'plaintext'}->{'comment_on_cartouche_line'} = 'in cartouche.
+
+ _Title of box_
+Out of main text
';
$result_converted{'html_text'}->{'comment_on_cartouche_line'} = '<table
class="cartouche" border="1"><tr><td>
<p>in cartouche.
</p></td></tr></table>
+
+<table class="cartouche" border="1"><tr><th>
+<em class="emph">Title of box</em></th></tr><tr><td>
+<p>Out of main text
+</p></td></tr></table>
';
$result_converted{'xml'}->{'comment_on_cartouche_line'} = '<cartouche spaces="
" endspaces=" "><!-- c comment -->
<para>in cartouche.
</para></cartouche>
+
+<cartouche spaces=" " endspaces=" "><cartouchetitle><emph>Title of box</emph>
</cartouchetitle><!-- c comment -->
+<para>Out of main text
+</para></cartouche>
';
$result_converted{'latex_text'}->{'comment_on_cartouche_line'} =
'\\begin{mdframed}[style=Texinfocartouche]
in cartouche.
\\end{mdframed}
+
+\\begin{mdframed}[style=Texinfocartouche, frametitle={\\emph{Title of box}}]
+Out of main text
+\\end{mdframed}
';
$result_converted{'docbook'}->{'comment_on_cartouche_line'} =
'<sidebar><para>in cartouche.
+</para></sidebar>
+<sidebar><title><emphasis>Title of box</emphasis></title>
+<para>Out of main text
</para></sidebar>';
1;
diff --git a/tp/tests/coverage_macro.texi b/tp/tests/coverage_macro.texi
index ff269a1b87..6b221406b3 100644
--- a/tp/tests/coverage_macro.texi
+++ b/tp/tests/coverage_macro.texi
@@ -926,6 +926,10 @@ Value--table samp
c--artouche
@end cartouche
+@cartouche Tit--le @emph{of box}
+With title c--artouche
+@end cartouche
+
@flushleft
f--lushleft
more text
diff --git a/tp/tests/layout/res_parser/formatting/formatting.html
b/tp/tests/layout/res_parser/formatting/formatting.html
index 970fba6a5a..a11c165d4b 100644
--- a/tp/tests/layout/res_parser/formatting/formatting.html
+++ b/tp/tests/layout/res_parser/formatting/formatting.html
@@ -653,6 +653,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
@@ -1784,6 +1787,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -2872,6 +2880,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -4017,6 +4030,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -5103,6 +5121,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -6316,6 +6339,12 @@ ref</a>
</pre></td></tr></table>
<pre class="example-preformatted">
+</pre><table class="cartouche" border="1"><tr><th>
+Tit--le <em class="emph">of box</em></th></tr><tr><td>
+<pre class="example-preformatted">With title c--artouche
+</pre></td></tr></table>
+<pre class="example-preformatted">
+
</pre><div class="flushleft"><pre class="example-preformatted">f--lushleft
more text
</pre></div><pre class="example-preformatted">
diff --git a/tp/tests/layout/res_parser/formatting_chm/anchor.html
b/tp/tests/layout/res_parser/formatting_chm/anchor.html
index ffdc6ad56a..7c28287c16 100644
--- a/tp/tests/layout/res_parser/formatting_chm/anchor.html
+++ b/tp/tests/layout/res_parser/formatting_chm/anchor.html
@@ -654,6 +654,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
diff --git a/tp/tests/layout/res_parser/formatting_chm/chapter.html
b/tp/tests/layout/res_parser/formatting_chm/chapter.html
index a7f3e00243..31a37bf24b 100644
--- a/tp/tests/layout/res_parser/formatting_chm/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_chm/chapter.html
@@ -653,6 +653,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
@@ -1780,6 +1783,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -2866,6 +2874,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -4079,6 +4092,12 @@ ref</a>
</pre></td></tr></table>
<pre class="example-preformatted">
+</pre><table class="cartouche" border="1"><tr><th>
+Tit--le <em class="emph">of box</em></th></tr><tr><td>
+<pre class="example-preformatted">With title c--artouche
+</pre></td></tr></table>
+<pre class="example-preformatted">
+
</pre><div class="flushleft"><pre class="example-preformatted">f--lushleft
more text
</pre></div><pre class="example-preformatted">
diff --git a/tp/tests/layout/res_parser/formatting_chm/chapter2.html
b/tp/tests/layout/res_parser/formatting_chm/chapter2.html
index 658d9e8062..e28a01d342 100644
--- a/tp/tests/layout/res_parser/formatting_chm/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_chm/chapter2.html
@@ -653,6 +653,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting.html
b/tp/tests/layout/res_parser/formatting_chm/formatting.html
index 873286d033..51a0e2798e 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting.html
@@ -653,6 +653,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
@@ -1765,6 +1768,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -2853,6 +2861,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
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 0f9120bd86..53741064d0 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting_abt.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting_abt.html
@@ -653,6 +653,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
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 58c5f08125..323173b5d5 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html
@@ -653,6 +653,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
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 568871d3e9..5d792bce34 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html
@@ -653,6 +653,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
diff --git a/tp/tests/layout/res_parser/formatting_chm/index.html
b/tp/tests/layout/res_parser/formatting_chm/index.html
index 2e7fdfb4c5..b9641b655d 100644
--- a/tp/tests/layout/res_parser/formatting_chm/index.html
+++ b/tp/tests/layout/res_parser/formatting_chm/index.html
@@ -654,6 +654,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
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 37b38a8e63..a5b6d50cfe 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
@@ -653,6 +653,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
diff --git a/tp/tests/layout/res_parser/formatting_chm/subsection.html
b/tp/tests/layout/res_parser/formatting_chm/subsection.html
index 49da925ae8..3491803f3d 100644
--- a/tp/tests/layout/res_parser/formatting_chm/subsection.html
+++ b/tp/tests/layout/res_parser/formatting_chm/subsection.html
@@ -653,6 +653,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
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 ada698d5e4..e0d4a6d13a 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
@@ -653,6 +653,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
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 aea662725b..34f3e36df3 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
@@ -653,6 +653,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
diff --git a/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
b/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
index 85d70819ec..5fed485915 100644
--- a/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
+++ b/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
@@ -685,6 +685,9 @@ ref” in <filename>a comma, in file</filename>
</para></listitem></varlistentry></variablelist>
<sidebar><para>c–artouche
</para></sidebar>
+<sidebar><title>Tit–le <emphasis>of box</emphasis></title>
+<para>With title c–artouche
+</para></sidebar>
<para>f–lushleft
more text
</para>
@@ -1612,6 +1615,9 @@ ref” in <filename>a comma, in file</filename>
</para></listitem></varlistentry></variablelist>
<sidebar><para>c–artouche
</para></sidebar>
+<sidebar><title>Tit–le <emphasis>of box</emphasis></title>
+<para>With title c–artouche
+</para></sidebar>
<para>f–lushleft
more text
</para>
@@ -2526,6 +2532,9 @@ ref” in <filename>a comma, in file</filename>
</para></listitem></varlistentry></variablelist>
<sidebar><para>c–artouche
</para></sidebar>
+<sidebar><title>Tit–le <emphasis>of box</emphasis></title>
+<para>With title c–artouche
+</para></sidebar>
<para>f–lushleft
more text
</para>
@@ -3432,6 +3441,9 @@ section ``title with uref2 <ulink
url="href://http/myhost.com/index2.html">uref2
</screen></listitem></varlistentry></variablelist><screen>
</screen><sidebar><screen>c--artouche
</screen></sidebar><screen>
+</screen><sidebar><title>Tit--le <emphasis>of box</emphasis></title>
+<screen>With title c--artouche
+</screen></sidebar><screen>
</screen><screen>f--lushleft
more text
</screen><screen>
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 cd0abe559c..5957cb3a63 100644
--- a/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
@@ -653,6 +653,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
@@ -1784,6 +1787,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -2872,6 +2880,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -4017,6 +4030,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -5103,6 +5121,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -6316,6 +6339,12 @@ ref</a>
</pre></td></tr></table>
<pre class="example-preformatted">
+</pre><table class="cartouche" border="1"><tr><th>
+Tit--le <em class="emph">of box</em></th></tr><tr><td>
+<pre class="example-preformatted">With title c--artouche
+</pre></td></tr></table>
+<pre class="example-preformatted">
+
</pre><div class="flushleft"><pre class="example-preformatted">f--lushleft
more text
</pre></div><pre class="example-preformatted">
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 8e87c3679c..d11ffc3d11 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
@@ -654,6 +654,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
@@ -1780,6 +1783,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -2866,6 +2874,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -4079,6 +4092,12 @@ ref</a>
</pre></td></tr></table>
<pre class="example-preformatted">
+</pre><table class="cartouche" border="1"><tr><th>
+Tit--le <em class="emph">of box</em></th></tr><tr><td>
+<pre class="example-preformatted">With title c--artouche
+</pre></td></tr></table>
+<pre class="example-preformatted">
+
</pre><div class="flushleft"><pre class="example-preformatted">f--lushleft
more text
</pre></div><pre class="example-preformatted">
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 3096be7e1a..b3417cadf7 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
@@ -654,6 +654,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
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 bae74533a2..a64a22818b 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
@@ -654,6 +654,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
@@ -1764,6 +1767,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -2852,6 +2860,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
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 e9d2fdf831..2f19e52b34 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
@@ -654,6 +654,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
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 fce4738756..774614a706 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
@@ -654,6 +654,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
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 eba26586bc..1c31e9c337 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
@@ -654,6 +654,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
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 b36491311c..e00ccd191b 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
@@ -654,6 +654,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
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 5cfd2064d8..a61da7d004 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
@@ -654,6 +654,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
@@ -1781,6 +1784,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -2867,6 +2875,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -4080,6 +4093,12 @@ ref</a>
</pre></td></tr></table>
<pre class="example-preformatted">
+</pre><table class="cartouche" border="1"><tr><th>
+Tit--le <em class="emph">of box</em></th></tr><tr><td>
+<pre class="example-preformatted">With title c--artouche
+</pre></td></tr></table>
+<pre class="example-preformatted">
+
</pre><div class="flushleft"><pre class="example-preformatted">f--lushleft
more text
</pre></div><pre class="example-preformatted">
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 3d08c4466f..de148a8990 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
@@ -654,6 +654,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
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 0a220c7c8e..abd5892988 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
@@ -654,6 +654,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
@@ -1766,6 +1769,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -2854,6 +2862,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
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 bdee05c823..4aefd917fb 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
@@ -654,6 +654,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
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 c952f3a15a..ac26790d6e 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
@@ -654,6 +654,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
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 7253ed62e1..0a297fa703 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
@@ -654,6 +654,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
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 f0d6189da4..c2208f8907 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
@@ -654,6 +654,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
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 6657297540..8c8688c82c 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
@@ -654,6 +654,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
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 e10a9b7de9..cff81978ef 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
@@ -654,6 +654,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
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 9ce77d74ef..bd658353f8 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
@@ -654,6 +654,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
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 0cd845082f..47dab4e43e 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
@@ -654,6 +654,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
diff --git a/tp/tests/layout/res_parser/formatting_exotic/anchor.html
b/tp/tests/layout/res_parser/formatting_exotic/anchor.html
index a6a0d34c1a..158ecad032 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/anchor.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/anchor.html
@@ -654,6 +654,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
diff --git a/tp/tests/layout/res_parser/formatting_exotic/chapter.html
b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
index ddc6e15cde..5567afd309 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
@@ -653,6 +653,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
@@ -1799,6 +1802,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -2885,6 +2893,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -4094,6 +4107,12 @@ ref</a>
</pre></td></tr></table>
<pre class="example-preformatted">
+</pre><table class="cartouche" border="1"><tr><th>
+Tit--le <em class="emph">of box</em></th></tr><tr><td>
+<pre class="example-preformatted">With title c--artouche
+</pre></td></tr></table>
+<pre class="example-preformatted">
+
</pre><div class="flushleft"><pre class="example-preformatted">f--lushleft
more text
</pre></div><pre class="example-preformatted">
diff --git a/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
b/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
index 16af78ff63..f08f230fcc 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
@@ -653,6 +653,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
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 39e3e1614c..9db7f81ba7 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html
@@ -653,6 +653,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
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 7878d20f99..a913aa7718 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html
@@ -653,6 +653,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
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 6adabbbb94..a97d86f051 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html
@@ -653,6 +653,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
diff --git a/tp/tests/layout/res_parser/formatting_exotic/index.html
b/tp/tests/layout/res_parser/formatting_exotic/index.html
index 20f23b7a60..23b421ed88 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/index.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/index.html
@@ -653,6 +653,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
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 c294d85145..4ba6056d94 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
@@ -653,6 +653,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
diff --git a/tp/tests/layout/res_parser/formatting_exotic/subsection.html
b/tp/tests/layout/res_parser/formatting_exotic/subsection.html
index a1853b863f..c608f019b1 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/subsection.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/subsection.html
@@ -654,6 +654,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
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 60b7018bf4..e9089a7292 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
@@ -654,6 +654,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
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 1ce6d0da99..67bf2815bf 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
@@ -654,6 +654,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
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 0fe7885ef9..38dd297c88 100644
--- a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
@@ -653,6 +653,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
@@ -1784,6 +1787,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -2872,6 +2880,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -4017,6 +4030,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -5103,6 +5121,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -6316,6 +6339,12 @@ ref</a>
</pre></td></tr></table>
<pre class="example-preformatted">
+</pre><table class="cartouche" border="1"><tr><th>
+Tit--le <em class="emph">of box</em></th></tr><tr><td>
+<pre class="example-preformatted">With title c--artouche
+</pre></td></tr></table>
+<pre class="example-preformatted">
+
</pre><div class="flushleft"><pre class="example-preformatted">f--lushleft
more text
</pre></div><pre class="example-preformatted">
diff --git a/tp/tests/layout/res_parser/formatting_html/formatting.html
b/tp/tests/layout/res_parser/formatting_html/formatting.html
index 970fba6a5a..a11c165d4b 100644
--- a/tp/tests/layout/res_parser/formatting_html/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html/formatting.html
@@ -653,6 +653,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
@@ -1784,6 +1787,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -2872,6 +2880,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -4017,6 +4030,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -5103,6 +5121,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -6316,6 +6339,12 @@ ref</a>
</pre></td></tr></table>
<pre class="example-preformatted">
+</pre><table class="cartouche" border="1"><tr><th>
+Tit--le <em class="emph">of box</em></th></tr><tr><td>
+<pre class="example-preformatted">With title c--artouche
+</pre></td></tr></table>
+<pre class="example-preformatted">
+
</pre><div class="flushleft"><pre class="example-preformatted">f--lushleft
more text
</pre></div><pre class="example-preformatted">
diff --git a/tp/tests/layout/res_parser/formatting_html32/formatting.html
b/tp/tests/layout/res_parser/formatting_html32/formatting.html
index 0ce3e9371f..f055cb4664 100644
--- a/tp/tests/layout/res_parser/formatting_html32/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html32/formatting.html
@@ -653,6 +653,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
@@ -1717,6 +1720,11 @@ ref</a>
<p>c-artouche
</p></td></tr></table>
+<table border="1"><tr><th>
+Tit-le <em>of box</em></th></tr><tr><td>
+<p>With title c-artouche
+</p></td></tr></table>
+
<div><p align="left">f-lushleft
more text
</p></div>
@@ -2779,6 +2787,11 @@ ref</a>
<p>c-artouche
</p></td></tr></table>
+<table border="1"><tr><th>
+Tit-le <em>of box</em></th></tr><tr><td>
+<p>With title c-artouche
+</p></td></tr></table>
+
<div><p align="left">f-lushleft
more text
</p></div>
@@ -3898,6 +3911,11 @@ ref</a>
<p>c-artouche
</p></td></tr></table>
+<table border="1"><tr><th>
+Tit-le <em>of box</em></th></tr><tr><td>
+<p>With title c-artouche
+</p></td></tr></table>
+
<div><p align="left">f-lushleft
more text
</p></div>
@@ -4958,6 +4976,11 @@ ref</a>
<p>c-artouche
</p></td></tr></table>
+<table border="1"><tr><th>
+Tit-le <em>of box</em></th></tr><tr><td>
+<p>With title c-artouche
+</p></td></tr></table>
+
<div><p align="left">f-lushleft
more text
</p></div>
@@ -6144,6 +6167,12 @@ ref</a>
</pre></td></tr></table>
<pre>
+</pre><table border="1"><tr><th>
+Tit--le <em>of box</em></th></tr><tr><td>
+<pre>With title c--artouche
+</pre></td></tr></table>
+<pre>
+
</pre><div><pre>f--lushleft
more text
</pre></div><pre>
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 bc867df73d..8d62164123 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
@@ -653,6 +653,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
@@ -1839,6 +1842,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -2925,6 +2933,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -4138,6 +4151,12 @@ ref</a>
</pre></td></tr></table>
<pre class="example-preformatted">
+</pre><table class="cartouche" border="1"><tr><th>
+Tit--le <em class="emph">of box</em></th></tr><tr><td>
+<pre class="example-preformatted">With title c--artouche
+</pre></td></tr></table>
+<pre class="example-preformatted">
+
</pre><div class="flushleft"><pre class="example-preformatted">f--lushleft
more text
</pre></div><pre class="example-preformatted">
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 ffdc6ad56a..7c28287c16 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/anchor.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/anchor.html
@@ -654,6 +654,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
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 a1a03ac57c..c584e11c73 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
@@ -653,6 +653,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
@@ -1800,6 +1803,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -2886,6 +2894,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -4099,6 +4112,12 @@ ref</a>
</pre></td></tr></table>
<pre class="example-preformatted">
+</pre><table class="cartouche" border="1"><tr><th>
+Tit--le <em class="emph">of box</em></th></tr><tr><td>
+<pre class="example-preformatted">With title c--artouche
+</pre></td></tr></table>
+<pre class="example-preformatted">
+
</pre><div class="flushleft"><pre class="example-preformatted">f--lushleft
more text
</pre></div><pre class="example-preformatted">
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 afa5d2c75e..87681a89ea 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html
@@ -653,6 +653,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
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 7ec322572a..7bcb6e9c82 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
@@ -653,6 +653,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
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 36fb171474..6fd99bb6b9 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
@@ -653,6 +653,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
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 a4499ee743..97de822212 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
@@ -653,6 +653,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
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 1be2a726ef..bc3cab8e0b 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
@@ -653,6 +653,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
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 2bbf8338a7..01e346bce7 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/index.html
@@ -653,6 +653,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
@@ -1770,6 +1773,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -2858,6 +2866,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
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 f330554f33..905bee3907 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
@@ -653,6 +653,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
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 ad82291b44..f14bac00e8 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html
@@ -653,6 +653,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
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 559f0dda07..7e24d0bee0 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
@@ -653,6 +653,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
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 bb74ebded0..cbfdf4a4be 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
@@ -653,6 +653,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
diff --git a/tp/tests/layout/res_parser/formatting_info/formatting.info
b/tp/tests/layout/res_parser/formatting_info/formatting.info
index cf070565ef..ee23651b87 100644
--- a/tp/tests/layout/res_parser/formatting_info/formatting.info
+++ b/tp/tests/layout/res_parser/formatting_info/formatting.info
@@ -514,6 +514,9 @@ _b_
c-artouche
+ Tit-le _of box_
+With title c-artouche
+
f-lushleft
more text
@@ -1235,6 +1238,9 @@ _b_
c-artouche
+ Tit-le _of box_
+With title c-artouche
+
f-lushleft
more text
@@ -1913,6 +1919,9 @@ _b_
c-artouche
+ Tit-le _of box_
+With title c-artouche
+
f-lushleft
more text
@@ -2729,6 +2738,9 @@ cross ref name: (file name). '@inforef{}' *note ::
c--artouche
+ Tit-le _of box_
+ With title c--artouche
+
f--lushleft
more text
@@ -2940,14 +2952,14 @@ aaa" ]
[index ]
* Menu:
-* truc: chapter. (line 2203)
+* truc: chapter. (line 2215)
codeidx
[index ]
* Menu:
-* a INDEX---ENTRY tẽ --- î: chapter. (line 2203)
+* a INDEX---ENTRY tẽ --- î: chapter. (line 2215)
cp
@@ -2955,116 +2967,116 @@ aaa" ]
* Menu:
* ": chapter. (line 28)
-* " <1>: chapter. (line 698)
-* " <2>: chapter. (line 1379)
+* " <1>: chapter. (line 702)
+* " <2>: chapter. (line 1387)
* -option: chapter. (line 28)
-* -option <1>: chapter. (line 698)
-* -option <2>: chapter. (line 1379)
-* .: chapter. (line 2203)
-* ?: chapter. (line 2203)
-* a: chapter. (line 2203)
-* aaa, bbb: chapter. (line 2203)
-* a--a: chapter. (line 2203)
+* -option <1>: chapter. (line 702)
+* -option <2>: chapter. (line 1387)
+* .: chapter. (line 2215)
+* ?: chapter. (line 2215)
+* a: chapter. (line 2215)
+* aaa, bbb: chapter. (line 2215)
+* a--a: chapter. (line 2215)
* a--asis: chapter. (line 510)
-* a--asis <1>: chapter. (line 1180)
-* a--asis <2>: chapter. (line 1988)
+* a--asis <1>: chapter. (line 1184)
+* a--asis <2>: chapter. (line 1996)
* b: chapter. (line 511)
-* b <1>: chapter. (line 1181)
-* b <2>: chapter. (line 1989)
-* b--b, c--c: chapter. (line 2203)
+* b <1>: chapter. (line 1185)
+* b <2>: chapter. (line 1997)
+* b--b, c--c: chapter. (line 2215)
* counting entry: chapter. (line 4)
-* d--dd, e--ee, f--ff: chapter. (line 2203)
+* d--dd, e--ee, f--ff: chapter. (line 2215)
* d--efcv_name: chapter. (line 351)
* d--efcv_name <1>: chapter. (line 354)
-* d--efcv_name <2>: chapter. (line 1021)
-* d--efcv_name <3>: chapter. (line 1024)
-* d--efcv_name <4>: chapter. (line 1829)
-* d--efcv_name <5>: chapter. (line 1832)
+* d--efcv_name <2>: chapter. (line 1025)
+* d--efcv_name <3>: chapter. (line 1028)
+* d--efcv_name <4>: chapter. (line 1837)
+* d--efcv_name <5>: chapter. (line 1840)
* d--efivar_name of c--lass: chapter. (line 396)
-* d--efivar_name of c--lass <1>: chapter. (line 1066)
-* d--efivar_name of c--lass <2>: chapter. (line 1874)
+* d--efivar_name of c--lass <1>: chapter. (line 1070)
+* d--efivar_name of c--lass <2>: chapter. (line 1882)
* d--efopt_name: chapter. (line 387)
-* d--efopt_name <1>: chapter. (line 1057)
-* d--efopt_name <2>: chapter. (line 1865)
+* d--efopt_name <1>: chapter. (line 1061)
+* d--efopt_name <2>: chapter. (line 1873)
* d--eftypecv_name of c--lass: chapter. (line 357)
* d--eftypecv_name of c--lass <1>: chapter. (line 360)
-* d--eftypecv_name of c--lass <2>: chapter. (line 1027)
-* d--eftypecv_name of c--lass <3>: chapter. (line 1030)
-* d--eftypecv_name of c--lass <4>: chapter. (line 1835)
-* d--eftypecv_name of c--lass <5>: chapter. (line 1838)
+* d--eftypecv_name of c--lass <2>: chapter. (line 1031)
+* d--eftypecv_name of c--lass <3>: chapter. (line 1034)
+* d--eftypecv_name of c--lass <4>: chapter. (line 1843)
+* d--eftypecv_name of c--lass <5>: chapter. (line 1846)
* d--eftypecv_name2 of c--lass2: chapter. (line 428)
* d--eftypecv_name2 of c--lass2 <1>: chapter. (line 431)
-* d--eftypecv_name2 of c--lass2 <2>: chapter. (line 1098)
-* d--eftypecv_name2 of c--lass2 <3>: chapter. (line 1101)
-* d--eftypecv_name2 of c--lass2 <4>: chapter. (line 1907)
-* d--eftypecv_name2 of c--lass2 <5>: chapter. (line 1910)
+* d--eftypecv_name2 of c--lass2 <2>: chapter. (line 1102)
+* d--eftypecv_name2 of c--lass2 <3>: chapter. (line 1105)
+* d--eftypecv_name2 of c--lass2 <4>: chapter. (line 1915)
+* d--eftypecv_name2 of c--lass2 <5>: chapter. (line 1918)
* d--eftypeivar_name of c--lass: chapter. (line 399)
-* d--eftypeivar_name of c--lass <1>: chapter. (line 1069)
-* d--eftypeivar_name of c--lass <2>: chapter. (line 1877)
+* d--eftypeivar_name of c--lass <1>: chapter. (line 1073)
+* d--eftypeivar_name of c--lass <2>: chapter. (line 1885)
* d--eftypevar_name: chapter. (line 393)
-* d--eftypevar_name <1>: chapter. (line 1063)
-* d--eftypevar_name <2>: chapter. (line 1871)
+* d--eftypevar_name <1>: chapter. (line 1067)
+* d--eftypevar_name <2>: chapter. (line 1879)
* d--eftypevr_name: chapter. (line 348)
-* d--eftypevr_name <1>: chapter. (line 1018)
-* d--eftypevr_name <2>: chapter. (line 1826)
+* d--eftypevr_name <1>: chapter. (line 1022)
+* d--eftypevr_name <2>: chapter. (line 1834)
* d--efvar_name: chapter. (line 381)
* d--efvar_name <1>: chapter. (line 384)
-* d--efvar_name <2>: chapter. (line 1051)
-* d--efvar_name <3>: chapter. (line 1054)
-* d--efvar_name <4>: chapter. (line 1859)
-* d--efvar_name <5>: chapter. (line 1862)
+* d--efvar_name <2>: chapter. (line 1055)
+* d--efvar_name <3>: chapter. (line 1058)
+* d--efvar_name <4>: chapter. (line 1867)
+* d--efvar_name <5>: chapter. (line 1870)
* d--efvr_name: chapter. (line 327)
-* d--efvr_name <1>: chapter. (line 997)
-* d--efvr_name <2>: chapter. (line 1805)
-* g--gg, h--hh jjj, k--kk, l--ll: chapter. (line 2203)
+* d--efvr_name <1>: chapter. (line 1001)
+* d--efvr_name <2>: chapter. (line 1813)
+* g--gg, h--hh jjj, k--kk, l--ll: chapter. (line 2215)
* index entry between item and itemx: chapter. (line 515)
-* index entry between item and itemx <1>: chapter. (line 633)
-* index entry between item and itemx <2>: chapter. (line 1185)
-* index entry between item and itemx <3>: chapter. (line 1303)
-* index entry between item and itemx <4>: chapter. (line 1993)
-* index entry between item and itemx <5>: chapter. (line 2144)
+* index entry between item and itemx <1>: chapter. (line 637)
+* index entry between item and itemx <2>: chapter. (line 1189)
+* index entry between item and itemx <3>: chapter. (line 1311)
+* index entry between item and itemx <4>: chapter. (line 2001)
+* index entry between item and itemx <5>: chapter. (line 2156)
* index entry in footnote: chapter. (line 4)
* index entry within deffn: chapter. (line 302)
-* index entry within deffn <1>: chapter. (line 972)
-* index entry within deffn <2>: chapter. (line 1778)
+* index entry within deffn <1>: chapter. (line 976)
+* index entry within deffn <2>: chapter. (line 1786)
* index entry within itemize: chapter. (line 213)
-* index entry within itemize <1>: chapter. (line 883)
-* index entry within itemize <2>: chapter. (line 1689)
+* index entry within itemize <1>: chapter. (line 887)
+* index entry within itemize <2>: chapter. (line 1697)
* index entry within multitable: chapter. (line 235)
-* index entry within multitable <1>: chapter. (line 905)
-* index entry within multitable <2>: chapter. (line 1712)
-* t-ruc: chapter. (line 2203)
-* T-ruc: chapter. (line 2203)
+* index entry within multitable <1>: chapter. (line 909)
+* index entry within multitable <2>: chapter. (line 1720)
+* t-ruc: chapter. (line 2215)
+* T-ruc: chapter. (line 2215)
* vtable i--tem code kbdinputstyle: chapter. (line 137)
-* vtable i--tem code kbdinputstyle <1>: chapter. (line 807)
-* vtable i--tem code kbdinputstyle <2>: chapter. (line 1612)
+* vtable i--tem code kbdinputstyle <1>: chapter. (line 811)
+* vtable i--tem code kbdinputstyle <2>: chapter. (line 1620)
* vtable i--tem default kbdinputstyle: chapter. (line 132)
-* vtable i--tem default kbdinputstyle <1>: chapter. (line 802)
-* vtable i--tem default kbdinputstyle <2>: chapter. (line 1607)
+* vtable i--tem default kbdinputstyle <1>: chapter. (line 806)
+* vtable i--tem default kbdinputstyle <2>: chapter. (line 1615)
* vtable i--tem distinct kbdinputstyle: chapter. (line 147)
-* vtable i--tem distinct kbdinputstyle <1>: chapter. (line 817)
-* vtable i--tem distinct kbdinputstyle <2>: chapter. (line 1622)
+* vtable i--tem distinct kbdinputstyle <1>: chapter. (line 821)
+* vtable i--tem distinct kbdinputstyle <2>: chapter. (line 1630)
* vtable i--tem example kbdinputstyle: chapter. (line 142)
-* vtable i--tem example kbdinputstyle <1>: chapter. (line 812)
-* vtable i--tem example kbdinputstyle <2>: chapter. (line 1617)
+* vtable i--tem example kbdinputstyle <1>: chapter. (line 816)
+* vtable i--tem example kbdinputstyle <2>: chapter. (line 1625)
* vtable i--tem in example code kbdinputstyle: chapter. (line 139)
-* vtable i--tem in example code kbdinputstyle <1>: chapter. (line 809)
-* vtable i--tem in example code kbdinputstyle <2>: chapter. (line 1614)
+* vtable i--tem in example code kbdinputstyle <1>: chapter. (line 813)
+* vtable i--tem in example code kbdinputstyle <2>: chapter. (line 1622)
* vtable i--tem in example default kbdinputstyle: chapter. (line 134)
* vtable i--tem in example default kbdinputstyle <1>: chapter.
- (line 804)
+ (line 808)
* vtable i--tem in example default kbdinputstyle <2>: chapter.
- (line 1609)
+ (line 1617)
* vtable i--tem in example distinct kbdinputstyle: chapter. (line 149)
* vtable i--tem in example distinct kbdinputstyle <1>: chapter.
- (line 819)
+ (line 823)
* vtable i--tem in example distinct kbdinputstyle <2>: chapter.
- (line 1624)
+ (line 1632)
* vtable i--tem in example example kbdinputstyle: chapter. (line 144)
* vtable i--tem in example example kbdinputstyle <1>: chapter.
- (line 814)
+ (line 818)
* vtable i--tem in example example kbdinputstyle <2>: chapter.
- (line 1619)
+ (line 1627)
fn
@@ -3072,171 +3084,171 @@ aaa" ]
* Menu:
* --foption: chapter. (line 28)
-* --foption <1>: chapter. (line 698)
-* --foption <2>: chapter. (line 1379)
-* .: chapter. (line 2203)
-* ?: chapter. (line 2203)
+* --foption <1>: chapter. (line 702)
+* --foption <2>: chapter. (line 1387)
+* .: chapter. (line 2215)
+* ?: chapter. (line 2215)
* ``: chapter. (line 28)
-* `` <1>: chapter. (line 698)
-* `` <2>: chapter. (line 1379)
+* `` <1>: chapter. (line 702)
+* `` <2>: chapter. (line 1387)
* a: chapter. (line 315)
* a <1>: chapter. (line 514)
-* a <2>: chapter. (line 632)
-* a <3>: chapter. (line 985)
-* a <4>: chapter. (line 1184)
-* a <5>: chapter. (line 1302)
-* a <6>: chapter. (line 1791)
-* a <7>: chapter. (line 1992)
-* a <8>: chapter. (line 2143)
-* a <9>: chapter. (line 2203)
-* after: chapter. (line 643)
-* after <1>: chapter. (line 1313)
-* after <2>: chapter. (line 2154)
+* a <2>: chapter. (line 636)
+* a <3>: chapter. (line 989)
+* a <4>: chapter. (line 1188)
+* a <5>: chapter. (line 1310)
+* a <6>: chapter. (line 1799)
+* a <7>: chapter. (line 2000)
+* a <8>: chapter. (line 2155)
+* a <9>: chapter. (line 2215)
+* after: chapter. (line 647)
+* after <1>: chapter. (line 1321)
+* after <2>: chapter. (line 2166)
* arg2: chapter. (line 434)
-* arg2 <1>: chapter. (line 1104)
-* arg2 <2>: chapter. (line 1914)
+* arg2 <1>: chapter. (line 1108)
+* arg2 <2>: chapter. (line 1922)
* b: chapter. (line 515)
-* b <1>: chapter. (line 633)
-* b <2>: chapter. (line 1185)
-* b <3>: chapter. (line 1303)
-* b <4>: chapter. (line 1993)
-* b <5>: chapter. (line 2144)
+* b <1>: chapter. (line 637)
+* b <2>: chapter. (line 1189)
+* b <3>: chapter. (line 1311)
+* b <4>: chapter. (line 2001)
+* b <5>: chapter. (line 2156)
* bidule machin: chapter. (line 310)
-* bidule machin <1>: chapter. (line 980)
-* bidule machin <2>: chapter. (line 1786)
+* bidule machin <1>: chapter. (line 984)
+* bidule machin <2>: chapter. (line 1794)
* d--effn_name: chapter. (line 294)
-* d--effn_name <1>: chapter. (line 964)
-* d--effn_name <2>: chapter. (line 1770)
+* d--effn_name <1>: chapter. (line 968)
+* d--effn_name <2>: chapter. (line 1778)
* d--efmac_name: chapter. (line 375)
-* d--efmac_name <1>: chapter. (line 1045)
-* d--efmac_name <2>: chapter. (line 1853)
+* d--efmac_name <1>: chapter. (line 1049)
+* d--efmac_name <2>: chapter. (line 1861)
* d--efmethod_name on c--lass: chapter. (line 402)
-* d--efmethod_name on c--lass <1>: chapter. (line 1072)
-* d--efmethod_name on c--lass <2>: chapter. (line 1880)
+* d--efmethod_name on c--lass <1>: chapter. (line 1076)
+* d--efmethod_name on c--lass <2>: chapter. (line 1888)
* d--efop_name on c--lass: chapter. (line 363)
* d--efop_name on c--lass <1>: chapter. (line 366)
-* d--efop_name on c--lass <2>: chapter. (line 1033)
-* d--efop_name on c--lass <3>: chapter. (line 1036)
-* d--efop_name on c--lass <4>: chapter. (line 1841)
-* d--efop_name on c--lass <5>: chapter. (line 1844)
+* d--efop_name on c--lass <2>: chapter. (line 1037)
+* d--efop_name on c--lass <3>: chapter. (line 1040)
+* d--efop_name on c--lass <4>: chapter. (line 1849)
+* d--efop_name on c--lass <5>: chapter. (line 1852)
* d--efspec_name: chapter. (line 378)
-* d--efspec_name <1>: chapter. (line 1048)
-* d--efspec_name <2>: chapter. (line 1856)
+* d--efspec_name <1>: chapter. (line 1052)
+* d--efspec_name <2>: chapter. (line 1864)
* d--eftypefn_name: chapter. (line 336)
* d--eftypefn_name <1>: chapter. (line 339)
-* d--eftypefn_name <2>: chapter. (line 1006)
-* d--eftypefn_name <3>: chapter. (line 1009)
-* d--eftypefn_name <4>: chapter. (line 1814)
-* d--eftypefn_name <5>: chapter. (line 1817)
+* d--eftypefn_name <2>: chapter. (line 1010)
+* d--eftypefn_name <3>: chapter. (line 1013)
+* d--eftypefn_name <4>: chapter. (line 1822)
+* d--eftypefn_name <5>: chapter. (line 1825)
* d--eftypefn_name2: chapter. (line 413)
-* d--eftypefn_name2 <1>: chapter. (line 1083)
-* d--eftypefn_name2 <2>: chapter. (line 1892)
+* d--eftypefn_name2 <1>: chapter. (line 1087)
+* d--eftypefn_name2 <2>: chapter. (line 1900)
* d--eftypefun_name: chapter. (line 390)
-* d--eftypefun_name <1>: chapter. (line 1060)
-* d--eftypefun_name <2>: chapter. (line 1868)
+* d--eftypefun_name <1>: chapter. (line 1064)
+* d--eftypefun_name <2>: chapter. (line 1876)
* d--eftypemethod_name on c--lass: chapter. (line 405)
-* d--eftypemethod_name on c--lass <1>: chapter. (line 1075)
-* d--eftypemethod_name on c--lass <2>: chapter. (line 1883)
+* d--eftypemethod_name on c--lass <1>: chapter. (line 1079)
+* d--eftypemethod_name on c--lass <2>: chapter. (line 1891)
* d--eftypeop_name on c--lass: chapter. (line 342)
* d--eftypeop_name on c--lass <1>: chapter. (line 345)
-* d--eftypeop_name on c--lass <2>: chapter. (line 1012)
-* d--eftypeop_name on c--lass <3>: chapter. (line 1015)
-* d--eftypeop_name on c--lass <4>: chapter. (line 1820)
-* d--eftypeop_name on c--lass <5>: chapter. (line 1823)
+* d--eftypeop_name on c--lass <2>: chapter. (line 1016)
+* d--eftypeop_name on c--lass <3>: chapter. (line 1019)
+* d--eftypeop_name on c--lass <4>: chapter. (line 1828)
+* d--eftypeop_name on c--lass <5>: chapter. (line 1831)
* d--eftypeop_name2 on c--lass2: chapter. (line 418)
* d--eftypeop_name2 on c--lass2 <1>: chapter. (line 423)
-* d--eftypeop_name2 on c--lass2 <2>: chapter. (line 1088)
-* d--eftypeop_name2 on c--lass2 <3>: chapter. (line 1093)
-* d--eftypeop_name2 on c--lass2 <4>: chapter. (line 1897)
-* d--eftypeop_name2 on c--lass2 <5>: chapter. (line 1902)
+* d--eftypeop_name2 on c--lass2 <2>: chapter. (line 1092)
+* d--eftypeop_name2 on c--lass2 <3>: chapter. (line 1097)
+* d--eftypeop_name2 on c--lass2 <4>: chapter. (line 1905)
+* d--eftypeop_name2 on c--lass2 <5>: chapter. (line 1910)
* d--efun_name: chapter. (line 372)
-* d--efun_name <1>: chapter. (line 1042)
-* d--efun_name <2>: chapter. (line 1850)
+* d--efun_name <1>: chapter. (line 1046)
+* d--efun_name <2>: chapter. (line 1858)
* de--ffn_name: chapter. (line 297)
-* de--ffn_name <1>: chapter. (line 967)
-* de--ffn_name <2>: chapter. (line 1773)
+* de--ffn_name <1>: chapter. (line 971)
+* de--ffn_name <2>: chapter. (line 1781)
* deffn: chapter. (line 318)
* deffn <1>: chapter. (line 320)
-* deffn <2>: chapter. (line 988)
-* deffn <3>: chapter. (line 990)
-* deffn <4>: chapter. (line 1795)
-* deffn <5>: chapter. (line 1797)
+* deffn <2>: chapter. (line 992)
+* deffn <3>: chapter. (line 994)
+* deffn <4>: chapter. (line 1803)
+* deffn <5>: chapter. (line 1805)
* deffnx: chapter. (line 316)
* deffnx <1>: chapter. (line 321)
-* deffnx <2>: chapter. (line 986)
-* deffnx <3>: chapter. (line 991)
-* deffnx <4>: chapter. (line 1792)
-* deffnx <5>: chapter. (line 1798)
-* f---aa: chapter. (line 2203)
-* f---bb, f---cc: chapter. (line 2203)
-* f---ddd, f---eee, ffff: chapter. (line 2203)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter. (line 2203)
+* deffnx <2>: chapter. (line 990)
+* deffnx <3>: chapter. (line 995)
+* deffnx <4>: chapter. (line 1800)
+* deffnx <5>: chapter. (line 1806)
+* f---aa: chapter. (line 2215)
+* f---bb, f---cc: chapter. (line 2215)
+* f---ddd, f---eee, ffff: chapter. (line 2215)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter. (line 2215)
* followed: chapter. (line 313)
-* followed <1>: chapter. (line 641)
-* followed <2>: chapter. (line 983)
-* followed <3>: chapter. (line 1311)
-* followed <4>: chapter. (line 1789)
-* followed <5>: chapter. (line 2152)
+* followed <1>: chapter. (line 645)
+* followed <2>: chapter. (line 987)
+* followed <3>: chapter. (line 1319)
+* followed <4>: chapter. (line 1797)
+* followed <5>: chapter. (line 2164)
* I: chapter. (line 301)
* I <1>: chapter. (line 323)
-* I <2>: chapter. (line 971)
-* I <3>: chapter. (line 993)
-* I <4>: chapter. (line 1777)
-* I <5>: chapter. (line 1800)
+* I <2>: chapter. (line 975)
+* I <3>: chapter. (line 997)
+* I <4>: chapter. (line 1785)
+* I <5>: chapter. (line 1808)
* id i ule: chapter. (line 307)
-* id i ule <1>: chapter. (line 977)
-* id i ule <2>: chapter. (line 1783)
+* id i ule <1>: chapter. (line 981)
+* id i ule <2>: chapter. (line 1791)
* id ule: chapter. (line 306)
-* id ule <1>: chapter. (line 976)
-* id ule <2>: chapter. (line 1782)
-* INVALID: chapter. (line 645)
-* INVALID <1>: chapter. (line 1315)
-* INVALID <2>: chapter. (line 2156)
+* id ule <1>: chapter. (line 980)
+* id ule <2>: chapter. (line 1790)
+* INVALID: chapter. (line 649)
+* INVALID <1>: chapter. (line 1323)
+* INVALID <2>: chapter. (line 2168)
* log trap: chapter. (line 303)
-* log trap <1>: chapter. (line 973)
-* log trap <2>: chapter. (line 1779)
+* log trap <1>: chapter. (line 977)
+* log trap <2>: chapter. (line 1787)
* log trap1: chapter. (line 304)
-* log trap1 <1>: chapter. (line 974)
-* log trap1 <2>: chapter. (line 1780)
+* log trap1 <1>: chapter. (line 978)
+* log trap1 <2>: chapter. (line 1788)
* log trap2: chapter. (line 305)
-* log trap2 <1>: chapter. (line 975)
-* log trap2 <2>: chapter. (line 1781)
+* log trap2 <1>: chapter. (line 979)
+* log trap2 <2>: chapter. (line 1789)
* machin: chapter. (line 309)
* machin <1>: chapter. (line 311)
-* machin <2>: chapter. (line 637)
-* machin <3>: chapter. (line 638)
-* machin <4>: chapter. (line 639)
-* machin <5>: chapter. (line 640)
-* machin <6>: chapter. (line 979)
-* machin <7>: chapter. (line 981)
-* machin <8>: chapter. (line 1307)
-* machin <9>: chapter. (line 1308)
-* machin <10>: chapter. (line 1309)
-* machin <11>: chapter. (line 1310)
-* machin <12>: chapter. (line 1785)
-* machin <13>: chapter. (line 1787)
-* machin <14>: chapter. (line 2148)
-* machin <15>: chapter. (line 2149)
-* machin <16>: chapter. (line 2150)
-* machin <17>: chapter. (line 2151)
+* machin <2>: chapter. (line 641)
+* machin <3>: chapter. (line 642)
+* machin <4>: chapter. (line 643)
+* machin <5>: chapter. (line 644)
+* machin <6>: chapter. (line 983)
+* machin <7>: chapter. (line 985)
+* machin <8>: chapter. (line 1315)
+* machin <9>: chapter. (line 1316)
+* machin <10>: chapter. (line 1317)
+* machin <11>: chapter. (line 1318)
+* machin <12>: chapter. (line 1793)
+* machin <13>: chapter. (line 1795)
+* machin <14>: chapter. (line 2160)
+* machin <15>: chapter. (line 2161)
+* machin <16>: chapter. (line 2162)
+* machin <17>: chapter. (line 2163)
* n--ame: chapter. (line 330)
* n--ame <1>: chapter. (line 333)
-* n--ame <2>: chapter. (line 1000)
-* n--ame <3>: chapter. (line 1003)
-* n--ame <4>: chapter. (line 1808)
-* n--ame <5>: chapter. (line 1811)
+* n--ame <2>: chapter. (line 1004)
+* n--ame <3>: chapter. (line 1007)
+* n--ame <4>: chapter. (line 1816)
+* n--ame <5>: chapter. (line 1819)
* name2: chapter. (line 408)
-* name2 <1>: chapter. (line 1078)
-* name2 <2>: chapter. (line 1887)
-* t--ruc: chapter. (line 2203)
-* T--ruc: chapter. (line 2203)
+* name2 <1>: chapter. (line 1082)
+* name2 <2>: chapter. (line 1895)
+* t--ruc: chapter. (line 2215)
+* T--ruc: chapter. (line 2215)
* truc: chapter. (line 302)
* truc <1>: chapter. (line 324)
-* truc <2>: chapter. (line 972)
-* truc <3>: chapter. (line 994)
-* truc <4>: chapter. (line 1778)
-* truc <5>: chapter. (line 1801)
-* xxx, zzz: chapter. (line 2203)
+* truc <2>: chapter. (line 976)
+* truc <3>: chapter. (line 998)
+* truc <4>: chapter. (line 1786)
+* truc <5>: chapter. (line 1809)
+* xxx, zzz: chapter. (line 2215)
vr
@@ -3250,8 +3262,8 @@ aaa" ]
* Menu:
* d--eftp_name: chapter. (line 369)
-* d--eftp_name <1>: chapter. (line 1039)
-* d--eftp_name <2>: chapter. (line 1847)
+* d--eftp_name <1>: chapter. (line 1043)
+* d--eftp_name <2>: chapter. (line 1855)
(8)
@@ -3334,306 +3346,306 @@ chapter 2
* Menu:
* ": chapter. (line 28)
-* " <1>: chapter. (line 698)
-* " <2>: chapter. (line 1379)
+* " <1>: chapter. (line 702)
+* " <2>: chapter. (line 1387)
* -option: chapter. (line 28)
-* -option <1>: chapter. (line 698)
-* -option <2>: chapter. (line 1379)
-* .: chapter. (line 2203)
-* ?: chapter. (line 2203)
-* a: chapter. (line 2203)
-* aaa, bbb: chapter. (line 2203)
-* a--a: chapter. (line 2203)
+* -option <1>: chapter. (line 702)
+* -option <2>: chapter. (line 1387)
+* .: chapter. (line 2215)
+* ?: chapter. (line 2215)
+* a: chapter. (line 2215)
+* aaa, bbb: chapter. (line 2215)
+* a--a: chapter. (line 2215)
* a--asis: chapter. (line 510)
-* a--asis <1>: chapter. (line 1180)
-* a--asis <2>: chapter. (line 1988)
+* a--asis <1>: chapter. (line 1184)
+* a--asis <2>: chapter. (line 1996)
* b: chapter. (line 511)
-* b <1>: chapter. (line 1181)
-* b <2>: chapter. (line 1989)
-* b--b, c--c: chapter. (line 2203)
-* counting entry: chapter. (line 2553)
-* d--dd, e--ee, f--ff: chapter. (line 2203)
+* b <1>: chapter. (line 1185)
+* b <2>: chapter. (line 1997)
+* b--b, c--c: chapter. (line 2215)
+* counting entry: chapter. (line 2565)
+* d--dd, e--ee, f--ff: chapter. (line 2215)
* d--efcv_name: chapter. (line 351)
* d--efcv_name <1>: chapter. (line 354)
-* d--efcv_name <2>: chapter. (line 1021)
-* d--efcv_name <3>: chapter. (line 1024)
-* d--efcv_name <4>: chapter. (line 1829)
-* d--efcv_name <5>: chapter. (line 1832)
+* d--efcv_name <2>: chapter. (line 1025)
+* d--efcv_name <3>: chapter. (line 1028)
+* d--efcv_name <4>: chapter. (line 1837)
+* d--efcv_name <5>: chapter. (line 1840)
* d--efivar_name of c--lass: chapter. (line 396)
-* d--efivar_name of c--lass <1>: chapter. (line 1066)
-* d--efivar_name of c--lass <2>: chapter. (line 1874)
+* d--efivar_name of c--lass <1>: chapter. (line 1070)
+* d--efivar_name of c--lass <2>: chapter. (line 1882)
* d--efopt_name: chapter. (line 387)
-* d--efopt_name <1>: chapter. (line 1057)
-* d--efopt_name <2>: chapter. (line 1865)
+* d--efopt_name <1>: chapter. (line 1061)
+* d--efopt_name <2>: chapter. (line 1873)
* d--eftypecv_name of c--lass: chapter. (line 357)
* d--eftypecv_name of c--lass <1>: chapter. (line 360)
-* d--eftypecv_name of c--lass <2>: chapter. (line 1027)
-* d--eftypecv_name of c--lass <3>: chapter. (line 1030)
-* d--eftypecv_name of c--lass <4>: chapter. (line 1835)
-* d--eftypecv_name of c--lass <5>: chapter. (line 1838)
+* d--eftypecv_name of c--lass <2>: chapter. (line 1031)
+* d--eftypecv_name of c--lass <3>: chapter. (line 1034)
+* d--eftypecv_name of c--lass <4>: chapter. (line 1843)
+* d--eftypecv_name of c--lass <5>: chapter. (line 1846)
* d--eftypecv_name2 of c--lass2: chapter. (line 428)
* d--eftypecv_name2 of c--lass2 <1>: chapter. (line 431)
-* d--eftypecv_name2 of c--lass2 <2>: chapter. (line 1098)
-* d--eftypecv_name2 of c--lass2 <3>: chapter. (line 1101)
-* d--eftypecv_name2 of c--lass2 <4>: chapter. (line 1907)
-* d--eftypecv_name2 of c--lass2 <5>: chapter. (line 1910)
+* d--eftypecv_name2 of c--lass2 <2>: chapter. (line 1102)
+* d--eftypecv_name2 of c--lass2 <3>: chapter. (line 1105)
+* d--eftypecv_name2 of c--lass2 <4>: chapter. (line 1915)
+* d--eftypecv_name2 of c--lass2 <5>: chapter. (line 1918)
* d--eftypeivar_name of c--lass: chapter. (line 399)
-* d--eftypeivar_name of c--lass <1>: chapter. (line 1069)
-* d--eftypeivar_name of c--lass <2>: chapter. (line 1877)
+* d--eftypeivar_name of c--lass <1>: chapter. (line 1073)
+* d--eftypeivar_name of c--lass <2>: chapter. (line 1885)
* d--eftypevar_name: chapter. (line 393)
-* d--eftypevar_name <1>: chapter. (line 1063)
-* d--eftypevar_name <2>: chapter. (line 1871)
+* d--eftypevar_name <1>: chapter. (line 1067)
+* d--eftypevar_name <2>: chapter. (line 1879)
* d--eftypevr_name: chapter. (line 348)
-* d--eftypevr_name <1>: chapter. (line 1018)
-* d--eftypevr_name <2>: chapter. (line 1826)
+* d--eftypevr_name <1>: chapter. (line 1022)
+* d--eftypevr_name <2>: chapter. (line 1834)
* d--efvar_name: chapter. (line 381)
* d--efvar_name <1>: chapter. (line 384)
-* d--efvar_name <2>: chapter. (line 1051)
-* d--efvar_name <3>: chapter. (line 1054)
-* d--efvar_name <4>: chapter. (line 1859)
-* d--efvar_name <5>: chapter. (line 1862)
+* d--efvar_name <2>: chapter. (line 1055)
+* d--efvar_name <3>: chapter. (line 1058)
+* d--efvar_name <4>: chapter. (line 1867)
+* d--efvar_name <5>: chapter. (line 1870)
* d--efvr_name: chapter. (line 327)
-* d--efvr_name <1>: chapter. (line 997)
-* d--efvr_name <2>: chapter. (line 1805)
-* g--gg, h--hh jjj, k--kk, l--ll: chapter. (line 2203)
+* d--efvr_name <1>: chapter. (line 1001)
+* d--efvr_name <2>: chapter. (line 1813)
+* g--gg, h--hh jjj, k--kk, l--ll: chapter. (line 2215)
* index entry between item and itemx: chapter. (line 515)
-* index entry between item and itemx <1>: chapter. (line 633)
-* index entry between item and itemx <2>: chapter. (line 1185)
-* index entry between item and itemx <3>: chapter. (line 1303)
-* index entry between item and itemx <4>: chapter. (line 1993)
-* index entry between item and itemx <5>: chapter. (line 2144)
-* index entry in footnote: chapter. (line 2548)
+* index entry between item and itemx <1>: chapter. (line 637)
+* index entry between item and itemx <2>: chapter. (line 1189)
+* index entry between item and itemx <3>: chapter. (line 1311)
+* index entry between item and itemx <4>: chapter. (line 2001)
+* index entry between item and itemx <5>: chapter. (line 2156)
+* index entry in footnote: chapter. (line 2560)
* index entry within deffn: chapter. (line 302)
-* index entry within deffn <1>: chapter. (line 972)
-* index entry within deffn <2>: chapter. (line 1778)
+* index entry within deffn <1>: chapter. (line 976)
+* index entry within deffn <2>: chapter. (line 1786)
* index entry within itemize: chapter. (line 213)
-* index entry within itemize <1>: chapter. (line 883)
-* index entry within itemize <2>: chapter. (line 1689)
+* index entry within itemize <1>: chapter. (line 887)
+* index entry within itemize <2>: chapter. (line 1697)
* index entry within multitable: chapter. (line 235)
-* index entry within multitable <1>: chapter. (line 905)
-* index entry within multitable <2>: chapter. (line 1712)
-* t-ruc: chapter. (line 2203)
-* T-ruc: chapter. (line 2203)
+* index entry within multitable <1>: chapter. (line 909)
+* index entry within multitable <2>: chapter. (line 1720)
+* t-ruc: chapter. (line 2215)
+* T-ruc: chapter. (line 2215)
* vtable i--tem code kbdinputstyle: chapter. (line 137)
-* vtable i--tem code kbdinputstyle <1>: chapter. (line 807)
-* vtable i--tem code kbdinputstyle <2>: chapter. (line 1612)
+* vtable i--tem code kbdinputstyle <1>: chapter. (line 811)
+* vtable i--tem code kbdinputstyle <2>: chapter. (line 1620)
* vtable i--tem default kbdinputstyle: chapter. (line 132)
-* vtable i--tem default kbdinputstyle <1>: chapter. (line 802)
-* vtable i--tem default kbdinputstyle <2>: chapter. (line 1607)
+* vtable i--tem default kbdinputstyle <1>: chapter. (line 806)
+* vtable i--tem default kbdinputstyle <2>: chapter. (line 1615)
* vtable i--tem distinct kbdinputstyle: chapter. (line 147)
-* vtable i--tem distinct kbdinputstyle <1>: chapter. (line 817)
-* vtable i--tem distinct kbdinputstyle <2>: chapter. (line 1622)
+* vtable i--tem distinct kbdinputstyle <1>: chapter. (line 821)
+* vtable i--tem distinct kbdinputstyle <2>: chapter. (line 1630)
* vtable i--tem example kbdinputstyle: chapter. (line 142)
-* vtable i--tem example kbdinputstyle <1>: chapter. (line 812)
-* vtable i--tem example kbdinputstyle <2>: chapter. (line 1617)
+* vtable i--tem example kbdinputstyle <1>: chapter. (line 816)
+* vtable i--tem example kbdinputstyle <2>: chapter. (line 1625)
* vtable i--tem in example code kbdinputstyle: chapter. (line 139)
-* vtable i--tem in example code kbdinputstyle <1>: chapter. (line 809)
-* vtable i--tem in example code kbdinputstyle <2>: chapter. (line 1614)
+* vtable i--tem in example code kbdinputstyle <1>: chapter. (line 813)
+* vtable i--tem in example code kbdinputstyle <2>: chapter. (line 1622)
* vtable i--tem in example default kbdinputstyle: chapter. (line 134)
* vtable i--tem in example default kbdinputstyle <1>: chapter.
- (line 804)
+ (line 808)
* vtable i--tem in example default kbdinputstyle <2>: chapter.
- (line 1609)
+ (line 1617)
* vtable i--tem in example distinct kbdinputstyle: chapter. (line 149)
* vtable i--tem in example distinct kbdinputstyle <1>: chapter.
- (line 819)
+ (line 823)
* vtable i--tem in example distinct kbdinputstyle <2>: chapter.
- (line 1624)
+ (line 1632)
* vtable i--tem in example example kbdinputstyle: chapter. (line 144)
* vtable i--tem in example example kbdinputstyle <1>: chapter.
- (line 814)
+ (line 818)
* vtable i--tem in example example kbdinputstyle <2>: chapter.
- (line 1619)
+ (line 1627)
[index ]
* Menu:
* --foption: chapter. (line 28)
-* --foption <1>: chapter. (line 698)
-* --foption <2>: chapter. (line 1379)
-* .: chapter. (line 2203)
-* ?: chapter. (line 2203)
+* --foption <1>: chapter. (line 702)
+* --foption <2>: chapter. (line 1387)
+* .: chapter. (line 2215)
+* ?: chapter. (line 2215)
* ``: chapter. (line 28)
-* `` <1>: chapter. (line 698)
-* `` <2>: chapter. (line 1379)
+* `` <1>: chapter. (line 702)
+* `` <2>: chapter. (line 1387)
* a: chapter. (line 315)
* a <1>: chapter. (line 514)
-* a <2>: chapter. (line 632)
-* a <3>: chapter. (line 985)
-* a <4>: chapter. (line 1184)
-* a <5>: chapter. (line 1302)
-* a <6>: chapter. (line 1791)
-* a <7>: chapter. (line 1992)
-* a <8>: chapter. (line 2143)
-* a <9>: chapter. (line 2203)
-* after: chapter. (line 643)
-* after <1>: chapter. (line 1313)
-* after <2>: chapter. (line 2154)
+* a <2>: chapter. (line 636)
+* a <3>: chapter. (line 989)
+* a <4>: chapter. (line 1188)
+* a <5>: chapter. (line 1310)
+* a <6>: chapter. (line 1799)
+* a <7>: chapter. (line 2000)
+* a <8>: chapter. (line 2155)
+* a <9>: chapter. (line 2215)
+* after: chapter. (line 647)
+* after <1>: chapter. (line 1321)
+* after <2>: chapter. (line 2166)
* arg2: chapter. (line 434)
-* arg2 <1>: chapter. (line 1104)
-* arg2 <2>: chapter. (line 1914)
+* arg2 <1>: chapter. (line 1108)
+* arg2 <2>: chapter. (line 1922)
* b: chapter. (line 515)
-* b <1>: chapter. (line 633)
-* b <2>: chapter. (line 1185)
-* b <3>: chapter. (line 1303)
-* b <4>: chapter. (line 1993)
-* b <5>: chapter. (line 2144)
+* b <1>: chapter. (line 637)
+* b <2>: chapter. (line 1189)
+* b <3>: chapter. (line 1311)
+* b <4>: chapter. (line 2001)
+* b <5>: chapter. (line 2156)
* bidule machin: chapter. (line 310)
-* bidule machin <1>: chapter. (line 980)
-* bidule machin <2>: chapter. (line 1786)
+* bidule machin <1>: chapter. (line 984)
+* bidule machin <2>: chapter. (line 1794)
* d--effn_name: chapter. (line 294)
-* d--effn_name <1>: chapter. (line 964)
-* d--effn_name <2>: chapter. (line 1770)
+* d--effn_name <1>: chapter. (line 968)
+* d--effn_name <2>: chapter. (line 1778)
* d--efmac_name: chapter. (line 375)
-* d--efmac_name <1>: chapter. (line 1045)
-* d--efmac_name <2>: chapter. (line 1853)
+* d--efmac_name <1>: chapter. (line 1049)
+* d--efmac_name <2>: chapter. (line 1861)
* d--efmethod_name on c--lass: chapter. (line 402)
-* d--efmethod_name on c--lass <1>: chapter. (line 1072)
-* d--efmethod_name on c--lass <2>: chapter. (line 1880)
+* d--efmethod_name on c--lass <1>: chapter. (line 1076)
+* d--efmethod_name on c--lass <2>: chapter. (line 1888)
* d--efop_name on c--lass: chapter. (line 363)
* d--efop_name on c--lass <1>: chapter. (line 366)
-* d--efop_name on c--lass <2>: chapter. (line 1033)
-* d--efop_name on c--lass <3>: chapter. (line 1036)
-* d--efop_name on c--lass <4>: chapter. (line 1841)
-* d--efop_name on c--lass <5>: chapter. (line 1844)
+* d--efop_name on c--lass <2>: chapter. (line 1037)
+* d--efop_name on c--lass <3>: chapter. (line 1040)
+* d--efop_name on c--lass <4>: chapter. (line 1849)
+* d--efop_name on c--lass <5>: chapter. (line 1852)
* d--efspec_name: chapter. (line 378)
-* d--efspec_name <1>: chapter. (line 1048)
-* d--efspec_name <2>: chapter. (line 1856)
+* d--efspec_name <1>: chapter. (line 1052)
+* d--efspec_name <2>: chapter. (line 1864)
* d--eftypefn_name: chapter. (line 336)
* d--eftypefn_name <1>: chapter. (line 339)
-* d--eftypefn_name <2>: chapter. (line 1006)
-* d--eftypefn_name <3>: chapter. (line 1009)
-* d--eftypefn_name <4>: chapter. (line 1814)
-* d--eftypefn_name <5>: chapter. (line 1817)
+* d--eftypefn_name <2>: chapter. (line 1010)
+* d--eftypefn_name <3>: chapter. (line 1013)
+* d--eftypefn_name <4>: chapter. (line 1822)
+* d--eftypefn_name <5>: chapter. (line 1825)
* d--eftypefn_name2: chapter. (line 413)
-* d--eftypefn_name2 <1>: chapter. (line 1083)
-* d--eftypefn_name2 <2>: chapter. (line 1892)
+* d--eftypefn_name2 <1>: chapter. (line 1087)
+* d--eftypefn_name2 <2>: chapter. (line 1900)
* d--eftypefun_name: chapter. (line 390)
-* d--eftypefun_name <1>: chapter. (line 1060)
-* d--eftypefun_name <2>: chapter. (line 1868)
+* d--eftypefun_name <1>: chapter. (line 1064)
+* d--eftypefun_name <2>: chapter. (line 1876)
* d--eftypemethod_name on c--lass: chapter. (line 405)
-* d--eftypemethod_name on c--lass <1>: chapter. (line 1075)
-* d--eftypemethod_name on c--lass <2>: chapter. (line 1883)
+* d--eftypemethod_name on c--lass <1>: chapter. (line 1079)
+* d--eftypemethod_name on c--lass <2>: chapter. (line 1891)
* d--eftypeop_name on c--lass: chapter. (line 342)
* d--eftypeop_name on c--lass <1>: chapter. (line 345)
-* d--eftypeop_name on c--lass <2>: chapter. (line 1012)
-* d--eftypeop_name on c--lass <3>: chapter. (line 1015)
-* d--eftypeop_name on c--lass <4>: chapter. (line 1820)
-* d--eftypeop_name on c--lass <5>: chapter. (line 1823)
+* d--eftypeop_name on c--lass <2>: chapter. (line 1016)
+* d--eftypeop_name on c--lass <3>: chapter. (line 1019)
+* d--eftypeop_name on c--lass <4>: chapter. (line 1828)
+* d--eftypeop_name on c--lass <5>: chapter. (line 1831)
* d--eftypeop_name2 on c--lass2: chapter. (line 418)
* d--eftypeop_name2 on c--lass2 <1>: chapter. (line 423)
-* d--eftypeop_name2 on c--lass2 <2>: chapter. (line 1088)
-* d--eftypeop_name2 on c--lass2 <3>: chapter. (line 1093)
-* d--eftypeop_name2 on c--lass2 <4>: chapter. (line 1897)
-* d--eftypeop_name2 on c--lass2 <5>: chapter. (line 1902)
+* d--eftypeop_name2 on c--lass2 <2>: chapter. (line 1092)
+* d--eftypeop_name2 on c--lass2 <3>: chapter. (line 1097)
+* d--eftypeop_name2 on c--lass2 <4>: chapter. (line 1905)
+* d--eftypeop_name2 on c--lass2 <5>: chapter. (line 1910)
* d--efun_name: chapter. (line 372)
-* d--efun_name <1>: chapter. (line 1042)
-* d--efun_name <2>: chapter. (line 1850)
+* d--efun_name <1>: chapter. (line 1046)
+* d--efun_name <2>: chapter. (line 1858)
* de--ffn_name: chapter. (line 297)
-* de--ffn_name <1>: chapter. (line 967)
-* de--ffn_name <2>: chapter. (line 1773)
+* de--ffn_name <1>: chapter. (line 971)
+* de--ffn_name <2>: chapter. (line 1781)
* deffn: chapter. (line 318)
* deffn <1>: chapter. (line 320)
-* deffn <2>: chapter. (line 988)
-* deffn <3>: chapter. (line 990)
-* deffn <4>: chapter. (line 1795)
-* deffn <5>: chapter. (line 1797)
+* deffn <2>: chapter. (line 992)
+* deffn <3>: chapter. (line 994)
+* deffn <4>: chapter. (line 1803)
+* deffn <5>: chapter. (line 1805)
* deffnx: chapter. (line 316)
* deffnx <1>: chapter. (line 321)
-* deffnx <2>: chapter. (line 986)
-* deffnx <3>: chapter. (line 991)
-* deffnx <4>: chapter. (line 1792)
-* deffnx <5>: chapter. (line 1798)
-* f---aa: chapter. (line 2203)
-* f---bb, f---cc: chapter. (line 2203)
-* f---ddd, f---eee, ffff: chapter. (line 2203)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter. (line 2203)
+* deffnx <2>: chapter. (line 990)
+* deffnx <3>: chapter. (line 995)
+* deffnx <4>: chapter. (line 1800)
+* deffnx <5>: chapter. (line 1806)
+* f---aa: chapter. (line 2215)
+* f---bb, f---cc: chapter. (line 2215)
+* f---ddd, f---eee, ffff: chapter. (line 2215)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter. (line 2215)
* followed: chapter. (line 313)
-* followed <1>: chapter. (line 641)
-* followed <2>: chapter. (line 983)
-* followed <3>: chapter. (line 1311)
-* followed <4>: chapter. (line 1789)
-* followed <5>: chapter. (line 2152)
+* followed <1>: chapter. (line 645)
+* followed <2>: chapter. (line 987)
+* followed <3>: chapter. (line 1319)
+* followed <4>: chapter. (line 1797)
+* followed <5>: chapter. (line 2164)
* I: chapter. (line 301)
* I <1>: chapter. (line 323)
-* I <2>: chapter. (line 971)
-* I <3>: chapter. (line 993)
-* I <4>: chapter. (line 1777)
-* I <5>: chapter. (line 1800)
+* I <2>: chapter. (line 975)
+* I <3>: chapter. (line 997)
+* I <4>: chapter. (line 1785)
+* I <5>: chapter. (line 1808)
* id i ule: chapter. (line 307)
-* id i ule <1>: chapter. (line 977)
-* id i ule <2>: chapter. (line 1783)
+* id i ule <1>: chapter. (line 981)
+* id i ule <2>: chapter. (line 1791)
* id ule: chapter. (line 306)
-* id ule <1>: chapter. (line 976)
-* id ule <2>: chapter. (line 1782)
-* INVALID: chapter. (line 645)
-* INVALID <1>: chapter. (line 1315)
-* INVALID <2>: chapter. (line 2156)
+* id ule <1>: chapter. (line 980)
+* id ule <2>: chapter. (line 1790)
+* INVALID: chapter. (line 649)
+* INVALID <1>: chapter. (line 1323)
+* INVALID <2>: chapter. (line 2168)
* log trap: chapter. (line 303)
-* log trap <1>: chapter. (line 973)
-* log trap <2>: chapter. (line 1779)
+* log trap <1>: chapter. (line 977)
+* log trap <2>: chapter. (line 1787)
* log trap1: chapter. (line 304)
-* log trap1 <1>: chapter. (line 974)
-* log trap1 <2>: chapter. (line 1780)
+* log trap1 <1>: chapter. (line 978)
+* log trap1 <2>: chapter. (line 1788)
* log trap2: chapter. (line 305)
-* log trap2 <1>: chapter. (line 975)
-* log trap2 <2>: chapter. (line 1781)
+* log trap2 <1>: chapter. (line 979)
+* log trap2 <2>: chapter. (line 1789)
* machin: chapter. (line 309)
* machin <1>: chapter. (line 311)
-* machin <2>: chapter. (line 637)
-* machin <3>: chapter. (line 638)
-* machin <4>: chapter. (line 639)
-* machin <5>: chapter. (line 640)
-* machin <6>: chapter. (line 979)
-* machin <7>: chapter. (line 981)
-* machin <8>: chapter. (line 1307)
-* machin <9>: chapter. (line 1308)
-* machin <10>: chapter. (line 1309)
-* machin <11>: chapter. (line 1310)
-* machin <12>: chapter. (line 1785)
-* machin <13>: chapter. (line 1787)
-* machin <14>: chapter. (line 2148)
-* machin <15>: chapter. (line 2149)
-* machin <16>: chapter. (line 2150)
-* machin <17>: chapter. (line 2151)
+* machin <2>: chapter. (line 641)
+* machin <3>: chapter. (line 642)
+* machin <4>: chapter. (line 643)
+* machin <5>: chapter. (line 644)
+* machin <6>: chapter. (line 983)
+* machin <7>: chapter. (line 985)
+* machin <8>: chapter. (line 1315)
+* machin <9>: chapter. (line 1316)
+* machin <10>: chapter. (line 1317)
+* machin <11>: chapter. (line 1318)
+* machin <12>: chapter. (line 1793)
+* machin <13>: chapter. (line 1795)
+* machin <14>: chapter. (line 2160)
+* machin <15>: chapter. (line 2161)
+* machin <16>: chapter. (line 2162)
+* machin <17>: chapter. (line 2163)
* n--ame: chapter. (line 330)
* n--ame <1>: chapter. (line 333)
-* n--ame <2>: chapter. (line 1000)
-* n--ame <3>: chapter. (line 1003)
-* n--ame <4>: chapter. (line 1808)
-* n--ame <5>: chapter. (line 1811)
+* n--ame <2>: chapter. (line 1004)
+* n--ame <3>: chapter. (line 1007)
+* n--ame <4>: chapter. (line 1816)
+* n--ame <5>: chapter. (line 1819)
* name2: chapter. (line 408)
-* name2 <1>: chapter. (line 1078)
-* name2 <2>: chapter. (line 1887)
-* t--ruc: chapter. (line 2203)
-* T--ruc: chapter. (line 2203)
+* name2 <1>: chapter. (line 1082)
+* name2 <2>: chapter. (line 1895)
+* t--ruc: chapter. (line 2215)
+* T--ruc: chapter. (line 2215)
* truc: chapter. (line 302)
* truc <1>: chapter. (line 324)
-* truc <2>: chapter. (line 972)
-* truc <3>: chapter. (line 994)
-* truc <4>: chapter. (line 1778)
-* truc <5>: chapter. (line 1801)
-* xxx, zzz: chapter. (line 2203)
+* truc <2>: chapter. (line 976)
+* truc <3>: chapter. (line 998)
+* truc <4>: chapter. (line 1786)
+* truc <5>: chapter. (line 1809)
+* xxx, zzz: chapter. (line 2215)
Tag Table:
-Node: Top19025
-Node: chapter19210
-Ref: chapter-Footnote-199022
-Ref: chapter-Footnote-299042
-Ref: chapter-Footnote-399063
-Ref: chapter-Footnote-499083
-Ref: chapter-Footnote-599104
-Ref: chapter-Footnote-699124
-Ref: chapter-Footnote-799145
-Ref: chapter-Footnote-899183
-Node: s--ect,ion99203
-Node: subsection99406
-Ref: anchor99587
-Node: subsubsection ``simple-double--99587
-Node: subsubsection three---four----''99787
-Node: chapter299959
+Node: Top19092
+Node: chapter19277
+Ref: chapter-Footnote-199296
+Ref: chapter-Footnote-299316
+Ref: chapter-Footnote-399337
+Ref: chapter-Footnote-499357
+Ref: chapter-Footnote-599378
+Ref: chapter-Footnote-699398
+Ref: chapter-Footnote-799419
+Ref: chapter-Footnote-899457
+Node: s--ect,ion99477
+Node: subsection99680
+Ref: anchor99861
+Node: subsubsection ``simple-double--99861
+Node: subsubsection three---four----''100061
+Node: chapter2100233
End Tag Table
diff --git
a/tp/tests/layout/res_parser/formatting_info_disable_encoding/formatting.info
b/tp/tests/layout/res_parser/formatting_info_disable_encoding/formatting.info
index 7799561d8d..004d4f1764 100644
---
a/tp/tests/layout/res_parser/formatting_info_disable_encoding/formatting.info
+++
b/tp/tests/layout/res_parser/formatting_info_disable_encoding/formatting.info
@@ -515,6 +515,9 @@ _b_
c-artouche
+ Tit-le _of box_
+With title c-artouche
+
f-lushleft
more text
@@ -1237,6 +1240,9 @@ _b_
c-artouche
+ Tit-le _of box_
+With title c-artouche
+
f-lushleft
more text
@@ -1916,6 +1922,9 @@ _b_
c-artouche
+ Tit-le _of box_
+With title c-artouche
+
f-lushleft
more text
@@ -2732,6 +2741,9 @@ cross ref name: (file name). '@inforef{}' *note ::
c--artouche
+ Tit-le _of box_
+ With title c--artouche
+
f--lushleft
more text
@@ -2943,14 +2955,14 @@ aaa" ]
[index ]
* Menu:
-* truc: chapter. (line 2205)
+* truc: chapter. (line 2217)
codeidx
[index ]
* Menu:
-* a INDEX---ENTRY te~ --- i^: chapter. (line 2205)
+* a INDEX---ENTRY te~ --- i^: chapter. (line 2217)
cp
@@ -2958,116 +2970,116 @@ aaa" ]
* Menu:
* ": chapter. (line 28)
-* " <1>: chapter. (line 699)
-* " <2>: chapter. (line 1381)
+* " <1>: chapter. (line 703)
+* " <2>: chapter. (line 1389)
* -option: chapter. (line 28)
-* -option <1>: chapter. (line 699)
-* -option <2>: chapter. (line 1381)
-* .: chapter. (line 2205)
-* ?: chapter. (line 2205)
-* a: chapter. (line 2205)
-* aaa, bbb: chapter. (line 2205)
-* a--a: chapter. (line 2205)
+* -option <1>: chapter. (line 703)
+* -option <2>: chapter. (line 1389)
+* .: chapter. (line 2217)
+* ?: chapter. (line 2217)
+* a: chapter. (line 2217)
+* aaa, bbb: chapter. (line 2217)
+* a--a: chapter. (line 2217)
* a--asis: chapter. (line 511)
-* a--asis <1>: chapter. (line 1182)
-* a--asis <2>: chapter. (line 1990)
+* a--asis <1>: chapter. (line 1186)
+* a--asis <2>: chapter. (line 1998)
* b: chapter. (line 512)
-* b <1>: chapter. (line 1183)
-* b <2>: chapter. (line 1991)
-* b--b, c--c: chapter. (line 2205)
+* b <1>: chapter. (line 1187)
+* b <2>: chapter. (line 1999)
+* b--b, c--c: chapter. (line 2217)
* counting entry: chapter. (line 4)
-* d--dd, e--ee, f--ff: chapter. (line 2205)
+* d--dd, e--ee, f--ff: chapter. (line 2217)
* d--efcv_name: chapter. (line 352)
* d--efcv_name <1>: chapter. (line 355)
-* d--efcv_name <2>: chapter. (line 1023)
-* d--efcv_name <3>: chapter. (line 1026)
-* d--efcv_name <4>: chapter. (line 1831)
-* d--efcv_name <5>: chapter. (line 1834)
+* d--efcv_name <2>: chapter. (line 1027)
+* d--efcv_name <3>: chapter. (line 1030)
+* d--efcv_name <4>: chapter. (line 1839)
+* d--efcv_name <5>: chapter. (line 1842)
* d--efivar_name of c--lass: chapter. (line 397)
-* d--efivar_name of c--lass <1>: chapter. (line 1068)
-* d--efivar_name of c--lass <2>: chapter. (line 1876)
+* d--efivar_name of c--lass <1>: chapter. (line 1072)
+* d--efivar_name of c--lass <2>: chapter. (line 1884)
* d--efopt_name: chapter. (line 388)
-* d--efopt_name <1>: chapter. (line 1059)
-* d--efopt_name <2>: chapter. (line 1867)
+* d--efopt_name <1>: chapter. (line 1063)
+* d--efopt_name <2>: chapter. (line 1875)
* d--eftypecv_name of c--lass: chapter. (line 358)
* d--eftypecv_name of c--lass <1>: chapter. (line 361)
-* d--eftypecv_name of c--lass <2>: chapter. (line 1029)
-* d--eftypecv_name of c--lass <3>: chapter. (line 1032)
-* d--eftypecv_name of c--lass <4>: chapter. (line 1837)
-* d--eftypecv_name of c--lass <5>: chapter. (line 1840)
+* d--eftypecv_name of c--lass <2>: chapter. (line 1033)
+* d--eftypecv_name of c--lass <3>: chapter. (line 1036)
+* d--eftypecv_name of c--lass <4>: chapter. (line 1845)
+* d--eftypecv_name of c--lass <5>: chapter. (line 1848)
* d--eftypecv_name2 of c--lass2: chapter. (line 429)
* d--eftypecv_name2 of c--lass2 <1>: chapter. (line 432)
-* d--eftypecv_name2 of c--lass2 <2>: chapter. (line 1100)
-* d--eftypecv_name2 of c--lass2 <3>: chapter. (line 1103)
-* d--eftypecv_name2 of c--lass2 <4>: chapter. (line 1909)
-* d--eftypecv_name2 of c--lass2 <5>: chapter. (line 1912)
+* d--eftypecv_name2 of c--lass2 <2>: chapter. (line 1104)
+* d--eftypecv_name2 of c--lass2 <3>: chapter. (line 1107)
+* d--eftypecv_name2 of c--lass2 <4>: chapter. (line 1917)
+* d--eftypecv_name2 of c--lass2 <5>: chapter. (line 1920)
* d--eftypeivar_name of c--lass: chapter. (line 400)
-* d--eftypeivar_name of c--lass <1>: chapter. (line 1071)
-* d--eftypeivar_name of c--lass <2>: chapter. (line 1879)
+* d--eftypeivar_name of c--lass <1>: chapter. (line 1075)
+* d--eftypeivar_name of c--lass <2>: chapter. (line 1887)
* d--eftypevar_name: chapter. (line 394)
-* d--eftypevar_name <1>: chapter. (line 1065)
-* d--eftypevar_name <2>: chapter. (line 1873)
+* d--eftypevar_name <1>: chapter. (line 1069)
+* d--eftypevar_name <2>: chapter. (line 1881)
* d--eftypevr_name: chapter. (line 349)
-* d--eftypevr_name <1>: chapter. (line 1020)
-* d--eftypevr_name <2>: chapter. (line 1828)
+* d--eftypevr_name <1>: chapter. (line 1024)
+* d--eftypevr_name <2>: chapter. (line 1836)
* d--efvar_name: chapter. (line 382)
* d--efvar_name <1>: chapter. (line 385)
-* d--efvar_name <2>: chapter. (line 1053)
-* d--efvar_name <3>: chapter. (line 1056)
-* d--efvar_name <4>: chapter. (line 1861)
-* d--efvar_name <5>: chapter. (line 1864)
+* d--efvar_name <2>: chapter. (line 1057)
+* d--efvar_name <3>: chapter. (line 1060)
+* d--efvar_name <4>: chapter. (line 1869)
+* d--efvar_name <5>: chapter. (line 1872)
* d--efvr_name: chapter. (line 328)
-* d--efvr_name <1>: chapter. (line 999)
-* d--efvr_name <2>: chapter. (line 1807)
-* g--gg, h--hh jjj, k--kk, l--ll: chapter. (line 2205)
+* d--efvr_name <1>: chapter. (line 1003)
+* d--efvr_name <2>: chapter. (line 1815)
+* g--gg, h--hh jjj, k--kk, l--ll: chapter. (line 2217)
* index entry between item and itemx: chapter. (line 516)
-* index entry between item and itemx <1>: chapter. (line 634)
-* index entry between item and itemx <2>: chapter. (line 1187)
-* index entry between item and itemx <3>: chapter. (line 1305)
-* index entry between item and itemx <4>: chapter. (line 1995)
-* index entry between item and itemx <5>: chapter. (line 2146)
+* index entry between item and itemx <1>: chapter. (line 638)
+* index entry between item and itemx <2>: chapter. (line 1191)
+* index entry between item and itemx <3>: chapter. (line 1313)
+* index entry between item and itemx <4>: chapter. (line 2003)
+* index entry between item and itemx <5>: chapter. (line 2158)
* index entry in footnote: chapter. (line 4)
* index entry within deffn: chapter. (line 303)
-* index entry within deffn <1>: chapter. (line 974)
-* index entry within deffn <2>: chapter. (line 1780)
+* index entry within deffn <1>: chapter. (line 978)
+* index entry within deffn <2>: chapter. (line 1788)
* index entry within itemize: chapter. (line 214)
-* index entry within itemize <1>: chapter. (line 885)
-* index entry within itemize <2>: chapter. (line 1691)
+* index entry within itemize <1>: chapter. (line 889)
+* index entry within itemize <2>: chapter. (line 1699)
* index entry within multitable: chapter. (line 236)
-* index entry within multitable <1>: chapter. (line 907)
-* index entry within multitable <2>: chapter. (line 1714)
-* t-ruc: chapter. (line 2205)
-* T-ruc: chapter. (line 2205)
+* index entry within multitable <1>: chapter. (line 911)
+* index entry within multitable <2>: chapter. (line 1722)
+* t-ruc: chapter. (line 2217)
+* T-ruc: chapter. (line 2217)
* vtable i--tem code kbdinputstyle: chapter. (line 138)
-* vtable i--tem code kbdinputstyle <1>: chapter. (line 809)
-* vtable i--tem code kbdinputstyle <2>: chapter. (line 1614)
+* vtable i--tem code kbdinputstyle <1>: chapter. (line 813)
+* vtable i--tem code kbdinputstyle <2>: chapter. (line 1622)
* vtable i--tem default kbdinputstyle: chapter. (line 133)
-* vtable i--tem default kbdinputstyle <1>: chapter. (line 804)
-* vtable i--tem default kbdinputstyle <2>: chapter. (line 1609)
+* vtable i--tem default kbdinputstyle <1>: chapter. (line 808)
+* vtable i--tem default kbdinputstyle <2>: chapter. (line 1617)
* vtable i--tem distinct kbdinputstyle: chapter. (line 148)
-* vtable i--tem distinct kbdinputstyle <1>: chapter. (line 819)
-* vtable i--tem distinct kbdinputstyle <2>: chapter. (line 1624)
+* vtable i--tem distinct kbdinputstyle <1>: chapter. (line 823)
+* vtable i--tem distinct kbdinputstyle <2>: chapter. (line 1632)
* vtable i--tem example kbdinputstyle: chapter. (line 143)
-* vtable i--tem example kbdinputstyle <1>: chapter. (line 814)
-* vtable i--tem example kbdinputstyle <2>: chapter. (line 1619)
+* vtable i--tem example kbdinputstyle <1>: chapter. (line 818)
+* vtable i--tem example kbdinputstyle <2>: chapter. (line 1627)
* vtable i--tem in example code kbdinputstyle: chapter. (line 140)
-* vtable i--tem in example code kbdinputstyle <1>: chapter. (line 811)
-* vtable i--tem in example code kbdinputstyle <2>: chapter. (line 1616)
+* vtable i--tem in example code kbdinputstyle <1>: chapter. (line 815)
+* vtable i--tem in example code kbdinputstyle <2>: chapter. (line 1624)
* vtable i--tem in example default kbdinputstyle: chapter. (line 135)
* vtable i--tem in example default kbdinputstyle <1>: chapter.
- (line 806)
+ (line 810)
* vtable i--tem in example default kbdinputstyle <2>: chapter.
- (line 1611)
+ (line 1619)
* vtable i--tem in example distinct kbdinputstyle: chapter. (line 150)
* vtable i--tem in example distinct kbdinputstyle <1>: chapter.
- (line 821)
+ (line 825)
* vtable i--tem in example distinct kbdinputstyle <2>: chapter.
- (line 1626)
+ (line 1634)
* vtable i--tem in example example kbdinputstyle: chapter. (line 145)
* vtable i--tem in example example kbdinputstyle <1>: chapter.
- (line 816)
+ (line 820)
* vtable i--tem in example example kbdinputstyle <2>: chapter.
- (line 1621)
+ (line 1629)
fn
@@ -3075,171 +3087,171 @@ aaa" ]
* Menu:
* --foption: chapter. (line 28)
-* --foption <1>: chapter. (line 699)
-* --foption <2>: chapter. (line 1381)
-* .: chapter. (line 2205)
-* ?: chapter. (line 2205)
+* --foption <1>: chapter. (line 703)
+* --foption <2>: chapter. (line 1389)
+* .: chapter. (line 2217)
+* ?: chapter. (line 2217)
* ``: chapter. (line 28)
-* `` <1>: chapter. (line 699)
-* `` <2>: chapter. (line 1381)
+* `` <1>: chapter. (line 703)
+* `` <2>: chapter. (line 1389)
* a: chapter. (line 316)
* a <1>: chapter. (line 515)
-* a <2>: chapter. (line 633)
-* a <3>: chapter. (line 987)
-* a <4>: chapter. (line 1186)
-* a <5>: chapter. (line 1304)
-* a <6>: chapter. (line 1793)
-* a <7>: chapter. (line 1994)
-* a <8>: chapter. (line 2145)
-* a <9>: chapter. (line 2205)
-* after: chapter. (line 644)
-* after <1>: chapter. (line 1315)
-* after <2>: chapter. (line 2156)
+* a <2>: chapter. (line 637)
+* a <3>: chapter. (line 991)
+* a <4>: chapter. (line 1190)
+* a <5>: chapter. (line 1312)
+* a <6>: chapter. (line 1801)
+* a <7>: chapter. (line 2002)
+* a <8>: chapter. (line 2157)
+* a <9>: chapter. (line 2217)
+* after: chapter. (line 648)
+* after <1>: chapter. (line 1323)
+* after <2>: chapter. (line 2168)
* arg2: chapter. (line 435)
-* arg2 <1>: chapter. (line 1106)
-* arg2 <2>: chapter. (line 1916)
+* arg2 <1>: chapter. (line 1110)
+* arg2 <2>: chapter. (line 1924)
* b: chapter. (line 516)
-* b <1>: chapter. (line 634)
-* b <2>: chapter. (line 1187)
-* b <3>: chapter. (line 1305)
-* b <4>: chapter. (line 1995)
-* b <5>: chapter. (line 2146)
+* b <1>: chapter. (line 638)
+* b <2>: chapter. (line 1191)
+* b <3>: chapter. (line 1313)
+* b <4>: chapter. (line 2003)
+* b <5>: chapter. (line 2158)
* bidule machin: chapter. (line 311)
-* bidule machin <1>: chapter. (line 982)
-* bidule machin <2>: chapter. (line 1788)
+* bidule machin <1>: chapter. (line 986)
+* bidule machin <2>: chapter. (line 1796)
* d--effn_name: chapter. (line 295)
-* d--effn_name <1>: chapter. (line 966)
-* d--effn_name <2>: chapter. (line 1772)
+* d--effn_name <1>: chapter. (line 970)
+* d--effn_name <2>: chapter. (line 1780)
* d--efmac_name: chapter. (line 376)
-* d--efmac_name <1>: chapter. (line 1047)
-* d--efmac_name <2>: chapter. (line 1855)
+* d--efmac_name <1>: chapter. (line 1051)
+* d--efmac_name <2>: chapter. (line 1863)
* d--efmethod_name on c--lass: chapter. (line 403)
-* d--efmethod_name on c--lass <1>: chapter. (line 1074)
-* d--efmethod_name on c--lass <2>: chapter. (line 1882)
+* d--efmethod_name on c--lass <1>: chapter. (line 1078)
+* d--efmethod_name on c--lass <2>: chapter. (line 1890)
* d--efop_name on c--lass: chapter. (line 364)
* d--efop_name on c--lass <1>: chapter. (line 367)
-* d--efop_name on c--lass <2>: chapter. (line 1035)
-* d--efop_name on c--lass <3>: chapter. (line 1038)
-* d--efop_name on c--lass <4>: chapter. (line 1843)
-* d--efop_name on c--lass <5>: chapter. (line 1846)
+* d--efop_name on c--lass <2>: chapter. (line 1039)
+* d--efop_name on c--lass <3>: chapter. (line 1042)
+* d--efop_name on c--lass <4>: chapter. (line 1851)
+* d--efop_name on c--lass <5>: chapter. (line 1854)
* d--efspec_name: chapter. (line 379)
-* d--efspec_name <1>: chapter. (line 1050)
-* d--efspec_name <2>: chapter. (line 1858)
+* d--efspec_name <1>: chapter. (line 1054)
+* d--efspec_name <2>: chapter. (line 1866)
* d--eftypefn_name: chapter. (line 337)
* d--eftypefn_name <1>: chapter. (line 340)
-* d--eftypefn_name <2>: chapter. (line 1008)
-* d--eftypefn_name <3>: chapter. (line 1011)
-* d--eftypefn_name <4>: chapter. (line 1816)
-* d--eftypefn_name <5>: chapter. (line 1819)
+* d--eftypefn_name <2>: chapter. (line 1012)
+* d--eftypefn_name <3>: chapter. (line 1015)
+* d--eftypefn_name <4>: chapter. (line 1824)
+* d--eftypefn_name <5>: chapter. (line 1827)
* d--eftypefn_name2: chapter. (line 414)
-* d--eftypefn_name2 <1>: chapter. (line 1085)
-* d--eftypefn_name2 <2>: chapter. (line 1894)
+* d--eftypefn_name2 <1>: chapter. (line 1089)
+* d--eftypefn_name2 <2>: chapter. (line 1902)
* d--eftypefun_name: chapter. (line 391)
-* d--eftypefun_name <1>: chapter. (line 1062)
-* d--eftypefun_name <2>: chapter. (line 1870)
+* d--eftypefun_name <1>: chapter. (line 1066)
+* d--eftypefun_name <2>: chapter. (line 1878)
* d--eftypemethod_name on c--lass: chapter. (line 406)
-* d--eftypemethod_name on c--lass <1>: chapter. (line 1077)
-* d--eftypemethod_name on c--lass <2>: chapter. (line 1885)
+* d--eftypemethod_name on c--lass <1>: chapter. (line 1081)
+* d--eftypemethod_name on c--lass <2>: chapter. (line 1893)
* d--eftypeop_name on c--lass: chapter. (line 343)
* d--eftypeop_name on c--lass <1>: chapter. (line 346)
-* d--eftypeop_name on c--lass <2>: chapter. (line 1014)
-* d--eftypeop_name on c--lass <3>: chapter. (line 1017)
-* d--eftypeop_name on c--lass <4>: chapter. (line 1822)
-* d--eftypeop_name on c--lass <5>: chapter. (line 1825)
+* d--eftypeop_name on c--lass <2>: chapter. (line 1018)
+* d--eftypeop_name on c--lass <3>: chapter. (line 1021)
+* d--eftypeop_name on c--lass <4>: chapter. (line 1830)
+* d--eftypeop_name on c--lass <5>: chapter. (line 1833)
* d--eftypeop_name2 on c--lass2: chapter. (line 419)
* d--eftypeop_name2 on c--lass2 <1>: chapter. (line 424)
-* d--eftypeop_name2 on c--lass2 <2>: chapter. (line 1090)
-* d--eftypeop_name2 on c--lass2 <3>: chapter. (line 1095)
-* d--eftypeop_name2 on c--lass2 <4>: chapter. (line 1899)
-* d--eftypeop_name2 on c--lass2 <5>: chapter. (line 1904)
+* d--eftypeop_name2 on c--lass2 <2>: chapter. (line 1094)
+* d--eftypeop_name2 on c--lass2 <3>: chapter. (line 1099)
+* d--eftypeop_name2 on c--lass2 <4>: chapter. (line 1907)
+* d--eftypeop_name2 on c--lass2 <5>: chapter. (line 1912)
* d--efun_name: chapter. (line 373)
-* d--efun_name <1>: chapter. (line 1044)
-* d--efun_name <2>: chapter. (line 1852)
+* d--efun_name <1>: chapter. (line 1048)
+* d--efun_name <2>: chapter. (line 1860)
* de--ffn_name: chapter. (line 298)
-* de--ffn_name <1>: chapter. (line 969)
-* de--ffn_name <2>: chapter. (line 1775)
+* de--ffn_name <1>: chapter. (line 973)
+* de--ffn_name <2>: chapter. (line 1783)
* deffn: chapter. (line 319)
* deffn <1>: chapter. (line 321)
-* deffn <2>: chapter. (line 990)
-* deffn <3>: chapter. (line 992)
-* deffn <4>: chapter. (line 1797)
-* deffn <5>: chapter. (line 1799)
+* deffn <2>: chapter. (line 994)
+* deffn <3>: chapter. (line 996)
+* deffn <4>: chapter. (line 1805)
+* deffn <5>: chapter. (line 1807)
* deffnx: chapter. (line 317)
* deffnx <1>: chapter. (line 322)
-* deffnx <2>: chapter. (line 988)
-* deffnx <3>: chapter. (line 993)
-* deffnx <4>: chapter. (line 1794)
-* deffnx <5>: chapter. (line 1800)
-* f---aa: chapter. (line 2205)
-* f---bb, f---cc: chapter. (line 2205)
-* f---ddd, f---eee, ffff: chapter. (line 2205)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter. (line 2205)
+* deffnx <2>: chapter. (line 992)
+* deffnx <3>: chapter. (line 997)
+* deffnx <4>: chapter. (line 1802)
+* deffnx <5>: chapter. (line 1808)
+* f---aa: chapter. (line 2217)
+* f---bb, f---cc: chapter. (line 2217)
+* f---ddd, f---eee, ffff: chapter. (line 2217)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter. (line 2217)
* followed: chapter. (line 314)
-* followed <1>: chapter. (line 642)
-* followed <2>: chapter. (line 985)
-* followed <3>: chapter. (line 1313)
-* followed <4>: chapter. (line 1791)
-* followed <5>: chapter. (line 2154)
+* followed <1>: chapter. (line 646)
+* followed <2>: chapter. (line 989)
+* followed <3>: chapter. (line 1321)
+* followed <4>: chapter. (line 1799)
+* followed <5>: chapter. (line 2166)
* I: chapter. (line 302)
* I <1>: chapter. (line 324)
-* I <2>: chapter. (line 973)
-* I <3>: chapter. (line 995)
-* I <4>: chapter. (line 1779)
-* I <5>: chapter. (line 1802)
+* I <2>: chapter. (line 977)
+* I <3>: chapter. (line 999)
+* I <4>: chapter. (line 1787)
+* I <5>: chapter. (line 1810)
* id i ule: chapter. (line 308)
-* id i ule <1>: chapter. (line 979)
-* id i ule <2>: chapter. (line 1785)
+* id i ule <1>: chapter. (line 983)
+* id i ule <2>: chapter. (line 1793)
* id ule: chapter. (line 307)
-* id ule <1>: chapter. (line 978)
-* id ule <2>: chapter. (line 1784)
-* INVALID: chapter. (line 646)
-* INVALID <1>: chapter. (line 1317)
-* INVALID <2>: chapter. (line 2158)
+* id ule <1>: chapter. (line 982)
+* id ule <2>: chapter. (line 1792)
+* INVALID: chapter. (line 650)
+* INVALID <1>: chapter. (line 1325)
+* INVALID <2>: chapter. (line 2170)
* log trap: chapter. (line 304)
-* log trap <1>: chapter. (line 975)
-* log trap <2>: chapter. (line 1781)
+* log trap <1>: chapter. (line 979)
+* log trap <2>: chapter. (line 1789)
* log trap1: chapter. (line 305)
-* log trap1 <1>: chapter. (line 976)
-* log trap1 <2>: chapter. (line 1782)
+* log trap1 <1>: chapter. (line 980)
+* log trap1 <2>: chapter. (line 1790)
* log trap2: chapter. (line 306)
-* log trap2 <1>: chapter. (line 977)
-* log trap2 <2>: chapter. (line 1783)
+* log trap2 <1>: chapter. (line 981)
+* log trap2 <2>: chapter. (line 1791)
* machin: chapter. (line 310)
* machin <1>: chapter. (line 312)
-* machin <2>: chapter. (line 638)
-* machin <3>: chapter. (line 639)
-* machin <4>: chapter. (line 640)
-* machin <5>: chapter. (line 641)
-* machin <6>: chapter. (line 981)
-* machin <7>: chapter. (line 983)
-* machin <8>: chapter. (line 1309)
-* machin <9>: chapter. (line 1310)
-* machin <10>: chapter. (line 1311)
-* machin <11>: chapter. (line 1312)
-* machin <12>: chapter. (line 1787)
-* machin <13>: chapter. (line 1789)
-* machin <14>: chapter. (line 2150)
-* machin <15>: chapter. (line 2151)
-* machin <16>: chapter. (line 2152)
-* machin <17>: chapter. (line 2153)
+* machin <2>: chapter. (line 642)
+* machin <3>: chapter. (line 643)
+* machin <4>: chapter. (line 644)
+* machin <5>: chapter. (line 645)
+* machin <6>: chapter. (line 985)
+* machin <7>: chapter. (line 987)
+* machin <8>: chapter. (line 1317)
+* machin <9>: chapter. (line 1318)
+* machin <10>: chapter. (line 1319)
+* machin <11>: chapter. (line 1320)
+* machin <12>: chapter. (line 1795)
+* machin <13>: chapter. (line 1797)
+* machin <14>: chapter. (line 2162)
+* machin <15>: chapter. (line 2163)
+* machin <16>: chapter. (line 2164)
+* machin <17>: chapter. (line 2165)
* n--ame: chapter. (line 331)
* n--ame <1>: chapter. (line 334)
-* n--ame <2>: chapter. (line 1002)
-* n--ame <3>: chapter. (line 1005)
-* n--ame <4>: chapter. (line 1810)
-* n--ame <5>: chapter. (line 1813)
+* n--ame <2>: chapter. (line 1006)
+* n--ame <3>: chapter. (line 1009)
+* n--ame <4>: chapter. (line 1818)
+* n--ame <5>: chapter. (line 1821)
* name2: chapter. (line 409)
-* name2 <1>: chapter. (line 1080)
-* name2 <2>: chapter. (line 1889)
-* t--ruc: chapter. (line 2205)
-* T--ruc: chapter. (line 2205)
+* name2 <1>: chapter. (line 1084)
+* name2 <2>: chapter. (line 1897)
+* t--ruc: chapter. (line 2217)
+* T--ruc: chapter. (line 2217)
* truc: chapter. (line 303)
* truc <1>: chapter. (line 325)
-* truc <2>: chapter. (line 974)
-* truc <3>: chapter. (line 996)
-* truc <4>: chapter. (line 1780)
-* truc <5>: chapter. (line 1803)
-* xxx, zzz: chapter. (line 2205)
+* truc <2>: chapter. (line 978)
+* truc <3>: chapter. (line 1000)
+* truc <4>: chapter. (line 1788)
+* truc <5>: chapter. (line 1811)
+* xxx, zzz: chapter. (line 2217)
vr
@@ -3253,8 +3265,8 @@ aaa" ]
* Menu:
* d--eftp_name: chapter. (line 370)
-* d--eftp_name <1>: chapter. (line 1041)
-* d--eftp_name <2>: chapter. (line 1849)
+* d--eftp_name <1>: chapter. (line 1045)
+* d--eftp_name <2>: chapter. (line 1857)
(8)
@@ -3337,306 +3349,306 @@ chapter 2
* Menu:
* ": chapter. (line 28)
-* " <1>: chapter. (line 699)
-* " <2>: chapter. (line 1381)
+* " <1>: chapter. (line 703)
+* " <2>: chapter. (line 1389)
* -option: chapter. (line 28)
-* -option <1>: chapter. (line 699)
-* -option <2>: chapter. (line 1381)
-* .: chapter. (line 2205)
-* ?: chapter. (line 2205)
-* a: chapter. (line 2205)
-* aaa, bbb: chapter. (line 2205)
-* a--a: chapter. (line 2205)
+* -option <1>: chapter. (line 703)
+* -option <2>: chapter. (line 1389)
+* .: chapter. (line 2217)
+* ?: chapter. (line 2217)
+* a: chapter. (line 2217)
+* aaa, bbb: chapter. (line 2217)
+* a--a: chapter. (line 2217)
* a--asis: chapter. (line 511)
-* a--asis <1>: chapter. (line 1182)
-* a--asis <2>: chapter. (line 1990)
+* a--asis <1>: chapter. (line 1186)
+* a--asis <2>: chapter. (line 1998)
* b: chapter. (line 512)
-* b <1>: chapter. (line 1183)
-* b <2>: chapter. (line 1991)
-* b--b, c--c: chapter. (line 2205)
-* counting entry: chapter. (line 2555)
-* d--dd, e--ee, f--ff: chapter. (line 2205)
+* b <1>: chapter. (line 1187)
+* b <2>: chapter. (line 1999)
+* b--b, c--c: chapter. (line 2217)
+* counting entry: chapter. (line 2567)
+* d--dd, e--ee, f--ff: chapter. (line 2217)
* d--efcv_name: chapter. (line 352)
* d--efcv_name <1>: chapter. (line 355)
-* d--efcv_name <2>: chapter. (line 1023)
-* d--efcv_name <3>: chapter. (line 1026)
-* d--efcv_name <4>: chapter. (line 1831)
-* d--efcv_name <5>: chapter. (line 1834)
+* d--efcv_name <2>: chapter. (line 1027)
+* d--efcv_name <3>: chapter. (line 1030)
+* d--efcv_name <4>: chapter. (line 1839)
+* d--efcv_name <5>: chapter. (line 1842)
* d--efivar_name of c--lass: chapter. (line 397)
-* d--efivar_name of c--lass <1>: chapter. (line 1068)
-* d--efivar_name of c--lass <2>: chapter. (line 1876)
+* d--efivar_name of c--lass <1>: chapter. (line 1072)
+* d--efivar_name of c--lass <2>: chapter. (line 1884)
* d--efopt_name: chapter. (line 388)
-* d--efopt_name <1>: chapter. (line 1059)
-* d--efopt_name <2>: chapter. (line 1867)
+* d--efopt_name <1>: chapter. (line 1063)
+* d--efopt_name <2>: chapter. (line 1875)
* d--eftypecv_name of c--lass: chapter. (line 358)
* d--eftypecv_name of c--lass <1>: chapter. (line 361)
-* d--eftypecv_name of c--lass <2>: chapter. (line 1029)
-* d--eftypecv_name of c--lass <3>: chapter. (line 1032)
-* d--eftypecv_name of c--lass <4>: chapter. (line 1837)
-* d--eftypecv_name of c--lass <5>: chapter. (line 1840)
+* d--eftypecv_name of c--lass <2>: chapter. (line 1033)
+* d--eftypecv_name of c--lass <3>: chapter. (line 1036)
+* d--eftypecv_name of c--lass <4>: chapter. (line 1845)
+* d--eftypecv_name of c--lass <5>: chapter. (line 1848)
* d--eftypecv_name2 of c--lass2: chapter. (line 429)
* d--eftypecv_name2 of c--lass2 <1>: chapter. (line 432)
-* d--eftypecv_name2 of c--lass2 <2>: chapter. (line 1100)
-* d--eftypecv_name2 of c--lass2 <3>: chapter. (line 1103)
-* d--eftypecv_name2 of c--lass2 <4>: chapter. (line 1909)
-* d--eftypecv_name2 of c--lass2 <5>: chapter. (line 1912)
+* d--eftypecv_name2 of c--lass2 <2>: chapter. (line 1104)
+* d--eftypecv_name2 of c--lass2 <3>: chapter. (line 1107)
+* d--eftypecv_name2 of c--lass2 <4>: chapter. (line 1917)
+* d--eftypecv_name2 of c--lass2 <5>: chapter. (line 1920)
* d--eftypeivar_name of c--lass: chapter. (line 400)
-* d--eftypeivar_name of c--lass <1>: chapter. (line 1071)
-* d--eftypeivar_name of c--lass <2>: chapter. (line 1879)
+* d--eftypeivar_name of c--lass <1>: chapter. (line 1075)
+* d--eftypeivar_name of c--lass <2>: chapter. (line 1887)
* d--eftypevar_name: chapter. (line 394)
-* d--eftypevar_name <1>: chapter. (line 1065)
-* d--eftypevar_name <2>: chapter. (line 1873)
+* d--eftypevar_name <1>: chapter. (line 1069)
+* d--eftypevar_name <2>: chapter. (line 1881)
* d--eftypevr_name: chapter. (line 349)
-* d--eftypevr_name <1>: chapter. (line 1020)
-* d--eftypevr_name <2>: chapter. (line 1828)
+* d--eftypevr_name <1>: chapter. (line 1024)
+* d--eftypevr_name <2>: chapter. (line 1836)
* d--efvar_name: chapter. (line 382)
* d--efvar_name <1>: chapter. (line 385)
-* d--efvar_name <2>: chapter. (line 1053)
-* d--efvar_name <3>: chapter. (line 1056)
-* d--efvar_name <4>: chapter. (line 1861)
-* d--efvar_name <5>: chapter. (line 1864)
+* d--efvar_name <2>: chapter. (line 1057)
+* d--efvar_name <3>: chapter. (line 1060)
+* d--efvar_name <4>: chapter. (line 1869)
+* d--efvar_name <5>: chapter. (line 1872)
* d--efvr_name: chapter. (line 328)
-* d--efvr_name <1>: chapter. (line 999)
-* d--efvr_name <2>: chapter. (line 1807)
-* g--gg, h--hh jjj, k--kk, l--ll: chapter. (line 2205)
+* d--efvr_name <1>: chapter. (line 1003)
+* d--efvr_name <2>: chapter. (line 1815)
+* g--gg, h--hh jjj, k--kk, l--ll: chapter. (line 2217)
* index entry between item and itemx: chapter. (line 516)
-* index entry between item and itemx <1>: chapter. (line 634)
-* index entry between item and itemx <2>: chapter. (line 1187)
-* index entry between item and itemx <3>: chapter. (line 1305)
-* index entry between item and itemx <4>: chapter. (line 1995)
-* index entry between item and itemx <5>: chapter. (line 2146)
-* index entry in footnote: chapter. (line 2550)
+* index entry between item and itemx <1>: chapter. (line 638)
+* index entry between item and itemx <2>: chapter. (line 1191)
+* index entry between item and itemx <3>: chapter. (line 1313)
+* index entry between item and itemx <4>: chapter. (line 2003)
+* index entry between item and itemx <5>: chapter. (line 2158)
+* index entry in footnote: chapter. (line 2562)
* index entry within deffn: chapter. (line 303)
-* index entry within deffn <1>: chapter. (line 974)
-* index entry within deffn <2>: chapter. (line 1780)
+* index entry within deffn <1>: chapter. (line 978)
+* index entry within deffn <2>: chapter. (line 1788)
* index entry within itemize: chapter. (line 214)
-* index entry within itemize <1>: chapter. (line 885)
-* index entry within itemize <2>: chapter. (line 1691)
+* index entry within itemize <1>: chapter. (line 889)
+* index entry within itemize <2>: chapter. (line 1699)
* index entry within multitable: chapter. (line 236)
-* index entry within multitable <1>: chapter. (line 907)
-* index entry within multitable <2>: chapter. (line 1714)
-* t-ruc: chapter. (line 2205)
-* T-ruc: chapter. (line 2205)
+* index entry within multitable <1>: chapter. (line 911)
+* index entry within multitable <2>: chapter. (line 1722)
+* t-ruc: chapter. (line 2217)
+* T-ruc: chapter. (line 2217)
* vtable i--tem code kbdinputstyle: chapter. (line 138)
-* vtable i--tem code kbdinputstyle <1>: chapter. (line 809)
-* vtable i--tem code kbdinputstyle <2>: chapter. (line 1614)
+* vtable i--tem code kbdinputstyle <1>: chapter. (line 813)
+* vtable i--tem code kbdinputstyle <2>: chapter. (line 1622)
* vtable i--tem default kbdinputstyle: chapter. (line 133)
-* vtable i--tem default kbdinputstyle <1>: chapter. (line 804)
-* vtable i--tem default kbdinputstyle <2>: chapter. (line 1609)
+* vtable i--tem default kbdinputstyle <1>: chapter. (line 808)
+* vtable i--tem default kbdinputstyle <2>: chapter. (line 1617)
* vtable i--tem distinct kbdinputstyle: chapter. (line 148)
-* vtable i--tem distinct kbdinputstyle <1>: chapter. (line 819)
-* vtable i--tem distinct kbdinputstyle <2>: chapter. (line 1624)
+* vtable i--tem distinct kbdinputstyle <1>: chapter. (line 823)
+* vtable i--tem distinct kbdinputstyle <2>: chapter. (line 1632)
* vtable i--tem example kbdinputstyle: chapter. (line 143)
-* vtable i--tem example kbdinputstyle <1>: chapter. (line 814)
-* vtable i--tem example kbdinputstyle <2>: chapter. (line 1619)
+* vtable i--tem example kbdinputstyle <1>: chapter. (line 818)
+* vtable i--tem example kbdinputstyle <2>: chapter. (line 1627)
* vtable i--tem in example code kbdinputstyle: chapter. (line 140)
-* vtable i--tem in example code kbdinputstyle <1>: chapter. (line 811)
-* vtable i--tem in example code kbdinputstyle <2>: chapter. (line 1616)
+* vtable i--tem in example code kbdinputstyle <1>: chapter. (line 815)
+* vtable i--tem in example code kbdinputstyle <2>: chapter. (line 1624)
* vtable i--tem in example default kbdinputstyle: chapter. (line 135)
* vtable i--tem in example default kbdinputstyle <1>: chapter.
- (line 806)
+ (line 810)
* vtable i--tem in example default kbdinputstyle <2>: chapter.
- (line 1611)
+ (line 1619)
* vtable i--tem in example distinct kbdinputstyle: chapter. (line 150)
* vtable i--tem in example distinct kbdinputstyle <1>: chapter.
- (line 821)
+ (line 825)
* vtable i--tem in example distinct kbdinputstyle <2>: chapter.
- (line 1626)
+ (line 1634)
* vtable i--tem in example example kbdinputstyle: chapter. (line 145)
* vtable i--tem in example example kbdinputstyle <1>: chapter.
- (line 816)
+ (line 820)
* vtable i--tem in example example kbdinputstyle <2>: chapter.
- (line 1621)
+ (line 1629)
[index ]
* Menu:
* --foption: chapter. (line 28)
-* --foption <1>: chapter. (line 699)
-* --foption <2>: chapter. (line 1381)
-* .: chapter. (line 2205)
-* ?: chapter. (line 2205)
+* --foption <1>: chapter. (line 703)
+* --foption <2>: chapter. (line 1389)
+* .: chapter. (line 2217)
+* ?: chapter. (line 2217)
* ``: chapter. (line 28)
-* `` <1>: chapter. (line 699)
-* `` <2>: chapter. (line 1381)
+* `` <1>: chapter. (line 703)
+* `` <2>: chapter. (line 1389)
* a: chapter. (line 316)
* a <1>: chapter. (line 515)
-* a <2>: chapter. (line 633)
-* a <3>: chapter. (line 987)
-* a <4>: chapter. (line 1186)
-* a <5>: chapter. (line 1304)
-* a <6>: chapter. (line 1793)
-* a <7>: chapter. (line 1994)
-* a <8>: chapter. (line 2145)
-* a <9>: chapter. (line 2205)
-* after: chapter. (line 644)
-* after <1>: chapter. (line 1315)
-* after <2>: chapter. (line 2156)
+* a <2>: chapter. (line 637)
+* a <3>: chapter. (line 991)
+* a <4>: chapter. (line 1190)
+* a <5>: chapter. (line 1312)
+* a <6>: chapter. (line 1801)
+* a <7>: chapter. (line 2002)
+* a <8>: chapter. (line 2157)
+* a <9>: chapter. (line 2217)
+* after: chapter. (line 648)
+* after <1>: chapter. (line 1323)
+* after <2>: chapter. (line 2168)
* arg2: chapter. (line 435)
-* arg2 <1>: chapter. (line 1106)
-* arg2 <2>: chapter. (line 1916)
+* arg2 <1>: chapter. (line 1110)
+* arg2 <2>: chapter. (line 1924)
* b: chapter. (line 516)
-* b <1>: chapter. (line 634)
-* b <2>: chapter. (line 1187)
-* b <3>: chapter. (line 1305)
-* b <4>: chapter. (line 1995)
-* b <5>: chapter. (line 2146)
+* b <1>: chapter. (line 638)
+* b <2>: chapter. (line 1191)
+* b <3>: chapter. (line 1313)
+* b <4>: chapter. (line 2003)
+* b <5>: chapter. (line 2158)
* bidule machin: chapter. (line 311)
-* bidule machin <1>: chapter. (line 982)
-* bidule machin <2>: chapter. (line 1788)
+* bidule machin <1>: chapter. (line 986)
+* bidule machin <2>: chapter. (line 1796)
* d--effn_name: chapter. (line 295)
-* d--effn_name <1>: chapter. (line 966)
-* d--effn_name <2>: chapter. (line 1772)
+* d--effn_name <1>: chapter. (line 970)
+* d--effn_name <2>: chapter. (line 1780)
* d--efmac_name: chapter. (line 376)
-* d--efmac_name <1>: chapter. (line 1047)
-* d--efmac_name <2>: chapter. (line 1855)
+* d--efmac_name <1>: chapter. (line 1051)
+* d--efmac_name <2>: chapter. (line 1863)
* d--efmethod_name on c--lass: chapter. (line 403)
-* d--efmethod_name on c--lass <1>: chapter. (line 1074)
-* d--efmethod_name on c--lass <2>: chapter. (line 1882)
+* d--efmethod_name on c--lass <1>: chapter. (line 1078)
+* d--efmethod_name on c--lass <2>: chapter. (line 1890)
* d--efop_name on c--lass: chapter. (line 364)
* d--efop_name on c--lass <1>: chapter. (line 367)
-* d--efop_name on c--lass <2>: chapter. (line 1035)
-* d--efop_name on c--lass <3>: chapter. (line 1038)
-* d--efop_name on c--lass <4>: chapter. (line 1843)
-* d--efop_name on c--lass <5>: chapter. (line 1846)
+* d--efop_name on c--lass <2>: chapter. (line 1039)
+* d--efop_name on c--lass <3>: chapter. (line 1042)
+* d--efop_name on c--lass <4>: chapter. (line 1851)
+* d--efop_name on c--lass <5>: chapter. (line 1854)
* d--efspec_name: chapter. (line 379)
-* d--efspec_name <1>: chapter. (line 1050)
-* d--efspec_name <2>: chapter. (line 1858)
+* d--efspec_name <1>: chapter. (line 1054)
+* d--efspec_name <2>: chapter. (line 1866)
* d--eftypefn_name: chapter. (line 337)
* d--eftypefn_name <1>: chapter. (line 340)
-* d--eftypefn_name <2>: chapter. (line 1008)
-* d--eftypefn_name <3>: chapter. (line 1011)
-* d--eftypefn_name <4>: chapter. (line 1816)
-* d--eftypefn_name <5>: chapter. (line 1819)
+* d--eftypefn_name <2>: chapter. (line 1012)
+* d--eftypefn_name <3>: chapter. (line 1015)
+* d--eftypefn_name <4>: chapter. (line 1824)
+* d--eftypefn_name <5>: chapter. (line 1827)
* d--eftypefn_name2: chapter. (line 414)
-* d--eftypefn_name2 <1>: chapter. (line 1085)
-* d--eftypefn_name2 <2>: chapter. (line 1894)
+* d--eftypefn_name2 <1>: chapter. (line 1089)
+* d--eftypefn_name2 <2>: chapter. (line 1902)
* d--eftypefun_name: chapter. (line 391)
-* d--eftypefun_name <1>: chapter. (line 1062)
-* d--eftypefun_name <2>: chapter. (line 1870)
+* d--eftypefun_name <1>: chapter. (line 1066)
+* d--eftypefun_name <2>: chapter. (line 1878)
* d--eftypemethod_name on c--lass: chapter. (line 406)
-* d--eftypemethod_name on c--lass <1>: chapter. (line 1077)
-* d--eftypemethod_name on c--lass <2>: chapter. (line 1885)
+* d--eftypemethod_name on c--lass <1>: chapter. (line 1081)
+* d--eftypemethod_name on c--lass <2>: chapter. (line 1893)
* d--eftypeop_name on c--lass: chapter. (line 343)
* d--eftypeop_name on c--lass <1>: chapter. (line 346)
-* d--eftypeop_name on c--lass <2>: chapter. (line 1014)
-* d--eftypeop_name on c--lass <3>: chapter. (line 1017)
-* d--eftypeop_name on c--lass <4>: chapter. (line 1822)
-* d--eftypeop_name on c--lass <5>: chapter. (line 1825)
+* d--eftypeop_name on c--lass <2>: chapter. (line 1018)
+* d--eftypeop_name on c--lass <3>: chapter. (line 1021)
+* d--eftypeop_name on c--lass <4>: chapter. (line 1830)
+* d--eftypeop_name on c--lass <5>: chapter. (line 1833)
* d--eftypeop_name2 on c--lass2: chapter. (line 419)
* d--eftypeop_name2 on c--lass2 <1>: chapter. (line 424)
-* d--eftypeop_name2 on c--lass2 <2>: chapter. (line 1090)
-* d--eftypeop_name2 on c--lass2 <3>: chapter. (line 1095)
-* d--eftypeop_name2 on c--lass2 <4>: chapter. (line 1899)
-* d--eftypeop_name2 on c--lass2 <5>: chapter. (line 1904)
+* d--eftypeop_name2 on c--lass2 <2>: chapter. (line 1094)
+* d--eftypeop_name2 on c--lass2 <3>: chapter. (line 1099)
+* d--eftypeop_name2 on c--lass2 <4>: chapter. (line 1907)
+* d--eftypeop_name2 on c--lass2 <5>: chapter. (line 1912)
* d--efun_name: chapter. (line 373)
-* d--efun_name <1>: chapter. (line 1044)
-* d--efun_name <2>: chapter. (line 1852)
+* d--efun_name <1>: chapter. (line 1048)
+* d--efun_name <2>: chapter. (line 1860)
* de--ffn_name: chapter. (line 298)
-* de--ffn_name <1>: chapter. (line 969)
-* de--ffn_name <2>: chapter. (line 1775)
+* de--ffn_name <1>: chapter. (line 973)
+* de--ffn_name <2>: chapter. (line 1783)
* deffn: chapter. (line 319)
* deffn <1>: chapter. (line 321)
-* deffn <2>: chapter. (line 990)
-* deffn <3>: chapter. (line 992)
-* deffn <4>: chapter. (line 1797)
-* deffn <5>: chapter. (line 1799)
+* deffn <2>: chapter. (line 994)
+* deffn <3>: chapter. (line 996)
+* deffn <4>: chapter. (line 1805)
+* deffn <5>: chapter. (line 1807)
* deffnx: chapter. (line 317)
* deffnx <1>: chapter. (line 322)
-* deffnx <2>: chapter. (line 988)
-* deffnx <3>: chapter. (line 993)
-* deffnx <4>: chapter. (line 1794)
-* deffnx <5>: chapter. (line 1800)
-* f---aa: chapter. (line 2205)
-* f---bb, f---cc: chapter. (line 2205)
-* f---ddd, f---eee, ffff: chapter. (line 2205)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter. (line 2205)
+* deffnx <2>: chapter. (line 992)
+* deffnx <3>: chapter. (line 997)
+* deffnx <4>: chapter. (line 1802)
+* deffnx <5>: chapter. (line 1808)
+* f---aa: chapter. (line 2217)
+* f---bb, f---cc: chapter. (line 2217)
+* f---ddd, f---eee, ffff: chapter. (line 2217)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter. (line 2217)
* followed: chapter. (line 314)
-* followed <1>: chapter. (line 642)
-* followed <2>: chapter. (line 985)
-* followed <3>: chapter. (line 1313)
-* followed <4>: chapter. (line 1791)
-* followed <5>: chapter. (line 2154)
+* followed <1>: chapter. (line 646)
+* followed <2>: chapter. (line 989)
+* followed <3>: chapter. (line 1321)
+* followed <4>: chapter. (line 1799)
+* followed <5>: chapter. (line 2166)
* I: chapter. (line 302)
* I <1>: chapter. (line 324)
-* I <2>: chapter. (line 973)
-* I <3>: chapter. (line 995)
-* I <4>: chapter. (line 1779)
-* I <5>: chapter. (line 1802)
+* I <2>: chapter. (line 977)
+* I <3>: chapter. (line 999)
+* I <4>: chapter. (line 1787)
+* I <5>: chapter. (line 1810)
* id i ule: chapter. (line 308)
-* id i ule <1>: chapter. (line 979)
-* id i ule <2>: chapter. (line 1785)
+* id i ule <1>: chapter. (line 983)
+* id i ule <2>: chapter. (line 1793)
* id ule: chapter. (line 307)
-* id ule <1>: chapter. (line 978)
-* id ule <2>: chapter. (line 1784)
-* INVALID: chapter. (line 646)
-* INVALID <1>: chapter. (line 1317)
-* INVALID <2>: chapter. (line 2158)
+* id ule <1>: chapter. (line 982)
+* id ule <2>: chapter. (line 1792)
+* INVALID: chapter. (line 650)
+* INVALID <1>: chapter. (line 1325)
+* INVALID <2>: chapter. (line 2170)
* log trap: chapter. (line 304)
-* log trap <1>: chapter. (line 975)
-* log trap <2>: chapter. (line 1781)
+* log trap <1>: chapter. (line 979)
+* log trap <2>: chapter. (line 1789)
* log trap1: chapter. (line 305)
-* log trap1 <1>: chapter. (line 976)
-* log trap1 <2>: chapter. (line 1782)
+* log trap1 <1>: chapter. (line 980)
+* log trap1 <2>: chapter. (line 1790)
* log trap2: chapter. (line 306)
-* log trap2 <1>: chapter. (line 977)
-* log trap2 <2>: chapter. (line 1783)
+* log trap2 <1>: chapter. (line 981)
+* log trap2 <2>: chapter. (line 1791)
* machin: chapter. (line 310)
* machin <1>: chapter. (line 312)
-* machin <2>: chapter. (line 638)
-* machin <3>: chapter. (line 639)
-* machin <4>: chapter. (line 640)
-* machin <5>: chapter. (line 641)
-* machin <6>: chapter. (line 981)
-* machin <7>: chapter. (line 983)
-* machin <8>: chapter. (line 1309)
-* machin <9>: chapter. (line 1310)
-* machin <10>: chapter. (line 1311)
-* machin <11>: chapter. (line 1312)
-* machin <12>: chapter. (line 1787)
-* machin <13>: chapter. (line 1789)
-* machin <14>: chapter. (line 2150)
-* machin <15>: chapter. (line 2151)
-* machin <16>: chapter. (line 2152)
-* machin <17>: chapter. (line 2153)
+* machin <2>: chapter. (line 642)
+* machin <3>: chapter. (line 643)
+* machin <4>: chapter. (line 644)
+* machin <5>: chapter. (line 645)
+* machin <6>: chapter. (line 985)
+* machin <7>: chapter. (line 987)
+* machin <8>: chapter. (line 1317)
+* machin <9>: chapter. (line 1318)
+* machin <10>: chapter. (line 1319)
+* machin <11>: chapter. (line 1320)
+* machin <12>: chapter. (line 1795)
+* machin <13>: chapter. (line 1797)
+* machin <14>: chapter. (line 2162)
+* machin <15>: chapter. (line 2163)
+* machin <16>: chapter. (line 2164)
+* machin <17>: chapter. (line 2165)
* n--ame: chapter. (line 331)
* n--ame <1>: chapter. (line 334)
-* n--ame <2>: chapter. (line 1002)
-* n--ame <3>: chapter. (line 1005)
-* n--ame <4>: chapter. (line 1810)
-* n--ame <5>: chapter. (line 1813)
+* n--ame <2>: chapter. (line 1006)
+* n--ame <3>: chapter. (line 1009)
+* n--ame <4>: chapter. (line 1818)
+* n--ame <5>: chapter. (line 1821)
* name2: chapter. (line 409)
-* name2 <1>: chapter. (line 1080)
-* name2 <2>: chapter. (line 1889)
-* t--ruc: chapter. (line 2205)
-* T--ruc: chapter. (line 2205)
+* name2 <1>: chapter. (line 1084)
+* name2 <2>: chapter. (line 1897)
+* t--ruc: chapter. (line 2217)
+* T--ruc: chapter. (line 2217)
* truc: chapter. (line 303)
* truc <1>: chapter. (line 325)
-* truc <2>: chapter. (line 974)
-* truc <3>: chapter. (line 996)
-* truc <4>: chapter. (line 1780)
-* truc <5>: chapter. (line 1803)
-* xxx, zzz: chapter. (line 2205)
+* truc <2>: chapter. (line 978)
+* truc <3>: chapter. (line 1000)
+* truc <4>: chapter. (line 1788)
+* truc <5>: chapter. (line 1811)
+* xxx, zzz: chapter. (line 2217)
Tag Table:
-Node: Top18988
-Node: chapter19173
-Ref: chapter-Footnote-198871
-Ref: chapter-Footnote-298891
-Ref: chapter-Footnote-398912
-Ref: chapter-Footnote-498932
-Ref: chapter-Footnote-598953
-Ref: chapter-Footnote-698973
-Ref: chapter-Footnote-798994
-Ref: chapter-Footnote-899032
-Node: s--ect,ion99052
-Node: subsection99255
-Ref: anchor99436
-Node: subsubsection ``simple-double--99436
-Node: subsubsection three---four----''99636
-Node: chapter299808
+Node: Top19055
+Node: chapter19240
+Ref: chapter-Footnote-199145
+Ref: chapter-Footnote-299165
+Ref: chapter-Footnote-399186
+Ref: chapter-Footnote-499206
+Ref: chapter-Footnote-599227
+Ref: chapter-Footnote-699247
+Ref: chapter-Footnote-799268
+Ref: chapter-Footnote-899306
+Node: s--ect,ion99326
+Node: subsection99529
+Ref: anchor99710
+Node: subsubsection ``simple-double--99710
+Node: subsubsection three---four----''99910
+Node: chapter2100082
End Tag Table
diff --git a/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
b/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
index 1310b87de9..3c302e72bc 100644
--- a/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
@@ -653,6 +653,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
@@ -1743,6 +1746,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph"
style="text-align:left">f–lushleft
more text
</p></div>
@@ -2831,6 +2839,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph"
style="text-align:left">f–lushleft
more text
</p></div>
@@ -3976,6 +3989,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph"
style="text-align:left">f–lushleft
more text
</p></div>
@@ -5062,6 +5080,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph"
style="text-align:left">f–lushleft
more text
</p></div>
@@ -6275,6 +6298,12 @@ ref</a>
</pre></td></tr></table>
<pre class="example-preformatted">
+</pre><table class="cartouche" border="1"><tr><th>
+Tit--le <em class="emph">of box</em></th></tr><tr><td>
+<pre class="example-preformatted">With title c--artouche
+</pre></td></tr></table>
+<pre class="example-preformatted">
+
</pre><div class="flushleft"><pre class="example-preformatted">f--lushleft
more text
</pre></div><pre class="example-preformatted">
diff --git a/tp/tests/layout/res_parser/formatting_latex/formatting.tex
b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
index e8df70304c..453f4aa4d7 100644
--- a/tp/tests/layout/res_parser/formatting_latex/formatting.tex
+++ b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
@@ -1492,6 +1492,10 @@ Value--table samp
c--artouche
\end{mdframed}
+\begin{mdframed}[style=Texinfocartouche, frametitle={Tit--le \emph{of box}}]
+With title c--artouche
+\end{mdframed}
+
\begin{flushleft}
\begin{Texinfopreformatted}%
f--lushleft
@@ -3152,6 +3156,10 @@ Value--table samp
c--artouche
\end{mdframed}
+\begin{mdframed}[style=Texinfocartouche, frametitle={Tit--le \emph{of box}}]
+With title c--artouche
+\end{mdframed}
+
\begin{flushleft}
\begin{Texinfopreformatted}%
f--lushleft
@@ -4828,6 +4836,10 @@ Value--table samp
c--artouche
\end{mdframed}
+\begin{mdframed}[style=Texinfocartouche, frametitle={Tit--le \emph{of box}}]
+With title c--artouche
+\end{mdframed}
+
\begin{flushleft}
\begin{Texinfopreformatted}%
f--lushleft
@@ -6487,6 +6499,10 @@ Value--table samp
c--artouche
\end{mdframed}
+\begin{mdframed}[style=Texinfocartouche, frametitle={Tit--le \emph{of box}}]
+With title c--artouche
+\end{mdframed}
+
\begin{flushleft}
\begin{Texinfopreformatted}%
f--lushleft
@@ -8588,6 +8604,14 @@ b
\begin{Texinfopreformatted}%
\ttfamily
\end{Texinfopreformatted}
+\begin{mdframed}[style=Texinfocartouche, frametitle={Tit--le \emph{of box}}]
+\begin{Texinfopreformatted}%
+\ttfamily With title c{-}{-}artouche
+\end{Texinfopreformatted}
+\end{mdframed}
+\begin{Texinfopreformatted}%
+\ttfamily
+\end{Texinfopreformatted}
\begin{flushleft}
\begin{Texinfopreformatted}%
\begin{Texinfopreformatted}%
diff --git a/tp/tests/layout/res_parser/formatting_macro_expand/formatting.texi
b/tp/tests/layout/res_parser/formatting_macro_expand/formatting.texi
index 65c0dcf43c..d53e5c8470 100644
--- a/tp/tests/layout/res_parser/formatting_macro_expand/formatting.texi
+++ b/tp/tests/layout/res_parser/formatting_macro_expand/formatting.texi
@@ -943,6 +943,10 @@ Value--table samp
c--artouche
@end cartouche
+@cartouche Tit--le @emph{of box}
+With title c--artouche
+@end cartouche
+
@flushleft
f--lushleft
more text
@@ -2107,6 +2111,10 @@ Value--table samp
c--artouche
@end cartouche
+@cartouche Tit--le @emph{of box}
+With title c--artouche
+@end cartouche
+
@flushleft
f--lushleft
more text
@@ -3267,6 +3275,10 @@ Value--table samp
c--artouche
@end cartouche
+@cartouche Tit--le @emph{of box}
+With title c--artouche
+@end cartouche
+
@flushleft
f--lushleft
more text
@@ -4456,6 +4468,10 @@ Value--table samp
c--artouche
@end cartouche
+@cartouche Tit--le @emph{of box}
+With title c--artouche
+@end cartouche
+
@flushleft
f--lushleft
more text
@@ -5623,6 +5639,10 @@ Value--table samp
c--artouche
@end cartouche
+@cartouche Tit--le @emph{of box}
+With title c--artouche
+@end cartouche
+
@flushleft
f--lushleft
more text
diff --git a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
index c17b22b626..5400c43536 100644
--- a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
@@ -653,6 +653,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
@@ -1792,6 +1795,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -2878,6 +2886,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -4021,6 +4034,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -5105,6 +5123,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -6316,6 +6339,12 @@ ref</a>
</pre></td></tr></table>
<pre class="example-preformatted">
+</pre><table class="cartouche" border="1"><tr><th>
+Tit--le <em class="emph">of box</em></th></tr><tr><td>
+<pre class="example-preformatted">With title c--artouche
+</pre></td></tr></table>
+<pre class="example-preformatted">
+
</pre><div class="flushleft"><pre class="example-preformatted">f--lushleft
more text
</pre></div><pre class="example-preformatted">
diff --git a/tp/tests/layout/res_parser/formatting_nodes/anchor.html
b/tp/tests/layout/res_parser/formatting_nodes/anchor.html
index ffdc6ad56a..7c28287c16 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/anchor.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/anchor.html
@@ -654,6 +654,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
diff --git a/tp/tests/layout/res_parser/formatting_nodes/chapter.html
b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
index a1a03ac57c..c584e11c73 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
@@ -653,6 +653,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
@@ -1800,6 +1803,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -2886,6 +2894,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -4099,6 +4112,12 @@ ref</a>
</pre></td></tr></table>
<pre class="example-preformatted">
+</pre><table class="cartouche" border="1"><tr><th>
+Tit--le <em class="emph">of box</em></th></tr><tr><td>
+<pre class="example-preformatted">With title c--artouche
+</pre></td></tr></table>
+<pre class="example-preformatted">
+
</pre><div class="flushleft"><pre class="example-preformatted">f--lushleft
more text
</pre></div><pre class="example-preformatted">
diff --git a/tp/tests/layout/res_parser/formatting_nodes/chapter2.html
b/tp/tests/layout/res_parser/formatting_nodes/chapter2.html
index afa5d2c75e..87681a89ea 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/chapter2.html
@@ -653,6 +653,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
diff --git a/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html
b/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html
index 7ec322572a..7bcb6e9c82 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html
@@ -653,6 +653,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
diff --git a/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html
b/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html
index 36fb171474..6fd99bb6b9 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html
@@ -653,6 +653,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
diff --git a/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html
b/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html
index a4499ee743..97de822212 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html
@@ -653,6 +653,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
diff --git a/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html
b/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html
index 1be2a726ef..bc3cab8e0b 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html
@@ -653,6 +653,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
diff --git a/tp/tests/layout/res_parser/formatting_nodes/index.html
b/tp/tests/layout/res_parser/formatting_nodes/index.html
index 2bbf8338a7..01e346bce7 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/index.html
@@ -653,6 +653,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
@@ -1770,6 +1773,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -2858,6 +2866,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
diff --git
a/tp/tests/layout/res_parser/formatting_nodes/s_002d_002dect_002cion.html
b/tp/tests/layout/res_parser/formatting_nodes/s_002d_002dect_002cion.html
index f330554f33..905bee3907 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/s_002d_002dect_002cion.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/s_002d_002dect_002cion.html
@@ -653,6 +653,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
diff --git a/tp/tests/layout/res_parser/formatting_nodes/subsection.html
b/tp/tests/layout/res_parser/formatting_nodes/subsection.html
index ad82291b44..f14bac00e8 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/subsection.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/subsection.html
@@ -653,6 +653,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
diff --git
a/tp/tests/layout/res_parser/formatting_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
b/tp/tests/layout/res_parser/formatting_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
index 559f0dda07..7e24d0bee0 100644
---
a/tp/tests/layout/res_parser/formatting_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
+++
b/tp/tests/layout/res_parser/formatting_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
@@ -653,6 +653,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
diff --git
a/tp/tests/layout/res_parser/formatting_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
b/tp/tests/layout/res_parser/formatting_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
index bb74ebded0..cbfdf4a4be 100644
---
a/tp/tests/layout/res_parser/formatting_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
+++
b/tp/tests/layout/res_parser/formatting_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
@@ -653,6 +653,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
diff --git
a/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
b/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
index 6581ab5ef4..856a647ef1 100644
--- a/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
@@ -653,6 +653,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
@@ -1784,6 +1787,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -2872,6 +2880,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -4017,6 +4030,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -5103,6 +5121,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -6316,6 +6339,12 @@ ref</a>
</pre></td></tr></table>
<pre class="example-preformatted">
+</pre><table class="cartouche" border="1"><tr><th>
+Tit--le <em class="emph">of box</em></th></tr><tr><td>
+<pre class="example-preformatted">With title c--artouche
+</pre></td></tr></table>
+<pre class="example-preformatted">
+
</pre><div class="flushleft"><pre class="example-preformatted">f--lushleft
more text
</pre></div><pre class="example-preformatted">
diff --git a/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt
b/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt
index e1067a497c..3ea235cb80 100644
--- a/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt
+++ b/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt
@@ -527,6 +527,9 @@ _b_
c-artouche
+ Tit-le _of box_
+With title c-artouche
+
f-lushleft
more text
@@ -1205,6 +1208,9 @@ _b_
c-artouche
+ Tit-le _of box_
+With title c-artouche
+
f-lushleft
more text
@@ -2021,6 +2027,9 @@ cross ref name: (file name). '@inforef{}' *note ::
c--artouche
+ Tit-le _of box_
+ With title c--artouche
+
f--lushleft
more text
@@ -2231,300 +2240,300 @@ aaa
* Menu:
-* truc: chapter. (line 2227)
+* truc: chapter. (line 2239)
codeidx
* Menu:
-* a INDEX---ENTRY tẽ --- î: chapter. (line 2227)
+* a INDEX---ENTRY tẽ --- î: chapter. (line 2239)
cp
* Menu:
* ": chapter. (line 28)
-* " <1>: chapter. (line 706)
-* " <2>: chapter. (line 1395)
+* " <1>: chapter. (line 710)
+* " <2>: chapter. (line 1403)
* -option: chapter. (line 28)
-* -option <1>: chapter. (line 706)
-* -option <2>: chapter. (line 1395)
-* .: chapter. (line 2227)
-* ?: chapter. (line 2227)
-* a: chapter. (line 2227)
-* aaa, bbb: chapter. (line 2227)
-* a--a: chapter. (line 2227)
+* -option <1>: chapter. (line 710)
+* -option <2>: chapter. (line 1403)
+* .: chapter. (line 2239)
+* ?: chapter. (line 2239)
+* a: chapter. (line 2239)
+* aaa, bbb: chapter. (line 2239)
+* a--a: chapter. (line 2239)
* a--asis: chapter. (line 510)
-* a--asis <1>: chapter. (line 1188)
-* a--asis <2>: chapter. (line 2004)
+* a--asis <1>: chapter. (line 1192)
+* a--asis <2>: chapter. (line 2012)
* b: chapter. (line 511)
-* b <1>: chapter. (line 1189)
-* b <2>: chapter. (line 2005)
-* b--b, c--c: chapter. (line 2227)
+* b <1>: chapter. (line 1193)
+* b <2>: chapter. (line 2013)
+* b--b, c--c: chapter. (line 2239)
* counting entry: chapter. (line 0)
-* d--dd, e--ee, f--ff: chapter. (line 2227)
+* d--dd, e--ee, f--ff: chapter. (line 2239)
* d--efcv_name: chapter. (line 351)
* d--efcv_name <1>: chapter. (line 354)
-* d--efcv_name <2>: chapter. (line 1029)
-* d--efcv_name <3>: chapter. (line 1032)
-* d--efcv_name <4>: chapter. (line 1845)
-* d--efcv_name <5>: chapter. (line 1848)
+* d--efcv_name <2>: chapter. (line 1033)
+* d--efcv_name <3>: chapter. (line 1036)
+* d--efcv_name <4>: chapter. (line 1853)
+* d--efcv_name <5>: chapter. (line 1856)
* d--efivar_name of c--lass: chapter. (line 396)
-* d--efivar_name of c--lass <1>: chapter. (line 1074)
-* d--efivar_name of c--lass <2>: chapter. (line 1890)
+* d--efivar_name of c--lass <1>: chapter. (line 1078)
+* d--efivar_name of c--lass <2>: chapter. (line 1898)
* d--efopt_name: chapter. (line 387)
-* d--efopt_name <1>: chapter. (line 1065)
-* d--efopt_name <2>: chapter. (line 1881)
+* d--efopt_name <1>: chapter. (line 1069)
+* d--efopt_name <2>: chapter. (line 1889)
* d--eftypecv_name of c--lass: chapter. (line 357)
* d--eftypecv_name of c--lass <1>: chapter. (line 360)
-* d--eftypecv_name of c--lass <2>: chapter. (line 1035)
-* d--eftypecv_name of c--lass <3>: chapter. (line 1038)
-* d--eftypecv_name of c--lass <4>: chapter. (line 1851)
-* d--eftypecv_name of c--lass <5>: chapter. (line 1854)
+* d--eftypecv_name of c--lass <2>: chapter. (line 1039)
+* d--eftypecv_name of c--lass <3>: chapter. (line 1042)
+* d--eftypecv_name of c--lass <4>: chapter. (line 1859)
+* d--eftypecv_name of c--lass <5>: chapter. (line 1862)
* d--eftypecv_name2 of c--lass2: chapter. (line 428)
* d--eftypecv_name2 of c--lass2 <1>: chapter. (line 431)
-* d--eftypecv_name2 of c--lass2 <2>: chapter. (line 1106)
-* d--eftypecv_name2 of c--lass2 <3>: chapter. (line 1109)
-* d--eftypecv_name2 of c--lass2 <4>: chapter. (line 1923)
-* d--eftypecv_name2 of c--lass2 <5>: chapter. (line 1926)
+* d--eftypecv_name2 of c--lass2 <2>: chapter. (line 1110)
+* d--eftypecv_name2 of c--lass2 <3>: chapter. (line 1113)
+* d--eftypecv_name2 of c--lass2 <4>: chapter. (line 1931)
+* d--eftypecv_name2 of c--lass2 <5>: chapter. (line 1934)
* d--eftypeivar_name of c--lass: chapter. (line 399)
-* d--eftypeivar_name of c--lass <1>: chapter. (line 1077)
-* d--eftypeivar_name of c--lass <2>: chapter. (line 1893)
+* d--eftypeivar_name of c--lass <1>: chapter. (line 1081)
+* d--eftypeivar_name of c--lass <2>: chapter. (line 1901)
* d--eftypevar_name: chapter. (line 393)
-* d--eftypevar_name <1>: chapter. (line 1071)
-* d--eftypevar_name <2>: chapter. (line 1887)
+* d--eftypevar_name <1>: chapter. (line 1075)
+* d--eftypevar_name <2>: chapter. (line 1895)
* d--eftypevr_name: chapter. (line 348)
-* d--eftypevr_name <1>: chapter. (line 1026)
-* d--eftypevr_name <2>: chapter. (line 1842)
+* d--eftypevr_name <1>: chapter. (line 1030)
+* d--eftypevr_name <2>: chapter. (line 1850)
* d--efvar_name: chapter. (line 381)
* d--efvar_name <1>: chapter. (line 384)
-* d--efvar_name <2>: chapter. (line 1059)
-* d--efvar_name <3>: chapter. (line 1062)
-* d--efvar_name <4>: chapter. (line 1875)
-* d--efvar_name <5>: chapter. (line 1878)
+* d--efvar_name <2>: chapter. (line 1063)
+* d--efvar_name <3>: chapter. (line 1066)
+* d--efvar_name <4>: chapter. (line 1883)
+* d--efvar_name <5>: chapter. (line 1886)
* d--efvr_name: chapter. (line 327)
-* d--efvr_name <1>: chapter. (line 1005)
-* d--efvr_name <2>: chapter. (line 1821)
-* g--gg, h--hh jjj, k--kk, l--ll: chapter. (line 2227)
+* d--efvr_name <1>: chapter. (line 1009)
+* d--efvr_name <2>: chapter. (line 1829)
+* g--gg, h--hh jjj, k--kk, l--ll: chapter. (line 2239)
* index entry between item and itemx: chapter. (line 515)
-* index entry between item and itemx <1>: chapter. (line 641)
-* index entry between item and itemx <2>: chapter. (line 1193)
-* index entry between item and itemx <3>: chapter. (line 1319)
-* index entry between item and itemx <4>: chapter. (line 2009)
-* index entry between item and itemx <5>: chapter. (line 2168)
+* index entry between item and itemx <1>: chapter. (line 645)
+* index entry between item and itemx <2>: chapter. (line 1197)
+* index entry between item and itemx <3>: chapter. (line 1327)
+* index entry between item and itemx <4>: chapter. (line 2017)
+* index entry between item and itemx <5>: chapter. (line 2180)
* index entry in footnote: chapter. (line 0)
* index entry within deffn: chapter. (line 302)
-* index entry within deffn <1>: chapter. (line 980)
-* index entry within deffn <2>: chapter. (line 1794)
+* index entry within deffn <1>: chapter. (line 984)
+* index entry within deffn <2>: chapter. (line 1802)
* index entry within itemize: chapter. (line 213)
-* index entry within itemize <1>: chapter. (line 891)
-* index entry within itemize <2>: chapter. (line 1705)
+* index entry within itemize <1>: chapter. (line 895)
+* index entry within itemize <2>: chapter. (line 1713)
* index entry within multitable: chapter. (line 235)
-* index entry within multitable <1>: chapter. (line 913)
-* index entry within multitable <2>: chapter. (line 1728)
-* t-ruc: chapter. (line 2227)
-* T-ruc: chapter. (line 2227)
+* index entry within multitable <1>: chapter. (line 917)
+* index entry within multitable <2>: chapter. (line 1736)
+* t-ruc: chapter. (line 2239)
+* T-ruc: chapter. (line 2239)
* vtable i--tem code kbdinputstyle: chapter. (line 137)
-* vtable i--tem code kbdinputstyle <1>: chapter. (line 815)
-* vtable i--tem code kbdinputstyle <2>: chapter. (line 1628)
+* vtable i--tem code kbdinputstyle <1>: chapter. (line 819)
+* vtable i--tem code kbdinputstyle <2>: chapter. (line 1636)
* vtable i--tem default kbdinputstyle: chapter. (line 132)
-* vtable i--tem default kbdinputstyle <1>: chapter. (line 810)
-* vtable i--tem default kbdinputstyle <2>: chapter. (line 1623)
+* vtable i--tem default kbdinputstyle <1>: chapter. (line 814)
+* vtable i--tem default kbdinputstyle <2>: chapter. (line 1631)
* vtable i--tem distinct kbdinputstyle: chapter. (line 147)
-* vtable i--tem distinct kbdinputstyle <1>: chapter. (line 825)
-* vtable i--tem distinct kbdinputstyle <2>: chapter. (line 1638)
+* vtable i--tem distinct kbdinputstyle <1>: chapter. (line 829)
+* vtable i--tem distinct kbdinputstyle <2>: chapter. (line 1646)
* vtable i--tem example kbdinputstyle: chapter. (line 142)
-* vtable i--tem example kbdinputstyle <1>: chapter. (line 820)
-* vtable i--tem example kbdinputstyle <2>: chapter. (line 1633)
+* vtable i--tem example kbdinputstyle <1>: chapter. (line 824)
+* vtable i--tem example kbdinputstyle <2>: chapter. (line 1641)
* vtable i--tem in example code kbdinputstyle: chapter. (line 139)
-* vtable i--tem in example code kbdinputstyle <1>: chapter. (line 817)
-* vtable i--tem in example code kbdinputstyle <2>: chapter. (line 1630)
+* vtable i--tem in example code kbdinputstyle <1>: chapter. (line 821)
+* vtable i--tem in example code kbdinputstyle <2>: chapter. (line 1638)
* vtable i--tem in example default kbdinputstyle: chapter. (line 134)
* vtable i--tem in example default kbdinputstyle <1>: chapter.
- (line 812)
+ (line 816)
* vtable i--tem in example default kbdinputstyle <2>: chapter.
- (line 1625)
+ (line 1633)
* vtable i--tem in example distinct kbdinputstyle: chapter. (line 149)
* vtable i--tem in example distinct kbdinputstyle <1>: chapter.
- (line 827)
+ (line 831)
* vtable i--tem in example distinct kbdinputstyle <2>: chapter.
- (line 1640)
+ (line 1648)
* vtable i--tem in example example kbdinputstyle: chapter. (line 144)
* vtable i--tem in example example kbdinputstyle <1>: chapter.
- (line 822)
+ (line 826)
* vtable i--tem in example example kbdinputstyle <2>: chapter.
- (line 1635)
+ (line 1643)
fn
* Menu:
* --foption: chapter. (line 28)
-* --foption <1>: chapter. (line 706)
-* --foption <2>: chapter. (line 1395)
-* .: chapter. (line 2227)
-* ?: chapter. (line 2227)
+* --foption <1>: chapter. (line 710)
+* --foption <2>: chapter. (line 1403)
+* .: chapter. (line 2239)
+* ?: chapter. (line 2239)
* ``: chapter. (line 28)
-* `` <1>: chapter. (line 706)
-* `` <2>: chapter. (line 1395)
+* `` <1>: chapter. (line 710)
+* `` <2>: chapter. (line 1403)
* a: chapter. (line 315)
* a <1>: chapter. (line 514)
-* a <2>: chapter. (line 640)
-* a <3>: chapter. (line 993)
-* a <4>: chapter. (line 1192)
-* a <5>: chapter. (line 1318)
-* a <6>: chapter. (line 1807)
-* a <7>: chapter. (line 2008)
-* a <8>: chapter. (line 2167)
-* a <9>: chapter. (line 2227)
-* after: chapter. (line 651)
-* after <1>: chapter. (line 1329)
-* after <2>: chapter. (line 2178)
+* a <2>: chapter. (line 644)
+* a <3>: chapter. (line 997)
+* a <4>: chapter. (line 1196)
+* a <5>: chapter. (line 1326)
+* a <6>: chapter. (line 1815)
+* a <7>: chapter. (line 2016)
+* a <8>: chapter. (line 2179)
+* a <9>: chapter. (line 2239)
+* after: chapter. (line 655)
+* after <1>: chapter. (line 1337)
+* after <2>: chapter. (line 2190)
* arg2: chapter. (line 434)
-* arg2 <1>: chapter. (line 1112)
-* arg2 <2>: chapter. (line 1930)
+* arg2 <1>: chapter. (line 1116)
+* arg2 <2>: chapter. (line 1938)
* b: chapter. (line 515)
-* b <1>: chapter. (line 641)
-* b <2>: chapter. (line 1193)
-* b <3>: chapter. (line 1319)
-* b <4>: chapter. (line 2009)
-* b <5>: chapter. (line 2168)
+* b <1>: chapter. (line 645)
+* b <2>: chapter. (line 1197)
+* b <3>: chapter. (line 1327)
+* b <4>: chapter. (line 2017)
+* b <5>: chapter. (line 2180)
* bidule machin: chapter. (line 310)
-* bidule machin <1>: chapter. (line 988)
-* bidule machin <2>: chapter. (line 1802)
+* bidule machin <1>: chapter. (line 992)
+* bidule machin <2>: chapter. (line 1810)
* d--effn_name: chapter. (line 294)
-* d--effn_name <1>: chapter. (line 972)
-* d--effn_name <2>: chapter. (line 1786)
+* d--effn_name <1>: chapter. (line 976)
+* d--effn_name <2>: chapter. (line 1794)
* d--efmac_name: chapter. (line 375)
-* d--efmac_name <1>: chapter. (line 1053)
-* d--efmac_name <2>: chapter. (line 1869)
+* d--efmac_name <1>: chapter. (line 1057)
+* d--efmac_name <2>: chapter. (line 1877)
* d--efmethod_name on c--lass: chapter. (line 402)
-* d--efmethod_name on c--lass <1>: chapter. (line 1080)
-* d--efmethod_name on c--lass <2>: chapter. (line 1896)
+* d--efmethod_name on c--lass <1>: chapter. (line 1084)
+* d--efmethod_name on c--lass <2>: chapter. (line 1904)
* d--efop_name on c--lass: chapter. (line 363)
* d--efop_name on c--lass <1>: chapter. (line 366)
-* d--efop_name on c--lass <2>: chapter. (line 1041)
-* d--efop_name on c--lass <3>: chapter. (line 1044)
-* d--efop_name on c--lass <4>: chapter. (line 1857)
-* d--efop_name on c--lass <5>: chapter. (line 1860)
+* d--efop_name on c--lass <2>: chapter. (line 1045)
+* d--efop_name on c--lass <3>: chapter. (line 1048)
+* d--efop_name on c--lass <4>: chapter. (line 1865)
+* d--efop_name on c--lass <5>: chapter. (line 1868)
* d--efspec_name: chapter. (line 378)
-* d--efspec_name <1>: chapter. (line 1056)
-* d--efspec_name <2>: chapter. (line 1872)
+* d--efspec_name <1>: chapter. (line 1060)
+* d--efspec_name <2>: chapter. (line 1880)
* d--eftypefn_name: chapter. (line 336)
* d--eftypefn_name <1>: chapter. (line 339)
-* d--eftypefn_name <2>: chapter. (line 1014)
-* d--eftypefn_name <3>: chapter. (line 1017)
-* d--eftypefn_name <4>: chapter. (line 1830)
-* d--eftypefn_name <5>: chapter. (line 1833)
+* d--eftypefn_name <2>: chapter. (line 1018)
+* d--eftypefn_name <3>: chapter. (line 1021)
+* d--eftypefn_name <4>: chapter. (line 1838)
+* d--eftypefn_name <5>: chapter. (line 1841)
* d--eftypefn_name2: chapter. (line 413)
-* d--eftypefn_name2 <1>: chapter. (line 1091)
-* d--eftypefn_name2 <2>: chapter. (line 1908)
+* d--eftypefn_name2 <1>: chapter. (line 1095)
+* d--eftypefn_name2 <2>: chapter. (line 1916)
* d--eftypefun_name: chapter. (line 390)
-* d--eftypefun_name <1>: chapter. (line 1068)
-* d--eftypefun_name <2>: chapter. (line 1884)
+* d--eftypefun_name <1>: chapter. (line 1072)
+* d--eftypefun_name <2>: chapter. (line 1892)
* d--eftypemethod_name on c--lass: chapter. (line 405)
-* d--eftypemethod_name on c--lass <1>: chapter. (line 1083)
-* d--eftypemethod_name on c--lass <2>: chapter. (line 1899)
+* d--eftypemethod_name on c--lass <1>: chapter. (line 1087)
+* d--eftypemethod_name on c--lass <2>: chapter. (line 1907)
* d--eftypeop_name on c--lass: chapter. (line 342)
* d--eftypeop_name on c--lass <1>: chapter. (line 345)
-* d--eftypeop_name on c--lass <2>: chapter. (line 1020)
-* d--eftypeop_name on c--lass <3>: chapter. (line 1023)
-* d--eftypeop_name on c--lass <4>: chapter. (line 1836)
-* d--eftypeop_name on c--lass <5>: chapter. (line 1839)
+* d--eftypeop_name on c--lass <2>: chapter. (line 1024)
+* d--eftypeop_name on c--lass <3>: chapter. (line 1027)
+* d--eftypeop_name on c--lass <4>: chapter. (line 1844)
+* d--eftypeop_name on c--lass <5>: chapter. (line 1847)
* d--eftypeop_name2 on c--lass2: chapter. (line 418)
* d--eftypeop_name2 on c--lass2 <1>: chapter. (line 423)
-* d--eftypeop_name2 on c--lass2 <2>: chapter. (line 1096)
-* d--eftypeop_name2 on c--lass2 <3>: chapter. (line 1101)
-* d--eftypeop_name2 on c--lass2 <4>: chapter. (line 1913)
-* d--eftypeop_name2 on c--lass2 <5>: chapter. (line 1918)
+* d--eftypeop_name2 on c--lass2 <2>: chapter. (line 1100)
+* d--eftypeop_name2 on c--lass2 <3>: chapter. (line 1105)
+* d--eftypeop_name2 on c--lass2 <4>: chapter. (line 1921)
+* d--eftypeop_name2 on c--lass2 <5>: chapter. (line 1926)
* d--efun_name: chapter. (line 372)
-* d--efun_name <1>: chapter. (line 1050)
-* d--efun_name <2>: chapter. (line 1866)
+* d--efun_name <1>: chapter. (line 1054)
+* d--efun_name <2>: chapter. (line 1874)
* de--ffn_name: chapter. (line 297)
-* de--ffn_name <1>: chapter. (line 975)
-* de--ffn_name <2>: chapter. (line 1789)
+* de--ffn_name <1>: chapter. (line 979)
+* de--ffn_name <2>: chapter. (line 1797)
* deffn: chapter. (line 318)
* deffn <1>: chapter. (line 320)
-* deffn <2>: chapter. (line 996)
-* deffn <3>: chapter. (line 998)
-* deffn <4>: chapter. (line 1811)
-* deffn <5>: chapter. (line 1813)
+* deffn <2>: chapter. (line 1000)
+* deffn <3>: chapter. (line 1002)
+* deffn <4>: chapter. (line 1819)
+* deffn <5>: chapter. (line 1821)
* deffnx: chapter. (line 316)
* deffnx <1>: chapter. (line 321)
-* deffnx <2>: chapter. (line 994)
-* deffnx <3>: chapter. (line 999)
-* deffnx <4>: chapter. (line 1808)
-* deffnx <5>: chapter. (line 1814)
-* f---aa: chapter. (line 2227)
-* f---bb, f---cc: chapter. (line 2227)
-* f---ddd, f---eee, ffff: chapter. (line 2227)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter. (line 2227)
+* deffnx <2>: chapter. (line 998)
+* deffnx <3>: chapter. (line 1003)
+* deffnx <4>: chapter. (line 1816)
+* deffnx <5>: chapter. (line 1822)
+* f---aa: chapter. (line 2239)
+* f---bb, f---cc: chapter. (line 2239)
+* f---ddd, f---eee, ffff: chapter. (line 2239)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter. (line 2239)
* followed: chapter. (line 313)
-* followed <1>: chapter. (line 649)
-* followed <2>: chapter. (line 991)
-* followed <3>: chapter. (line 1327)
-* followed <4>: chapter. (line 1805)
-* followed <5>: chapter. (line 2176)
+* followed <1>: chapter. (line 653)
+* followed <2>: chapter. (line 995)
+* followed <3>: chapter. (line 1335)
+* followed <4>: chapter. (line 1813)
+* followed <5>: chapter. (line 2188)
* I: chapter. (line 301)
* I <1>: chapter. (line 323)
-* I <2>: chapter. (line 979)
-* I <3>: chapter. (line 1001)
-* I <4>: chapter. (line 1793)
-* I <5>: chapter. (line 1816)
+* I <2>: chapter. (line 983)
+* I <3>: chapter. (line 1005)
+* I <4>: chapter. (line 1801)
+* I <5>: chapter. (line 1824)
* id i ule: chapter. (line 307)
-* id i ule <1>: chapter. (line 985)
-* id i ule <2>: chapter. (line 1799)
+* id i ule <1>: chapter. (line 989)
+* id i ule <2>: chapter. (line 1807)
* id ule: chapter. (line 306)
-* id ule <1>: chapter. (line 984)
-* id ule <2>: chapter. (line 1798)
-* INVALID: chapter. (line 653)
-* INVALID <1>: chapter. (line 1331)
-* INVALID <2>: chapter. (line 2180)
+* id ule <1>: chapter. (line 988)
+* id ule <2>: chapter. (line 1806)
+* INVALID: chapter. (line 657)
+* INVALID <1>: chapter. (line 1339)
+* INVALID <2>: chapter. (line 2192)
* log trap: chapter. (line 303)
-* log trap <1>: chapter. (line 981)
-* log trap <2>: chapter. (line 1795)
+* log trap <1>: chapter. (line 985)
+* log trap <2>: chapter. (line 1803)
* log trap1: chapter. (line 304)
-* log trap1 <1>: chapter. (line 982)
-* log trap1 <2>: chapter. (line 1796)
+* log trap1 <1>: chapter. (line 986)
+* log trap1 <2>: chapter. (line 1804)
* log trap2: chapter. (line 305)
-* log trap2 <1>: chapter. (line 983)
-* log trap2 <2>: chapter. (line 1797)
+* log trap2 <1>: chapter. (line 987)
+* log trap2 <2>: chapter. (line 1805)
* machin: chapter. (line 309)
* machin <1>: chapter. (line 311)
-* machin <2>: chapter. (line 645)
-* machin <3>: chapter. (line 646)
-* machin <4>: chapter. (line 647)
-* machin <5>: chapter. (line 648)
-* machin <6>: chapter. (line 987)
-* machin <7>: chapter. (line 989)
-* machin <8>: chapter. (line 1323)
-* machin <9>: chapter. (line 1324)
-* machin <10>: chapter. (line 1325)
-* machin <11>: chapter. (line 1326)
-* machin <12>: chapter. (line 1801)
-* machin <13>: chapter. (line 1803)
-* machin <14>: chapter. (line 2172)
-* machin <15>: chapter. (line 2173)
-* machin <16>: chapter. (line 2174)
-* machin <17>: chapter. (line 2175)
+* machin <2>: chapter. (line 649)
+* machin <3>: chapter. (line 650)
+* machin <4>: chapter. (line 651)
+* machin <5>: chapter. (line 652)
+* machin <6>: chapter. (line 991)
+* machin <7>: chapter. (line 993)
+* machin <8>: chapter. (line 1331)
+* machin <9>: chapter. (line 1332)
+* machin <10>: chapter. (line 1333)
+* machin <11>: chapter. (line 1334)
+* machin <12>: chapter. (line 1809)
+* machin <13>: chapter. (line 1811)
+* machin <14>: chapter. (line 2184)
+* machin <15>: chapter. (line 2185)
+* machin <16>: chapter. (line 2186)
+* machin <17>: chapter. (line 2187)
* n--ame: chapter. (line 330)
* n--ame <1>: chapter. (line 333)
-* n--ame <2>: chapter. (line 1008)
-* n--ame <3>: chapter. (line 1011)
-* n--ame <4>: chapter. (line 1824)
-* n--ame <5>: chapter. (line 1827)
+* n--ame <2>: chapter. (line 1012)
+* n--ame <3>: chapter. (line 1015)
+* n--ame <4>: chapter. (line 1832)
+* n--ame <5>: chapter. (line 1835)
* name2: chapter. (line 408)
-* name2 <1>: chapter. (line 1086)
-* name2 <2>: chapter. (line 1903)
-* t--ruc: chapter. (line 2227)
-* T--ruc: chapter. (line 2227)
+* name2 <1>: chapter. (line 1090)
+* name2 <2>: chapter. (line 1911)
+* t--ruc: chapter. (line 2239)
+* T--ruc: chapter. (line 2239)
* truc: chapter. (line 302)
* truc <1>: chapter. (line 324)
-* truc <2>: chapter. (line 980)
-* truc <3>: chapter. (line 1002)
-* truc <4>: chapter. (line 1794)
-* truc <5>: chapter. (line 1817)
-* xxx, zzz: chapter. (line 2227)
+* truc <2>: chapter. (line 984)
+* truc <3>: chapter. (line 1006)
+* truc <4>: chapter. (line 1802)
+* truc <5>: chapter. (line 1825)
+* xxx, zzz: chapter. (line 2239)
vr
@@ -2537,8 +2546,8 @@ aaa
* Menu:
* d--eftp_name: chapter. (line 369)
-* d--eftp_name <1>: chapter. (line 1047)
-* d--eftp_name <2>: chapter. (line 1863)
+* d--eftp_name <1>: chapter. (line 1051)
+* d--eftp_name <2>: chapter. (line 1871)
(8)
@@ -2583,285 +2592,285 @@ chapter 2
* Menu:
* ": chapter. (line 28)
-* " <1>: chapter. (line 706)
-* " <2>: chapter. (line 1395)
+* " <1>: chapter. (line 710)
+* " <2>: chapter. (line 1403)
* -option: chapter. (line 28)
-* -option <1>: chapter. (line 706)
-* -option <2>: chapter. (line 1395)
-* .: chapter. (line 2227)
-* ?: chapter. (line 2227)
-* a: chapter. (line 2227)
-* aaa, bbb: chapter. (line 2227)
-* a--a: chapter. (line 2227)
+* -option <1>: chapter. (line 710)
+* -option <2>: chapter. (line 1403)
+* .: chapter. (line 2239)
+* ?: chapter. (line 2239)
+* a: chapter. (line 2239)
+* aaa, bbb: chapter. (line 2239)
+* a--a: chapter. (line 2239)
* a--asis: chapter. (line 510)
-* a--asis <1>: chapter. (line 1188)
-* a--asis <2>: chapter. (line 2004)
+* a--asis <1>: chapter. (line 1192)
+* a--asis <2>: chapter. (line 2012)
* b: chapter. (line 511)
-* b <1>: chapter. (line 1189)
-* b <2>: chapter. (line 2005)
-* b--b, c--c: chapter. (line 2227)
-* counting entry: chapter. (line 2564)
-* d--dd, e--ee, f--ff: chapter. (line 2227)
+* b <1>: chapter. (line 1193)
+* b <2>: chapter. (line 2013)
+* b--b, c--c: chapter. (line 2239)
+* counting entry: chapter. (line 2576)
+* d--dd, e--ee, f--ff: chapter. (line 2239)
* d--efcv_name: chapter. (line 351)
* d--efcv_name <1>: chapter. (line 354)
-* d--efcv_name <2>: chapter. (line 1029)
-* d--efcv_name <3>: chapter. (line 1032)
-* d--efcv_name <4>: chapter. (line 1845)
-* d--efcv_name <5>: chapter. (line 1848)
+* d--efcv_name <2>: chapter. (line 1033)
+* d--efcv_name <3>: chapter. (line 1036)
+* d--efcv_name <4>: chapter. (line 1853)
+* d--efcv_name <5>: chapter. (line 1856)
* d--efivar_name of c--lass: chapter. (line 396)
-* d--efivar_name of c--lass <1>: chapter. (line 1074)
-* d--efivar_name of c--lass <2>: chapter. (line 1890)
+* d--efivar_name of c--lass <1>: chapter. (line 1078)
+* d--efivar_name of c--lass <2>: chapter. (line 1898)
* d--efopt_name: chapter. (line 387)
-* d--efopt_name <1>: chapter. (line 1065)
-* d--efopt_name <2>: chapter. (line 1881)
+* d--efopt_name <1>: chapter. (line 1069)
+* d--efopt_name <2>: chapter. (line 1889)
* d--eftypecv_name of c--lass: chapter. (line 357)
* d--eftypecv_name of c--lass <1>: chapter. (line 360)
-* d--eftypecv_name of c--lass <2>: chapter. (line 1035)
-* d--eftypecv_name of c--lass <3>: chapter. (line 1038)
-* d--eftypecv_name of c--lass <4>: chapter. (line 1851)
-* d--eftypecv_name of c--lass <5>: chapter. (line 1854)
+* d--eftypecv_name of c--lass <2>: chapter. (line 1039)
+* d--eftypecv_name of c--lass <3>: chapter. (line 1042)
+* d--eftypecv_name of c--lass <4>: chapter. (line 1859)
+* d--eftypecv_name of c--lass <5>: chapter. (line 1862)
* d--eftypecv_name2 of c--lass2: chapter. (line 428)
* d--eftypecv_name2 of c--lass2 <1>: chapter. (line 431)
-* d--eftypecv_name2 of c--lass2 <2>: chapter. (line 1106)
-* d--eftypecv_name2 of c--lass2 <3>: chapter. (line 1109)
-* d--eftypecv_name2 of c--lass2 <4>: chapter. (line 1923)
-* d--eftypecv_name2 of c--lass2 <5>: chapter. (line 1926)
+* d--eftypecv_name2 of c--lass2 <2>: chapter. (line 1110)
+* d--eftypecv_name2 of c--lass2 <3>: chapter. (line 1113)
+* d--eftypecv_name2 of c--lass2 <4>: chapter. (line 1931)
+* d--eftypecv_name2 of c--lass2 <5>: chapter. (line 1934)
* d--eftypeivar_name of c--lass: chapter. (line 399)
-* d--eftypeivar_name of c--lass <1>: chapter. (line 1077)
-* d--eftypeivar_name of c--lass <2>: chapter. (line 1893)
+* d--eftypeivar_name of c--lass <1>: chapter. (line 1081)
+* d--eftypeivar_name of c--lass <2>: chapter. (line 1901)
* d--eftypevar_name: chapter. (line 393)
-* d--eftypevar_name <1>: chapter. (line 1071)
-* d--eftypevar_name <2>: chapter. (line 1887)
+* d--eftypevar_name <1>: chapter. (line 1075)
+* d--eftypevar_name <2>: chapter. (line 1895)
* d--eftypevr_name: chapter. (line 348)
-* d--eftypevr_name <1>: chapter. (line 1026)
-* d--eftypevr_name <2>: chapter. (line 1842)
+* d--eftypevr_name <1>: chapter. (line 1030)
+* d--eftypevr_name <2>: chapter. (line 1850)
* d--efvar_name: chapter. (line 381)
* d--efvar_name <1>: chapter. (line 384)
-* d--efvar_name <2>: chapter. (line 1059)
-* d--efvar_name <3>: chapter. (line 1062)
-* d--efvar_name <4>: chapter. (line 1875)
-* d--efvar_name <5>: chapter. (line 1878)
+* d--efvar_name <2>: chapter. (line 1063)
+* d--efvar_name <3>: chapter. (line 1066)
+* d--efvar_name <4>: chapter. (line 1883)
+* d--efvar_name <5>: chapter. (line 1886)
* d--efvr_name: chapter. (line 327)
-* d--efvr_name <1>: chapter. (line 1005)
-* d--efvr_name <2>: chapter. (line 1821)
-* g--gg, h--hh jjj, k--kk, l--ll: chapter. (line 2227)
+* d--efvr_name <1>: chapter. (line 1009)
+* d--efvr_name <2>: chapter. (line 1829)
+* g--gg, h--hh jjj, k--kk, l--ll: chapter. (line 2239)
* index entry between item and itemx: chapter. (line 515)
-* index entry between item and itemx <1>: chapter. (line 641)
-* index entry between item and itemx <2>: chapter. (line 1193)
-* index entry between item and itemx <3>: chapter. (line 1319)
-* index entry between item and itemx <4>: chapter. (line 2009)
-* index entry between item and itemx <5>: chapter. (line 2168)
-* index entry in footnote: chapter. (line 2559)
+* index entry between item and itemx <1>: chapter. (line 645)
+* index entry between item and itemx <2>: chapter. (line 1197)
+* index entry between item and itemx <3>: chapter. (line 1327)
+* index entry between item and itemx <4>: chapter. (line 2017)
+* index entry between item and itemx <5>: chapter. (line 2180)
+* index entry in footnote: chapter. (line 2571)
* index entry within deffn: chapter. (line 302)
-* index entry within deffn <1>: chapter. (line 980)
-* index entry within deffn <2>: chapter. (line 1794)
+* index entry within deffn <1>: chapter. (line 984)
+* index entry within deffn <2>: chapter. (line 1802)
* index entry within itemize: chapter. (line 213)
-* index entry within itemize <1>: chapter. (line 891)
-* index entry within itemize <2>: chapter. (line 1705)
+* index entry within itemize <1>: chapter. (line 895)
+* index entry within itemize <2>: chapter. (line 1713)
* index entry within multitable: chapter. (line 235)
-* index entry within multitable <1>: chapter. (line 913)
-* index entry within multitable <2>: chapter. (line 1728)
-* t-ruc: chapter. (line 2227)
-* T-ruc: chapter. (line 2227)
+* index entry within multitable <1>: chapter. (line 917)
+* index entry within multitable <2>: chapter. (line 1736)
+* t-ruc: chapter. (line 2239)
+* T-ruc: chapter. (line 2239)
* vtable i--tem code kbdinputstyle: chapter. (line 137)
-* vtable i--tem code kbdinputstyle <1>: chapter. (line 815)
-* vtable i--tem code kbdinputstyle <2>: chapter. (line 1628)
+* vtable i--tem code kbdinputstyle <1>: chapter. (line 819)
+* vtable i--tem code kbdinputstyle <2>: chapter. (line 1636)
* vtable i--tem default kbdinputstyle: chapter. (line 132)
-* vtable i--tem default kbdinputstyle <1>: chapter. (line 810)
-* vtable i--tem default kbdinputstyle <2>: chapter. (line 1623)
+* vtable i--tem default kbdinputstyle <1>: chapter. (line 814)
+* vtable i--tem default kbdinputstyle <2>: chapter. (line 1631)
* vtable i--tem distinct kbdinputstyle: chapter. (line 147)
-* vtable i--tem distinct kbdinputstyle <1>: chapter. (line 825)
-* vtable i--tem distinct kbdinputstyle <2>: chapter. (line 1638)
+* vtable i--tem distinct kbdinputstyle <1>: chapter. (line 829)
+* vtable i--tem distinct kbdinputstyle <2>: chapter. (line 1646)
* vtable i--tem example kbdinputstyle: chapter. (line 142)
-* vtable i--tem example kbdinputstyle <1>: chapter. (line 820)
-* vtable i--tem example kbdinputstyle <2>: chapter. (line 1633)
+* vtable i--tem example kbdinputstyle <1>: chapter. (line 824)
+* vtable i--tem example kbdinputstyle <2>: chapter. (line 1641)
* vtable i--tem in example code kbdinputstyle: chapter. (line 139)
-* vtable i--tem in example code kbdinputstyle <1>: chapter. (line 817)
-* vtable i--tem in example code kbdinputstyle <2>: chapter. (line 1630)
+* vtable i--tem in example code kbdinputstyle <1>: chapter. (line 821)
+* vtable i--tem in example code kbdinputstyle <2>: chapter. (line 1638)
* vtable i--tem in example default kbdinputstyle: chapter. (line 134)
* vtable i--tem in example default kbdinputstyle <1>: chapter.
- (line 812)
+ (line 816)
* vtable i--tem in example default kbdinputstyle <2>: chapter.
- (line 1625)
+ (line 1633)
* vtable i--tem in example distinct kbdinputstyle: chapter. (line 149)
* vtable i--tem in example distinct kbdinputstyle <1>: chapter.
- (line 827)
+ (line 831)
* vtable i--tem in example distinct kbdinputstyle <2>: chapter.
- (line 1640)
+ (line 1648)
* vtable i--tem in example example kbdinputstyle: chapter. (line 144)
* vtable i--tem in example example kbdinputstyle <1>: chapter.
- (line 822)
+ (line 826)
* vtable i--tem in example example kbdinputstyle <2>: chapter.
- (line 1635)
+ (line 1643)
* Menu:
* --foption: chapter. (line 28)
-* --foption <1>: chapter. (line 706)
-* --foption <2>: chapter. (line 1395)
-* .: chapter. (line 2227)
-* ?: chapter. (line 2227)
+* --foption <1>: chapter. (line 710)
+* --foption <2>: chapter. (line 1403)
+* .: chapter. (line 2239)
+* ?: chapter. (line 2239)
* ``: chapter. (line 28)
-* `` <1>: chapter. (line 706)
-* `` <2>: chapter. (line 1395)
+* `` <1>: chapter. (line 710)
+* `` <2>: chapter. (line 1403)
* a: chapter. (line 315)
* a <1>: chapter. (line 514)
-* a <2>: chapter. (line 640)
-* a <3>: chapter. (line 993)
-* a <4>: chapter. (line 1192)
-* a <5>: chapter. (line 1318)
-* a <6>: chapter. (line 1807)
-* a <7>: chapter. (line 2008)
-* a <8>: chapter. (line 2167)
-* a <9>: chapter. (line 2227)
-* after: chapter. (line 651)
-* after <1>: chapter. (line 1329)
-* after <2>: chapter. (line 2178)
+* a <2>: chapter. (line 644)
+* a <3>: chapter. (line 997)
+* a <4>: chapter. (line 1196)
+* a <5>: chapter. (line 1326)
+* a <6>: chapter. (line 1815)
+* a <7>: chapter. (line 2016)
+* a <8>: chapter. (line 2179)
+* a <9>: chapter. (line 2239)
+* after: chapter. (line 655)
+* after <1>: chapter. (line 1337)
+* after <2>: chapter. (line 2190)
* arg2: chapter. (line 434)
-* arg2 <1>: chapter. (line 1112)
-* arg2 <2>: chapter. (line 1930)
+* arg2 <1>: chapter. (line 1116)
+* arg2 <2>: chapter. (line 1938)
* b: chapter. (line 515)
-* b <1>: chapter. (line 641)
-* b <2>: chapter. (line 1193)
-* b <3>: chapter. (line 1319)
-* b <4>: chapter. (line 2009)
-* b <5>: chapter. (line 2168)
+* b <1>: chapter. (line 645)
+* b <2>: chapter. (line 1197)
+* b <3>: chapter. (line 1327)
+* b <4>: chapter. (line 2017)
+* b <5>: chapter. (line 2180)
* bidule machin: chapter. (line 310)
-* bidule machin <1>: chapter. (line 988)
-* bidule machin <2>: chapter. (line 1802)
+* bidule machin <1>: chapter. (line 992)
+* bidule machin <2>: chapter. (line 1810)
* d--effn_name: chapter. (line 294)
-* d--effn_name <1>: chapter. (line 972)
-* d--effn_name <2>: chapter. (line 1786)
+* d--effn_name <1>: chapter. (line 976)
+* d--effn_name <2>: chapter. (line 1794)
* d--efmac_name: chapter. (line 375)
-* d--efmac_name <1>: chapter. (line 1053)
-* d--efmac_name <2>: chapter. (line 1869)
+* d--efmac_name <1>: chapter. (line 1057)
+* d--efmac_name <2>: chapter. (line 1877)
* d--efmethod_name on c--lass: chapter. (line 402)
-* d--efmethod_name on c--lass <1>: chapter. (line 1080)
-* d--efmethod_name on c--lass <2>: chapter. (line 1896)
+* d--efmethod_name on c--lass <1>: chapter. (line 1084)
+* d--efmethod_name on c--lass <2>: chapter. (line 1904)
* d--efop_name on c--lass: chapter. (line 363)
* d--efop_name on c--lass <1>: chapter. (line 366)
-* d--efop_name on c--lass <2>: chapter. (line 1041)
-* d--efop_name on c--lass <3>: chapter. (line 1044)
-* d--efop_name on c--lass <4>: chapter. (line 1857)
-* d--efop_name on c--lass <5>: chapter. (line 1860)
+* d--efop_name on c--lass <2>: chapter. (line 1045)
+* d--efop_name on c--lass <3>: chapter. (line 1048)
+* d--efop_name on c--lass <4>: chapter. (line 1865)
+* d--efop_name on c--lass <5>: chapter. (line 1868)
* d--efspec_name: chapter. (line 378)
-* d--efspec_name <1>: chapter. (line 1056)
-* d--efspec_name <2>: chapter. (line 1872)
+* d--efspec_name <1>: chapter. (line 1060)
+* d--efspec_name <2>: chapter. (line 1880)
* d--eftypefn_name: chapter. (line 336)
* d--eftypefn_name <1>: chapter. (line 339)
-* d--eftypefn_name <2>: chapter. (line 1014)
-* d--eftypefn_name <3>: chapter. (line 1017)
-* d--eftypefn_name <4>: chapter. (line 1830)
-* d--eftypefn_name <5>: chapter. (line 1833)
+* d--eftypefn_name <2>: chapter. (line 1018)
+* d--eftypefn_name <3>: chapter. (line 1021)
+* d--eftypefn_name <4>: chapter. (line 1838)
+* d--eftypefn_name <5>: chapter. (line 1841)
* d--eftypefn_name2: chapter. (line 413)
-* d--eftypefn_name2 <1>: chapter. (line 1091)
-* d--eftypefn_name2 <2>: chapter. (line 1908)
+* d--eftypefn_name2 <1>: chapter. (line 1095)
+* d--eftypefn_name2 <2>: chapter. (line 1916)
* d--eftypefun_name: chapter. (line 390)
-* d--eftypefun_name <1>: chapter. (line 1068)
-* d--eftypefun_name <2>: chapter. (line 1884)
+* d--eftypefun_name <1>: chapter. (line 1072)
+* d--eftypefun_name <2>: chapter. (line 1892)
* d--eftypemethod_name on c--lass: chapter. (line 405)
-* d--eftypemethod_name on c--lass <1>: chapter. (line 1083)
-* d--eftypemethod_name on c--lass <2>: chapter. (line 1899)
+* d--eftypemethod_name on c--lass <1>: chapter. (line 1087)
+* d--eftypemethod_name on c--lass <2>: chapter. (line 1907)
* d--eftypeop_name on c--lass: chapter. (line 342)
* d--eftypeop_name on c--lass <1>: chapter. (line 345)
-* d--eftypeop_name on c--lass <2>: chapter. (line 1020)
-* d--eftypeop_name on c--lass <3>: chapter. (line 1023)
-* d--eftypeop_name on c--lass <4>: chapter. (line 1836)
-* d--eftypeop_name on c--lass <5>: chapter. (line 1839)
+* d--eftypeop_name on c--lass <2>: chapter. (line 1024)
+* d--eftypeop_name on c--lass <3>: chapter. (line 1027)
+* d--eftypeop_name on c--lass <4>: chapter. (line 1844)
+* d--eftypeop_name on c--lass <5>: chapter. (line 1847)
* d--eftypeop_name2 on c--lass2: chapter. (line 418)
* d--eftypeop_name2 on c--lass2 <1>: chapter. (line 423)
-* d--eftypeop_name2 on c--lass2 <2>: chapter. (line 1096)
-* d--eftypeop_name2 on c--lass2 <3>: chapter. (line 1101)
-* d--eftypeop_name2 on c--lass2 <4>: chapter. (line 1913)
-* d--eftypeop_name2 on c--lass2 <5>: chapter. (line 1918)
+* d--eftypeop_name2 on c--lass2 <2>: chapter. (line 1100)
+* d--eftypeop_name2 on c--lass2 <3>: chapter. (line 1105)
+* d--eftypeop_name2 on c--lass2 <4>: chapter. (line 1921)
+* d--eftypeop_name2 on c--lass2 <5>: chapter. (line 1926)
* d--efun_name: chapter. (line 372)
-* d--efun_name <1>: chapter. (line 1050)
-* d--efun_name <2>: chapter. (line 1866)
+* d--efun_name <1>: chapter. (line 1054)
+* d--efun_name <2>: chapter. (line 1874)
* de--ffn_name: chapter. (line 297)
-* de--ffn_name <1>: chapter. (line 975)
-* de--ffn_name <2>: chapter. (line 1789)
+* de--ffn_name <1>: chapter. (line 979)
+* de--ffn_name <2>: chapter. (line 1797)
* deffn: chapter. (line 318)
* deffn <1>: chapter. (line 320)
-* deffn <2>: chapter. (line 996)
-* deffn <3>: chapter. (line 998)
-* deffn <4>: chapter. (line 1811)
-* deffn <5>: chapter. (line 1813)
+* deffn <2>: chapter. (line 1000)
+* deffn <3>: chapter. (line 1002)
+* deffn <4>: chapter. (line 1819)
+* deffn <5>: chapter. (line 1821)
* deffnx: chapter. (line 316)
* deffnx <1>: chapter. (line 321)
-* deffnx <2>: chapter. (line 994)
-* deffnx <3>: chapter. (line 999)
-* deffnx <4>: chapter. (line 1808)
-* deffnx <5>: chapter. (line 1814)
-* f---aa: chapter. (line 2227)
-* f---bb, f---cc: chapter. (line 2227)
-* f---ddd, f---eee, ffff: chapter. (line 2227)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter. (line 2227)
+* deffnx <2>: chapter. (line 998)
+* deffnx <3>: chapter. (line 1003)
+* deffnx <4>: chapter. (line 1816)
+* deffnx <5>: chapter. (line 1822)
+* f---aa: chapter. (line 2239)
+* f---bb, f---cc: chapter. (line 2239)
+* f---ddd, f---eee, ffff: chapter. (line 2239)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter. (line 2239)
* followed: chapter. (line 313)
-* followed <1>: chapter. (line 649)
-* followed <2>: chapter. (line 991)
-* followed <3>: chapter. (line 1327)
-* followed <4>: chapter. (line 1805)
-* followed <5>: chapter. (line 2176)
+* followed <1>: chapter. (line 653)
+* followed <2>: chapter. (line 995)
+* followed <3>: chapter. (line 1335)
+* followed <4>: chapter. (line 1813)
+* followed <5>: chapter. (line 2188)
* I: chapter. (line 301)
* I <1>: chapter. (line 323)
-* I <2>: chapter. (line 979)
-* I <3>: chapter. (line 1001)
-* I <4>: chapter. (line 1793)
-* I <5>: chapter. (line 1816)
+* I <2>: chapter. (line 983)
+* I <3>: chapter. (line 1005)
+* I <4>: chapter. (line 1801)
+* I <5>: chapter. (line 1824)
* id i ule: chapter. (line 307)
-* id i ule <1>: chapter. (line 985)
-* id i ule <2>: chapter. (line 1799)
+* id i ule <1>: chapter. (line 989)
+* id i ule <2>: chapter. (line 1807)
* id ule: chapter. (line 306)
-* id ule <1>: chapter. (line 984)
-* id ule <2>: chapter. (line 1798)
-* INVALID: chapter. (line 653)
-* INVALID <1>: chapter. (line 1331)
-* INVALID <2>: chapter. (line 2180)
+* id ule <1>: chapter. (line 988)
+* id ule <2>: chapter. (line 1806)
+* INVALID: chapter. (line 657)
+* INVALID <1>: chapter. (line 1339)
+* INVALID <2>: chapter. (line 2192)
* log trap: chapter. (line 303)
-* log trap <1>: chapter. (line 981)
-* log trap <2>: chapter. (line 1795)
+* log trap <1>: chapter. (line 985)
+* log trap <2>: chapter. (line 1803)
* log trap1: chapter. (line 304)
-* log trap1 <1>: chapter. (line 982)
-* log trap1 <2>: chapter. (line 1796)
+* log trap1 <1>: chapter. (line 986)
+* log trap1 <2>: chapter. (line 1804)
* log trap2: chapter. (line 305)
-* log trap2 <1>: chapter. (line 983)
-* log trap2 <2>: chapter. (line 1797)
+* log trap2 <1>: chapter. (line 987)
+* log trap2 <2>: chapter. (line 1805)
* machin: chapter. (line 309)
* machin <1>: chapter. (line 311)
-* machin <2>: chapter. (line 645)
-* machin <3>: chapter. (line 646)
-* machin <4>: chapter. (line 647)
-* machin <5>: chapter. (line 648)
-* machin <6>: chapter. (line 987)
-* machin <7>: chapter. (line 989)
-* machin <8>: chapter. (line 1323)
-* machin <9>: chapter. (line 1324)
-* machin <10>: chapter. (line 1325)
-* machin <11>: chapter. (line 1326)
-* machin <12>: chapter. (line 1801)
-* machin <13>: chapter. (line 1803)
-* machin <14>: chapter. (line 2172)
-* machin <15>: chapter. (line 2173)
-* machin <16>: chapter. (line 2174)
-* machin <17>: chapter. (line 2175)
+* machin <2>: chapter. (line 649)
+* machin <3>: chapter. (line 650)
+* machin <4>: chapter. (line 651)
+* machin <5>: chapter. (line 652)
+* machin <6>: chapter. (line 991)
+* machin <7>: chapter. (line 993)
+* machin <8>: chapter. (line 1331)
+* machin <9>: chapter. (line 1332)
+* machin <10>: chapter. (line 1333)
+* machin <11>: chapter. (line 1334)
+* machin <12>: chapter. (line 1809)
+* machin <13>: chapter. (line 1811)
+* machin <14>: chapter. (line 2184)
+* machin <15>: chapter. (line 2185)
+* machin <16>: chapter. (line 2186)
+* machin <17>: chapter. (line 2187)
* n--ame: chapter. (line 330)
* n--ame <1>: chapter. (line 333)
-* n--ame <2>: chapter. (line 1008)
-* n--ame <3>: chapter. (line 1011)
-* n--ame <4>: chapter. (line 1824)
-* n--ame <5>: chapter. (line 1827)
+* n--ame <2>: chapter. (line 1012)
+* n--ame <3>: chapter. (line 1015)
+* n--ame <4>: chapter. (line 1832)
+* n--ame <5>: chapter. (line 1835)
* name2: chapter. (line 408)
-* name2 <1>: chapter. (line 1086)
-* name2 <2>: chapter. (line 1903)
-* t--ruc: chapter. (line 2227)
-* T--ruc: chapter. (line 2227)
+* name2 <1>: chapter. (line 1090)
+* name2 <2>: chapter. (line 1911)
+* t--ruc: chapter. (line 2239)
+* T--ruc: chapter. (line 2239)
* truc: chapter. (line 302)
* truc <1>: chapter. (line 324)
-* truc <2>: chapter. (line 980)
-* truc <3>: chapter. (line 1002)
-* truc <4>: chapter. (line 1794)
-* truc <5>: chapter. (line 1817)
-* xxx, zzz: chapter. (line 2227)
+* truc <2>: chapter. (line 984)
+* truc <3>: chapter. (line 1006)
+* truc <4>: chapter. (line 1802)
+* truc <5>: chapter. (line 1825)
+* xxx, zzz: chapter. (line 2239)
Top section
1 chapter
diff --git a/tp/tests/layout/res_parser/formatting_rawtext/formatting.txt
b/tp/tests/layout/res_parser/formatting_rawtext/formatting.txt
index 68af98ebb9..46fd9d2363 100644
--- a/tp/tests/layout/res_parser/formatting_rawtext/formatting.txt
+++ b/tp/tests/layout/res_parser/formatting_rawtext/formatting.txt
@@ -683,6 +683,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
@@ -1525,6 +1528,9 @@ Value--table samp
c--artouche
+Tit--le of box
+With title c--artouche
+
f--lushleft
more text
diff --git
a/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
b/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
index ef7d179f53..8442710dcf 100644
--- a/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
+++ b/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
@@ -652,6 +652,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
@@ -1780,6 +1783,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -2867,6 +2875,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -3987,6 +4000,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -5199,6 +5217,12 @@ ref</a>
</pre></td></tr></table>
<pre class="example-preformatted">
+</pre><table class="cartouche" border="1"><tr><th>
+Tit--le <em class="emph">of box</em></th></tr><tr><td>
+<pre class="example-preformatted">With title c--artouche
+</pre></td></tr></table>
+<pre class="example-preformatted">
+
</pre><div class="flushleft"><pre class="example-preformatted">f--lushleft
more text
</pre></div><pre class="example-preformatted">
@@ -6313,6 +6337,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
diff --git
a/tp/tests/layout/res_parser/formatting_sort_element_counts/formatting.html
b/tp/tests/layout/res_parser/formatting_sort_element_counts/formatting.html
index 970fba6a5a..a11c165d4b 100644
--- a/tp/tests/layout/res_parser/formatting_sort_element_counts/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_sort_element_counts/formatting.html
@@ -653,6 +653,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
@@ -1784,6 +1787,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -2872,6 +2880,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -4017,6 +4030,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -5103,6 +5121,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -6316,6 +6339,12 @@ ref</a>
</pre></td></tr></table>
<pre class="example-preformatted">
+</pre><table class="cartouche" border="1"><tr><th>
+Tit--le <em class="emph">of box</em></th></tr><tr><td>
+<pre class="example-preformatted">With title c--artouche
+</pre></td></tr></table>
+<pre class="example-preformatted">
+
</pre><div class="flushleft"><pre class="example-preformatted">f--lushleft
more text
</pre></div><pre class="example-preformatted">
diff --git
a/tp/tests/layout/res_parser/formatting_sort_element_counts/formatting_elt_counts.txt
b/tp/tests/layout/res_parser/formatting_sort_element_counts/formatting_elt_counts.txt
index f255dd2652..4b30b5cbab 100644
---
a/tp/tests/layout/res_parser/formatting_sort_element_counts/formatting_elt_counts.txt
+++
b/tp/tests/layout/res_parser/formatting_sort_element_counts/formatting_elt_counts.txt
@@ -1,5 +1,5 @@
-1736 @chapter chapter
-1696 @top Top section
+1742 @chapter chapter
+1702 @top Top section
10 @section A section
7 @subsection subsection
4 @centerchap chapter 2
diff --git a/tp/tests/layout/res_parser/formatting_textcontent/formatting
b/tp/tests/layout/res_parser/formatting_textcontent/formatting
index 38161bb67e..84f6b6bdcf 100644
--- a/tp/tests/layout/res_parser/formatting_textcontent/formatting
+++ b/tp/tests/layout/res_parser/formatting_textcontent/formatting
@@ -663,6 +663,9 @@ Value--table samp
c--artouche
+Tit--le of box
+With title c--artouche
+
f--lushleft
more text
@@ -1502,6 +1505,9 @@ Value--table samp
c--artouche
+Tit--le of box
+With title c--artouche
+
f--lushleft
more text
@@ -2363,6 +2369,9 @@ Value--table samp
c--artouche
+Tit--le of box
+With title c--artouche
+
f--lushleft
more text
@@ -3197,6 +3206,9 @@ Value--table samp
c--artouche
+Tit--le of box
+With title c--artouche
+
f--lushleft
more text
diff --git a/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
b/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
index 71fad8dde0..0d02ec1960 100644
--- a/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
@@ -653,6 +653,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
@@ -1784,6 +1787,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -2872,6 +2880,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -4017,6 +4030,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -5103,6 +5121,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -6316,6 +6339,12 @@ ref</a>
</pre></td></tr></table>
<pre class="example-preformatted">
+</pre><table class="cartouche" border="1"><tr><th>
+Tit--le <em class="emph">of box</em></th></tr><tr><td>
+<pre class="example-preformatted">With title c--artouche
+</pre></td></tr></table>
+<pre class="example-preformatted">
+
</pre><div class="flushleft"><pre class="example-preformatted">f--lushleft
more text
</pre></div><pre class="example-preformatted">
diff --git a/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
b/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
index 19f8933c17..894af7fced 100644
--- a/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
@@ -653,6 +653,9 @@ Value-table samp
c-artouche
+Tit-le of box
+With title c-artouche
+
f-lushleft
more text
@@ -1784,6 +1787,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -2872,6 +2880,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -4017,6 +4030,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -5103,6 +5121,11 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><th>
+Tit–le <em class="emph">of box</em></th></tr><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -6316,6 +6339,12 @@ ref</a>
</pre></td></tr></table>
<pre class="example-preformatted">
+</pre><table class="cartouche" border="1"><tr><th>
+Tit--le <em class="emph">of box</em></th></tr><tr><td>
+<pre class="example-preformatted">With title c--artouche
+</pre></td></tr></table>
+<pre class="example-preformatted">
+
</pre><div class="flushleft"><pre class="example-preformatted">f--lushleft
more text
</pre></div><pre class="example-preformatted">
diff --git a/tp/tests/layout/res_parser/formatting_xml/formatting.xml
b/tp/tests/layout/res_parser/formatting_xml/formatting.xml
index 1ac4ac48f8..8f55be488c 100644
--- a/tp/tests/layout/res_parser/formatting_xml/formatting.xml
+++ b/tp/tests/layout/res_parser/formatting_xml/formatting.xml
@@ -947,6 +947,10 @@ Value--table samp
c--artouche
@end cartouche
+@cartouche Tit--le @emph{of box}
+With title c--artouche
+@end cartouche
+
@flushleft
f--lushleft
more text
@@ -2108,6 +2112,10 @@ ref</inforefrefname><inforefinfoname spaces=" ">a
comma, in file</inforefi
<para>c&textndash;artouche
</para></cartouche>
+<cartouche spaces=" " endspaces=" "><cartouchetitle>Tit&textndash;le <emph>of
box</emph></cartouchetitle>
+<para>With title c&textndash;artouche
+</para></cartouche>
+
<flushleft endspaces=" ">
<para>f&textndash;lushleft
more text
@@ -3260,6 +3268,10 @@ ref</inforefrefname><inforefinfoname spaces=" ">a
comma, in file</inforefi
<para>c&textndash;artouche
</para></cartouche>
+<cartouche spaces=" " endspaces=" "><cartouchetitle>Tit&textndash;le <emph>of
box</emph></cartouchetitle>
+<para>With title c&textndash;artouche
+</para></cartouche>
+
<flushleft endspaces=" ">
<para>f&textndash;lushleft
more text
@@ -4442,6 +4454,10 @@ ref</inforefrefname><inforefinfoname spaces=" ">a
comma, in file</inforefi
<para>c&textndash;artouche
</para></cartouche>
+<cartouche spaces=" " endspaces=" "><cartouchetitle>Tit&textndash;le <emph>of
box</emph></cartouchetitle>
+<para>With title c&textndash;artouche
+</para></cartouche>
+
<flushleft endspaces=" ">
<para>f&textndash;lushleft
more text
@@ -5589,6 +5605,10 @@ ref</inforefrefname><inforefinfoname spaces=" ">a
comma, in file</inforefi
<pre xml:space="preserve">c--artouche
</pre></cartouche>
<pre xml:space="preserve">
+</pre><cartouche spaces=" " endspaces=" "><cartouchetitle>Tit--le <emph>of
box</emph></cartouchetitle>
+<pre xml:space="preserve">With title c--artouche
+</pre></cartouche>
+<pre xml:space="preserve">
</pre><flushleft endspaces=" ">
<pre xml:space="preserve">f--lushleft
more text
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/anchor.html
b/tp/tests/tex_html/res_parser/formatting_singular/anchor.html
index 1ff1c01852..0b7830bd63 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/anchor.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/anchor.html
@@ -654,6 +654,8 @@ Value-table samp
c-artouche
+With title c-artouche
+
f-lushleft
more text
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
b/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
index 9c582729c4..f818bbab74 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
@@ -653,6 +653,8 @@ Value-table samp
c-artouche
+With title c-artouche
+
f-lushleft
more text
@@ -1908,6 +1910,10 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -3130,6 +3136,10 @@ ref</a>
<p>c–artouche
</p></td></tr></table>
+<table class="cartouche" border="1"><tr><td>
+<p>With title c–artouche
+</p></td></tr></table>
+
<div class="flushleft"><p class="flushleft-paragraph">f–lushleft
more text
</p></div>
@@ -4479,6 +4489,11 @@ ref</a>
</pre></td></tr></table>
<pre class="example-preformatted">
+</pre><table class="cartouche" border="1"><tr><td>
+<pre class="example-preformatted">With title c--artouche
+</pre></td></tr></table>
+<pre class="example-preformatted">
+
</pre><div class="flushleft"><pre class="example-preformatted">f--lushleft
more text
</pre></div><pre class="example-preformatted">
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/chapter2.html
b/tp/tests/tex_html/res_parser/formatting_singular/chapter2.html
index a18f5af6cc..04bddc9417 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/chapter2.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/chapter2.html
@@ -653,6 +653,8 @@ Value-table samp
c-artouche
+With title c-artouche
+
f-lushleft
more text
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/index.htm
b/tp/tests/tex_html/res_parser/formatting_singular/index.htm
index 40e0d5eb0c..ec9dc6faa6 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/index.htm
+++ b/tp/tests/tex_html/res_parser/formatting_singular/index.htm
@@ -653,6 +653,8 @@ Value-table samp
c-artouche
+With title c-artouche
+
f-lushleft
more text
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/index.html
b/tp/tests/tex_html/res_parser/formatting_singular/index.html
index be04d96152..850d2061e1 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/index.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/index.html
@@ -654,6 +654,8 @@ Value-table samp
c-artouche
+With title c-artouche
+
f-lushleft
more text
diff --git
a/tp/tests/tex_html/res_parser/formatting_singular/s_002d_002dect_002cion.html
b/tp/tests/tex_html/res_parser/formatting_singular/s_002d_002dect_002cion.html
index 7d66cc62e1..5757071653 100644
---
a/tp/tests/tex_html/res_parser/formatting_singular/s_002d_002dect_002cion.html
+++
b/tp/tests/tex_html/res_parser/formatting_singular/s_002d_002dect_002cion.html
@@ -653,6 +653,8 @@ Value-table samp
c-artouche
+With title c-artouche
+
f-lushleft
more text
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/sing_abt.htm
b/tp/tests/tex_html/res_parser/formatting_singular/sing_abt.htm
index bdb8bf3da8..9c1865bb0b 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/sing_abt.htm
+++ b/tp/tests/tex_html/res_parser/formatting_singular/sing_abt.htm
@@ -653,6 +653,8 @@ Value-table samp
c-artouche
+With title c-artouche
+
f-lushleft
more text
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/sing_fot.htm
b/tp/tests/tex_html/res_parser/formatting_singular/sing_fot.htm
index 5ce86d0e7e..7c55a048bf 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/sing_fot.htm
+++ b/tp/tests/tex_html/res_parser/formatting_singular/sing_fot.htm
@@ -653,6 +653,8 @@ Value-table samp
c-artouche
+With title c-artouche
+
f-lushleft
more text
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/sing_ovr.htm
b/tp/tests/tex_html/res_parser/formatting_singular/sing_ovr.htm
index bddc574568..b64211dd98 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/sing_ovr.htm
+++ b/tp/tests/tex_html/res_parser/formatting_singular/sing_ovr.htm
@@ -653,6 +653,8 @@ Value-table samp
c-artouche
+With title c-artouche
+
f-lushleft
more text
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/sing_toc.htm
b/tp/tests/tex_html/res_parser/formatting_singular/sing_toc.htm
index 5528b00906..6a9eed8b6b 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/sing_toc.htm
+++ b/tp/tests/tex_html/res_parser/formatting_singular/sing_toc.htm
@@ -653,6 +653,8 @@ Value-table samp
c-artouche
+With title c-artouche
+
f-lushleft
more text
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/subsection.html
b/tp/tests/tex_html/res_parser/formatting_singular/subsection.html
index 20d52586fa..d5ee705eb7 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/subsection.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/subsection.html
@@ -653,6 +653,8 @@ Value-table samp
c-artouche
+With title c-artouche
+
f-lushleft
more text
diff --git
a/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
b/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
index 6344100402..a8baedfe40 100644
---
a/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
+++
b/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
@@ -653,6 +653,8 @@ Value-table samp
c-artouche
+With title c-artouche
+
f-lushleft
more text
diff --git
a/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
b/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
index e99e4e8189..3542378ce9 100644
---
a/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
+++
b/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
@@ -653,6 +653,8 @@ Value-table samp
c-artouche
+With title c-artouche
+
f-lushleft
more text
diff --git a/util/texinfo.dtd b/util/texinfo.dtd
index f97369103a..0f370b77ed 100644
--- a/util/texinfo.dtd
+++ b/util/texinfo.dtd
@@ -643,9 +643,10 @@
<!ELEMENT smalllisp (%block; | exdent)*>
<!ATTLIST smalllisp
%spacesblockattr;>
-<!ELEMENT cartouche (%block; | exdent)*>
+<!ELEMENT cartouche (cartouchetitle?, (%block; | exdent))*>
<!ATTLIST cartouche
%spacesblockattr;>
+<!ELEMENT cartouchetitle (#PCDATA | %Inline.line;)*>
<!ELEMENT format (%block; | exdent)*>
<!ATTLIST format
%spacesblockattr;>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: Use @cartouche argument as cartouche title in texi2any,
Patrice Dumas <=