texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: tp/tests/coverage_macro.texi: add @itemize @w{}


From: Patrice Dumas
Subject: branch master updated: tp/tests/coverage_macro.texi: add @itemize @w{}
Date: Tue, 04 Jan 2022 09:45:21 -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 b092210469 tp/tests/coverage_macro.texi: add @itemize @w{}
b092210469 is described below

commit b092210469cb742cd7f9e8e85fca49e2d4f6f209
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Tue Jan 4 15:44:44 2022 +0100

    tp/tests/coverage_macro.texi: add @itemize @w{}
---
 tp/TODO                                            |    5 +
 tp/tests/coverage_macro.texi                       |   15 +
 .../layout/res_parser/formatting/formatting.html   |   87 ++
 .../layout/res_parser/formatting_chm/anchor.html   |    9 +
 .../layout/res_parser/formatting_chm/chapter.html  |   57 ++
 .../layout/res_parser/formatting_chm/chapter2.html |    9 +
 .../res_parser/formatting_chm/formatting.html      |   39 +
 .../res_parser/formatting_chm/formatting_abt.html  |    9 +
 .../res_parser/formatting_chm/formatting_ovr.html  |    9 +
 .../res_parser/formatting_chm/formatting_toc.html  |    9 +
 .../layout/res_parser/formatting_chm/index.html    |    9 +
 .../formatting_chm/s_002d_002dect_002cion.html     |    9 +
 .../res_parser/formatting_chm/subsection.html      |    9 +
 ...tion-_0060_0060simple_002ddouble_002d_002d.html |    9 +
 ...02d_002dfour_002d_002d_002d_002d_0027_0027.html |    9 +
 .../res_parser/formatting_docbook/formatting.xml   |   54 +
 .../formatting_enable_encoding/formatting.html     |   87 ++
 .../EPUB/xhtml/formatting.xhtml                    |   87 ++
 .../EPUB/xhtml/chapter.xhtml                       |   57 ++
 .../EPUB/xhtml/chapter2.xhtml                      |    9 +
 .../EPUB/xhtml/formatting.xhtml                    |   39 +
 .../EPUB/xhtml/formatting_abt.xhtml                |    9 +
 .../EPUB/xhtml/formatting_fot.xhtml                |    9 +
 .../EPUB/xhtml/formatting_ovr.xhtml                |    9 +
 .../EPUB/xhtml/formatting_toc.xhtml                |    9 +
 .../EPUB/xhtml/s_002d_002dect_002cion.xhtml        |    9 +
 .../EPUB/xhtml/subsection.xhtml                    |    9 +
 ...ion-_0060_0060simple_002ddouble_002d_002d.xhtml |    9 +
 ...2d_002dfour_002d_002d_002d_002d_0027_0027.xhtml |    9 +
 .../res_parser/formatting_exotic/anchor.html       |    9 +
 .../res_parser/formatting_exotic/chapter.html      |   57 ++
 .../res_parser/formatting_exotic/chapter2.html     |    9 +
 .../formatting_exotic/formatting_abt.html          |    9 +
 .../formatting_exotic/formatting_ovr.html          |    9 +
 .../formatting_exotic/formatting_toc.html          |    9 +
 .../layout/res_parser/formatting_exotic/index.html |    9 +
 .../formatting_exotic/s_002d_002dect_002cion.html  |    9 +
 .../res_parser/formatting_exotic/subsection.html   |    9 +
 ...tion-_0060_0060simple_002ddouble_002d_002d.html |    9 +
 ...02d_002dfour_002d_002d_002d_002d_0027_0027.html |    9 +
 .../res_parser/formatting_fr_icons/formatting.html |   87 ++
 .../res_parser/formatting_html/formatting.html     |   87 ++
 .../res_parser/formatting_html32/formatting.html   |   87 ++
 .../formatting_html_no_texi2html/formatting.html   |   57 ++
 .../res_parser/formatting_html_nodes/anchor.html   |    9 +
 .../res_parser/formatting_html_nodes/chapter.html  |   57 ++
 .../res_parser/formatting_html_nodes/chapter2.html |    9 +
 .../formatting_html_nodes/formatting_abt.html      |    9 +
 .../formatting_html_nodes/formatting_fot.html      |    9 +
 .../formatting_html_nodes/formatting_ovr.html      |    9 +
 .../formatting_html_nodes/formatting_toc.html      |    9 +
 .../res_parser/formatting_html_nodes/index.html    |   39 +
 .../s_002d_002dect_002cion.html                    |    9 +
 .../formatting_html_nodes/subsection.html          |    9 +
 ...tion-_0060_0060simple_002ddouble_002d_002d.html |    9 +
 ...02d_002dfour_002d_002d_002d_002d_0027_0027.html |    9 +
 .../res_parser/formatting_info/formatting.info     |  Bin 119092 -> 119724 
bytes
 .../formatting_inline_css/formatting.html          |   87 ++
 .../res_parser/formatting_latex/formatting.tex     |   75 ++
 .../formatting_macro_expand/formatting.texi        |   75 ++
 .../res_parser/formatting_mathjax/formatting.html  |   87 ++
 .../layout/res_parser/formatting_nodes/anchor.html |    9 +
 .../res_parser/formatting_nodes/chapter.html       |   57 ++
 .../res_parser/formatting_nodes/chapter2.html      |    9 +
 .../formatting_nodes/formatting_abt.html           |    9 +
 .../formatting_nodes/formatting_fot.html           |    9 +
 .../formatting_nodes/formatting_ovr.html           |    9 +
 .../formatting_nodes/formatting_toc.html           |    9 +
 .../layout/res_parser/formatting_nodes/index.html  |   39 +
 .../formatting_nodes/s_002d_002dect_002cion.html   |    9 +
 .../res_parser/formatting_nodes/subsection.html    |    9 +
 ...tion-_0060_0060simple_002ddouble_002d_002d.html |    9 +
 ...02d_002dfour_002d_002d_002d_002d_0027_0027.html |    9 +
 .../formatting_numerical_entities/formatting.html  |   87 ++
 .../res_parser/formatting_plaintext/formatting.txt | 1053 ++++++++++----------
 .../res_parser/formatting_rawtext/formatting.txt   |   18 +
 .../formatting_regions/formatting_regions.html     |   87 ++
 .../res_parser/formatting_textcontent/formatting   |   36 +
 .../formatting_weird_quotes/formatting.html        |   87 ++
 .../res_parser/formatting_xhtml/formatting.html    |   87 ++
 .../res_parser/formatting_xml/formatting.xml       |   75 ++
 .../res_parser/formatting_singular/anchor.html     |    9 +
 .../res_parser/formatting_singular/chapter.html    |   57 ++
 .../res_parser/formatting_singular/chapter2.html   |    9 +
 .../res_parser/formatting_singular/index.htm       |    9 +
 .../res_parser/formatting_singular/index.html      |    9 +
 .../s_002d_002dect_002cion.html                    |    9 +
 .../res_parser/formatting_singular/sing_abt.htm    |    9 +
 .../res_parser/formatting_singular/sing_fot.htm    |    9 +
 .../res_parser/formatting_singular/sing_ovr.htm    |    9 +
 .../res_parser/formatting_singular/sing_toc.htm    |    9 +
 .../res_parser/formatting_singular/subsection.html |    9 +
 ...tion-_0060_0060simple_002ddouble_002d_002d.html |    9 +
 ...02d_002dfour_002d_002d_002d_002d_0027_0027.html |    9 +
 94 files changed, 3041 insertions(+), 513 deletions(-)

diff --git a/tp/TODO b/tp/TODO
index bb33fb622a..4842cf9541 100644
--- a/tp/TODO
+++ b/tp/TODO
@@ -13,6 +13,7 @@ xmllint --nonet --noout --valid commands.xml
 Before next release
 ===================
 
+
 Bugs
 ====
 
@@ -242,6 +243,10 @@ DocBook
   information that there is only one section to the functions formatting
   the page header and page footer.
 
+  there is a mark= attribute for itemizedlist element for the initial mark
+  of each item but the standard "does not specify a set of appropriate 
keywords"
+  so it cannot be used.
+
 
 Interrogations and remarks
 ==========================
diff --git a/tp/tests/coverage_macro.texi b/tp/tests/coverage_macro.texi
index 9e3c9def9e..51bc542580 100644
--- a/tp/tests/coverage_macro.texi
+++ b/tp/tests/coverage_macro.texi
@@ -402,6 +402,21 @@ something, other thing
 @item i--tem 2
 @end itemize
 
+@itemize @w
+@item without brace w a--b
+@item without brace w c--d
+@end itemize
+
+@itemize @w{}
+@item with w a--b
+@item with w c--d
+@end itemize
+
+@itemize @w{} on a line
+@item line w a--b
+@item line with w c--d
+@end itemize
+
 @enumerate
 @item e--numerate
 @end enumerate
diff --git a/tp/tests/layout/res_parser/formatting/formatting.html 
b/tp/tests/layout/res_parser/formatting/formatting.html
index d6e3c016c5..7d872bbdde 100644
--- a/tp/tests/layout/res_parser/formatting/formatting.html
+++ b/tp/tests/layout/res_parser/formatting/formatting.html
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
@@ -1215,6 +1224,21 @@ i&ndash;tem 1
 </li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&ndash;b
+</li><li><!-- /@w --> without brace w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&ndash;b
+</li><li><!-- /@w --> with w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&ndash;b
+</li><li><!-- /@w --> on a line line with w c&ndash;d
+</li></ul>
+
 <ol>
 <li> e&ndash;numerate
 </li></ol>
@@ -2215,6 +2239,21 @@ i&ndash;tem 1
 </li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&ndash;b
+</li><li><!-- /@w --> without brace w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&ndash;b
+</li><li><!-- /@w --> with w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&ndash;b
+</li><li><!-- /@w --> on a line line with w c&ndash;d
+</li></ul>
+
 <ol>
 <li> e&ndash;numerate
 </li></ol>
@@ -3271,6 +3310,21 @@ i&ndash;tem 1
 </li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&ndash;b
+</li><li><!-- /@w --> without brace w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&ndash;b
+</li><li><!-- /@w --> with w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&ndash;b
+</li><li><!-- /@w --> on a line line with w c&ndash;d
+</li></ul>
+
 <ol>
 <li> e&ndash;numerate
 </li></ol>
@@ -4270,6 +4324,21 @@ i&ndash;tem 1
 </li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&ndash;b
+</li><li><!-- /@w --> without brace w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&ndash;b
+</li><li><!-- /@w --> with w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&ndash;b
+</li><li><!-- /@w --> on a line line with w c&ndash;d
+</li></ul>
+
 <ol>
 <li> e&ndash;numerate
 </li></ol>
@@ -5313,6 +5382,24 @@ error&rarr; &rarr; - &lowast; -| &rArr;
 </pre></li></ul>
 <pre class="example">
 
+</pre><ul class="no-bullet">
+<li><!-- /@w --> <pre class="example">without brace w a--b
+</pre></li><li><!-- /@w --> <pre class="example">without brace w c--d
+</pre></li></ul>
+<pre class="example">
+
+</pre><ul class="no-bullet">
+<li><!-- /@w --> <pre class="example">with w a--b
+</pre></li><li><!-- /@w --> <pre class="example">with w c--d
+</pre></li></ul>
+<pre class="example">
+
+</pre><ul class="no-bullet">
+<li><!-- /@w --> on a line <pre class="example">line w a--b
+</pre></li><li><!-- /@w --> on a line <pre class="example">line with w c--d
+</pre></li></ul>
+<pre class="example">
+
 </pre><ol>
 <li> <pre class="example">e--numerate
 </pre></li></ol>
diff --git a/tp/tests/layout/res_parser/formatting_chm/anchor.html 
b/tp/tests/layout/res_parser/formatting_chm/anchor.html
index 4a1a1e0468..eba60e2819 100644
--- a/tp/tests/layout/res_parser/formatting_chm/anchor.html
+++ b/tp/tests/layout/res_parser/formatting_chm/anchor.html
@@ -332,6 +332,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
diff --git a/tp/tests/layout/res_parser/formatting_chm/chapter.html 
b/tp/tests/layout/res_parser/formatting_chm/chapter.html
index 635bfc2a71..b684750392 100644
--- a/tp/tests/layout/res_parser/formatting_chm/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_chm/chapter.html
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
@@ -1222,6 +1231,21 @@ i&ndash;tem 1
 </li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&ndash;b
+</li><li><!-- /@w --> without brace w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&ndash;b
+</li><li><!-- /@w --> with w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&ndash;b
+</li><li><!-- /@w --> on a line line with w c&ndash;d
+</li></ul>
+
 <ol>
 <li> e&ndash;numerate
 </li></ol>
@@ -2221,6 +2245,21 @@ i&ndash;tem 1
 </li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&ndash;b
+</li><li><!-- /@w --> without brace w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&ndash;b
+</li><li><!-- /@w --> with w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&ndash;b
+</li><li><!-- /@w --> on a line line with w c&ndash;d
+</li></ul>
+
 <ol>
 <li> e&ndash;numerate
 </li></ol>
@@ -3264,6 +3303,24 @@ error&rarr; &rarr; - &lowast; -| &rArr;
 </pre></li></ul>
 <pre class="example">
 
+</pre><ul class="no-bullet">
+<li><!-- /@w --> <pre class="example">without brace w a--b
+</pre></li><li><!-- /@w --> <pre class="example">without brace w c--d
+</pre></li></ul>
+<pre class="example">
+
+</pre><ul class="no-bullet">
+<li><!-- /@w --> <pre class="example">with w a--b
+</pre></li><li><!-- /@w --> <pre class="example">with w c--d
+</pre></li></ul>
+<pre class="example">
+
+</pre><ul class="no-bullet">
+<li><!-- /@w --> on a line <pre class="example">line w a--b
+</pre></li><li><!-- /@w --> on a line <pre class="example">line with w c--d
+</pre></li></ul>
+<pre class="example">
+
 </pre><ol>
 <li> <pre class="example">e--numerate
 </pre></li></ol>
diff --git a/tp/tests/layout/res_parser/formatting_chm/chapter2.html 
b/tp/tests/layout/res_parser/formatting_chm/chapter2.html
index 39f87908b6..0960b296e7 100644
--- a/tp/tests/layout/res_parser/formatting_chm/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_chm/chapter2.html
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting.html 
b/tp/tests/layout/res_parser/formatting_chm/formatting.html
index a762b68e55..42a7295751 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting.html
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
@@ -1215,6 +1224,21 @@ i&ndash;tem 1
 </li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&ndash;b
+</li><li><!-- /@w --> without brace w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&ndash;b
+</li><li><!-- /@w --> with w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&ndash;b
+</li><li><!-- /@w --> on a line line with w c&ndash;d
+</li></ul>
+
 <ol>
 <li> e&ndash;numerate
 </li></ol>
@@ -2215,6 +2239,21 @@ i&ndash;tem 1
 </li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&ndash;b
+</li><li><!-- /@w --> without brace w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&ndash;b
+</li><li><!-- /@w --> with w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&ndash;b
+</li><li><!-- /@w --> on a line line with w c&ndash;d
+</li></ul>
+
 <ol>
 <li> e&ndash;numerate
 </li></ol>
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 ecd73e288a..ba817d0982 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting_abt.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting_abt.html
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
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 371c1ea828..2b9b177d68 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
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 7cae8eab10..ef19074c78 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
diff --git a/tp/tests/layout/res_parser/formatting_chm/index.html 
b/tp/tests/layout/res_parser/formatting_chm/index.html
index 8d18800c0a..dfd792f929 100644
--- a/tp/tests/layout/res_parser/formatting_chm/index.html
+++ b/tp/tests/layout/res_parser/formatting_chm/index.html
@@ -332,6 +332,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
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 ac4e190953..b00fe4c6ac 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
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
diff --git a/tp/tests/layout/res_parser/formatting_chm/subsection.html 
b/tp/tests/layout/res_parser/formatting_chm/subsection.html
index 71eeadf0c8..cb82611301 100644
--- a/tp/tests/layout/res_parser/formatting_chm/subsection.html
+++ b/tp/tests/layout/res_parser/formatting_chm/subsection.html
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
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 5965cdbef1..d3ef3ab6b2 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
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
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 fa7ee11dd1..42a5ddf74e 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
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
diff --git a/tp/tests/layout/res_parser/formatting_docbook/formatting.xml 
b/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
index aeb25a61a6..08f518d6dc 100644
--- a/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
+++ b/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
@@ -332,6 +332,15 @@ error&#8594; &#8614; &#8722; &#9733; &#8867; &#8658;
 <para>&#8226; a&#8211;n itemize line i&#8211;tem 1
 </para></listitem><listitem><para>&#8226; a&#8211;n itemize line i&#8211;tem 2
 </para></listitem></itemizedlist>
+<itemizedlist><listitem><para><!-- /@w --> without brace w a&#8211;b
+</para></listitem><listitem><para><!-- /@w --> without brace w c&#8211;d
+</para></listitem></itemizedlist>
+<itemizedlist><listitem><para><!-- /@w --> with w a&#8211;b
+</para></listitem><listitem><para><!-- /@w --> with w c&#8211;d
+</para></listitem></itemizedlist>
+<itemizedlist><listitem><para><!-- /@w --> on a line line w a&#8211;b
+</para></listitem><listitem><para><!-- /@w --> on a line line with w c&#8211;d
+</para></listitem></itemizedlist>
 <orderedlist numeration="arabic"><listitem><para>e&#8211;numerate
 </para></listitem></orderedlist>
 <orderedlist numeration="arabic"><listitem><para>first third
@@ -1134,6 +1143,15 @@ error&#8594; &#8614; &#8722; &#9733; &#8867; &#8658;
 <para>&#8226; a&#8211;n itemize line i&#8211;tem 1
 </para></listitem><listitem><para>&#8226; a&#8211;n itemize line i&#8211;tem 2
 </para></listitem></itemizedlist>
+<itemizedlist><listitem><para><!-- /@w --> without brace w a&#8211;b
+</para></listitem><listitem><para><!-- /@w --> without brace w c&#8211;d
+</para></listitem></itemizedlist>
+<itemizedlist><listitem><para><!-- /@w --> with w a&#8211;b
+</para></listitem><listitem><para><!-- /@w --> with w c&#8211;d
+</para></listitem></itemizedlist>
+<itemizedlist><listitem><para><!-- /@w --> on a line line w a&#8211;b
+</para></listitem><listitem><para><!-- /@w --> on a line line with w c&#8211;d
+</para></listitem></itemizedlist>
 <orderedlist numeration="arabic"><listitem><para>e&#8211;numerate
 </para></listitem></orderedlist>
 <orderedlist numeration="arabic"><listitem><para>first third
