[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/Convert/TexinfoMarkup.pm (%no_arg_co
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Texinfo/Convert/TexinfoMarkup.pm (%no_arg_commands_formatting), util/texinfo.dtd: use &symbol; for @& to avoid using the & entity already used for & in text in XML. &symbol; ultimately maps to & in DTD. |
|
Date: |
Wed, 07 Dec 2022 05:27:34 -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 b11a2de32f * tp/Texinfo/Convert/TexinfoMarkup.pm
(%no_arg_commands_formatting), util/texinfo.dtd: use &symbol; for @& to
avoid using the & entity already used for & in text in XML. &symbol;
ultimately maps to & in DTD.
b11a2de32f is described below
commit b11a2de32f4bbb231f3bfab2ef5a94a0615d305c
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Wed Dec 7 11:27:14 2022 +0100
* tp/Texinfo/Convert/TexinfoMarkup.pm (%no_arg_commands_formatting),
util/texinfo.dtd: use &symbol; for @& to avoid using the &
entity already used for & in text in XML. &symbol; ultimately maps
to & in DTD.
* tp/tests/coverage_macro.texi: add @&.
---
ChangeLog | 9 +
tp/Texinfo/Convert/TexinfoMarkup.pm | 3 +-
tp/t/results/def/ampchar.pl | 4 +-
tp/tests/coverage_macro.texi | 1 +
.../layout/res_parser/formatting/formatting.html | 6 +
.../layout/res_parser/formatting_chm/anchor.html | 1 +
.../layout/res_parser/formatting_chm/chapter.html | 4 +
.../layout/res_parser/formatting_chm/chapter2.html | 1 +
.../res_parser/formatting_chm/formatting.html | 3 +
.../res_parser/formatting_chm/formatting_abt.html | 1 +
.../res_parser/formatting_chm/formatting_ovr.html | 1 +
.../res_parser/formatting_chm/formatting_toc.html | 1 +
.../layout/res_parser/formatting_chm/index.html | 1 +
.../formatting_chm/s_002d_002dect_002cion.html | 1 +
.../res_parser/formatting_chm/subsection.html | 1 +
...tion-_0060_0060simple_002ddouble_002d_002d.html | 1 +
...02d_002dfour_002d_002d_002d_002d_0027_0027.html | 1 +
.../res_parser/formatting_docbook/formatting.xml | 4 +
.../formatting_enable_encoding/formatting.html | 6 +
.../EPUB/xhtml/chapter.xhtml | 4 +
.../EPUB/xhtml/chapter2.xhtml | 1 +
.../EPUB/xhtml/formatting.xhtml | 3 +
.../EPUB/xhtml/formatting_abt.xhtml | 1 +
.../EPUB/xhtml/formatting_fot.xhtml | 1 +
.../EPUB/xhtml/formatting_ovr.xhtml | 1 +
.../EPUB/xhtml/formatting_toc.xhtml | 1 +
.../EPUB/xhtml/chapter.xhtml | 4 +
.../EPUB/xhtml/chapter2.xhtml | 1 +
.../EPUB/xhtml/formatting.xhtml | 3 +
.../EPUB/xhtml/formatting_abt.xhtml | 1 +
.../EPUB/xhtml/formatting_fot.xhtml | 1 +
.../EPUB/xhtml/formatting_ovr.xhtml | 1 +
.../EPUB/xhtml/formatting_toc.xhtml | 1 +
.../EPUB/xhtml/s_002d_002dect_002cion.xhtml | 1 +
.../EPUB/xhtml/subsection.xhtml | 1 +
...ion-_0060_0060simple_002ddouble_002d_002d.xhtml | 1 +
...2d_002dfour_002d_002d_002d_002d_0027_0027.xhtml | 1 +
.../res_parser/formatting_exotic/anchor.html | 1 +
.../res_parser/formatting_exotic/chapter.html | 4 +
.../res_parser/formatting_exotic/chapter2.html | 1 +
.../formatting_exotic/formatting_abt.html | 1 +
.../formatting_exotic/formatting_ovr.html | 1 +
.../formatting_exotic/formatting_toc.html | 1 +
.../layout/res_parser/formatting_exotic/index.html | 1 +
.../formatting_exotic/s_002d_002dect_002cion.html | 1 +
.../res_parser/formatting_exotic/subsection.html | 1 +
...tion-_0060_0060simple_002ddouble_002d_002d.html | 1 +
...02d_002dfour_002d_002d_002d_002d_0027_0027.html | 1 +
.../res_parser/formatting_fr_icons/formatting.html | 6 +
.../res_parser/formatting_html/formatting.html | 6 +
.../res_parser/formatting_html32/formatting.html | 6 +
.../formatting_html_no_texi2html/formatting.html | 4 +
.../res_parser/formatting_html_nodes/anchor.html | 1 +
.../res_parser/formatting_html_nodes/chapter.html | 4 +
.../res_parser/formatting_html_nodes/chapter2.html | 1 +
.../formatting_html_nodes/formatting_abt.html | 1 +
.../formatting_html_nodes/formatting_fot.html | 1 +
.../formatting_html_nodes/formatting_ovr.html | 1 +
.../formatting_html_nodes/formatting_toc.html | 1 +
.../res_parser/formatting_html_nodes/index.html | 3 +
.../s_002d_002dect_002cion.html | 1 +
.../formatting_html_nodes/subsection.html | 1 +
...tion-_0060_0060simple_002ddouble_002d_002d.html | 1 +
...02d_002dfour_002d_002d_002d_002d_0027_0027.html | 1 +
.../res_parser/formatting_info/formatting.info | 445 +++++++++++----------
.../formatting.info | 445 +++++++++++----------
.../formatting_inline_css/formatting.html | 6 +
.../res_parser/formatting_latex/formatting.tex | 5 +
.../formatting_macro_expand/formatting.texi | 5 +
.../res_parser/formatting_mathjax/formatting.html | 6 +
.../layout/res_parser/formatting_nodes/anchor.html | 1 +
.../res_parser/formatting_nodes/chapter.html | 4 +
.../res_parser/formatting_nodes/chapter2.html | 1 +
.../formatting_nodes/formatting_abt.html | 1 +
.../formatting_nodes/formatting_fot.html | 1 +
.../formatting_nodes/formatting_ovr.html | 1 +
.../formatting_nodes/formatting_toc.html | 1 +
.../layout/res_parser/formatting_nodes/index.html | 3 +
.../formatting_nodes/s_002d_002dect_002cion.html | 1 +
.../res_parser/formatting_nodes/subsection.html | 1 +
...tion-_0060_0060simple_002ddouble_002d_002d.html | 1 +
...02d_002dfour_002d_002d_002d_002d_0027_0027.html | 1 +
.../formatting_numerical_entities/formatting.html | 6 +
.../res_parser/formatting_plaintext/formatting.txt | 411 +++++++++----------
.../res_parser/formatting_rawtext/formatting.txt | 2 +
.../formatting_regions/formatting_regions.html | 6 +
.../formatting_sort_element_counts/formatting.html | 6 +
.../formatting_elt_counts.txt | 4 +-
.../res_parser/formatting_textcontent/formatting | 4 +
.../formatting_weird_quotes/formatting.html | 6 +
.../res_parser/formatting_xhtml/formatting.html | 6 +
.../res_parser/formatting_xml/formatting.xml | 5 +
.../res_parser/formatting_singular/anchor.html | 1 +
.../res_parser/formatting_singular/chapter.html | 4 +
.../res_parser/formatting_singular/chapter2.html | 1 +
.../res_parser/formatting_singular/index.htm | 1 +
.../res_parser/formatting_singular/index.html | 1 +
.../s_002d_002dect_002cion.html | 1 +
.../res_parser/formatting_singular/sing_abt.htm | 1 +
.../res_parser/formatting_singular/sing_fot.htm | 1 +
.../res_parser/formatting_singular/sing_ovr.htm | 1 +
.../res_parser/formatting_singular/sing_toc.htm | 1 +
.../res_parser/formatting_singular/subsection.html | 1 +
...tion-_0060_0060simple_002ddouble_002d_002d.html | 1 +
...02d_002dfour_002d_002d_002d_002d_0027_0027.html | 1 +
util/texinfo.dtd | 3 +-
106 files changed, 880 insertions(+), 655 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 6f2468d005..06acff585a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2022-12-07 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/Convert/TexinfoMarkup.pm (%no_arg_commands_formatting),
+ util/texinfo.dtd: use &symbol; for @& to avoid using the &
+ entity already used for & in text in XML. &symbol; ultimately maps
+ to & in DTD.
+
+ * tp/tests/coverage_macro.texi: add @&.
+
2022-12-06 Patrice Dumas <pertusus@free.fr>
* tp/t/19def.t: move all_empty_def to @test_info and format to xml
diff --git a/tp/Texinfo/Convert/TexinfoMarkup.pm
b/tp/Texinfo/Convert/TexinfoMarkup.pm
index ddf052d965..2462789d28 100644
--- a/tp/Texinfo/Convert/TexinfoMarkup.pm
+++ b/tp/Texinfo/Convert/TexinfoMarkup.pm
@@ -66,7 +66,8 @@ our %no_arg_commands_formatting = (
'@' => 'arobase',
'{' => 'lbrace',
'}' => 'rbrace',
- '&' => 'amp',
+ '&' => 'ampsymbol', # avoid amp as it is already the entity for
+ # & in text in XML
'\\' => 'backslash', # should only appear in math
'TeX' => 'tex',
diff --git a/tp/t/results/def/ampchar.pl b/tp/t/results/def/ampchar.pl
index be9a5162c3..971699f547 100644
--- a/tp/t/results/def/ampchar.pl
+++ b/tp/t/results/def/ampchar.pl
@@ -338,9 +338,9 @@ $result_converted_errors{'html'}->{'ampchar'} = [
-$result_converted{'xml'}->{'ampchar'} = '<defop spaces=" " endspaces="
"><definitionterm><indexterm index="fn" number="1">b on
a</indexterm><defcategory bracketed="on">Constructor</defcategory>
<defclass>a</defclass> <defoperation>b</defoperation>
<defdelimiter>(</defdelimiter><defparam><code>const
std::vector<int>&</code></defparam><defdelimiter>)</defdelimiter></definitionterm>
+$result_converted{'xml'}->{'ampchar'} = '<defop spaces=" " endspaces="
"><definitionterm><indexterm index="fn" number="1">b on
a</indexterm><defcategory bracketed="on">Constructor</defcategory>
<defclass>a</defclass> <defoperation>b</defoperation>
<defdelimiter>(</defdelimiter><defparam><code>const
std::vector<int>&symbol;</code></defparam><defdelimiter>)</defdelimiter></definitionterm>
</defop>
-<para>& & &char; { } &arobase;
+<para>& &symbol; &char; { } &arobase;
</para>';
diff --git a/tp/tests/coverage_macro.texi b/tp/tests/coverage_macro.texi
index 14fe513a95..ff269a1b87 100644
--- a/tp/tests/coverage_macro.texi
+++ b/tp/tests/coverage_macro.texi
@@ -73,6 +73,7 @@ kbd: @kbd{``simple-double--three---four----''} @*
@code{@@!} @!
@code{@@?} @?
@code{@@.} @.
+@code{@@&} @&
@code{@@@@} @@
@code{@@@}} @}
@code{@@@{} @{
diff --git a/tp/tests/layout/res_parser/formatting/formatting.html
b/tp/tests/layout/res_parser/formatting/formatting.html
index 19591b5bf1..f2238f61a1 100644
--- a/tp/tests/layout/res_parser/formatting/formatting.html
+++ b/tp/tests/layout/res_parser/formatting/formatting.html
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
@@ -978,6 +979,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -2065,6 +2067,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -3209,6 +3212,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -4294,6 +4298,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -5385,6 +5390,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
diff --git a/tp/tests/layout/res_parser/formatting_chm/anchor.html
b/tp/tests/layout/res_parser/formatting_chm/anchor.html
index 0ae148e68e..ffdc6ad56a 100644
--- a/tp/tests/layout/res_parser/formatting_chm/anchor.html
+++ b/tp/tests/layout/res_parser/formatting_chm/anchor.html
@@ -82,6 +82,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
diff --git a/tp/tests/layout/res_parser/formatting_chm/chapter.html
b/tp/tests/layout/res_parser/formatting_chm/chapter.html
index 13e9296d01..88be6c61e0 100644
--- a/tp/tests/layout/res_parser/formatting_chm/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_chm/chapter.html
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
@@ -974,6 +975,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -2059,6 +2061,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -3150,6 +3153,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
diff --git a/tp/tests/layout/res_parser/formatting_chm/chapter2.html
b/tp/tests/layout/res_parser/formatting_chm/chapter2.html
index dedeb2dc40..658d9e8062 100644
--- a/tp/tests/layout/res_parser/formatting_chm/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_chm/chapter2.html
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting.html
b/tp/tests/layout/res_parser/formatting_chm/formatting.html
index c39f662d4e..ab736bdc60 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting.html
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
@@ -959,6 +960,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -2046,6 +2048,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting_abt.html
b/tp/tests/layout/res_parser/formatting_chm/formatting_abt.html
index c9ffe26599..0f9120bd86 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting_abt.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting_abt.html
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 c9c503dac8..58c5f08125 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 a382a107c2..568871d3e9 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
diff --git a/tp/tests/layout/res_parser/formatting_chm/index.html
b/tp/tests/layout/res_parser/formatting_chm/index.html
index e1976f812f..2e7fdfb4c5 100644
--- a/tp/tests/layout/res_parser/formatting_chm/index.html
+++ b/tp/tests/layout/res_parser/formatting_chm/index.html
@@ -82,6 +82,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 ba6010eb24..37b38a8e63 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
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
diff --git a/tp/tests/layout/res_parser/formatting_chm/subsection.html
b/tp/tests/layout/res_parser/formatting_chm/subsection.html
index e4a7108a85..49da925ae8 100644
--- a/tp/tests/layout/res_parser/formatting_chm/subsection.html
+++ b/tp/tests/layout/res_parser/formatting_chm/subsection.html
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 e7dbc95b95..ada698d5e4 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
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 a89e165120..aea662725b 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
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
diff --git a/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
b/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
index 6f7198d622..b78c6324ca 100644
--- a/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
+++ b/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
@@ -98,6 +98,7 @@ kbd:
<userinput>``simple-double--three---four----''</userinput>
<literal>@!</literal> !
<literal>@?</literal> ?
<literal>@.</literal> .
+<literal>@&</literal> &
<literal>@@</literal> @
<literal>@}</literal> }
<literal>@{</literal> {
@@ -1024,6 +1025,7 @@ kbd:
<userinput>``simple-double--three---four----''</userinput>
<literal>@!</literal> !
<literal>@?</literal> ?
<literal>@.</literal> .
+<literal>@&</literal> &
<literal>@@</literal> @
<literal>@}</literal> }
<literal>@{</literal> {
@@ -1937,6 +1939,7 @@ kbd:
<userinput>``simple-double--three---four----''</userinput>
<literal>@!</literal> !
<literal>@?</literal> ?
<literal>@.</literal> .
+<literal>@&</literal> &
<literal>@@</literal> @
<literal>@}</literal> }
<literal>@{</literal> {
@@ -2846,6 +2849,7 @@ kbd:
<userinput>``simple-double--three---four----''</userinput>
<literal>@!</literal> !
<literal>@?</literal> ?
<literal>@.</literal> .
+<literal>@&</literal> &
<literal>@@</literal> @
<literal>@}</literal> }
<literal>@{</literal> {
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 0152cb8db9..53fdb468f2 100644
--- a/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
@@ -978,6 +979,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -2065,6 +2067,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -3209,6 +3212,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -4294,6 +4298,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -5385,6 +5390,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
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 0d289514e6..125836aec8 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
@@ -82,6 +82,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
@@ -974,6 +975,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br/>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -2059,6 +2061,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br/>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -3150,6 +3153,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
diff --git
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
index 4016ebb352..3096be7e1a 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
@@ -82,6 +82,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 57ac8907df..8530ed1d9b 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
@@ -82,6 +82,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
@@ -958,6 +959,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br/>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -2045,6 +2047,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br/>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
diff --git
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
b/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
index 9657add853..e9d2fdf831 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
@@ -82,6 +82,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 8e14d0a256..fce4738756 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
@@ -82,6 +82,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 d6e32bba46..eba26586bc 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
@@ -82,6 +82,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 b88339304f..b36491311c 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
@@ -82,6 +82,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 1609708b58..30ded7b845 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
@@ -82,6 +82,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
@@ -975,6 +976,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br/>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -2060,6 +2062,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br/>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -3151,6 +3154,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
diff --git
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
index 98e4815348..3d08c4466f 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
@@ -82,6 +82,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 31412407fe..b69f3213a6 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
@@ -82,6 +82,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
@@ -960,6 +961,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br/>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -2047,6 +2049,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br/>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
diff --git
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
index b1c1c44c4e..bdee05c823 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
@@ -82,6 +82,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 50a119cf7b..c952f3a15a 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
@@ -82,6 +82,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 472ee1de10..7253ed62e1 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
@@ -82,6 +82,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 4f4f3d8007..f0d6189da4 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
@@ -82,6 +82,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 121f92c575..6657297540 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
@@ -82,6 +82,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 429dc405c8..e10a9b7de9 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
@@ -82,6 +82,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 a819214db1..9ce77d74ef 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
@@ -82,6 +82,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 fcf6516aa3..0cd845082f 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
@@ -82,6 +82,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
diff --git a/tp/tests/layout/res_parser/formatting_exotic/anchor.html
b/tp/tests/layout/res_parser/formatting_exotic/anchor.html
index 40064fe8dd..a6a0d34c1a 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/anchor.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/anchor.html
@@ -82,6 +82,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
diff --git a/tp/tests/layout/res_parser/formatting_exotic/chapter.html
b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
index 8872d87cca..9091a96f91 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
@@ -993,6 +994,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -2078,6 +2080,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -3169,6 +3172,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
diff --git a/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
b/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
index 0b196c5e65..16af78ff63 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 4610b00ed2..39e3e1614c 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 2fcf2089ad..7878d20f99 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 4a89962b04..6adabbbb94 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
diff --git a/tp/tests/layout/res_parser/formatting_exotic/index.html
b/tp/tests/layout/res_parser/formatting_exotic/index.html
index 4fb38f69e9..20f23b7a60 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/index.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/index.html
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 05f4efcd40..c294d85145 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
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
diff --git a/tp/tests/layout/res_parser/formatting_exotic/subsection.html
b/tp/tests/layout/res_parser/formatting_exotic/subsection.html
index 50f43cab05..a1853b863f 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/subsection.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/subsection.html
@@ -82,6 +82,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 39e4781ea6..60b7018bf4 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
@@ -82,6 +82,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 f5b2917f83..1ce6d0da99 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
@@ -82,6 +82,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 6d171036d3..fa3b338455 100644
--- a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
@@ -978,6 +979,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -2065,6 +2067,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -3209,6 +3212,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -4294,6 +4298,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -5385,6 +5390,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
diff --git a/tp/tests/layout/res_parser/formatting_html/formatting.html
b/tp/tests/layout/res_parser/formatting_html/formatting.html
index 19591b5bf1..f2238f61a1 100644
--- a/tp/tests/layout/res_parser/formatting_html/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html/formatting.html
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
@@ -978,6 +979,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -2065,6 +2067,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -3209,6 +3212,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -4294,6 +4298,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -5385,6 +5390,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
diff --git a/tp/tests/layout/res_parser/formatting_html32/formatting.html
b/tp/tests/layout/res_parser/formatting_html32/formatting.html
index 299e75235d..1e01b37e13 100644
--- a/tp/tests/layout/res_parser/formatting_html32/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html32/formatting.html
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
@@ -937,6 +938,7 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
<code>@!</code> !
<code>@?</code> ?
<code>@.</code> .
+<code>@&</code> &
<code>@@</code> @
<code>@}</code> }
<code>@{</code> {
@@ -1998,6 +2000,7 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
<code>@!</code> !
<code>@?</code> ?
<code>@.</code> .
+<code>@&</code> &
<code>@@</code> @
<code>@}</code> }
<code>@{</code> {
@@ -3116,6 +3119,7 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
<code>@!</code> !
<code>@?</code> ?
<code>@.</code> .
+<code>@&</code> &
<code>@@</code> @
<code>@}</code> }
<code>@{</code> {
@@ -4175,6 +4179,7 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
<code>@!</code> !
<code>@?</code> ?
<code>@.</code> .
+<code>@&</code> &
<code>@@</code> @
<code>@}</code> }
<code>@{</code> {
@@ -5239,6 +5244,7 @@ kbd: <kbd>``simple-double--three---four----''</kbd>
<code>@!</code> !
<code>@?</code> ?
<code>@.</code> .
+<code>@&</code> &
<code>@@</code> @
<code>@}</code> }
<code>@{</code> {
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 b72049ebbe..fa064b5da7 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
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
@@ -1033,6 +1034,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -2118,6 +2120,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -3209,6 +3212,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
diff --git a/tp/tests/layout/res_parser/formatting_html_nodes/anchor.html
b/tp/tests/layout/res_parser/formatting_html_nodes/anchor.html
index 0ae148e68e..ffdc6ad56a 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/anchor.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/anchor.html
@@ -82,6 +82,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 62ffb2ba28..d4fbcc433f 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
@@ -994,6 +995,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -2079,6 +2081,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -3170,6 +3173,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
diff --git a/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html
b/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html
index a5f11d7d40..afa5d2c75e 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 7d90b61199..7ec322572a 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
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 23a3962df8..36fb171474 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
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 35c239f00b..a4499ee743 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
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 8a25bbe233..1be2a726ef 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
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 d9691b272b..a6a4036c4f 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/index.html
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
@@ -964,6 +965,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -2051,6 +2053,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
diff --git
a/tp/tests/layout/res_parser/formatting_html_nodes/s_002d_002dect_002cion.html
b/tp/tests/layout/res_parser/formatting_html_nodes/s_002d_002dect_002cion.html
index 4b41913ce2..f330554f33 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
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 84e57f9009..ad82291b44 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 7d09a49830..559f0dda07 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
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 69bdf7331b..bb74ebded0 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
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
diff --git a/tp/tests/layout/res_parser/formatting_info/formatting.info
b/tp/tests/layout/res_parser/formatting_info/formatting.info
index 2d00182f0e..cf070565ef 100644
--- a/tp/tests/layout/res_parser/formatting_info/formatting.info
+++ b/tp/tests/layout/res_parser/formatting_info/formatting.info
@@ -29,7 +29,7 @@ kbd: '``simple-double--three---four----'''
@*
@ followed by a space @ followed by a tab @ followed by a new line
- '@-' '@:' '@!' ! '@?' ? '@.' . '@@' @ '@}' } '@{' { '@/'
+ '@-' '@:' '@!' ! '@?' ? '@.' . '@&' & '@@' @ '@}' } '@{' { '@/'
foo vs. bar. colon :And something else. semi colon ;. And ? ?.
Now ! !@ but , ,
@@ -750,7 +750,7 @@ kbd: '``simple-double--three---four----'''
@*
@ followed by a space @ followed by a tab @ followed by a new line
- '@-' '@:' '@!' ! '@?' ? '@.' . '@@' @ '@}' } '@{' { '@/'
+ '@-' '@:' '@!' ! '@?' ? '@.' . '@&' & '@@' @ '@}' } '@{' { '@/'
foo vs. bar. colon :And something else. semi colon ;. And ? ?.
Now ! !@ but , ,
@@ -1428,7 +1428,7 @@ kbd: '``simple-double--three---four----'''
@*
@ followed by a space @ followed by a tab @ followed by a new line
- '@-' '@:' '@!' ! '@?' ? '@.' . '@@' @ '@}' } '@{' { '@/'
+ '@-' '@:' '@!' ! '@?' ? '@.' . '@&' & '@@' @ '@}' } '@{' { '@/'
foo vs. bar. colon :And something else. semi colon ;. And ? ?.
Now ! !@ but , ,
@@ -2156,6 +2156,7 @@ cross ref name: (file name). '@inforef{}' *note ::
@! !
@? ?
@. .
+ @& &
@@ @
@} }
@{ {
@@ -2939,14 +2940,14 @@ aaa" ]
[index ]
* Menu:
-* truc: chapter. (line 2202)
+* truc: chapter. (line 2203)
codeidx
[index ]
* Menu:
-* a INDEX---ENTRY tẽ --- î: chapter. (line 2202)
+* a INDEX---ENTRY tẽ --- î: chapter. (line 2203)
cp
@@ -2959,111 +2960,111 @@ aaa" ]
* -option: chapter. (line 28)
* -option <1>: chapter. (line 698)
* -option <2>: chapter. (line 1379)
-* .: chapter. (line 2202)
-* ?: chapter. (line 2202)
-* a: chapter. (line 2202)
-* aaa, bbb: chapter. (line 2202)
-* a--a: chapter. (line 2202)
+* .: chapter. (line 2203)
+* ?: chapter. (line 2203)
+* a: chapter. (line 2203)
+* aaa, bbb: chapter. (line 2203)
+* a--a: chapter. (line 2203)
* a--asis: chapter. (line 510)
* a--asis <1>: chapter. (line 1180)
-* a--asis <2>: chapter. (line 1987)
+* a--asis <2>: chapter. (line 1988)
* b: chapter. (line 511)
* b <1>: chapter. (line 1181)
-* b <2>: chapter. (line 1988)
-* b--b, c--c: chapter. (line 2202)
+* b <2>: chapter. (line 1989)
+* b--b, c--c: chapter. (line 2203)
* counting entry: chapter. (line 4)
-* d--dd, e--ee, f--ff: chapter. (line 2202)
+* d--dd, e--ee, f--ff: chapter. (line 2203)
* 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 1828)
-* d--efcv_name <5>: chapter. (line 1831)
+* d--efcv_name <4>: chapter. (line 1829)
+* d--efcv_name <5>: chapter. (line 1832)
* 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 1873)
+* d--efivar_name of c--lass <2>: chapter. (line 1874)
* d--efopt_name: chapter. (line 387)
* d--efopt_name <1>: chapter. (line 1057)
-* d--efopt_name <2>: chapter. (line 1864)
+* d--efopt_name <2>: chapter. (line 1865)
* 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 1834)
-* d--eftypecv_name of c--lass <5>: chapter. (line 1837)
+* d--eftypecv_name of c--lass <4>: chapter. (line 1835)
+* d--eftypecv_name of c--lass <5>: chapter. (line 1838)
* 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 1906)
-* d--eftypecv_name2 of c--lass2 <5>: chapter. (line 1909)
+* d--eftypecv_name2 of c--lass2 <4>: chapter. (line 1907)
+* d--eftypecv_name2 of c--lass2 <5>: chapter. (line 1910)
* 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 1876)
+* d--eftypeivar_name of c--lass <2>: chapter. (line 1877)
* d--eftypevar_name: chapter. (line 393)
* d--eftypevar_name <1>: chapter. (line 1063)
-* d--eftypevar_name <2>: chapter. (line 1870)
+* d--eftypevar_name <2>: chapter. (line 1871)
* d--eftypevr_name: chapter. (line 348)
* d--eftypevr_name <1>: chapter. (line 1018)
-* d--eftypevr_name <2>: chapter. (line 1825)
+* d--eftypevr_name <2>: chapter. (line 1826)
* 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 1858)
-* d--efvar_name <5>: chapter. (line 1861)
+* d--efvar_name <4>: chapter. (line 1859)
+* d--efvar_name <5>: chapter. (line 1862)
* d--efvr_name: chapter. (line 327)
* d--efvr_name <1>: chapter. (line 997)
-* d--efvr_name <2>: chapter. (line 1804)
-* g--gg, h--hh jjj, k--kk, l--ll: chapter. (line 2202)
+* d--efvr_name <2>: chapter. (line 1805)
+* g--gg, h--hh jjj, k--kk, l--ll: chapter. (line 2203)
* 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 1992)
-* index entry between item and itemx <5>: chapter. (line 2143)
+* 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 4)
* index entry within deffn: chapter. (line 302)
* index entry within deffn <1>: chapter. (line 972)
-* index entry within deffn <2>: chapter. (line 1777)
+* index entry within deffn <2>: chapter. (line 1778)
* index entry within itemize: chapter. (line 213)
* index entry within itemize <1>: chapter. (line 883)
-* index entry within itemize <2>: chapter. (line 1688)
+* index entry within itemize <2>: chapter. (line 1689)
* index entry within multitable: chapter. (line 235)
* index entry within multitable <1>: chapter. (line 905)
-* index entry within multitable <2>: chapter. (line 1711)
-* t-ruc: chapter. (line 2202)
-* T-ruc: chapter. (line 2202)
+* index entry within multitable <2>: chapter. (line 1712)
+* t-ruc: chapter. (line 2203)
+* T-ruc: chapter. (line 2203)
* 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 1611)
+* vtable i--tem code kbdinputstyle <2>: chapter. (line 1612)
* 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 1606)
+* vtable i--tem default kbdinputstyle <2>: chapter. (line 1607)
* 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 1621)
+* vtable i--tem distinct kbdinputstyle <2>: chapter. (line 1622)
* 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 1616)
+* vtable i--tem example kbdinputstyle <2>: chapter. (line 1617)
* 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 1613)
+* vtable i--tem in example code kbdinputstyle <2>: chapter. (line 1614)
* vtable i--tem in example default kbdinputstyle: chapter. (line 134)
* vtable i--tem in example default kbdinputstyle <1>: chapter.
(line 804)
* vtable i--tem in example default kbdinputstyle <2>: chapter.
- (line 1608)
+ (line 1609)
* vtable i--tem in example distinct kbdinputstyle: chapter. (line 149)
* vtable i--tem in example distinct kbdinputstyle <1>: chapter.
(line 819)
* vtable i--tem in example distinct kbdinputstyle <2>: chapter.
- (line 1623)
+ (line 1624)
* vtable i--tem in example example kbdinputstyle: chapter. (line 144)
* vtable i--tem in example example kbdinputstyle <1>: chapter.
(line 814)
* vtable i--tem in example example kbdinputstyle <2>: chapter.
- (line 1618)
+ (line 1619)
fn
@@ -3073,8 +3074,8 @@ aaa" ]
* --foption: chapter. (line 28)
* --foption <1>: chapter. (line 698)
* --foption <2>: chapter. (line 1379)
-* .: chapter. (line 2202)
-* ?: chapter. (line 2202)
+* .: chapter. (line 2203)
+* ?: chapter. (line 2203)
* ``: chapter. (line 28)
* `` <1>: chapter. (line 698)
* `` <2>: chapter. (line 1379)
@@ -3084,122 +3085,122 @@ aaa" ]
* a <3>: chapter. (line 985)
* a <4>: chapter. (line 1184)
* a <5>: chapter. (line 1302)
-* a <6>: chapter. (line 1790)
-* a <7>: chapter. (line 1991)
-* a <8>: chapter. (line 2142)
-* a <9>: chapter. (line 2202)
+* 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 2153)
+* after <2>: chapter. (line 2154)
* arg2: chapter. (line 434)
* arg2 <1>: chapter. (line 1104)
-* arg2 <2>: chapter. (line 1913)
+* arg2 <2>: chapter. (line 1914)
* b: chapter. (line 515)
* b <1>: chapter. (line 633)
* b <2>: chapter. (line 1185)
* b <3>: chapter. (line 1303)
-* b <4>: chapter. (line 1992)
-* b <5>: chapter. (line 2143)
+* b <4>: chapter. (line 1993)
+* b <5>: chapter. (line 2144)
* bidule machin: chapter. (line 310)
* bidule machin <1>: chapter. (line 980)
-* bidule machin <2>: chapter. (line 1785)
+* bidule machin <2>: chapter. (line 1786)
* d--effn_name: chapter. (line 294)
* d--effn_name <1>: chapter. (line 964)
-* d--effn_name <2>: chapter. (line 1769)
+* d--effn_name <2>: chapter. (line 1770)
* d--efmac_name: chapter. (line 375)
* d--efmac_name <1>: chapter. (line 1045)
-* d--efmac_name <2>: chapter. (line 1852)
+* d--efmac_name <2>: chapter. (line 1853)
* 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 1879)
+* d--efmethod_name on c--lass <2>: chapter. (line 1880)
* 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 1840)
-* d--efop_name on c--lass <5>: chapter. (line 1843)
+* d--efop_name on c--lass <4>: chapter. (line 1841)
+* d--efop_name on c--lass <5>: chapter. (line 1844)
* d--efspec_name: chapter. (line 378)
* d--efspec_name <1>: chapter. (line 1048)
-* d--efspec_name <2>: chapter. (line 1855)
+* d--efspec_name <2>: chapter. (line 1856)
* 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 1813)
-* d--eftypefn_name <5>: chapter. (line 1816)
+* d--eftypefn_name <4>: chapter. (line 1814)
+* d--eftypefn_name <5>: chapter. (line 1817)
* d--eftypefn_name2: chapter. (line 413)
* d--eftypefn_name2 <1>: chapter. (line 1083)
-* d--eftypefn_name2 <2>: chapter. (line 1891)
+* d--eftypefn_name2 <2>: chapter. (line 1892)
* d--eftypefun_name: chapter. (line 390)
* d--eftypefun_name <1>: chapter. (line 1060)
-* d--eftypefun_name <2>: chapter. (line 1867)
+* d--eftypefun_name <2>: chapter. (line 1868)
* 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 1882)
+* d--eftypemethod_name on c--lass <2>: chapter. (line 1883)
* 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 1819)
-* d--eftypeop_name on c--lass <5>: chapter. (line 1822)
+* d--eftypeop_name on c--lass <4>: chapter. (line 1820)
+* d--eftypeop_name on c--lass <5>: chapter. (line 1823)
* 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 1896)
-* d--eftypeop_name2 on c--lass2 <5>: chapter. (line 1901)
+* d--eftypeop_name2 on c--lass2 <4>: chapter. (line 1897)
+* d--eftypeop_name2 on c--lass2 <5>: chapter. (line 1902)
* d--efun_name: chapter. (line 372)
* d--efun_name <1>: chapter. (line 1042)
-* d--efun_name <2>: chapter. (line 1849)
+* d--efun_name <2>: chapter. (line 1850)
* de--ffn_name: chapter. (line 297)
* de--ffn_name <1>: chapter. (line 967)
-* de--ffn_name <2>: chapter. (line 1772)
+* de--ffn_name <2>: chapter. (line 1773)
* deffn: chapter. (line 318)
* deffn <1>: chapter. (line 320)
* deffn <2>: chapter. (line 988)
* deffn <3>: chapter. (line 990)
-* deffn <4>: chapter. (line 1794)
-* deffn <5>: chapter. (line 1796)
+* deffn <4>: chapter. (line 1795)
+* deffn <5>: chapter. (line 1797)
* deffnx: chapter. (line 316)
* deffnx <1>: chapter. (line 321)
* deffnx <2>: chapter. (line 986)
* deffnx <3>: chapter. (line 991)
-* deffnx <4>: chapter. (line 1791)
-* deffnx <5>: chapter. (line 1797)
-* f---aa: chapter. (line 2202)
-* f---bb, f---cc: chapter. (line 2202)
-* f---ddd, f---eee, ffff: chapter. (line 2202)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter. (line 2202)
+* 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)
* followed: chapter. (line 313)
* followed <1>: chapter. (line 641)
* followed <2>: chapter. (line 983)
* followed <3>: chapter. (line 1311)
-* followed <4>: chapter. (line 1788)
-* followed <5>: chapter. (line 2151)
+* followed <4>: chapter. (line 1789)
+* followed <5>: chapter. (line 2152)
* I: chapter. (line 301)
* I <1>: chapter. (line 323)
* I <2>: chapter. (line 971)
* I <3>: chapter. (line 993)
-* I <4>: chapter. (line 1776)
-* I <5>: chapter. (line 1799)
+* I <4>: chapter. (line 1777)
+* I <5>: chapter. (line 1800)
* id i ule: chapter. (line 307)
* id i ule <1>: chapter. (line 977)
-* id i ule <2>: chapter. (line 1782)
+* id i ule <2>: chapter. (line 1783)
* id ule: chapter. (line 306)
* id ule <1>: chapter. (line 976)
-* id ule <2>: chapter. (line 1781)
+* id ule <2>: chapter. (line 1782)
* INVALID: chapter. (line 645)
* INVALID <1>: chapter. (line 1315)
-* INVALID <2>: chapter. (line 2155)
+* INVALID <2>: chapter. (line 2156)
* log trap: chapter. (line 303)
* log trap <1>: chapter. (line 973)
-* log trap <2>: chapter. (line 1778)
+* log trap <2>: chapter. (line 1779)
* log trap1: chapter. (line 304)
* log trap1 <1>: chapter. (line 974)
-* log trap1 <2>: chapter. (line 1779)
+* log trap1 <2>: chapter. (line 1780)
* log trap2: chapter. (line 305)
* log trap2 <1>: chapter. (line 975)
-* log trap2 <2>: chapter. (line 1780)
+* log trap2 <2>: chapter. (line 1781)
* machin: chapter. (line 309)
* machin <1>: chapter. (line 311)
* machin <2>: chapter. (line 637)
@@ -3212,30 +3213,30 @@ aaa" ]
* machin <9>: chapter. (line 1308)
* machin <10>: chapter. (line 1309)
* machin <11>: chapter. (line 1310)
-* machin <12>: chapter. (line 1784)
-* machin <13>: chapter. (line 1786)
-* machin <14>: chapter. (line 2147)
-* machin <15>: chapter. (line 2148)
-* machin <16>: chapter. (line 2149)
-* machin <17>: chapter. (line 2150)
+* 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)
* 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 1807)
-* n--ame <5>: chapter. (line 1810)
+* n--ame <4>: chapter. (line 1808)
+* n--ame <5>: chapter. (line 1811)
* name2: chapter. (line 408)
* name2 <1>: chapter. (line 1078)
-* name2 <2>: chapter. (line 1886)
-* t--ruc: chapter. (line 2202)
-* T--ruc: chapter. (line 2202)
+* name2 <2>: chapter. (line 1887)
+* t--ruc: chapter. (line 2203)
+* T--ruc: chapter. (line 2203)
* truc: chapter. (line 302)
* truc <1>: chapter. (line 324)
* truc <2>: chapter. (line 972)
* truc <3>: chapter. (line 994)
-* truc <4>: chapter. (line 1777)
-* truc <5>: chapter. (line 1800)
-* xxx, zzz: chapter. (line 2202)
+* truc <4>: chapter. (line 1778)
+* truc <5>: chapter. (line 1801)
+* xxx, zzz: chapter. (line 2203)
vr
@@ -3250,7 +3251,7 @@ aaa" ]
* d--eftp_name: chapter. (line 369)
* d--eftp_name <1>: chapter. (line 1039)
-* d--eftp_name <2>: chapter. (line 1846)
+* d--eftp_name <2>: chapter. (line 1847)
(8)
@@ -3338,111 +3339,111 @@ chapter 2
* -option: chapter. (line 28)
* -option <1>: chapter. (line 698)
* -option <2>: chapter. (line 1379)
-* .: chapter. (line 2202)
-* ?: chapter. (line 2202)
-* a: chapter. (line 2202)
-* aaa, bbb: chapter. (line 2202)
-* a--a: chapter. (line 2202)
+* .: chapter. (line 2203)
+* ?: chapter. (line 2203)
+* a: chapter. (line 2203)
+* aaa, bbb: chapter. (line 2203)
+* a--a: chapter. (line 2203)
* a--asis: chapter. (line 510)
* a--asis <1>: chapter. (line 1180)
-* a--asis <2>: chapter. (line 1987)
+* a--asis <2>: chapter. (line 1988)
* b: chapter. (line 511)
* b <1>: chapter. (line 1181)
-* b <2>: chapter. (line 1988)
-* b--b, c--c: chapter. (line 2202)
-* counting entry: chapter. (line 2552)
-* d--dd, e--ee, f--ff: chapter. (line 2202)
+* 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)
* 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 1828)
-* d--efcv_name <5>: chapter. (line 1831)
+* d--efcv_name <4>: chapter. (line 1829)
+* d--efcv_name <5>: chapter. (line 1832)
* 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 1873)
+* d--efivar_name of c--lass <2>: chapter. (line 1874)
* d--efopt_name: chapter. (line 387)
* d--efopt_name <1>: chapter. (line 1057)
-* d--efopt_name <2>: chapter. (line 1864)
+* d--efopt_name <2>: chapter. (line 1865)
* 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 1834)
-* d--eftypecv_name of c--lass <5>: chapter. (line 1837)
+* d--eftypecv_name of c--lass <4>: chapter. (line 1835)
+* d--eftypecv_name of c--lass <5>: chapter. (line 1838)
* 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 1906)
-* d--eftypecv_name2 of c--lass2 <5>: chapter. (line 1909)
+* d--eftypecv_name2 of c--lass2 <4>: chapter. (line 1907)
+* d--eftypecv_name2 of c--lass2 <5>: chapter. (line 1910)
* 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 1876)
+* d--eftypeivar_name of c--lass <2>: chapter. (line 1877)
* d--eftypevar_name: chapter. (line 393)
* d--eftypevar_name <1>: chapter. (line 1063)
-* d--eftypevar_name <2>: chapter. (line 1870)
+* d--eftypevar_name <2>: chapter. (line 1871)
* d--eftypevr_name: chapter. (line 348)
* d--eftypevr_name <1>: chapter. (line 1018)
-* d--eftypevr_name <2>: chapter. (line 1825)
+* d--eftypevr_name <2>: chapter. (line 1826)
* 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 1858)
-* d--efvar_name <5>: chapter. (line 1861)
+* d--efvar_name <4>: chapter. (line 1859)
+* d--efvar_name <5>: chapter. (line 1862)
* d--efvr_name: chapter. (line 327)
* d--efvr_name <1>: chapter. (line 997)
-* d--efvr_name <2>: chapter. (line 1804)
-* g--gg, h--hh jjj, k--kk, l--ll: chapter. (line 2202)
+* d--efvr_name <2>: chapter. (line 1805)
+* g--gg, h--hh jjj, k--kk, l--ll: chapter. (line 2203)
* 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 1992)
-* index entry between item and itemx <5>: chapter. (line 2143)
-* index entry in footnote: chapter. (line 2547)
+* 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 within deffn: chapter. (line 302)
* index entry within deffn <1>: chapter. (line 972)
-* index entry within deffn <2>: chapter. (line 1777)
+* index entry within deffn <2>: chapter. (line 1778)
* index entry within itemize: chapter. (line 213)
* index entry within itemize <1>: chapter. (line 883)
-* index entry within itemize <2>: chapter. (line 1688)
+* index entry within itemize <2>: chapter. (line 1689)
* index entry within multitable: chapter. (line 235)
* index entry within multitable <1>: chapter. (line 905)
-* index entry within multitable <2>: chapter. (line 1711)
-* t-ruc: chapter. (line 2202)
-* T-ruc: chapter. (line 2202)
+* index entry within multitable <2>: chapter. (line 1712)
+* t-ruc: chapter. (line 2203)
+* T-ruc: chapter. (line 2203)
* 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 1611)
+* vtable i--tem code kbdinputstyle <2>: chapter. (line 1612)
* 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 1606)
+* vtable i--tem default kbdinputstyle <2>: chapter. (line 1607)
* 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 1621)
+* vtable i--tem distinct kbdinputstyle <2>: chapter. (line 1622)
* 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 1616)
+* vtable i--tem example kbdinputstyle <2>: chapter. (line 1617)
* 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 1613)
+* vtable i--tem in example code kbdinputstyle <2>: chapter. (line 1614)
* vtable i--tem in example default kbdinputstyle: chapter. (line 134)
* vtable i--tem in example default kbdinputstyle <1>: chapter.
(line 804)
* vtable i--tem in example default kbdinputstyle <2>: chapter.
- (line 1608)
+ (line 1609)
* vtable i--tem in example distinct kbdinputstyle: chapter. (line 149)
* vtable i--tem in example distinct kbdinputstyle <1>: chapter.
(line 819)
* vtable i--tem in example distinct kbdinputstyle <2>: chapter.
- (line 1623)
+ (line 1624)
* vtable i--tem in example example kbdinputstyle: chapter. (line 144)
* vtable i--tem in example example kbdinputstyle <1>: chapter.
(line 814)
* vtable i--tem in example example kbdinputstyle <2>: chapter.
- (line 1618)
+ (line 1619)
[index ]
* Menu:
@@ -3450,8 +3451,8 @@ chapter 2
* --foption: chapter. (line 28)
* --foption <1>: chapter. (line 698)
* --foption <2>: chapter. (line 1379)
-* .: chapter. (line 2202)
-* ?: chapter. (line 2202)
+* .: chapter. (line 2203)
+* ?: chapter. (line 2203)
* ``: chapter. (line 28)
* `` <1>: chapter. (line 698)
* `` <2>: chapter. (line 1379)
@@ -3461,122 +3462,122 @@ chapter 2
* a <3>: chapter. (line 985)
* a <4>: chapter. (line 1184)
* a <5>: chapter. (line 1302)
-* a <6>: chapter. (line 1790)
-* a <7>: chapter. (line 1991)
-* a <8>: chapter. (line 2142)
-* a <9>: chapter. (line 2202)
+* 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 2153)
+* after <2>: chapter. (line 2154)
* arg2: chapter. (line 434)
* arg2 <1>: chapter. (line 1104)
-* arg2 <2>: chapter. (line 1913)
+* arg2 <2>: chapter. (line 1914)
* b: chapter. (line 515)
* b <1>: chapter. (line 633)
* b <2>: chapter. (line 1185)
* b <3>: chapter. (line 1303)
-* b <4>: chapter. (line 1992)
-* b <5>: chapter. (line 2143)
+* b <4>: chapter. (line 1993)
+* b <5>: chapter. (line 2144)
* bidule machin: chapter. (line 310)
* bidule machin <1>: chapter. (line 980)
-* bidule machin <2>: chapter. (line 1785)
+* bidule machin <2>: chapter. (line 1786)
* d--effn_name: chapter. (line 294)
* d--effn_name <1>: chapter. (line 964)
-* d--effn_name <2>: chapter. (line 1769)
+* d--effn_name <2>: chapter. (line 1770)
* d--efmac_name: chapter. (line 375)
* d--efmac_name <1>: chapter. (line 1045)
-* d--efmac_name <2>: chapter. (line 1852)
+* d--efmac_name <2>: chapter. (line 1853)
* 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 1879)
+* d--efmethod_name on c--lass <2>: chapter. (line 1880)
* 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 1840)
-* d--efop_name on c--lass <5>: chapter. (line 1843)
+* d--efop_name on c--lass <4>: chapter. (line 1841)
+* d--efop_name on c--lass <5>: chapter. (line 1844)
* d--efspec_name: chapter. (line 378)
* d--efspec_name <1>: chapter. (line 1048)
-* d--efspec_name <2>: chapter. (line 1855)
+* d--efspec_name <2>: chapter. (line 1856)
* 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 1813)
-* d--eftypefn_name <5>: chapter. (line 1816)
+* d--eftypefn_name <4>: chapter. (line 1814)
+* d--eftypefn_name <5>: chapter. (line 1817)
* d--eftypefn_name2: chapter. (line 413)
* d--eftypefn_name2 <1>: chapter. (line 1083)
-* d--eftypefn_name2 <2>: chapter. (line 1891)
+* d--eftypefn_name2 <2>: chapter. (line 1892)
* d--eftypefun_name: chapter. (line 390)
* d--eftypefun_name <1>: chapter. (line 1060)
-* d--eftypefun_name <2>: chapter. (line 1867)
+* d--eftypefun_name <2>: chapter. (line 1868)
* 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 1882)
+* d--eftypemethod_name on c--lass <2>: chapter. (line 1883)
* 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 1819)
-* d--eftypeop_name on c--lass <5>: chapter. (line 1822)
+* d--eftypeop_name on c--lass <4>: chapter. (line 1820)
+* d--eftypeop_name on c--lass <5>: chapter. (line 1823)
* 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 1896)
-* d--eftypeop_name2 on c--lass2 <5>: chapter. (line 1901)
+* d--eftypeop_name2 on c--lass2 <4>: chapter. (line 1897)
+* d--eftypeop_name2 on c--lass2 <5>: chapter. (line 1902)
* d--efun_name: chapter. (line 372)
* d--efun_name <1>: chapter. (line 1042)
-* d--efun_name <2>: chapter. (line 1849)
+* d--efun_name <2>: chapter. (line 1850)
* de--ffn_name: chapter. (line 297)
* de--ffn_name <1>: chapter. (line 967)
-* de--ffn_name <2>: chapter. (line 1772)
+* de--ffn_name <2>: chapter. (line 1773)
* deffn: chapter. (line 318)
* deffn <1>: chapter. (line 320)
* deffn <2>: chapter. (line 988)
* deffn <3>: chapter. (line 990)
-* deffn <4>: chapter. (line 1794)
-* deffn <5>: chapter. (line 1796)
+* deffn <4>: chapter. (line 1795)
+* deffn <5>: chapter. (line 1797)
* deffnx: chapter. (line 316)
* deffnx <1>: chapter. (line 321)
* deffnx <2>: chapter. (line 986)
* deffnx <3>: chapter. (line 991)
-* deffnx <4>: chapter. (line 1791)
-* deffnx <5>: chapter. (line 1797)
-* f---aa: chapter. (line 2202)
-* f---bb, f---cc: chapter. (line 2202)
-* f---ddd, f---eee, ffff: chapter. (line 2202)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter. (line 2202)
+* 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)
* followed: chapter. (line 313)
* followed <1>: chapter. (line 641)
* followed <2>: chapter. (line 983)
* followed <3>: chapter. (line 1311)
-* followed <4>: chapter. (line 1788)
-* followed <5>: chapter. (line 2151)
+* followed <4>: chapter. (line 1789)
+* followed <5>: chapter. (line 2152)
* I: chapter. (line 301)
* I <1>: chapter. (line 323)
* I <2>: chapter. (line 971)
* I <3>: chapter. (line 993)
-* I <4>: chapter. (line 1776)
-* I <5>: chapter. (line 1799)
+* I <4>: chapter. (line 1777)
+* I <5>: chapter. (line 1800)
* id i ule: chapter. (line 307)
* id i ule <1>: chapter. (line 977)
-* id i ule <2>: chapter. (line 1782)
+* id i ule <2>: chapter. (line 1783)
* id ule: chapter. (line 306)
* id ule <1>: chapter. (line 976)
-* id ule <2>: chapter. (line 1781)
+* id ule <2>: chapter. (line 1782)
* INVALID: chapter. (line 645)
* INVALID <1>: chapter. (line 1315)
-* INVALID <2>: chapter. (line 2155)
+* INVALID <2>: chapter. (line 2156)
* log trap: chapter. (line 303)
* log trap <1>: chapter. (line 973)
-* log trap <2>: chapter. (line 1778)
+* log trap <2>: chapter. (line 1779)
* log trap1: chapter. (line 304)
* log trap1 <1>: chapter. (line 974)
-* log trap1 <2>: chapter. (line 1779)
+* log trap1 <2>: chapter. (line 1780)
* log trap2: chapter. (line 305)
* log trap2 <1>: chapter. (line 975)
-* log trap2 <2>: chapter. (line 1780)
+* log trap2 <2>: chapter. (line 1781)
* machin: chapter. (line 309)
* machin <1>: chapter. (line 311)
* machin <2>: chapter. (line 637)
@@ -3589,50 +3590,50 @@ chapter 2
* machin <9>: chapter. (line 1308)
* machin <10>: chapter. (line 1309)
* machin <11>: chapter. (line 1310)
-* machin <12>: chapter. (line 1784)
-* machin <13>: chapter. (line 1786)
-* machin <14>: chapter. (line 2147)
-* machin <15>: chapter. (line 2148)
-* machin <16>: chapter. (line 2149)
-* machin <17>: chapter. (line 2150)
+* 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)
* 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 1807)
-* n--ame <5>: chapter. (line 1810)
+* n--ame <4>: chapter. (line 1808)
+* n--ame <5>: chapter. (line 1811)
* name2: chapter. (line 408)
* name2 <1>: chapter. (line 1078)
-* name2 <2>: chapter. (line 1886)
-* t--ruc: chapter. (line 2202)
-* T--ruc: chapter. (line 2202)
+* name2 <2>: chapter. (line 1887)
+* t--ruc: chapter. (line 2203)
+* T--ruc: chapter. (line 2203)
* truc: chapter. (line 302)
* truc <1>: chapter. (line 324)
* truc <2>: chapter. (line 972)
* truc <3>: chapter. (line 994)
-* truc <4>: chapter. (line 1777)
-* truc <5>: chapter. (line 1800)
-* xxx, zzz: chapter. (line 2202)
+* truc <4>: chapter. (line 1778)
+* truc <5>: chapter. (line 1801)
+* xxx, zzz: chapter. (line 2203)
Tag Table:
-Node: Top19018
-Node: chapter19203
-Ref: chapter-Footnote-198991
-Ref: chapter-Footnote-299011
-Ref: chapter-Footnote-399032
-Ref: chapter-Footnote-499052
-Ref: chapter-Footnote-599073
-Ref: chapter-Footnote-699093
-Ref: chapter-Footnote-799114
-Ref: chapter-Footnote-899152
-Node: s--ect,ion99172
-Node: subsection99375
-Ref: anchor99556
-Node: subsubsection ``simple-double--99556
-Node: subsubsection three---four----''99756
-Node: chapter299928
+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
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 ab4db36bce..7799561d8d 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
@@ -30,7 +30,7 @@ kbd: '``simple-double--three---four----'''
@*
@ followed by a space @ followed by a tab @ followed by a new line
- '@-' '@:' '@!' ! '@?' ? '@.' . '@@' @ '@}' } '@{' { '@/'
+ '@-' '@:' '@!' ! '@?' ? '@.' . '@&' & '@@' @ '@}' } '@{' { '@/'
foo vs. bar. colon :And something else. semi colon ;. And ? ?.
Now ! !@ but , ,
@@ -752,7 +752,7 @@ kbd: '``simple-double--three---four----'''
@*
@ followed by a space @ followed by a tab @ followed by a new line
- '@-' '@:' '@!' ! '@?' ? '@.' . '@@' @ '@}' } '@{' { '@/'
+ '@-' '@:' '@!' ! '@?' ? '@.' . '@&' & '@@' @ '@}' } '@{' { '@/'
foo vs. bar. colon :And something else. semi colon ;. And ? ?.
Now ! !@ but , ,
@@ -1431,7 +1431,7 @@ kbd: '``simple-double--three---four----'''
@*
@ followed by a space @ followed by a tab @ followed by a new line
- '@-' '@:' '@!' ! '@?' ? '@.' . '@@' @ '@}' } '@{' { '@/'
+ '@-' '@:' '@!' ! '@?' ? '@.' . '@&' & '@@' @ '@}' } '@{' { '@/'
foo vs. bar. colon :And something else. semi colon ;. And ? ?.
Now ! !@ but , ,
@@ -2159,6 +2159,7 @@ cross ref name: (file name). '@inforef{}' *note ::
@! !
@? ?
@. .
+ @& &
@@ @
@} }
@{ {
@@ -2942,14 +2943,14 @@ aaa" ]
[index ]
* Menu:
-* truc: chapter. (line 2204)
+* truc: chapter. (line 2205)
codeidx
[index ]
* Menu:
-* a INDEX---ENTRY te~ --- i^: chapter. (line 2204)
+* a INDEX---ENTRY te~ --- i^: chapter. (line 2205)
cp
@@ -2962,111 +2963,111 @@ aaa" ]
* -option: chapter. (line 28)
* -option <1>: chapter. (line 699)
* -option <2>: chapter. (line 1381)
-* .: chapter. (line 2204)
-* ?: chapter. (line 2204)
-* a: chapter. (line 2204)
-* aaa, bbb: chapter. (line 2204)
-* a--a: chapter. (line 2204)
+* .: chapter. (line 2205)
+* ?: chapter. (line 2205)
+* a: chapter. (line 2205)
+* aaa, bbb: chapter. (line 2205)
+* a--a: chapter. (line 2205)
* a--asis: chapter. (line 511)
* a--asis <1>: chapter. (line 1182)
-* a--asis <2>: chapter. (line 1989)
+* a--asis <2>: chapter. (line 1990)
* b: chapter. (line 512)
* b <1>: chapter. (line 1183)
-* b <2>: chapter. (line 1990)
-* b--b, c--c: chapter. (line 2204)
+* b <2>: chapter. (line 1991)
+* b--b, c--c: chapter. (line 2205)
* counting entry: chapter. (line 4)
-* d--dd, e--ee, f--ff: chapter. (line 2204)
+* d--dd, e--ee, f--ff: chapter. (line 2205)
* 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 1830)
-* d--efcv_name <5>: chapter. (line 1833)
+* d--efcv_name <4>: chapter. (line 1831)
+* d--efcv_name <5>: chapter. (line 1834)
* 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 1875)
+* d--efivar_name of c--lass <2>: chapter. (line 1876)
* d--efopt_name: chapter. (line 388)
* d--efopt_name <1>: chapter. (line 1059)
-* d--efopt_name <2>: chapter. (line 1866)
+* d--efopt_name <2>: chapter. (line 1867)
* 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 1836)
-* d--eftypecv_name of c--lass <5>: chapter. (line 1839)
+* d--eftypecv_name of c--lass <4>: chapter. (line 1837)
+* d--eftypecv_name of c--lass <5>: chapter. (line 1840)
* 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 1908)
-* d--eftypecv_name2 of c--lass2 <5>: chapter. (line 1911)
+* d--eftypecv_name2 of c--lass2 <4>: chapter. (line 1909)
+* d--eftypecv_name2 of c--lass2 <5>: chapter. (line 1912)
* 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 1878)
+* d--eftypeivar_name of c--lass <2>: chapter. (line 1879)
* d--eftypevar_name: chapter. (line 394)
* d--eftypevar_name <1>: chapter. (line 1065)
-* d--eftypevar_name <2>: chapter. (line 1872)
+* d--eftypevar_name <2>: chapter. (line 1873)
* d--eftypevr_name: chapter. (line 349)
* d--eftypevr_name <1>: chapter. (line 1020)
-* d--eftypevr_name <2>: chapter. (line 1827)
+* d--eftypevr_name <2>: chapter. (line 1828)
* 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 1860)
-* d--efvar_name <5>: chapter. (line 1863)
+* d--efvar_name <4>: chapter. (line 1861)
+* d--efvar_name <5>: chapter. (line 1864)
* d--efvr_name: chapter. (line 328)
* d--efvr_name <1>: chapter. (line 999)
-* d--efvr_name <2>: chapter. (line 1806)
-* g--gg, h--hh jjj, k--kk, l--ll: chapter. (line 2204)
+* d--efvr_name <2>: chapter. (line 1807)
+* g--gg, h--hh jjj, k--kk, l--ll: chapter. (line 2205)
* 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 1994)
-* index entry between item and itemx <5>: chapter. (line 2145)
+* 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 4)
* index entry within deffn: chapter. (line 303)
* index entry within deffn <1>: chapter. (line 974)
-* index entry within deffn <2>: chapter. (line 1779)
+* index entry within deffn <2>: chapter. (line 1780)
* index entry within itemize: chapter. (line 214)
* index entry within itemize <1>: chapter. (line 885)
-* index entry within itemize <2>: chapter. (line 1690)
+* index entry within itemize <2>: chapter. (line 1691)
* index entry within multitable: chapter. (line 236)
* index entry within multitable <1>: chapter. (line 907)
-* index entry within multitable <2>: chapter. (line 1713)
-* t-ruc: chapter. (line 2204)
-* T-ruc: chapter. (line 2204)
+* index entry within multitable <2>: chapter. (line 1714)
+* t-ruc: chapter. (line 2205)
+* T-ruc: chapter. (line 2205)
* 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 1613)
+* vtable i--tem code kbdinputstyle <2>: chapter. (line 1614)
* 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 1608)
+* vtable i--tem default kbdinputstyle <2>: chapter. (line 1609)
* 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 1623)
+* vtable i--tem distinct kbdinputstyle <2>: chapter. (line 1624)
* 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 1618)
+* vtable i--tem example kbdinputstyle <2>: chapter. (line 1619)
* 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 1615)
+* vtable i--tem in example code kbdinputstyle <2>: chapter. (line 1616)
* vtable i--tem in example default kbdinputstyle: chapter. (line 135)
* vtable i--tem in example default kbdinputstyle <1>: chapter.
(line 806)
* vtable i--tem in example default kbdinputstyle <2>: chapter.
- (line 1610)
+ (line 1611)
* vtable i--tem in example distinct kbdinputstyle: chapter. (line 150)
* vtable i--tem in example distinct kbdinputstyle <1>: chapter.
(line 821)
* vtable i--tem in example distinct kbdinputstyle <2>: chapter.
- (line 1625)
+ (line 1626)
* vtable i--tem in example example kbdinputstyle: chapter. (line 145)
* vtable i--tem in example example kbdinputstyle <1>: chapter.
(line 816)
* vtable i--tem in example example kbdinputstyle <2>: chapter.
- (line 1620)
+ (line 1621)
fn
@@ -3076,8 +3077,8 @@ aaa" ]
* --foption: chapter. (line 28)
* --foption <1>: chapter. (line 699)
* --foption <2>: chapter. (line 1381)
-* .: chapter. (line 2204)
-* ?: chapter. (line 2204)
+* .: chapter. (line 2205)
+* ?: chapter. (line 2205)
* ``: chapter. (line 28)
* `` <1>: chapter. (line 699)
* `` <2>: chapter. (line 1381)
@@ -3087,122 +3088,122 @@ aaa" ]
* a <3>: chapter. (line 987)
* a <4>: chapter. (line 1186)
* a <5>: chapter. (line 1304)
-* a <6>: chapter. (line 1792)
-* a <7>: chapter. (line 1993)
-* a <8>: chapter. (line 2144)
-* a <9>: chapter. (line 2204)
+* 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 2155)
+* after <2>: chapter. (line 2156)
* arg2: chapter. (line 435)
* arg2 <1>: chapter. (line 1106)
-* arg2 <2>: chapter. (line 1915)
+* arg2 <2>: chapter. (line 1916)
* b: chapter. (line 516)
* b <1>: chapter. (line 634)
* b <2>: chapter. (line 1187)
* b <3>: chapter. (line 1305)
-* b <4>: chapter. (line 1994)
-* b <5>: chapter. (line 2145)
+* b <4>: chapter. (line 1995)
+* b <5>: chapter. (line 2146)
* bidule machin: chapter. (line 311)
* bidule machin <1>: chapter. (line 982)
-* bidule machin <2>: chapter. (line 1787)
+* bidule machin <2>: chapter. (line 1788)
* d--effn_name: chapter. (line 295)
* d--effn_name <1>: chapter. (line 966)
-* d--effn_name <2>: chapter. (line 1771)
+* d--effn_name <2>: chapter. (line 1772)
* d--efmac_name: chapter. (line 376)
* d--efmac_name <1>: chapter. (line 1047)
-* d--efmac_name <2>: chapter. (line 1854)
+* d--efmac_name <2>: chapter. (line 1855)
* 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 1881)
+* d--efmethod_name on c--lass <2>: chapter. (line 1882)
* 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 1842)
-* d--efop_name on c--lass <5>: chapter. (line 1845)
+* d--efop_name on c--lass <4>: chapter. (line 1843)
+* d--efop_name on c--lass <5>: chapter. (line 1846)
* d--efspec_name: chapter. (line 379)
* d--efspec_name <1>: chapter. (line 1050)
-* d--efspec_name <2>: chapter. (line 1857)
+* d--efspec_name <2>: chapter. (line 1858)
* 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 1815)
-* d--eftypefn_name <5>: chapter. (line 1818)
+* d--eftypefn_name <4>: chapter. (line 1816)
+* d--eftypefn_name <5>: chapter. (line 1819)
* d--eftypefn_name2: chapter. (line 414)
* d--eftypefn_name2 <1>: chapter. (line 1085)
-* d--eftypefn_name2 <2>: chapter. (line 1893)
+* d--eftypefn_name2 <2>: chapter. (line 1894)
* d--eftypefun_name: chapter. (line 391)
* d--eftypefun_name <1>: chapter. (line 1062)
-* d--eftypefun_name <2>: chapter. (line 1869)
+* d--eftypefun_name <2>: chapter. (line 1870)
* 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 1884)
+* d--eftypemethod_name on c--lass <2>: chapter. (line 1885)
* 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 1821)
-* d--eftypeop_name on c--lass <5>: chapter. (line 1824)
+* d--eftypeop_name on c--lass <4>: chapter. (line 1822)
+* d--eftypeop_name on c--lass <5>: chapter. (line 1825)
* 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 1898)
-* d--eftypeop_name2 on c--lass2 <5>: chapter. (line 1903)
+* d--eftypeop_name2 on c--lass2 <4>: chapter. (line 1899)
+* d--eftypeop_name2 on c--lass2 <5>: chapter. (line 1904)
* d--efun_name: chapter. (line 373)
* d--efun_name <1>: chapter. (line 1044)
-* d--efun_name <2>: chapter. (line 1851)
+* d--efun_name <2>: chapter. (line 1852)
* de--ffn_name: chapter. (line 298)
* de--ffn_name <1>: chapter. (line 969)
-* de--ffn_name <2>: chapter. (line 1774)
+* de--ffn_name <2>: chapter. (line 1775)
* deffn: chapter. (line 319)
* deffn <1>: chapter. (line 321)
* deffn <2>: chapter. (line 990)
* deffn <3>: chapter. (line 992)
-* deffn <4>: chapter. (line 1796)
-* deffn <5>: chapter. (line 1798)
+* deffn <4>: chapter. (line 1797)
+* deffn <5>: chapter. (line 1799)
* deffnx: chapter. (line 317)
* deffnx <1>: chapter. (line 322)
* deffnx <2>: chapter. (line 988)
* deffnx <3>: chapter. (line 993)
-* deffnx <4>: chapter. (line 1793)
-* deffnx <5>: chapter. (line 1799)
-* f---aa: chapter. (line 2204)
-* f---bb, f---cc: chapter. (line 2204)
-* f---ddd, f---eee, ffff: chapter. (line 2204)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter. (line 2204)
+* 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)
* followed: chapter. (line 314)
* followed <1>: chapter. (line 642)
* followed <2>: chapter. (line 985)
* followed <3>: chapter. (line 1313)
-* followed <4>: chapter. (line 1790)
-* followed <5>: chapter. (line 2153)
+* followed <4>: chapter. (line 1791)
+* followed <5>: chapter. (line 2154)
* I: chapter. (line 302)
* I <1>: chapter. (line 324)
* I <2>: chapter. (line 973)
* I <3>: chapter. (line 995)
-* I <4>: chapter. (line 1778)
-* I <5>: chapter. (line 1801)
+* I <4>: chapter. (line 1779)
+* I <5>: chapter. (line 1802)
* id i ule: chapter. (line 308)
* id i ule <1>: chapter. (line 979)
-* id i ule <2>: chapter. (line 1784)
+* id i ule <2>: chapter. (line 1785)
* id ule: chapter. (line 307)
* id ule <1>: chapter. (line 978)
-* id ule <2>: chapter. (line 1783)
+* id ule <2>: chapter. (line 1784)
* INVALID: chapter. (line 646)
* INVALID <1>: chapter. (line 1317)
-* INVALID <2>: chapter. (line 2157)
+* INVALID <2>: chapter. (line 2158)
* log trap: chapter. (line 304)
* log trap <1>: chapter. (line 975)
-* log trap <2>: chapter. (line 1780)
+* log trap <2>: chapter. (line 1781)
* log trap1: chapter. (line 305)
* log trap1 <1>: chapter. (line 976)
-* log trap1 <2>: chapter. (line 1781)
+* log trap1 <2>: chapter. (line 1782)
* log trap2: chapter. (line 306)
* log trap2 <1>: chapter. (line 977)
-* log trap2 <2>: chapter. (line 1782)
+* log trap2 <2>: chapter. (line 1783)
* machin: chapter. (line 310)
* machin <1>: chapter. (line 312)
* machin <2>: chapter. (line 638)
@@ -3215,30 +3216,30 @@ aaa" ]
* machin <9>: chapter. (line 1310)
* machin <10>: chapter. (line 1311)
* machin <11>: chapter. (line 1312)
-* machin <12>: chapter. (line 1786)
-* machin <13>: chapter. (line 1788)
-* machin <14>: chapter. (line 2149)
-* machin <15>: chapter. (line 2150)
-* machin <16>: chapter. (line 2151)
-* machin <17>: chapter. (line 2152)
+* 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)
* 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 1809)
-* n--ame <5>: chapter. (line 1812)
+* n--ame <4>: chapter. (line 1810)
+* n--ame <5>: chapter. (line 1813)
* name2: chapter. (line 409)
* name2 <1>: chapter. (line 1080)
-* name2 <2>: chapter. (line 1888)
-* t--ruc: chapter. (line 2204)
-* T--ruc: chapter. (line 2204)
+* name2 <2>: chapter. (line 1889)
+* t--ruc: chapter. (line 2205)
+* T--ruc: chapter. (line 2205)
* truc: chapter. (line 303)
* truc <1>: chapter. (line 325)
* truc <2>: chapter. (line 974)
* truc <3>: chapter. (line 996)
-* truc <4>: chapter. (line 1779)
-* truc <5>: chapter. (line 1802)
-* xxx, zzz: chapter. (line 2204)
+* truc <4>: chapter. (line 1780)
+* truc <5>: chapter. (line 1803)
+* xxx, zzz: chapter. (line 2205)
vr
@@ -3253,7 +3254,7 @@ aaa" ]
* d--eftp_name: chapter. (line 370)
* d--eftp_name <1>: chapter. (line 1041)
-* d--eftp_name <2>: chapter. (line 1848)
+* d--eftp_name <2>: chapter. (line 1849)
(8)
@@ -3341,111 +3342,111 @@ chapter 2
* -option: chapter. (line 28)
* -option <1>: chapter. (line 699)
* -option <2>: chapter. (line 1381)
-* .: chapter. (line 2204)
-* ?: chapter. (line 2204)
-* a: chapter. (line 2204)
-* aaa, bbb: chapter. (line 2204)
-* a--a: chapter. (line 2204)
+* .: chapter. (line 2205)
+* ?: chapter. (line 2205)
+* a: chapter. (line 2205)
+* aaa, bbb: chapter. (line 2205)
+* a--a: chapter. (line 2205)
* a--asis: chapter. (line 511)
* a--asis <1>: chapter. (line 1182)
-* a--asis <2>: chapter. (line 1989)
+* a--asis <2>: chapter. (line 1990)
* b: chapter. (line 512)
* b <1>: chapter. (line 1183)
-* b <2>: chapter. (line 1990)
-* b--b, c--c: chapter. (line 2204)
-* counting entry: chapter. (line 2554)
-* d--dd, e--ee, f--ff: chapter. (line 2204)
+* 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)
* 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 1830)
-* d--efcv_name <5>: chapter. (line 1833)
+* d--efcv_name <4>: chapter. (line 1831)
+* d--efcv_name <5>: chapter. (line 1834)
* 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 1875)
+* d--efivar_name of c--lass <2>: chapter. (line 1876)
* d--efopt_name: chapter. (line 388)
* d--efopt_name <1>: chapter. (line 1059)
-* d--efopt_name <2>: chapter. (line 1866)
+* d--efopt_name <2>: chapter. (line 1867)
* 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 1836)
-* d--eftypecv_name of c--lass <5>: chapter. (line 1839)
+* d--eftypecv_name of c--lass <4>: chapter. (line 1837)
+* d--eftypecv_name of c--lass <5>: chapter. (line 1840)
* 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 1908)
-* d--eftypecv_name2 of c--lass2 <5>: chapter. (line 1911)
+* d--eftypecv_name2 of c--lass2 <4>: chapter. (line 1909)
+* d--eftypecv_name2 of c--lass2 <5>: chapter. (line 1912)
* 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 1878)
+* d--eftypeivar_name of c--lass <2>: chapter. (line 1879)
* d--eftypevar_name: chapter. (line 394)
* d--eftypevar_name <1>: chapter. (line 1065)
-* d--eftypevar_name <2>: chapter. (line 1872)
+* d--eftypevar_name <2>: chapter. (line 1873)
* d--eftypevr_name: chapter. (line 349)
* d--eftypevr_name <1>: chapter. (line 1020)
-* d--eftypevr_name <2>: chapter. (line 1827)
+* d--eftypevr_name <2>: chapter. (line 1828)
* 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 1860)
-* d--efvar_name <5>: chapter. (line 1863)
+* d--efvar_name <4>: chapter. (line 1861)
+* d--efvar_name <5>: chapter. (line 1864)
* d--efvr_name: chapter. (line 328)
* d--efvr_name <1>: chapter. (line 999)
-* d--efvr_name <2>: chapter. (line 1806)
-* g--gg, h--hh jjj, k--kk, l--ll: chapter. (line 2204)
+* d--efvr_name <2>: chapter. (line 1807)
+* g--gg, h--hh jjj, k--kk, l--ll: chapter. (line 2205)
* 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 1994)
-* index entry between item and itemx <5>: chapter. (line 2145)
-* index entry in footnote: chapter. (line 2549)
+* 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 within deffn: chapter. (line 303)
* index entry within deffn <1>: chapter. (line 974)
-* index entry within deffn <2>: chapter. (line 1779)
+* index entry within deffn <2>: chapter. (line 1780)
* index entry within itemize: chapter. (line 214)
* index entry within itemize <1>: chapter. (line 885)
-* index entry within itemize <2>: chapter. (line 1690)
+* index entry within itemize <2>: chapter. (line 1691)
* index entry within multitable: chapter. (line 236)
* index entry within multitable <1>: chapter. (line 907)
-* index entry within multitable <2>: chapter. (line 1713)
-* t-ruc: chapter. (line 2204)
-* T-ruc: chapter. (line 2204)
+* index entry within multitable <2>: chapter. (line 1714)
+* t-ruc: chapter. (line 2205)
+* T-ruc: chapter. (line 2205)
* 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 1613)
+* vtable i--tem code kbdinputstyle <2>: chapter. (line 1614)
* 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 1608)
+* vtable i--tem default kbdinputstyle <2>: chapter. (line 1609)
* 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 1623)
+* vtable i--tem distinct kbdinputstyle <2>: chapter. (line 1624)
* 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 1618)
+* vtable i--tem example kbdinputstyle <2>: chapter. (line 1619)
* 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 1615)
+* vtable i--tem in example code kbdinputstyle <2>: chapter. (line 1616)
* vtable i--tem in example default kbdinputstyle: chapter. (line 135)
* vtable i--tem in example default kbdinputstyle <1>: chapter.
(line 806)
* vtable i--tem in example default kbdinputstyle <2>: chapter.
- (line 1610)
+ (line 1611)
* vtable i--tem in example distinct kbdinputstyle: chapter. (line 150)
* vtable i--tem in example distinct kbdinputstyle <1>: chapter.
(line 821)
* vtable i--tem in example distinct kbdinputstyle <2>: chapter.
- (line 1625)
+ (line 1626)
* vtable i--tem in example example kbdinputstyle: chapter. (line 145)
* vtable i--tem in example example kbdinputstyle <1>: chapter.
(line 816)
* vtable i--tem in example example kbdinputstyle <2>: chapter.
- (line 1620)
+ (line 1621)
[index ]
* Menu:
@@ -3453,8 +3454,8 @@ chapter 2
* --foption: chapter. (line 28)
* --foption <1>: chapter. (line 699)
* --foption <2>: chapter. (line 1381)
-* .: chapter. (line 2204)
-* ?: chapter. (line 2204)
+* .: chapter. (line 2205)
+* ?: chapter. (line 2205)
* ``: chapter. (line 28)
* `` <1>: chapter. (line 699)
* `` <2>: chapter. (line 1381)
@@ -3464,122 +3465,122 @@ chapter 2
* a <3>: chapter. (line 987)
* a <4>: chapter. (line 1186)
* a <5>: chapter. (line 1304)
-* a <6>: chapter. (line 1792)
-* a <7>: chapter. (line 1993)
-* a <8>: chapter. (line 2144)
-* a <9>: chapter. (line 2204)
+* 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 2155)
+* after <2>: chapter. (line 2156)
* arg2: chapter. (line 435)
* arg2 <1>: chapter. (line 1106)
-* arg2 <2>: chapter. (line 1915)
+* arg2 <2>: chapter. (line 1916)
* b: chapter. (line 516)
* b <1>: chapter. (line 634)
* b <2>: chapter. (line 1187)
* b <3>: chapter. (line 1305)
-* b <4>: chapter. (line 1994)
-* b <5>: chapter. (line 2145)
+* b <4>: chapter. (line 1995)
+* b <5>: chapter. (line 2146)
* bidule machin: chapter. (line 311)
* bidule machin <1>: chapter. (line 982)
-* bidule machin <2>: chapter. (line 1787)
+* bidule machin <2>: chapter. (line 1788)
* d--effn_name: chapter. (line 295)
* d--effn_name <1>: chapter. (line 966)
-* d--effn_name <2>: chapter. (line 1771)
+* d--effn_name <2>: chapter. (line 1772)
* d--efmac_name: chapter. (line 376)
* d--efmac_name <1>: chapter. (line 1047)
-* d--efmac_name <2>: chapter. (line 1854)
+* d--efmac_name <2>: chapter. (line 1855)
* 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 1881)
+* d--efmethod_name on c--lass <2>: chapter. (line 1882)
* 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 1842)
-* d--efop_name on c--lass <5>: chapter. (line 1845)
+* d--efop_name on c--lass <4>: chapter. (line 1843)
+* d--efop_name on c--lass <5>: chapter. (line 1846)
* d--efspec_name: chapter. (line 379)
* d--efspec_name <1>: chapter. (line 1050)
-* d--efspec_name <2>: chapter. (line 1857)
+* d--efspec_name <2>: chapter. (line 1858)
* 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 1815)
-* d--eftypefn_name <5>: chapter. (line 1818)
+* d--eftypefn_name <4>: chapter. (line 1816)
+* d--eftypefn_name <5>: chapter. (line 1819)
* d--eftypefn_name2: chapter. (line 414)
* d--eftypefn_name2 <1>: chapter. (line 1085)
-* d--eftypefn_name2 <2>: chapter. (line 1893)
+* d--eftypefn_name2 <2>: chapter. (line 1894)
* d--eftypefun_name: chapter. (line 391)
* d--eftypefun_name <1>: chapter. (line 1062)
-* d--eftypefun_name <2>: chapter. (line 1869)
+* d--eftypefun_name <2>: chapter. (line 1870)
* 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 1884)
+* d--eftypemethod_name on c--lass <2>: chapter. (line 1885)
* 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 1821)
-* d--eftypeop_name on c--lass <5>: chapter. (line 1824)
+* d--eftypeop_name on c--lass <4>: chapter. (line 1822)
+* d--eftypeop_name on c--lass <5>: chapter. (line 1825)
* 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 1898)
-* d--eftypeop_name2 on c--lass2 <5>: chapter. (line 1903)
+* d--eftypeop_name2 on c--lass2 <4>: chapter. (line 1899)
+* d--eftypeop_name2 on c--lass2 <5>: chapter. (line 1904)
* d--efun_name: chapter. (line 373)
* d--efun_name <1>: chapter. (line 1044)
-* d--efun_name <2>: chapter. (line 1851)
+* d--efun_name <2>: chapter. (line 1852)
* de--ffn_name: chapter. (line 298)
* de--ffn_name <1>: chapter. (line 969)
-* de--ffn_name <2>: chapter. (line 1774)
+* de--ffn_name <2>: chapter. (line 1775)
* deffn: chapter. (line 319)
* deffn <1>: chapter. (line 321)
* deffn <2>: chapter. (line 990)
* deffn <3>: chapter. (line 992)
-* deffn <4>: chapter. (line 1796)
-* deffn <5>: chapter. (line 1798)
+* deffn <4>: chapter. (line 1797)
+* deffn <5>: chapter. (line 1799)
* deffnx: chapter. (line 317)
* deffnx <1>: chapter. (line 322)
* deffnx <2>: chapter. (line 988)
* deffnx <3>: chapter. (line 993)
-* deffnx <4>: chapter. (line 1793)
-* deffnx <5>: chapter. (line 1799)
-* f---aa: chapter. (line 2204)
-* f---bb, f---cc: chapter. (line 2204)
-* f---ddd, f---eee, ffff: chapter. (line 2204)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter. (line 2204)
+* 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)
* followed: chapter. (line 314)
* followed <1>: chapter. (line 642)
* followed <2>: chapter. (line 985)
* followed <3>: chapter. (line 1313)
-* followed <4>: chapter. (line 1790)
-* followed <5>: chapter. (line 2153)
+* followed <4>: chapter. (line 1791)
+* followed <5>: chapter. (line 2154)
* I: chapter. (line 302)
* I <1>: chapter. (line 324)
* I <2>: chapter. (line 973)
* I <3>: chapter. (line 995)
-* I <4>: chapter. (line 1778)
-* I <5>: chapter. (line 1801)
+* I <4>: chapter. (line 1779)
+* I <5>: chapter. (line 1802)
* id i ule: chapter. (line 308)
* id i ule <1>: chapter. (line 979)
-* id i ule <2>: chapter. (line 1784)
+* id i ule <2>: chapter. (line 1785)
* id ule: chapter. (line 307)
* id ule <1>: chapter. (line 978)
-* id ule <2>: chapter. (line 1783)
+* id ule <2>: chapter. (line 1784)
* INVALID: chapter. (line 646)
* INVALID <1>: chapter. (line 1317)
-* INVALID <2>: chapter. (line 2157)
+* INVALID <2>: chapter. (line 2158)
* log trap: chapter. (line 304)
* log trap <1>: chapter. (line 975)
-* log trap <2>: chapter. (line 1780)
+* log trap <2>: chapter. (line 1781)
* log trap1: chapter. (line 305)
* log trap1 <1>: chapter. (line 976)
-* log trap1 <2>: chapter. (line 1781)
+* log trap1 <2>: chapter. (line 1782)
* log trap2: chapter. (line 306)
* log trap2 <1>: chapter. (line 977)
-* log trap2 <2>: chapter. (line 1782)
+* log trap2 <2>: chapter. (line 1783)
* machin: chapter. (line 310)
* machin <1>: chapter. (line 312)
* machin <2>: chapter. (line 638)
@@ -3592,50 +3593,50 @@ chapter 2
* machin <9>: chapter. (line 1310)
* machin <10>: chapter. (line 1311)
* machin <11>: chapter. (line 1312)
-* machin <12>: chapter. (line 1786)
-* machin <13>: chapter. (line 1788)
-* machin <14>: chapter. (line 2149)
-* machin <15>: chapter. (line 2150)
-* machin <16>: chapter. (line 2151)
-* machin <17>: chapter. (line 2152)
+* 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)
* 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 1809)
-* n--ame <5>: chapter. (line 1812)
+* n--ame <4>: chapter. (line 1810)
+* n--ame <5>: chapter. (line 1813)
* name2: chapter. (line 409)
* name2 <1>: chapter. (line 1080)
-* name2 <2>: chapter. (line 1888)
-* t--ruc: chapter. (line 2204)
-* T--ruc: chapter. (line 2204)
+* name2 <2>: chapter. (line 1889)
+* t--ruc: chapter. (line 2205)
+* T--ruc: chapter. (line 2205)
* truc: chapter. (line 303)
* truc <1>: chapter. (line 325)
* truc <2>: chapter. (line 974)
* truc <3>: chapter. (line 996)
-* truc <4>: chapter. (line 1779)
-* truc <5>: chapter. (line 1802)
-* xxx, zzz: chapter. (line 2204)
+* truc <4>: chapter. (line 1780)
+* truc <5>: chapter. (line 1803)
+* xxx, zzz: chapter. (line 2205)
Tag Table:
-Node: Top18981
-Node: chapter19166
-Ref: chapter-Footnote-198840
-Ref: chapter-Footnote-298860
-Ref: chapter-Footnote-398881
-Ref: chapter-Footnote-498901
-Ref: chapter-Footnote-598922
-Ref: chapter-Footnote-698942
-Ref: chapter-Footnote-798963
-Ref: chapter-Footnote-899001
-Node: s--ect,ion99021
-Node: subsection99224
-Ref: anchor99405
-Node: subsubsection ``simple-double--99405
-Node: subsubsection three---four----''99605
-Node: chapter299777
+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
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 1b0ec44087..ed33b5739c 100644
--- a/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
@@ -937,6 +938,7 @@ kbd: <kbd class="kbd" style="font-style:
oblique">``simple-double--three---four-
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -2024,6 +2026,7 @@ kbd: <kbd class="kbd" style="font-style:
oblique">``simple-double--three---four-
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -3168,6 +3171,7 @@ kbd: <kbd class="kbd" style="font-style:
oblique">``simple-double--three---four-
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -4253,6 +4257,7 @@ kbd: <kbd class="kbd" style="font-style:
oblique">``simple-double--three---four-
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -5344,6 +5349,7 @@ kbd: <kbd class="kbd" style="font-style:
oblique">``simple-double--three---four-
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
diff --git a/tp/tests/layout/res_parser/formatting_latex/formatting.tex
b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
index c2a2a3c931..e8df70304c 100644
--- a/tp/tests/layout/res_parser/formatting_latex/formatting.tex
+++ b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
@@ -198,6 +198,7 @@ kbd:
\Texinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{
\texttt{@!} \@!
\texttt{@?} \@?
\texttt{@.} \@.
+\texttt{@\&} \&
\texttt{@@} @
\texttt{@\}} \}
\texttt{@\{} \{
@@ -1860,6 +1861,7 @@ kbd:
\Texinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{
\texttt{@!} \@!
\texttt{@?} \@?
\texttt{@.} \@.
+\texttt{@\&} \&
\texttt{@@} @
\texttt{@\}} \}
\texttt{@\{} \{
@@ -3535,6 +3537,7 @@ kbd:
\Texinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{
\texttt{@!} \@!
\texttt{@?} \@?
\texttt{@.} \@.
+\texttt{@\&} \&
\texttt{@@} @
\texttt{@\}} \}
\texttt{@\{} \{
@@ -5193,6 +5196,7 @@ kbd:
\Texinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{
\texttt{@!} \@!
\texttt{@?} \@?
\texttt{@.} \@.
+\texttt{@\&} \&
\texttt{@@} @
\texttt{@\}} \}
\texttt{@\{} \{
@@ -6853,6 +6857,7 @@ kbd:\
\Texinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}
\texttt{@!}\ \@!
\texttt{@?}\ \@?
\texttt{@.}\ \@.
+\texttt{@\&}\ \&
\texttt{@@}\ @
\texttt{@\}}\ \}
\texttt{@\{}\ \{
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 4343766183..65c0dcf43c 100644
--- a/tp/tests/layout/res_parser/formatting_macro_expand/formatting.texi
+++ b/tp/tests/layout/res_parser/formatting_macro_expand/formatting.texi
@@ -90,6 +90,7 @@ kbd: @kbd{``simple-double--three---four----''} @*
@code{@@!} @!
@code{@@?} @?
@code{@@.} @.
+@code{@@&} @&
@code{@@@@} @@
@code{@@@}} @}
@code{@@@{} @{
@@ -1298,6 +1299,7 @@ kbd: @kbd{``simple-double--three---four----''} @*
@code{@@!} @!
@code{@@?} @?
@code{@@.} @.
+@code{@@&} @&
@code{@@@@} @@
@code{@@@}} @}
@code{@@@{} @{
@@ -2457,6 +2459,7 @@ kbd: @kbd{``simple-double--three---four----''} @*
@code{@@!} @!
@code{@@?} @?
@code{@@.} @.
+@code{@@&} @&
@code{@@@@} @@
@code{@@@}} @}
@code{@@@{} @{
@@ -3645,6 +3648,7 @@ kbd: @kbd{``simple-double--three---four----''} @*
@code{@@!} @!
@code{@@?} @?
@code{@@.} @.
+@code{@@&} @&
@code{@@@@} @@
@code{@@@}} @}
@code{@@@{} @{
@@ -4799,6 +4803,7 @@ kbd: @kbd{``simple-double--three---four----''} @*
@code{@@!} @!
@code{@@?} @?
@code{@@.} @.
+@code{@@&} @&
@code{@@@@} @@
@code{@@@}} @}
@code{@@@{} @{
diff --git a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
index 66f70bd259..238a1065fd 100644
--- a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
@@ -988,6 +989,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -2073,6 +2075,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -3215,6 +3218,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -4298,6 +4302,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -5387,6 +5392,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
diff --git a/tp/tests/layout/res_parser/formatting_nodes/anchor.html
b/tp/tests/layout/res_parser/formatting_nodes/anchor.html
index 0ae148e68e..ffdc6ad56a 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/anchor.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/anchor.html
@@ -82,6 +82,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
diff --git a/tp/tests/layout/res_parser/formatting_nodes/chapter.html
b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
index 62ffb2ba28..d4fbcc433f 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
@@ -994,6 +995,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -2079,6 +2081,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -3170,6 +3173,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
diff --git a/tp/tests/layout/res_parser/formatting_nodes/chapter2.html
b/tp/tests/layout/res_parser/formatting_nodes/chapter2.html
index a5f11d7d40..afa5d2c75e 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/chapter2.html
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 7d90b61199..7ec322572a 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 23a3962df8..36fb171474 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 35c239f00b..a4499ee743 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 8a25bbe233..1be2a726ef 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
diff --git a/tp/tests/layout/res_parser/formatting_nodes/index.html
b/tp/tests/layout/res_parser/formatting_nodes/index.html
index d9691b272b..a6a4036c4f 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/index.html
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
@@ -964,6 +965,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -2051,6 +2053,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
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 4b41913ce2..f330554f33 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
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
diff --git a/tp/tests/layout/res_parser/formatting_nodes/subsection.html
b/tp/tests/layout/res_parser/formatting_nodes/subsection.html
index 84e57f9009..ad82291b44 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/subsection.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/subsection.html
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 7d09a49830..559f0dda07 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
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 69bdf7331b..bb74ebded0 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
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 894a15539a..4483a50f82 100644
--- a/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
@@ -978,6 +979,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -2065,6 +2067,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -3209,6 +3212,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -4294,6 +4298,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -5385,6 +5390,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
diff --git a/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt
b/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt
index 12900e6177..e1067a497c 100644
--- a/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt
+++ b/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt
@@ -42,7 +42,7 @@ kbd: '``simple-double--three---four----'''
@*
@ followed by a space @ followed by a tab @ followed by a new line
- '@-' '@:' '@!' ! '@?' ? '@.' . '@@' @ '@}' } '@{' { '@/'
+ '@-' '@:' '@!' ! '@?' ? '@.' . '@&' & '@@' @ '@}' } '@{' { '@/'
foo vs. bar. colon :And something else. semi colon ;. And ? ?.
Now ! !@ but , ,
@@ -720,7 +720,7 @@ kbd: '``simple-double--three---four----'''
@*
@ followed by a space @ followed by a tab @ followed by a new line
- '@-' '@:' '@!' ! '@?' ? '@.' . '@@' @ '@}' } '@{' { '@/'
+ '@-' '@:' '@!' ! '@?' ? '@.' . '@&' & '@@' @ '@}' } '@{' { '@/'
foo vs. bar. colon :And something else. semi colon ;. And ? ?.
Now ! !@ but , ,
@@ -1448,6 +1448,7 @@ cross ref name: (file name). '@inforef{}' *note ::
@! !
@? ?
@. .
+ @& &
@@ @
@} }
@{ {
@@ -2230,13 +2231,13 @@ aaa
* Menu:
-* truc: chapter. (line 2226)
+* truc: chapter. (line 2227)
codeidx
* Menu:
-* a INDEX---ENTRY tẽ --- î: chapter. (line 2226)
+* a INDEX---ENTRY tẽ --- î: chapter. (line 2227)
cp
@@ -2248,111 +2249,111 @@ aaa
* -option: chapter. (line 28)
* -option <1>: chapter. (line 706)
* -option <2>: chapter. (line 1395)
-* .: chapter. (line 2226)
-* ?: chapter. (line 2226)
-* a: chapter. (line 2226)
-* aaa, bbb: chapter. (line 2226)
-* a--a: chapter. (line 2226)
+* .: chapter. (line 2227)
+* ?: chapter. (line 2227)
+* a: chapter. (line 2227)
+* aaa, bbb: chapter. (line 2227)
+* a--a: chapter. (line 2227)
* a--asis: chapter. (line 510)
* a--asis <1>: chapter. (line 1188)
-* a--asis <2>: chapter. (line 2003)
+* a--asis <2>: chapter. (line 2004)
* b: chapter. (line 511)
* b <1>: chapter. (line 1189)
-* b <2>: chapter. (line 2004)
-* b--b, c--c: chapter. (line 2226)
+* b <2>: chapter. (line 2005)
+* b--b, c--c: chapter. (line 2227)
* counting entry: chapter. (line 0)
-* d--dd, e--ee, f--ff: chapter. (line 2226)
+* d--dd, e--ee, f--ff: chapter. (line 2227)
* 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 1844)
-* d--efcv_name <5>: chapter. (line 1847)
+* d--efcv_name <4>: chapter. (line 1845)
+* d--efcv_name <5>: chapter. (line 1848)
* 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 1889)
+* d--efivar_name of c--lass <2>: chapter. (line 1890)
* d--efopt_name: chapter. (line 387)
* d--efopt_name <1>: chapter. (line 1065)
-* d--efopt_name <2>: chapter. (line 1880)
+* d--efopt_name <2>: chapter. (line 1881)
* 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 1850)
-* d--eftypecv_name of c--lass <5>: chapter. (line 1853)
+* d--eftypecv_name of c--lass <4>: chapter. (line 1851)
+* d--eftypecv_name of c--lass <5>: chapter. (line 1854)
* 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 1922)
-* d--eftypecv_name2 of c--lass2 <5>: chapter. (line 1925)
+* d--eftypecv_name2 of c--lass2 <4>: chapter. (line 1923)
+* d--eftypecv_name2 of c--lass2 <5>: chapter. (line 1926)
* 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 1892)
+* d--eftypeivar_name of c--lass <2>: chapter. (line 1893)
* d--eftypevar_name: chapter. (line 393)
* d--eftypevar_name <1>: chapter. (line 1071)
-* d--eftypevar_name <2>: chapter. (line 1886)
+* d--eftypevar_name <2>: chapter. (line 1887)
* d--eftypevr_name: chapter. (line 348)
* d--eftypevr_name <1>: chapter. (line 1026)
-* d--eftypevr_name <2>: chapter. (line 1841)
+* d--eftypevr_name <2>: chapter. (line 1842)
* 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 1874)
-* d--efvar_name <5>: chapter. (line 1877)
+* d--efvar_name <4>: chapter. (line 1875)
+* d--efvar_name <5>: chapter. (line 1878)
* d--efvr_name: chapter. (line 327)
* d--efvr_name <1>: chapter. (line 1005)
-* d--efvr_name <2>: chapter. (line 1820)
-* g--gg, h--hh jjj, k--kk, l--ll: chapter. (line 2226)
+* d--efvr_name <2>: chapter. (line 1821)
+* g--gg, h--hh jjj, k--kk, l--ll: chapter. (line 2227)
* 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 2008)
-* index entry between item and itemx <5>: chapter. (line 2167)
+* 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 0)
* index entry within deffn: chapter. (line 302)
* index entry within deffn <1>: chapter. (line 980)
-* index entry within deffn <2>: chapter. (line 1793)
+* index entry within deffn <2>: chapter. (line 1794)
* index entry within itemize: chapter. (line 213)
* index entry within itemize <1>: chapter. (line 891)
-* index entry within itemize <2>: chapter. (line 1704)
+* index entry within itemize <2>: chapter. (line 1705)
* index entry within multitable: chapter. (line 235)
* index entry within multitable <1>: chapter. (line 913)
-* index entry within multitable <2>: chapter. (line 1727)
-* t-ruc: chapter. (line 2226)
-* T-ruc: chapter. (line 2226)
+* index entry within multitable <2>: chapter. (line 1728)
+* t-ruc: chapter. (line 2227)
+* T-ruc: chapter. (line 2227)
* 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 1627)
+* vtable i--tem code kbdinputstyle <2>: chapter. (line 1628)
* 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 1622)
+* vtable i--tem default kbdinputstyle <2>: chapter. (line 1623)
* 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 1637)
+* vtable i--tem distinct kbdinputstyle <2>: chapter. (line 1638)
* 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 1632)
+* vtable i--tem example kbdinputstyle <2>: chapter. (line 1633)
* 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 1629)
+* vtable i--tem in example code kbdinputstyle <2>: chapter. (line 1630)
* vtable i--tem in example default kbdinputstyle: chapter. (line 134)
* vtable i--tem in example default kbdinputstyle <1>: chapter.
(line 812)
* vtable i--tem in example default kbdinputstyle <2>: chapter.
- (line 1624)
+ (line 1625)
* vtable i--tem in example distinct kbdinputstyle: chapter. (line 149)
* vtable i--tem in example distinct kbdinputstyle <1>: chapter.
(line 827)
* vtable i--tem in example distinct kbdinputstyle <2>: chapter.
- (line 1639)
+ (line 1640)
* vtable i--tem in example example kbdinputstyle: chapter. (line 144)
* vtable i--tem in example example kbdinputstyle <1>: chapter.
(line 822)
* vtable i--tem in example example kbdinputstyle <2>: chapter.
- (line 1634)
+ (line 1635)
fn
@@ -2361,8 +2362,8 @@ aaa
* --foption: chapter. (line 28)
* --foption <1>: chapter. (line 706)
* --foption <2>: chapter. (line 1395)
-* .: chapter. (line 2226)
-* ?: chapter. (line 2226)
+* .: chapter. (line 2227)
+* ?: chapter. (line 2227)
* ``: chapter. (line 28)
* `` <1>: chapter. (line 706)
* `` <2>: chapter. (line 1395)
@@ -2372,122 +2373,122 @@ aaa
* a <3>: chapter. (line 993)
* a <4>: chapter. (line 1192)
* a <5>: chapter. (line 1318)
-* a <6>: chapter. (line 1806)
-* a <7>: chapter. (line 2007)
-* a <8>: chapter. (line 2166)
-* a <9>: chapter. (line 2226)
+* 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 2177)
+* after <2>: chapter. (line 2178)
* arg2: chapter. (line 434)
* arg2 <1>: chapter. (line 1112)
-* arg2 <2>: chapter. (line 1929)
+* arg2 <2>: chapter. (line 1930)
* b: chapter. (line 515)
* b <1>: chapter. (line 641)
* b <2>: chapter. (line 1193)
* b <3>: chapter. (line 1319)
-* b <4>: chapter. (line 2008)
-* b <5>: chapter. (line 2167)
+* b <4>: chapter. (line 2009)
+* b <5>: chapter. (line 2168)
* bidule machin: chapter. (line 310)
* bidule machin <1>: chapter. (line 988)
-* bidule machin <2>: chapter. (line 1801)
+* bidule machin <2>: chapter. (line 1802)
* d--effn_name: chapter. (line 294)
* d--effn_name <1>: chapter. (line 972)
-* d--effn_name <2>: chapter. (line 1785)
+* d--effn_name <2>: chapter. (line 1786)
* d--efmac_name: chapter. (line 375)
* d--efmac_name <1>: chapter. (line 1053)
-* d--efmac_name <2>: chapter. (line 1868)
+* d--efmac_name <2>: chapter. (line 1869)
* 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 1895)
+* d--efmethod_name on c--lass <2>: chapter. (line 1896)
* 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 1856)
-* d--efop_name on c--lass <5>: chapter. (line 1859)
+* d--efop_name on c--lass <4>: chapter. (line 1857)
+* d--efop_name on c--lass <5>: chapter. (line 1860)
* d--efspec_name: chapter. (line 378)
* d--efspec_name <1>: chapter. (line 1056)
-* d--efspec_name <2>: chapter. (line 1871)
+* d--efspec_name <2>: chapter. (line 1872)
* 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 1829)
-* d--eftypefn_name <5>: chapter. (line 1832)
+* d--eftypefn_name <4>: chapter. (line 1830)
+* d--eftypefn_name <5>: chapter. (line 1833)
* d--eftypefn_name2: chapter. (line 413)
* d--eftypefn_name2 <1>: chapter. (line 1091)
-* d--eftypefn_name2 <2>: chapter. (line 1907)
+* d--eftypefn_name2 <2>: chapter. (line 1908)
* d--eftypefun_name: chapter. (line 390)
* d--eftypefun_name <1>: chapter. (line 1068)
-* d--eftypefun_name <2>: chapter. (line 1883)
+* d--eftypefun_name <2>: chapter. (line 1884)
* 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 1898)
+* d--eftypemethod_name on c--lass <2>: chapter. (line 1899)
* 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 1835)
-* d--eftypeop_name on c--lass <5>: chapter. (line 1838)
+* d--eftypeop_name on c--lass <4>: chapter. (line 1836)
+* d--eftypeop_name on c--lass <5>: chapter. (line 1839)
* 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 1912)
-* d--eftypeop_name2 on c--lass2 <5>: chapter. (line 1917)
+* d--eftypeop_name2 on c--lass2 <4>: chapter. (line 1913)
+* d--eftypeop_name2 on c--lass2 <5>: chapter. (line 1918)
* d--efun_name: chapter. (line 372)
* d--efun_name <1>: chapter. (line 1050)
-* d--efun_name <2>: chapter. (line 1865)
+* d--efun_name <2>: chapter. (line 1866)
* de--ffn_name: chapter. (line 297)
* de--ffn_name <1>: chapter. (line 975)
-* de--ffn_name <2>: chapter. (line 1788)
+* de--ffn_name <2>: chapter. (line 1789)
* deffn: chapter. (line 318)
* deffn <1>: chapter. (line 320)
* deffn <2>: chapter. (line 996)
* deffn <3>: chapter. (line 998)
-* deffn <4>: chapter. (line 1810)
-* deffn <5>: chapter. (line 1812)
+* deffn <4>: chapter. (line 1811)
+* deffn <5>: chapter. (line 1813)
* deffnx: chapter. (line 316)
* deffnx <1>: chapter. (line 321)
* deffnx <2>: chapter. (line 994)
* deffnx <3>: chapter. (line 999)
-* deffnx <4>: chapter. (line 1807)
-* deffnx <5>: chapter. (line 1813)
-* f---aa: chapter. (line 2226)
-* f---bb, f---cc: chapter. (line 2226)
-* f---ddd, f---eee, ffff: chapter. (line 2226)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter. (line 2226)
+* 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)
* followed: chapter. (line 313)
* followed <1>: chapter. (line 649)
* followed <2>: chapter. (line 991)
* followed <3>: chapter. (line 1327)
-* followed <4>: chapter. (line 1804)
-* followed <5>: chapter. (line 2175)
+* followed <4>: chapter. (line 1805)
+* followed <5>: chapter. (line 2176)
* I: chapter. (line 301)
* I <1>: chapter. (line 323)
* I <2>: chapter. (line 979)
* I <3>: chapter. (line 1001)
-* I <4>: chapter. (line 1792)
-* I <5>: chapter. (line 1815)
+* I <4>: chapter. (line 1793)
+* I <5>: chapter. (line 1816)
* id i ule: chapter. (line 307)
* id i ule <1>: chapter. (line 985)
-* id i ule <2>: chapter. (line 1798)
+* id i ule <2>: chapter. (line 1799)
* id ule: chapter. (line 306)
* id ule <1>: chapter. (line 984)
-* id ule <2>: chapter. (line 1797)
+* id ule <2>: chapter. (line 1798)
* INVALID: chapter. (line 653)
* INVALID <1>: chapter. (line 1331)
-* INVALID <2>: chapter. (line 2179)
+* INVALID <2>: chapter. (line 2180)
* log trap: chapter. (line 303)
* log trap <1>: chapter. (line 981)
-* log trap <2>: chapter. (line 1794)
+* log trap <2>: chapter. (line 1795)
* log trap1: chapter. (line 304)
* log trap1 <1>: chapter. (line 982)
-* log trap1 <2>: chapter. (line 1795)
+* log trap1 <2>: chapter. (line 1796)
* log trap2: chapter. (line 305)
* log trap2 <1>: chapter. (line 983)
-* log trap2 <2>: chapter. (line 1796)
+* log trap2 <2>: chapter. (line 1797)
* machin: chapter. (line 309)
* machin <1>: chapter. (line 311)
* machin <2>: chapter. (line 645)
@@ -2500,30 +2501,30 @@ aaa
* machin <9>: chapter. (line 1324)
* machin <10>: chapter. (line 1325)
* machin <11>: chapter. (line 1326)
-* machin <12>: chapter. (line 1800)
-* machin <13>: chapter. (line 1802)
-* machin <14>: chapter. (line 2171)
-* machin <15>: chapter. (line 2172)
-* machin <16>: chapter. (line 2173)
-* machin <17>: chapter. (line 2174)
+* 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)
* 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 1823)
-* n--ame <5>: chapter. (line 1826)
+* n--ame <4>: chapter. (line 1824)
+* n--ame <5>: chapter. (line 1827)
* name2: chapter. (line 408)
* name2 <1>: chapter. (line 1086)
-* name2 <2>: chapter. (line 1902)
-* t--ruc: chapter. (line 2226)
-* T--ruc: chapter. (line 2226)
+* name2 <2>: chapter. (line 1903)
+* t--ruc: chapter. (line 2227)
+* T--ruc: chapter. (line 2227)
* truc: chapter. (line 302)
* truc <1>: chapter. (line 324)
* truc <2>: chapter. (line 980)
* truc <3>: chapter. (line 1002)
-* truc <4>: chapter. (line 1793)
-* truc <5>: chapter. (line 1816)
-* xxx, zzz: chapter. (line 2226)
+* truc <4>: chapter. (line 1794)
+* truc <5>: chapter. (line 1817)
+* xxx, zzz: chapter. (line 2227)
vr
@@ -2537,7 +2538,7 @@ aaa
* d--eftp_name: chapter. (line 369)
* d--eftp_name <1>: chapter. (line 1047)
-* d--eftp_name <2>: chapter. (line 1862)
+* d--eftp_name <2>: chapter. (line 1863)
(8)
@@ -2587,119 +2588,119 @@ chapter 2
* -option: chapter. (line 28)
* -option <1>: chapter. (line 706)
* -option <2>: chapter. (line 1395)
-* .: chapter. (line 2226)
-* ?: chapter. (line 2226)
-* a: chapter. (line 2226)
-* aaa, bbb: chapter. (line 2226)
-* a--a: chapter. (line 2226)
+* .: chapter. (line 2227)
+* ?: chapter. (line 2227)
+* a: chapter. (line 2227)
+* aaa, bbb: chapter. (line 2227)
+* a--a: chapter. (line 2227)
* a--asis: chapter. (line 510)
* a--asis <1>: chapter. (line 1188)
-* a--asis <2>: chapter. (line 2003)
+* a--asis <2>: chapter. (line 2004)
* b: chapter. (line 511)
* b <1>: chapter. (line 1189)
-* b <2>: chapter. (line 2004)
-* b--b, c--c: chapter. (line 2226)
-* counting entry: chapter. (line 2563)
-* d--dd, e--ee, f--ff: chapter. (line 2226)
+* 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)
* 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 1844)
-* d--efcv_name <5>: chapter. (line 1847)
+* d--efcv_name <4>: chapter. (line 1845)
+* d--efcv_name <5>: chapter. (line 1848)
* 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 1889)
+* d--efivar_name of c--lass <2>: chapter. (line 1890)
* d--efopt_name: chapter. (line 387)
* d--efopt_name <1>: chapter. (line 1065)
-* d--efopt_name <2>: chapter. (line 1880)
+* d--efopt_name <2>: chapter. (line 1881)
* 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 1850)
-* d--eftypecv_name of c--lass <5>: chapter. (line 1853)
+* d--eftypecv_name of c--lass <4>: chapter. (line 1851)
+* d--eftypecv_name of c--lass <5>: chapter. (line 1854)
* 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 1922)
-* d--eftypecv_name2 of c--lass2 <5>: chapter. (line 1925)
+* d--eftypecv_name2 of c--lass2 <4>: chapter. (line 1923)
+* d--eftypecv_name2 of c--lass2 <5>: chapter. (line 1926)
* 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 1892)
+* d--eftypeivar_name of c--lass <2>: chapter. (line 1893)
* d--eftypevar_name: chapter. (line 393)
* d--eftypevar_name <1>: chapter. (line 1071)
-* d--eftypevar_name <2>: chapter. (line 1886)
+* d--eftypevar_name <2>: chapter. (line 1887)
* d--eftypevr_name: chapter. (line 348)
* d--eftypevr_name <1>: chapter. (line 1026)
-* d--eftypevr_name <2>: chapter. (line 1841)
+* d--eftypevr_name <2>: chapter. (line 1842)
* 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 1874)
-* d--efvar_name <5>: chapter. (line 1877)
+* d--efvar_name <4>: chapter. (line 1875)
+* d--efvar_name <5>: chapter. (line 1878)
* d--efvr_name: chapter. (line 327)
* d--efvr_name <1>: chapter. (line 1005)
-* d--efvr_name <2>: chapter. (line 1820)
-* g--gg, h--hh jjj, k--kk, l--ll: chapter. (line 2226)
+* d--efvr_name <2>: chapter. (line 1821)
+* g--gg, h--hh jjj, k--kk, l--ll: chapter. (line 2227)
* 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 2008)
-* index entry between item and itemx <5>: chapter. (line 2167)
-* index entry in footnote: chapter. (line 2558)
+* 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 within deffn: chapter. (line 302)
* index entry within deffn <1>: chapter. (line 980)
-* index entry within deffn <2>: chapter. (line 1793)
+* index entry within deffn <2>: chapter. (line 1794)
* index entry within itemize: chapter. (line 213)
* index entry within itemize <1>: chapter. (line 891)
-* index entry within itemize <2>: chapter. (line 1704)
+* index entry within itemize <2>: chapter. (line 1705)
* index entry within multitable: chapter. (line 235)
* index entry within multitable <1>: chapter. (line 913)
-* index entry within multitable <2>: chapter. (line 1727)
-* t-ruc: chapter. (line 2226)
-* T-ruc: chapter. (line 2226)
+* index entry within multitable <2>: chapter. (line 1728)
+* t-ruc: chapter. (line 2227)
+* T-ruc: chapter. (line 2227)
* 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 1627)
+* vtable i--tem code kbdinputstyle <2>: chapter. (line 1628)
* 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 1622)
+* vtable i--tem default kbdinputstyle <2>: chapter. (line 1623)
* 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 1637)
+* vtable i--tem distinct kbdinputstyle <2>: chapter. (line 1638)
* 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 1632)
+* vtable i--tem example kbdinputstyle <2>: chapter. (line 1633)
* 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 1629)
+* vtable i--tem in example code kbdinputstyle <2>: chapter. (line 1630)
* vtable i--tem in example default kbdinputstyle: chapter. (line 134)
* vtable i--tem in example default kbdinputstyle <1>: chapter.
(line 812)
* vtable i--tem in example default kbdinputstyle <2>: chapter.
- (line 1624)
+ (line 1625)
* vtable i--tem in example distinct kbdinputstyle: chapter. (line 149)
* vtable i--tem in example distinct kbdinputstyle <1>: chapter.
(line 827)
* vtable i--tem in example distinct kbdinputstyle <2>: chapter.
- (line 1639)
+ (line 1640)
* vtable i--tem in example example kbdinputstyle: chapter. (line 144)
* vtable i--tem in example example kbdinputstyle <1>: chapter.
(line 822)
* vtable i--tem in example example kbdinputstyle <2>: chapter.
- (line 1634)
+ (line 1635)
* Menu:
* --foption: chapter. (line 28)
* --foption <1>: chapter. (line 706)
* --foption <2>: chapter. (line 1395)
-* .: chapter. (line 2226)
-* ?: chapter. (line 2226)
+* .: chapter. (line 2227)
+* ?: chapter. (line 2227)
* ``: chapter. (line 28)
* `` <1>: chapter. (line 706)
* `` <2>: chapter. (line 1395)
@@ -2709,122 +2710,122 @@ chapter 2
* a <3>: chapter. (line 993)
* a <4>: chapter. (line 1192)
* a <5>: chapter. (line 1318)
-* a <6>: chapter. (line 1806)
-* a <7>: chapter. (line 2007)
-* a <8>: chapter. (line 2166)
-* a <9>: chapter. (line 2226)
+* 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 2177)
+* after <2>: chapter. (line 2178)
* arg2: chapter. (line 434)
* arg2 <1>: chapter. (line 1112)
-* arg2 <2>: chapter. (line 1929)
+* arg2 <2>: chapter. (line 1930)
* b: chapter. (line 515)
* b <1>: chapter. (line 641)
* b <2>: chapter. (line 1193)
* b <3>: chapter. (line 1319)
-* b <4>: chapter. (line 2008)
-* b <5>: chapter. (line 2167)
+* b <4>: chapter. (line 2009)
+* b <5>: chapter. (line 2168)
* bidule machin: chapter. (line 310)
* bidule machin <1>: chapter. (line 988)
-* bidule machin <2>: chapter. (line 1801)
+* bidule machin <2>: chapter. (line 1802)
* d--effn_name: chapter. (line 294)
* d--effn_name <1>: chapter. (line 972)
-* d--effn_name <2>: chapter. (line 1785)
+* d--effn_name <2>: chapter. (line 1786)
* d--efmac_name: chapter. (line 375)
* d--efmac_name <1>: chapter. (line 1053)
-* d--efmac_name <2>: chapter. (line 1868)
+* d--efmac_name <2>: chapter. (line 1869)
* 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 1895)
+* d--efmethod_name on c--lass <2>: chapter. (line 1896)
* 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 1856)
-* d--efop_name on c--lass <5>: chapter. (line 1859)
+* d--efop_name on c--lass <4>: chapter. (line 1857)
+* d--efop_name on c--lass <5>: chapter. (line 1860)
* d--efspec_name: chapter. (line 378)
* d--efspec_name <1>: chapter. (line 1056)
-* d--efspec_name <2>: chapter. (line 1871)
+* d--efspec_name <2>: chapter. (line 1872)
* 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 1829)
-* d--eftypefn_name <5>: chapter. (line 1832)
+* d--eftypefn_name <4>: chapter. (line 1830)
+* d--eftypefn_name <5>: chapter. (line 1833)
* d--eftypefn_name2: chapter. (line 413)
* d--eftypefn_name2 <1>: chapter. (line 1091)
-* d--eftypefn_name2 <2>: chapter. (line 1907)
+* d--eftypefn_name2 <2>: chapter. (line 1908)
* d--eftypefun_name: chapter. (line 390)
* d--eftypefun_name <1>: chapter. (line 1068)
-* d--eftypefun_name <2>: chapter. (line 1883)
+* d--eftypefun_name <2>: chapter. (line 1884)
* 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 1898)
+* d--eftypemethod_name on c--lass <2>: chapter. (line 1899)
* 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 1835)
-* d--eftypeop_name on c--lass <5>: chapter. (line 1838)
+* d--eftypeop_name on c--lass <4>: chapter. (line 1836)
+* d--eftypeop_name on c--lass <5>: chapter. (line 1839)
* 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 1912)
-* d--eftypeop_name2 on c--lass2 <5>: chapter. (line 1917)
+* d--eftypeop_name2 on c--lass2 <4>: chapter. (line 1913)
+* d--eftypeop_name2 on c--lass2 <5>: chapter. (line 1918)
* d--efun_name: chapter. (line 372)
* d--efun_name <1>: chapter. (line 1050)
-* d--efun_name <2>: chapter. (line 1865)
+* d--efun_name <2>: chapter. (line 1866)
* de--ffn_name: chapter. (line 297)
* de--ffn_name <1>: chapter. (line 975)
-* de--ffn_name <2>: chapter. (line 1788)
+* de--ffn_name <2>: chapter. (line 1789)
* deffn: chapter. (line 318)
* deffn <1>: chapter. (line 320)
* deffn <2>: chapter. (line 996)
* deffn <3>: chapter. (line 998)
-* deffn <4>: chapter. (line 1810)
-* deffn <5>: chapter. (line 1812)
+* deffn <4>: chapter. (line 1811)
+* deffn <5>: chapter. (line 1813)
* deffnx: chapter. (line 316)
* deffnx <1>: chapter. (line 321)
* deffnx <2>: chapter. (line 994)
* deffnx <3>: chapter. (line 999)
-* deffnx <4>: chapter. (line 1807)
-* deffnx <5>: chapter. (line 1813)
-* f---aa: chapter. (line 2226)
-* f---bb, f---cc: chapter. (line 2226)
-* f---ddd, f---eee, ffff: chapter. (line 2226)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter. (line 2226)
+* 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)
* followed: chapter. (line 313)
* followed <1>: chapter. (line 649)
* followed <2>: chapter. (line 991)
* followed <3>: chapter. (line 1327)
-* followed <4>: chapter. (line 1804)
-* followed <5>: chapter. (line 2175)
+* followed <4>: chapter. (line 1805)
+* followed <5>: chapter. (line 2176)
* I: chapter. (line 301)
* I <1>: chapter. (line 323)
* I <2>: chapter. (line 979)
* I <3>: chapter. (line 1001)
-* I <4>: chapter. (line 1792)
-* I <5>: chapter. (line 1815)
+* I <4>: chapter. (line 1793)
+* I <5>: chapter. (line 1816)
* id i ule: chapter. (line 307)
* id i ule <1>: chapter. (line 985)
-* id i ule <2>: chapter. (line 1798)
+* id i ule <2>: chapter. (line 1799)
* id ule: chapter. (line 306)
* id ule <1>: chapter. (line 984)
-* id ule <2>: chapter. (line 1797)
+* id ule <2>: chapter. (line 1798)
* INVALID: chapter. (line 653)
* INVALID <1>: chapter. (line 1331)
-* INVALID <2>: chapter. (line 2179)
+* INVALID <2>: chapter. (line 2180)
* log trap: chapter. (line 303)
* log trap <1>: chapter. (line 981)
-* log trap <2>: chapter. (line 1794)
+* log trap <2>: chapter. (line 1795)
* log trap1: chapter. (line 304)
* log trap1 <1>: chapter. (line 982)
-* log trap1 <2>: chapter. (line 1795)
+* log trap1 <2>: chapter. (line 1796)
* log trap2: chapter. (line 305)
* log trap2 <1>: chapter. (line 983)
-* log trap2 <2>: chapter. (line 1796)
+* log trap2 <2>: chapter. (line 1797)
* machin: chapter. (line 309)
* machin <1>: chapter. (line 311)
* machin <2>: chapter. (line 645)
@@ -2837,30 +2838,30 @@ chapter 2
* machin <9>: chapter. (line 1324)
* machin <10>: chapter. (line 1325)
* machin <11>: chapter. (line 1326)
-* machin <12>: chapter. (line 1800)
-* machin <13>: chapter. (line 1802)
-* machin <14>: chapter. (line 2171)
-* machin <15>: chapter. (line 2172)
-* machin <16>: chapter. (line 2173)
-* machin <17>: chapter. (line 2174)
+* 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)
* 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 1823)
-* n--ame <5>: chapter. (line 1826)
+* n--ame <4>: chapter. (line 1824)
+* n--ame <5>: chapter. (line 1827)
* name2: chapter. (line 408)
* name2 <1>: chapter. (line 1086)
-* name2 <2>: chapter. (line 1902)
-* t--ruc: chapter. (line 2226)
-* T--ruc: chapter. (line 2226)
+* name2 <2>: chapter. (line 1903)
+* t--ruc: chapter. (line 2227)
+* T--ruc: chapter. (line 2227)
* truc: chapter. (line 302)
* truc <1>: chapter. (line 324)
* truc <2>: chapter. (line 980)
* truc <3>: chapter. (line 1002)
-* truc <4>: chapter. (line 1793)
-* truc <5>: chapter. (line 1816)
-* xxx, zzz: chapter. (line 2226)
+* truc <4>: chapter. (line 1794)
+* truc <5>: chapter. (line 1817)
+* xxx, zzz: chapter. (line 2227)
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 b7a021e45d..68af98ebb9 100644
--- a/tp/tests/layout/res_parser/formatting_rawtext/formatting.txt
+++ b/tp/tests/layout/res_parser/formatting_rawtext/formatting.txt
@@ -111,6 +111,7 @@ kbd: ``simple-double--three---four----''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
@@ -952,6 +953,7 @@ kbd: ``simple-double--three---four----''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 5f548d529c..4b6d29d7f4 100644
--- a/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
+++ b/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
@@ -80,6 +80,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
@@ -974,6 +975,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -2060,6 +2062,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -3179,6 +3182,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -4269,6 +4273,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -5503,6 +5508,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
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 19591b5bf1..f2238f61a1 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
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
@@ -978,6 +979,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -2065,6 +2067,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -3209,6 +3212,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -4294,6 +4298,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -5385,6 +5390,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
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 87c31f0e8c..f255dd2652 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 @@
-1734 @chapter chapter
-1694 @top Top section
+1736 @chapter chapter
+1696 @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 24e8777bb1..38161bb67e 100644
--- a/tp/tests/layout/res_parser/formatting_textcontent/formatting
+++ b/tp/tests/layout/res_parser/formatting_textcontent/formatting
@@ -84,6 +84,7 @@ kbd: ``simple-double--three---four----''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
@@ -922,6 +923,7 @@ kbd: ``simple-double--three---four----''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
@@ -1782,6 +1784,7 @@ kbd: ``simple-double--three---four----''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
@@ -2615,6 +2618,7 @@ kbd: ``simple-double--three---four----''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 f69316ceb2..708cc190db 100644
--- a/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
@@ -978,6 +979,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -2065,6 +2067,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -3209,6 +3212,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -4294,6 +4298,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -5385,6 +5390,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
diff --git a/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
b/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
index 3cc19ddd02..48f93fd257 100644
--- a/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
@@ -978,6 +979,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br/>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -2065,6 +2067,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br/>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -3209,6 +3212,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br/>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -4294,6 +4298,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br/>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -5385,6 +5390,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
diff --git a/tp/tests/layout/res_parser/formatting_xml/formatting.xml
b/tp/tests/layout/res_parser/formatting_xml/formatting.xml
index 4057455427..5ee83c5343 100644
--- a/tp/tests/layout/res_parser/formatting_xml/formatting.xml
+++ b/tp/tests/layout/res_parser/formatting_xml/formatting.xml
@@ -93,6 +93,7 @@ kbd: @kbd{``simple-double--three---four----''} @*
@code{@@!} @!
@code{@@?} @?
@code{@@.} @.
+@code{@@&} @&
@code{@@@@} @@
@code{@@@}} @}
@code{@@@{} @{
@@ -1300,6 +1301,7 @@ kbd: <kbd>``simple-double--three---four----''</kbd>
&linebreak;
<code>&arobase;!</code> &eosexcl;
<code>&arobase;?</code> &eosquest;
<code>&arobase;.</code> &eosperiod;
+<code>&arobase;&</code> &symbol;
<code>&arobase;&arobase;</code> &arobase;
<code>&arobase;}</code> }
<code>&arobase;{</code> {
@@ -2449,6 +2451,7 @@ kbd: <kbd>``simple-double--three---four----''</kbd>
&linebreak;
<code>&arobase;!</code> &eosexcl;
<code>&arobase;?</code> &eosquest;
<code>&arobase;.</code> &eosperiod;
+<code>&arobase;&</code> &symbol;
<code>&arobase;&arobase;</code> &arobase;
<code>&arobase;}</code> }
<code>&arobase;{</code> {
@@ -3628,6 +3631,7 @@ kbd: <kbd>``simple-double--three---four----''</kbd>
&linebreak;
<code>&arobase;!</code> &eosexcl;
<code>&arobase;?</code> &eosquest;
<code>&arobase;.</code> &eosperiod;
+<code>&arobase;&</code> &symbol;
<code>&arobase;&arobase;</code> &arobase;
<code>&arobase;}</code> }
<code>&arobase;{</code> {
@@ -4772,6 +4776,7 @@ kbd: <kbd>``simple-double--three---four----''</kbd>
&linebreak;
<code>&arobase;!</code> &eosexcl;
<code>&arobase;?</code> &eosquest;
<code>&arobase;.</code> &eosperiod;
+<code>&arobase;&</code> &symbol;
<code>&arobase;&arobase;</code> &arobase;
<code>&arobase;}</code> }
<code>&arobase;{</code> {
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 50c1270562..1ff1c01852 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/anchor.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/anchor.html
@@ -82,6 +82,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 200b9a7fd6..aa92555eb1 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
@@ -1019,6 +1020,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -2240,6 +2242,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd> <br>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
@@ -3467,6 +3470,7 @@ kbd: <kbd
class="kbd">``simple-double--three---four----''</kbd>
<code class="code">@!</code> !
<code class="code">@?</code> ?
<code class="code">@.</code> .
+<code class="code">@&</code> &
<code class="code">@@</code> @
<code class="code">@}</code> }
<code class="code">@{</code> {
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 f1eda18fa5..a18f5af6cc 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/chapter2.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/chapter2.html
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 f11d5cfcad..40e0d5eb0c 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/index.htm
+++ b/tp/tests/tex_html/res_parser/formatting_singular/index.htm
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 afa9fffc31..be04d96152 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/index.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/index.html
@@ -82,6 +82,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 41f3032a6f..7d66cc62e1 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
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 eae5882679..bdb8bf3da8 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
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 5466eb1956..5ce86d0e7e 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
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 42826a2ff8..bddc574568 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
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 5be3763f81..5528b00906 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
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 cc6a0e7d21..20d52586fa 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/subsection.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/subsection.html
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 d92afb1e7a..6344100402 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
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
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 e202c1591b..e99e4e8189 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
@@ -81,6 +81,7 @@ kbd: ``simple-double-three-four-''
@! !
@? ?
@. .
+@& &
@@ @
@} }
@{ {
diff --git a/util/texinfo.dtd b/util/texinfo.dtd
index 583477dc96..9fa1b201f5 100644
--- a/util/texinfo.dtd
+++ b/util/texinfo.dtd
@@ -1474,8 +1474,9 @@ Use exactly what is on the XML specification
LibXML error: invalid redeclaration of predefined entity
<!ENTITY amp "&">
Use exactly what is on the XML specification
--->
<!ENTITY amp "&#38;">
+-->
+<!ENTITY ampsymbol "&"> <!-- same expansion as ampchar -->
<!ENTITY lsquo "‘">
<!ENTITY textlsquo "‘">
<!ENTITY rsquo "’">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/Convert/TexinfoMarkup.pm (%no_arg_commands_formatting), util/texinfo.dtd: use &symbol; for @& to avoid using the & entity already used for & in text in XML. &symbol; ultimately maps to & in DTD.,
Patrice Dumas <=