branch master updated: * tp/Texinfo/Convert/HTML.pm (%default_special_element_info): change the 'order' of contents and shortcontents to have shortcontents separate element appear before contents separate element.

[Patrice Dumas]

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 14c47023f0 * tp/Texinfo/Convert/HTML.pm 
(%default_special_element_info): change the 'order' of contents and 
shortcontents to have shortcontents separate element appear before contents 
separate element.
14c47023f0 is described below

commit 14c47023f0f9928cc84f49ce1673770bfe0cc66b
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Mar 12 14:49:50 2023 +0100

    * tp/Texinfo/Convert/HTML.pm (%default_special_element_info): change
    the 'order' of contents and shortcontents to have shortcontents
    separate element appear before contents separate element.
---
 ChangeLog                                          |  6 ++++
 tp/Texinfo/Convert/HTML.pm                         |  4 +--
 .../res_parser/formatting_fr/formatting.html       | 32 +++++++++++-----------
 .../res_parser/formatting_fr_icons/formatting.html | 32 +++++++++++-----------
 .../formatting_inline_css/formatting.html          | 28 +++++++++----------
 .../formatting_texi2html/formatting.html           | 32 +++++++++++-----------
 6 files changed, 70 insertions(+), 64 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index effee52b85..f04dd0e1d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2023-03-12  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Convert/HTML.pm (%default_special_element_info): change
+       the 'order' of contents and shortcontents to have shortcontents
+       separate element appear before contents separate element.
+
 2023-03-12  Gavin Smith <gavinsmith0123@gmail.com>
 
        Swap contents and shortcontents
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index aea4995905..f0ba081b4e 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -1973,8 +1973,8 @@ my %default_special_element_info = (
    },
 
    'order' => {
-     'contents' => 20,
-     'shortcontents' => 30,
+     'contents' => 30,
+     'shortcontents' => 20,
      'footnotes' => 10,
      'about' => 40,
    },
diff --git a/tp/tests/layout/res_parser/formatting_fr/formatting.html 
b/tp/tests/layout/res_parser/formatting_fr/formatting.html
index 7c7e048fbe..cd05851a7b 100644
--- a/tp/tests/layout/res_parser/formatting_fr/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_fr/formatting.html
@@ -7947,6 +7947,22 @@ Menu comment
 <h5 class="footnote-body-heading"><a id="FOOT10" href="#DOCF10">(12)</a></h5>
 <p>in footnote</p>
 </div><hr>