@@ -1937,6 +1955,15 @@ error&#8594; &#8614; &#8722; &#9733; &#8867; &#8658;
 <para>&#8226; a&#8211;n itemize line i&#8211;tem 1
 </para></listitem><listitem><para>&#8226; a&#8211;n itemize line i&#8211;tem 2
 </para></listitem></itemizedlist>
+<itemizedlist><listitem><para><!-- /@w --> without brace w a&#8211;b
+</para></listitem><listitem><para><!-- /@w --> without brace w c&#8211;d
+</para></listitem></itemizedlist>
+<itemizedlist><listitem><para><!-- /@w --> with w a&#8211;b
+</para></listitem><listitem><para><!-- /@w --> with w c&#8211;d
+</para></listitem></itemizedlist>
+<itemizedlist><listitem><para><!-- /@w --> on a line line w a&#8211;b
+</para></listitem><listitem><para><!-- /@w --> on a line line with w c&#8211;d
+</para></listitem></itemizedlist>
 <orderedlist numeration="arabic"><listitem><para>e&#8211;numerate
 </para></listitem></orderedlist>
 <orderedlist numeration="arabic"><listitem><para>first third
@@ -2758,6 +2785,15 @@ error&#8594; &#8614; &#8722; &#9733; &#8867; &#8658;
 <para>&#8226; a&#8211;n itemize line i&#8211;tem 1
 </para></listitem><listitem><para>&#8226; a&#8211;n itemize line i&#8211;tem 2
 </para></listitem></itemizedlist>
+<itemizedlist><listitem><para><!-- /@w --> without brace w a&#8211;b
+</para></listitem><listitem><para><!-- /@w --> without brace w c&#8211;d
+</para></listitem></itemizedlist>
+<itemizedlist><listitem><para><!-- /@w --> with w a&#8211;b
+</para></listitem><listitem><para><!-- /@w --> with w c&#8211;d
+</para></listitem></itemizedlist>
+<itemizedlist><listitem><para><!-- /@w --> on a line line w a&#8211;b
+</para></listitem><listitem><para><!-- /@w --> on a line line with w c&#8211;d
+</para></listitem></itemizedlist>
 <orderedlist numeration="arabic"><listitem><para>e&#8211;numerate
 </para></listitem></orderedlist>
 <orderedlist numeration="arabic"><listitem><para>first third
@@ -3560,6 +3596,15 @@ error&#8594; &#8614; &#8722; &#9733; &#8867; &#8658;
 <para>&#8226; a&#8211;n itemize line i&#8211;tem 1
 </para></listitem><listitem><para>&#8226; a&#8211;n itemize line i&#8211;tem 2
 </para></listitem></itemizedlist>
+<itemizedlist><listitem><para><!-- /@w --> without brace w a&#8211;b
+</para></listitem><listitem><para><!-- /@w --> without brace w c&#8211;d
+</para></listitem></itemizedlist>
+<itemizedlist><listitem><para><!-- /@w --> with w a&#8211;b
+</para></listitem><listitem><para><!-- /@w --> with w c&#8211;d
+</para></listitem></itemizedlist>
+<itemizedlist><listitem><para><!-- /@w --> on a line line w a&#8211;b
+</para></listitem><listitem><para><!-- /@w --> on a line line with w c&#8211;d
+</para></listitem></itemizedlist>
 <orderedlist numeration="arabic"><listitem><para>e&#8211;numerate
 </para></listitem></orderedlist>
 <orderedlist numeration="arabic"><listitem><para>first third
@@ -4357,6 +4402,15 @@ error&#8594; &#8614; &#8722; &#9733; &#8867; &#8658;
 </screen><itemizedlist><screen></screen><listitem><screen>&#8226; a--n itemize 
line <indexterm role="cp"><primary>index entry within 
itemize</primary></indexterm>i--tem 1
 </screen></listitem><listitem><screen>&#8226; a--n itemize line i--tem 2
 </screen></listitem></itemizedlist><screen>
+</screen><itemizedlist><listitem><screen><!-- /@w --> without brace w a--b
+</screen></listitem><listitem><screen><!-- /@w --> without brace w c--d
+</screen></listitem></itemizedlist><screen>
+</screen><itemizedlist><listitem><screen><!-- /@w --> with w a--b
+</screen></listitem><listitem><screen><!-- /@w --> with w c--d
+</screen></listitem></itemizedlist><screen>
+</screen><itemizedlist><listitem><screen><!-- /@w --> on a line line w a--b
+</screen></listitem><listitem><screen><!-- /@w --> on a line line with w c--d
+</screen></listitem></itemizedlist><screen>
 </screen><orderedlist numeration="arabic"><listitem><screen>e--numerate
 </screen></listitem></orderedlist><screen>
 </screen><orderedlist numeration="arabic"><listitem><screen>first third
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 68955a8f59..6f05e9fd8e 100644
--- a/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
@@ -1215,6 +1224,21 @@ i–tem 1
 </li><li>• a–n itemize line i–tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a–b
+</li><li><!-- /@w --> without brace w c–d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a–b
+</li><li><!-- /@w --> with w c–d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a–b
+</li><li><!-- /@w --> on a line line with w c–d
+</li></ul>
+
 <ol>
 <li> e–numerate
 </li></ol>
@@ -2215,6 +2239,21 @@ i–tem 1
 </li><li>• a–n itemize line i–tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a–b
+</li><li><!-- /@w --> without brace w c–d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a–b
+</li><li><!-- /@w --> with w c–d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a–b
+</li><li><!-- /@w --> on a line line with w c–d
+</li></ul>
+
 <ol>
 <li> e–numerate
 </li></ol>
@@ -3271,6 +3310,21 @@ i–tem 1
 </li><li>• a–n itemize line i–tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a–b
+</li><li><!-- /@w --> without brace w c–d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a–b
+</li><li><!-- /@w --> with w c–d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a–b
+</li><li><!-- /@w --> on a line line with w c–d
+</li></ul>
+
 <ol>
 <li> e–numerate
 </li></ol>
@@ -4270,6 +4324,21 @@ i–tem 1
 </li><li>• a–n itemize line i–tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a–b
+</li><li><!-- /@w --> without brace w c–d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a–b
+</li><li><!-- /@w --> with w c–d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a–b
+</li><li><!-- /@w --> on a line line with w c–d
+</li></ul>
+
 <ol>
 <li> e–numerate
 </li></ol>
@@ -5313,6 +5382,24 @@ error→ ↦ − ★ ⊣ ⇒
 </pre></li></ul>
 <pre class="example">
 
+</pre><ul class="no-bullet">
+<li><!-- /@w --> <pre class="example">without brace w a--b
+</pre></li><li><!-- /@w --> <pre class="example">without brace w c--d
+</pre></li></ul>
+<pre class="example">
+
+</pre><ul class="no-bullet">
+<li><!-- /@w --> <pre class="example">with w a--b
+</pre></li><li><!-- /@w --> <pre class="example">with w c--d
+</pre></li></ul>
+<pre class="example">
+
+</pre><ul class="no-bullet">
+<li><!-- /@w --> on a line <pre class="example">line w a--b
+</pre></li><li><!-- /@w --> on a line <pre class="example">line with w c--d
+</pre></li></ul>
+<pre class="example">
+
 </pre><ol>
 <li> <pre class="example">e--numerate
 </pre></li></ol>
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 3c5e2badb5..9f2208f185 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
@@ -332,6 +332,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
@@ -1216,6 +1225,21 @@ i&#8211;tem 1
 </li><li>&#8226; a&#8211;n itemize line i&#8211;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&#8211;b
+</li><li><!-- /@w --> without brace w c&#8211;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&#8211;b
+</li><li><!-- /@w --> with w c&#8211;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&#8211;b
+</li><li><!-- /@w --> on a line line with w c&#8211;d
+</li></ul>
+
 <ol>
 <li> e&#8211;numerate
 </li></ol>
@@ -2216,6 +2240,21 @@ i&#8211;tem 1
 </li><li>&#8226; a&#8211;n itemize line i&#8211;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&#8211;b
+</li><li><!-- /@w --> without brace w c&#8211;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&#8211;b
+</li><li><!-- /@w --> with w c&#8211;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&#8211;b
+</li><li><!-- /@w --> on a line line with w c&#8211;d
+</li></ul>
+
 <ol>
 <li> e&#8211;numerate
 </li></ol>
@@ -3248,6 +3287,21 @@ i&#8211;tem 1
 </li><li>&#8226; a&#8211;n itemize line i&#8211;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&#8211;b
+</li><li><!-- /@w --> without brace w c&#8211;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&#8211;b
+</li><li><!-- /@w --> with w c&#8211;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&#8211;b
+</li><li><!-- /@w --> on a line line with w c&#8211;d
+</li></ul>
+
 <ol>
 <li> e&#8211;numerate
 </li></ol>
@@ -4247,6 +4301,21 @@ i&#8211;tem 1
 </li><li>&#8226; a&#8211;n itemize line i&#8211;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&#8211;b
+</li><li><!-- /@w --> without brace w c&#8211;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&#8211;b
+</li><li><!-- /@w --> with w c&#8211;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&#8211;b
+</li><li><!-- /@w --> on a line line with w c&#8211;d
+</li></ul>
+
 <ol>
 <li> e&#8211;numerate
 </li></ol>
@@ -5290,6 +5359,24 @@ error&#8594; &#8614; &#8722; &#9733; &#8867; &#8658;
 </pre></li></ul>
 <pre class="example">
 
+</pre><ul class="no-bullet">
+<li><!-- /@w --> <pre class="example">without brace w a--b
+</pre></li><li><!-- /@w --> <pre class="example">without brace w c--d
+</pre></li></ul>
+<pre class="example">
+
+</pre><ul class="no-bullet">
+<li><!-- /@w --> <pre class="example">with w a--b
+</pre></li><li><!-- /@w --> <pre class="example">with w c--d
+</pre></li></ul>
+<pre class="example">
+
+</pre><ul class="no-bullet">
+<li><!-- /@w --> on a line <pre class="example">line w a--b
+</pre></li><li><!-- /@w --> on a line <pre class="example">line with w c--d
+</pre></li></ul>
+<pre class="example">
+
 </pre><ol>
 <li> <pre class="example">e--numerate
 </pre></li></ol>
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 b9c2339d7f..2a46e65be1 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
@@ -332,6 +332,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
@@ -1225,6 +1234,21 @@ i&#8211;tem 1
 </li><li>&#8226; a&#8211;n itemize line i&#8211;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&#8211;b
+</li><li><!-- /@w --> without brace w c&#8211;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&#8211;b
+</li><li><!-- /@w --> with w c&#8211;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&#8211;b
+</li><li><!-- /@w --> on a line line with w c&#8211;d
+</li></ul>
+
 <ol>
 <li> e&#8211;numerate
 </li></ol>
@@ -2224,6 +2248,21 @@ i&#8211;tem 1
 </li><li>&#8226; a&#8211;n itemize line i&#8211;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&#8211;b
+</li><li><!-- /@w --> without brace w c&#8211;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&#8211;b
+</li><li><!-- /@w --> with w c&#8211;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&#8211;b
+</li><li><!-- /@w --> on a line line with w c&#8211;d
+</li></ul>
+
 <ol>
 <li> e&#8211;numerate
 </li></ol>
@@ -3267,6 +3306,24 @@ error&#8594; &#8614; &#8722; &#9733; &#8867; &#8658;
 </pre></li></ul>
 <pre class="example">
 
+</pre><ul class="no-bullet">
+<li><!-- /@w --> <pre class="example">without brace w a--b
+</pre></li><li><!-- /@w --> <pre class="example">without brace w c--d
+</pre></li></ul>
+<pre class="example">
+
+</pre><ul class="no-bullet">
+<li><!-- /@w --> <pre class="example">with w a--b
+</pre></li><li><!-- /@w --> <pre class="example">with w c--d
+</pre></li></ul>
+<pre class="example">
+
+</pre><ul class="no-bullet">
+<li><!-- /@w --> on a line <pre class="example">line w a--b
+</pre></li><li><!-- /@w --> on a line <pre class="example">line with w c--d
+</pre></li></ul>
+<pre class="example">
+
 </pre><ol>
 <li> <pre class="example">e--numerate
 </pre></li></ol>
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 623916a8cd..e3db8f78a2 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
@@ -332,6 +332,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
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 a0dfea33ba..12235729e5 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
@@ -332,6 +332,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
@@ -1218,6 +1227,21 @@ i&#8211;tem 1
 </li><li>&#8226; a&#8211;n itemize line i&#8211;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&#8211;b
+</li><li><!-- /@w --> without brace w c&#8211;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&#8211;b
+</li><li><!-- /@w --> with w c&#8211;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&#8211;b
+</li><li><!-- /@w --> on a line line with w c&#8211;d
+</li></ul>
+
 <ol>
 <li> e&#8211;numerate
 </li></ol>
@@ -2218,6 +2242,21 @@ i&#8211;tem 1
 </li><li>&#8226; a&#8211;n itemize line i&#8211;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&#8211;b
+</li><li><!-- /@w --> without brace w c&#8211;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&#8211;b
+</li><li><!-- /@w --> with w c&#8211;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&#8211;b
+</li><li><!-- /@w --> on a line line with w c&#8211;d
+</li></ul>
+
 <ol>
 <li> e&#8211;numerate
 </li></ol>
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 6bfd5b6476..c49959b59a 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
@@ -332,6 +332,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
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 b6b9171f14..dc8ace205e 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
@@ -332,6 +332,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
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 d55a1999c5..b9f5349ba7 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
@@ -332,6 +332,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
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 25c45d7ef9..f5a730b012 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
@@ -332,6 +332,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
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 d79228ace5..4367c0bc6f 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
@@ -332,6 +332,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
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 2049788170..310604ffbf 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
@@ -332,6 +332,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
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 fc272449a7..90902546da 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
@@ -332,6 +332,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
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 6677d1242a..2b566924d4 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
@@ -332,6 +332,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
diff --git a/tp/tests/layout/res_parser/formatting_exotic/anchor.html 
b/tp/tests/layout/res_parser/formatting_exotic/anchor.html
index 5e9158d7e0..b6e4850062 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/anchor.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/anchor.html
@@ -332,6 +332,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
diff --git a/tp/tests/layout/res_parser/formatting_exotic/chapter.html 
b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
index 49ba301fc7..5d26ff8a9a 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
@@ -1238,6 +1247,21 @@ i&ndash;tem 1
 </li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&ndash;b
+</li><li><!-- /@w --> without brace w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&ndash;b
+</li><li><!-- /@w --> with w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&ndash;b
+</li><li><!-- /@w --> on a line line with w c&ndash;d
+</li></ul>
+
 <ol>
 <li> e&ndash;numerate
 </li></ol>
@@ -2237,6 +2261,21 @@ i&ndash;tem 1
 </li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&ndash;b
+</li><li><!-- /@w --> without brace w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&ndash;b
+</li><li><!-- /@w --> with w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&ndash;b
+</li><li><!-- /@w --> on a line line with w c&ndash;d
+</li></ul>
+
 <ol>
 <li> e&ndash;numerate
 </li></ol>
@@ -3280,6 +3319,24 @@ error&rarr; &rarr; - &lowast; -| &rArr;
 </pre></li></ul>
 <pre class="example">
 
+</pre><ul class="no-bullet">
+<li><!-- /@w --> <pre class="example">without brace w a--b
+</pre></li><li><!-- /@w --> <pre class="example">without brace w c--d
+</pre></li></ul>
+<pre class="example">
+
+</pre><ul class="no-bullet">
+<li><!-- /@w --> <pre class="example">with w a--b
+</pre></li><li><!-- /@w --> <pre class="example">with w c--d
+</pre></li></ul>
+<pre class="example">
+
+</pre><ul class="no-bullet">
+<li><!-- /@w --> on a line <pre class="example">line w a--b
+</pre></li><li><!-- /@w --> on a line <pre class="example">line with w c--d
+</pre></li></ul>
+<pre class="example">
+
 </pre><ol>
 <li> <pre class="example">e--numerate
 </pre></li></ol>
diff --git a/tp/tests/layout/res_parser/formatting_exotic/chapter2.html 
b/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
index 4c9783a92d..21b4da5956 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
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 ef395c098c..7716e4592c 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
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 d2c0490221..9cc9e42f06 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
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 72fd9a3057..734eded663 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
diff --git a/tp/tests/layout/res_parser/formatting_exotic/index.html 
b/tp/tests/layout/res_parser/formatting_exotic/index.html
index 5f1315e15b..7688e65d7c 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/index.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/index.html
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
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 22b900d286..3b0e7f04bb 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
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
diff --git a/tp/tests/layout/res_parser/formatting_exotic/subsection.html 
b/tp/tests/layout/res_parser/formatting_exotic/subsection.html
index e3d07e31a3..b8a911477e 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/subsection.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/subsection.html
@@ -332,6 +332,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
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 c27db1985b..a9d760fca0 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
@@ -332,6 +332,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
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 2ba049f402..4eba8ba118 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
@@ -332,6 +332,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
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 ee78055255..5dc110eaa7 100644
--- a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
@@ -1215,6 +1224,21 @@ i&ndash;tem 1
 </li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&ndash;b
+</li><li><!-- /@w --> without brace w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&ndash;b
+</li><li><!-- /@w --> with w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&ndash;b
+</li><li><!-- /@w --> on a line line with w c&ndash;d
+</li></ul>
+
 <ol>
 <li> e&ndash;numerate
 </li></ol>
@@ -2215,6 +2239,21 @@ i&ndash;tem 1
 </li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&ndash;b
+</li><li><!-- /@w --> without brace w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&ndash;b
+</li><li><!-- /@w --> with w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&ndash;b
+</li><li><!-- /@w --> on a line line with w c&ndash;d
+</li></ul>
+
 <ol>
 <li> e&ndash;numerate
 </li></ol>
@@ -3271,6 +3310,21 @@ i&ndash;tem 1
 </li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&ndash;b
+</li><li><!-- /@w --> without brace w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&ndash;b
+</li><li><!-- /@w --> with w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&ndash;b
+</li><li><!-- /@w --> on a line line with w c&ndash;d
+</li></ul>
+
 <ol>
 <li> e&ndash;numerate
 </li></ol>
@@ -4270,6 +4324,21 @@ i&ndash;tem 1
 </li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&ndash;b
+</li><li><!-- /@w --> without brace w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&ndash;b
+</li><li><!-- /@w --> with w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&ndash;b
+</li><li><!-- /@w --> on a line line with w c&ndash;d
+</li></ul>
+
 <ol>
 <li> e&ndash;numerate
 </li></ol>
@@ -5313,6 +5382,24 @@ erreur&rarr; &rarr; - &lowast; -| &rArr;
 </pre></li></ul>
 <pre class="example">
 
