[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/Convert/HTML.pm: rename name extra k
From: |
Patrice Dumas |
Subject: |
branch master updated: * tp/Texinfo/Convert/HTML.pm: rename name extra key of special elements to special_element_type. |
Date: |
Sun, 02 Jan 2022 18:00:06 -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 00fe0342b0 * tp/Texinfo/Convert/HTML.pm: rename name extra key of
special elements to special_element_type.
00fe0342b0 is described below
commit 00fe0342b0bdbf292a45e67f82a3fa5c390b323b
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Jan 2 23:59:54 2022 +0100
* tp/Texinfo/Convert/HTML.pm: rename name extra key of special
elements to special_element_type.
---
ChangeLog | 5 +
tp/TODO | 16 +-
tp/Texinfo/Common.pm | 8 +
tp/Texinfo/Convert/HTML.pm | 26 +-
tp/t/91morecoverage.t | 2 +-
tp/t/init/only_toc_out.init | 2 +-
tp/t/results/morecoverage/formatting_fr.pl | 385 +++++++++++++++++++++++++++
tp/t/results/morecoverage/texi_formatting.pl | 312 ++++++++++++++++++++++
8 files changed, 740 insertions(+), 16 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0a2b0fd605..bdbf906e8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2022-01-02 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/Convert/HTML.pm: rename name extra key of special
+ elements to special_element_type.
+
2022-01-02 Patrice Dumas <pertusus@free.fr>
* NEWS: add USE_XML_SYNTAX, HTML_ROOT_ELEMENT_ATTRIBUTES
diff --git a/tp/TODO b/tp/TODO
index 240ac3af36..de2663cf50 100644
--- a/tp/TODO
+++ b/tp/TODO
@@ -13,6 +13,10 @@ 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
====
@@ -66,9 +70,8 @@ my $collator = Unicode::Collate::Locale->new('locale' =>
$locale_name, 'normaliz
@sorted = $collator->sort(@not_sorted);
-Some dubious nesting could be warned against. In the Perl Parser
-there is a 'context_command_stack' that could be used for that. Wait
-for this stack to be in the XS Parser before doing it.
+Some dubious nesting could be warned against. The parsers context
+command stacks could be used for that.
Some erroneous constructs not already warned against:
@@ -94,7 +97,7 @@ could be done the same way.
There is no warning with a block command between @def* and @def*x,
only for paragraph. Not sure that this can be detected with
-'context_command_stack'.
+the context command stack.
@defun a b c d e f
@@ -146,11 +149,6 @@ to a possible test of CASE_INSENSITIVE_FILENAMES.
Unit test of end_line_count for Texinfo/Convert/Paragraph.pm .... containers.
-In html test empty @top for title, with different cases for anchors.
-
-in html test footnotestyle separate. There are such tests in tp/tests,
-maybe they are sufficient, but they are only done for long checks.
-
anchor in flushright, on an empty line, with a current byte offset.
Future features
diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
index fa2874a4af..cb9b1c7951 100644
--- a/tp/Texinfo/Common.pm
+++ b/tp/Texinfo/Common.pm
@@ -2501,6 +2501,10 @@ sub debug_print_element_short($)
my $parent_string = '';
my $text = '';
$type = "($current->{'type'})" if (defined($current->{'type'}));
+ # specific of HTML
+ $type .= '{'.$current->{'extra'}->{'special_element_type'}.'}'
+ if (defined($current->{'extra'})
+ and defined($current->{'extra'}->{'special_element_type'}));
$cmd = "\@$current->{'cmdname'}" if (defined($current->{'cmdname'}));
$text = "[T]" if (defined($current->{'text'}));
my $args = '';
@@ -2523,6 +2527,10 @@ sub debug_print_element($)
my $parent_string = '';
my $text = '';
$type = "($current->{'type'})" if (defined($current->{'type'}));
+ # specific of HTML
+ $type .= '{'.$current->{'extra'}->{'special_element_type'}.'}'
+ if (defined($current->{'extra'})
+ and defined($current->{'extra'}->{'special_element_type'}));
$cmd = "\@$current->{'cmdname'}" if (defined($current->{'cmdname'}));
$cmd .= "($current->{'structure'}->{'level'})"
if (defined($current->{'structure'}->{'level'}));
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 1280349878..034d24a09e 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -677,7 +677,7 @@ sub command_text($$;$)
if (!$target->{'tree'}) {
if (defined($command->{'type'})
and $command->{'type'} eq 'special_element') {
- my $special_element_name = $command->{'extra'}->{'name'};
+ my $special_element_name =
$command->{'extra'}->{'special_element_type'};
$tree =
$self->get_conf('SPECIAL_ELEMENTS_HEADING')->{$special_element_name};
$explanation = "command_text $special_element_name";
} elsif ($command->{'cmdname'} and ($command->{'cmdname'} eq 'node'
@@ -5220,7 +5220,7 @@ sub _convert_special_element_type($$$$)
my $result = '';
- my $special_element_name = $element->{'extra'}->{'name'};
+ my $special_element_name = $element->{'extra'}->{'special_element_type'};
$result .= join('', $self->close_registered_sections_level(0));
my $id = $self->command_id($element);
$result .= $self->html_attribute_class('div',
"${special_element_name}_element");
@@ -6528,7 +6528,7 @@ sub _prepare_special_elements($$$$)
next unless ($do_special{$type});
my $element = {'type' => 'special_element',
- 'extra' => {'name' => $type,
+ 'extra' => {'special_element_type' => $type,
}};
$element->{'structure'}->{'directions'}->{'This'} = $element;
$self->{'special_elements_types'}->{$type} = $element;
@@ -6580,7 +6580,7 @@ sub _prepare_special_elements($$$$)
$default_filename .= '.'.$extension if (defined($extension));
my $element = {'type' => 'special_element',
- 'extra' => {'name' => $type,
+ 'extra' => {'special_element_type' => $type,
}};
# only the filename is used
@@ -6640,7 +6640,7 @@ sub _prepare_contents_elements($)
}
my $contents_element = {'type' => 'special_element',
- 'extra' => {'name' => $type}};
+ 'extra' => {'special_element_type' => $type}};
$self->{'special_elements_types'}->{$type} = $contents_element;
my $target = $self->{'misc_elements_targets'}->{$type};
my $filename;
@@ -7756,6 +7756,14 @@ 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) {
print STDERR "\nC UNIT $unit_nr\n" if ($self->get_conf('DEBUG'));
@@ -8145,6 +8153,14 @@ 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) {
print STDERR "\nUNIT NO-PAGE $unit_nr\n" if ($self->get_conf('DEBUG'));
diff --git a/tp/t/91morecoverage.t b/tp/t/91morecoverage.t
index 976174daa0..f208364ee7 100644
--- a/tp/t/91morecoverage.t
+++ b/tp/t/91morecoverage.t
@@ -23,7 +23,7 @@ my @test_cases = (
);
foreach my $test (@test_cases) {
- push @{$test->[2]->{'test_formats'}}, 'info', 'html';
+ push @{$test->[2]->{'test_formats'}}, ('info', 'html', 'html_text');
}
our ($arg_test_case, $arg_generate, $arg_debug);
diff --git a/tp/t/init/only_toc_out.init b/tp/t/init/only_toc_out.init
index 731474d4cd..88cf74a17b 100644
--- a/tp/t/init/only_toc_out.init
+++ b/tp/t/init/only_toc_out.init
@@ -12,7 +12,7 @@ sub toc_out_element_file_name($$$$$)
my $filename = shift;
my $prefix = $converter->{'document_name'};
- my $type = $element->{'extra'}->{'name'};
+ my $type = $element->{'extra'}->{'special_element_type'};
if ($type and $type ne 'Contents')
{
$filename = "$prefix.".$converter->get_conf('EXTENSION');
diff --git a/tp/t/results/morecoverage/formatting_fr.pl
b/tp/t/results/morecoverage/formatting_fr.pl
index f95dc5446a..9b80f52838 100644
--- a/tp/t/results/morecoverage/formatting_fr.pl
+++ b/tp/t/results/morecoverage/formatting_fr.pl
@@ -5326,4 +5326,389 @@ Menu comment
</html>
';
+
+$result_converted{'html_text'}->{'formatting_fr'} = '<h1>title –a</h1>
+<h3 class="right-align">formatting subtitle –a</h3>
+<h3 class="right-align">subtitle 2 –a</h3>
+<strong>author1 –a with accents in name Téça</strong><br>
+<strong>author2 –a</strong><br>
+<p>In titlepage
+
+</p>
+<p>Insercopying in titlepage
+</p><p>In copying
+
+</p><hr>
+
+<div class="top" id="Top">
+<table class="header" cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left">[ < ]</td>
+<td valign="middle" align="left">[ > ]</td>
+<td valign="middle" align="left"> </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="top" id="Top-section">Top section</h1>
+
+<table class="menu" border="0" cellspacing="0">
+<tr><td align="left" valign="top"><a href="#chapter">1
chapter</a></td><td> </td><td align="left" valign="top"></td></tr>
+<tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">
+
+Menu comment
+
+</pre></th></tr><tr><td align="left" valign="top"><a href="#chapter2"
rel="index">chapter 2</a></td><td> </td><td align="left"
valign="top">Chapter 2
+</td></tr>
+</table>
+
+
+
+
+<p>Insertcopying in normal text
+</p><p>In copying
+
+</p>
+<p>Normal text
+
+</p>
+<p>In example.
+</p><div class="example">
+<pre class="example">
+
+</pre></div>
+
+<a class="index-entry-anchor" id="index-t_002d_002druc"></a>
+<a class="index-entry-anchor" id="index-T_002d_002druc"></a>
+<a class="index-entry-anchor" id="index-_002e"></a>
+<a class="index-entry-anchor" id="index-_003f"></a>
+<a class="index-entry-anchor" id="index-a"></a>
+<a class="index-entry-anchor" id="index-t_002d_002druc-1"></a>
+<a class="index-entry-anchor" id="index-T_002d_002druc-1"></a>
+<a class="index-entry-anchor" id="index-_002e-1"></a>
+<a class="index-entry-anchor" id="index-_003f-1"></a>
+<a class="index-entry-anchor" id="index-a-1"></a>
+
+
+<p>cp
+</p><table><tr><th valign="top">Aller à: </th><td><a
class="summary-letter" href="#t_h_cp_symbol-1"><b>.</b></a>
+
+<a class="summary-letter" href="#t_h_cp_symbol-2"><b>?</b></a>
+
+<br>
+<a class="summary-letter" href="#t_h_cp_letter-A"><b>A</b></a>
+
+<a class="summary-letter" href="#t_h_cp_letter-T"><b>T</b></a>
+
+</td></tr></table>
+<table class="index-cp" border="0">
+<tr><td></td><th align="left">Entrée
d’index</th><td> </td><th align="left"> Section</th></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="t_h_cp_symbol-1">.</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-_002e">.</a></td><td> </td><td valign="top"><a
href="#Top">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="t_h_cp_symbol-2">?</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-_003f">?</a></td><td> </td><td valign="top"><a
href="#Top">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="t_h_cp_letter-A">A</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="#index-a">a</a></td><td> </td><td
valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="t_h_cp_letter-T">T</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-t_002d_002druc">t–ruc</a></td><td> </td><td
valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-T_002d_002druc">T–ruc</a></td><td> </td><td
valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+</table>
+<table><tr><th valign="top">Aller à: </th><td><a
class="summary-letter" href="#t_h_cp_symbol-1"><b>.</b></a>
+
+<a class="summary-letter" href="#t_h_cp_symbol-2"><b>?</b></a>
+
+<br>
+<a class="summary-letter" href="#t_h_cp_letter-A"><b>A</b></a>
+
+<a class="summary-letter" href="#t_h_cp_letter-T"><b>T</b></a>
+
+</td></tr></table>
+
+<p>fn
+</p><table><tr><th valign="top">Aller à: </th><td><a
class="summary-letter" href="#t_h_fn_symbol-1"><b>.</b></a>
+
+<a class="summary-letter" href="#t_h_fn_symbol-2"><b>?</b></a>
+
+<br>
+<a class="summary-letter" href="#t_h_fn_letter-A"><b>A</b></a>
+
+<a class="summary-letter" href="#t_h_fn_letter-T"><b>T</b></a>
+
+</td></tr></table>
+<table class="index-fn" border="0">
+<tr><td></td><th align="left">Entrée
d’index</th><td> </td><th align="left"> Section</th></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="t_h_fn_symbol-1">.</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-_002e-1"><code>.</code></a></td><td> </td><td valign="top"><a
href="#Top">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="t_h_fn_symbol-2">?</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-_003f-1"><code>?</code></a></td><td> </td><td valign="top"><a
href="#Top">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="t_h_fn_letter-A">A</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-a-1"><code>a</code></a></td><td> </td><td valign="top"><a
href="#Top">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="t_h_fn_letter-T">T</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-t_002d_002druc-1"><code>t--ruc</code></a></td><td> </td><td
valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-T_002d_002druc-1"><code>T--ruc</code></a></td><td> </td><td
valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+</table>
+<table><tr><th valign="top">Aller à: </th><td><a
class="summary-letter" href="#t_h_fn_symbol-1"><b>.</b></a>
+
+<a class="summary-letter" href="#t_h_fn_symbol-2"><b>?</b></a>
+
+<br>
+<a class="summary-letter" href="#t_h_fn_letter-A"><b>A</b></a>
+
+<a class="summary-letter" href="#t_h_fn_letter-T"><b>T</b></a>
+
+</td></tr></table>
+
+<p>vr
+</p>
+<p>ky
+</p>
+<p>pg
+</p>
+<p>tp
+</p>
+
+
+<hr style="height: 6px;">
+<div class="chapter" id="chapter">
+<table class="header" cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left">[ << ]</td>
+<td valign="middle" align="left">[ < ]</td>
+<td valign="middle" align="left">[Plus haut]</td>
+<td valign="middle" align="left">[ > ]</td>
+<td valign="middle" align="left">[ >> ]</td>
+<td valign="middle" align="left"> </td>
+<td valign="middle" align="left"> </td>
+<td valign="middle" align="left"> </td>
+<td valign="middle" align="left"> </td>
+<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="chapter" id="chapter-1">1 chapter</h1>
+
+<p><a id="DOCF1" href="#FOOT1"><sup>1</sup></a>
+</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><pre class="menu-comment">
+
+Menu comment
+“simple-double–three—four—-”
+
+
+</pre></td></tr></table>
+</div>
+
+<hr>
+<div class="section" id="s_002d_002dect_002cion">
+<table class="header" cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left">[ << ]</td>
+<td valign="middle" align="left">[ < ]</td>
+<td valign="middle" align="left">[Plus haut]</td>
+<td valign="middle" align="left">[ > ]</td>
+<td valign="middle" align="left">[ >> ]</td>
+<td valign="middle" align="left"> </td>
+<td valign="middle" align="left"> </td>
+<td valign="middle" align="left"> </td>
+<td valign="middle" align="left"> </td>
+<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>
+<h2 class="section" id="A-section">1.1 A section</h2>
+
+<table class="menu" border="0" cellspacing="0">
+<tr><td align="left" valign="top"><a href="#subsection">1.1.1
subsection</a></td><td> </td><td align="left" valign="top">
+</td></tr>
+<tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">
+
+</pre></th></tr><tr><th colspan="3" align="left" valign="top"><pre
class="menu-comment">In detailmenu
+
+</pre></th></tr><tr><td align="left" valign="top"><a
href="#subsubsection-_0060_0060simple_002ddouble_002d_002d">1.1.1.1
subsubsection “simple-double–</a></td><td> </td><td
align="left" valign="top">
+</td></tr>
+<tr><td align="left" valign="top"><a
href="#subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">1.1.1.2
three—four—-”</a></td><td> </td><td align="left"
valign="top">
+</td></tr>
+</table>
+
+<hr>
+<div class="subsection" id="subsection">
+<table class="header" cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left">[ << ]</td>
+<td valign="middle" align="left">[ < ]</td>
+<td valign="middle" align="left">[Plus haut]</td>
+<td valign="middle" align="left">[ > ]</td>
+<td valign="middle" align="left">[ >> ]</td>
+<td valign="middle" align="left"> </td>
+<td valign="middle" align="left"> </td>
+<td valign="middle" align="left"> </td>
+<td valign="middle" align="left"> </td>
+<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>
+<h3 class="subsection" id="subsection-1">1.1.1 subsection</h3>
+
+<table class="menu" border="0" cellspacing="0">
+<tr><td align="left" valign="top"><a
href="#subsubsection-_0060_0060simple_002ddouble_002d_002d">1.1.1.1
subsubsection “simple-double–</a></td><td> </td><td
align="left" valign="top">
+</td></tr>
+<tr><td align="left" valign="top"><a
href="#subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">1.1.1.2
three—four—-”</a></td><td> </td><td align="left"
valign="top">
+</td></tr>
+</table>
+
+<a class="anchor" id="anchor"></a>
+<hr>
+<div class="subsubsection"
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
+<table class="header" cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left">[ << ]</td>
+<td valign="middle" align="left">[ < ]</td>
+<td valign="middle" align="left">[Plus haut]</td>
+<td valign="middle" align="left">[ > ]</td>
+<td valign="middle" align="left">[ >> ]</td>
+<td valign="middle" align="left"> </td>
+<td valign="middle" align="left"> </td>
+<td valign="middle" align="left"> </td>
+<td valign="middle" align="left"> </td>
+<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>
+<h4 class="subsubsection"
id="subsubsection-_0060_0060simple_002ddouble_002d_002d-1">1.1.1.1
subsubsection “simple-double–</h4>
+
+<hr>
+</div>
+<div class="subsubsection"
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
+<table class="header" cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left">[ << ]</td>
+<td valign="middle" align="left">[ < ]</td>
+<td valign="middle" align="left">[Plus haut]</td>
+<td valign="middle" align="left">[ > ]</td>
+<td valign="middle" align="left">[ >> ]</td>
+<td valign="middle" align="left"> </td>
+<td valign="middle" align="left"> </td>
+<td valign="middle" align="left"> </td>
+<td valign="middle" align="left"> </td>
+<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>
+<h4 class="subsubsection"
id="three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">1.1.1.2
three—four—-”</h4>
+
+<hr>
+</div>
+</div>
+</div>
+</div>
+<div class="centerchap" id="chapter2">
+<table class="header" cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left">[ << ]</td>
+<td valign="middle" align="left">[ < ]</td>
+<td valign="middle" align="left">[Plus haut]</td>
+<td valign="middle" align="left">[ > ]</td>
+<td valign="middle" align="left">[ >> ]</td>
+<td valign="middle" align="left"> </td>
+<td valign="middle" align="left"> </td>
+<td valign="middle" align="left"> </td>
+<td valign="middle" align="left"> </td>
+<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="centerchap center-align" id="chapter-2">chapter 2</h1>
+
+<table><tr><th valign="top">Aller à: </th><td><a
class="summary-letter" href="#t_h_cp_symbol-1"><b>.</b></a>
+
+<a class="summary-letter" href="#t_h_cp_symbol-2"><b>?</b></a>
+
+<br>
+<a class="summary-letter" href="#t_h_cp_letter-A"><b>A</b></a>
+
+<a class="summary-letter" href="#t_h_cp_letter-T"><b>T</b></a>
+
+</td></tr></table>
+<table class="index-cp" border="0">
+<tr><td></td><th align="left">Entrée
d’index</th><td> </td><th align="left"> Section</th></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="t_h_cp_symbol-1">.</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-_002e">.</a></td><td> </td><td valign="top"><a
href="#Top">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="t_h_cp_symbol-2">?</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-_003f">?</a></td><td> </td><td valign="top"><a
href="#Top">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="t_h_cp_letter-A">A</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="#index-a">a</a></td><td> </td><td
valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="t_h_cp_letter-T">T</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-t_002d_002druc">t–ruc</a></td><td> </td><td
valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-T_002d_002druc">T–ruc</a></td><td> </td><td
valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+</table>
+<table><tr><th valign="top">Aller à: </th><td><a
class="summary-letter" href="#t_h_cp_symbol-1"><b>.</b></a>
+
+<a class="summary-letter" href="#t_h_cp_symbol-2"><b>?</b></a>
+
+<br>
+<a class="summary-letter" href="#t_h_cp_letter-A"><b>A</b></a>
+
+<a class="summary-letter" href="#t_h_cp_letter-T"><b>T</b></a>
+
+</td></tr></table>
+<table><tr><th valign="top">Aller à: </th><td><a
class="summary-letter" href="#t_h_fn_symbol-1"><b>.</b></a>
+
+<a class="summary-letter" href="#t_h_fn_symbol-2"><b>?</b></a>
+
+<br>
+<a class="summary-letter" href="#t_h_fn_letter-A"><b>A</b></a>
+
+<a class="summary-letter" href="#t_h_fn_letter-T"><b>T</b></a>
+
+</td></tr></table>
+<table class="index-fn" border="0">
+<tr><td></td><th align="left">Entrée
d’index</th><td> </td><th align="left"> Section</th></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="t_h_fn_symbol-1">.</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-_002e-1"><code>.</code></a></td><td> </td><td valign="top"><a
href="#Top">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="t_h_fn_symbol-2">?</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-_003f-1"><code>?</code></a></td><td> </td><td valign="top"><a
href="#Top">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="t_h_fn_letter-A">A</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-a-1"><code>a</code></a></td><td> </td><td valign="top"><a
href="#Top">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="t_h_fn_letter-T">T</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-t_002d_002druc-1"><code>t--ruc</code></a></td><td> </td><td
valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-T_002d_002druc-1"><code>T--ruc</code></a></td><td> </td><td
valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+</table>
+<table><tr><th valign="top">Aller à: </th><td><a
class="summary-letter" href="#t_h_fn_symbol-1"><b>.</b></a>
+
+<a class="summary-letter" href="#t_h_fn_symbol-2"><b>?</b></a>
+
+<br>
+<a class="summary-letter" href="#t_h_fn_letter-A"><b>A</b></a>
+
+<a class="summary-letter" href="#t_h_fn_letter-T"><b>T</b></a>
+
+</td></tr></table>
+
+</div>
+</div>
+<hr>
+';
+
1;
diff --git a/tp/t/results/morecoverage/texi_formatting.pl
b/tp/t/results/morecoverage/texi_formatting.pl
index eb0240126e..649520ff32 100644
--- a/tp/t/results/morecoverage/texi_formatting.pl
+++ b/tp/t/results/morecoverage/texi_formatting.pl
@@ -5253,4 +5253,316 @@ Previous: <a href="#chapter" accesskey="p"
rel="prev">chapter</a>, Up: <a href="
</html>
';
+
+$result_converted{'html_text'}->{'texi_formatting'} = '
+<div class="top" id="Top">
+<div class="header">
+<p>
+ [<a href="#Top" title="Index" rel="index">Index</a>]</p>
+</div>
+<h1 class="top" id="Top-section">Top section</h1>
+
+
+
+
+
+<p>Insertcopying in normal text
+</p><p>In copying
+
+</p>
+<p>Normal text
+
+</p>
+<p>In example.
+</p><div class="example">
+<pre class="example">
+
+</pre></div>
+
+<a class="index-entry-anchor" id="index-t_002d_002druc"></a>
+<a class="index-entry-anchor" id="index-T_002d_002druc"></a>
+<a class="index-entry-anchor" id="index-_002e"></a>
+<a class="index-entry-anchor" id="index-_003f"></a>
+<a class="index-entry-anchor" id="index-a"></a>
+<a class="index-entry-anchor" id="index-t_002d_002druc-1"></a>
+<a class="index-entry-anchor" id="index-T_002d_002druc-1"></a>
+<a class="index-entry-anchor" id="index-_002e-1"></a>
+<a class="index-entry-anchor" id="index-_003f-1"></a>
+<a class="index-entry-anchor" id="index-a-1"></a>
+
+
+<p>cp
+</p><table><tr><th valign="top">Jump to: </th><td><a
class="summary-letter" href="#t_h_cp_symbol-1"><b>.</b></a>
+
+<a class="summary-letter" href="#t_h_cp_symbol-2"><b>?</b></a>
+
+<br>
+<a class="summary-letter" href="#t_h_cp_letter-A"><b>A</b></a>
+
+<a class="summary-letter" href="#t_h_cp_letter-T"><b>T</b></a>
+
+</td></tr></table>
+<table class="index-cp" border="0">
+<tr><td></td><th align="left">Index Entry</th><td> </td><th align="left">
Section</th></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="t_h_cp_symbol-1">.</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-_002e">.</a>:</td><td> </td><td valign="top"><a
href="#Top">Top</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="t_h_cp_symbol-2">?</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-_003f">?</a>:</td><td> </td><td valign="top"><a
href="#Top">Top</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="t_h_cp_letter-A">A</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="#index-a">a</a>:</td><td> </td><td
valign="top"><a href="#Top">Top</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="t_h_cp_letter-T">T</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-t_002d_002druc">t–ruc</a>:</td><td> </td><td
valign="top"><a href="#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-T_002d_002druc">T–ruc</a>:</td><td> </td><td
valign="top"><a href="#Top">Top</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+</table>
+<table><tr><th valign="top">Jump to: </th><td><a class="summary-letter"
href="#t_h_cp_symbol-1"><b>.</b></a>
+
+<a class="summary-letter" href="#t_h_cp_symbol-2"><b>?</b></a>
+
+<br>
+<a class="summary-letter" href="#t_h_cp_letter-A"><b>A</b></a>
+
+<a class="summary-letter" href="#t_h_cp_letter-T"><b>T</b></a>
+
+</td></tr></table>
+
+<p>fn
+</p><table><tr><th valign="top">Jump to: </th><td><a
class="summary-letter" href="#t_h_fn_symbol-1"><b>.</b></a>
+
+<a class="summary-letter" href="#t_h_fn_symbol-2"><b>?</b></a>
+
+<br>
+<a class="summary-letter" href="#t_h_fn_letter-A"><b>A</b></a>
+
+<a class="summary-letter" href="#t_h_fn_letter-T"><b>T</b></a>
+
+</td></tr></table>
+<table class="index-fn" border="0">
+<tr><td></td><th align="left">Index Entry</th><td> </td><th align="left">
Section</th></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="t_h_fn_symbol-1">.</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-_002e-1"><code>.</code></a>:</td><td> </td><td
valign="top"><a href="#Top">Top</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="t_h_fn_symbol-2">?</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-_003f-1"><code>?</code></a>:</td><td> </td><td
valign="top"><a href="#Top">Top</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="t_h_fn_letter-A">A</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-a-1"><code>a</code></a>:</td><td> </td><td valign="top"><a
href="#Top">Top</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="t_h_fn_letter-T">T</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-t_002d_002druc-1"><code>t--ruc</code></a>:</td><td> </td><td
valign="top"><a href="#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-T_002d_002druc-1"><code>T--ruc</code></a>:</td><td> </td><td
valign="top"><a href="#Top">Top</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+</table>
+<table><tr><th valign="top">Jump to: </th><td><a class="summary-letter"
href="#t_h_fn_symbol-1"><b>.</b></a>
+
+<a class="summary-letter" href="#t_h_fn_symbol-2"><b>?</b></a>
+
+<br>
+<a class="summary-letter" href="#t_h_fn_letter-A"><b>A</b></a>
+
+<a class="summary-letter" href="#t_h_fn_letter-T"><b>T</b></a>
+
+</td></tr></table>
+
+<p>vr
+</p>
+<p>ky
+</p>
+<p>pg
+</p>
+<p>tp
+</p>
+
+
+<div class="Contents_element">
+<h2 class="contents-heading">Table of Contents</h2>
+
+<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>
+<div class="Overview_element">
+<h2 class="shortcontents-heading">Short Table of Contents</h2>
+
+<div class="shortcontents">
+<ul class="no-bullet">
+<li><a id="stoc-chapter-1" href="#toc-chapter-1">1 chapter</a></li>
+<li><a id="stoc-chapter-2" href="#toc-chapter-2" rel="index">chapter 2</a></li>
+</ul>
+</div>
+</div>
+<hr>
+<div class="chapter" id="chapter">
+<div class="header">
+<p>
+ [<a href="#Top" title="Index" rel="index">Index</a>]</p>
+</div>
+<h2 class="chapter" id="chapter-1">1 chapter</h2>
+
+<p><a id="DOCF1" href="#FOOT1"><sup>1</sup></a>
+</p>
+
+<ul class="section-toc">
+<li><a href="#s_002d_002dect_002cion" accesskey="1">A section</a></li>
+</ul>
+<hr>
+<div class="section" id="s_002d_002dect_002cion">
+<div class="header">
+<p>
+ [<a href="#Top" title="Index" rel="index">Index</a>]</p>
+</div>
+<h3 class="section" id="A-section">1.1 A section</h3>
+
+
+<ul class="section-toc">
+<li><a href="#subsection" accesskey="1">subsection</a></li>
+</ul>
+<hr>
+<div class="subsection" id="subsection">
+<div class="header">
+<p>
+ [<a href="#Top" title="Index" rel="index">Index</a>]</p>
+</div>
+<h4 class="subsection" id="subsection-1">1.1.1 subsection</h4>
+
+
+<a class="anchor" id="anchor"></a>
+<ul class="section-toc">
+<li><a href="#subsubsection-_0060_0060simple_002ddouble_002d_002d"
accesskey="1">subsubsection “simple-double–</a></li>
+<li><a
href="#subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027"
accesskey="2">three—four—-”</a></li>
+</ul>
+<hr>
+<div class="subsubsection"
id="subsubsection-_0060_0060simple_002ddouble_002d_002d">
+<div class="header">
+<p>
+ [<a href="#Top" title="Index" rel="index">Index</a>]</p>
+</div>
+<h4 class="subsubsection"
id="subsubsection-_0060_0060simple_002ddouble_002d_002d-1">1.1.1.1
subsubsection “simple-double–</h4>
+
+<hr>
+</div>
+<div class="subsubsection"
id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">
+<div class="header">
+<p>
+ [<a href="#Top" title="Index" rel="index">Index</a>]</p>
+</div>
+<h4 class="subsubsection"
id="three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">1.1.1.2
three—four—-”</h4>
+
+<hr>
+</div>
+</div>
+</div>
+</div>
+<div class="centerchap" id="chapter2">
+<div class="header">
+<p>
+ [<a href="#Top" title="Index" rel="index">Index</a>]</p>
+</div>
+<h2 class="centerchap center-align" id="chapter-2">chapter 2</h2>
+
+<table><tr><th valign="top">Jump to: </th><td><a class="summary-letter"
href="#t_h_cp_symbol-1"><b>.</b></a>
+
+<a class="summary-letter" href="#t_h_cp_symbol-2"><b>?</b></a>
+
+<br>
+<a class="summary-letter" href="#t_h_cp_letter-A"><b>A</b></a>
+
+<a class="summary-letter" href="#t_h_cp_letter-T"><b>T</b></a>
+
+</td></tr></table>
+<table class="index-cp" border="0">
+<tr><td></td><th align="left">Index Entry</th><td> </td><th align="left">
Section</th></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="t_h_cp_symbol-1">.</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-_002e">.</a>:</td><td> </td><td valign="top"><a
href="#Top">Top</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="t_h_cp_symbol-2">?</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-_003f">?</a>:</td><td> </td><td valign="top"><a
href="#Top">Top</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="t_h_cp_letter-A">A</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="#index-a">a</a>:</td><td> </td><td
valign="top"><a href="#Top">Top</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="t_h_cp_letter-T">T</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-t_002d_002druc">t–ruc</a>:</td><td> </td><td
valign="top"><a href="#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-T_002d_002druc">T–ruc</a>:</td><td> </td><td
valign="top"><a href="#Top">Top</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+</table>
+<table><tr><th valign="top">Jump to: </th><td><a class="summary-letter"
href="#t_h_cp_symbol-1"><b>.</b></a>
+
+<a class="summary-letter" href="#t_h_cp_symbol-2"><b>?</b></a>
+
+<br>
+<a class="summary-letter" href="#t_h_cp_letter-A"><b>A</b></a>
+
+<a class="summary-letter" href="#t_h_cp_letter-T"><b>T</b></a>
+
+</td></tr></table>
+<table><tr><th valign="top">Jump to: </th><td><a class="summary-letter"
href="#t_h_fn_symbol-1"><b>.</b></a>
+
+<a class="summary-letter" href="#t_h_fn_symbol-2"><b>?</b></a>
+
+<br>
+<a class="summary-letter" href="#t_h_fn_letter-A"><b>A</b></a>
+
+<a class="summary-letter" href="#t_h_fn_letter-T"><b>T</b></a>
+
+</td></tr></table>
+<table class="index-fn" border="0">
+<tr><td></td><th align="left">Index Entry</th><td> </td><th align="left">
Section</th></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="t_h_fn_symbol-1">.</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-_002e-1"><code>.</code></a>:</td><td> </td><td
valign="top"><a href="#Top">Top</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="t_h_fn_symbol-2">?</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-_003f-1"><code>?</code></a>:</td><td> </td><td
valign="top"><a href="#Top">Top</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="t_h_fn_letter-A">A</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-a-1"><code>a</code></a>:</td><td> </td><td valign="top"><a
href="#Top">Top</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="t_h_fn_letter-T">T</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-t_002d_002druc-1"><code>t--ruc</code></a>:</td><td> </td><td
valign="top"><a href="#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-T_002d_002druc-1"><code>T--ruc</code></a>:</td><td> </td><td
valign="top"><a href="#Top">Top</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+</table>
+<table><tr><th valign="top">Jump to: </th><td><a class="summary-letter"
href="#t_h_fn_symbol-1"><b>.</b></a>
+
+<a class="summary-letter" href="#t_h_fn_symbol-2"><b>?</b></a>
+
+<br>
+<a class="summary-letter" href="#t_h_fn_letter-A"><b>A</b></a>
+
+<a class="summary-letter" href="#t_h_fn_letter-T"><b>T</b></a>
+
+</td></tr></table>
+
+</div>
+</div>
+<div class="footnote">
+<hr>
+<h4 class="footnotes-heading">Footnotes</h4>
+
+<h5><a id="FOOT1" href="#DOCF1">(1)</a></h5>
+<p>in footnote</p>
+</div>
+';
+
1;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/Convert/HTML.pm: rename name extra key of special elements to special_element_type.,
Patrice Dumas <=