[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * Texinfo/Convert/HTML.pm (_contents_inline_eleme
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * Texinfo/Convert/HTML.pm (_contents_inline_element): Put inline contents elements in a <div>. Report from Per Bothner. |
|
Date: |
Sun, 14 Feb 2021 07:20:31 -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 ae5a082 * Texinfo/Convert/HTML.pm (_contents_inline_element): Put
inline contents elements in a <div>. Report from Per Bothner.
ae5a082 is described below
commit ae5a082a87ce21e929627fe2d89ef3a9fdc30bf5
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Feb 14 13:20:21 2021 +0100
* Texinfo/Convert/HTML.pm (_contents_inline_element):
Put inline contents elements in a <div>. Report from
Per Bothner.
---
ChangeLog | 6 ++++++
tp/Texinfo/Convert/HTML.pm | 7 ++++---
tp/t/results/converters_tests/ref_in_sectioning.pl | 3 ++-
.../results/converters_tests/sample_utf8/res_html/index.html | 4 ++--
tp/t/results/html_tests/character_number_leading_toc_stoc.pl | 8 ++++----
tp/t/results/html_tests/shortcontents_no_top.pl | 4 ++--
.../html_tests/text_before_top_and_contents_after_title.pl | 4 ++--
tp/t/results/languages/appendix_translated.pl | 4 ++--
tp/t/results/morecoverage/texi_formatting.pl | 8 ++++----
tp/t/results/sectioning/chapter_before_and_after_part.pl | 4 ++--
tp/t/results/sectioning/chapter_between_nodes.pl | 4 ++--
.../results/sectioning/chapter_node_before_and_after_part.pl | 4 ++--
tp/t/results/sectioning/contents.pl | 4 ++--
tp/t/results/sectioning/contents_and_shortcontents.pl | 8 ++++----
tp/t/results/sectioning/contents_in_html_text.pl | 6 ++++--
tp/t/results/sectioning/no_argument_and_contents.pl | 4 ++--
tp/t/results/sectioning/node_part_chapter_after_chapter.pl | 4 ++--
tp/t/results/sectioning/section_before_part.pl | 4 ++--
tp/t/results/sectioning/section_below_unnumbered.pl | 4 ++--
tp/t/results/sectioning/section_in_unnumbered_info.pl | 4 ++--
tp/t/results/sectioning/section_in_unnumbered_plaintext.pl | 4 ++--
tp/t/results/sectioning/shortcontents.pl | 4 ++--
.../contents_at_begin_inline/contents_at_begin.html | 4 ++--
.../res_parser/contents_at_end_inline/contents_at_end.html | 4 ++--
.../contents_in_middle_chapter.html | 4 ++--
.../contents_in_middle_section.html | 4 ++--
.../double_contents_after_title/double_contents.html | 4 ++--
.../double_contents_after_title_book/double_contents.html | 4 ++--
.../double_contents_after_title_book_chapter/index.html | 4 ++--
.../double_contents_after_title_no_texi2html/index.html | 4 ++--
.../res_parser/double_contents_book/double_contents.html | 12 ++++++------
.../res_parser/double_contents_inline/double_contents.html | 12 ++++++------
.../res_parser/double_contents_inline_chapter/chapter.html | 8 ++++----
.../res_parser/double_contents_inline_chapter/index.html | 4 ++--
.../res_parser/double_contents_inline_nodes/chapter.html | 4 ++--
.../res_parser/double_contents_inline_nodes/index.html | 4 ++--
.../res_parser/double_contents_inline_nodes/section.html | 4 ++--
.../res_parser/double_contents_inline_section/chapter.html | 4 ++--
.../res_parser/double_contents_inline_section/index.html | 4 ++--
.../res_parser/double_contents_inline_section/section.html | 4 ++--
.../res_parser_info/index_special_region_html/index.html | 4 ++--
.../index_special_region_no_insertcopying_html/index.html | 4 ++--
.../index_special_region_no_region_html/index.html | 4 ++--
43 files changed, 110 insertions(+), 100 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 9b983b3..f70a426 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2021-02-14 Patrice Dumas <pertusus@free.fr>
+ * Texinfo/Convert/HTML.pm (_contents_inline_element):
+ Put inline contents elements in a <div>. Report from
+ Per Bothner.
+
+2021-02-14 Patrice Dumas <pertusus@free.fr>
+
* Texinfo/Convert/HTML.pm (%default_formatting_references,
converter_initialize, _default_*), init/book.pm,
init/chm.pm, init/html32.pm, t/init/mini_ker_t2h.init,
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 174c268..1fe5ce4 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -3777,15 +3777,15 @@ sub _contents_inline_element($$$)
my $content = &{$self->{'format_contents'}}($self, $cmdname, $command);
if ($content) {
- my $result = '';
my $element_name = $contents_command_element_name{$cmdname};
my $special_element
= $self->special_element($element_name);
my $heading;
+ my $result = "<div class=\"${element_name}_element\"";
if ($special_element) {
my $id = $self->command_id($special_element);
if ($id ne '') {
- $result .= "<span id=\"$id\"></span>\n";
+ $result .= " id=\"$id\"";
}
$heading = $self->command_text($special_element);
} else {
@@ -3794,10 +3794,11 @@ sub _contents_inline_element($$$)
$heading
= $self->convert_tree
($self->get_conf('SPECIAL_ELEMENTS_NAME')->{$element_name});
}
+ $result .= ">\n";
my $class = $self->get_conf('SPECIAL_ELEMENTS_CLASS')->{$element_name};
$result .= &{$self->{'format_heading_text'}}($self, $class.'-heading',
$heading, $self->get_conf('CHAPTER_HEADER_LEVEL'))."\n";
- $result .= $content . "\n";
+ $result .= $content . "</div>\n";
return $result;
}
return '';
diff --git a/tp/t/results/converters_tests/ref_in_sectioning.pl
b/tp/t/results/converters_tests/ref_in_sectioning.pl
index 8c35a64..02f6f22 100644
--- a/tp/t/results/converters_tests/ref_in_sectioning.pl
+++ b/tp/t/results/converters_tests/ref_in_sectioning.pl
@@ -2550,6 +2550,7 @@ $result_converted{'html_text'}->{'ref_in_sectioning'} = '
<h1 class="top">for example <a href="#node">See <a data-manual="file name"
href="file name.html#node">title</a> in <cite>Manual</cite>.</a> (see <a
href="#node">See <a data-manual="file name" href="file
name.html#node">title</a> in <cite>Manual</cite>.</a>) (see <cite><a
data-manual="file" href="file.html#Top">Manual</a></cite>)</h1>
+<div class="Contents_element">
<h2 class="contents-heading">Table of Contents</h2>
<div class="contents">
@@ -2573,7 +2574,7 @@ $result_converted{'html_text'}->{'ref_in_sectioning'} = '
</ul></li>
</ul>
</div>
-
+</div>
</div><hr>
<div class="chapter" id="node">
<div class="header">
diff --git a/tp/t/results/converters_tests/sample_utf8/res_html/index.html
b/tp/t/results/converters_tests/sample_utf8/res_html/index.html
index 09be89c..8849b44 100644
--- a/tp/t/results/converters_tests/sample_utf8/res_html/index.html
+++ b/tp/t/results/converters_tests/sample_utf8/res_html/index.html
@@ -62,7 +62,7 @@ Texinfo中文示例
</p>
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
<h2 class="contents-heading">Table of Contents</h2>
<div class="contents">
@@ -73,7 +73,7 @@ Texinfo中文示例
<li><a id="toc-Index" href="Index-node.html" rel="index">Index</a></li>
</ul>
</div>
-
+</div>
</div><hr>
<div class="header">
<p>
diff --git a/tp/t/results/html_tests/character_number_leading_toc_stoc.pl
b/tp/t/results/html_tests/character_number_leading_toc_stoc.pl
index 98133dc..8fa16f1 100644
--- a/tp/t/results/html_tests/character_number_leading_toc_stoc.pl
+++ b/tp/t/results/html_tests/character_number_leading_toc_stoc.pl
@@ -337,7 +337,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<div class="top" id="top">
<h1 class="top">top</h1>
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
<h2 class="contents-heading">Table of Contents</h2>
<div class="contents">
@@ -350,8 +350,8 @@ ul.no-bullet {list-style: none}
</ul></li>
</ul>
</div>
-
-<span id="SEC_Overview"></span>
+</div>
+<div class="Overview_element" id="SEC_Overview">
<h2 class="shortcontents-heading">Short Table of Contents</h2>
<div class="shortcontents">
@@ -360,7 +360,7 @@ ul.no-bullet {list-style: none}
<li><a id="stoc-_005f" href="#toc-_005f">_</a></li>
</ul>
</div>
-
+</div>
</div><div class="chapter" id="g_t0">
<h2 class="chapter">1 0</h2>
</div><div class="unnumbered" id="g_t_005f">
diff --git a/tp/t/results/html_tests/shortcontents_no_top.pl
b/tp/t/results/html_tests/shortcontents_no_top.pl
index 849f0a1..eff58b1 100644
--- a/tp/t/results/html_tests/shortcontents_no_top.pl
+++ b/tp/t/results/html_tests/shortcontents_no_top.pl
@@ -279,7 +279,7 @@ ul.no-bullet {list-style: none}
</div><div class="section" id="sec">
<h3 class="section">2.1 sec</h3>
-<span id="SEC_Overview"></span>
+<div class="Overview_element" id="SEC_Overview">
<h2 class="shortcontents-heading">Short Table of Contents</h2>
<div class="shortcontents">
@@ -289,7 +289,7 @@ ul.no-bullet {list-style: none}
</ul>
</div>
-
+</div>
</div><hr></div>
diff --git
a/tp/t/results/html_tests/text_before_top_and_contents_after_title.pl
b/tp/t/results/html_tests/text_before_top_and_contents_after_title.pl
index 6b964e1..b26e7c6 100644
--- a/tp/t/results/html_tests/text_before_top_and_contents_after_title.pl
+++ b/tp/t/results/html_tests/text_before_top_and_contents_after_title.pl
@@ -354,7 +354,7 @@ ul.no-bullet {list-style: none}
</head>
<body lang="en">
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
<h2 class="contents-heading">Table of Contents</h2>
<div class="contents">
@@ -363,7 +363,7 @@ ul.no-bullet {list-style: none}
<li><a id="toc-the-chap" href="#the-chap">1 the chap</a></li>
</ul>
</div>
-
+</div>
<hr>
<p>Some text before top
diff --git a/tp/t/results/languages/appendix_translated.pl
b/tp/t/results/languages/appendix_translated.pl
index 89558d6..da52629 100644
--- a/tp/t/results/languages/appendix_translated.pl
+++ b/tp/t/results/languages/appendix_translated.pl
@@ -371,7 +371,7 @@ ul.no-bullet {list-style: none}
<div class="node" id="top">
<h1 class="top">top</h1>
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
<h2 class="contents-heading">Table des matières</h2>
<div class="contents">
@@ -380,7 +380,7 @@ ul.no-bullet {list-style: none}
<li><a id="toc-dernier" href="#dernier">Annexe A dernier</a></li>
</ul>
</div>
-
+</div>
</div><div class="appendix" id="dernier">
<h2 class="appendix">Annexe A dernier</h2>
diff --git a/tp/t/results/morecoverage/texi_formatting.pl
b/tp/t/results/morecoverage/texi_formatting.pl
index 2978c21..c9bc72b 100644
--- a/tp/t/results/morecoverage/texi_formatting.pl
+++ b/tp/t/results/morecoverage/texi_formatting.pl
@@ -5032,7 +5032,7 @@ Next: <a href="#chapter" accesskey="n"
rel="next">chapter</a> [<a href="#
</p>
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
<h2 class="contents-heading">Table of Contents</h2>
<div class="contents">
@@ -5052,8 +5052,8 @@ Next: <a href="#chapter" accesskey="n"
rel="next">chapter</a> [<a href="#
<li><a id="toc-chapter-2" href="#chapter2" rel="index">chapter 2</a></li>
</ul>
</div>
-
-<span id="SEC_Overview"></span>
+</div>
+<div class="Overview_element" id="SEC_Overview">
<h2 class="shortcontents-heading">Short Table of Contents</h2>
<div class="shortcontents">
@@ -5062,7 +5062,7 @@ Next: <a href="#chapter" accesskey="n"
rel="next">chapter</a> [<a href="#
<li><a id="stoc-chapter-2" href="#toc-chapter-2" rel="index">chapter 2</a></li>
</ul>
</div>
-
+</div>
</div><hr>
<div class="chapter" id="chapter">
<div class="header">
diff --git a/tp/t/results/sectioning/chapter_before_and_after_part.pl
b/tp/t/results/sectioning/chapter_before_and_after_part.pl
index 9d0aab7..9976be1 100644
--- a/tp/t/results/sectioning/chapter_before_and_after_part.pl
+++ b/tp/t/results/sectioning/chapter_before_and_after_part.pl
@@ -384,7 +384,7 @@ ul.no-bullet {list-style: none}
</div><div class="chapter" id="chapter-2">
<h2 class="chapter">2 chapter 2</h2>
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
<h2 class="contents-heading">Table of Contents</h2>
<div class="contents">
@@ -397,7 +397,7 @@ ul.no-bullet {list-style: none}
</ul>
</div>
-
+</div>
</div><hr></div>
diff --git a/tp/t/results/sectioning/chapter_between_nodes.pl
b/tp/t/results/sectioning/chapter_between_nodes.pl
index 47c7014..d37bb63 100644
--- a/tp/t/results/sectioning/chapter_between_nodes.pl
+++ b/tp/t/results/sectioning/chapter_between_nodes.pl
@@ -766,7 +766,7 @@ Previous: <a href="#Top" accesskey="p" rel="prev">top
section</a>, Up: <a href="
<p>section.
</p>
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
<h2 class="contents-heading">Table of Contents</h2>
<div class="contents">
@@ -778,7 +778,7 @@ Previous: <a href="#Top" accesskey="p" rel="prev">top
section</a>, Up: <a href="
</ul></li>
</ul>
</div>
-
+</div>
</div><hr>
</div>
</div>
diff --git a/tp/t/results/sectioning/chapter_node_before_and_after_part.pl
b/tp/t/results/sectioning/chapter_node_before_and_after_part.pl
index 4a27bbc..05abe91 100644
--- a/tp/t/results/sectioning/chapter_node_before_and_after_part.pl
+++ b/tp/t/results/sectioning/chapter_node_before_and_after_part.pl
@@ -690,7 +690,7 @@ Previous: <a href="#Top" accesskey="p"
rel="prev">chapter</a>, Up: <a href="#Top
<div class="node" id="chapter-2">
<h2 class="chapter">2 chapter 2</h2>
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
<h2 class="contents-heading">Table of Contents</h2>
<div class="contents">
@@ -703,7 +703,7 @@ Previous: <a href="#Top" accesskey="p"
rel="prev">chapter</a>, Up: <a href="#Top
</ul>
</div>
-
+</div>
</div><hr>
</div>
diff --git a/tp/t/results/sectioning/contents.pl
b/tp/t/results/sectioning/contents.pl
index 8a1a688..2cee6fd 100644
--- a/tp/t/results/sectioning/contents.pl
+++ b/tp/t/results/sectioning/contents.pl
@@ -805,7 +805,7 @@ ul.no-bullet {list-style: none}
<div class="top" id="top">
<h1 class="top">top</h1>
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
<h2 class="contents-heading">Table of Contents</h2>
<div class="contents">
@@ -836,7 +836,7 @@ ul.no-bullet {list-style: none}
</ul>
</div>
-
+</div>
</div><div class="chapter" id="chapter">
<h2 class="chapter">1 chapter</h2>
diff --git a/tp/t/results/sectioning/contents_and_shortcontents.pl
b/tp/t/results/sectioning/contents_and_shortcontents.pl
index d480e41..0ed343e 100644
--- a/tp/t/results/sectioning/contents_and_shortcontents.pl
+++ b/tp/t/results/sectioning/contents_and_shortcontents.pl
@@ -841,7 +841,7 @@ ul.no-bullet {list-style: none}
<div class="top" id="top">
<h1 class="top">top</h1>
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
<h2 class="contents-heading">Table of Contents</h2>
<div class="contents">
@@ -872,8 +872,8 @@ ul.no-bullet {list-style: none}
</ul>
</div>
-
-<span id="SEC_Overview"></span>
+</div>
+<div class="Overview_element" id="SEC_Overview">
<h2 class="shortcontents-heading">Short Table of Contents</h2>
<div class="shortcontents">
@@ -890,7 +890,7 @@ ul.no-bullet {list-style: none}
</ul>
</div>
-
+</div>
</div><div class="chapter" id="chapter">
<h2 class="chapter">1 chapter</h2>
diff --git a/tp/t/results/sectioning/contents_in_html_text.pl
b/tp/t/results/sectioning/contents_in_html_text.pl
index 2fb7918..b83f923 100644
--- a/tp/t/results/sectioning/contents_in_html_text.pl
+++ b/tp/t/results/sectioning/contents_in_html_text.pl
@@ -330,6 +330,7 @@ $result_converted{'html_text'}->{'contents_in_html_text'} =
'<div class="top" id
</div><div class="chapter" id="Chap2">
<h2 class="chapter">2 Chap2</h2>
+<div class="Overview_element">
<h2 class="shortcontents-heading">Short Table of Contents</h2>
<div class="shortcontents">
@@ -338,7 +339,8 @@ $result_converted{'html_text'}->{'contents_in_html_text'} =
'<div class="top" id
<li><a id="stoc-Chap2" href="#toc-Chap2">2 Chap2</a></li>
</ul>
</div>
-
+</div>
+<div class="Contents_element">
<h2 class="contents-heading">Table of Contents</h2>
<div class="contents">
@@ -351,7 +353,7 @@ $result_converted{'html_text'}->{'contents_in_html_text'} =
'<div class="top" id
<li><a id="toc-Chap2" href="#Chap2">2 Chap2</a></li>
</ul>
</div>
-
+</div>
</div><hr></div>
';
diff --git a/tp/t/results/sectioning/no_argument_and_contents.pl
b/tp/t/results/sectioning/no_argument_and_contents.pl
index 941f391..d06b05d 100644
--- a/tp/t/results/sectioning/no_argument_and_contents.pl
+++ b/tp/t/results/sectioning/no_argument_and_contents.pl
@@ -248,7 +248,7 @@ ul.no-bullet {list-style: none}
<div class="top" id="for-example">
<h1 class="top">for example</h1>
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
<h2 class="contents-heading">Table of Contents</h2>
<div class="contents">
@@ -257,7 +257,7 @@ ul.no-bullet {list-style: none}
<li>1 </li>
</ul>
</div>
-
+</div>
</div><div class="chapter">
<h2 class="chapter">1 </h2>
diff --git a/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
b/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
index 22f9aec..8cc4ec1 100644
--- a/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
+++ b/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
@@ -1117,7 +1117,7 @@ Next: <a href="#chapter-node" accesskey="n"
rel="next">chapter node</a> [
<h1 class="top">top</h1>
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
<h2 class="contents-heading">Table of Contents</h2>
<div class="contents">
@@ -1133,7 +1133,7 @@ Next: <a href="#chapter-node" accesskey="n"
rel="next">chapter node</a> [
</ul>
</div>
-
+</div>
</div><hr>
<div class="chapter" id="chapter-node">
<div class="header">
diff --git a/tp/t/results/sectioning/section_before_part.pl
b/tp/t/results/sectioning/section_before_part.pl
index bb03e70..da8690f 100644
--- a/tp/t/results/sectioning/section_before_part.pl
+++ b/tp/t/results/sectioning/section_before_part.pl
@@ -246,7 +246,7 @@ ul.no-bullet {list-style: none}
<h1 class="part">part</h1>
<hr>
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
<h2 class="contents-heading">Table of Contents</h2>
<div class="contents">
@@ -256,7 +256,7 @@ ul.no-bullet {list-style: none}
</ul>
</div>
-
+</div>
</div><hr></div>
diff --git a/tp/t/results/sectioning/section_below_unnumbered.pl
b/tp/t/results/sectioning/section_below_unnumbered.pl
index e951d2a..2296c84 100644
--- a/tp/t/results/sectioning/section_below_unnumbered.pl
+++ b/tp/t/results/sectioning/section_below_unnumbered.pl
@@ -944,7 +944,7 @@ Next: <a href="#Unn" accesskey="n" rel="next">Unn</a>
[<a href="#SEC_Cont
</p>
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
<h2 class="contents-heading">Table of Contents</h2>
<div class="contents">
@@ -956,7 +956,7 @@ Next: <a href="#Unn" accesskey="n" rel="next">Unn</a>
[<a href="#SEC_Cont
</ul></li>
</ul>
</div>
-
+</div>
</div><hr>
<div class="unnumbered" id="Unn">
<div class="header">
diff --git a/tp/t/results/sectioning/section_in_unnumbered_info.pl
b/tp/t/results/sectioning/section_in_unnumbered_info.pl
index 9e38ae8..8f679fc 100644
--- a/tp/t/results/sectioning/section_in_unnumbered_info.pl
+++ b/tp/t/results/sectioning/section_in_unnumbered_info.pl
@@ -8273,7 +8273,7 @@ Next: <a href="#chapter" accesskey="n"
rel="next">chapter</a> [<a href="#
<p>Menu:
</p>
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
<h2 class="contents-heading">Table of Contents</h2>
<div class="contents">
@@ -8336,7 +8336,7 @@ Next: <a href="#chapter" accesskey="n"
rel="next">chapter</a> [<a href="#
</ul></li>
</ul>
</div>
-
+</div>
</div><hr>
<div class="chapter" id="chapter">
<div class="header">
diff --git a/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl
b/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl
index 40dc00a..5fa784a 100644
--- a/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl
+++ b/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl
@@ -8095,7 +8095,7 @@ Next: <a href="#chapter" accesskey="n"
rel="next">chapter</a> [<a href="#
<p>Menu:
</p>
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
<h2 class="contents-heading">Table of Contents</h2>
<div class="contents">
@@ -8158,7 +8158,7 @@ Next: <a href="#chapter" accesskey="n"
rel="next">chapter</a> [<a href="#
</ul></li>
</ul>
</div>
-
+</div>
</div><hr>
<div class="chapter" id="chapter">
<div class="header">
diff --git a/tp/t/results/sectioning/shortcontents.pl
b/tp/t/results/sectioning/shortcontents.pl
index f019f88..32f5b0e 100644
--- a/tp/t/results/sectioning/shortcontents.pl
+++ b/tp/t/results/sectioning/shortcontents.pl
@@ -800,7 +800,7 @@ ul.no-bullet {list-style: none}
<div class="top" id="top">
<h1 class="top">top</h1>
-<span id="SEC_Overview"></span>
+<div class="Overview_element" id="SEC_Overview">
<h2 class="shortcontents-heading">Short Table of Contents</h2>
<div class="shortcontents">
@@ -817,7 +817,7 @@ ul.no-bullet {list-style: none}
</ul>
</div>
-
+</div>
</div><div class="chapter" id="chapter">
<h2 class="chapter">1 chapter</h2>
diff --git
a/tp/tests/contents/res_parser/contents_at_begin_inline/contents_at_begin.html
b/tp/tests/contents/res_parser/contents_at_begin_inline/contents_at_begin.html
index 59c969c..45bf5fd 100644
---
a/tp/tests/contents/res_parser/contents_at_begin_inline/contents_at_begin.html
+++
b/tp/tests/contents/res_parser/contents_at_begin_inline/contents_at_begin.html
@@ -35,7 +35,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
<h1 class="contents-heading">Table of Contents</h1>
<div class="contents">
@@ -44,7 +44,7 @@ ul.no-bullet {list-style: none}
<li><a id="toc-Chapter-1" href="#chapter">1 Chapter 1</a></li>
</ul>
</div>
-
+</div>
<div class="top" id="Top">
<table class="header" cellpadding="1" cellspacing="1" border="0">
diff --git
a/tp/tests/contents/res_parser/contents_at_end_inline/contents_at_end.html
b/tp/tests/contents/res_parser/contents_at_end_inline/contents_at_end.html
index 25d1276..ba14ebc 100644
--- a/tp/tests/contents/res_parser/contents_at_end_inline/contents_at_end.html
+++ b/tp/tests/contents/res_parser/contents_at_end_inline/contents_at_end.html
@@ -77,7 +77,7 @@ ul.no-bullet {list-style: none}
<p>The chapter
</p>
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
<h1 class="contents-heading">Table of Contents</h1>
<div class="contents">
@@ -86,7 +86,7 @@ ul.no-bullet {list-style: none}
<li><a id="toc-Chapter-1" href="#chapter">1 Chapter 1</a></li>
</ul>
</div>
-
+</div>
</div><hr size="6">
</div>
</div>
diff --git
a/tp/tests/contents/res_parser/contents_in_middle_chapter_inline/contents_in_middle_chapter.html
b/tp/tests/contents/res_parser/contents_in_middle_chapter_inline/contents_in_middle_chapter.html
index 199306d..8eda3a5 100644
---
a/tp/tests/contents/res_parser/contents_in_middle_chapter_inline/contents_in_middle_chapter.html
+++
b/tp/tests/contents/res_parser/contents_in_middle_chapter_inline/contents_in_middle_chapter.html
@@ -76,7 +76,7 @@ ul.no-bullet {list-style: none}
<h1 class="chapter">1 Chapter 1</h1>
<p>The chapter with contents
-</p><span id="SEC_Contents"></span>
+</p><div class="Contents_element" id="SEC_Contents">
<h1 class="contents-heading">Table of Contents</h1>
<div class="contents">
@@ -88,7 +88,7 @@ ul.no-bullet {list-style: none}
</ul></li>
</ul>
</div>
-
+</div>
<table class="menu" border="0" cellspacing="0">
<tr><td align="left" valign="top"><a href="#section">1.1
section</a></td><td> </td><td align="left" valign="top">
diff --git
a/tp/tests/contents/res_parser/contents_in_middle_section_inline/contents_in_middle_section.html
b/tp/tests/contents/res_parser/contents_in_middle_section_inline/contents_in_middle_section.html
index 31f894a..be4c87d 100644
---
a/tp/tests/contents/res_parser/contents_in_middle_section_inline/contents_in_middle_section.html
+++
b/tp/tests/contents/res_parser/contents_in_middle_section_inline/contents_in_middle_section.html
@@ -104,7 +104,7 @@ ul.no-bullet {list-style: none}
<h2 class="section">1.1 section</h2>
<p>The section with contents
-</p><span id="SEC_Contents"></span>
+</p><div class="Contents_element" id="SEC_Contents">
<h1 class="contents-heading">Table of Contents</h1>
<div class="contents">
@@ -117,7 +117,7 @@ ul.no-bullet {list-style: none}
</ul></li>
</ul>
</div>
-
+</div>
</div><hr>
</div>
diff --git
a/tp/tests/contents/res_parser/double_contents_after_title/double_contents.html
b/tp/tests/contents/res_parser/double_contents_after_title/double_contents.html
index 32cf98d..19a7e27 100644
---
a/tp/tests/contents/res_parser/double_contents_after_title/double_contents.html
+++
b/tp/tests/contents/res_parser/double_contents_after_title/double_contents.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
</head>
<body lang="en">
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
<h1 class="contents-heading">Table of Contents</h1>
<div class="contents">
@@ -46,7 +46,7 @@ ul.no-bullet {list-style: none}
</ul></li>
</ul>
</div>
-
+</div>
<hr>
diff --git
a/tp/tests/contents/res_parser/double_contents_after_title_book/double_contents.html
b/tp/tests/contents/res_parser/double_contents_after_title_book/double_contents.html
index 32cf98d..19a7e27 100644
---
a/tp/tests/contents/res_parser/double_contents_after_title_book/double_contents.html
+++
b/tp/tests/contents/res_parser/double_contents_after_title_book/double_contents.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
</head>
<body lang="en">
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
<h1 class="contents-heading">Table of Contents</h1>
<div class="contents">
@@ -46,7 +46,7 @@ ul.no-bullet {list-style: none}
</ul></li>
</ul>
</div>
-
+</div>
<hr>
diff --git
a/tp/tests/contents/res_parser/double_contents_after_title_book_chapter/index.html
b/tp/tests/contents/res_parser/double_contents_after_title_book_chapter/index.html
index 196e934..2419eee 100644
---
a/tp/tests/contents/res_parser/double_contents_after_title_book_chapter/index.html
+++
b/tp/tests/contents/res_parser/double_contents_after_title_book_chapter/index.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
</head>
<body lang="en">
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
<h1 class="contents-heading">Table of Contents</h1>
<div class="contents">
@@ -46,7 +46,7 @@ ul.no-bullet {list-style: none}
</ul></li>
</ul>
</div>
-
+</div>
<hr>
diff --git
a/tp/tests/contents/res_parser/double_contents_after_title_no_texi2html/index.html
b/tp/tests/contents/res_parser/double_contents_after_title_no_texi2html/index.html
index 77e5ae2..2d36735 100644
---
a/tp/tests/contents/res_parser/double_contents_after_title_no_texi2html/index.html
+++
b/tp/tests/contents/res_parser/double_contents_after_title_no_texi2html/index.html
@@ -37,7 +37,7 @@ ul.no-bullet {list-style: none}
</head>
<body lang="en">
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
<h2 class="contents-heading">Table of Contents</h2>
<div class="contents">
@@ -49,7 +49,7 @@ ul.no-bullet {list-style: none}
</ul></li>
</ul>
</div>
-
+</div>
<hr>
diff --git
a/tp/tests/contents/res_parser/double_contents_book/double_contents.html
b/tp/tests/contents/res_parser/double_contents_book/double_contents.html
index e361bfa..7a48506 100644
--- a/tp/tests/contents/res_parser/double_contents_book/double_contents.html
+++ b/tp/tests/contents/res_parser/double_contents_book/double_contents.html
@@ -35,7 +35,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
<h1 class="contents-heading">Table of Contents</h1>
<div class="contents">
@@ -47,7 +47,7 @@ ul.no-bullet {list-style: none}
</ul></li>
</ul>
</div>
-
+</div>
<div class="top" id="Top">
<table class="header" cellpadding="1" cellspacing="1" border="0">
@@ -80,7 +80,7 @@ ul.no-bullet {list-style: none}
<li> <a href="#section">1.1 section with contents</a> </li>
</ul>
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
<h1 class="contents-heading">Table of Contents</h1>
<div class="contents">
@@ -92,7 +92,7 @@ ul.no-bullet {list-style: none}
</ul></li>
</ul>
</div>
-
+</div>
<p>The chapter
</p>
@@ -108,7 +108,7 @@ ul.no-bullet {list-style: none}
</tr></table>
<div class="node" id="section-with-contents">
<h2 class="section">1.1 section with contents</h2>
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
<h1 class="contents-heading">Table of Contents</h1>
<div class="contents">
@@ -120,7 +120,7 @@ ul.no-bullet {list-style: none}
</ul></li>
</ul>
</div>
-
+</div>
</div><hr>
</div>
diff --git
a/tp/tests/contents/res_parser/double_contents_inline/double_contents.html
b/tp/tests/contents/res_parser/double_contents_inline/double_contents.html
index 7917ed5..673ef74 100644
--- a/tp/tests/contents/res_parser/double_contents_inline/double_contents.html
+++ b/tp/tests/contents/res_parser/double_contents_inline/double_contents.html
@@ -35,7 +35,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
<h1 class="contents-heading">Table of Contents</h1>
<div class="contents">
@@ -47,7 +47,7 @@ ul.no-bullet {list-style: none}
</ul></li>
</ul>
</div>
-
+</div>
<div class="top" id="Top">
<table class="header" cellpadding="1" cellspacing="1" border="0">
@@ -88,7 +88,7 @@ ul.no-bullet {list-style: none}
<div class="node" id="Chapter-1">
<h1 class="chapter">1 Chapter 1</h1>
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
<h1 class="contents-heading">Table of Contents</h1>
<div class="contents">
@@ -100,7 +100,7 @@ ul.no-bullet {list-style: none}
</ul></li>
</ul>
</div>
-
+</div>
<p>The chapter
</p>
<table class="menu" border="0" cellspacing="0">
@@ -127,7 +127,7 @@ ul.no-bullet {list-style: none}
</tr></table>
<div class="node" id="section-with-contents">
<h2 class="section">1.1 section with contents</h2>
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
<h1 class="contents-heading">Table of Contents</h1>
<div class="contents">
@@ -139,7 +139,7 @@ ul.no-bullet {list-style: none}
</ul></li>
</ul>
</div>
-
+</div>
</div><hr size="6">
</div>
diff --git
a/tp/tests/contents/res_parser/double_contents_inline_chapter/chapter.html
b/tp/tests/contents/res_parser/double_contents_inline_chapter/chapter.html
index 47dae13..39aaaeb 100644
--- a/tp/tests/contents/res_parser/double_contents_inline_chapter/chapter.html
+++ b/tp/tests/contents/res_parser/double_contents_inline_chapter/chapter.html
@@ -53,7 +53,7 @@ ul.no-bullet {list-style: none}
<div class="node" id="Chapter-1">
<h1 class="chapter">1 Chapter 1</h1>
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
<h1 class="contents-heading">Table of Contents</h1>
<div class="contents">
@@ -65,7 +65,7 @@ ul.no-bullet {list-style: none}
</ul></li>
</ul>
</div>
-
+</div>
<p>The chapter
</p>
<table class="menu" border="0" cellspacing="0">
@@ -92,7 +92,7 @@ ul.no-bullet {list-style: none}
</tr></table>
<div class="node" id="section-with-contents">
<h2 class="section">1.1 section with contents</h2>
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
<h1 class="contents-heading">Table of Contents</h1>
<div class="contents">
@@ -104,7 +104,7 @@ ul.no-bullet {list-style: none}
</ul></li>
</ul>
</div>
-
+</div>
</div><hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
diff --git
a/tp/tests/contents/res_parser/double_contents_inline_chapter/index.html
b/tp/tests/contents/res_parser/double_contents_inline_chapter/index.html
index 44b5985..cc006a3 100644
--- a/tp/tests/contents/res_parser/double_contents_inline_chapter/index.html
+++ b/tp/tests/contents/res_parser/double_contents_inline_chapter/index.html
@@ -35,7 +35,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
<h1 class="contents-heading">Table of Contents</h1>
<div class="contents">
@@ -47,7 +47,7 @@ ul.no-bullet {list-style: none}
</ul></li>
</ul>
</div>
-
+</div>
<div class="top" id="Top">
<table class="header" cellpadding="1" cellspacing="1" border="0">
diff --git
a/tp/tests/contents/res_parser/double_contents_inline_nodes/chapter.html
b/tp/tests/contents/res_parser/double_contents_inline_nodes/chapter.html
index 9ef22d7..43b53bb 100644
--- a/tp/tests/contents/res_parser/double_contents_inline_nodes/chapter.html
+++ b/tp/tests/contents/res_parser/double_contents_inline_nodes/chapter.html
@@ -54,7 +54,7 @@ ul.no-bullet {list-style: none}
<div class="node" id="Chapter-1">
<h1 class="chapter">1 Chapter 1</h1>
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
<h1 class="contents-heading">Table of Contents</h1>
<div class="contents">
@@ -66,7 +66,7 @@ ul.no-bullet {list-style: none}
</ul></li>
</ul>
</div>
-
+</div>
<p>The chapter
</p>
<table class="menu" border="0" cellspacing="0">
diff --git
a/tp/tests/contents/res_parser/double_contents_inline_nodes/index.html
b/tp/tests/contents/res_parser/double_contents_inline_nodes/index.html
index 8ccbbfd..51086fb 100644
--- a/tp/tests/contents/res_parser/double_contents_inline_nodes/index.html
+++ b/tp/tests/contents/res_parser/double_contents_inline_nodes/index.html
@@ -35,7 +35,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
<h1 class="contents-heading">Table of Contents</h1>
<div class="contents">
@@ -47,7 +47,7 @@ ul.no-bullet {list-style: none}
</ul></li>
</ul>
</div>
-
+</div>
<div class="top" id="Top">
<table class="header" cellpadding="1" cellspacing="1" border="0">
diff --git
a/tp/tests/contents/res_parser/double_contents_inline_nodes/section.html
b/tp/tests/contents/res_parser/double_contents_inline_nodes/section.html
index b28bdea..4941852 100644
--- a/tp/tests/contents/res_parser/double_contents_inline_nodes/section.html
+++ b/tp/tests/contents/res_parser/double_contents_inline_nodes/section.html
@@ -53,7 +53,7 @@ ul.no-bullet {list-style: none}
<hr>
<div class="node" id="section-with-contents">
<h2 class="section">1.1 section with contents</h2>
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
<h1 class="contents-heading">Table of Contents</h1>
<div class="contents">
@@ -65,7 +65,7 @@ ul.no-bullet {list-style: none}
</ul></li>
</ul>
</div>
-
+</div>
</div><hr>
</div>
diff --git
a/tp/tests/contents/res_parser/double_contents_inline_section/chapter.html
b/tp/tests/contents/res_parser/double_contents_inline_section/chapter.html
index f5babee..e06cac2 100644
--- a/tp/tests/contents/res_parser/double_contents_inline_section/chapter.html
+++ b/tp/tests/contents/res_parser/double_contents_inline_section/chapter.html
@@ -53,7 +53,7 @@ ul.no-bullet {list-style: none}
<div class="node" id="Chapter-1">
<h1 class="chapter">1 Chapter 1</h1>
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
<h1 class="contents-heading">Table of Contents</h1>
<div class="contents">
@@ -65,7 +65,7 @@ ul.no-bullet {list-style: none}
</ul></li>
</ul>
</div>
-
+</div>
<p>The chapter
</p>
<table class="menu" border="0" cellspacing="0">
diff --git
a/tp/tests/contents/res_parser/double_contents_inline_section/index.html
b/tp/tests/contents/res_parser/double_contents_inline_section/index.html
index c535eae..0967a85 100644
--- a/tp/tests/contents/res_parser/double_contents_inline_section/index.html
+++ b/tp/tests/contents/res_parser/double_contents_inline_section/index.html
@@ -35,7 +35,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
<h1 class="contents-heading">Table of Contents</h1>
<div class="contents">
@@ -47,7 +47,7 @@ ul.no-bullet {list-style: none}
</ul></li>
</ul>
</div>
-
+</div>
<div class="top" id="Top">
<table class="header" cellpadding="1" cellspacing="1" border="0">
diff --git
a/tp/tests/contents/res_parser/double_contents_inline_section/section.html
b/tp/tests/contents/res_parser/double_contents_inline_section/section.html
index 8530d38..f307ba0 100644
--- a/tp/tests/contents/res_parser/double_contents_inline_section/section.html
+++ b/tp/tests/contents/res_parser/double_contents_inline_section/section.html
@@ -52,7 +52,7 @@ ul.no-bullet {list-style: none}
</tr></table>
<div class="node" id="section-with-contents">
<h2 class="section">1.1 section with contents</h2>
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
<h1 class="contents-heading">Table of Contents</h1>
<div class="contents">
@@ -64,7 +64,7 @@ ul.no-bullet {list-style: none}
</ul></li>
</ul>
</div>
-
+</div>
</div><hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
diff --git
a/tp/tests/indices/res_parser_info/index_special_region_html/index.html
b/tp/tests/indices/res_parser_info/index_special_region_html/index.html
index cf72cfd..bacb0ac 100644
--- a/tp/tests/indices/res_parser_info/index_special_region_html/index.html
+++ b/tp/tests/indices/res_parser_info/index_special_region_html/index.html
@@ -54,7 +54,7 @@ Next: <a href="Copying-and-indices.html" accesskey="n"
rel="next">Copying and in
</div>
<div class="node" id="Top-1">
<h1 class="top">Top</h1>
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
<h2 class="contents-heading">Table of Contents</h2>
<div class="contents">
@@ -64,7 +64,7 @@ Next: <a href="Copying-and-indices.html" accesskey="n"
rel="next">Copying and in
<li><a id="toc-Copying-and-indices-1" href="Copying-and-indices.html"
rel="index">Appendix A Copying and indices</a></li>
</ul>
</div>
-
+</div>
</div><div class="chapter" id="Chapter">
<h2 class="chapter">1 Chapter</h2>
diff --git
a/tp/tests/indices/res_parser_info/index_special_region_no_insertcopying_html/index.html
b/tp/tests/indices/res_parser_info/index_special_region_no_insertcopying_html/index.html
index c5b307e..21d8caa 100644
---
a/tp/tests/indices/res_parser_info/index_special_region_no_insertcopying_html/index.html
+++
b/tp/tests/indices/res_parser_info/index_special_region_no_insertcopying_html/index.html
@@ -53,7 +53,7 @@ Next: <a href="Copying-and-indices.html" accesskey="n"
rel="next">Copying and in
</div>
<div class="node" id="Top-1">
<h1 class="top">Top</h1>
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
<h2 class="contents-heading">Table of Contents</h2>
<div class="contents">
@@ -63,7 +63,7 @@ Next: <a href="Copying-and-indices.html" accesskey="n"
rel="next">Copying and in
<li><a id="toc-Copying-and-indices-1" href="Copying-and-indices.html"
rel="index">Appendix A Copying and indices</a></li>
</ul>
</div>
-
+</div>
</div><div class="chapter" id="Chapter">
<h2 class="chapter">1 Chapter</h2>
diff --git
a/tp/tests/indices/res_parser_info/index_special_region_no_region_html/index.html
b/tp/tests/indices/res_parser_info/index_special_region_no_region_html/index.html
index 8402cc3..7a5a21c 100644
---
a/tp/tests/indices/res_parser_info/index_special_region_no_region_html/index.html
+++
b/tp/tests/indices/res_parser_info/index_special_region_no_region_html/index.html
@@ -54,7 +54,7 @@ Next: <a href="Copying-and-indices.html" accesskey="n"
rel="next">Copying and in
<div class="node" id="Top-1">
<h1 class="top">Top</h1>
-<span id="SEC_Contents"></span>
+<div class="Contents_element" id="SEC_Contents">
<h2 class="contents-heading">Table of Contents</h2>
<div class="contents">
@@ -64,7 +64,7 @@ Next: <a href="Copying-and-indices.html" accesskey="n"
rel="next">Copying and in
<li><a id="toc-Copying-and-indices-1" href="Copying-and-indices.html"
rel="index">Appendix A Copying and indices</a></li>
</ul>
</div>
-
+</div>
</div><div class="chapter" id="Chapter">
<h2 class="chapter">1 Chapter</h2>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * Texinfo/Convert/HTML.pm (_contents_inline_element): Put inline contents elements in a <div>. Report from Per Bothner.,
Patrice Dumas <=