+</pre><ul class="no-bullet">
+<li><!-- /@w --> <pre class="example">without brace w a--b
+</pre></li><li><!-- /@w --> <pre class="example">without brace w c--d
+</pre></li></ul>
+<pre class="example">
+
+</pre><ul class="no-bullet">
+<li><!-- /@w --> <pre class="example">with w a--b
+</pre></li><li><!-- /@w --> <pre class="example">with w c--d
+</pre></li></ul>
+<pre class="example">
+
+</pre><ul class="no-bullet">
+<li><!-- /@w --> on a line <pre class="example">line w a--b
+</pre></li><li><!-- /@w --> on a line <pre class="example">line with w c--d
+</pre></li></ul>
+<pre class="example">
+
 </pre><ol>
 <li> <pre class="example">e--numerate
 </pre></li></ol>
diff --git a/tp/tests/layout/res_parser/formatting_html/formatting.html 
b/tp/tests/layout/res_parser/formatting_html/formatting.html
index d6e3c016c5..7d872bbdde 100644
--- a/tp/tests/layout/res_parser/formatting_html/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html/formatting.html
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
@@ -1215,6 +1224,21 @@ i&ndash;tem 1
 </li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&ndash;b
+</li><li><!-- /@w --> without brace w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&ndash;b
+</li><li><!-- /@w --> with w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&ndash;b
+</li><li><!-- /@w --> on a line line with w c&ndash;d
+</li></ul>
+
 <ol>
 <li> e&ndash;numerate
 </li></ol>
@@ -2215,6 +2239,21 @@ i&ndash;tem 1
 </li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&ndash;b
+</li><li><!-- /@w --> without brace w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&ndash;b
+</li><li><!-- /@w --> with w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&ndash;b
+</li><li><!-- /@w --> on a line line with w c&ndash;d
+</li></ul>
+
 <ol>
 <li> e&ndash;numerate
 </li></ol>
@@ -3271,6 +3310,21 @@ i&ndash;tem 1
 </li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&ndash;b
+</li><li><!-- /@w --> without brace w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&ndash;b
+</li><li><!-- /@w --> with w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&ndash;b
+</li><li><!-- /@w --> on a line line with w c&ndash;d
+</li></ul>
+
 <ol>
 <li> e&ndash;numerate
 </li></ol>
@@ -4270,6 +4324,21 @@ i&ndash;tem 1
 </li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&ndash;b
+</li><li><!-- /@w --> without brace w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&ndash;b
+</li><li><!-- /@w --> with w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&ndash;b
+</li><li><!-- /@w --> on a line line with w c&ndash;d
+</li></ul>
+
 <ol>
 <li> e&ndash;numerate
 </li></ol>
@@ -5313,6 +5382,24 @@ error&rarr; &rarr; - &lowast; -| &rArr;
 </pre></li></ul>
 <pre class="example">
 
+</pre><ul class="no-bullet">
+<li><!-- /@w --> <pre class="example">without brace w a--b
+</pre></li><li><!-- /@w --> <pre class="example">without brace w c--d
+</pre></li></ul>
+<pre class="example">
+
+</pre><ul class="no-bullet">
+<li><!-- /@w --> <pre class="example">with w a--b
+</pre></li><li><!-- /@w --> <pre class="example">with w c--d
+</pre></li></ul>
+<pre class="example">
+
+</pre><ul class="no-bullet">
+<li><!-- /@w --> on a line <pre class="example">line w a--b
+</pre></li><li><!-- /@w --> on a line <pre class="example">line with w c--d
+</pre></li></ul>
+<pre class="example">
+
 </pre><ol>
 <li> <pre class="example">e--numerate
 </pre></li></ol>
diff --git a/tp/tests/layout/res_parser/formatting_html32/formatting.html 
b/tp/tests/layout/res_parser/formatting_html32/formatting.html
index 8116a75ec2..33e25c20eb 100644
--- a/tp/tests/layout/res_parser/formatting_html32/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html32/formatting.html
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
@@ -1181,6 +1190,21 @@ i-tem 1
 </li><li>* a-n itemize line i-tem 2
 </li></ul>
 
+<ul>
+<li><!-- /@w --> without brace w a-b
+</li><li><!-- /@w --> without brace w c-d
+</li></ul>
+
+<ul>
+<li><!-- /@w --> with w a-b
+</li><li><!-- /@w --> with w c-d
+</li></ul>
+
+<ul>
+<li><!-- /@w --> on a line line w a-b
+</li><li><!-- /@w --> on a line line with w c-d
+</li></ul>
+
 <ol>
 <li> e-numerate
 </li></ol>
@@ -2157,6 +2181,21 @@ i-tem 1
 </li><li>* a-n itemize line i-tem 2
 </li></ul>
 
+<ul>
+<li><!-- /@w --> without brace w a-b
+</li><li><!-- /@w --> without brace w c-d
+</li></ul>
+
+<ul>
+<li><!-- /@w --> with w a-b
+</li><li><!-- /@w --> with w c-d
+</li></ul>
+
+<ul>
+<li><!-- /@w --> on a line line w a-b
+</li><li><!-- /@w --> on a line line with w c-d
+</li></ul>
+
 <ol>
 <li> e-numerate
 </li></ol>
@@ -3189,6 +3228,21 @@ i-tem 1
 </li><li>* a-n itemize line i-tem 2
 </li></ul>
 
+<ul>
+<li><!-- /@w --> without brace w a-b
+</li><li><!-- /@w --> without brace w c-d
+</li></ul>
+
+<ul>
+<li><!-- /@w --> with w a-b
+</li><li><!-- /@w --> with w c-d
+</li></ul>
+
+<ul>
+<li><!-- /@w --> on a line line w a-b
+</li><li><!-- /@w --> on a line line with w c-d
+</li></ul>
+
 <ol>
 <li> e-numerate
 </li></ol>
@@ -4164,6 +4218,21 @@ i-tem 1
 </li><li>* a-n itemize line i-tem 2
 </li></ul>
 
+<ul>
+<li><!-- /@w --> without brace w a-b
+</li><li><!-- /@w --> without brace w c-d
+</li></ul>
+
+<ul>
+<li><!-- /@w --> with w a-b
+</li><li><!-- /@w --> with w c-d
+</li></ul>
+
+<ul>
+<li><!-- /@w --> on a line line w a-b
+</li><li><!-- /@w --> on a line line with w c-d
+</li></ul>
+
 <ol>
 <li> e-numerate
 </li></ol>
@@ -5182,6 +5251,24 @@ error-&gt; ==&gt; - -!- -| =&gt;
 </pre></li></ul>
 <pre>
 
+</pre><ul>
+<li><!-- /@w --> <pre>without brace w a--b
+</pre></li><li><!-- /@w --> <pre>without brace w c--d
+</pre></li></ul>
+<pre>
+
+</pre><ul>
+<li><!-- /@w --> <pre>with w a--b
+</pre></li><li><!-- /@w --> <pre>with w c--d
+</pre></li></ul>
+<pre>
+
+</pre><ul>
+<li><!-- /@w --> on a line <pre>line w a--b
+</pre></li><li><!-- /@w --> on a line <pre>line with w c--d
+</pre></li></ul>
+<pre>
+
 </pre><ol>
 <li> <pre>e--numerate
 </pre></li></ol>
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 e176a1e2e9..e8aac874ba 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
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
@@ -1276,6 +1285,21 @@ i&ndash;tem 1
 </li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&ndash;b
+</li><li><!-- /@w --> without brace w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&ndash;b
+</li><li><!-- /@w --> with w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&ndash;b
+</li><li><!-- /@w --> on a line line with w c&ndash;d
+</li></ul>
+
 <ol>
 <li> e&ndash;numerate
 </li></ol>
@@ -2275,6 +2299,21 @@ i&ndash;tem 1
 </li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&ndash;b
+</li><li><!-- /@w --> without brace w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&ndash;b
+</li><li><!-- /@w --> with w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&ndash;b
+</li><li><!-- /@w --> on a line line with w c&ndash;d
+</li></ul>
+
 <ol>
 <li> e&ndash;numerate
 </li></ol>
@@ -3318,6 +3357,24 @@ error&rarr; &rarr; - &lowast; -| &rArr;
 </pre></li></ul>
 <pre class="example">
 
+</pre><ul class="no-bullet">
+<li><!-- /@w --> <pre class="example">without brace w a--b
+</pre></li><li><!-- /@w --> <pre class="example">without brace w c--d
+</pre></li></ul>
+<pre class="example">
+
+</pre><ul class="no-bullet">
+<li><!-- /@w --> <pre class="example">with w a--b
+</pre></li><li><!-- /@w --> <pre class="example">with w c--d
+</pre></li></ul>
+<pre class="example">
+
+</pre><ul class="no-bullet">
+<li><!-- /@w --> on a line <pre class="example">line w a--b
+</pre></li><li><!-- /@w --> on a line <pre class="example">line with w c--d
+</pre></li></ul>
+<pre class="example">
+
 </pre><ol>
 <li> <pre class="example">e--numerate
 </pre></li></ol>
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 4a1a1e0468..eba60e2819 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/anchor.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/anchor.html
@@ -332,6 +332,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
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 1f3bdc25c4..93a236cbde 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
@@ -1238,6 +1247,21 @@ i&ndash;tem 1
 </li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&ndash;b
+</li><li><!-- /@w --> without brace w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&ndash;b
+</li><li><!-- /@w --> with w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&ndash;b
+</li><li><!-- /@w --> on a line line with w c&ndash;d
+</li></ul>
+
 <ol>
 <li> e&ndash;numerate
 </li></ol>
@@ -2237,6 +2261,21 @@ i&ndash;tem 1
 </li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&ndash;b
+</li><li><!-- /@w --> without brace w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&ndash;b
+</li><li><!-- /@w --> with w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&ndash;b
+</li><li><!-- /@w --> on a line line with w c&ndash;d
+</li></ul>
+
 <ol>
 <li> e&ndash;numerate
 </li></ol>
@@ -3280,6 +3319,24 @@ error&rarr; &rarr; - &lowast; -| &rArr;
 </pre></li></ul>
 <pre class="example">
 
+</pre><ul class="no-bullet">
+<li><!-- /@w --> <pre class="example">without brace w a--b
+</pre></li><li><!-- /@w --> <pre class="example">without brace w c--d
+</pre></li></ul>
+<pre class="example">
+
+</pre><ul class="no-bullet">
+<li><!-- /@w --> <pre class="example">with w a--b
+</pre></li><li><!-- /@w --> <pre class="example">with w c--d
+</pre></li></ul>
+<pre class="example">
+
+</pre><ul class="no-bullet">
+<li><!-- /@w --> on a line <pre class="example">line w a--b
+</pre></li><li><!-- /@w --> on a line <pre class="example">line with w c--d
+</pre></li></ul>
+<pre class="example">
+
 </pre><ol>
 <li> <pre class="example">e--numerate
 </pre></li></ol>
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 a63773ee19..6a76e9134e 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
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 fe915bd09b..b688976a4d 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
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
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 b8470c6028..39200fd502 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
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
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 64fc92b5c1..4363672f75 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
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
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 68b77d7274..a2bba10d30 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
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
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 9f8b7e4663..1aaa7aa356 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/index.html
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
@@ -1215,6 +1224,21 @@ i&ndash;tem 1
 </li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&ndash;b
+</li><li><!-- /@w --> without brace w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&ndash;b
+</li><li><!-- /@w --> with w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&ndash;b
+</li><li><!-- /@w --> on a line line with w c&ndash;d
+</li></ul>
+
 <ol>
 <li> e&ndash;numerate
 </li></ol>
@@ -2215,6 +2239,21 @@ i&ndash;tem 1
 </li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&ndash;b
+</li><li><!-- /@w --> without brace w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&ndash;b
+</li><li><!-- /@w --> with w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&ndash;b
+</li><li><!-- /@w --> on a line line with w c&ndash;d
+</li></ul>
+
 <ol>
 <li> e&ndash;numerate
 </li></ol>
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 372b44ff96..3344c4f988 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
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
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 0fd53ebc4c..ca0316460a 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
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 9219d69ddc..09cb8e330e 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
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
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 672717d208..d63c6c75b8 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
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
diff --git a/tp/tests/layout/res_parser/formatting_info/formatting.info 
b/tp/tests/layout/res_parser/formatting_info/formatting.info
index 69d8fbe02c..2a6537ab8f 100644
Binary files a/tp/tests/layout/res_parser/formatting_info/formatting.info and 
b/tp/tests/layout/res_parser/formatting_info/formatting.info differ
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 bf995095bb..21389912b9 100644
--- a/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
@@ -1215,6 +1224,21 @@ i&ndash;tem 1
 </li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
 </li></ul>
 
+<ul class="no-bullet" style="list-style: none">
+<li><!-- /@w --> without brace w a&ndash;b
+</li><li><!-- /@w --> without brace w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet" style="list-style: none">
+<li><!-- /@w --> with w a&ndash;b
+</li><li><!-- /@w --> with w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet" style="list-style: none">
+<li><!-- /@w --> on a line line w a&ndash;b
+</li><li><!-- /@w --> on a line line with w c&ndash;d
+</li></ul>
+
 <ol>
 <li> e&ndash;numerate
 </li></ol>
@@ -2215,6 +2239,21 @@ i&ndash;tem 1
 </li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
 </li></ul>
 
+<ul class="no-bullet" style="list-style: none">
+<li><!-- /@w --> without brace w a&ndash;b
+</li><li><!-- /@w --> without brace w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet" style="list-style: none">
+<li><!-- /@w --> with w a&ndash;b
+</li><li><!-- /@w --> with w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet" style="list-style: none">
+<li><!-- /@w --> on a line line w a&ndash;b
+</li><li><!-- /@w --> on a line line with w c&ndash;d
+</li></ul>
+
 <ol>
 <li> e&ndash;numerate
 </li></ol>
@@ -3271,6 +3310,21 @@ i&ndash;tem 1
 </li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
 </li></ul>
 
+<ul class="no-bullet" style="list-style: none">
+<li><!-- /@w --> without brace w a&ndash;b
+</li><li><!-- /@w --> without brace w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet" style="list-style: none">
+<li><!-- /@w --> with w a&ndash;b
+</li><li><!-- /@w --> with w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet" style="list-style: none">
+<li><!-- /@w --> on a line line w a&ndash;b
+</li><li><!-- /@w --> on a line line with w c&ndash;d
+</li></ul>
+
 <ol>
 <li> e&ndash;numerate
 </li></ol>
@@ -4270,6 +4324,21 @@ i&ndash;tem 1
 </li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
 </li></ul>
 
+<ul class="no-bullet" style="list-style: none">
+<li><!-- /@w --> without brace w a&ndash;b
+</li><li><!-- /@w --> without brace w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet" style="list-style: none">
+<li><!-- /@w --> with w a&ndash;b
+</li><li><!-- /@w --> with w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet" style="list-style: none">
+<li><!-- /@w --> on a line line w a&ndash;b
+</li><li><!-- /@w --> on a line line with w c&ndash;d
+</li></ul>
+
 <ol>
 <li> e&ndash;numerate
 </li></ol>
@@ -5313,6 +5382,24 @@ error&rarr; &rarr; - &lowast; -| &rArr;
 </pre></li></ul>
 <pre class="example">
 
+</pre><ul class="no-bullet" style="list-style: none">
+<li><!-- /@w --> <pre class="example">without brace w a--b
+</pre></li><li><!-- /@w --> <pre class="example">without brace w c--d
+</pre></li></ul>
+<pre class="example">
+
+</pre><ul class="no-bullet" style="list-style: none">
+<li><!-- /@w --> <pre class="example">with w a--b
+</pre></li><li><!-- /@w --> <pre class="example">with w c--d
+</pre></li></ul>
+<pre class="example">
+
+</pre><ul class="no-bullet" style="list-style: none">
+<li><!-- /@w --> on a line <pre class="example">line w a--b
+</pre></li><li><!-- /@w --> on a line <pre class="example">line with w c--d
+</pre></li></ul>
+<pre class="example">
+
 </pre><ol>
 <li> <pre class="example">e--numerate
 </pre></li></ol>
diff --git a/tp/tests/layout/res_parser/formatting_latex/formatting.tex 
b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
index 17afcfbf8d..b7eff5a7b7 100644
--- a/tp/tests/layout/res_parser/formatting_latex/formatting.tex
+++ b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
@@ -566,6 +566,21 @@ i--tem 1
 \item i--tem 2
 \end{itemize}
 
+\begin{itemize}[label={}]
+\item without brace w a--b
+\item without brace w c--d
+\end{itemize}
+
+\begin{itemize}[label={}]
+\item with w a--b
+\item with w c--d
+\end{itemize}
+
+\begin{itemize}[label=\hbox{} on a line]
+\item line w a--b
+\item line with w c--d
+\end{itemize}
+
 \begin{enumerate}[start=1]
 \item e--numerate
 \end{enumerate}
@@ -1730,6 +1745,21 @@ i--tem 1
 \item i--tem 2
 \end{itemize}
 
+\begin{itemize}[label={}]
+\item without brace w a--b
+\item without brace w c--d
+\end{itemize}
+
+\begin{itemize}[label={}]
+\item with w a--b
+\item with w c--d
+\end{itemize}
+
+\begin{itemize}[label=\hbox{} on a line]
+\item line w a--b
+\item line with w c--d
+\end{itemize}
+
 \begin{enumerate}[start=1]
 \item e--numerate
 \end{enumerate}
@@ -2914,6 +2944,21 @@ i--tem 1
 \item i--tem 2
 \end{itemize}
 
+\begin{itemize}[label={}]
+\item without brace w a--b
+\item without brace w c--d
+\end{itemize}
+
+\begin{itemize}[label={}]
+\item with w a--b
+\item with w c--d
+\end{itemize}
+
+\begin{itemize}[label=\hbox{} on a line]
+\item line w a--b
+\item line with w c--d
+\end{itemize}
+
 \begin{enumerate}[start=1]
 \item e--numerate
 \end{enumerate}
@@ -4077,6 +4122,21 @@ i--tem 1
 \item i--tem 2
 \end{itemize}
 
+\begin{itemize}[label={}]
+\item without brace w a--b
+\item without brace w c--d
+\end{itemize}
+
+\begin{itemize}[label={}]
+\item with w a--b
+\item with w c--d
+\end{itemize}
+
+\begin{itemize}[label=\hbox{} on a line]
+\item line w a--b
+\item line with w c--d
+\end{itemize}
+
 \begin{enumerate}[start=1]
 \item e--numerate
 \end{enumerate}
@@ -5251,6 +5311,21 @@ i{-}{-}tem 1
 \item i{-}{-}tem 2
 \end{itemize}
 
