texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: * tp/Texinfo/Convert/HTML.pm (_convert_heading_co


From: Patrice Dumas
Subject: branch master updated: * tp/Texinfo/Convert/HTML.pm (_convert_heading_command): use level corrected sectioning command name for the opening section class.
Date: Tue, 11 Jan 2022 19:07:49 -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 d173c2b83d * tp/Texinfo/Convert/HTML.pm (_convert_heading_command): 
use level corrected sectioning command name for the opening section class.
d173c2b83d is described below

commit d173c2b83d9623cf63d8aabd91edd82e84fb73b0
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Wed Jan 12 01:07:38 2022 +0100

    * tp/Texinfo/Convert/HTML.pm (_convert_heading_command):
    use level corrected sectioning command name for the opening section
    class.
---
 ChangeLog                                                   |  6 ++++++
 tp/Texinfo/Convert/HTML.pm                                  | 13 ++++++++-----
 tp/t/results/moreindices/index_no_node/res_html/index.html  |  2 +-
 tp/t/results/sectioning/part_before_section.pl              |  2 +-
 tp/t/results/sectioning/section_before_after_top_node.pl    |  2 +-
 .../sectioning/section_before_after_top_node_last_node.pl   |  2 +-
 tp/t/results/sectioning/section_before_top.pl               |  2 +-
 tp/t/results/sectioning/section_chapter_before_top_nodes.pl |  4 ++--
 tp/t/results/sectioning/unnumbered_before_node_top_top.pl   |  2 +-
 .../results/sectioning/unnumbered_top_without_node_nodes.pl |  2 +-
 .../sectioning/unnumbered_top_without_node_sections.pl      |  2 +-
 11 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ad008ee463..d9430acfd0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2022-01-11  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Convert/HTML.pm (_convert_heading_command):
+       use level corrected sectioning command name for the opening section
+       class.
+
 2022-01-11  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Convert/HTML.pm (%css_map, _convert_titlefont_command)
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 1d73c98ab9..00033f34dc 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -3319,9 +3319,9 @@ sub _convert_heading_command($$$$$)
 
     # FIXME if this is not the section element, it should not be the
     # section as class
-    $result .= $self->html_attribute_class('div', 
$opening_section->{'cmdname'});
-                 #"${level_corrected_section_opening_cmdname}");
-                 #"${level_corrected_section_opening_cmdname}-level-extent");
+    $result .= $self->html_attribute_class('div',
+                                 $level_corrected_opening_section_cmdname);
+                 #"${level_corrected_opening_section_cmdname}-level-extent");
 
     $result .= " id=\"$element_id\""
         if (defined($element_id) and $element_id ne '');
@@ -6191,6 +6191,9 @@ sub _load_htmlxref_files {
 #  file_counters
 #  paragraph_symbol
 #  line_break_element
+#
+#  simpletitle_tree
+#  simpletitle_command_name
 #  
 #  commands_conversion
 
@@ -8282,8 +8285,8 @@ __("cannot use absolute path or URL `%s' for 
JS_WEBLABELS_FILE when generating w
 
 # FIXME the file opening should be done in main program, only
 # the formatting should be done in customization function.  Frames
-# are deprecated in HTML and therefore there is no point in investing
-# time in producing them.
+# are deprecated in HTML, however, and therefore there is no point
+# in investing time in better code to produce them.
 sub _default_format_frame_files($$)
 {
   my $self = shift;
diff --git a/tp/t/results/moreindices/index_no_node/res_html/index.html 
b/tp/t/results/moreindices/index_no_node/res_html/index.html
index 0183dc70b7..11e7eb17f6 100644
--- a/tp/t/results/moreindices/index_no_node/res_html/index.html
+++ b/tp/t/results/moreindices/index_no_node/res_html/index.html
@@ -23,7 +23,7 @@ span.program-in-footer {font-size: smaller}
 </head>
 
 <body lang="en">
-<div class="top" id="top-section">
+<div class="unnumbered" id="top-section">
 <table class="nav-header" cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="unnumbered.html" 
title="Previous section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#second" title="Next section in 
reading order"> &gt; </a>]</td>
diff --git a/tp/t/results/sectioning/part_before_section.pl 
b/tp/t/results/sectioning/part_before_section.pl
index 689ee35577..15aacd1747 100644
--- a/tp/t/results/sectioning/part_before_section.pl
+++ b/tp/t/results/sectioning/part_before_section.pl
@@ -231,7 +231,7 @@ $result_converted{'html_text'}->{'part_before_section'} = 
'<div class="part" id=
 <ul class="mini-toc">
 <li><a href="#section" accesskey="1">section</a></li>
 </ul>
-<div class="section" id="section">
+<div class="chapter" id="section">
 <h2 class="chapter">1 section</h2>
 </div>
 </div>
diff --git a/tp/t/results/sectioning/section_before_after_top_node.pl 
b/tp/t/results/sectioning/section_before_after_top_node.pl
index dc18f2772f..6e95af3a7e 100644
--- a/tp/t/results/sectioning/section_before_after_top_node.pl
+++ b/tp/t/results/sectioning/section_before_after_top_node.pl
@@ -415,7 +415,7 @@ 
$result_converted{'html'}->{'section_before_after_top_node'} = '<!DOCTYPE html>
 <h2 class="unnumbered">before</h2>
 
 </div>
-<div class="top" id="Top">
+<div class="unnumbered" id="Top">
 <h2 class="unnumbered" id="top-section">top section</h2>
 
 </div>
diff --git a/tp/t/results/sectioning/section_before_after_top_node_last_node.pl 
b/tp/t/results/sectioning/section_before_after_top_node_last_node.pl
index 5bc074985d..0bea90a48b 100644
--- a/tp/t/results/sectioning/section_before_after_top_node_last_node.pl
+++ b/tp/t/results/sectioning/section_before_after_top_node_last_node.pl
@@ -494,7 +494,7 @@ Next: <a href="#node-after" accesskey="n" rel="next">node 
after</a> &nbsp; </p>
 <h2 class="unnumbered">before</h2>
 
 </div>
-<div class="top" id="Top">
+<div class="unnumbered" id="Top">
 <h2 class="unnumbered" id="top-section">top section</h2>
 
 </div>
diff --git a/tp/t/results/sectioning/section_before_top.pl 
b/tp/t/results/sectioning/section_before_top.pl
index cbca9efa74..c3d50fed7b 100644
--- a/tp/t/results/sectioning/section_before_top.pl
+++ b/tp/t/results/sectioning/section_before_top.pl
@@ -561,7 +561,7 @@ Previous: <a href="#Top" accesskey="p" rel="prev">top</a>, 
Up: <a href="#Top" ac
 
 <hr>
 </div>
-<div class="top" id="Top">
+<div class="unnumberedsec" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="#section-node" accesskey="n" rel="next">section</a> &nbsp; </p>
diff --git a/tp/t/results/sectioning/section_chapter_before_top_nodes.pl 
b/tp/t/results/sectioning/section_chapter_before_top_nodes.pl
index 3fd95f9da9..7df32524b3 100644
--- a/tp/t/results/sectioning/section_chapter_before_top_nodes.pl
+++ b/tp/t/results/sectioning/section_chapter_before_top_nodes.pl
@@ -921,7 +921,7 @@ Next: <a href="#chapter-node" accesskey="n" 
rel="next">chapter</a>, Up: <a href=
 
 <hr>
 </div>
-<div class="chapter" id="chapter-node">
+<div class="section" id="chapter-node">
 <div class="nav-header">
 <p>
 Next: <a href="#Top" accesskey="n" rel="next">top</a>, Previous: <a 
href="#section-node" accesskey="p" rel="prev">section</a>, Up: <a href="#Top" 
accesskey="u" rel="up">top</a> &nbsp; </p>
@@ -931,7 +931,7 @@ Next: <a href="#Top" accesskey="n" rel="next">top</a>, 
Previous: <a href="#secti
 
 <hr>
 </div>
-<div class="top" id="Top">
+<div class="unnumberedsec" id="Top">
 <div class="nav-header">
 <p>
 Next: <a href="#chapter-node" accesskey="n" rel="next">chapter</a> &nbsp; </p>
diff --git a/tp/t/results/sectioning/unnumbered_before_node_top_top.pl 
b/tp/t/results/sectioning/unnumbered_before_node_top_top.pl
index c282719110..225b9bc103 100644
--- a/tp/t/results/sectioning/unnumbered_before_node_top_top.pl
+++ b/tp/t/results/sectioning/unnumbered_before_node_top_top.pl
@@ -563,7 +563,7 @@ 
$result_converted{'html'}->{'unnumbered_before_node_top_top'} = '<!DOCTYPE html>
 <p>in unnumbered
 </p>
 </div>
-<div class="top" id="Top">
+<div class="unnumbered" id="Top">
 <h2 class="unnumbered" id="top-section">top section</h2>
 <p>Top node
 </p></div>
diff --git a/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl 
b/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl
index bcfb4236d1..b0320a1a84 100644
--- a/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl
+++ b/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl
@@ -914,7 +914,7 @@ Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> 
&nbsp; </p>
 <p>in unnumbered
 </p>
 </div>
-<div class="top" id="top-section">
+<div class="unnumbered" id="top-section">
 <h2 class="unnumbered">top section</h2>
 <p>Top section
 </p>
diff --git a/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl 
b/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl
index 7e260ab088..03198ad8c4 100644
--- a/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl
+++ b/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl
@@ -1056,7 +1056,7 @@ Up: <a href="dir.html#Top" accesskey="u" 
rel="up">(dir)</a> &nbsp; </p>
 <p>in unnumbered
 </p>
 </div>
-<div class="top" id="top-section">
+<div class="unnumbered" id="top-section">
 <h2 class="unnumbered">top section</h2>
 <p>Top section
 </p>



reply via email to

[Prev in Thread] Current Thread [Next in Thread]