[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/Convert/HTML.pm (_convert_listoffloa
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Texinfo/Convert/HTML.pm (_convert_listoffloats_command): add a class for caption or shortcaption in listoffloats, like caption-in-listoffloats |
|
Date: |
Wed, 12 Jan 2022 10:59:52 -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 90c1186a0b * tp/Texinfo/Convert/HTML.pm
(_convert_listoffloats_command): add a class for caption or shortcaption in
listoffloats, like caption-in-listoffloats
90c1186a0b is described below
commit 90c1186a0b7c22baf95d677990d7f6cb993c833f
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Wed Jan 12 16:59:40 2022 +0100
* tp/Texinfo/Convert/HTML.pm (_convert_listoffloats_command): add
a class for caption or shortcaption in listoffloats, like
caption-in-listoffloats
* tp/Texinfo/Convert/HTML.pm (_convert_menu_command)
(_convert_menu_entry_type, converter_initialize): in preformatted
in menu, let the description be converted as preformatted.
In case of SIMPLE_MENU use the menu conversion command, but
use a <div> instead of a table.
---
ChangeLog | 12 +
tp/Texinfo/Convert/HTML.pm | 53 +-
tp/t/html_tests.t | 22 +-
.../coverage/punctuation_in_line_commands.pl | 4 +-
tp/t/results/coverage_braces/test_image.pl | 4 +-
tp/t/results/float/anchor_in_caption.pl | 2 +-
tp/t/results/float/cindex_in_caption.pl | 2 +-
tp/t/results/float/complex_float.pl | 4 +-
.../float/empty_listoffloats_with_floats.pl | 2 +-
tp/t/results/float/float_copying.pl | 2 +-
tp/t/results/float/float_with_at_commands.pl | 2 +-
tp/t/results/float/footnote_in_caption.pl | 2 +-
.../results/float/footnote_in_caption_and_error.pl | 2 +-
.../float/numbering_captions_listoffloats.pl | 18 +-
.../float_copying/res_html/Copying-and-floats.html | 2 +-
tp/t/results/html_tests/simple_menu.pl | 61 ++
tp/t/results/html_tests/simple_menu_in_example.pl | 805 +++++++++++++++++++++
tp/t/results/menu/menu_in_example.pl | 8 +-
tp/t/results/menu/sc_in_menu.pl | 2 +-
tp/t/results/morecoverage/formatting_fr.pl | 4 +-
.../layout/res_parser/formatting/formatting.html | 2 +-
.../formatting_enable_encoding/formatting.html | 2 +-
.../EPUB/xhtml/formatting.xhtml | 2 +-
.../EPUB/xhtml/chapter.xhtml | 2 +-
.../res_parser/formatting_fr_icons/formatting.html | 2 +-
.../res_parser/formatting_html/formatting.html | 2 +-
.../res_parser/formatting_html32/formatting.html | 2 +-
.../res_parser/formatting_html_nodes/chapter.html | 2 +-
.../formatting_inline_css/formatting.html | 2 +-
.../res_parser/formatting_mathjax/formatting.html | 2 +-
.../res_parser/formatting_nodes/chapter.html | 2 +-
.../formatting_numerical_entities/formatting.html | 2 +-
.../formatting_regions/formatting_regions.html | 2 +-
.../formatting_weird_quotes/formatting.html | 2 +-
.../res_parser/formatting_xhtml/formatting.html | 2 +-
.../res_parser/formatting_singular/chapter.html | 2 +-
36 files changed, 973 insertions(+), 72 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 83a9df1628..cc786b9d8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2022-01-11 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/Convert/HTML.pm (_convert_listoffloats_command): add
+ a class for caption or shortcaption in listoffloats, like
+ caption-in-listoffloats
+
+ * tp/Texinfo/Convert/HTML.pm (_convert_menu_command)
+ (_convert_menu_entry_type, converter_initialize): in preformatted
+ in menu, let the description be converted as preformatted.
+ In case of SIMPLE_MENU use the menu conversion command, but
+ use a <div> instead of a table.
+
2022-01-11 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/Convert/HTML.pm (_default_format_navigation_panel):
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index b5a79d0633..816709ec80 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -3833,20 +3833,26 @@ sub _convert_listoffloats_command($$$$)
}
$result .= '</dt>';
my $caption;
+ my $caption_cmdname;
if ($float->{'extra'}->{'shortcaption'}) {
$caption = $float->{'extra'}->{'shortcaption'};
+ $caption_cmdname = 'shortcaption';
} elsif ($float->{'extra'}->{'caption'}) {
$caption = $float->{'extra'}->{'caption'};
+ $caption_cmdname = 'caption';
}
my $caption_text;
+ my $caption_class;
if ($caption) {
$caption_text = $self->convert_tree_new_formatting_context(
$caption->{'args'}->[0], $cmdname, 'listoffloats');
+ $caption_class = "${caption_cmdname}-in-${cmdname}";
} else {
$caption_text = '';
}
- $result .= '<dd>'.$caption_text.'</dd>'."\n";
+ $result .= $self->html_attribute_class('dd', $caption_class).'>'
+ .$caption_text.'</dd>'."\n";
}
return $result . "</dl>\n";
} else {
@@ -3885,6 +3891,11 @@ sub _convert_menu_command($$$$)
if ($self->in_string()) {
return $content;
}
+
+ if ($self->get_conf('SIMPLE_MENU')) {
+ return $self->html_attribute_class('div', $cmdname).'>'
+ .$content ."</div>\n";
+ }
my $begin_row = '';
my $end_row = '';
if ($self->_in_preformatted_in_menu()) {
@@ -3938,6 +3949,8 @@ sub _convert_float_command($$$$$)
my $prepended_text;
my $caption_text = '';
if ($prepended) {
+ # FIXME add a span with a class name for the prependend information
+ # if not empty?
$prepended_text = $self->convert_tree_new_formatting_context(
{'cmdname' => 'strong',
'args' => [{'type' => 'brace_command_arg',
@@ -3990,7 +4003,7 @@ sub _convert_quotation_command($$$$$)
my $attribution = '';
if ($command->{'extra'} and $command->{'extra'}->{'authors'}) {
# FIXME there is no easy way to mark with a class the @author
- # @-command. Add a span?
+ # @-command. Add a span or a div (@center is in a div)?
foreach my $author (@{$command->{'extra'}->{'authors'}}) {
my $centered_author = $self->gdt("\@center --- \@emph{{author}}\n",
{'author' => $author->{'args'}->[0]->{'contents'}});
@@ -4966,7 +4979,7 @@ sub _convert_preformatted_type($$$$)
#
# 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 here, not <pre>
+ # 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()) {
@@ -5008,6 +5021,7 @@ sub _convert_definfoenclose_type($$$$) {
my $command = shift;
my $content = shift;
+ # FIXME add a span to mark the original command as a class?
return $self->protect_text($command->{'extra'}->{'begin'}) . $content
.$self->protect_text($command->{'extra'}->{'end'});
}
@@ -5185,8 +5199,9 @@ sub _convert_menu_entry_type($$$)
my $MENU_SYMBOL = $self->get_conf('MENU_SYMBOL');
my $MENU_ENTRY_COLON = $self->get_conf('MENU_ENTRY_COLON');
- if ($self->_in_preformatted_in_menu() or $self->in_string()) {
- my $result = '';
+ my $in_string = $self->in_string();
+ if ($self->_in_preformatted_in_menu() or $in_string) {
+ my $result_name_node = '';
my $i = 0;
my @args = @{$command->{'args'}};
while (@args) {
@@ -5197,18 +5212,18 @@ sub _convert_menu_entry_type($$$)
my $name = $self->convert_tree(
{'type' => '_code', 'contents' => $arg->{'contents'}},
"menu_arg menu_entry_node preformatted [$i]");
- if ($href ne '' and !$self->in_string()) {
- $result .= "<a href=\"$href\"$rel$accesskey>".$name."</a>";
+ if ($href ne '' and !$in_string) {
+ $result_name_node .= "<a href=\"$href\"$rel$accesskey>".$name."</a>";
} else {
- $result .= $name;
+ $result_name_node .= $name;
}
} elsif ($arg->{'type'} and $arg->{'type'} eq 'menu_entry_leading_text')
{
my $text = $arg->{'text'};
$text =~ s/\*/$MENU_SYMBOL/;
- $result .= $text;
+ $result_name_node .= $text;
} else {
- $result .= $self->convert_tree($arg, "menu_arg preformatted [$i]");
+ $result_name_node .= $self->convert_tree($arg, "menu_arg preformatted
[$i]");
}
$i++;
}
@@ -5218,18 +5233,12 @@ sub _convert_menu_entry_type($$$)
$i++;
}
- if (!$self->get_conf('SIMPLE_MENU')) {
- $description =~ s/^<pre[^>]*>//;
- $description =~ s/<\/pre>$//;
- }
-
- $result = $result . $description;
-
- if (!$self->get_conf('SIMPLE_MENU')) {
+ if (!$self->get_conf('SIMPLE_MENU') and not $in_string) {
my $pre_class = $self->_preformatted_class();
- $result = $self->html_attribute_class('pre',
$pre_class).">".$result."</pre>";
+ $result_name_node = $self->html_attribute_class('pre', $pre_class).">"
+ .$result_name_node."</pre>";
}
- return $result;
+ return $result_name_node . $description;
}
my $name;
@@ -6320,10 +6329,6 @@ sub converter_initialize($)
} elsif (exists($default_commands_conversion{$command})) {
$self->{'commands_conversion'}->{$command}
= $default_commands_conversion{$command};
- if ($command eq 'menu' and $self->get_conf('SIMPLE_MENU')) {
- $self->{'commands_conversion'}->{$command}
- = $default_commands_conversion{'example'};
- }
}
}
}
diff --git a/tp/t/html_tests.t b/tp/t/html_tests.t
index 1151a36880..07dff9992e 100644
--- a/tp/t/html_tests.t
+++ b/tp/t/html_tests.t
@@ -275,8 +275,26 @@ in detaildescription
@end detailmenu
@end menu
-' ,{'SIMPLE_MENU' => 1, 'test_formats' => ['info']}
-],
+', {'SIMPLE_MENU' => 1, 'test_formats' => ['info']}, {'FORMAT_MENU' =>
'menu'}],
+['simple_menu_in_example',
+'@node Top
+
+@example
+@menu
+* (entry)::
+@cartouche
+in cartouche in description in menu in example
+@end cartouche
+
+@cartouche
+in cartouche in menu comment in menu in example
+@end cartouche
+
+* (node) menu:: a node in menu
+* a menu name:(other) node.
+@end menu
+@end example
+', {'SIMPLE_MENU' => 1, 'test_formats' => ['info']}, {'FORMAT_MENU' =>
'menu'}],
['character_number_leading_toc_stoc',
'@top top
@chapter 0
diff --git a/tp/t/results/coverage/punctuation_in_line_commands.pl
b/tp/t/results/coverage/punctuation_in_line_commands.pl
index bd680f0a19..09bccfdcfe 100644
--- a/tp/t/results/coverage/punctuation_in_line_commands.pl
+++ b/tp/t/results/coverage/punctuation_in_line_commands.pl
@@ -1211,8 +1211,8 @@
$result_converted{'html_text'}->{'punctuation_in_line_commands'} = '
</p>
<div class="caption"><p><strong class="strong">float type! After punc 2:
</strong>caption! After punc</p></div></div>
<dl class="listoffloats">
-<dt><a href="#float-label_0021-After-punc">float type! After punc
1</a></dt><dd><p>shortcaption! After punc</p></dd>
-<dt><a href="#label-with-caption">float type! After punc
2</a></dt><dd><p>caption! After punc</p></dd>
+<dt><a href="#float-label_0021-After-punc">float type! After punc
1</a></dt><dd class="shortcaption-in-listoffloats"><p>shortcaption! After
punc</p></dd>
+<dt><a href="#label-with-caption">float type! After punc 2</a></dt><dd
class="caption-in-listoffloats"><p>caption! After punc</p></dd>
</dl>
<a class="index-entry-id" id="index-index_0021-After-punc"></a>
diff --git a/tp/t/results/coverage_braces/test_image.pl
b/tp/t/results/coverage_braces/test_image.pl
index 6da5d833e6..e9aff3e818 100644
--- a/tp/t/results/coverage_braces/test_image.pl
+++ b/tp/t/results/coverage_braces/test_image.pl
@@ -3956,7 +3956,7 @@ In text <img class="image" src="f@i--le.. a@<"%@
< & @ % "
<p><strong class="strong">Image 1: </strong>In text <img class="image"
src="f@i--le.. a@<"%@ < & @ % " .ext@i--le..
a@<"%@ < & @ % " " alt="alt î–le.. a
<"%@ < & @ % " ">.</p></div></div>
<dl class="listoffloats">
-<dt><a href="#Image-with-commands">Image 1</a></dt><dd><img class="image"
src="f@i--le.. a@<"%@ < & @ % " .ext@i--le..
a@<"%@ < & @ % " " alt="f@i--le.. a@<"%@ <
& @ % " ">
+<dt><a href="#Image-with-commands">Image 1</a></dt><dd
class="caption-in-listoffloats"><img class="image" src="f@i--le..
a@<"%@ < & @ % " .ext@i--le.. a@<"%@ < &
@ % " " alt="f@i--le.. a@<"%@ < & @ % " ">
<p>In text <img class="image" src="f@i--le.. a@<"%@ < & @ %
" .ext@i--le.. a@<"%@ < & @ % " " alt="alt
î–le.. a
<"%@ < & @ % " ">.</p></dd>
@@ -4197,7 +4197,7 @@ In text <img class="image" src="f@i--le.. a@<"%@
< & @ % "
<p><strong class="strong">Image 1: </strong>In text <img class="image"
src="f@i--le.. a@<"%@ < & @ % " .ext@i--le..
a@<"%@ < & @ % " " alt="alt î–le.. a
<"%@ < & @ % " ">.</p></div></div>
<dl class="listoffloats">
-<dt><a href="#Image-with-commands">Image 1</a></dt><dd><img class="image"
src="f@i--le.. a@<"%@ < & @ % " .ext@i--le..
a@<"%@ < & @ % " " alt="f@i--le.. a@<"%@ <
& @ % " ">
+<dt><a href="#Image-with-commands">Image 1</a></dt><dd
class="caption-in-listoffloats"><img class="image" src="f@i--le..
a@<"%@ < & @ % " .ext@i--le.. a@<"%@ < &
@ % " " alt="f@i--le.. a@<"%@ < & @ % " ">
<p>In text <img class="image" src="f@i--le.. a@<"%@ < & @ %
" .ext@i--le.. a@<"%@ < & @ % " " alt="alt
î–le.. a
<"%@ < & @ % " ">.</p></dd>
diff --git a/tp/t/results/float/anchor_in_caption.pl
b/tp/t/results/float/anchor_in_caption.pl
index 4c86bd6318..ab5bc68438 100644
--- a/tp/t/results/float/anchor_in_caption.pl
+++ b/tp/t/results/float/anchor_in_caption.pl
@@ -437,7 +437,7 @@ $result_converted{'html'}->{'anchor_in_caption'} =
'<!DOCTYPE html>
<h1 class="node" id="Top">Top</h1>
<dl class="listoffloats">
-<dt><a href="#label">fl 1</a></dt><dd><p>in caption</p></dd>
+<dt><a href="#label">fl 1</a></dt><dd class="caption-in-listoffloats"><p>in
caption</p></dd>
</dl>
<div class="float" id="label">
diff --git a/tp/t/results/float/cindex_in_caption.pl
b/tp/t/results/float/cindex_in_caption.pl
index 22d7a8a6c2..2cda0f8d0c 100644
--- a/tp/t/results/float/cindex_in_caption.pl
+++ b/tp/t/results/float/cindex_in_caption.pl
@@ -532,7 +532,7 @@ a.summary-letter-printindex {text-decoration: none}
<h1 class="node" id="Top">Top</h1>
<dl class="listoffloats">
-<dt><a href="#label">fl 1</a></dt><dd><p>in caption
+<dt><a href="#label">fl 1</a></dt><dd class="caption-in-listoffloats"><p>in
caption
</p></dd>
</dl>
diff --git a/tp/t/results/float/complex_float.pl
b/tp/t/results/float/complex_float.pl
index 17a83b1220..e3a47937a2 100644
--- a/tp/t/results/float/complex_float.pl
+++ b/tp/t/results/float/complex_float.pl
@@ -4888,8 +4888,8 @@ Next: <a href="#chapter" accesskey="n" rel="next">A
chapter</a> </p>
<p>A list of floats at the beginning.
</p><dl class="listoffloats">
-<dt><a href="#text-with-a-lot-of-features">Text 1</a></dt><dd><p>TeX and <em
class="emph"><b class="b">téî</b><a class="url"
href="an_url">an_url</a></em> <small class="sc">AND</small> <tt class="verb">it
is @verb</tt> a word !@ Æ.</p></dd>
-<dt><a href="#float-with-a-lot-of-features-and-no-shortcaption">Text
1.1</a></dt><dd><p>An example of float caption<small
class="enddots">...</small> 2
+<dt><a href="#text-with-a-lot-of-features">Text 1</a></dt><dd
class="shortcaption-in-listoffloats"><p>TeX and <em class="emph"><b
class="b">téî</b><a class="url" href="an_url">an_url</a></em>
<small class="sc">AND</small> <tt class="verb">it is @verb</tt> a word !@
Æ.</p></dd>
+<dt><a href="#float-with-a-lot-of-features-and-no-shortcaption">Text
1.1</a></dt><dd class="caption-in-listoffloats"><p>An example of float
caption<small class="enddots">...</small> 2
An example 2.
</p><div class="example">
<pre class="example-preformatted">example 2
diff --git a/tp/t/results/float/empty_listoffloats_with_floats.pl
b/tp/t/results/float/empty_listoffloats_with_floats.pl
index e35c4afc91..c519ffae01 100644
--- a/tp/t/results/float/empty_listoffloats_with_floats.pl
+++ b/tp/t/results/float/empty_listoffloats_with_floats.pl
@@ -691,7 +691,7 @@
$result_converted{'html'}->{'empty_listoffloats_with_floats'} = '<!DOCTYPE html>
<div class="caption"><p>caption no label</p></div></div>
<dl class="listoffloats">
<dt><a href="#label1">1</a></dt><dd></dd>
-<dt><a href="#label2">2</a></dt><dd><p>caption with label</p></dd>
+<dt><a href="#label2">2</a></dt><dd class="caption-in-listoffloats"><p>caption
with label</p></dd>
</dl>
diff --git a/tp/t/results/float/float_copying.pl
b/tp/t/results/float/float_copying.pl
index bca9fb3024..7508773d2b 100644
--- a/tp/t/results/float/float_copying.pl
+++ b/tp/t/results/float/float_copying.pl
@@ -1680,7 +1680,7 @@ the author abandon his copyright.
<a class="index-entry-id" id="index-copying-indexed-caption-function"></a>
</div></div>
<dl class="listoffloats">
-<dt><a href="#public-domain">Copyright notice 1</a></dt><dd><p>The Public
Domain notice<a class="footnote" id="t_hlistoffloats_DOCF1_4"
href="#t_hlistoffloats_FOOT1_4"><sup>4</sup></a>
+<dt><a href="#public-domain">Copyright notice 1</a></dt><dd
class="caption-in-listoffloats"><p>The Public Domain notice<a class="footnote"
id="t_hlistoffloats_DOCF1_4" href="#t_hlistoffloats_FOOT1_4"><sup>4</sup></a>
</p>
</dd>
</dl>
diff --git a/tp/t/results/float/float_with_at_commands.pl
b/tp/t/results/float/float_with_at_commands.pl
index c886fb6724..6b7cc36fbd 100644
--- a/tp/t/results/float/float_with_at_commands.pl
+++ b/tp/t/results/float/float_with_at_commands.pl
@@ -599,7 +599,7 @@ $result_converted{'html'}->{'float_with_at_commands'} =
'<!DOCTYPE html>
<div class="caption"><p><strong class="strong">entrée 1: </strong>La
première entrée est importante</p></div></div>
<dl class="listoffloats">
-<dt><a href="#premi_00e8re-entr_00e9e">entrée 1</a></dt><dd><p>La
première entrée est importante</p></dd>
+<dt><a href="#premi_00e8re-entr_00e9e">entrée 1</a></dt><dd
class="caption-in-listoffloats"><p>La première entrée est
importante</p></dd>
</dl>
diff --git a/tp/t/results/float/footnote_in_caption.pl
b/tp/t/results/float/footnote_in_caption.pl
index 6cb0d57f4e..ce58b809cd 100644
--- a/tp/t/results/float/footnote_in_caption.pl
+++ b/tp/t/results/float/footnote_in_caption.pl
@@ -447,7 +447,7 @@ $result_converted{'html'}->{'footnote_in_caption'} =
'<!DOCTYPE html>
<h1 class="node" id="Top">Top</h1>
<dl class="listoffloats">
-<dt><a href="#label">fl 1</a></dt><dd><p>in caption<a class="footnote"
id="t_hlistoffloats_DOCF1_1"
href="#t_hlistoffloats_FOOT1_1"><sup>1</sup></a></p></dd>
+<dt><a href="#label">fl 1</a></dt><dd class="caption-in-listoffloats"><p>in
caption<a class="footnote" id="t_hlistoffloats_DOCF1_1"
href="#t_hlistoffloats_FOOT1_1"><sup>1</sup></a></p></dd>
</dl>
<div class="float" id="label">
diff --git a/tp/t/results/float/footnote_in_caption_and_error.pl
b/tp/t/results/float/footnote_in_caption_and_error.pl
index bbdb0756da..abf95ef34b 100644
--- a/tp/t/results/float/footnote_in_caption_and_error.pl
+++ b/tp/t/results/float/footnote_in_caption_and_error.pl
@@ -434,7 +434,7 @@
$result_converted{'html'}->{'footnote_in_caption_and_error'} = '<!DOCTYPE html>
<h1 class="node" id="Top">Top</h1>
<dl class="listoffloats">
-<dt><a href="#label">fl 1</a></dt><dd><p>in caption<a class="footnote"
id="t_hlistoffloats_DOCF1_1"
href="#t_hlistoffloats_FOOT1_1"><sup>1</sup></a></p></dd>
+<dt><a href="#label">fl 1</a></dt><dd class="caption-in-listoffloats"><p>in
caption<a class="footnote" id="t_hlistoffloats_DOCF1_1"
href="#t_hlistoffloats_FOOT1_1"><sup>1</sup></a></p></dd>
</dl>
<div class="float" id="label">
diff --git a/tp/t/results/float/numbering_captions_listoffloats.pl
b/tp/t/results/float/numbering_captions_listoffloats.pl
index a2a0e9674b..5191830cef 100644
--- a/tp/t/results/float/numbering_captions_listoffloats.pl
+++ b/tp/t/results/float/numbering_captions_listoffloats.pl
@@ -8278,18 +8278,18 @@ See <a class="xref"
href="#text-with-a-lot-of-features">Text 1</a>.
<p>A ref to float without type <a class="ref" href="#label-but-no-type">1</a>.
</p>
<dl class="listoffloats">
-<dt><a href="#text-with-a-lot-of-features">Text 1</a></dt><dd><p>TeX and
someething</p></dd>
-<dt><a href="#text-in-chapter">Text 1.1</a></dt><dd><p>C Text in
chapter</p></dd>
-<dt><a href="#float-with-a-lot-of-features-and-no-shortcaption">Text
1.2</a></dt><dd><p>An example of float caption, no shortcaption<small
class="enddots">...</small></p></dd>
+<dt><a href="#text-with-a-lot-of-features">Text 1</a></dt><dd
class="shortcaption-in-listoffloats"><p>TeX and someething</p></dd>
+<dt><a href="#text-in-chapter">Text 1.1</a></dt><dd
class="caption-in-listoffloats"><p>C Text in chapter</p></dd>
+<dt><a href="#float-with-a-lot-of-features-and-no-shortcaption">Text
1.2</a></dt><dd class="caption-in-listoffloats"><p>An example of float caption,
no shortcaption<small class="enddots">...</small></p></dd>
<dt><a href="#text-in-section">Text 1.3</a></dt><dd></dd>
-<dt><a href="#unnumbered-float">Text 5</a></dt><dd><p>SC unnumbered
float</p></dd>
-<dt><a href="#Section-within-unnumbered-float">Text 6</a></dt><dd><p>SC
Section within unnumbered</p></dd>
-<dt><a href="#Chapter-with-subsec-float">Text 2.1</a></dt><dd><p>SC Chapter
with subsec</p></dd>
-<dt><a href="#unnumbered-sec-float">Text 2.2</a></dt><dd><p>SC unnumbered sec
float</p></dd>
-<dt><a href="#appendix-sec-float">Text A.1</a></dt><dd><p>SC appendix sec
float</p></dd>
+<dt><a href="#unnumbered-float">Text 5</a></dt><dd
class="shortcaption-in-listoffloats"><p>SC unnumbered float</p></dd>
+<dt><a href="#Section-within-unnumbered-float">Text 6</a></dt><dd
class="shortcaption-in-listoffloats"><p>SC Section within unnumbered</p></dd>
+<dt><a href="#Chapter-with-subsec-float">Text 2.1</a></dt><dd
class="shortcaption-in-listoffloats"><p>SC Chapter with subsec</p></dd>
+<dt><a href="#unnumbered-sec-float">Text 2.2</a></dt><dd
class="shortcaption-in-listoffloats"><p>SC unnumbered sec float</p></dd>
+<dt><a href="#appendix-sec-float">Text A.1</a></dt><dd
class="shortcaption-in-listoffloats"><p>SC appendix sec float</p></dd>
</dl>
<dl class="listoffloats">
-<dt><a href="#theoreme">théorème 1.1</a></dt><dd><p>C A
théorème</p></dd>
+<dt><a href="#theoreme">théorème 1.1</a></dt><dd
class="caption-in-listoffloats"><p>C A théorème</p></dd>
</dl>
</div>
diff --git
a/tp/t/results/formatting/float_copying/res_html/Copying-and-floats.html
b/tp/t/results/formatting/float_copying/res_html/Copying-and-floats.html
index c227f74cfc..72aeb118f8 100644
--- a/tp/t/results/formatting/float_copying/res_html/Copying-and-floats.html
+++ b/tp/t/results/formatting/float_copying/res_html/Copying-and-floats.html
@@ -79,7 +79,7 @@ the author abandon his copyright.
</div></div>
<h3 class="subheading" id="listoffloats">listoffloats</h3>
<dl class="listoffloats">
-<dt><a href="index.html#public-domain">Copyright notice 1</a></dt><dd><p>The
Public Domain notice<a class="footnote" id="t_hlistoffloats_DOCF1_4"
href="float_copying_fot.html#t_hlistoffloats_FOOT1_4"><sup>4</sup></a>
+<dt><a href="index.html#public-domain">Copyright notice 1</a></dt><dd
class="caption-in-listoffloats"><p>The Public Domain notice<a class="footnote"
id="t_hlistoffloats_DOCF1_4"
href="float_copying_fot.html#t_hlistoffloats_FOOT1_4"><sup>4</sup></a>
</p>
</dd>
</dl>
diff --git a/tp/t/results/html_tests/simple_menu.pl
b/tp/t/results/html_tests/simple_menu.pl
index 7fca157343..d717fd6fbf 100644
--- a/tp/t/results/html_tests/simple_menu.pl
+++ b/tp/t/results/html_tests/simple_menu.pl
@@ -2240,6 +2240,8 @@ $result_converted{'html'}->{'simple_menu'} = '<!DOCTYPE
html>
<link href="#Top" rel="start" title="Top">
<style type="text/css">
<!--
+pre.menu-preformatted {font-family: serif}
+ul.mark-bullet {list-style-type: disc}
-->
</style>
@@ -2250,6 +2252,65 @@ $result_converted{'html'}->{'simple_menu'} = '<!DOCTYPE
html>
<div class="top-level-extent" id="Top">
<a class="top" id="SEC_Top"></a>
+<div class="menu"><pre class="menu-preformatted">• <a href="ggg.html#Top"
accesskey="1">(ggg)</a>:: description
+</pre><ul class="itemize mark-bullet">
+<li><pre class="menu-preformatted">idescr
+</pre></li></ul>
+<pre class="menu-preformatted">in html
+AAA
+
+CCC
+
+</pre><ul class="itemize mark-bullet">
+<li><pre class="menu-preformatted">iaa
+</pre></li></ul>
+<pre class="menu-preformatted">
+
+in html title
+
+BBB
+
+</pre><ul class="itemize mark-bullet">
+<li><pre class="menu-preformatted">ibb
+</pre></li></ul>
+<pre class="menu-preformatted">• <a href="manual.html#Top"
accesskey="2">(manual)</a>::
+
+comment
+
+• <a href="after_comment.html#Top" accesskey="3">(after_comment)</a>::
description
+in description
+• <a href="after_description.html#Top"
accesskey="4">(after_description)</a>::
+
+</pre><pre class="menu-preformatted">• <a href="detailggg.html#Top"
accesskey="5">(detailggg)</a>:: detaildescription
+</pre><ul class="itemize mark-bullet">
+<li><pre class="menu-preformatted">idetaildescr
+</pre></li></ul>
+<pre class="menu-preformatted">detailin detailhtml
+detailAAA
+
+detailCCC
+
+</pre><ul class="itemize mark-bullet">
+<li><pre class="menu-preformatted">detailiaa
+</pre></li></ul>
+<pre class="menu-preformatted">
+
+detailin html detailtitle
+
+detailBBB
+
+</pre><ul class="itemize mark-bullet">
+<li><pre class="menu-preformatted">detailibb
+</pre></li></ul>
+<pre class="menu-preformatted">• <a href="detailmanual.html#Top"
accesskey="6">(detailmanual)</a>::
+
+detailcomment
+
+• <a href="detailafter_comment.html#Top"
accesskey="7">(detailafter_comment)</a>:: detaildescription
+in detaildescription
+• <a href="detailafter_description.html#Top"
accesskey="8">(detailafter_description)</a>::
+
+</pre></div>
</div>
diff --git a/tp/t/results/html_tests/simple_menu_in_example.pl
b/tp/t/results/html_tests/simple_menu_in_example.pl
new file mode 100644
index 0000000000..3deab09302
--- /dev/null
+++ b/tp/t/results/html_tests/simple_menu_in_example.pl
@@ -0,0 +1,805 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors
+ %result_indices %result_sectioning %result_nodes %result_menus
+ %result_floats %result_converted %result_converted_errors
+ %result_elements %result_directions_text %result_indices_sort_strings);
+
+use utf8;
+
+$result_trees{'simple_menu_in_example'} = {
+ 'contents' => [
+ {
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'before_node_section'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Top'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'node',
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'cmdname' => 'example',
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'cmdname' => 'menu',
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'args' => [
+ {
+ 'parent' => {},
+ 'text' => '* ',
+ 'type' => 'menu_entry_leading_text'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '('
+ },
+ {
+ 'parent' => {},
+ 'text' => 'entry'
+ },
+ {
+ 'parent' => {},
+ 'text' => ')'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'menu_entry_node'
+ },
+ {
+ 'parent' => {},
+ 'text' => '::',
+ 'type' => 'menu_entry_separator'
+ },
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'preformatted'
+ },
+ {
+ 'cmdname' => 'cartouche',
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'in cartouche in description in
menu in example
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'preformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'cartouche'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command_argument' => 'cartouche',
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'cartouche'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 8,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'extra' => {
+ 'end_command' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 6,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'menu_entry_description'
+ }
+ ],
+ 'extra' => {
+ 'menu_entry_description' => {},
+ 'menu_entry_node' => {
+ 'manual_content' => [
+ {}
+ ]
+ }
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ },
+ 'parent' => {},
+ 'type' => 'menu_entry'
+ },
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'after_description_line'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'preformatted'
+ },
+ {
+ 'cmdname' => 'cartouche',
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'in cartouche in menu comment in menu
in example
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'preformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'cartouche'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command_argument' => 'cartouche',
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'cartouche'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 12,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'extra' => {
+ 'end_command' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 10,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'preformatted'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'menu_comment'
+ },
+ {
+ 'args' => [
+ {
+ 'parent' => {},
+ 'text' => '* ',
+ 'type' => 'menu_entry_leading_text'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '('
+ },
+ {
+ 'parent' => {},
+ 'text' => 'node'
+ },
+ {
+ 'parent' => {},
+ 'text' => ')'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' '
+ },
+ {
+ 'parent' => {},
+ 'text' => 'menu'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'menu_entry_node'
+ },
+ {
+ 'parent' => {},
+ 'text' => ':: ',
+ 'type' => 'menu_entry_separator'
+ },
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'a node in menu
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'preformatted'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'menu_entry_description'
+ }
+ ],
+ 'extra' => {
+ 'menu_entry_description' => {},
+ 'menu_entry_node' => {
+ 'manual_content' => [
+ {}
+ ],
+ 'node_content' => [
+ {}
+ ],
+ 'normalized' => 'menu'
+ }
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 14,
+ 'macro' => ''
+ },
+ 'parent' => {},
+ 'type' => 'menu_entry'
+ },
+ {
+ 'args' => [
+ {
+ 'parent' => {},
+ 'text' => '* ',
+ 'type' => 'menu_entry_leading_text'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'a menu name'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'menu_entry_name'
+ },
+ {
+ 'parent' => {},
+ 'text' => ':',
+ 'type' => 'menu_entry_separator'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '('
+ },
+ {
+ 'parent' => {},
+ 'text' => 'other'
+ },
+ {
+ 'parent' => {},
+ 'text' => ')'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' '
+ },
+ {
+ 'parent' => {},
+ 'text' => 'node'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'menu_entry_node'
+ },
+ {
+ 'parent' => {},
+ 'text' => '.',
+ 'type' => 'menu_entry_separator'
+ },
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'preformatted'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'menu_entry_description'
+ }
+ ],
+ 'extra' => {
+ 'menu_entry_description' => {},
+ 'menu_entry_name' => {},
+ 'menu_entry_node' => {
+ 'manual_content' => [
+ {}
+ ],
+ 'node_content' => [
+ {}
+ ],
+ 'normalized' => 'node'
+ }
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 15,
+ 'macro' => ''
+ },
+ 'parent' => {},
+ 'type' => 'menu_entry'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'menu'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command_argument' => 'menu',
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'menu'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 16,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'extra' => {
+ 'end_command' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'example'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command_argument' => 'example',
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'example'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 17,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'extra' => {
+ 'end_command' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'extra' => {
+ 'node_content' => [
+ {}
+ ],
+ 'nodes_manuals' => [
+ {
+ 'node_content' => [
+ {}
+ ],
+ 'normalized' => 'Top'
+ }
+ ],
+ 'normalized' => 'Top',
+ 'spaces_before_argument' => ' '
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'type' => 'document_root'
+};
+$result_trees{'simple_menu_in_example'}{'contents'}[0]{'parent'} =
$result_trees{'simple_menu_in_example'};
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'simple_menu_in_example'}{'contents'}[1]{'args'}[0];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'args'}[0]{'parent'} =
$result_trees{'simple_menu_in_example'}{'contents'}[1];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'simple_menu_in_example'}{'contents'}[1];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[2]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'contents'}[1];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'contents'}[2];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'extra'}{'end_command'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'contents'}[2];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_description'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'manual_content'}[0]
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[3]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[4]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[2]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[0];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[0]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_description'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node'}{'manual_content'}[0]
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[1];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[4];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[1];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[1]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[2]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[0]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[1]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[2]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[3]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[4]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[4]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[5]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[5]{'contents'}[0];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[5]{'contents'}[0]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[5];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[5]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_description'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[5];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_name'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[1];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node'}{'manual_content'}[0]
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[1];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[4];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[5]{'args'}[0];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[5]{'args'}[0]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[5];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[5]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[5];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'simple_menu_in_example'}{'contents'}[1];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'extra'}{'node_content'}[0]
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'simple_menu_in_example'}{'contents'}[1]{'parent'} =
$result_trees{'simple_menu_in_example'};
+
+$result_texis{'simple_menu_in_example'} = '@node Top
+
+@example
+@menu
+* (entry)::
+@cartouche
+in cartouche in description in menu in example
+@end cartouche
+
+@cartouche
+in cartouche in menu comment in menu in example
+@end cartouche
+
+* (node) menu:: a node in menu
+* a menu name:(other) node.
+@end menu
+@end example
+';
+
+
+$result_texts{'simple_menu_in_example'} = '
+* (entry)::
+in cartouche in description in menu in example
+
+in cartouche in menu comment in menu in example
+
+* (node) menu:: a node in menu
+* a menu name:(other) node.
+';
+
+$result_nodes{'simple_menu_in_example'} = {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'Top'
+ }
+};
+
+$result_menus{'simple_menu_in_example'} = {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'Top'
+ }
+};
+
+$result_errors{'simple_menu_in_example'} = [
+ {
+ 'error_line' => ':4: warning: @menu in invalid context
+',
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => '',
+ 'text' => '@menu in invalid context',
+ 'type' => 'warning'
+ }
+];
+
+
+$result_floats{'simple_menu_in_example'} = {};
+
+
+
+$result_converted{'info'}->{'simple_menu_in_example'} = 'This is , produced
from .
+
+
+File: , Node: Top, Up: (dir)
+
+* Menu:
+
+ * (entry)::
+ in cartouche in description in menu in example
+
+ in cartouche in menu comment in menu in example
+
+ * (node) menu:: a node in menu
+ * a menu name:(other) node.
+
+
+Tag Table:
+Node: Top27
+
+End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
+';
+
+
+$result_converted{'html'}->{'simple_menu_in_example'} = '<!DOCTYPE html>
+<html>
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Untitled Document</title>
+
+<meta name="description" content="Untitled Document">
+<meta name="keywords" content="Untitled Document">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="viewport" content="width=device-width,initial-scale=1">
+
+<link href="#Top" rel="start" title="Top">
+<style type="text/css">
+<!--
+div.example {margin-left: 3.2em}
+pre.menu-comment-preformatted {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+-->
+</style>
+
+
+</head>
+
+<body lang="en">
+<h1 class="node" id="Top">Top</h1>
+
+<div class="example">
+<div class="menu">• <a href="entry.html#Top"
accesskey="1">(entry)</a>::<pre class="menu-preformatted">
+
+</pre><table class="cartouche" border="1"><tr><td>
+<pre class="menu-preformatted">in cartouche in description in menu in example
+</pre></td></tr></table>
+<pre class="menu-comment-preformatted">
+
+</pre><table class="cartouche" border="1"><tr><td>
+<pre class="menu-comment-preformatted">in cartouche in menu comment in menu in
example
+</pre></td></tr></table>
+<pre class="menu-comment-preformatted">
+
+</pre>• <a href="node.html#menu" accesskey="2">(node) menu</a>::
<pre class="menu-preformatted">a node in menu
+</pre>• a menu name:<a href="other.html#node" accesskey="3">(other)
node</a>.<pre class="menu-preformatted">
+
+</pre></div>
+</div>
+
+
+
+</body>
+</html>
+';
+
+$result_converted_errors{'html'}->{'simple_menu_in_example'} = [
+ {
+ 'error_line' => 'warning: must specify a title with a title command or @top
+',
+ 'text' => 'must specify a title with a title command or @top',
+ 'type' => 'warning'
+ }
+];
+
+
+1;
diff --git a/tp/t/results/menu/menu_in_example.pl
b/tp/t/results/menu/menu_in_example.pl
index 83d24d5c40..f51369af6f 100644
--- a/tp/t/results/menu/menu_in_example.pl
+++ b/tp/t/results/menu/menu_in_example.pl
@@ -753,20 +753,20 @@ pre.menu-preformatted {font-family: serif}
<div class="example">
<table class="menu" border="0" cellspacing="0"><tr><td>
-<pre class="menu-preformatted">• <a href="entry.html#Top"
accesskey="1">(entry)</a>::
+<pre class="menu-preformatted">• <a href="entry.html#Top"
accesskey="1">(entry)</a>::</pre><pre class="menu-preformatted">
</pre><table class="cartouche" border="1"><tr><td>
<pre class="menu-preformatted">in cartouche in description in menu in example
</pre></td></tr></table>
-</pre><pre class="menu-comment-preformatted">
+<pre class="menu-comment-preformatted">
</pre><table class="cartouche" border="1"><tr><td>
<pre class="menu-comment-preformatted">in cartouche in menu comment in menu in
example
</pre></td></tr></table>
<pre class="menu-comment-preformatted">
-</pre><pre class="menu-preformatted">• <a href="node.html#menu"
accesskey="2">(node) menu</a>:: a node in menu
-</pre><pre class="menu-preformatted">• a menu name:<a
href="other.html#node" accesskey="3">(other) node</a>.
+</pre><pre class="menu-preformatted">• <a href="node.html#menu"
accesskey="2">(node) menu</a>:: </pre><pre class="menu-preformatted">a
node in menu
+</pre><pre class="menu-preformatted">• a menu name:<a
href="other.html#node" accesskey="3">(other) node</a>. </pre><pre
class="menu-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 e3d5b6cad4..5b3b636c3c 100644
--- a/tp/t/results/menu/sc_in_menu.pl
+++ b/tp/t/results/menu/sc_in_menu.pl
@@ -1170,7 +1170,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">• <span class="sc">EXAMPLE VALUE</span>:<a
href="dir.html#EXAMPLE-NODE" accesskey="1">(dir)<span class="sc">EXAMPLE
NODE</span></a>. <span class="sc">EXAMPLE DESCRIP TION</span>
+<pre class="menu-preformatted">• <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><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 153167e727..600c362cc6 100644
--- a/tp/t/results/morecoverage/formatting_fr.pl
+++ b/tp/t/results/morecoverage/formatting_fr.pl
@@ -5089,7 +5089,7 @@ Menu comment
</p>
<div class="format">
<table class="menu" border="0" cellspacing="0"><tr><td>
-<pre class="menu-preformatted">• <a
href="#s_002d_002dect_002cion">s--ect,ion</a>:: s–ect,ion
+<pre class="menu-preformatted">• <a
href="#s_002d_002dect_002cion">s--ect,ion</a>:: </pre><pre
class="menu-preformatted">s–ect,ion
</pre><pre class="menu-comment-preformatted">
Menu comment
@@ -5654,7 +5654,7 @@ Menu comment
</p>
<div class="format">
<table class="menu" border="0" cellspacing="0"><tr><td>
-<pre class="menu-preformatted">• <a
href="#s_002d_002dect_002cion">s--ect,ion</a>:: s–ect,ion
+<pre class="menu-preformatted">• <a
href="#s_002d_002dect_002cion">s--ect,ion</a>:: </pre><pre
class="menu-preformatted">s–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 4cc0888564..4902fb3373 100644
--- a/tp/tests/layout/res_parser/formatting/formatting.html
+++ b/tp/tests/layout/res_parser/formatting/formatting.html
@@ -6749,7 +6749,7 @@ Invalid use of @':
</p>
<div class="format">
<table class="menu" border="0" cellspacing="0"><tr><td>
-<pre class="menu-preformatted">• <a
href="#s_002d_002dect_002cion">s--ect,ion</a>:: s–ect,ion
+<pre class="menu-preformatted">• <a
href="#s_002d_002dect_002cion">s--ect,ion</a>:: </pre><pre
class="menu-preformatted">s–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 96f48bc55b..60425d12e8 100644
--- a/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
@@ -6749,7 +6749,7 @@ Invalid use of @':
</p>
<div class="format">
<table class="menu" border="0" cellspacing="0"><tr><td>
-<pre class="menu-preformatted">• <a
href="#s_002d_002dect_002cion">s--ect,ion</a>:: s–ect,ion
+<pre class="menu-preformatted">• <a
href="#s_002d_002dect_002cion">s--ect,ion</a>:: </pre><pre
class="menu-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 a3b55ae3e8..2f8eccbdc2 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
@@ -6724,7 +6724,7 @@ Invalid use of @':
</p>
<div class="format">
<table class="menu" border="0" cellspacing="0"><tr><td>
-<pre class="menu-preformatted">• <a
href="#s_002d_002dect_002cion">s--ect,ion</a>:: s–ect,ion
+<pre class="menu-preformatted">• <a
href="#s_002d_002dect_002cion">s--ect,ion</a>:: </pre><pre
class="menu-preformatted">s–ect,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 3e62befa53..a2d6abc253 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
@@ -4668,7 +4668,7 @@ Invalid use of @':
</p>
<div class="format">
<table class="menu" border="0" cellspacing="0"><tr><td>
-<pre class="menu-preformatted">• <a
href="s_002d_002dect_002cion.xhtml">s--ect,ion</a>:: s–ect,ion
+<pre class="menu-preformatted">• <a
href="s_002d_002dect_002cion.xhtml">s--ect,ion</a>:: </pre><pre
class="menu-preformatted">s–ect,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 58760a2c01..f8087068fc 100644
--- a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
@@ -6749,7 +6749,7 @@ Invalid use of @':
</p>
<div class="format">
<table class="menu" border="0" cellspacing="0"><tr><td>
-<pre class="menu-preformatted">• <a
href="#s_002d_002dect_002cion">s--ect,ion</a>:: s–ect,ion
+<pre class="menu-preformatted">• <a
href="#s_002d_002dect_002cion">s--ect,ion</a>:: </pre><pre
class="menu-preformatted">s–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 4cc0888564..4902fb3373 100644
--- a/tp/tests/layout/res_parser/formatting_html/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html/formatting.html
@@ -6749,7 +6749,7 @@ Invalid use of @':
</p>
<div class="format">
<table class="menu" border="0" cellspacing="0"><tr><td>
-<pre class="menu-preformatted">• <a
href="#s_002d_002dect_002cion">s--ect,ion</a>:: s–ect,ion
+<pre class="menu-preformatted">• <a
href="#s_002d_002dect_002cion">s--ect,ion</a>:: </pre><pre
class="menu-preformatted">s–ect,ion
</pre><pre class="menu-comment-preformatted">
Menu comment
diff --git a/tp/tests/layout/res_parser/formatting_html32/formatting.html
b/tp/tests/layout/res_parser/formatting_html32/formatting.html
index 4c3a51ddf8..bf8dde9ba4 100644
--- a/tp/tests/layout/res_parser/formatting_html32/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html32/formatting.html
@@ -6611,7 +6611,7 @@ Invalid use of @':
</p>
<div>
<table border="0" cellspacing="0"><tr><td>
-<pre>* <a href="#s_002d_002dect_002cion">s--ect,ion</a>:: s-ect,ion
+<pre>* <a href="#s_002d_002dect_002cion">s--ect,ion</a>:: </pre><pre>s-ect,ion
</pre><pre>
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 4c6e971d48..f17bfe30a6 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
@@ -4683,7 +4683,7 @@ Invalid use of @':
</p>
<div class="format">
<table class="menu" border="0" cellspacing="0"><tr><td>
-<pre class="menu-preformatted">• <a
href="s_002d_002dect_002cion.html">s--ect,ion</a>:: s–ect,ion
+<pre class="menu-preformatted">• <a
href="s_002d_002dect_002cion.html">s--ect,ion</a>:: </pre><pre
class="menu-preformatted">s–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 1ee7735251..56ea5acab2 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">• <a
href="#s_002d_002dect_002cion">s--ect,ion</a>:: s–ect,ion
+<pre class="menu-preformatted" style="font-family: serif">• <a
href="#s_002d_002dect_002cion">s--ect,ion</a>:: </pre><pre
class="menu-preformatted" style="font-family: serif">s–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 269df838bf..4ab4654365 100644
--- a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
@@ -6759,7 +6759,7 @@ Invalid use of @':
</p>
<div class="format">
<table class="menu" border="0" cellspacing="0"><tr><td>
-<pre class="menu-preformatted">• <a
href="#s_002d_002dect_002cion">s--ect,ion</a>:: s–ect,ion
+<pre class="menu-preformatted">• <a
href="#s_002d_002dect_002cion">s--ect,ion</a>:: </pre><pre
class="menu-preformatted">s–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 4c6e971d48..f17bfe30a6 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
@@ -4683,7 +4683,7 @@ Invalid use of @':
</p>
<div class="format">
<table class="menu" border="0" cellspacing="0"><tr><td>
-<pre class="menu-preformatted">• <a
href="s_002d_002dect_002cion.html">s--ect,ion</a>:: s–ect,ion
+<pre class="menu-preformatted">• <a
href="s_002d_002dect_002cion.html">s--ect,ion</a>:: </pre><pre
class="menu-preformatted">s–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 375bef170c..96df201aa9 100644
--- a/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
@@ -6749,7 +6749,7 @@ Invalid use of @':
</p>
<div class="format">
<table class="menu" border="0" cellspacing="0"><tr><td>
-<pre class="menu-preformatted">• <a
href="#s_002d_002dect_002cion">s--ect,ion</a>:: s–ect,ion
+<pre class="menu-preformatted">• <a
href="#s_002d_002dect_002cion">s--ect,ion</a>:: </pre><pre
class="menu-preformatted">s–ect,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 b379db84ff..f1afce3d67 100644
--- a/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
+++ b/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
@@ -6668,7 +6668,7 @@ html ''
</p>
<div class="format">
<table class="menu" border="0" cellspacing="0"><tr><td>
-<pre class="menu-preformatted">• <a
href="#s_002d_002dect_002cion">s--ect,ion</a>:: s–ect,ion
+<pre class="menu-preformatted">• <a
href="#s_002d_002dect_002cion">s--ect,ion</a>:: </pre><pre
class="menu-preformatted">s–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 88fb498ad4..866aa916bb 100644
--- a/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
@@ -6749,7 +6749,7 @@ Invalid use of @':
</p>
<div class="format">
<table class="menu" border="0" cellspacing="0"><tr><td>
-<pre class="menu-preformatted">• <a
href="#s_002d_002dect_002cion">s--ect,ion</a>:: s–ect,ion
+<pre class="menu-preformatted">• <a
href="#s_002d_002dect_002cion">s--ect,ion</a>:: </pre><pre
class="menu-preformatted">s–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 a90e0b7f8a..795ea88ff6 100644
--- a/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_xhtml/formatting.html
@@ -6749,7 +6749,7 @@ Invalid use of @':
</p>
<div class="format">
<table class="menu" border="0" cellspacing="0"><tr><td>
-<pre class="menu-preformatted">• <a
href="#s_002d_002dect_002cion">s--ect,ion</a>:: s–ect,ion
+<pre class="menu-preformatted">• <a
href="#s_002d_002dect_002cion">s--ect,ion</a>:: </pre><pre
class="menu-preformatted">s–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 f00ffc9e71..2e6a3208e3 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
@@ -5008,7 +5008,7 @@ Invalid use of @':
</p>
<div class="format">
<blockquote><table class="menu" border="0" cellspacing="0">
-<pre class="menu-preformatted">• <a
href="s_002d_002dect_002cion.html">s--ect,ion</a>:: s–ect,ion
+<pre class="menu-preformatted">• <a
href="s_002d_002dect_002cion.html">s--ect,ion</a>:: </pre><pre
class="menu-preformatted">s–ect,ion
</pre><pre class="menu-comment-preformatted">
Menu comment
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/Convert/HTML.pm (_convert_listoffloats_command): add a class for caption or shortcaption in listoffloats, like caption-in-listoffloats,
Patrice Dumas <=