+\begin{itemize}[label={}]
+\item without brace w a{-}{-}b
+\item without brace w c{-}{-}d
+\end{itemize}
+
+\begin{itemize}[label={}]
+\item with w a{-}{-}b
+\item with w c{-}{-}d
+\end{itemize}
+
+\begin{itemize}[label=\hbox{} on a line]
+\item line w a{-}{-}b
+\item line with w c{-}{-}d
+\end{itemize}
+
 \begin{enumerate}[start=1]
 \item e{-}{-}numerate
 \end{enumerate}
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 03c71993b6..2bd2b9cec4 100644
--- a/tp/tests/layout/res_parser/formatting_macro_expand/formatting.texi
+++ b/tp/tests/layout/res_parser/formatting_macro_expand/formatting.texi
@@ -415,6 +415,21 @@ something, other thing
 @item i--tem 2
 @end itemize
 
+@itemize @w
+@item without brace w a--b
+@item without brace w c--d
+@end itemize
+
+@itemize @w{}
+@item with w a--b
+@item with w c--d
+@end itemize
+
+@itemize @w{} on a line
+@item line w a--b
+@item line with w c--d
+@end itemize
+
 @enumerate
 @item e--numerate
 @end enumerate
@@ -1442,6 +1457,21 @@ something, other thing
 @item i--tem 2
 @end itemize
 
+@itemize @w
+@item without brace w a--b
+@item without brace w c--d
+@end itemize
+
+@itemize @w{}
+@item with w a--b
+@item with w c--d
+@end itemize
+
+@itemize @w{} on a line
+@item line w a--b
+@item line with w c--d
+@end itemize
+
 @enumerate
 @item e--numerate
 @end enumerate
@@ -2461,6 +2491,21 @@ something, other thing
 @item i--tem 2
 @end itemize
 
+@itemize @w
+@item without brace w a--b
+@item without brace w c--d
+@end itemize
+
+@itemize @w{}
+@item with w a--b
+@item with w c--d
+@end itemize
+
+@itemize @w{} on a line
+@item line w a--b
+@item line with w c--d
+@end itemize
+
 @enumerate
 @item e--numerate
 @end enumerate
@@ -3506,6 +3551,21 @@ something, other thing
 @item i--tem 2
 @end itemize
 
+@itemize @w
+@item without brace w a--b
+@item without brace w c--d
+@end itemize
+
+@itemize @w{}
+@item with w a--b
+@item with w c--d
+@end itemize
+
+@itemize @w{} on a line
+@item line w a--b
+@item line with w c--d
+@end itemize
+
 @enumerate
 @item e--numerate
 @end enumerate
@@ -4519,6 +4579,21 @@ something, other thing
 @item i--tem 2
 @end itemize
 
+@itemize @w
+@item without brace w a--b
+@item without brace w c--d
+@end itemize
+
+@itemize @w{}
+@item with w a--b
+@item with w c--d
+@end itemize
+
+@itemize @w{} on a line
+@item line w a--b
+@item line with w c--d
+@end itemize
+
 @enumerate
 @item e--numerate
 @end enumerate
diff --git a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html 
b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
index c6d7f18edf..959fb294a2 100644
--- a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
@@ -1225,6 +1234,21 @@ i&ndash;tem 1
 </li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&ndash;b
+</li><li><!-- /@w --> without brace w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&ndash;b
+</li><li><!-- /@w --> with w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&ndash;b
+</li><li><!-- /@w --> on a line line with w c&ndash;d
+</li></ul>
+
 <ol>
 <li> e&ndash;numerate
 </li></ol>
@@ -2225,6 +2249,21 @@ i&ndash;tem 1
 </li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&ndash;b
+</li><li><!-- /@w --> without brace w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&ndash;b
+</li><li><!-- /@w --> with w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&ndash;b
+</li><li><!-- /@w --> on a line line with w c&ndash;d
+</li></ul>
+
 <ol>
 <li> e&ndash;numerate
 </li></ol>
@@ -3281,6 +3320,21 @@ i&ndash;tem 1
 </li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&ndash;b
+</li><li><!-- /@w --> without brace w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&ndash;b
+</li><li><!-- /@w --> with w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&ndash;b
+</li><li><!-- /@w --> on a line line with w c&ndash;d
+</li></ul>
+
 <ol>
 <li> e&ndash;numerate
 </li></ol>
@@ -4280,6 +4334,21 @@ i&ndash;tem 1
 </li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&ndash;b
+</li><li><!-- /@w --> without brace w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&ndash;b
+</li><li><!-- /@w --> with w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&ndash;b
+</li><li><!-- /@w --> on a line line with w c&ndash;d
+</li></ul>
+
 <ol>
 <li> e&ndash;numerate
 </li></ol>
@@ -5323,6 +5392,24 @@ error&rarr; &rarr; - &lowast; -| &rArr;
 </pre></li></ul>
 <pre class="example">
 
+</pre><ul class="no-bullet">
+<li><!-- /@w --> <pre class="example">without brace w a--b
+</pre></li><li><!-- /@w --> <pre class="example">without brace w c--d
+</pre></li></ul>
+<pre class="example">
+
+</pre><ul class="no-bullet">
+<li><!-- /@w --> <pre class="example">with w a--b
+</pre></li><li><!-- /@w --> <pre class="example">with w c--d
+</pre></li></ul>
+<pre class="example">
+
+</pre><ul class="no-bullet">
+<li><!-- /@w --> on a line <pre class="example">line w a--b
+</pre></li><li><!-- /@w --> on a line <pre class="example">line with w c--d
+</pre></li></ul>
+<pre class="example">
+
 </pre><ol>
 <li> <pre class="example">e--numerate
 </pre></li></ol>
diff --git a/tp/tests/layout/res_parser/formatting_nodes/anchor.html 
b/tp/tests/layout/res_parser/formatting_nodes/anchor.html
index 4a1a1e0468..eba60e2819 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/anchor.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/anchor.html
@@ -332,6 +332,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
diff --git a/tp/tests/layout/res_parser/formatting_nodes/chapter.html 
b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
index 1f3bdc25c4..93a236cbde 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
@@ -1238,6 +1247,21 @@ i&ndash;tem 1
 </li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&ndash;b
+</li><li><!-- /@w --> without brace w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&ndash;b
+</li><li><!-- /@w --> with w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&ndash;b
+</li><li><!-- /@w --> on a line line with w c&ndash;d
+</li></ul>
+
 <ol>
 <li> e&ndash;numerate
 </li></ol>
@@ -2237,6 +2261,21 @@ i&ndash;tem 1
 </li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&ndash;b
+</li><li><!-- /@w --> without brace w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&ndash;b
+</li><li><!-- /@w --> with w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&ndash;b
+</li><li><!-- /@w --> on a line line with w c&ndash;d
+</li></ul>
+
 <ol>
 <li> e&ndash;numerate
 </li></ol>
@@ -3280,6 +3319,24 @@ error&rarr; &rarr; - &lowast; -| &rArr;
 </pre></li></ul>
 <pre class="example">
 
+</pre><ul class="no-bullet">
+<li><!-- /@w --> <pre class="example">without brace w a--b
+</pre></li><li><!-- /@w --> <pre class="example">without brace w c--d
+</pre></li></ul>
+<pre class="example">
+
+</pre><ul class="no-bullet">
+<li><!-- /@w --> <pre class="example">with w a--b
+</pre></li><li><!-- /@w --> <pre class="example">with w c--d
+</pre></li></ul>
+<pre class="example">
+
+</pre><ul class="no-bullet">
+<li><!-- /@w --> on a line <pre class="example">line w a--b
+</pre></li><li><!-- /@w --> on a line <pre class="example">line with w c--d
+</pre></li></ul>
+<pre class="example">
+
 </pre><ol>
 <li> <pre class="example">e--numerate
 </pre></li></ol>
diff --git a/tp/tests/layout/res_parser/formatting_nodes/chapter2.html 
b/tp/tests/layout/res_parser/formatting_nodes/chapter2.html
index a63773ee19..6a76e9134e 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/chapter2.html
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
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 fe915bd09b..b688976a4d 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
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 b8470c6028..39200fd502 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
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 64fc92b5c1..4363672f75 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
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 68b77d7274..a2bba10d30 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
diff --git a/tp/tests/layout/res_parser/formatting_nodes/index.html 
b/tp/tests/layout/res_parser/formatting_nodes/index.html
index 9f8b7e4663..1aaa7aa356 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/index.html
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
@@ -1215,6 +1224,21 @@ i&ndash;tem 1
 </li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&ndash;b
+</li><li><!-- /@w --> without brace w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&ndash;b
+</li><li><!-- /@w --> with w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&ndash;b
+</li><li><!-- /@w --> on a line line with w c&ndash;d
+</li></ul>
+
 <ol>
 <li> e&ndash;numerate
 </li></ol>
@@ -2215,6 +2239,21 @@ i&ndash;tem 1
 </li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&ndash;b
+</li><li><!-- /@w --> without brace w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&ndash;b
+</li><li><!-- /@w --> with w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&ndash;b
+</li><li><!-- /@w --> on a line line with w c&ndash;d
+</li></ul>
+
 <ol>
 <li> e&ndash;numerate
 </li></ol>
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 372b44ff96..3344c4f988 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
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
diff --git a/tp/tests/layout/res_parser/formatting_nodes/subsection.html 
b/tp/tests/layout/res_parser/formatting_nodes/subsection.html
index 0fd53ebc4c..ca0316460a 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/subsection.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/subsection.html
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
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 9219d69ddc..09cb8e330e 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
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
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 672717d208..d63c6c75b8 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
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
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 5a0b5e87b1..f0719c2977 100644
--- a/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
@@ -1215,6 +1224,21 @@ i&#8211;tem 1
 </li><li>&#8226; a&#8211;n itemize line i&#8211;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&#8211;b
+</li><li><!-- /@w --> without brace w c&#8211;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&#8211;b
+</li><li><!-- /@w --> with w c&#8211;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&#8211;b
+</li><li><!-- /@w --> on a line line with w c&#8211;d
+</li></ul>
+
 <ol>
 <li> e&#8211;numerate
 </li></ol>
@@ -2215,6 +2239,21 @@ i&#8211;tem 1
 </li><li>&#8226; a&#8211;n itemize line i&#8211;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&#8211;b
+</li><li><!-- /@w --> without brace w c&#8211;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&#8211;b
+</li><li><!-- /@w --> with w c&#8211;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&#8211;b
+</li><li><!-- /@w --> on a line line with w c&#8211;d
+</li></ul>
+
 <ol>
 <li> e&#8211;numerate
 </li></ol>
@@ -3271,6 +3310,21 @@ i&#8211;tem 1
 </li><li>&#8226; a&#8211;n itemize line i&#8211;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&#8211;b
+</li><li><!-- /@w --> without brace w c&#8211;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&#8211;b
+</li><li><!-- /@w --> with w c&#8211;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&#8211;b
+</li><li><!-- /@w --> on a line line with w c&#8211;d
+</li></ul>
+
 <ol>
 <li> e&#8211;numerate
 </li></ol>
@@ -4270,6 +4324,21 @@ i&#8211;tem 1
 </li><li>&#8226; a&#8211;n itemize line i&#8211;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&#8211;b
+</li><li><!-- /@w --> without brace w c&#8211;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&#8211;b
+</li><li><!-- /@w --> with w c&#8211;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&#8211;b
+</li><li><!-- /@w --> on a line line with w c&#8211;d
+</li></ul>
+
 <ol>
 <li> e&#8211;numerate
 </li></ol>
@@ -5313,6 +5382,24 @@ error&#8594; &#8614; &#8722; &#9733; &#8867; &#8658;
 </pre></li></ul>
 <pre class="example">
 
+</pre><ul class="no-bullet">
+<li><!-- /@w --> <pre class="example">without brace w a--b
+</pre></li><li><!-- /@w --> <pre class="example">without brace w c--d
+</pre></li></ul>
+<pre class="example">
+
+</pre><ul class="no-bullet">
+<li><!-- /@w --> <pre class="example">with w a--b
+</pre></li><li><!-- /@w --> <pre class="example">with w c--d
+</pre></li></ul>
+<pre class="example">
+
+</pre><ul class="no-bullet">
+<li><!-- /@w --> on a line <pre class="example">line w a--b
+</pre></li><li><!-- /@w --> on a line <pre class="example">line with w c--d
+</pre></li></ul>
+<pre class="example">
+
 </pre><ol>
 <li> <pre class="example">e--numerate
 </pre></li></ol>
diff --git a/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt 
b/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt
index 603f573ab2..5af02d4597 100644
--- a/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt
+++ b/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt
@@ -195,6 +195,15 @@ b i r SC t sansserif slanted
    • a–n itemize line i–tem 1
    • a–n itemize line i–tem 2
 
+     without brace w a–b
+     without brace w c–d
+
+     with w a–b
+     with w c–d
+
+    on a line line w a–b
+    on a line line with w c–d
+
   1. e–numerate
 
   3. first third
@@ -812,6 +821,15 @@ b i r SC t sansserif slanted
    • a–n itemize line i–tem 1
    • a–n itemize line i–tem 2
 
+     without brace w a–b
+     without brace w c–d
+
+     with w a–b
+     with w c–d
+
+    on a line line w a–b
+    on a line line with w c–d
+
   1. e–numerate
 
   3. first third
@@ -1570,6 +1588,15 @@ aaa
         • a–n itemize line i--tem 1
         • a–n itemize line i--tem 2
 
+          without brace w a--b
+          without brace w c--d
+
+          with w a--b
+          with w c--d
+
+         on a line line w a--b
+         on a line line with w c--d
+
        1. e--numerate
 
        3. first third
@@ -2047,297 +2074,297 @@ aaa
 
 * Menu:
 
-* truc:                                  chapter.            (line 2043)
+* truc:                                  chapter.            (line 2070)
 
    codeidx
 
 * Menu:
 
-* a INDEX---ENTRY tẽ --- î:              chapter.            (line 2043)
+* a INDEX---ENTRY tẽ --- î:              chapter.            (line 2070)
 
    cp
 
 * Menu:
 
 * “:                                     chapter.            (line   28)
-* “ <1>:                                 chapter.            (line  645)
-* “ <2>:                                 chapter.            (line 1273)
+* “ <1>:                                 chapter.            (line  654)
+* “ <2>:                                 chapter.            (line 1291)
 * –option:                               chapter.            (line   28)
-* –option <1>:                           chapter.            (line  645)
-* –option <2>:                           chapter.            (line 1273)
-* .:                                     chapter.            (line 2043)
-* ?:                                     chapter.            (line 2043)
-* a:                                     chapter.            (line 2043)
-* aaa, bbb:                              chapter.            (line 2043)
-* a—a:                                   chapter.            (line 2043)
-* a--asis:                               chapter.            (line  482)
-* a--asis <1>:                           chapter.            (line 1099)
-* a--asis <2>:                           chapter.            (line 1858)
-* b:                                     chapter.            (line  483)
-* b <1>:                                 chapter.            (line 1100)
-* b <2>:                                 chapter.            (line 1859)
-* b—b, c—c:                              chapter.            (line 2043)
+* –option <1>:                           chapter.            (line  654)
+* –option <2>:                           chapter.            (line 1291)
+* .:                                     chapter.            (line 2070)
+* ?:                                     chapter.            (line 2070)
+* a:                                     chapter.            (line 2070)
+* aaa, bbb:                              chapter.            (line 2070)
+* a—a:                                   chapter.            (line 2070)
+* a--asis:                               chapter.            (line  491)
+* a--asis <1>:                           chapter.            (line 1117)
+* a--asis <2>:                           chapter.            (line 1885)
+* b:                                     chapter.            (line  492)
+* b <1>:                                 chapter.            (line 1118)
+* b <2>:                                 chapter.            (line 1886)
+* b—b, c—c:                              chapter.            (line 2070)
 * counting entry:                        chapter.            (line    0)
-* d—dd, e—ee, f—ff:                      chapter.            (line 2043)
-* d--efcv_name:                          chapter.            (line  319)
-* d--efcv_name <1>:                      chapter.            (line  322)
-* d--efcv_name <2>:                      chapter.            (line  936)
-* d--efcv_name <3>:                      chapter.            (line  939)
-* d--efcv_name <4>:                      chapter.            (line 1696)
-* d--efcv_name <5>:                      chapter.            (line 1699)
-* d--efivar_name of c--lass:             chapter.            (line  364)
-* d--efivar_name of c--lass <1>:         chapter.            (line  981)
-* d--efivar_name of c--lass <2>:         chapter.            (line 1741)
-* d--efopt_name:                         chapter.            (line  355)
-* d--efopt_name <1>:                     chapter.            (line  972)
-* d--efopt_name <2>:                     chapter.            (line 1732)
-* d--eftypecv_name of c--lass:           chapter.            (line  325)
-* d--eftypecv_name of c--lass <1>:       chapter.            (line  328)
-* d--eftypecv_name of c--lass <2>:       chapter.            (line  942)
-* d--eftypecv_name of c--lass <3>:       chapter.            (line  945)
-* d--eftypecv_name of c--lass <4>:       chapter.            (line 1702)
-* d--eftypecv_name of c--lass <5>:       chapter.            (line 1705)
-* d--eftypecv_name2 of c--lass2:         chapter.            (line  396)
-* d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  401)
-* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1013)
-* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1018)
-* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1774)
-* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1779)
-* d--eftypeivar_name of c--lass:         chapter.            (line  367)
-* d--eftypeivar_name of c--lass <1>:     chapter.            (line  984)
-* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1744)
-* d--eftypevar_name:                     chapter.            (line  361)
-* d--eftypevar_name <1>:                 chapter.            (line  978)
-* d--eftypevar_name <2>:                 chapter.            (line 1738)
-* d--eftypevr_name:                      chapter.            (line  316)
-* d--eftypevr_name <1>:                  chapter.            (line  933)
-* d--eftypevr_name <2>:                  chapter.            (line 1693)
-* d--efvar_name:                         chapter.            (line  349)
-* d--efvar_name <1>:                     chapter.            (line  352)
-* d--efvar_name <2>:                     chapter.            (line  966)
-* d--efvar_name <3>:                     chapter.            (line  969)
-* d--efvar_name <4>:                     chapter.            (line 1726)
-* d--efvar_name <5>:                     chapter.            (line 1729)
-* d--efvr_name:                          chapter.            (line  295)
-* d--efvr_name <1>:                      chapter.            (line  912)
-* d--efvr_name <2>:                      chapter.            (line 1672)
-* g—gg, h—hh jjj, k—kk, l—ll:            chapter.            (line 2043)
-* index entry between item and itemx:    chapter.            (line  487)
-* index entry between item and itemx <1>: chapter.           (line  588)
-* index entry between item and itemx <2>: chapter.           (line 1104)
-* index entry between item and itemx <3>: chapter.           (line 1205)
-* index entry between item and itemx <4>: chapter.           (line 1863)
-* index entry between item and itemx <5>: chapter.           (line 1992)
+* d—dd, e—ee, f—ff:                      chapter.            (line 2070)
+* d--efcv_name:                          chapter.            (line  328)
+* d--efcv_name <1>:                      chapter.            (line  331)
+* d--efcv_name <2>:                      chapter.            (line  954)
+* d--efcv_name <3>:                      chapter.            (line  957)
+* d--efcv_name <4>:                      chapter.            (line 1723)
+* d--efcv_name <5>:                      chapter.            (line 1726)
+* d--efivar_name of c--lass:             chapter.            (line  373)
+* d--efivar_name of c--lass <1>:         chapter.            (line  999)
+* d--efivar_name of c--lass <2>:         chapter.            (line 1768)
+* d--efopt_name:                         chapter.            (line  364)
+* d--efopt_name <1>:                     chapter.            (line  990)
+* d--efopt_name <2>:                     chapter.            (line 1759)
+* d--eftypecv_name of c--lass:           chapter.            (line  334)
+* d--eftypecv_name of c--lass <1>:       chapter.            (line  337)
+* d--eftypecv_name of c--lass <2>:       chapter.            (line  960)
+* d--eftypecv_name of c--lass <3>:       chapter.            (line  963)
+* d--eftypecv_name of c--lass <4>:       chapter.            (line 1729)
+* d--eftypecv_name of c--lass <5>:       chapter.            (line 1732)
+* d--eftypecv_name2 of c--lass2:         chapter.            (line  405)
+* d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  410)
+* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1031)
+* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1036)
+* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1801)
+* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1806)
+* d--eftypeivar_name of c--lass:         chapter.            (line  376)
+* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1002)
+* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1771)
+* d--eftypevar_name:                     chapter.            (line  370)
+* d--eftypevar_name <1>:                 chapter.            (line  996)
+* d--eftypevar_name <2>:                 chapter.            (line 1765)
+* d--eftypevr_name:                      chapter.            (line  325)
+* d--eftypevr_name <1>:                  chapter.            (line  951)
+* d--eftypevr_name <2>:                  chapter.            (line 1720)
+* d--efvar_name:                         chapter.            (line  358)
+* d--efvar_name <1>:                     chapter.            (line  361)
+* d--efvar_name <2>:                     chapter.            (line  984)
+* d--efvar_name <3>:                     chapter.            (line  987)
+* d--efvar_name <4>:                     chapter.            (line 1753)
+* d--efvar_name <5>:                     chapter.            (line 1756)
+* d--efvr_name:                          chapter.            (line  304)
+* d--efvr_name <1>:                      chapter.            (line  930)
+* d--efvr_name <2>:                      chapter.            (line 1699)
+* g—gg, h—hh jjj, k—kk, l—ll:            chapter.            (line 2070)
+* index entry between item and itemx:    chapter.            (line  496)
+* index entry between item and itemx <1>: chapter.           (line  597)
+* index entry between item and itemx <2>: chapter.           (line 1122)
+* index entry between item and itemx <3>: chapter.           (line 1223)
+* index entry between item and itemx <4>: chapter.           (line 1890)
+* index entry between item and itemx <5>: chapter.           (line 2019)
 * index entry in footnote:               chapter.            (line    0)
