branch master updated: * tp/Texinfo/Convert/HTML.pm (%css_map, _convert_preformatted_type): set a class for menu entry description in preformatted in menu to have it inline to avoid a line break caused by <pre> being a block element. Note that it does not seem to be rendered as intended, at least in firefox there still seems to be a line break.

[Patrice Dumas]

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

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 1e0b56dbd3 * tp/Texinfo/Convert/HTML.pm (%css_map, 
_convert_preformatted_type): set a class for menu entry description in 
preformatted in menu to have it inline to avoid a line break caused by <pre> 
being a block element.  Note that it does not seem to be rendered as intended, 
at least in firefox there still seems to be a line break.
1e0b56dbd3 is described below

commit 1e0b56dbd3548b90c1088e1e7399a354e8073c68
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Wed Jan 12 17:28:26 2022 +0100

    * tp/Texinfo/Convert/HTML.pm (%css_map, _convert_preformatted_type):
    set a class for menu entry description in preformatted in menu to
    have it inline to avoid a line break caused by <pre> being a block
    element.  Note that it does not seem to be rendered as intended, at
    least in firefox there still seems to be a line break.
---
 ChangeLog                                          |  8 ++++++++
 tp/Texinfo/Convert/HTML.pm                         | 22 +++++++++++++++-------
 tp/t/results/html_tests/simple_menu_in_example.pl  |  7 ++++---
 tp/t/results/menu/menu_in_example.pl               |  7 ++++---
 tp/t/results/menu/sc_in_menu.pl                    |  3 ++-
 tp/t/results/morecoverage/formatting_fr.pl         |  5 +++--
 .../layout/res_parser/formatting/formatting.html   |  3 ++-
 .../formatting_enable_encoding/formatting.html     |  3 ++-
 .../EPUB/xhtml/formatting.xhtml                    |  3 ++-
 .../EPUB/xhtml/chapter.xhtml                       |  3 ++-
 .../res_parser/formatting_fr_icons/formatting.html |  3 ++-
 .../res_parser/formatting_html/formatting.html     |  3 ++-
 .../res_parser/formatting_html_nodes/chapter.html  |  3 ++-
 .../formatting_inline_css/formatting.html          |  2 +-
 .../res_parser/formatting_mathjax/formatting.html  |  3 ++-
 .../res_parser/formatting_nodes/chapter.html       |  3 ++-
 .../formatting_numerical_entities/formatting.html  |  3 ++-
 .../formatting_regions/formatting_regions.html     |  3 ++-
 .../formatting_weird_quotes/formatting.html        |  3 ++-
 .../res_parser/formatting_xhtml/formatting.html    |  3 ++-
 .../res_parser/formatting_singular/chapter.html    |  3 ++-
 21 files changed, 65 insertions(+), 31 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cc786b9d8d..b07ed91c93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2022-01-11  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Convert/HTML.pm (%css_map, _convert_preformatted_type):
