branch master updated: Update tests tests for Swap contents and shortcontents

[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 ef79ea710c Update tests tests for Swap contents and shortcontents
ef79ea710c is described below

commit ef79ea710ce5502e7ebceb134fcc9238b6b71ae5
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Mar 12 14:44:32 2023 +0100

    Update tests tests for Swap contents and shortcontents
---
 .../EPUB/xhtml/formatting.xhtml                    | 22 +++++++++++-----------
 .../res_parser/formatting_html32/formatting.html   | 14 +++++++-------
 .../formatting_html_no_split/formatting.html       | 20 ++++++++++----------
 .../formatting_regions/formatting_regions.html     | 22 +++++++++++-----------
 .../res_parser/formatting_xhtml/formatting.html    | 20 ++++++++++----------
 .../formatting_enable_encoding/formatting.html     | 20 ++++++++++----------
 .../EPUB/xhtml/formatting.xhtml                    | 22 +++++++++++-----------
 .../res_parser/formatting_mathjax/formatting.html  | 20 ++++++++++----------
 .../formatting_numerical_entities/formatting.html  | 20 ++++++++++----------
 .../formatting_sort_element_counts/formatting.html | 20 ++++++++++----------
 .../formatting_weird_quotes/formatting.html        | 20 ++++++++++----------
 11 files changed, 110 insertions(+), 110 deletions(-)

diff --git 
a/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
 
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
index 903d4deff8..8987fcbadb 100644
--- 
a/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
+++ 
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
@@ -3085,7 +3085,17 @@ html ''
 
 
 
-<a class="node" id="Top"></a><a class="top" id="Top-section"></a><div 
class="element-contents" id="SEC_Contents">
+<a class="node" id="Top"></a><a class="top" id="Top-section"></a><div 
class="element-shortcontents" id="SEC_Shortcontents">
+<h2 class="shortcontents-heading">Short Table of Contents</h2>
+
+<div class="shortcontents">
+<ul class="toc-numbered-mark">
+<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>
+<div class="element-contents" id="SEC_Contents">
 <h2 class="contents-heading">Table of Contents</h2>
 
 <div class="contents">
@@ -3106,16 +3116,6 @@ html ''
 </ul>
 </div>
 </div>
-<div class="element-shortcontents" id="SEC_Shortcontents">
-<h2 class="shortcontents-heading">Short Table of Contents</h2>
-
-<div class="shortcontents">
-<ul class="toc-numbered-mark">
-<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>
 <div class="footnotes-segment">
 <h4 class="footnotes-heading">Footnotes</h4>
 
diff --git a/tp/tests/coverage/res_parser/formatting_html32/formatting.html 
b/tp/tests/coverage/res_parser/formatting_html32/formatting.html
index 90899fa8fe..346ad01f47 100644
--- a/tp/tests/coverage/res_parser/formatting_html32/formatting.html
+++ b/tp/tests/coverage/res_parser/formatting_html32/formatting.html
@@ -3031,6 +3031,13 @@ Menu comment
 </table>
 
 
+<div id="SEC_Shortcontents">
+<h2>Short Table of Contents</h2>
+
+<ul>
+<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 id="SEC_Contents">
 <h2>Table of Contents</h2>
 
@@ -3049,13 +3056,6 @@ Menu comment
   </ul></li>
   <li><a id="toc-chapter-2" href="#chapter2" rel="index">chapter 2</a></li>
 </ul></div>
-<div id="SEC_Shortcontents">
-<h2>Short Table of Contents</h2>
-
-<ul>
-<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>
 <hr>
 <div id="chapter">
 <div>
diff --git 
a/tp/tests/coverage/res_parser/formatting_html_no_split/formatting.html 
b/tp/tests/coverage/res_parser/formatting_html_no_split/formatting.html
index 9c8ed71b5c..02dc8fabb0 100644
--- a/tp/tests/coverage/res_parser/formatting_html_no_split/formatting.html
+++ b/tp/tests/coverage/res_parser/formatting_html_no_split/formatting.html
@@ -914,6 +914,16 @@ Next: <a href="#chapter" accesskey="n" 
rel="next">chapter</a> &nbsp; [<a href="#
 
 
 
+<div class="element-shortcontents" id="SEC_Shortcontents">
+<h2 class="shortcontents-heading">Short Table of Contents</h2>
+
+<div class="shortcontents">
+<ul class="toc-numbered-mark">
+<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>
 <div class="element-contents" id="SEC_Contents">
 <h2 class="contents-heading">Table of Contents</h2>
 
@@ -935,16 +945,6 @@ Next: <a href="#chapter" accesskey="n" 
rel="next">chapter</a> &nbsp; [<a href="#
 </ul>
 </div>
 </div>
-<div class="element-shortcontents" id="SEC_Shortcontents">
-<h2 class="shortcontents-heading">Short Table of Contents</h2>
-
-<div class="shortcontents">
-<ul class="toc-numbered-mark">
-<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="chapter-level-extent" id="chapter">
 <div class="nav-panel">
diff --git 
a/tp/tests/coverage/res_parser/formatting_regions/formatting_regions.html 
b/tp/tests/coverage/res_parser/formatting_regions/formatting_regions.html
index 00d554c9f1..d0787aec34 100644
--- a/tp/tests/coverage/res_parser/formatting_regions/formatting_regions.html
+++ b/tp/tests/coverage/res_parser/formatting_regions/formatting_regions.html
@@ -3091,6 +3091,17 @@ html ''
 Next: <a href="#constructs" accesskey="n" rel="next">constructs</a> &nbsp; [<a 
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a 
href="#constructs" title="Index" rel="index">Index</a>]</p>
 </div>
 <h1 class="top" id="Top-section"><span>Top section<a class="copiable-link" 
href="#Top-section"> &para;</a></span></h1>
+<div class="element-shortcontents" id="SEC_Shortcontents">
+<h2 class="shortcontents-heading">Short Table of Contents</h2>
+
+<div class="shortcontents">
+<ul class="toc-numbered-mark">
+<li><a id="stoc-constructs-1" href="#toc-constructs-1" rel="index">1 
constructs</a></li>
+<li><a id="stoc-chapter-1" href="#toc-chapter-1">2 chapter</a></li>
+<li><a id="stoc-chapter-2" href="#toc-chapter-2" rel="index">chapter 2</a></li>
+</ul>
+</div>
+</div>
 <div class="element-contents" id="SEC_Contents">
 <h2 class="contents-heading">Table of Contents</h2>
 
@@ -3112,17 +3123,6 @@ Next: <a href="#constructs" accesskey="n" 
rel="next">constructs</a> &nbsp; [<a h
 </ul>
 </div>
 </div>
-<div class="element-shortcontents" id="SEC_Shortcontents">
-<h2 class="shortcontents-heading">Short Table of Contents</h2>
-
-<div class="shortcontents">
-<ul class="toc-numbered-mark">
-<li><a id="stoc-constructs-1" href="#toc-constructs-1" rel="index">1 
constructs</a></li>
-<li><a id="stoc-chapter-1" href="#toc-chapter-1">2 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-level-extent" id="constructs">
 <div class="nav-panel">
diff --git a/tp/tests/coverage/res_parser/formatting_xhtml/formatting.html 
b/tp/tests/coverage/res_parser/formatting_xhtml/formatting.html
index 614b62aa7d..9d93425c28 100644
--- a/tp/tests/coverage/res_parser/formatting_xhtml/formatting.html
+++ b/tp/tests/coverage/res_parser/formatting_xhtml/formatting.html
@@ -3107,6 +3107,16 @@ Next: <a href="#chapter" accesskey="n" 
rel="next">chapter</a> &nbsp; [<a href="#
 
 
 
+<div class="element-shortcontents" id="SEC_Shortcontents">
+<h2 class="shortcontents-heading">Short Table of Contents</h2>
+
+<div class="shortcontents">
+<ul class="toc-numbered-mark">
+<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>
 <div class="element-contents" id="SEC_Contents">
 <h2 class="contents-heading">Table of Contents</h2>
 
@@ -3128,16 +3138,6 @@ Next: <a href="#chapter" accesskey="n" 
rel="next">chapter</a> &nbsp; [<a href="#
 </ul>
 </div>
 </div>
-<div class="element-shortcontents" id="SEC_Shortcontents">
-<h2 class="shortcontents-heading">Short Table of Contents</h2>
-
-<div class="shortcontents">
-<ul class="toc-numbered-mark">
-<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="chapter-level-extent" id="chapter">
 <div class="nav-panel">
diff --git 
a/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html 
b/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
index 1c0f5a2f0d..cc7e9dbd3c 100644
--- a/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
@@ -3123,6 +3123,16 @@ Menu comment
 </table>
 
 
+<div class="element-shortcontents" id="SEC_Shortcontents">
+<h2 class="shortcontents-heading">Short Table of Contents</h2>
+
+<div class="shortcontents">
+<ul class="toc-numbered-mark">
+<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>
 <div class="element-contents" id="SEC_Contents">
 <h2 class="contents-heading">Table of Contents</h2>
 
@@ -3144,16 +3154,6 @@ Menu comment
 </ul>
 </div>
 </div>
-<div class="element-shortcontents" id="SEC_Shortcontents">
-<h2 class="shortcontents-heading">Short Table of Contents</h2>
-
-<div class="shortcontents">
-<ul class="toc-numbered-mark">
-<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="chapter-level-extent" id="chapter">
 <div class="nav-panel">
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
index cf209171bb..6ff70ddf2b 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
+++ 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
@@ -3087,7 +3087,17 @@ html ''
 
 
 
-<a class="node" id="Top"></a><a class="top" id="Top-section"></a><div 
class="element-contents" id="SEC_Contents">
+<a class="node" id="Top"></a><a class="top" id="Top-section"></a><div 
class="element-shortcontents" id="SEC_Shortcontents">
+<h2 class="shortcontents-heading">Short Table of Contents</h2>
+
+<div class="shortcontents">
+<ul class="toc-numbered-mark">
+<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>
+<div class="element-contents" id="SEC_Contents">
 <h2 class="contents-heading">Table of Contents</h2>
 
 <div class="contents">
@@ -3108,16 +3118,6 @@ html ''
 </ul>
 </div>
 </div>
-<div class="element-shortcontents" id="SEC_Shortcontents">
-<h2 class="shortcontents-heading">Short Table of Contents</h2>
-
-<div class="shortcontents">
-<ul class="toc-numbered-mark">
-<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>
 
 
 <a href="js_licenses.xhtml" rel="jslicense"><small>JavaScript license 
information</small></a>
diff --git a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html 
b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
index fde998b0ab..5853f88830 100644
--- a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
@@ -3110,6 +3110,16 @@ Next: <a href="#chapter" accesskey="n" 
rel="next">chapter</a> &nbsp; [<a href="#
 
 
 
+<div class="element-shortcontents" id="SEC_Shortcontents">
+<h2 class="shortcontents-heading">Short Table of Contents</h2>
+
+<div class="shortcontents">
+<ul class="toc-numbered-mark">
+<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>
 <div class="element-contents" id="SEC_Contents">
 <h2 class="contents-heading">Table of Contents</h2>
 
@@ -3131,16 +3141,6 @@ Next: <a href="#chapter" accesskey="n" 
rel="next">chapter</a> &nbsp; [<a href="#
 </ul>
 </div>
 </div>
-<div class="element-shortcontents" id="SEC_Shortcontents">
-<h2 class="shortcontents-heading">Short Table of Contents</h2>
-
-<div class="shortcontents">
-<ul class="toc-numbered-mark">
-<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="chapter-level-extent" id="chapter">
 <div class="nav-panel">
diff --git 
a/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html 
b/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
index 533fc2247a..6cc9032fd6 100644
--- a/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
@@ -3123,6 +3123,16 @@ Menu comment
 </table>
 
 
+<div class="element-shortcontents" id="SEC_Shortcontents">
+<h2 class="shortcontents-heading">Short Table of Contents</h2>
+
+<div class="shortcontents">
+<ul class="toc-numbered-mark">
+<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>
 <div class="element-contents" id="SEC_Contents">
 <h2 class="contents-heading">Table of Contents</h2>
 
@@ -3144,16 +3154,6 @@ Menu comment
 </ul>
 </div>
 </div>
-<div class="element-shortcontents" id="SEC_Shortcontents">
-<h2 class="shortcontents-heading">Short Table of Contents</h2>
-
-<div class="shortcontents">
-<ul class="toc-numbered-mark">
-<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="chapter-level-extent" id="chapter">
 <div class="nav-panel">
diff --git 
a/tp/tests/layout/res_parser/formatting_sort_element_counts/formatting.html 
b/tp/tests/layout/res_parser/formatting_sort_element_counts/formatting.html
index b54e6cf275..6ed60eac68 100644
--- a/tp/tests/layout/res_parser/formatting_sort_element_counts/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_sort_element_counts/formatting.html
@@ -914,6 +914,16 @@ ul.toc-numbered-mark {list-style: none}
 
 
 
+<div class="element-shortcontents" id="SEC_Shortcontents">
+<h2 class="shortcontents-heading">Short Table of Contents</h2>
+
+<div class="shortcontents">
+<ul class="toc-numbered-mark">
+<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>
 <div class="element-contents" id="SEC_Contents">
 <h2 class="contents-heading">Table of Contents</h2>
 
@@ -935,16 +945,6 @@ ul.toc-numbered-mark {list-style: none}
 </ul>
 </div>
 </div>
-<div class="element-shortcontents" id="SEC_Shortcontents">
-<h2 class="shortcontents-heading">Short Table of Contents</h2>
-
-<div class="shortcontents">
-<ul class="toc-numbered-mark">
-<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="chapter-level-extent" id="chapter">
 <div class="nav-panel">
diff --git a/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html 
b/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
index ab16a50a3f..1e9a41514b 100644
--- a/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
@@ -3123,6 +3123,16 @@ Menu comment
 </table>
 
 
+<div class="element-shortcontents" id="SEC_Shortcontents">
+<h2 class="shortcontents-heading">Short Table of Contents</h2>
+
+<div class="shortcontents">
+<ul class="toc-numbered-mark">
+<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>
 <div class="element-contents" id="SEC_Contents">
 <h2 class="contents-heading">Table of Contents</h2>
 
@@ -3144,16 +3154,6 @@ Menu comment
 </ul>
 </div>
 </div>
-<div class="element-shortcontents" id="SEC_Shortcontents">
-<h2 class="shortcontents-heading">Short Table of Contents</h2>
-
-<div class="shortcontents">
-<ul class="toc-numbered-mark">
-<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="chapter-level-extent" id="chapter">
 <div class="nav-panel">