-* index entry within deffn:              chapter.            (line  266)
-* index entry within deffn <1>:          chapter.            (line  883)
-* index entry within deffn <2>:          chapter.            (line 1641)
+* index entry within deffn:              chapter.            (line  275)
+* index entry within deffn <1>:          chapter.            (line  901)
+* index entry within deffn <2>:          chapter.            (line 1668)
 * index entry within itemize:            chapter.            (line  194)
-* index entry within itemize <1>:        chapter.            (line  811)
-* index entry within itemize <2>:        chapter.            (line 1569)
-* index entry within multitable:         chapter.            (line  210)
-* index entry within multitable <1>:     chapter.            (line  827)
-* index entry within multitable <2>:     chapter.            (line 1586)
-* t–ruc:                                 chapter.            (line 2043)
-* T–ruc:                                 chapter.            (line 2043)
+* index entry within itemize <1>:        chapter.            (line  820)
+* index entry within itemize <2>:        chapter.            (line 1587)
+* index entry within multitable:         chapter.            (line  219)
+* index entry within multitable <1>:     chapter.            (line  845)
+* index entry within multitable <2>:     chapter.            (line 1613)
+* t–ruc:                                 chapter.            (line 2070)
+* T–ruc:                                 chapter.            (line 2070)
 * vtable i--tem code kbdinputstyle:      chapter.            (line  133)
-* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  750)
-* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1507)
+* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  759)
+* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1525)
 * vtable i--tem default kbdinputstyle:   chapter.            (line  128)
-* vtable i--tem default kbdinputstyle <1>: chapter.          (line  745)
-* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1502)
+* vtable i--tem default kbdinputstyle <1>: chapter.          (line  754)
+* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1520)
 * vtable i--tem distinct kbdinputstyle:  chapter.            (line  143)
-* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  760)
-* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1517)
+* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  769)
+* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1535)
 * vtable i--tem example kbdinputstyle:   chapter.            (line  138)
-* vtable i--tem example kbdinputstyle <1>: chapter.          (line  755)
-* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1512)
+* vtable i--tem example kbdinputstyle <1>: chapter.          (line  764)
+* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1530)
 * vtable i--tem in example code kbdinputstyle: chapter.      (line  135)
-* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  752)
-* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1509)
+* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  761)
+* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1527)
 * vtable i--tem in example default kbdinputstyle: chapter.   (line  130)
 * vtable i--tem in example default kbdinputstyle <1>: chapter.
-                                                             (line  747)
+                                                             (line  756)
 * vtable i--tem in example default kbdinputstyle <2>: chapter.
-                                                             (line 1504)
+                                                             (line 1522)
 * vtable i--tem in example distinct kbdinputstyle: chapter.  (line  145)
 * vtable i--tem in example distinct kbdinputstyle <1>: chapter.
-                                                             (line  762)
+                                                             (line  771)
 * vtable i--tem in example distinct kbdinputstyle <2>: chapter.
-                                                             (line 1519)
+                                                             (line 1537)
 * vtable i--tem in example example kbdinputstyle: chapter.   (line  140)
 * vtable i--tem in example example kbdinputstyle <1>: chapter.
-                                                             (line  757)
+                                                             (line  766)
 * vtable i--tem in example example kbdinputstyle <2>: chapter.
-                                                             (line 1514)
+                                                             (line 1532)
 
    fn
 
 * Menu:
 
 * --foption:                             chapter.            (line   28)
-* --foption <1>:                         chapter.            (line  645)
-* --foption <2>:                         chapter.            (line 1273)
-* .:                                     chapter.            (line 2043)
-* ?:                                     chapter.            (line 2043)
+* --foption <1>:                         chapter.            (line  654)
+* --foption <2>:                         chapter.            (line 1291)
+* .:                                     chapter.            (line 2070)
+* ?:                                     chapter.            (line 2070)
 * ``:                                    chapter.            (line   28)
-* `` <1>:                                chapter.            (line  645)
-* `` <2>:                                chapter.            (line 1273)
-* a:                                     chapter.            (line  283)
-* a <1>:                                 chapter.            (line  486)
-* a <2>:                                 chapter.            (line  587)
-* a <3>:                                 chapter.            (line  900)
-* a <4>:                                 chapter.            (line 1103)
-* a <5>:                                 chapter.            (line 1204)
-* a <6>:                                 chapter.            (line 1658)
-* a <7>:                                 chapter.            (line 1862)
-* a <8>:                                 chapter.            (line 1991)
-* a <9>:                                 chapter.            (line 2043)
-* after:                                 chapter.            (line  598)
-* after <1>:                             chapter.            (line 1215)
-* after <2>:                             chapter.            (line 2002)
-* arg2:                                  chapter.            (line  406)
-* arg2 <1>:                              chapter.            (line 1023)
-* arg2 <2>:                              chapter.            (line 1784)
-* b:                                     chapter.            (line  487)
-* b <1>:                                 chapter.            (line  588)
-* b <2>:                                 chapter.            (line 1104)
-* b <3>:                                 chapter.            (line 1205)
-* b <4>:                                 chapter.            (line 1863)
-* b <5>:                                 chapter.            (line 1992)
-* bidule machin:                         chapter.            (line  277)
-* bidule machin <1>:                     chapter.            (line  894)
-* bidule machin <2>:                     chapter.            (line 1652)
-* d--effn_name:                          chapter.            (line  258)
-* d--effn_name <1>:                      chapter.            (line  875)
-* d--effn_name <2>:                      chapter.            (line 1633)
-* d--efmac_name:                         chapter.            (line  343)
-* d--efmac_name <1>:                     chapter.            (line  960)
-* d--efmac_name <2>:                     chapter.            (line 1720)
-* d--efmethod_name on c--lass:           chapter.            (line  370)
-* d--efmethod_name on c--lass <1>:       chapter.            (line  987)
-* d--efmethod_name on c--lass <2>:       chapter.            (line 1747)
-* d--efop_name on c--lass:               chapter.            (line  331)
-* d--efop_name on c--lass <1>:           chapter.            (line  334)
-* d--efop_name on c--lass <2>:           chapter.            (line  948)
-* d--efop_name on c--lass <3>:           chapter.            (line  951)
-* d--efop_name on c--lass <4>:           chapter.            (line 1708)
-* d--efop_name on c--lass <5>:           chapter.            (line 1711)
-* d--efspec_name:                        chapter.            (line  346)
-* d--efspec_name <1>:                    chapter.            (line  963)
-* d--efspec_name <2>:                    chapter.            (line 1723)
-* d--eftypefn_name:                      chapter.            (line  304)
-* d--eftypefn_name <1>:                  chapter.            (line  307)
-* d--eftypefn_name <2>:                  chapter.            (line  921)
-* d--eftypefn_name <3>:                  chapter.            (line  924)
-* d--eftypefn_name <4>:                  chapter.            (line 1681)
-* d--eftypefn_name <5>:                  chapter.            (line 1684)
-* d--eftypefn_name2:                     chapter.            (line  381)
-* d--eftypefn_name2 <1>:                 chapter.            (line  998)
-* d--eftypefn_name2 <2>:                 chapter.            (line 1759)
-* d--eftypefun_name:                     chapter.            (line  358)
-* d--eftypefun_name <1>:                 chapter.            (line  975)
-* d--eftypefun_name <2>:                 chapter.            (line 1735)
-* d--eftypemethod_name on c--lass:       chapter.            (line  373)
-* d--eftypemethod_name on c--lass <1>:   chapter.            (line  990)
-* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1750)
-* d--eftypeop_name on c--lass:           chapter.            (line  310)
-* d--eftypeop_name on c--lass <1>:       chapter.            (line  313)
-* d--eftypeop_name on c--lass <2>:       chapter.            (line  927)
-* d--eftypeop_name on c--lass <3>:       chapter.            (line  930)
-* d--eftypeop_name on c--lass <4>:       chapter.            (line 1687)
-* d--eftypeop_name on c--lass <5>:       chapter.            (line 1690)
-* d--eftypeop_name2 on c--lass2:         chapter.            (line  386)
-* d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  391)
-* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1003)
-* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1008)
-* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1764)
-* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1769)
-* d--efun_name:                          chapter.            (line  340)
-* d--efun_name <1>:                      chapter.            (line  957)
-* d--efun_name <2>:                      chapter.            (line 1717)
-* de--ffn_name:                          chapter.            (line  261)
-* de--ffn_name <1>:                      chapter.            (line  878)
-* de--ffn_name <2>:                      chapter.            (line 1636)
-* deffn:                                 chapter.            (line  286)
-* deffn <1>:                             chapter.            (line  288)
-* deffn <2>:                             chapter.            (line  903)
-* deffn <3>:                             chapter.            (line  905)
-* deffn <4>:                             chapter.            (line 1662)
-* deffn <5>:                             chapter.            (line 1664)
-* deffnx:                                chapter.            (line  284)
-* deffnx <1>:                            chapter.            (line  289)
-* deffnx <2>:                            chapter.            (line  901)
-* deffnx <3>:                            chapter.            (line  906)
-* deffnx <4>:                            chapter.            (line 1659)
-* deffnx <5>:                            chapter.            (line 1665)
-* f---aa:                                chapter.            (line 2043)
-* f---bb, f---cc:                        chapter.            (line 2043)
-* f---ddd, f---eee, ffff:                chapter.            (line 2043)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2043)
-* followed:                              chapter.            (line  280)
-* followed <1>:                          chapter.            (line  596)
-* followed <2>:                          chapter.            (line  897)
-* followed <3>:                          chapter.            (line 1213)
-* followed <4>:                          chapter.            (line 1655)
-* followed <5>:                          chapter.            (line 2000)
-* I:                                     chapter.            (line  265)
-* I <1>:                                 chapter.            (line  291)
-* I <2>:                                 chapter.            (line  882)
-* I <3>:                                 chapter.            (line  908)
-* I <4>:                                 chapter.            (line 1640)
-* I <5>:                                 chapter.            (line 1667)
-* id i ule:                              chapter.            (line  271)
-* id i ule <1>:                          chapter.            (line  888)
-* id i ule <2>:                          chapter.            (line 1646)
-* id ule:                                chapter.            (line  270)
-* id ule <1>:                            chapter.            (line  887)
-* id ule <2>:                            chapter.            (line 1645)
-* log trap:                              chapter.            (line  267)
-* log trap <1>:                          chapter.            (line  884)
-* log trap <2>:                          chapter.            (line 1642)
-* log trap1:                             chapter.            (line  268)
-* log trap1 <1>:                         chapter.            (line  885)
-* log trap1 <2>:                         chapter.            (line 1643)
-* log trap2:                             chapter.            (line  269)
-* log trap2 <1>:                         chapter.            (line  886)
-* log trap2 <2>:                         chapter.            (line 1644)
-* machin:                                chapter.            (line  276)
-* machin <1>:                            chapter.            (line  278)
-* machin <2>:                            chapter.            (line  592)
-* machin <3>:                            chapter.            (line  593)
-* machin <4>:                            chapter.            (line  594)
-* machin <5>:                            chapter.            (line  595)
-* machin <6>:                            chapter.            (line  893)
-* machin <7>:                            chapter.            (line  895)
-* machin <8>:                            chapter.            (line 1209)
-* machin <9>:                            chapter.            (line 1210)
-* machin <10>:                           chapter.            (line 1211)
-* machin <11>:                           chapter.            (line 1212)
-* machin <12>:                           chapter.            (line 1651)
-* machin <13>:                           chapter.            (line 1653)
-* machin <14>:                           chapter.            (line 1996)
-* machin <15>:                           chapter.            (line 1997)
-* machin <16>:                           chapter.            (line 1998)
-* machin <17>:                           chapter.            (line 1999)
-* n--ame:                                chapter.            (line  298)
-* n--ame <1>:                            chapter.            (line  301)
-* n--ame <2>:                            chapter.            (line  915)
-* n--ame <3>:                            chapter.            (line  918)
-* n--ame <4>:                            chapter.            (line 1675)
-* n--ame <5>:                            chapter.            (line 1678)
-* name2:                                 chapter.            (line  376)
-* name2 <1>:                             chapter.            (line  993)
-* name2 <2>:                             chapter.            (line 1754)
-* t--ruc:                                chapter.            (line 2043)
-* T--ruc:                                chapter.            (line 2043)
-* truc:                                  chapter.            (line  266)
-* truc <1>:                              chapter.            (line  292)
-* truc <2>:                              chapter.            (line  883)
-* truc <3>:                              chapter.            (line  909)
-* truc <4>:                              chapter.            (line 1641)
-* truc <5>:                              chapter.            (line 1668)
-* xxx, zzz:                              chapter.            (line 2043)
+* `` <1>:                                chapter.            (line  654)
+* `` <2>:                                chapter.            (line 1291)
+* a:                                     chapter.            (line  292)
+* a <1>:                                 chapter.            (line  495)
+* a <2>:                                 chapter.            (line  596)
+* a <3>:                                 chapter.            (line  918)
+* a <4>:                                 chapter.            (line 1121)
+* a <5>:                                 chapter.            (line 1222)
+* a <6>:                                 chapter.            (line 1685)
+* a <7>:                                 chapter.            (line 1889)
+* a <8>:                                 chapter.            (line 2018)
+* a <9>:                                 chapter.            (line 2070)
+* after:                                 chapter.            (line  607)
+* after <1>:                             chapter.            (line 1233)
+* after <2>:                             chapter.            (line 2029)
+* arg2:                                  chapter.            (line  415)
+* arg2 <1>:                              chapter.            (line 1041)
+* arg2 <2>:                              chapter.            (line 1811)
+* b:                                     chapter.            (line  496)
+* b <1>:                                 chapter.            (line  597)
+* b <2>:                                 chapter.            (line 1122)
+* b <3>:                                 chapter.            (line 1223)
+* b <4>:                                 chapter.            (line 1890)
+* b <5>:                                 chapter.            (line 2019)
+* bidule machin:                         chapter.            (line  286)
+* bidule machin <1>:                     chapter.            (line  912)
+* bidule machin <2>:                     chapter.            (line 1679)
+* d--effn_name:                          chapter.            (line  267)
+* d--effn_name <1>:                      chapter.            (line  893)
+* d--effn_name <2>:                      chapter.            (line 1660)
+* d--efmac_name:                         chapter.            (line  352)
+* d--efmac_name <1>:                     chapter.            (line  978)
+* d--efmac_name <2>:                     chapter.            (line 1747)
+* d--efmethod_name on c--lass:           chapter.            (line  379)
+* d--efmethod_name on c--lass <1>:       chapter.            (line 1005)
+* d--efmethod_name on c--lass <2>:       chapter.            (line 1774)
+* d--efop_name on c--lass:               chapter.            (line  340)
+* d--efop_name on c--lass <1>:           chapter.            (line  343)
+* d--efop_name on c--lass <2>:           chapter.            (line  966)
+* d--efop_name on c--lass <3>:           chapter.            (line  969)
+* d--efop_name on c--lass <4>:           chapter.            (line 1735)
+* d--efop_name on c--lass <5>:           chapter.            (line 1738)
+* d--efspec_name:                        chapter.            (line  355)
+* d--efspec_name <1>:                    chapter.            (line  981)
+* d--efspec_name <2>:                    chapter.            (line 1750)
+* d--eftypefn_name:                      chapter.            (line  313)
+* d--eftypefn_name <1>:                  chapter.            (line  316)
+* d--eftypefn_name <2>:                  chapter.            (line  939)
+* d--eftypefn_name <3>:                  chapter.            (line  942)
+* d--eftypefn_name <4>:                  chapter.            (line 1708)
+* d--eftypefn_name <5>:                  chapter.            (line 1711)
+* d--eftypefn_name2:                     chapter.            (line  390)
+* d--eftypefn_name2 <1>:                 chapter.            (line 1016)
+* d--eftypefn_name2 <2>:                 chapter.            (line 1786)
+* d--eftypefun_name:                     chapter.            (line  367)
+* d--eftypefun_name <1>:                 chapter.            (line  993)
+* d--eftypefun_name <2>:                 chapter.            (line 1762)
+* d--eftypemethod_name on c--lass:       chapter.            (line  382)
+* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1008)
+* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1777)
+* d--eftypeop_name on c--lass:           chapter.            (line  319)
+* d--eftypeop_name on c--lass <1>:       chapter.            (line  322)
+* d--eftypeop_name on c--lass <2>:       chapter.            (line  945)
+* d--eftypeop_name on c--lass <3>:       chapter.            (line  948)
+* d--eftypeop_name on c--lass <4>:       chapter.            (line 1714)
+* d--eftypeop_name on c--lass <5>:       chapter.            (line 1717)
+* d--eftypeop_name2 on c--lass2:         chapter.            (line  395)
+* d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  400)
+* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1021)
+* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1026)
+* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1791)
+* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1796)
+* d--efun_name:                          chapter.            (line  349)
+* d--efun_name <1>:                      chapter.            (line  975)
+* d--efun_name <2>:                      chapter.            (line 1744)
+* de--ffn_name:                          chapter.            (line  270)
+* de--ffn_name <1>:                      chapter.            (line  896)
+* de--ffn_name <2>:                      chapter.            (line 1663)
+* deffn:                                 chapter.            (line  295)
+* deffn <1>:                             chapter.            (line  297)
+* deffn <2>:                             chapter.            (line  921)
+* deffn <3>:                             chapter.            (line  923)
+* deffn <4>:                             chapter.            (line 1689)
+* deffn <5>:                             chapter.            (line 1691)
+* deffnx:                                chapter.            (line  293)
+* deffnx <1>:                            chapter.            (line  298)
+* deffnx <2>:                            chapter.            (line  919)
+* deffnx <3>:                            chapter.            (line  924)
+* deffnx <4>:                            chapter.            (line 1686)
+* deffnx <5>:                            chapter.            (line 1692)
+* f---aa:                                chapter.            (line 2070)
+* f---bb, f---cc:                        chapter.            (line 2070)
+* f---ddd, f---eee, ffff:                chapter.            (line 2070)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2070)
+* followed:                              chapter.            (line  289)
+* followed <1>:                          chapter.            (line  605)
+* followed <2>:                          chapter.            (line  915)
+* followed <3>:                          chapter.            (line 1231)
+* followed <4>:                          chapter.            (line 1682)
+* followed <5>:                          chapter.            (line 2027)
+* I:                                     chapter.            (line  274)
+* I <1>:                                 chapter.            (line  300)
+* I <2>:                                 chapter.            (line  900)
+* I <3>:                                 chapter.            (line  926)
+* I <4>:                                 chapter.            (line 1667)
+* I <5>:                                 chapter.            (line 1694)
+* id i ule:                              chapter.            (line  280)
+* id i ule <1>:                          chapter.            (line  906)
+* id i ule <2>:                          chapter.            (line 1673)
+* id ule:                                chapter.            (line  279)
+* id ule <1>:                            chapter.            (line  905)
+* id ule <2>:                            chapter.            (line 1672)
+* log trap:                              chapter.            (line  276)
+* log trap <1>:                          chapter.            (line  902)
+* log trap <2>:                          chapter.            (line 1669)
+* log trap1:                             chapter.            (line  277)
+* log trap1 <1>:                         chapter.            (line  903)
+* log trap1 <2>:                         chapter.            (line 1670)
+* log trap2:                             chapter.            (line  278)
+* log trap2 <1>:                         chapter.            (line  904)
+* log trap2 <2>:                         chapter.            (line 1671)
+* machin:                                chapter.            (line  285)
+* machin <1>:                            chapter.            (line  287)
+* machin <2>:                            chapter.            (line  601)
+* machin <3>:                            chapter.            (line  602)
+* machin <4>:                            chapter.            (line  603)
+* machin <5>:                            chapter.            (line  604)
+* machin <6>:                            chapter.            (line  911)
+* machin <7>:                            chapter.            (line  913)
+* machin <8>:                            chapter.            (line 1227)
+* machin <9>:                            chapter.            (line 1228)
+* machin <10>:                           chapter.            (line 1229)
+* machin <11>:                           chapter.            (line 1230)
+* machin <12>:                           chapter.            (line 1678)
+* machin <13>:                           chapter.            (line 1680)
+* machin <14>:                           chapter.            (line 2023)
+* machin <15>:                           chapter.            (line 2024)
+* machin <16>:                           chapter.            (line 2025)
+* machin <17>:                           chapter.            (line 2026)
+* n--ame:                                chapter.            (line  307)
+* n--ame <1>:                            chapter.            (line  310)
+* n--ame <2>:                            chapter.            (line  933)
+* n--ame <3>:                            chapter.            (line  936)
+* n--ame <4>:                            chapter.            (line 1702)
+* n--ame <5>:                            chapter.            (line 1705)
+* name2:                                 chapter.            (line  385)
+* name2 <1>:                             chapter.            (line 1011)
+* name2 <2>:                             chapter.            (line 1781)
+* t--ruc:                                chapter.            (line 2070)
+* T--ruc:                                chapter.            (line 2070)
+* truc:                                  chapter.            (line  275)
+* truc <1>:                              chapter.            (line  301)
+* truc <2>:                              chapter.            (line  901)
+* truc <3>:                              chapter.            (line  927)
+* truc <4>:                              chapter.            (line 1668)
+* truc <5>:                              chapter.            (line 1695)
+* xxx, zzz:                              chapter.            (line 2070)
 
    vr
 
