[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/Convert/HTML.pm (convert): output sp
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Texinfo/Convert/HTML.pm (convert): output special elements in every cases where there are multiple units. |
|
Date: |
Mon, 03 Jan 2022 04:09:46 -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 1f51673b77 * tp/Texinfo/Convert/HTML.pm (convert): output special
elements in every cases where there are multiple units.
1f51673b77 is described below
commit 1f51673b77a60b2418dc21b52ea44ed53eb37113
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Jan 3 10:09:34 2022 +0100
* tp/Texinfo/Convert/HTML.pm (convert): output special elements
in every cases where there are multiple units.
---
ChangeLog | 5 +
tp/TODO | 4 -
tp/Texinfo/Convert/HTML.pm | 26 +-
tp/t/03coverage_braces.t | 1 -
tp/t/60macro.t | 6 +-
tp/t/html_tests.t | 6 +-
tp/t/languages.t | 4 +-
.../two_footnotes_in_nodes_separate.pl | 48 ++-
tp/t/results/formatting/texi_bib_example.pl | 110 +++++++
tp/t/results/formatting/texi_glossary.pl | 110 +++++++
.../indices/index_entry_in_footnote_separate.pl | 18 +-
tp/t/results/macro/implicit_quoting_one_arg.pl | 18 +-
tp/t/results/morecoverage/formatting_fr.pl | 330 +++++++++++++++++++++
.../sectioning/anchor_in_footnote_separate.pl | 11 +
14 files changed, 656 insertions(+), 41 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 9fea42fc4f..6c55ddcb7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2022-01-03 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/Convert/HTML.pm (convert): output special elements
+ in every cases where there are multiple units.
+
2022-01-03 Patrice Dumas <pertusus@free.fr>
* p/Texinfo/Common.pm, tp/Texinfo/Config.pm,
diff --git a/tp/TODO b/tp/TODO
index 08c819de27..664ffeff65 100644
--- a/tp/TODO
+++ b/tp/TODO
@@ -13,10 +13,6 @@ xmllint --nonet --noout --valid commands.xml
Before next release
===================
-Special elements are ignored in different contexts, see IGNORED SPE
-in HTML.pm. There are tests already showing that.
-
-
Bugs
====
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index b950729f5b..31b1a7aa65 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -7759,16 +7759,11 @@ sub convert($$)
$result = $self->_convert($root, 'convert no unit');
$result .= &{$self->{'format_footnotes_text'}}($self);
} else {
- # special elements are ignored, so for instance separate
- # footnotes will not show up
- #if ($special_elements and @$special_elements) {
- # print STDERR "C IGNORED SPE @$special_elements\n";
- # foreach my $special_element (@$special_elements) {
- # print STDERR " C SE-III
".Texinfo::Common::debug_print_element_short($special_element)."\n";
- # }
- #}
my $unit_nr = 0;
- foreach my $tree_unit (@$tree_units) {
+ # TODO there is no rule before the footnotes special element in
+ # case of separate footnotes in the default formatting style.
+ # Not sure if it is an issue.
+ foreach my $tree_unit (@$tree_units, @$special_elements) {
print STDERR "\nC UNIT $unit_nr\n" if ($self->get_conf('DEBUG'));
my $tree_unit_text = $self->_convert($tree_unit, "convert unit
$unit_nr");
$result .= $tree_unit_text;
@@ -8156,16 +8151,11 @@ sub output($$)
}
my $body = '';
if ($tree_units and @$tree_units) {
- # special elements are ignored, so for instance separate
- # footnotes will not show up
- #if ($special_elements and @$special_elements) {
- # print STDERR "IGNORED SPE @$special_elements\n";
- # foreach my $special_element (@$special_elements) {
- # print STDERR " SE-III
".Texinfo::Common::debug_print_element_short($special_element)."\n";
- # }
- #}
my $unit_nr = 0;
- foreach my $tree_unit (@$tree_units) {
+ # TODO there is no rule before the footnotes special element in
+ # case of separate footnotes in the default formatting style.
+ # Not sure if it is an issue.
+ foreach my $tree_unit (@$tree_units, @$special_elements) {
print STDERR "\nUNIT NO-PAGE $unit_nr\n" if ($self->get_conf('DEBUG'));
my $tree_unit_text = $self->_convert($tree_unit, "no-page output unit
$unit_nr");
$body .= $tree_unit_text;
diff --git a/tp/t/03coverage_braces.t b/tp/t/03coverage_braces.t
index 483936c673..35e8fb097e 100644
--- a/tp/t/03coverage_braces.t
+++ b/tp/t/03coverage_braces.t
@@ -233,7 +233,6 @@ in format
['two_footnotes_in_nodes',
$two_footnotes_in_nodes_text,
, {'test_formats' => ['html', 'info']} ],
-# FIXME no footnotes text in HTML...
['two_footnotes_in_nodes_separate',
'@footnotestyle separate
'.$two_footnotes_in_nodes_text,
diff --git a/tp/t/60macro.t b/tp/t/60macro.t
index 0a3c7c16d0..e37df1c03f 100644
--- a/tp/t/60macro.t
+++ b/tp/t/60macro.t
@@ -173,11 +173,11 @@ now, arg3
}.'],
['implicit_quoting_one_arg',
'
-@macro FIXME{a}
-@strong{FIXME: \a\}
+@macro FIXAME{a}
+@strong{FIXAME: \a\}
@end macro
-@FIXME{Many arguments, separated by commas, are processed here}
+@FIXAME{Many arguments, separated by commas, are processed here}
'],
['implicit_quoting_recursion',
'@rmacro cat{a,b}
diff --git a/tp/t/html_tests.t b/tp/t/html_tests.t
index 15975cd711..c7e58a3c76 100644
--- a/tp/t/html_tests.t
+++ b/tp/t/html_tests.t
@@ -504,8 +504,10 @@ my @file_tests = (
@node @^i
', {'test_split' => 'section'}, {'SPLIT' => 'chapter'}],
-# FIXME the result is incorrect, the second footnote text is in
-# the separate file but the link points to the same file
+# TODO? the result is incorrect, the second footnote text is in
+# the separate file but the link in chap-s.html points to the same file.
+# The manual states that the footnotestyle should be in the preamble,
+# so it is very unclear whether this needs to be fixed.
['footnotestyle_separate_late',
'@setfilename footnotestyle_separate_late.info
diff --git a/tp/t/languages.t b/tp/t/languages.t
index ffa404cc3e..3371b7393e 100644
--- a/tp/t/languages.t
+++ b/tp/t/languages.t
@@ -14,13 +14,13 @@ my @test_cases = (
@defivar AAA BBB CCC
@end defivar
'],
-# FIXME it may be correct, but it is worth noting that the
+# REMARK it is worth noting that the
# @defivar in @insertcopying after @documentlanguage de appears
# in german in the document, (and after @documentlanguage pt at
# the end appears in portruguese) but the index entry is in fr, because
# the index entry is set in the @copying block which is in
# @documentlanguage fr.
-# Also the copying comment at te beginning of each file is in fr
+# Also the copying comment at the beginning of each file is in fr
['multiple',
'@documentlanguage fr
diff --git a/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl
b/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl
index dda9dff3e0..596cfe4e07 100644
--- a/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl
+++ b/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl
@@ -910,7 +910,30 @@ Previous: <a href="#Top" accesskey="p" rel="prev">2
footnotes in 2 nodes</a>, Up
</p>
</div>
</div>
+<div class="Footnotes_element" id="SEC_Foot">
+<div class="header">
+<p>
+ </p>
+</div>
+<h4 class="footnotes-heading">Footnotes</h4>
+<h5><a id="FOOT1" href="#DOCF1">(1)</a></h5>
+<p>Footnote Top/1
+</p>
+<p>para2</p>
+<h5><a id="FOOT2" href="#DOCF2">(2)</a></h5>
+<p>Footnote Top/2
+</p>
+<p>para2</p>
+<h5><a id="FOOT3" href="#DOCF3">(3)</a></h5>
+<p>Footnote chapter/1
+</p>
+<p>para2</p>
+<h5><a id="FOOT4" href="#DOCF4">(4)</a></h5>
+<p>Footnote chapter/2
+</p>
+<p>para2</p>
+</div>
</body>
@@ -1049,6 +1072,29 @@
$result_converted{'html_text'}->{'two_footnotes_in_nodes_separate'} = '<div clas
</p>
</div>
</div>
-';
+<div class="Footnotes_element" id="SEC_Foot">
+<div class="header">
+<p>
+ </p>
+</div>
+<h4 class="footnotes-heading">Footnotes</h4>
+
+<h5><a id="FOOT1" href="#DOCF1">(1)</a></h5>
+<p>Footnote Top/1
+</p>
+<p>para2</p>
+<h5><a id="FOOT2" href="#DOCF2">(2)</a></h5>
+<p>Footnote Top/2
+</p>
+<p>para2</p>
+<h5><a id="FOOT3" href="#DOCF3">(3)</a></h5>
+<p>Footnote chapter/1
+</p>
+<p>para2</p>
+<h5><a id="FOOT4" href="#DOCF4">(4)</a></h5>
+<p>Footnote chapter/2
+</p>
+<p>para2</p>
+</div>';
1;
diff --git a/tp/t/results/formatting/texi_bib_example.pl
b/tp/t/results/formatting/texi_bib_example.pl
index 53f6d918fa..33f4ad8188 100644
--- a/tp/t/results/formatting/texi_bib_example.pl
+++ b/tp/t/results/formatting/texi_bib_example.pl
@@ -5768,6 +5768,116 @@ Massachusetts, 1994.
</div>
</div>
<hr>
+<div class="About_element" id="SEC_About">
+<table class="header" cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left">[<a href="#Top" title="Cover (top) of
document">Top</a>]</td>
+<td valign="middle" align="left">[Contents]</td>
+<td valign="middle" align="left">[Index]</td>
+<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ?
</a>]</td>
+</tr></table>
+<h1 class="about-heading">About This Document</h1>
+
+<p>
+ This document was generated on <em>a sunny day</em> using <a
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
+</p>
+<p>
+ The buttons in the navigation panels have the following meaning:
+</p>
+<table border="1">
+ <tr>
+ <th> Button </th>
+ <th> Name </th>
+ <th> Go to </th>
+ <th> From 1.2.3 go to</th>
+ </tr>
+ <tr>
+ <td align="center"> [ << ] </td>
+ <td align="center">FastBack</td>
+ <td>Beginning of this chapter or previous chapter</td>
+ <td>1</td>
+ </tr>
+ <tr>
+ <td align="center"> [ < ] </td>
+ <td align="center">Back</td>
+ <td>Previous section in reading order</td>
+ <td>1.2.2</td>
+ </tr>
+ <tr>
+ <td align="center"> [ Up ] </td>
+ <td align="center">Up</td>
+ <td>Up section</td>
+ <td>1.2</td>
+ </tr>
+ <tr>
+ <td align="center"> [ > ] </td>
+ <td align="center">Forward</td>
+ <td>Next section in reading order</td>
+ <td>1.2.4</td>
+ </tr>
+ <tr>
+ <td align="center"> [ >> ] </td>
+ <td align="center">FastForward</td>
+ <td>Next chapter</td>
+ <td>2</td>
+ </tr>
+ <tr>
+ <td align="center"> [Top] </td>
+ <td align="center">Top</td>
+ <td>Cover (top) of document</td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td align="center"> [Contents] </td>
+ <td align="center">Contents</td>
+ <td>Table of contents</td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td align="center"> [Index] </td>
+ <td align="center">Index</td>
+ <td>Index</td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td align="center"> [ ? ] </td>
+ <td align="center">About</td>
+ <td>About (help)</td>
+ <td> </td>
+ </tr>
+</table>
+
+<p>
+ where the <strong> Example </strong> assumes that the current position is at
<strong> Subsubsection One-Two-Three </strong> of a document of the following
structure:
+</p>
+
+<ul>
+ <li> 1. Section One
+ <ul>
+ <li>1.1 Subsection One-One
+ <ul>
+ <li>...</li>
+ </ul>
+ </li>
+ <li>1.2 Subsection One-Two
+ <ul>
+ <li>1.2.1 Subsubsection One-Two-One</li>
+ <li>1.2.2 Subsubsection One-Two-Two</li>
+ <li>1.2.3 Subsubsection One-Two-Three
+ <strong><== Current Position </strong></li>
+ <li>1.2.4 Subsubsection One-Two-Four</li>
+ </ul>
+ </li>
+ <li>1.3 Subsection One-Three
+ <ul>
+ <li>...</li>
+ </ul>
+ </li>
+ <li>1.4 Subsection One-Four</li>
+ </ul>
+ </li>
+</ul>
+
+</div><hr>
<p>
<span class="smaller">This document was generated on <em>a sunny day</em>
using <a
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.</span>
</p>
diff --git a/tp/t/results/formatting/texi_glossary.pl
b/tp/t/results/formatting/texi_glossary.pl
index ab4e431498..b2a7a39119 100644
--- a/tp/t/results/formatting/texi_glossary.pl
+++ b/tp/t/results/formatting/texi_glossary.pl
@@ -1669,6 +1669,116 @@ ul.no-bullet {list-style: none}
</div>
</div>
<hr>
+<div class="About_element" id="SEC_About">
+<table class="header" cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left">[<a href="#Top" title="Cover (top) of
document">Top</a>]</td>
+<td valign="middle" align="left">[Contents]</td>
+<td valign="middle" align="left">[Index]</td>
+<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ?
</a>]</td>
+</tr></table>
+<h1 class="about-heading">About This Document</h1>
+
+<p>
+ This document was generated on <em>a sunny day</em> using <a
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
+</p>
+<p>
+ The buttons in the navigation panels have the following meaning:
+</p>
+<table border="1">
+ <tr>
+ <th> Button </th>
+ <th> Name </th>
+ <th> Go to </th>
+ <th> From 1.2.3 go to</th>
+ </tr>
+ <tr>
+ <td align="center"> [ << ] </td>
+ <td align="center">FastBack</td>
+ <td>Beginning of this chapter or previous chapter</td>
+ <td>1</td>
+ </tr>
+ <tr>
+ <td align="center"> [ < ] </td>
+ <td align="center">Back</td>
+ <td>Previous section in reading order</td>
+ <td>1.2.2</td>
+ </tr>
+ <tr>
+ <td align="center"> [ Up ] </td>
+ <td align="center">Up</td>
+ <td>Up section</td>
+ <td>1.2</td>
+ </tr>
+ <tr>
+ <td align="center"> [ > ] </td>
+ <td align="center">Forward</td>
+ <td>Next section in reading order</td>
+ <td>1.2.4</td>
+ </tr>
+ <tr>
+ <td align="center"> [ >> ] </td>
+ <td align="center">FastForward</td>
+ <td>Next chapter</td>
+ <td>2</td>
+ </tr>
+ <tr>
+ <td align="center"> [Top] </td>
+ <td align="center">Top</td>
+ <td>Cover (top) of document</td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td align="center"> [Contents] </td>
+ <td align="center">Contents</td>
+ <td>Table of contents</td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td align="center"> [Index] </td>
+ <td align="center">Index</td>
+ <td>Index</td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td align="center"> [ ? ] </td>
+ <td align="center">About</td>
+ <td>About (help)</td>
+ <td> </td>
+ </tr>
+</table>
+
+<p>
+ where the <strong> Example </strong> assumes that the current position is at
<strong> Subsubsection One-Two-Three </strong> of a document of the following
structure:
+</p>
+
+<ul>
+ <li> 1. Section One
+ <ul>
+ <li>1.1 Subsection One-One
+ <ul>
+ <li>...</li>
+ </ul>
+ </li>
+ <li>1.2 Subsection One-Two
+ <ul>
+ <li>1.2.1 Subsubsection One-Two-One</li>
+ <li>1.2.2 Subsubsection One-Two-Two</li>
+ <li>1.2.3 Subsubsection One-Two-Three
+ <strong><== Current Position </strong></li>
+ <li>1.2.4 Subsubsection One-Two-Four</li>
+ </ul>
+ </li>
+ <li>1.3 Subsection One-Three
+ <ul>
+ <li>...</li>
+ </ul>
+ </li>
+ <li>1.4 Subsection One-Four</li>
+ </ul>
+ </li>
+</ul>
+
+</div><hr>
<p>
<span class="smaller">This document was generated on <em>a sunny day</em>
using <a
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.</span>
</p>
diff --git a/tp/t/results/indices/index_entry_in_footnote_separate.pl
b/tp/t/results/indices/index_entry_in_footnote_separate.pl
index 3ecb2c5a6f..6dfddd32d1 100644
--- a/tp/t/results/indices/index_entry_in_footnote_separate.pl
+++ b/tp/t/results/indices/index_entry_in_footnote_separate.pl
@@ -727,6 +727,22 @@
$result_converted{'html_text'}->{'index_entry_in_footnote_separate'} = '<a class
<a class="summary-letter" href="#t_h_cp_letter-I"><b>I</b></a>
</td></tr></table>
-';
+<div class="Footnotes_element" id="SEC_Foot">
+<div class="header">
+<p>
+ [<a href="#First" title="Index" rel="index">Index</a>]</p>
+</div>
+<h4 class="footnotes-heading">Footnotes</h4>
+
+<h5><a id="FOOT1" href="#DOCF1">(1)</a></h5>
+<p>in footnote
+<a class="index-entry-anchor" id="index-index-entry-in-footnote"></a>
+</p>
+<p>Blah
+</p>
+<p>Blih
+</p>
+<a class="index-entry-anchor" id="index-counting-entry"></a>
+</div>';
1;
diff --git a/tp/t/results/macro/implicit_quoting_one_arg.pl
b/tp/t/results/macro/implicit_quoting_one_arg.pl
index 09e3ae1173..d3bd3d8a2c 100644
--- a/tp/t/results/macro/implicit_quoting_one_arg.pl
+++ b/tp/t/results/macro/implicit_quoting_one_arg.pl
@@ -19,7 +19,7 @@ $result_trees{'implicit_quoting_one_arg'} = {
'args' => [
{
'parent' => {},
- 'text' => 'FIXME',
+ 'text' => 'FIXAME',
'type' => 'macro_name'
},
{
@@ -32,7 +32,7 @@ $result_trees{'implicit_quoting_one_arg'} = {
'contents' => [
{
'parent' => {},
- 'text' => '@strong{FIXME: \\a\\}',
+ 'text' => '@strong{FIXAME: \\a\\}',
'type' => 'raw'
},
{
@@ -43,7 +43,7 @@ $result_trees{'implicit_quoting_one_arg'} = {
}
],
'extra' => {
- 'arg_line' => ' FIXME{a}
+ 'arg_line' => ' FIXAME{a}
'
},
'line_nr' => {
@@ -73,7 +73,7 @@ $result_trees{'implicit_quoting_one_arg'} = {
'contents' => [
{
'parent' => {},
- 'text' => 'FIXME: Many arguments, separated by commas,
are processed here'
+ 'text' => 'FIXAME: Many arguments, separated by commas,
are processed here'
}
],
'parent' => {},
@@ -85,7 +85,7 @@ $result_trees{'implicit_quoting_one_arg'} = {
'line_nr' => {
'file_name' => '',
'line_nr' => 6,
- 'macro' => 'FIXME'
+ 'macro' => 'FIXAME'
},
'parent' => {}
},
@@ -121,17 +121,17 @@
$result_trees{'implicit_quoting_one_arg'}{'contents'}[0]{'contents'}[4]{'parent'
$result_trees{'implicit_quoting_one_arg'}{'contents'}[0]{'parent'} =
$result_trees{'implicit_quoting_one_arg'};
$result_texis{'implicit_quoting_one_arg'} = '
-@macro FIXME{a}
-@strong{FIXME: \\a\\}
+@macro FIXAME{a}
+@strong{FIXAME: \\a\\}
@end macro
-@strong{FIXME: Many arguments, separated by commas, are processed here}
+@strong{FIXAME: Many arguments, separated by commas, are processed here}
';
$result_texts{'implicit_quoting_one_arg'} = '
-FIXME: Many arguments, separated by commas, are processed here
+FIXAME: Many arguments, separated by commas, are processed here
';
$result_errors{'implicit_quoting_one_arg'} = [];
diff --git a/tp/t/results/morecoverage/formatting_fr.pl
b/tp/t/results/morecoverage/formatting_fr.pl
index 76901302ca..9b31125c8a 100644
--- a/tp/t/results/morecoverage/formatting_fr.pl
+++ b/tp/t/results/morecoverage/formatting_fr.pl
@@ -5312,6 +5312,171 @@ Menu comment
</div>
</div>
<hr>
+<div class="Footnotes_element" id="SEC_Foot">
+<table class="header" cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left">[<a href="#Top" title="Couverture (top)
du document">Racine</a>]</td>
+<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table des
matières">Table des matières</a>]</td>
+<td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="#SEC_About" title="A propos (page
d’aide)"> ? </a>]</td>
+</tr></table>
+<h1 class="footnotes-heading">Notes de bas de page</h1>
+
+<h5><a id="FOOT1" href="#DOCF1">(1)</a></h5>
+<p>in footnote</p>
+</div><hr>
+<div class="Contents_element" id="SEC_Contents">
+<table class="header" cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left">[<a href="#Top" title="Couverture (top)
du document">Racine</a>]</td>
+<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table des
matières">Table des matières</a>]</td>
+<td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="#SEC_About" title="A propos (page
d’aide)"> ? </a>]</td>
+</tr></table>
+<h1 class="contents-heading">Table des matières</h1>
+
+<div class="contents">
+
+<ul class="no-bullet">
+ <li><a id="toc-chapter-1" href="#chapter">1 chapter</a>
+ <ul class="no-bullet">
+ <li><a id="toc-A-section" href="#s_002d_002dect_002cion">1.1 A section</a>
+ <ul class="no-bullet">
+ <li><a id="toc-subsection-1" href="#subsection">1.1.1 subsection</a>
+ <ul class="no-bullet">
+ <li><a id="toc-subsubsection-_0060_0060simple_002ddouble_002d_002d-1"
href="#subsubsection-_0060_0060simple_002ddouble_002d_002d">1.1.1.1
subsubsection “simple-double–</a></li>
+ <li><a id="toc-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027"
href="#subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">1.1.1.2
three—four—-”</a></li>
+ </ul></li>
+ </ul></li>
+ </ul></li>
+ <li><a id="toc-chapter-2" href="#chapter2" rel="index">chapter 2</a></li>
+</ul>
+</div>
+</div><hr>
+<div class="Overview_element" id="SEC_Overview">
+<table class="header" cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left">[<a href="#Top" title="Couverture (top)
du document">Racine</a>]</td>
+<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table des
matières">Table des matières</a>]</td>
+<td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="#SEC_About" title="A propos (page
d’aide)"> ? </a>]</td>
+</tr></table>
+<h1 class="shortcontents-heading">Résumé du contenu</h1>
+
+<div class="shortcontents">
+<ul class="no-bullet">
+<li><a id="stoc-chapter-1" href="#chapter">1 chapter</a></li>
+<li><a id="stoc-chapter-2" href="#chapter2" rel="index">chapter 2</a></li>
+</ul>
+</div>
+</div><hr>
+<div class="About_element" id="SEC_About">
+<table class="header" cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left">[<a href="#Top" title="Couverture (top)
du document">Racine</a>]</td>
+<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table des
matières">Table des matières</a>]</td>
+<td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="#SEC_About" title="A propos (page
d’aide)"> ? </a>]</td>
+</tr></table>
+<h1 class="about-heading">A propos de ce document</h1>
+
+<p>
+ Ce document a été généré le <em>a sunny
day</em>.
+</p>
+<p>
+ Les boutons du panneau de navigation ont la signification suivante :
+</p>
+<table border="1">
+ <tr>
+ <th> Bouton </th>
+ <th> Nom </th>
+ <th> Aller à </th>
+ <th> Depuis 1.2.3 aller à</th>
+ </tr>
+ <tr>
+ <td align="center"> [ << ] </td>
+ <td align="center">RetourRapide</td>
+ <td>Début de ce chapitre ou chapitre précédent</td>
+ <td>1</td>
+ </tr>
+ <tr>
+ <td align="center"> [ < ] </td>
+ <td align="center">Arrière</td>
+ <td>Section précédente dans l’ordre de lecture</td>
+ <td>1.2.2</td>
+ </tr>
+ <tr>
+ <td align="center"> [Plus haut] </td>
+ <td align="center">Monter</td>
+ <td>Section supérieure</td>
+ <td>1.2</td>
+ </tr>
+ <tr>
+ <td align="center"> [ > ] </td>
+ <td align="center">Avant</td>
+ <td>Section suivante dans l’ordre de lecture</td>
+ <td>1.2.4</td>
+ </tr>
+ <tr>
+ <td align="center"> [ >> ] </td>
+ <td align="center">AvanceRapide</td>
+ <td>Chapitre suivant</td>
+ <td>2</td>
+ </tr>
+ <tr>
+ <td align="center"> [Racine] </td>
+ <td align="center">Racine</td>
+ <td>Couverture (top) du document</td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td align="center"> [Table des matières] </td>
+ <td align="center">Table des matières</td>
+ <td>Table des matières</td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td align="center"> [Index] </td>
+ <td align="center">Index</td>
+ <td>Index</td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td align="center"> [ ? ] </td>
+ <td align="center">A propos</td>
+ <td>A propos (page d’aide)</td>
+ <td> </td>
+ </tr>
+</table>
+
+<p>
+ Dans cet exemple on est à <strong> Sous-sous-section un-deux-trois
</strong> dans un document dont la structure est :
+</p>
+
+<ul>
+ <li> 1. Section un
+ <ul>
+ <li>1.1 Sous-section un-un
+ <ul>
+ <li>...</li>
+ </ul>
+ </li>
+ <li>1.2 Sous-section un-deux
+ <ul>
+ <li>1.2.1 Sous-sous-section un-deux-un</li>
+ <li>1.2.2 Sous-sous-section un-deux-deux</li>
+ <li>1.2.3 Sous-sous-section un-deux-trois
+ <strong><== Position actuelle </strong></li>
+ <li>1.2.4 Sous-sous-section un-deux-quatre</li>
+ </ul>
+ </li>
+ <li>1.3 Sous-section un-trois
+ <ul>
+ <li>...</li>
+ </ul>
+ </li>
+ <li>1.4 Sous-section un-quatre</li>
+ </ul>
+ </li>
+</ul>
+
+</div><hr>
<p>
<span class="smaller">Ce document a été
généré le <em>a sunny day</em>.</span>
</p>
@@ -5704,6 +5869,171 @@ Menu comment
</div>
</div>
<hr>
+<div class="Footnotes_element" id="SEC_Foot">
+<table class="header" cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left">[<a href="#Top" title="Couverture (top)
du document">Racine</a>]</td>
+<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table des
matières">Table des matières</a>]</td>
+<td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="#SEC_About" title="A propos (page
d’aide)"> ? </a>]</td>
+</tr></table>
+<h1 class="footnotes-heading">Notes de bas de page</h1>
+
+<h5><a id="FOOT1" href="#DOCF1">(1)</a></h5>
+<p>in footnote</p>
+</div><hr>
+<div class="Contents_element" id="SEC_Contents">
+<table class="header" cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left">[<a href="#Top" title="Couverture (top)
du document">Racine</a>]</td>
+<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table des
matières">Table des matières</a>]</td>
+<td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="#SEC_About" title="A propos (page
d’aide)"> ? </a>]</td>
+</tr></table>
+<h1 class="contents-heading">Table des matières</h1>
+
+<div class="contents">
+
+<ul class="no-bullet">
+ <li><a id="toc-chapter-1" href="#chapter">1 chapter</a>
+ <ul class="no-bullet">
+ <li><a id="toc-A-section" href="#s_002d_002dect_002cion">1.1 A section</a>
+ <ul class="no-bullet">
+ <li><a id="toc-subsection-1" href="#subsection">1.1.1 subsection</a>
+ <ul class="no-bullet">
+ <li><a id="toc-subsubsection-_0060_0060simple_002ddouble_002d_002d-1"
href="#subsubsection-_0060_0060simple_002ddouble_002d_002d">1.1.1.1
subsubsection “simple-double–</a></li>
+ <li><a id="toc-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027"
href="#subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">1.1.1.2
three—four—-”</a></li>
+ </ul></li>
+ </ul></li>
+ </ul></li>
+ <li><a id="toc-chapter-2" href="#chapter2" rel="index">chapter 2</a></li>
+</ul>
+</div>
+</div><hr>
+<div class="Overview_element" id="SEC_Overview">
+<table class="header" cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left">[<a href="#Top" title="Couverture (top)
du document">Racine</a>]</td>
+<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table des
matières">Table des matières</a>]</td>
+<td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="#SEC_About" title="A propos (page
d’aide)"> ? </a>]</td>
+</tr></table>
+<h1 class="shortcontents-heading">Résumé du contenu</h1>
+
+<div class="shortcontents">
+<ul class="no-bullet">
+<li><a id="stoc-chapter-1" href="#chapter">1 chapter</a></li>
+<li><a id="stoc-chapter-2" href="#chapter2" rel="index">chapter 2</a></li>
+</ul>
+</div>
+</div><hr>
+<div class="About_element" id="SEC_About">
+<table class="header" cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left">[<a href="#Top" title="Couverture (top)
du document">Racine</a>]</td>
+<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table des
matières">Table des matières</a>]</td>
+<td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="#SEC_About" title="A propos (page
d’aide)"> ? </a>]</td>
+</tr></table>
+<h1 class="about-heading">A propos de ce document</h1>
+
+<p>
+ Ce document a été généré le <em>a sunny
day</em>.
+</p>
+<p>
+ Les boutons du panneau de navigation ont la signification suivante :
+</p>
+<table border="1">
+ <tr>
+ <th> Bouton </th>
+ <th> Nom </th>
+ <th> Aller à </th>
+ <th> Depuis 1.2.3 aller à</th>
+ </tr>
+ <tr>
+ <td align="center"> [ << ] </td>
+ <td align="center">RetourRapide</td>
+ <td>Début de ce chapitre ou chapitre précédent</td>
+ <td>1</td>
+ </tr>
+ <tr>
+ <td align="center"> [ < ] </td>
+ <td align="center">Arrière</td>
+ <td>Section précédente dans l’ordre de lecture</td>
+ <td>1.2.2</td>
+ </tr>
+ <tr>
+ <td align="center"> [Plus haut] </td>
+ <td align="center">Monter</td>
+ <td>Section supérieure</td>
+ <td>1.2</td>
+ </tr>
+ <tr>
+ <td align="center"> [ > ] </td>
+ <td align="center">Avant</td>
+ <td>Section suivante dans l’ordre de lecture</td>
+ <td>1.2.4</td>
+ </tr>
+ <tr>
+ <td align="center"> [ >> ] </td>
+ <td align="center">AvanceRapide</td>
+ <td>Chapitre suivant</td>
+ <td>2</td>
+ </tr>
+ <tr>
+ <td align="center"> [Racine] </td>
+ <td align="center">Racine</td>
+ <td>Couverture (top) du document</td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td align="center"> [Table des matières] </td>
+ <td align="center">Table des matières</td>
+ <td>Table des matières</td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td align="center"> [Index] </td>
+ <td align="center">Index</td>
+ <td>Index</td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td align="center"> [ ? ] </td>
+ <td align="center">A propos</td>
+ <td>A propos (page d’aide)</td>
+ <td> </td>
+ </tr>
+</table>
+
+<p>
+ Dans cet exemple on est à <strong> Sous-sous-section un-deux-trois
</strong> dans un document dont la structure est :
+</p>
+
+<ul>
+ <li> 1. Section un
+ <ul>
+ <li>1.1 Sous-section un-un
+ <ul>
+ <li>...</li>
+ </ul>
+ </li>
+ <li>1.2 Sous-section un-deux
+ <ul>
+ <li>1.2.1 Sous-sous-section un-deux-un</li>
+ <li>1.2.2 Sous-sous-section un-deux-deux</li>
+ <li>1.2.3 Sous-sous-section un-deux-trois
+ <strong><== Position actuelle </strong></li>
+ <li>1.2.4 Sous-sous-section un-deux-quatre</li>
+ </ul>
+ </li>
+ <li>1.3 Sous-section un-trois
+ <ul>
+ <li>...</li>
+ </ul>
+ </li>
+ <li>1.4 Sous-section un-quatre</li>
+ </ul>
+ </li>
+</ul>
+
+</div><hr>
';
1;
diff --git a/tp/t/results/sectioning/anchor_in_footnote_separate.pl
b/tp/t/results/sectioning/anchor_in_footnote_separate.pl
index 8a17623c49..e4f02c0961 100644
--- a/tp/t/results/sectioning/anchor_in_footnote_separate.pl
+++ b/tp/t/results/sectioning/anchor_in_footnote_separate.pl
@@ -770,7 +770,18 @@ Previous: <a href="#Top" accesskey="p" rel="prev">Top</a>,
Up: <a href="#Top" ac
<p><a href="#Anchor-in-footnote">Anchor in footnote</a>.
</p></div>
</div>
+<div class="Footnotes_element" id="SEC_Foot">
+<div class="header">
+<p>
+ </p>
+</div>
+<h4 class="footnotes-heading">Footnotes</h4>
+<h5><a id="FOOT1" href="#DOCF1">(1)</a></h5>
+<p>in footnote
+<a class="anchor" id="Anchor-in-footnote"></a>.
+</p>
+</div>
</body>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/Convert/HTML.pm (convert): output special elements in every cases where there are multiple units.,
Patrice Dumas <=