+       set a class for menu entry description in preformatted in menu to
+       have it inline to avoid a line break caused by <pre> being a block
+       element.  Note that it does not seem to be rendered as intended, at
+       least in firefox there still seems to be a line break.
+
 2022-01-11  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Convert/HTML.pm (_convert_listoffloats_command): add
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 816709ec80..075ba36b48 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -1733,6 +1733,10 @@ my %css_map = (
 
      'ul.toc-numbered-mark'   => 'list-style: none',
      'pre.menu-comment-preformatted' => 'font-family: serif',
+     # using display: inline is an attempt to avoid a line break when in
+     # preformatted in menu.  In 2022 it does not seems to work in firefox, 
there
+     # is still a line break.
+     'pre.menu-entry-description-preformatted' => 'font-family: serif; 
display: inline',
      'pre.menu-preformatted'  => 'font-family: serif',
      'a.summary-letter-printindex'  => 'text-decoration: none',
      'pre.display-preformatted'     => 'font-family: inherit',
@@ -4976,14 +4980,18 @@ sub _convert_preformatted_type($$$$)
   # menu_entry_description is always in a preformatted container
   # in the tree, as the whole menu is meant to be an
   # environment where spaces and newlines are preserved.
-  #
-  # However, if not in preformatted block command (nor in SIMPLE_MENU),
-  # we don't preserve spaces and newlines in menu_entry_description,
-  # instead the whole menu_entry is in a table, so no <pre> in that situation
   if ($element->{'parent'}->{'type'}
-      and $element->{'parent'}->{'type'} eq 'menu_entry_description'
-      and !$self->_in_preformatted_in_menu()) {
-    return $content;
+      and $element->{'parent'}->{'type'} eq 'menu_entry_description') {
+    if (!$self->_in_preformatted_in_menu()) {
+      # If not in preformatted block command (nor in SIMPLE_MENU),
+      # we don't preserve spaces and newlines in menu_entry_description,
+      # instead the whole menu_entry is in a table, so no <pre> in that 
situation
+      return $content;
+    } else {
+      # if directly in description, we want to avoid the linebreak that
+      # comes with pre being a block level element, so set a special class
+      $pre_class = 'menu-entry-description-preformatted';
+    }
   }
 
   if ($self->in_string()) {
diff --git a/tp/t/results/html_tests/simple_menu_in_example.pl 
b/tp/t/results/html_tests/simple_menu_in_example.pl
index 3deab09302..761d0f7bec 100644
--- a/tp/t/results/html_tests/simple_menu_in_example.pl
+++ b/tp/t/results/html_tests/simple_menu_in_example.pl
@@ -757,6 +757,7 @@ $result_converted{'html'}->{'simple_menu_in_example'} = 
'<!DOCTYPE html>
 <!--
 div.example {margin-left: 3.2em}
 pre.menu-comment-preformatted {font-family: serif}
+pre.menu-entry-description-preformatted {font-family: serif; display: inline}
 pre.menu-preformatted {font-family: serif}
 -->
 </style>
@@ -768,7 +769,7 @@ pre.menu-preformatted {font-family: serif}
 <h1 class="node" id="Top">Top</h1>
 
 <div class="example">
-<div class="menu">&bull; <a href="entry.html#Top" 
accesskey="1">(entry)</a>::<pre class="menu-preformatted">
+<div class="menu">&bull; <a href="entry.html#Top" 
accesskey="1">(entry)</a>::<pre class="menu-entry-description-preformatted">
 
 </pre><table class="cartouche" border="1"><tr><td>
 <pre class="menu-preformatted">in cartouche in description in menu in example
@@ -780,8 +781,8 @@ pre.menu-preformatted {font-family: serif}
 </pre></td></tr></table>
 <pre class="menu-comment-preformatted">
 
-</pre>&bull; <a href="node.html#menu" accesskey="2">(node) menu</a>::      
<pre class="menu-preformatted">a node in menu
-</pre>&bull; a menu name:<a href="other.html#node" accesskey="3">(other) 
node</a>.<pre class="menu-preformatted">
+</pre>&bull; <a href="node.html#menu" accesskey="2">(node) menu</a>::      
<pre class="menu-entry-description-preformatted">a node in menu
+</pre>&bull; a menu name:<a href="other.html#node" accesskey="3">(other) 
node</a>.<pre class="menu-entry-description-preformatted">
 
 </pre></div>
 </div>
diff --git a/tp/t/results/menu/menu_in_example.pl 
b/tp/t/results/menu/menu_in_example.pl
index f51369af6f..c27ecb64d3 100644
--- a/tp/t/results/menu/menu_in_example.pl
+++ b/tp/t/results/menu/menu_in_example.pl
@@ -741,6 +741,7 @@ $result_converted{'html'}->{'menu_in_example'} = '<!DOCTYPE 
html>
 <!--
 div.example {margin-left: 3.2em}
 pre.menu-comment-preformatted {font-family: serif}
+pre.menu-entry-description-preformatted {font-family: serif; display: inline}
 pre.menu-preformatted {font-family: serif}
 -->
 </style>
@@ -753,7 +754,7 @@ pre.menu-preformatted {font-family: serif}
 
 <div class="example">
 <table class="menu" border="0" cellspacing="0"><tr><td>
-<pre class="menu-preformatted">&bull; <a href="entry.html#Top" 
accesskey="1">(entry)</a>::</pre><pre class="menu-preformatted">
+<pre class="menu-preformatted">&bull; <a href="entry.html#Top" 
accesskey="1">(entry)</a>::</pre><pre 
class="menu-entry-description-preformatted">
 
 </pre><table class="cartouche" border="1"><tr><td>
 <pre class="menu-preformatted">in cartouche in description in menu in example
@@ -765,8 +766,8 @@ pre.menu-preformatted {font-family: serif}
 </pre></td></tr></table>
 <pre class="menu-comment-preformatted">
 
-</pre><pre class="menu-preformatted">&bull; <a href="node.html#menu" 
accesskey="2">(node) menu</a>::      </pre><pre class="menu-preformatted">a 
node in menu
-</pre><pre class="menu-preformatted">&bull; a menu name:<a 
href="other.html#node" accesskey="3">(other) node</a>. </pre><pre 
class="menu-preformatted">
+</pre><pre class="menu-preformatted">&bull; <a href="node.html#menu" 
accesskey="2">(node) menu</a>::      </pre><pre 
class="menu-entry-description-preformatted">a node in menu
+</pre><pre class="menu-preformatted">&bull; a menu name:<a 
href="other.html#node" accesskey="3">(other) node</a>. </pre><pre 
class="menu-entry-description-preformatted">
 
 </pre></td></tr></table>
 </div>
diff --git a/tp/t/results/menu/sc_in_menu.pl b/tp/t/results/menu/sc_in_menu.pl
index 5b3b636c3c..e7626a7a46 100644
--- a/tp/t/results/menu/sc_in_menu.pl
+++ b/tp/t/results/menu/sc_in_menu.pl
@@ -1132,6 +1132,7 @@ $result_converted{'html'}->{'sc_in_menu'} = '<!DOCTYPE 
html>
 <!--
 div.example {margin-left: 3.2em}
 pre.menu-comment-preformatted {font-family: serif}
+pre.menu-entry-description-preformatted {font-family: serif; display: inline}
 pre.menu-preformatted {font-family: serif}
 -->
 </style>
@@ -1170,7 +1171,7 @@ Previous: <a href="#Top" accesskey="p" 
rel="prev">Top</a>, Up: <a href="#Top" ac
 
 <div class="example">
 <table class="menu" border="0" cellspacing="0"><tr><td>
-<pre class="menu-preformatted">&bull; <span class="sc">EXAMPLE VALUE</span>:<a 
href="dir.html#EXAMPLE-NODE" accesskey="1">(dir)<span class="sc">EXAMPLE 
NODE</span></a>.   </pre><pre class="menu-preformatted"><span 
class="sc">EXAMPLE DESCRIP TION</span>
+<pre class="menu-preformatted">&bull; <span class="sc">EXAMPLE VALUE</span>:<a 
href="dir.html#EXAMPLE-NODE" accesskey="1">(dir)<span class="sc">EXAMPLE 
NODE</span></a>.   </pre><pre class="menu-entry-description-preformatted"><span 
class="sc">EXAMPLE DESCRIP TION</span>
 </pre><pre class="menu-comment-preformatted">
 
 <span class="sc">EXAMPLE COMMENT</span>
diff --git a/tp/t/results/morecoverage/formatting_fr.pl 
b/tp/t/results/morecoverage/formatting_fr.pl
index 600c362cc6..759b71a258 100644
--- a/tp/t/results/morecoverage/formatting_fr.pl
+++ b/tp/t/results/morecoverage/formatting_fr.pl
@@ -4902,6 +4902,7 @@ div.example {margin-left: 3.2em}
 h1.centerchap {text-align:center}
 h3.subtitle {text-align:right}
 pre.menu-comment-preformatted {font-family: serif}
+pre.menu-entry-description-preformatted {font-family: serif; display: inline}
 pre.menu-preformatted {font-family: serif}
 span.program-in-footer {font-size: smaller}
 ul.toc-numbered-mark {list-style: none}
@@ -5089,7 +5090,7 @@ Menu comment
 </p>
 <div class="format">
 <table class="menu" border="0" cellspacing="0"><tr><td>
-<pre class="menu-preformatted">&bull; <a 
href="#s_002d_002dect_002cion">s--ect,ion</a>:: </pre><pre 
class="menu-preformatted">s&ndash;ect,ion
+<pre class="menu-preformatted">&bull; <a 
href="#s_002d_002dect_002cion">s--ect,ion</a>:: </pre><pre 
class="menu-entry-description-preformatted">s&ndash;ect,ion
 </pre><pre class="menu-comment-preformatted">
 
 Menu comment
@@ -5654,7 +5655,7 @@ Menu comment
 </p>
 <div class="format">
 <table class="menu" border="0" cellspacing="0"><tr><td>
-<pre class="menu-preformatted">&bull; <a 
href="#s_002d_002dect_002cion">s--ect,ion</a>:: </pre><pre 
class="menu-preformatted">s&ndash;ect,ion
+<pre class="menu-preformatted">&bull; <a 
href="#s_002d_002dect_002cion">s--ect,ion</a>:: </pre><pre 
class="menu-entry-description-preformatted">s&ndash;ect,ion
 </pre><pre class="menu-comment-preformatted">
 
 Menu comment
diff --git a/tp/tests/layout/res_parser/formatting/formatting.html 
b/tp/tests/layout/res_parser/formatting/formatting.html
index 4902fb3373..247c756277 100644
--- a/tp/tests/layout/res_parser/formatting/formatting.html
+++ b/tp/tests/layout/res_parser/formatting/formatting.html
@@ -815,6 +815,7 @@ p.flushright-paragraph {text-align:right}
 pre.display-preformatted {font-family: inherit}
 pre.format-preformatted {font-family: inherit}
 pre.menu-comment-preformatted {font-family: serif}
+pre.menu-entry-description-preformatted {font-family: serif; display: inline}
 pre.menu-preformatted {font-family: serif}
 span.program-in-footer {font-size: smaller}
 span.r {font-family: initial; font-weight: normal}
@@ -6749,7 +6750,7 @@ Invalid use of @':
 </p>
 <div class="format">
 <table class="menu" border="0" cellspacing="0"><tr><td>
-<pre class="menu-preformatted">&bull; <a 
href="#s_002d_002dect_002cion">s--ect,ion</a>:: </pre><pre 
class="menu-preformatted">s&ndash;ect,ion
+<pre class="menu-preformatted">&bull; <a 
href="#s_002d_002dect_002cion">s--ect,ion</a>:: </pre><pre 
class="menu-entry-description-preformatted">s&ndash;ect,ion
 </pre><pre class="menu-comment-preformatted">
 
 Menu comment
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 60425d12e8..a75ad43254 100644
--- a/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
@@ -815,6 +815,7 @@ p.flushright-paragraph {text-align:right}
 pre.display-preformatted {font-family: inherit}
 pre.format-preformatted {font-family: inherit}
 pre.menu-comment-preformatted {font-family: serif}
+pre.menu-entry-description-preformatted {font-family: serif; display: inline}
 pre.menu-preformatted {font-family: serif}
 span.program-in-footer {font-size: smaller}
 span.r {font-family: initial; font-weight: normal}
@@ -6749,7 +6750,7 @@ Invalid use of @':
 </p>
 <div class="format">
 <table class="menu" border="0" cellspacing="0"><tr><td>
-<pre class="menu-preformatted">&bull; <a 
href="#s_002d_002dect_002cion">s--ect,ion</a>:: </pre><pre 
class="menu-preformatted">s–ect,ion
+<pre class="menu-preformatted">&bull; <a 
href="#s_002d_002dect_002cion">s--ect,ion</a>:: </pre><pre 
class="menu-entry-description-preformatted">s–ect,ion
 </pre><pre class="menu-comment-preformatted">
 
 Menu comment
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 2f8eccbdc2..65392bec72 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
@@ -815,6 +815,7 @@ p.flushright-paragraph {text-align:right}
 pre.display-preformatted {font-family: inherit}
 pre.format-preformatted {font-family: inherit}
 pre.menu-comment-preformatted {font-family: serif}
+pre.menu-entry-description-preformatted {font-family: serif; display: inline}
 pre.menu-preformatted {font-family: serif}
 span.program-in-footer {font-size: smaller}
 span.r {font-family: initial; font-weight: normal}
@@ -6724,7 +6725,7 @@ Invalid use of @':
 </p>
 <div class="format">
 <table class="menu" border="0" cellspacing="0"><tr><td>
-<pre class="menu-preformatted">&#8226; <a 
href="#s_002d_002dect_002cion">s--ect&#44;ion</a>:: </pre><pre 
class="menu-preformatted">s&#8211;ect&#44;ion
+<pre class="menu-preformatted">&#8226; <a 
href="#s_002d_002dect_002cion">s--ect&#44;ion</a>:: </pre><pre 
class="menu-entry-description-preformatted">s&#8211;ect&#44;ion
 </pre><pre class="menu-comment-preformatted">
 
 Menu comment
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 a2d6abc253..b045d0fe1b 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
@@ -813,6 +813,7 @@ p.flushright-paragraph {text-align:right}
 pre.display-preformatted {font-family: inherit}
 pre.format-preformatted {font-family: inherit}
 pre.menu-comment-preformatted {font-family: serif}
+pre.menu-entry-description-preformatted {font-family: serif; display: inline}
 pre.menu-preformatted {font-family: serif}
 span.program-in-footer {font-size: smaller}
 span.r {font-family: initial; font-weight: normal}
@@ -4668,7 +4669,7 @@ Invalid use of @':
 </p>
 <div class="format">
 <table class="menu" border="0" cellspacing="0"><tr><td>
-<pre class="menu-preformatted">&#8226; <a 
href="s_002d_002dect_002cion.xhtml">s--ect&#44;ion</a>:: </pre><pre 
class="menu-preformatted">s&#8211;ect&#44;ion
+<pre class="menu-preformatted">&#8226; <a 
href="s_002d_002dect_002cion.xhtml">s--ect&#44;ion</a>:: </pre><pre 
class="menu-entry-description-preformatted">s&#8211;ect&#44;ion
 </pre><pre class="menu-comment-preformatted">
 
 Menu comment
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 f8087068fc..6c9a9a1837 100644
--- a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
@@ -815,6 +815,7 @@ p.flushright-paragraph {text-align:right}
 pre.display-preformatted {font-family: inherit}
 pre.format-preformatted {font-family: inherit}
 pre.menu-comment-preformatted {font-family: serif}
+pre.menu-entry-description-preformatted {font-family: serif; display: inline}
 pre.menu-preformatted {font-family: serif}
 span.program-in-footer {font-size: smaller}
 span.r {font-family: initial; font-weight: normal}
@@ -6749,7 +6750,7 @@ Invalid use of @':
 </p>
 <div class="format">
 <table class="menu" border="0" cellspacing="0"><tr><td>
-<pre class="menu-preformatted">&bull; <a 
href="#s_002d_002dect_002cion">s--ect,ion</a>:: </pre><pre 
class="menu-preformatted">s&ndash;ect,ion
+<pre class="menu-preformatted">&bull; <a 
href="#s_002d_002dect_002cion">s--ect,ion</a>:: </pre><pre 
class="menu-entry-description-preformatted">s&ndash;ect,ion
 </pre><pre class="menu-comment-preformatted">
 
 Menu comment
diff --git a/tp/tests/layout/res_parser/formatting_html/formatting.html 
b/tp/tests/layout/res_parser/formatting_html/formatting.html
index 4902fb3373..247c756277 100644
--- a/tp/tests/layout/res_parser/formatting_html/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html/formatting.html
@@ -815,6 +815,7 @@ p.flushright-paragraph {text-align:right}
 pre.display-preformatted {font-family: inherit}
 pre.format-preformatted {font-family: inherit}
 pre.menu-comment-preformatted {font-family: serif}
+pre.menu-entry-description-preformatted {font-family: serif; display: inline}
 pre.menu-preformatted {font-family: serif}
 span.program-in-footer {font-size: smaller}
 span.r {font-family: initial; font-weight: normal}
@@ -6749,7 +6750,7 @@ Invalid use of @':
 </p>
 <div class="format">
 <table class="menu" border="0" cellspacing="0"><tr><td>
-<pre class="menu-preformatted">&bull; <a 
href="#s_002d_002dect_002cion">s--ect,ion</a>:: </pre><pre 
class="menu-preformatted">s&ndash;ect,ion
+<pre class="menu-preformatted">&bull; <a 
href="#s_002d_002dect_002cion">s--ect,ion</a>:: </pre><pre 
class="menu-entry-description-preformatted">s&ndash;ect,ion
 </pre><pre class="menu-comment-preformatted">
 
 Menu comment
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 f17bfe30a6..f412cf35fc 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
@@ -813,6 +813,7 @@ p.flushright-paragraph {text-align:right}
 pre.display-preformatted {font-family: inherit}
 pre.format-preformatted {font-family: inherit}
 pre.menu-comment-preformatted {font-family: serif}
+pre.menu-entry-description-preformatted {font-family: serif; display: inline}
 pre.menu-preformatted {font-family: serif}
 span.program-in-footer {font-size: smaller}
 span.r {font-family: initial; font-weight: normal}
@@ -4683,7 +4684,7 @@ Invalid use of @':
 </p>
 <div class="format">
 <table class="menu" border="0" cellspacing="0"><tr><td>
-<pre class="menu-preformatted">&bull; <a 
href="s_002d_002dect_002cion.html">s--ect,ion</a>:: </pre><pre 
class="menu-preformatted">s&ndash;ect,ion
+<pre class="menu-preformatted">&bull; <a 
href="s_002d_002dect_002cion.html">s--ect,ion</a>:: </pre><pre 
class="menu-entry-description-preformatted">s&ndash;ect,ion
 </pre><pre class="menu-comment-preformatted">
 
 Menu comment
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 56ea5acab2..a296ddf231 100644
--- a/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
@@ -6726,7 +6726,7 @@ Invalid use of @':
 </p>
 <div class="format">
 <table class="menu" border="0" cellspacing="0"><tr><td>
-<pre class="menu-preformatted" style="font-family: serif">&bull; <a 
href="#s_002d_002dect_002cion">s--ect,ion</a>:: </pre><pre 
class="menu-preformatted" style="font-family: serif">s&ndash;ect,ion
+<pre class="menu-preformatted" style="font-family: serif">&bull; <a 
href="#s_002d_002dect_002cion">s--ect,ion</a>:: </pre><pre 
class="menu-entry-description-preformatted" style="font-family: serif; display: 
inline">s&ndash;ect,ion
 </pre><pre class="menu-comment-preformatted" style="font-family: serif">
 
 Menu comment
diff --git a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html 
b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
index 4ab4654365..160420863f 100644
--- a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
@@ -815,6 +815,7 @@ p.flushright-paragraph {text-align:right}
 pre.display-preformatted {font-family: inherit}
 pre.format-preformatted {font-family: inherit}
 pre.menu-comment-preformatted {font-family: serif}
+pre.menu-entry-description-preformatted {font-family: serif; display: inline}
 pre.menu-preformatted {font-family: serif}
 span.program-in-footer {font-size: smaller}
 span.r {font-family: initial; font-weight: normal}
@@ -6759,7 +6760,7 @@ Invalid use of @':
 </p>
 <div class="format">
 <table class="menu" border="0" cellspacing="0"><tr><td>
-<pre class="menu-preformatted">&bull; <a 
href="#s_002d_002dect_002cion">s--ect,ion</a>:: </pre><pre 
class="menu-preformatted">s&ndash;ect,ion
+<pre class="menu-preformatted">&bull; <a 
href="#s_002d_002dect_002cion">s--ect,ion</a>:: </pre><pre 
class="menu-entry-description-preformatted">s&ndash;ect,ion
 </pre><pre class="menu-comment-preformatted">
 
 Menu comment
diff --git a/tp/tests/layout/res_parser/formatting_nodes/chapter.html 
b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
index f17bfe30a6..f412cf35fc 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
@@ -813,6 +813,7 @@ p.flushright-paragraph {text-align:right}
 pre.display-preformatted {font-family: inherit}
 pre.format-preformatted {font-family: inherit}
 pre.menu-comment-preformatted {font-family: serif}
+pre.menu-entry-description-preformatted {font-family: serif; display: inline}
 pre.menu-preformatted {font-family: serif}
 span.program-in-footer {font-size: smaller}
 span.r {font-family: initial; font-weight: normal}
@@ -4683,7 +4684,7 @@ Invalid use of @':
 </p>
 <div class="format">
 <table class="menu" border="0" cellspacing="0"><tr><td>
-<pre class="menu-preformatted">&bull; <a 
href="s_002d_002dect_002cion.html">s--ect,ion</a>:: </pre><pre 
class="menu-preformatted">s&ndash;ect,ion
+<pre class="menu-preformatted">&bull; <a 
href="s_002d_002dect_002cion.html">s--ect,ion</a>:: </pre><pre 
class="menu-entry-description-preformatted">s&ndash;ect,ion
 </pre><pre class="menu-comment-preformatted">
 
 Menu comment
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 96df201aa9..47580ed258 100644
--- a/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
@@ -815,6 +815,7 @@ p.flushright-paragraph {text-align:right}
 pre.display-preformatted {font-family: inherit}
 pre.format-preformatted {font-family: inherit}
 pre.menu-comment-preformatted {font-family: serif}
+pre.menu-entry-description-preformatted {font-family: serif; display: inline}
 pre.menu-preformatted {font-family: serif}
 span.program-in-footer {font-size: smaller}
 span.r {font-family: initial; font-weight: normal}
@@ -6749,7 +6750,7 @@ Invalid use of @':
 </p>
 <div class="format">
 <table class="menu" border="0" cellspacing="0"><tr><td>
-<pre class="menu-preformatted">&#8226; <a 
href="#s_002d_002dect_002cion">s--ect&#44;ion</a>:: </pre><pre 
class="menu-preformatted">s&#8211;ect&#44;ion
+<pre class="menu-preformatted">&#8226; <a 
href="#s_002d_002dect_002cion">s--ect&#44;ion</a>:: </pre><pre 
class="menu-entry-description-preformatted">s&#8211;ect&#44;ion
 </pre><pre class="menu-comment-preformatted">
 
 Menu comment
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 f1afce3d67..4b81d80d50 100644
--- a/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
+++ b/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
@@ -814,6 +814,7 @@ p.flushright-paragraph {text-align:right}
 pre.display-preformatted {font-family: inherit}
 pre.format-preformatted {font-family: inherit}
 pre.menu-comment-preformatted {font-family: serif}
+pre.menu-entry-description-preformatted {font-family: serif; display: inline}
 pre.menu-preformatted {font-family: serif}
 span.program-in-footer {font-size: smaller}
 span.r {font-family: initial; font-weight: normal}
@@ -6668,7 +6669,7 @@ html ''
 </p>
 <div class="format">
 <table class="menu" border="0" cellspacing="0"><tr><td>
-<pre class="menu-preformatted">&bull; <a 
href="#s_002d_002dect_002cion">s--ect,ion</a>:: </pre><pre 
class="menu-preformatted">s&ndash;ect,ion
+<pre class="menu-preformatted">&bull; <a 
href="#s_002d_002dect_002cion">s--ect,ion</a>:: </pre><pre 
class="menu-entry-description-preformatted">s&ndash;ect,ion
 </pre><pre class="menu-comment-preformatted">
 
 Menu comment
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 866aa916bb..f7009ab1ad 100644
--- a/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
@@ -815,6 +815,7 @@ p.flushright-paragraph {text-align:right}
 pre.display-preformatted {font-family: inherit}
 pre.format-preformatted {font-family: inherit}
 pre.menu-comment-preformatted {font-family: serif}
+pre.menu-entry-description-preformatted {font-family: serif; display: inline}
 pre.menu-preformatted {font-family: serif}
 span.program-in-footer {font-size: smaller}
 span.r {font-family: initial; font-weight: normal}
@@ -6749,7 +6750,7 @@ Invalid use of @':
 </p>
 <div class="format">
 <table class="menu" border="0" cellspacing="0"><tr><td>
-<pre class="menu-preformatted">&bull; <a 
href="#s_002d_002dect_002cion">s--ect,ion</a>:: </pre><pre 
class="menu-preformatted">s&ndash;ect,ion
+<pre class="menu-preformatted">&bull; <a 
href="#s_002d_002dect_002cion">s--ect,ion</a>:: </pre><pre 
class="menu-entry-description-preformatted">s&ndash;ect,ion
 </pre><pre class="menu-comment-preformatted">
 
 Menu comment
diff --git a/tp/tests/layout/res_parser/formatting_xhtml/formatting.html 
b/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
index 795ea88ff6..3a28b39ba1 100644
--- a/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
@@ -815,6 +815,7 @@ p.flushright-paragraph {text-align:right}
 pre.display-preformatted {font-family: inherit}
 pre.format-preformatted {font-family: inherit}
 pre.menu-comment-preformatted {font-family: serif}
+pre.menu-entry-description-preformatted {font-family: serif; display: inline}
 pre.menu-preformatted {font-family: serif}
 span.program-in-footer {font-size: smaller}
 span.r {font-family: initial; font-weight: normal}
@@ -6749,7 +6750,7 @@ Invalid use of @':
 </p>
 <div class="format">
 <table class="menu" border="0" cellspacing="0"><tr><td>
-<pre class="menu-preformatted">&bull; <a 
href="#s_002d_002dect_002cion">s--ect,ion</a>:: </pre><pre 
class="menu-preformatted">s&ndash;ect,ion
+<pre class="menu-preformatted">&bull; <a 
href="#s_002d_002dect_002cion">s--ect,ion</a>:: </pre><pre 
class="menu-entry-description-preformatted">s&ndash;ect,ion
 </pre><pre class="menu-comment-preformatted">
 
 Menu comment
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 2e6a3208e3..c7eb506ae9 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
@@ -814,6 +814,7 @@ p.flushright-paragraph {text-align:right}
 pre.display-preformatted {font-family: inherit}
 pre.format-preformatted {font-family: inherit}
 pre.menu-comment-preformatted {font-family: serif}
+pre.menu-entry-description-preformatted {font-family: serif; display: inline}
 pre.menu-preformatted {font-family: serif}
 span.r {font-family: initial; font-weight: normal}
 span.sansserif {font-family: sans-serif; font-weight: normal}
@@ -5008,7 +5009,7 @@ Invalid use of @':
 </p>
 <div class="format">
 <blockquote><table class="menu" border="0" cellspacing="0">
-<pre class="menu-preformatted">&bull; <a 
href="s_002d_002dect_002cion.html">s--ect,ion</a>:: </pre><pre 
class="menu-preformatted">s&ndash;ect,ion
+<pre class="menu-preformatted">&bull; <a 
href="s_002d_002dect_002cion.html">s--ect,ion</a>:: </pre><pre 
class="menu-entry-description-preformatted">s&ndash;ect,ion
 </pre><pre class="menu-comment-preformatted">
 
 Menu comment