@@ -2349,9 +2376,9 @@ aaa
 
 * Menu:
 
-* d--eftp_name:                          chapter.            (line  337)
-* d--eftp_name <1>:                      chapter.            (line  954)
-* d--eftp_name <2>:                      chapter.            (line 1714)
+* d--eftp_name:                          chapter.            (line  346)
+* d--eftp_name <1>:                      chapter.            (line  972)
+* d--eftp_name <2>:                      chapter.            (line 1741)
 
    (8)
 
@@ -2396,282 +2423,282 @@ chapter 2
 * Menu:
 
 * “:                                     chapter.            (line   28)
-* “ <1>:                                 chapter.            (line  645)
-* “ <2>:                                 chapter.            (line 1273)
+* “ <1>:                                 chapter.            (line  654)
+* “ <2>:                                 chapter.            (line 1291)
 * –option:                               chapter.            (line   28)
-* –option <1>:                           chapter.            (line  645)
-* –option <2>:                           chapter.            (line 1273)
-* .:                                     chapter.            (line 2043)
-* ?:                                     chapter.            (line 2043)
-* a:                                     chapter.            (line 2043)
-* aaa, bbb:                              chapter.            (line 2043)
-* a—a:                                   chapter.            (line 2043)
-* a--asis:                               chapter.            (line  482)
-* a--asis <1>:                           chapter.            (line 1099)
-* a--asis <2>:                           chapter.            (line 1858)
-* b:                                     chapter.            (line  483)
-* b <1>:                                 chapter.            (line 1100)
-* b <2>:                                 chapter.            (line 1859)
-* b—b, c—c:                              chapter.            (line 2043)
-* counting entry:                        chapter.            (line 2377)
-* d—dd, e—ee, f—ff:                      chapter.            (line 2043)
-* d--efcv_name:                          chapter.            (line  319)
-* d--efcv_name <1>:                      chapter.            (line  322)
-* d--efcv_name <2>:                      chapter.            (line  936)
-* d--efcv_name <3>:                      chapter.            (line  939)
-* d--efcv_name <4>:                      chapter.            (line 1696)
-* d--efcv_name <5>:                      chapter.            (line 1699)
-* d--efivar_name of c--lass:             chapter.            (line  364)
-* d--efivar_name of c--lass <1>:         chapter.            (line  981)
-* d--efivar_name of c--lass <2>:         chapter.            (line 1741)
-* d--efopt_name:                         chapter.            (line  355)
-* d--efopt_name <1>:                     chapter.            (line  972)
-* d--efopt_name <2>:                     chapter.            (line 1732)
-* d--eftypecv_name of c--lass:           chapter.            (line  325)
-* d--eftypecv_name of c--lass <1>:       chapter.            (line  328)
-* d--eftypecv_name of c--lass <2>:       chapter.            (line  942)
-* d--eftypecv_name of c--lass <3>:       chapter.            (line  945)
-* d--eftypecv_name of c--lass <4>:       chapter.            (line 1702)
-* d--eftypecv_name of c--lass <5>:       chapter.            (line 1705)
-* d--eftypecv_name2 of c--lass2:         chapter.            (line  396)
-* d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  401)
-* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1013)
-* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1018)
-* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1774)
-* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1779)
-* d--eftypeivar_name of c--lass:         chapter.            (line  367)
-* d--eftypeivar_name of c--lass <1>:     chapter.            (line  984)
-* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1744)
-* d--eftypevar_name:                     chapter.            (line  361)
-* d--eftypevar_name <1>:                 chapter.            (line  978)
-* d--eftypevar_name <2>:                 chapter.            (line 1738)
-* d--eftypevr_name:                      chapter.            (line  316)
-* d--eftypevr_name <1>:                  chapter.            (line  933)
-* d--eftypevr_name <2>:                  chapter.            (line 1693)
-* d--efvar_name:                         chapter.            (line  349)
-* d--efvar_name <1>:                     chapter.            (line  352)
-* d--efvar_name <2>:                     chapter.            (line  966)
-* d--efvar_name <3>:                     chapter.            (line  969)
-* d--efvar_name <4>:                     chapter.            (line 1726)
-* d--efvar_name <5>:                     chapter.            (line 1729)
-* d--efvr_name:                          chapter.            (line  295)
-* d--efvr_name <1>:                      chapter.            (line  912)
-* d--efvr_name <2>:                      chapter.            (line 1672)
-* g—gg, h—hh jjj, k—kk, l—ll:            chapter.            (line 2043)
-* index entry between item and itemx:    chapter.            (line  487)
-* index entry between item and itemx <1>: chapter.           (line  588)
-* index entry between item and itemx <2>: chapter.           (line 1104)
-* index entry between item and itemx <3>: chapter.           (line 1205)
-* index entry between item and itemx <4>: chapter.           (line 1863)
-* index entry between item and itemx <5>: chapter.           (line 1992)
-* index entry in footnote:               chapter.            (line 2372)
-* index entry within deffn:              chapter.            (line  266)
-* index entry within deffn <1>:          chapter.            (line  883)
-* index entry within deffn <2>:          chapter.            (line 1641)
+* –option <1>:                           chapter.            (line  654)
+* –option <2>:                           chapter.            (line 1291)
+* .:                                     chapter.            (line 2070)
+* ?:                                     chapter.            (line 2070)
+* a:                                     chapter.            (line 2070)
+* aaa, bbb:                              chapter.            (line 2070)
+* a—a:                                   chapter.            (line 2070)
+* a--asis:                               chapter.            (line  491)
+* a--asis <1>:                           chapter.            (line 1117)
+* a--asis <2>:                           chapter.            (line 1885)
+* b:                                     chapter.            (line  492)
+* b <1>:                                 chapter.            (line 1118)
+* b <2>:                                 chapter.            (line 1886)
+* b—b, c—c:                              chapter.            (line 2070)
+* counting entry:                        chapter.            (line 2404)
+* d—dd, e—ee, f—ff:                      chapter.            (line 2070)
+* d--efcv_name:                          chapter.            (line  328)
+* d--efcv_name <1>:                      chapter.            (line  331)
+* d--efcv_name <2>:                      chapter.            (line  954)
+* d--efcv_name <3>:                      chapter.            (line  957)
+* d--efcv_name <4>:                      chapter.            (line 1723)
+* d--efcv_name <5>:                      chapter.            (line 1726)
+* d--efivar_name of c--lass:             chapter.            (line  373)
+* d--efivar_name of c--lass <1>:         chapter.            (line  999)
+* d--efivar_name of c--lass <2>:         chapter.            (line 1768)
+* d--efopt_name:                         chapter.            (line  364)
+* d--efopt_name <1>:                     chapter.            (line  990)
+* d--efopt_name <2>:                     chapter.            (line 1759)
+* d--eftypecv_name of c--lass:           chapter.            (line  334)
+* d--eftypecv_name of c--lass <1>:       chapter.            (line  337)
+* d--eftypecv_name of c--lass <2>:       chapter.            (line  960)
+* d--eftypecv_name of c--lass <3>:       chapter.            (line  963)
+* d--eftypecv_name of c--lass <4>:       chapter.            (line 1729)
+* d--eftypecv_name of c--lass <5>:       chapter.            (line 1732)
+* d--eftypecv_name2 of c--lass2:         chapter.            (line  405)
+* d--eftypecv_name2 of c--lass2 <1>:     chapter.            (line  410)
+* d--eftypecv_name2 of c--lass2 <2>:     chapter.            (line 1031)
+* d--eftypecv_name2 of c--lass2 <3>:     chapter.            (line 1036)
+* d--eftypecv_name2 of c--lass2 <4>:     chapter.            (line 1801)
+* d--eftypecv_name2 of c--lass2 <5>:     chapter.            (line 1806)
+* d--eftypeivar_name of c--lass:         chapter.            (line  376)
+* d--eftypeivar_name of c--lass <1>:     chapter.            (line 1002)
+* d--eftypeivar_name of c--lass <2>:     chapter.            (line 1771)
+* d--eftypevar_name:                     chapter.            (line  370)
+* d--eftypevar_name <1>:                 chapter.            (line  996)
+* d--eftypevar_name <2>:                 chapter.            (line 1765)
+* d--eftypevr_name:                      chapter.            (line  325)
+* d--eftypevr_name <1>:                  chapter.            (line  951)
+* d--eftypevr_name <2>:                  chapter.            (line 1720)
+* d--efvar_name:                         chapter.            (line  358)
+* d--efvar_name <1>:                     chapter.            (line  361)
+* d--efvar_name <2>:                     chapter.            (line  984)
+* d--efvar_name <3>:                     chapter.            (line  987)
+* d--efvar_name <4>:                     chapter.            (line 1753)
+* d--efvar_name <5>:                     chapter.            (line 1756)
+* d--efvr_name:                          chapter.            (line  304)
+* d--efvr_name <1>:                      chapter.            (line  930)
+* d--efvr_name <2>:                      chapter.            (line 1699)
+* g—gg, h—hh jjj, k—kk, l—ll:            chapter.            (line 2070)
+* index entry between item and itemx:    chapter.            (line  496)
+* index entry between item and itemx <1>: chapter.           (line  597)
+* index entry between item and itemx <2>: chapter.           (line 1122)
+* index entry between item and itemx <3>: chapter.           (line 1223)
+* index entry between item and itemx <4>: chapter.           (line 1890)
+* index entry between item and itemx <5>: chapter.           (line 2019)
+* index entry in footnote:               chapter.            (line 2399)
+* index entry within deffn:              chapter.            (line  275)
+* index entry within deffn <1>:          chapter.            (line  901)
+* index entry within deffn <2>:          chapter.            (line 1668)
 * index entry within itemize:            chapter.            (line  194)
-* index entry within itemize <1>:        chapter.            (line  811)
-* index entry within itemize <2>:        chapter.            (line 1569)
-* index entry within multitable:         chapter.            (line  210)
-* index entry within multitable <1>:     chapter.            (line  827)
-* index entry within multitable <2>:     chapter.            (line 1586)
-* t–ruc:                                 chapter.            (line 2043)
-* T–ruc:                                 chapter.            (line 2043)
+* index entry within itemize <1>:        chapter.            (line  820)
+* index entry within itemize <2>:        chapter.            (line 1587)
+* index entry within multitable:         chapter.            (line  219)
+* index entry within multitable <1>:     chapter.            (line  845)
+* index entry within multitable <2>:     chapter.            (line 1613)
+* t–ruc:                                 chapter.            (line 2070)
+* T–ruc:                                 chapter.            (line 2070)
 * vtable i--tem code kbdinputstyle:      chapter.            (line  133)
-* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  750)
-* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1507)
+* vtable i--tem code kbdinputstyle <1>:  chapter.            (line  759)
+* vtable i--tem code kbdinputstyle <2>:  chapter.            (line 1525)
 * vtable i--tem default kbdinputstyle:   chapter.            (line  128)
-* vtable i--tem default kbdinputstyle <1>: chapter.          (line  745)
-* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1502)
+* vtable i--tem default kbdinputstyle <1>: chapter.          (line  754)
+* vtable i--tem default kbdinputstyle <2>: chapter.          (line 1520)
 * vtable i--tem distinct kbdinputstyle:  chapter.            (line  143)
-* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  760)
-* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1517)
+* vtable i--tem distinct kbdinputstyle <1>: chapter.         (line  769)
+* vtable i--tem distinct kbdinputstyle <2>: chapter.         (line 1535)
 * vtable i--tem example kbdinputstyle:   chapter.            (line  138)
-* vtable i--tem example kbdinputstyle <1>: chapter.          (line  755)
-* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1512)
+* vtable i--tem example kbdinputstyle <1>: chapter.          (line  764)
+* vtable i--tem example kbdinputstyle <2>: chapter.          (line 1530)
 * vtable i--tem in example code kbdinputstyle: chapter.      (line  135)
-* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  752)
-* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1509)
+* vtable i--tem in example code kbdinputstyle <1>: chapter.  (line  761)
+* vtable i--tem in example code kbdinputstyle <2>: chapter.  (line 1527)
 * vtable i--tem in example default kbdinputstyle: chapter.   (line  130)
 * vtable i--tem in example default kbdinputstyle <1>: chapter.
-                                                             (line  747)
+                                                             (line  756)
 * vtable i--tem in example default kbdinputstyle <2>: chapter.
-                                                             (line 1504)
+                                                             (line 1522)
 * vtable i--tem in example distinct kbdinputstyle: chapter.  (line  145)
 * vtable i--tem in example distinct kbdinputstyle <1>: chapter.
-                                                             (line  762)
+                                                             (line  771)
 * vtable i--tem in example distinct kbdinputstyle <2>: chapter.
-                                                             (line 1519)
+                                                             (line 1537)
 * vtable i--tem in example example kbdinputstyle: chapter.   (line  140)
 * vtable i--tem in example example kbdinputstyle <1>: chapter.
-                                                             (line  757)
+                                                             (line  766)
 * vtable i--tem in example example kbdinputstyle <2>: chapter.
-                                                             (line 1514)
+                                                             (line 1532)
 
 * Menu:
 
 * --foption:                             chapter.            (line   28)
-* --foption <1>:                         chapter.            (line  645)
-* --foption <2>:                         chapter.            (line 1273)
-* .:                                     chapter.            (line 2043)
-* ?:                                     chapter.            (line 2043)
+* --foption <1>:                         chapter.            (line  654)
+* --foption <2>:                         chapter.            (line 1291)
+* .:                                     chapter.            (line 2070)
+* ?:                                     chapter.            (line 2070)
 * ``:                                    chapter.            (line   28)