+<div class="element-shortcontents" id="SEC_Shortcontents">
+<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
+<tr><td>[<a href="#Top" title="Cover (top) of document">Top</a>]</td>
+<td>[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
+<td>[<a href="#chapter" title="Index">Index</a>]</td>
+<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
+</tr></table>
+<h1 class="shortcontents-heading">Short Table of Contents</h1>
+
+<div class="shortcontents">
+<ul class="toc-numbered-mark">
+<li><a id="stoc-chapter-1" href="#chapter" rel="index">1 chapter</a></li>
+<li><a id="stoc-chapter-2" href="#chapter2" rel="index">chapter 2</a></li>
+</ul>
+</div>
+</div><hr>
 <div class="element-contents" id="SEC_Contents">
 <table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
 <tr><td>[<a href="#Top" title="Cover (top) of document">Top</a>]</td>
@@ -7974,22 +7990,6 @@ Menu comment
 </ul>
 </div>
 </div><hr>
-<div class="element-shortcontents" id="SEC_Shortcontents">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="#Top" title="Cover (top) of document">Top</a>]</td>
-<td>[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td>[<a href="#chapter" title="Index">Index</a>]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
-<h1 class="shortcontents-heading">Short Table of Contents</h1>
-
-<div class="shortcontents">
-<ul class="toc-numbered-mark">
-<li><a id="stoc-chapter-1" href="#chapter" rel="index">1 chapter</a></li>
-<li><a id="stoc-chapter-2" href="#chapter2" rel="index">chapter 2</a></li>
-</ul>
-</div>
-</div><hr>
 <div class="element-about" id="SEC_About">
 <table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
 <tr><td>[<a href="#Top" title="Cover (top) of document">Top</a>]</td>
diff --git a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html 
b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
index 3e2e2376f8..1fbd0f93d0 100644
--- a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
@@ -7947,6 +7947,22 @@ Menu comment
 <h5 class="footnote-body-heading"><a id="FOOT10" href="#DOCF10">(12)</a></h5>
 <p>in footnote</p>
 </div><hr>
+<div class="element-shortcontents" id="SEC_Shortcontents">
+<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
+<tr><td><a href="#Top" title="Cover (top) of document"><img src="a_top.png" 
border="0" alt="Top: Top section" align="middle"></a></td>
+<td><a href="#SEC_Contents" title="Table of contents"><img 
src="a_tableofcon.png" border="0" alt="Contents: Table of Contents" 
align="middle"></a></td>
+<td><a href="#chapter" title="Index"><img src="a_index.png" border="0" 
alt="Index: 1 chapter" align="middle"></a></td>
+<td><a href="#SEC_About" title="About (help)"><img src="a_help.png" border="0" 
alt="About: About This Document" align="middle"></a></td>
+</tr></table>
+<h1 class="shortcontents-heading">Short Table of Contents</h1>
+
+<div class="shortcontents">
+<ul class="toc-numbered-mark">
+<li><a id="stoc-chapter-1" href="#chapter" rel="index">1 chapter</a></li>
+<li><a id="stoc-chapter-2" href="#chapter2" rel="index">chapter 2</a></li>
+</ul>
+</div>
+</div><hr>
 <div class="element-contents" id="SEC_Contents">
 <table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
 <tr><td><a href="#Top" title="Cover (top) of document"><img src="a_top.png" 
border="0" alt="Top: Top section" align="middle"></a></td>
@@ -7974,22 +7990,6 @@ Menu comment
 </ul>
 </div>
 </div><hr>
-<div class="element-shortcontents" id="SEC_Shortcontents">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td><a href="#Top" title="Cover (top) of document"><img src="a_top.png" 
border="0" alt="Top: Top section" align="middle"></a></td>
-<td><a href="#SEC_Contents" title="Table of contents"><img 
src="a_tableofcon.png" border="0" alt="Contents: Table of Contents" 
align="middle"></a></td>
-<td><a href="#chapter" title="Index"><img src="a_index.png" border="0" 
alt="Index: 1 chapter" align="middle"></a></td>
-<td><a href="#SEC_About" title="About (help)"><img src="a_help.png" border="0" 
alt="About: About This Document" align="middle"></a></td>
-</tr></table>
-<h1 class="shortcontents-heading">Short Table of Contents</h1>
-
-<div class="shortcontents">
-<ul class="toc-numbered-mark">
-<li><a id="stoc-chapter-1" href="#chapter" rel="index">1 chapter</a></li>
-<li><a id="stoc-chapter-2" href="#chapter2" rel="index">chapter 2</a></li>
-</ul>
-</div>
-</div><hr>
 <div class="element-about" id="SEC_About">
 <table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
 <tr><td><a href="#Top" title="Cover (top) of document"><img src="a_top.png" 
border="0" alt="Top: Top section" align="middle"></a></td>
diff --git a/tp/tests/layout/res_parser/formatting_inline_css/formatting.html 
b/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
index 540c206b46..f7495f197e 100644
--- a/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
@@ -7801,6 +7801,20 @@ Previous: <a href="#chapter" accesskey="p" 
rel="prev">chapter</a>, Up: <a href="
 <hr>
 </div>
 </div>
+<div class="element-shortcontents" id="SEC_Shortcontents">
+<div class="nav-panel">
+<p>
+ &nbsp; [<a href="#SEC_Contents" title="Table of contents" 
rel="contents">Contents</a>][<a href="#chapter" title="Index" 
rel="index">Index</a>][<a href="#SEC_About" title="About (help)" rel="help"> ? 
</a>]</p>
+</div>
+<h2 class="shortcontents-heading">Short Table of Contents</h2>
+
+<div class="shortcontents">
+<ul class="toc-numbered-mark" style="list-style: none">
+<li><a id="stoc-chapter-1" href="#toc-chapter-1" rel="index">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="element-contents" id="SEC_Contents">
 <div class="nav-panel">
 <p>
@@ -7826,20 +7840,6 @@ Previous: <a href="#chapter" accesskey="p" 
rel="prev">chapter</a>, Up: <a href="
 </ul>
 </div>
 </div><hr>
-<div class="element-shortcontents" id="SEC_Shortcontents">
-<div class="nav-panel">
-<p>
- &nbsp; [<a href="#SEC_Contents" title="Table of contents" 
rel="contents">Contents</a>][<a href="#chapter" title="Index" 
rel="index">Index</a>][<a href="#SEC_About" title="About (help)" rel="help"> ? 
</a>]</p>
-</div>
-<h2 class="shortcontents-heading">Short Table of Contents</h2>
-
-<div class="shortcontents">
-<ul class="toc-numbered-mark" style="list-style: none">
-<li><a id="stoc-chapter-1" href="#toc-chapter-1" rel="index">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="element-about" id="SEC_About">
 <div class="nav-panel">
 <p>
diff --git a/tp/tests/layout/res_parser/formatting_texi2html/formatting.html 
b/tp/tests/layout/res_parser/formatting_texi2html/formatting.html
index 7b2f139ebe..fd4f05bef2 100644
--- a/tp/tests/layout/res_parser/formatting_texi2html/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_texi2html/formatting.html
@@ -7947,6 +7947,22 @@ Menu comment
 <h5 class="footnote-body-heading"><a id="FOOT10" href="#DOCF10">(12)</a></h5>
 <p>in footnote</p>
 </div><hr>
+<div class="element-shortcontents" id="SEC_Shortcontents">
+<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
+<tr><td>[<a href="#Top" title="Cover (top) of document">Top</a>]</td>
+<td>[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
+<td>[<a href="#chapter" title="Index">Index</a>]</td>
+<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
+</tr></table>
+<h1 class="shortcontents-heading">Short Table of Contents</h1>
+
+<div class="shortcontents">
+<ul class="toc-numbered-mark">
+<li><a id="stoc-chapter-1" href="#chapter" rel="index">1 chapter</a></li>
+<li><a id="stoc-chapter-2" href="#chapter2" rel="index">chapter 2</a></li>
+</ul>
+</div>
+</div><hr>
 <div class="element-contents" id="SEC_Contents">
 <table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
 <tr><td>[<a href="#Top" title="Cover (top) of document">Top</a>]</td>
@@ -7974,22 +7990,6 @@ Menu comment
 </ul>
 </div>
 </div><hr>
-<div class="element-shortcontents" id="SEC_Shortcontents">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="#Top" title="Cover (top) of document">Top</a>]</td>
-<td>[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td>[<a href="#chapter" title="Index">Index</a>]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
-<h1 class="shortcontents-heading">Short Table of Contents</h1>
-
-<div class="shortcontents">
-<ul class="toc-numbered-mark">
-<li><a id="stoc-chapter-1" href="#chapter" rel="index">1 chapter</a></li>
-<li><a id="stoc-chapter-2" href="#chapter2" rel="index">chapter 2</a></li>
-</ul>
-</div>
-</div><hr>
 <div class="element-about" id="SEC_About">
 <table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
 <tr><td>[<a href="#Top" title="Cover (top) of document">Top</a>]</td>