-* `` <1>:                                chapter.            (line  645)
-* `` <2>:                                chapter.            (line 1273)
-* a:                                     chapter.            (line  283)
-* a <1>:                                 chapter.            (line  486)
-* a <2>:                                 chapter.            (line  587)
-* a <3>:                                 chapter.            (line  900)
-* a <4>:                                 chapter.            (line 1103)
-* a <5>:                                 chapter.            (line 1204)
-* a <6>:                                 chapter.            (line 1658)
-* a <7>:                                 chapter.            (line 1862)
-* a <8>:                                 chapter.            (line 1991)
-* a <9>:                                 chapter.            (line 2043)
-* after:                                 chapter.            (line  598)
-* after <1>:                             chapter.            (line 1215)
-* after <2>:                             chapter.            (line 2002)
-* arg2:                                  chapter.            (line  406)
-* arg2 <1>:                              chapter.            (line 1023)
-* arg2 <2>:                              chapter.            (line 1784)
-* b:                                     chapter.            (line  487)
-* b <1>:                                 chapter.            (line  588)
-* b <2>:                                 chapter.            (line 1104)
-* b <3>:                                 chapter.            (line 1205)
-* b <4>:                                 chapter.            (line 1863)
-* b <5>:                                 chapter.            (line 1992)
-* bidule machin:                         chapter.            (line  277)
-* bidule machin <1>:                     chapter.            (line  894)
-* bidule machin <2>:                     chapter.            (line 1652)
-* d--effn_name:                          chapter.            (line  258)
-* d--effn_name <1>:                      chapter.            (line  875)
-* d--effn_name <2>:                      chapter.            (line 1633)
-* d--efmac_name:                         chapter.            (line  343)
-* d--efmac_name <1>:                     chapter.            (line  960)
-* d--efmac_name <2>:                     chapter.            (line 1720)
-* d--efmethod_name on c--lass:           chapter.            (line  370)
-* d--efmethod_name on c--lass <1>:       chapter.            (line  987)
-* d--efmethod_name on c--lass <2>:       chapter.            (line 1747)
-* d--efop_name on c--lass:               chapter.            (line  331)
-* d--efop_name on c--lass <1>:           chapter.            (line  334)
-* d--efop_name on c--lass <2>:           chapter.            (line  948)
-* d--efop_name on c--lass <3>:           chapter.            (line  951)
-* d--efop_name on c--lass <4>:           chapter.            (line 1708)
-* d--efop_name on c--lass <5>:           chapter.            (line 1711)
-* d--efspec_name:                        chapter.            (line  346)
-* d--efspec_name <1>:                    chapter.            (line  963)
-* d--efspec_name <2>:                    chapter.            (line 1723)
-* d--eftypefn_name:                      chapter.            (line  304)
-* d--eftypefn_name <1>:                  chapter.            (line  307)
-* d--eftypefn_name <2>:                  chapter.            (line  921)
-* d--eftypefn_name <3>:                  chapter.            (line  924)
-* d--eftypefn_name <4>:                  chapter.            (line 1681)
-* d--eftypefn_name <5>:                  chapter.            (line 1684)
-* d--eftypefn_name2:                     chapter.            (line  381)
-* d--eftypefn_name2 <1>:                 chapter.            (line  998)
-* d--eftypefn_name2 <2>:                 chapter.            (line 1759)
-* d--eftypefun_name:                     chapter.            (line  358)
-* d--eftypefun_name <1>:                 chapter.            (line  975)
-* d--eftypefun_name <2>:                 chapter.            (line 1735)
-* d--eftypemethod_name on c--lass:       chapter.            (line  373)
-* d--eftypemethod_name on c--lass <1>:   chapter.            (line  990)
-* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1750)
-* d--eftypeop_name on c--lass:           chapter.            (line  310)
-* d--eftypeop_name on c--lass <1>:       chapter.            (line  313)
-* d--eftypeop_name on c--lass <2>:       chapter.            (line  927)
-* d--eftypeop_name on c--lass <3>:       chapter.            (line  930)
-* d--eftypeop_name on c--lass <4>:       chapter.            (line 1687)
-* d--eftypeop_name on c--lass <5>:       chapter.            (line 1690)
-* d--eftypeop_name2 on c--lass2:         chapter.            (line  386)
-* d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  391)
-* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1003)
-* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1008)
-* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1764)
-* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1769)
-* d--efun_name:                          chapter.            (line  340)
-* d--efun_name <1>:                      chapter.            (line  957)
-* d--efun_name <2>:                      chapter.            (line 1717)
-* de--ffn_name:                          chapter.            (line  261)
-* de--ffn_name <1>:                      chapter.            (line  878)
-* de--ffn_name <2>:                      chapter.            (line 1636)
-* deffn:                                 chapter.            (line  286)
-* deffn <1>:                             chapter.            (line  288)
-* deffn <2>:                             chapter.            (line  903)
-* deffn <3>:                             chapter.            (line  905)
-* deffn <4>:                             chapter.            (line 1662)
-* deffn <5>:                             chapter.            (line 1664)
-* deffnx:                                chapter.            (line  284)
-* deffnx <1>:                            chapter.            (line  289)
-* deffnx <2>:                            chapter.            (line  901)
-* deffnx <3>:                            chapter.            (line  906)
-* deffnx <4>:                            chapter.            (line 1659)
-* deffnx <5>:                            chapter.            (line 1665)
-* f---aa:                                chapter.            (line 2043)
-* f---bb, f---cc:                        chapter.            (line 2043)
-* f---ddd, f---eee, ffff:                chapter.            (line 2043)
-* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2043)
-* followed:                              chapter.            (line  280)
-* followed <1>:                          chapter.            (line  596)
-* followed <2>:                          chapter.            (line  897)
-* followed <3>:                          chapter.            (line 1213)
-* followed <4>:                          chapter.            (line 1655)
-* followed <5>:                          chapter.            (line 2000)
-* I:                                     chapter.            (line  265)
-* I <1>:                                 chapter.            (line  291)
-* I <2>:                                 chapter.            (line  882)
-* I <3>:                                 chapter.            (line  908)
-* I <4>:                                 chapter.            (line 1640)
-* I <5>:                                 chapter.            (line 1667)
-* id i ule:                              chapter.            (line  271)
-* id i ule <1>:                          chapter.            (line  888)
-* id i ule <2>:                          chapter.            (line 1646)
-* id ule:                                chapter.            (line  270)
-* id ule <1>:                            chapter.            (line  887)
-* id ule <2>:                            chapter.            (line 1645)
-* log trap:                              chapter.            (line  267)
-* log trap <1>:                          chapter.            (line  884)
-* log trap <2>:                          chapter.            (line 1642)
-* log trap1:                             chapter.            (line  268)
-* log trap1 <1>:                         chapter.            (line  885)
-* log trap1 <2>:                         chapter.            (line 1643)
-* log trap2:                             chapter.            (line  269)
-* log trap2 <1>:                         chapter.            (line  886)
-* log trap2 <2>:                         chapter.            (line 1644)
-* machin:                                chapter.            (line  276)
-* machin <1>:                            chapter.            (line  278)
-* machin <2>:                            chapter.            (line  592)
-* machin <3>:                            chapter.            (line  593)
-* machin <4>:                            chapter.            (line  594)
-* machin <5>:                            chapter.            (line  595)
-* machin <6>:                            chapter.            (line  893)
-* machin <7>:                            chapter.            (line  895)
-* machin <8>:                            chapter.            (line 1209)
-* machin <9>:                            chapter.            (line 1210)
-* machin <10>:                           chapter.            (line 1211)
-* machin <11>:                           chapter.            (line 1212)
-* machin <12>:                           chapter.            (line 1651)
-* machin <13>:                           chapter.            (line 1653)
-* machin <14>:                           chapter.            (line 1996)
-* machin <15>:                           chapter.            (line 1997)
-* machin <16>:                           chapter.            (line 1998)
-* machin <17>:                           chapter.            (line 1999)
-* n--ame:                                chapter.            (line  298)
-* n--ame <1>:                            chapter.            (line  301)
-* n--ame <2>:                            chapter.            (line  915)
-* n--ame <3>:                            chapter.            (line  918)
-* n--ame <4>:                            chapter.            (line 1675)
-* n--ame <5>:                            chapter.            (line 1678)
-* name2:                                 chapter.            (line  376)
-* name2 <1>:                             chapter.            (line  993)
-* name2 <2>:                             chapter.            (line 1754)
-* t--ruc:                                chapter.            (line 2043)
-* T--ruc:                                chapter.            (line 2043)
-* truc:                                  chapter.            (line  266)
-* truc <1>:                              chapter.            (line  292)
-* truc <2>:                              chapter.            (line  883)
-* truc <3>:                              chapter.            (line  909)
-* truc <4>:                              chapter.            (line 1641)
-* truc <5>:                              chapter.            (line 1668)
-* xxx, zzz:                              chapter.            (line 2043)
+* `` <1>:                                chapter.            (line  654)
+* `` <2>:                                chapter.            (line 1291)
+* a:                                     chapter.            (line  292)
+* a <1>:                                 chapter.            (line  495)
+* a <2>:                                 chapter.            (line  596)
+* a <3>:                                 chapter.            (line  918)
+* a <4>:                                 chapter.            (line 1121)
+* a <5>:                                 chapter.            (line 1222)
+* a <6>:                                 chapter.            (line 1685)
+* a <7>:                                 chapter.            (line 1889)
+* a <8>:                                 chapter.            (line 2018)
+* a <9>:                                 chapter.            (line 2070)
+* after:                                 chapter.            (line  607)
+* after <1>:                             chapter.            (line 1233)
+* after <2>:                             chapter.            (line 2029)
+* arg2:                                  chapter.            (line  415)
+* arg2 <1>:                              chapter.            (line 1041)
+* arg2 <2>:                              chapter.            (line 1811)
+* b:                                     chapter.            (line  496)
+* b <1>:                                 chapter.            (line  597)
+* b <2>:                                 chapter.            (line 1122)
+* b <3>:                                 chapter.            (line 1223)
+* b <4>:                                 chapter.            (line 1890)
+* b <5>:                                 chapter.            (line 2019)
+* bidule machin:                         chapter.            (line  286)
+* bidule machin <1>:                     chapter.            (line  912)
+* bidule machin <2>:                     chapter.            (line 1679)
+* d--effn_name:                          chapter.            (line  267)
+* d--effn_name <1>:                      chapter.            (line  893)
+* d--effn_name <2>:                      chapter.            (line 1660)
+* d--efmac_name:                         chapter.            (line  352)
+* d--efmac_name <1>:                     chapter.            (line  978)
+* d--efmac_name <2>:                     chapter.            (line 1747)
+* d--efmethod_name on c--lass:           chapter.            (line  379)
+* d--efmethod_name on c--lass <1>:       chapter.            (line 1005)
+* d--efmethod_name on c--lass <2>:       chapter.            (line 1774)
+* d--efop_name on c--lass:               chapter.            (line  340)
+* d--efop_name on c--lass <1>:           chapter.            (line  343)
+* d--efop_name on c--lass <2>:           chapter.            (line  966)
+* d--efop_name on c--lass <3>:           chapter.            (line  969)
+* d--efop_name on c--lass <4>:           chapter.            (line 1735)
+* d--efop_name on c--lass <5>:           chapter.            (line 1738)
+* d--efspec_name:                        chapter.            (line  355)
+* d--efspec_name <1>:                    chapter.            (line  981)
+* d--efspec_name <2>:                    chapter.            (line 1750)
+* d--eftypefn_name:                      chapter.            (line  313)
+* d--eftypefn_name <1>:                  chapter.            (line  316)
+* d--eftypefn_name <2>:                  chapter.            (line  939)
+* d--eftypefn_name <3>:                  chapter.            (line  942)
+* d--eftypefn_name <4>:                  chapter.            (line 1708)
+* d--eftypefn_name <5>:                  chapter.            (line 1711)
+* d--eftypefn_name2:                     chapter.            (line  390)
+* d--eftypefn_name2 <1>:                 chapter.            (line 1016)
+* d--eftypefn_name2 <2>:                 chapter.            (line 1786)
+* d--eftypefun_name:                     chapter.            (line  367)
+* d--eftypefun_name <1>:                 chapter.            (line  993)
+* d--eftypefun_name <2>:                 chapter.            (line 1762)
+* d--eftypemethod_name on c--lass:       chapter.            (line  382)
+* d--eftypemethod_name on c--lass <1>:   chapter.            (line 1008)
+* d--eftypemethod_name on c--lass <2>:   chapter.            (line 1777)
+* d--eftypeop_name on c--lass:           chapter.            (line  319)
+* d--eftypeop_name on c--lass <1>:       chapter.            (line  322)
+* d--eftypeop_name on c--lass <2>:       chapter.            (line  945)
+* d--eftypeop_name on c--lass <3>:       chapter.            (line  948)
+* d--eftypeop_name on c--lass <4>:       chapter.            (line 1714)
+* d--eftypeop_name on c--lass <5>:       chapter.            (line 1717)
+* d--eftypeop_name2 on c--lass2:         chapter.            (line  395)
+* d--eftypeop_name2 on c--lass2 <1>:     chapter.            (line  400)
+* d--eftypeop_name2 on c--lass2 <2>:     chapter.            (line 1021)
+* d--eftypeop_name2 on c--lass2 <3>:     chapter.            (line 1026)
+* d--eftypeop_name2 on c--lass2 <4>:     chapter.            (line 1791)
+* d--eftypeop_name2 on c--lass2 <5>:     chapter.            (line 1796)
+* d--efun_name:                          chapter.            (line  349)
+* d--efun_name <1>:                      chapter.            (line  975)
+* d--efun_name <2>:                      chapter.            (line 1744)
+* de--ffn_name:                          chapter.            (line  270)
+* de--ffn_name <1>:                      chapter.            (line  896)
+* de--ffn_name <2>:                      chapter.            (line 1663)
+* deffn:                                 chapter.            (line  295)
+* deffn <1>:                             chapter.            (line  297)
+* deffn <2>:                             chapter.            (line  921)
+* deffn <3>:                             chapter.            (line  923)
+* deffn <4>:                             chapter.            (line 1689)
+* deffn <5>:                             chapter.            (line 1691)
+* deffnx:                                chapter.            (line  293)
+* deffnx <1>:                            chapter.            (line  298)
+* deffnx <2>:                            chapter.            (line  919)
+* deffnx <3>:                            chapter.            (line  924)
+* deffnx <4>:                            chapter.            (line 1686)
+* deffnx <5>:                            chapter.            (line 1692)
+* f---aa:                                chapter.            (line 2070)
+* f---bb, f---cc:                        chapter.            (line 2070)
+* f---ddd, f---eee, ffff:                chapter.            (line 2070)
+* f---ggg, f---hhh fjjj, f---kkk, f---lll: chapter.          (line 2070)
+* followed:                              chapter.            (line  289)
+* followed <1>:                          chapter.            (line  605)
+* followed <2>:                          chapter.            (line  915)
+* followed <3>:                          chapter.            (line 1231)
+* followed <4>:                          chapter.            (line 1682)
+* followed <5>:                          chapter.            (line 2027)
+* I:                                     chapter.            (line  274)
+* I <1>:                                 chapter.            (line  300)
+* I <2>:                                 chapter.            (line  900)
+* I <3>:                                 chapter.            (line  926)
+* I <4>:                                 chapter.            (line 1667)
+* I <5>:                                 chapter.            (line 1694)
+* id i ule:                              chapter.            (line  280)
+* id i ule <1>:                          chapter.            (line  906)
+* id i ule <2>:                          chapter.            (line 1673)
+* id ule:                                chapter.            (line  279)
+* id ule <1>:                            chapter.            (line  905)
+* id ule <2>:                            chapter.            (line 1672)
+* log trap:                              chapter.            (line  276)
+* log trap <1>:                          chapter.            (line  902)
+* log trap <2>:                          chapter.            (line 1669)
+* log trap1:                             chapter.            (line  277)
+* log trap1 <1>:                         chapter.            (line  903)
+* log trap1 <2>:                         chapter.            (line 1670)
+* log trap2:                             chapter.            (line  278)
+* log trap2 <1>:                         chapter.            (line  904)
+* log trap2 <2>:                         chapter.            (line 1671)
+* machin:                                chapter.            (line  285)
+* machin <1>:                            chapter.            (line  287)
+* machin <2>:                            chapter.            (line  601)
+* machin <3>:                            chapter.            (line  602)
+* machin <4>:                            chapter.            (line  603)
+* machin <5>:                            chapter.            (line  604)
+* machin <6>:                            chapter.            (line  911)
+* machin <7>:                            chapter.            (line  913)
+* machin <8>:                            chapter.            (line 1227)
+* machin <9>:                            chapter.            (line 1228)
+* machin <10>:                           chapter.            (line 1229)
+* machin <11>:                           chapter.            (line 1230)
+* machin <12>:                           chapter.            (line 1678)
+* machin <13>:                           chapter.            (line 1680)
+* machin <14>:                           chapter.            (line 2023)
+* machin <15>:                           chapter.            (line 2024)
+* machin <16>:                           chapter.            (line 2025)
+* machin <17>:                           chapter.            (line 2026)
+* n--ame:                                chapter.            (line  307)
+* n--ame <1>:                            chapter.            (line  310)
+* n--ame <2>:                            chapter.            (line  933)
+* n--ame <3>:                            chapter.            (line  936)
+* n--ame <4>:                            chapter.            (line 1702)
+* n--ame <5>:                            chapter.            (line 1705)
+* name2:                                 chapter.            (line  385)
+* name2 <1>:                             chapter.            (line 1011)
+* name2 <2>:                             chapter.            (line 1781)
+* t--ruc:                                chapter.            (line 2070)
+* T--ruc:                                chapter.            (line 2070)
+* truc:                                  chapter.            (line  275)
+* truc <1>:                              chapter.            (line  301)
+* truc <2>:                              chapter.            (line  901)
+* truc <3>:                              chapter.            (line  927)
+* truc <4>:                              chapter.            (line 1668)
+* truc <5>:                              chapter.            (line 1695)
+* xxx, zzz:                              chapter.            (line 2070)
 
 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 b5da6b9626..79b9885c45 100644
--- a/tp/tests/layout/res_parser/formatting_rawtext/formatting.txt
+++ b/tp/tests/layout/res_parser/formatting_rawtext/formatting.txt
@@ -359,6 +359,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
@@ -1137,6 +1146,15 @@ e--mph item
 i--tem 1
 i--tem 2
 
+without brace w a--b
+without brace w c--d
+
+with w a--b
+with w c--d
+
+line w a--b
+line with w c--d
+
 1. e--numerate
 
 3. first third
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 822721c774..d0a0fee64d 100644
--- a/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
+++ b/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
@@ -330,6 +330,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
@@ -1215,6 +1224,21 @@ i&ndash;tem 1
 </li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&ndash;b
+</li><li><!-- /@w --> without brace w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&ndash;b
+</li><li><!-- /@w --> with w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&ndash;b
+</li><li><!-- /@w --> on a line line with w c&ndash;d
+</li></ul>
+
 <ol>
 <li> e&ndash;numerate
 </li></ol>
@@ -2214,6 +2238,21 @@ i&ndash;tem 1
 </li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&ndash;b
+</li><li><!-- /@w --> without brace w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&ndash;b
+</li><li><!-- /@w --> with w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&ndash;b
+</li><li><!-- /@w --> on a line line with w c&ndash;d
+</li></ul>
+
 <ol>
 <li> e&ndash;numerate
 </li></ol>
@@ -3247,6 +3286,21 @@ i&ndash;tem 1
 </li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&ndash;b
+</li><li><!-- /@w --> without brace w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&ndash;b
+</li><li><!-- /@w --> with w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&ndash;b
+</li><li><!-- /@w --> on a line line with w c&ndash;d
+</li></ul>
+
 <ol>
 <li> e&ndash;numerate
 </li></ol>
@@ -4289,6 +4343,24 @@ error&rarr; &rarr; - &lowast; -| &rArr;
 </pre></li></ul>
 <pre class="example">
 
+</pre><ul class="no-bullet">
+<li><!-- /@w --> <pre class="example">without brace w a--b
+</pre></li><li><!-- /@w --> <pre class="example">without brace w c--d
+</pre></li></ul>
+<pre class="example">
+
+</pre><ul class="no-bullet">
+<li><!-- /@w --> <pre class="example">with w a--b
+</pre></li><li><!-- /@w --> <pre class="example">with w c--d
+</pre></li></ul>
+<pre class="example">
+
+</pre><ul class="no-bullet">
+<li><!-- /@w --> on a line <pre class="example">line w a--b
+</pre></li><li><!-- /@w --> on a line <pre class="example">line with w c--d
+</pre></li></ul>
+<pre class="example">
+
 </pre><ol>
 <li> <pre class="example">e--numerate
 </pre></li></ol>
@@ -5391,6 +5463,21 @@ i&ndash;tem 1
 </li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&ndash;b
+</li><li><!-- /@w --> without brace w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&ndash;b
+</li><li><!-- /@w --> with w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&ndash;b
+</li><li><!-- /@w --> on a line line with w c&ndash;d
+</li></ul>
+
 <ol>
 <li> e&ndash;numerate
 </li></ol>
diff --git a/tp/tests/layout/res_parser/formatting_textcontent/formatting 
b/tp/tests/layout/res_parser/formatting_textcontent/formatting
index df31c083f7..18c8ace9f1 100644
--- a/tp/tests/layout/res_parser/formatting_textcontent/formatting
+++ b/tp/tests/layout/res_parser/formatting_textcontent/formatting
@@ -319,6 +319,15 @@ e--mph item
 i--tem 1
 i--tem 2
 
+without brace w a--b
+without brace w c--d
+
+with w a--b
+with w c--d
+
+line w a--b
+line with w c--d
+
 e--numerate
 
 first third
@@ -1074,6 +1083,15 @@ e--mph item
 i--tem 1
 i--tem 2
 
+without brace w a--b
+without brace w c--d
+
+with w a--b
+with w c--d
+
+line w a--b
+line with w c--d
+
 e--numerate
 
 first third
@@ -1850,6 +1868,15 @@ e--mph item
 i--tem 1
 i--tem 2
 
+without brace w a--b
+without brace w c--d
+
+with w a--b
+with w c--d
+
+line w a--b
+line with w c--d
+
 e--numerate
 
 first third
@@ -2600,6 +2627,15 @@ e--mph item
 i--tem 1
 i--tem 2
 
+without brace w a--b
+without brace w c--d
+
+with w a--b
+with w c--d
+
+line w a--b
+line with w c--d
+
 e--numerate
 
 first third
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 30abcee103..2d8cea33cf 100644
--- a/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
@@ -1215,6 +1224,21 @@ i&ndash;tem 1
 </li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&ndash;b
+</li><li><!-- /@w --> without brace w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&ndash;b
+</li><li><!-- /@w --> with w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&ndash;b
+</li><li><!-- /@w --> on a line line with w c&ndash;d
+</li></ul>
+
 <ol>
 <li> e&ndash;numerate
 </li></ol>
@@ -2215,6 +2239,21 @@ i&ndash;tem 1
 </li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&ndash;b
+</li><li><!-- /@w --> without brace w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&ndash;b
+</li><li><!-- /@w --> with w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&ndash;b
+</li><li><!-- /@w --> on a line line with w c&ndash;d
+</li></ul>
+
 <ol>
 <li> e&ndash;numerate
 </li></ol>
@@ -3271,6 +3310,21 @@ i&ndash;tem 1
 </li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&ndash;b
+</li><li><!-- /@w --> without brace w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&ndash;b
+</li><li><!-- /@w --> with w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&ndash;b
+</li><li><!-- /@w --> on a line line with w c&ndash;d
+</li></ul>
+
 <ol>
 <li> e&ndash;numerate
 </li></ol>
@@ -4270,6 +4324,21 @@ i&ndash;tem 1
 </li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&ndash;b
+</li><li><!-- /@w --> without brace w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&ndash;b
+</li><li><!-- /@w --> with w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&ndash;b
+</li><li><!-- /@w --> on a line line with w c&ndash;d
+</li></ul>
+
 <ol>
 <li> e&ndash;numerate
 </li></ol>
@@ -5313,6 +5382,24 @@ error&rarr; &rarr; - &lowast; -| &rArr;
 </pre></li></ul>
 <pre class="example">
 
+</pre><ul class="no-bullet">
+<li><!-- /@w --> <pre class="example">without brace w a--b
+</pre></li><li><!-- /@w --> <pre class="example">without brace w c--d
+</pre></li></ul>
+<pre class="example">
+
+</pre><ul class="no-bullet">
+<li><!-- /@w --> <pre class="example">with w a--b
+</pre></li><li><!-- /@w --> <pre class="example">with w c--d
+</pre></li></ul>
+<pre class="example">
+
+</pre><ul class="no-bullet">
+<li><!-- /@w --> on a line <pre class="example">line w a--b
+</pre></li><li><!-- /@w --> on a line <pre class="example">line with w c--d
+</pre></li></ul>
+<pre class="example">
+
 </pre><ol>
 <li> <pre class="example">e--numerate
 </pre></li></ol>
diff --git a/tp/tests/layout/res_parser/formatting_xhtml/formatting.html 
b/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
index 95afa36102..14750983df 100644
--- a/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
@@ -1215,6 +1224,21 @@ i&ndash;tem 1
 </li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&ndash;b
+</li><li><!-- /@w --> without brace w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&ndash;b
+</li><li><!-- /@w --> with w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&ndash;b
+</li><li><!-- /@w --> on a line line with w c&ndash;d
+</li></ul>
+
 <ol>
 <li> e&ndash;numerate
 </li></ol>
@@ -2215,6 +2239,21 @@ i&ndash;tem 1
 </li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&ndash;b
+</li><li><!-- /@w --> without brace w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&ndash;b
+</li><li><!-- /@w --> with w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&ndash;b
+</li><li><!-- /@w --> on a line line with w c&ndash;d
+</li></ul>
+
 <ol>
 <li> e&ndash;numerate
 </li></ol>
@@ -3271,6 +3310,21 @@ i&ndash;tem 1
 </li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&ndash;b
+</li><li><!-- /@w --> without brace w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&ndash;b
+</li><li><!-- /@w --> with w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&ndash;b
+</li><li><!-- /@w --> on a line line with w c&ndash;d
+</li></ul>
+
 <ol>
 <li> e&ndash;numerate
 </li></ol>
@@ -4270,6 +4324,21 @@ i&ndash;tem 1
 </li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&ndash;b
+</li><li><!-- /@w --> without brace w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&ndash;b
+</li><li><!-- /@w --> with w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&ndash;b
+</li><li><!-- /@w --> on a line line with w c&ndash;d
+</li></ul>
+
 <ol>
 <li> e&ndash;numerate
 </li></ol>
@@ -5313,6 +5382,24 @@ error&rarr; &rarr; - &lowast; -| &rArr;
 </pre></li></ul>
 <pre class="example">
 
+</pre><ul class="no-bullet">
+<li><!-- /@w --> <pre class="example">without brace w a--b
+</pre></li><li><!-- /@w --> <pre class="example">without brace w c--d
+</pre></li></ul>
+<pre class="example">
+
+</pre><ul class="no-bullet">
+<li><!-- /@w --> <pre class="example">with w a--b
+</pre></li><li><!-- /@w --> <pre class="example">with w c--d
+</pre></li></ul>
+<pre class="example">
+
+</pre><ul class="no-bullet">
+<li><!-- /@w --> on a line <pre class="example">line w a--b
+</pre></li><li><!-- /@w --> on a line <pre class="example">line with w c--d
+</pre></li></ul>
+<pre class="example">
+
 </pre><ol>
 <li> <pre class="example">e--numerate
 </pre></li></ol>
diff --git a/tp/tests/layout/res_parser/formatting_xml/formatting.xml 
b/tp/tests/layout/res_parser/formatting_xml/formatting.xml
index d7bb9ec4e2..16014a2587 100644
--- a/tp/tests/layout/res_parser/formatting_xml/formatting.xml
+++ b/tp/tests/layout/res_parser/formatting_xml/formatting.xml
@@ -418,6 +418,21 @@ something, other thing
 @item i--tem 2
 @end itemize
 
+@itemize @w
+@item without brace w a--b
+@item without brace w c--d
+@end itemize
+
+@itemize @w{}
+@item with w a--b
+@item with w c--d
+@end itemize
+
+@itemize @w{} on a line
+@item line w a--b
+@item line with w c--d
+@end itemize
+
 @enumerate
 @item e--numerate
 @end enumerate
@@ -1442,6 +1457,21 @@ quotation
 </para></listitem><listitem spaces=" "><prepend>&bullet; a&textndash;n itemize 
line</prepend><para>i&textndash;tem 2
 </para></listitem></itemize>
 
+<itemize commandarg="w" spaces=" " endspaces=" ">
+<listitem spaces=" "><prepend></prepend><para>without brace w a&textndash;b
+</para></listitem><listitem spaces=" "><prepend></prepend><para>without brace 
w c&textndash;d
+</para></listitem></itemize>
+
+<itemize commandarg="w" spaces=" " endspaces=" 
"><itemprepend><w></w></itemprepend>
+<listitem spaces=" "><prepend><w></w></prepend><para>with w a&textndash;b
+</para></listitem><listitem spaces=" "><prepend><w></w></prepend><para>with w 
c&textndash;d
+</para></listitem></itemize>
+
+<itemize spaces=" " endspaces=" "><itemprepend><w></w> on a line</itemprepend>
+<listitem spaces=" "><prepend><w></w> on a line</prepend><para>line w 
a&textndash;b
+</para></listitem><listitem spaces=" "><prepend><w></w> on a 
line</prepend><para>line with w c&textndash;d
+</para></listitem></itemize>
+
 <enumerate first="1" endspaces=" ">
 <listitem spaces=" "><para>e&textndash;numerate
 </para></listitem></enumerate>
@@ -2454,6 +2484,21 @@ quotation
 </para></listitem><listitem spaces=" "><prepend>&bullet; a&textndash;n itemize 
line</prepend><para>i&textndash;tem 2
 </para></listitem></itemize>
 
+<itemize commandarg="w" spaces=" " endspaces=" ">
+<listitem spaces=" "><prepend></prepend><para>without brace w a&textndash;b
+</para></listitem><listitem spaces=" "><prepend></prepend><para>without brace 
w c&textndash;d
+</para></listitem></itemize>
+
+<itemize commandarg="w" spaces=" " endspaces=" 
"><itemprepend><w></w></itemprepend>
+<listitem spaces=" "><prepend><w></w></prepend><para>with w a&textndash;b
+</para></listitem><listitem spaces=" "><prepend><w></w></prepend><para>with w 
c&textndash;d
+</para></listitem></itemize>
+
+<itemize spaces=" " endspaces=" "><itemprepend><w></w> on a line</itemprepend>
+<listitem spaces=" "><prepend><w></w> on a line</prepend><para>line w 
a&textndash;b
+</para></listitem><listitem spaces=" "><prepend><w></w> on a 
line</prepend><para>line with w c&textndash;d
+</para></listitem></itemize>
+
 <enumerate first="1" endspaces=" ">
 <listitem spaces=" "><para>e&textndash;numerate
 </para></listitem></enumerate>
@@ -3493,6 +3538,21 @@ quotation
 </para></listitem><listitem spaces=" "><prepend>&bullet; a&textndash;n itemize 
line</prepend><para>i&textndash;tem 2
 </para></listitem></itemize>
 
+<itemize commandarg="w" spaces=" " endspaces=" ">
+<listitem spaces=" "><prepend></prepend><para>without brace w a&textndash;b
+</para></listitem><listitem spaces=" "><prepend></prepend><para>without brace 
w c&textndash;d
+</para></listitem></itemize>
+
+<itemize commandarg="w" spaces=" " endspaces=" 
"><itemprepend><w></w></itemprepend>
+<listitem spaces=" "><prepend><w></w></prepend><para>with w a&textndash;b
+</para></listitem><listitem spaces=" "><prepend><w></w></prepend><para>with w 
c&textndash;d
+</para></listitem></itemize>
+
+<itemize spaces=" " endspaces=" "><itemprepend><w></w> on a line</itemprepend>
+<listitem spaces=" "><prepend><w></w> on a line</prepend><para>line w 
a&textndash;b
+</para></listitem><listitem spaces=" "><prepend><w></w> on a 
line</prepend><para>line with w c&textndash;d
+</para></listitem></itemize>
+
 <enumerate first="1" endspaces=" ">
 <listitem spaces=" "><para>e&textndash;numerate
 </para></listitem></enumerate>
@@ -4499,6 +4559,21 @@ indent in quotation
 </pre></listitem><listitem spaces=" "><prepend>&bullet; a--n itemize 
line</prepend><pre xml:space="preserve">i--tem 2
 </pre></listitem></itemize>
 <pre xml:space="preserve">
+</pre><itemize commandarg="w" spaces=" " endspaces=" ">
+<listitem spaces=" "><prepend></prepend><pre xml:space="preserve">without 
brace w a--b
+</pre></listitem><listitem spaces=" "><prepend></prepend><pre 
xml:space="preserve">without brace w c--d
+</pre></listitem></itemize>
+<pre xml:space="preserve">
+</pre><itemize commandarg="w" spaces=" " endspaces=" 
"><itemprepend><w></w></itemprepend>
+<listitem spaces=" "><prepend><w></w></prepend><pre xml:space="preserve">with 
w a--b
+</pre></listitem><listitem spaces=" "><prepend><w></w></prepend><pre 
xml:space="preserve">with w c--d
+</pre></listitem></itemize>
+<pre xml:space="preserve">
+</pre><itemize spaces=" " endspaces=" "><itemprepend><w></w> on a 
line</itemprepend>
+<listitem spaces=" "><prepend><w></w> on a line</prepend><pre 
xml:space="preserve">line w a--b
+</pre></listitem><listitem spaces=" "><prepend><w></w> on a line</prepend><pre 
xml:space="preserve">line with w c--d
+</pre></listitem></itemize>
+<pre xml:space="preserve">
 </pre><enumerate first="1" endspaces=" ">
 <listitem spaces=" "><pre xml:space="preserve">e--numerate
 </pre></listitem></enumerate>
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 edf8ec9518..fa087f1a30 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/anchor.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/anchor.html
@@ -332,6 +332,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
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 18a8d96463..f80e4362f7 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
@@ -1335,6 +1344,21 @@ i&ndash;tem 1
 </li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&ndash;b
+</li><li><!-- /@w --> without brace w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&ndash;b
+</li><li><!-- /@w --> with w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&ndash;b
+</li><li><!-- /@w --> on a line line with w c&ndash;d
+</li></ul>
+
 <ol>
 <li> e&ndash;numerate
 </li></ol>
@@ -2434,6 +2458,21 @@ i&ndash;tem 1
 </li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
 </li></ul>
 
+<ul class="no-bullet">
+<li><!-- /@w --> without brace w a&ndash;b
+</li><li><!-- /@w --> without brace w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> with w a&ndash;b
+</li><li><!-- /@w --> with w c&ndash;d
+</li></ul>
+
+<ul class="no-bullet">
+<li><!-- /@w --> on a line line w a&ndash;b
+</li><li><!-- /@w --> on a line line with w c&ndash;d
+</li></ul>
+
 <ol>
 <li> e&ndash;numerate
 </li></ol>
@@ -3577,6 +3616,24 @@ $">
 </pre></li></ul>
 <pre class="example">
 
+</pre><ul class="no-bullet">
+<li><!-- /@w --> <pre class="example">without brace w a--b
+</pre></li><li><!-- /@w --> <pre class="example">without brace w c--d
+</pre></li></ul>
+<pre class="example">
+
+</pre><ul class="no-bullet">
+<li><!-- /@w --> <pre class="example">with w a--b
+</pre></li><li><!-- /@w --> <pre class="example">with w c--d
+</pre></li></ul>
+<pre class="example">
+
+</pre><ul class="no-bullet">
+<li><!-- /@w --> on a line <pre class="example">line w a--b
+</pre></li><li><!-- /@w --> on a line <pre class="example">line with w c--d
+</pre></li></ul>
+<pre class="example">
+
 </pre><ol>
 <li> <pre class="example">e--numerate
 </pre></li></ol>
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 3d493dc953..da5ba41982 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/chapter2.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/chapter2.html
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
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 d9590755fd..3e876ec5dd 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/index.htm
+++ b/tp/tests/tex_html/res_parser/formatting_singular/index.htm
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
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 906af5cb67..b91055878a 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/index.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/index.html
@@ -332,6 +332,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
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 dff1ebb66f..17250b31fc 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
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
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 7902d16e2b..1ae04cd5ca 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
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
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 52574f7b09..8143090adc 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
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
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 731563c90b..4135ef82d4 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
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
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 486ef8daea..1410e7b901 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
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
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 cc0f112e7b..54814ed160 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/subsection.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/subsection.html
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
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 777fe97e52..41750e0b36 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
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third
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 cd30f20e7e..96b9baecfd 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
@@ -331,6 +331,15 @@ e-mph item
 i-tem 1
 i-tem 2
 
+without brace w a-b
+without brace w c-d
+
+with w a-b
+with w c-d
+
+line w a-b
+line with w c-d
+
 1. e-numerate
 
 3. first third



reply via email to

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