[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: Swap contents and shortcontents
|
From: |
Gavin D. Smith |
|
Subject: |
branch master updated: Swap contents and shortcontents |
|
Date: |
Sun, 12 Mar 2023 08:05:58 -0400 |
This is an automated email from the git hooks/post-receive script.
gavin pushed a commit to branch master
in repository texinfo.
The following commit(s) were added to refs/heads/master by this push:
new 11e6c5add1 Swap contents and shortcontents
11e6c5add1 is described below
commit 11e6c5add1f3fd55d795d3a9b03a4c1d01f43efc
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sun Mar 12 12:05:49 2023 +0000
Swap contents and shortcontents
* tp/Texinfo/Convert/HTML.pm (_convert_heading_command)
(_contents_shortcontents_in_title, _prepare_special_elements):
Swap the output for @contents and @shortcontents, so that
@shortcontents is first, for CONTENTS_OUTPUT_LOCATION set to
'after_top', 'after_title', or 'separate_element'. From
Arsen Arsenović.
* NEWS: update
---
ChangeLog | 12 ++++++++
NEWS | 1 +
tp/Texinfo/Convert/HTML.pm | 17 +++++-----
.../character_number_leading_toc_stoc.pl | 20 ++++++------
.../customize_special_element/res_html/index.html | 18 +++++------
.../moresectioning/contents_and_shortcontents.pl | 36 +++++++++++-----------
tp/t/results/sectioning/contents_and_parts.pl | 32 +++++++++----------
7 files changed, 74 insertions(+), 62 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b86cae6e16..effee52b85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2023-03-12 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Swap contents and shortcontents
+
+ * tp/Texinfo/Convert/HTML.pm (_convert_heading_command)
+ (_contents_shortcontents_in_title, _prepare_special_elements):
+ Swap the output for @contents and @shortcontents, so that
+ @shortcontents is first, for CONTENTS_OUTPUT_LOCATION set to
+ 'after_top', 'after_title', or 'separate_element'. From
+ Arsen Arsenović.
+ * NEWS: update
+
2023-03-12 Gavin Smith <gavinsmith0123@gmail.com>
* tp/Texinfo/XS/parsetexi/separator.c (handle_open_brace):
diff --git a/NEWS b/NEWS
index 6b37aa0161..a5e7809070 100644
--- a/NEWS
+++ b/NEWS
@@ -31,6 +31,7 @@ See the manual for detailed information.
. HTML output:
. format @subentry and index entry with @seealso or @seeentry more in line
with printed output.
+ . output @shortcontents before @contents by default
. No more capitalization of @sc argument in HTML Cross-references.
. Change @point expansion to U+22C6 in HTML Cross-references.
. omit colons after index entries by default. this can still be
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index d1f2746791..aea4995905 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -4110,7 +4110,7 @@ sub _convert_heading_command($$$$$)
and $cmdname eq 'top'
and $structuring and $structuring->{'sectioning_root'}
and scalar(@{$structuring->{'sections_list'}}) > 1) {
- foreach my $content_command_name ('contents', 'shortcontents') {
+ foreach my $content_command_name ('shortcontents', 'contents') {
if ($self->get_conf($content_command_name)) {
my $contents_text
= $self->_contents_inline_element($content_command_name, undef);
@@ -6962,7 +6962,7 @@ sub _contents_shortcontents_in_title($)
if ($structuring and $structuring->{'sectioning_root'}
and scalar(@{$structuring->{'sections_list'}}) > 1
and $self->get_conf('CONTENTS_OUTPUT_LOCATION') eq 'after_title') {
- foreach my $cmdname ('contents', 'shortcontents') {
+ foreach my $cmdname ('shortcontents', 'contents') {
if ($self->get_conf($cmdname)) {
my $contents_text = $self->_contents_inline_element($cmdname, undef);
if ($contents_text ne '') {
@@ -8966,13 +8966,12 @@ sub _prepare_special_elements($$$$)
my %do_special;
if ($self->{'structuring'} and $self->{'structuring'}->{'sectioning_root'}
and scalar(@{$self->{'structuring'}->{'sections_list'}}) > 1) {
- foreach my $cmdname ('contents', 'shortcontents') {
- my $special_element_variety
- = $contents_command_special_element_variety{$cmdname};
- if ($self->get_conf($cmdname)) {
- if ($self->get_conf('CONTENTS_OUTPUT_LOCATION')
- eq 'separate_element') {
- $do_special{$special_element_variety} = 1;
+ if ($self->get_conf('CONTENTS_OUTPUT_LOCATION') eq 'separate_element') {
+ foreach my $cmdname ('shortcontents', 'contents') {
+ my $special_element_variety
+ = $contents_command_special_element_variety{$cmdname};
+ if ($self->get_conf($cmdname)) {
+ $do_special{$special_element_variety} = 1;
}
}
}
diff --git a/tp/t/results/html_tests/character_number_leading_toc_stoc.pl
b/tp/t/results/html_tests/character_number_leading_toc_stoc.pl
index e8a7c0746e..f83a1b4474 100644
--- a/tp/t/results/html_tests/character_number_leading_toc_stoc.pl
+++ b/tp/t/results/html_tests/character_number_leading_toc_stoc.pl
@@ -292,6 +292,16 @@ ul.toc-numbered-mark {list-style: none}
<body lang="en">
<div class="top-level-extent" id="top">
<h1 class="top"><span>top<a class="copiable-link" href="#top">
¶</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-0" href="#toc-0">1 0</a></li>
+<li><a id="stoc-_005f" href="#toc-_005f">_</a></li>
+</ul>
+</div>
+</div>
<div class="element-contents" id="SEC_Contents">
<h2 class="contents-heading">Table of Contents</h2>
@@ -306,16 +316,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-0" href="#toc-0">1 0</a></li>
-<li><a id="stoc-_005f" href="#toc-_005f">_</a></li>
-</ul>
-</div>
-</div>
<div class="chapter-level-extent" id="g_t0">
<h2 class="chapter"><span>1 0<a class="copiable-link" href="#g_t0">
¶</a></span></h2>
</div>
diff --git
a/tp/t/results/init_files_tests/customize_special_element/res_html/index.html
b/tp/t/results/init_files_tests/customize_special_element/res_html/index.html
index 9dc73c3c65..151876314f 100644
---
a/tp/t/results/init_files_tests/customize_special_element/res_html/index.html
+++
b/tp/t/results/init_files_tests/customize_special_element/res_html/index.html
@@ -37,6 +37,15 @@ Next: <a href="Chapter.html" accesskey="n"
rel="next">chap</a> [<a href="
<hr>
<h1 class="top" id="top"><span>top<a class="copiable-link" href="#top">
¶</a></span></h1>
+<div class="element-shortcontents">
+
+<div class="shortcontents">
+<ul class="toc-numbered-mark">
+<li><a id="stoc-chap" href="#toc-chap">1 chap</a></li>
+<li><a id="stoc-chap-fr" href="#toc-chap-fr">2 chap fr</a></li>
+</ul>
+</div>
+</div>
<div class="element-contents" id="t_contents">
<h2 class="contents-heading">The <em class="emph">Table of Contents</em></h2>
@@ -48,15 +57,6 @@ Next: <a href="Chapter.html" accesskey="n"
rel="next">chap</a> [<a href="
</ul>
</div>
</div>
-<div class="element-shortcontents">
-
-<div class="shortcontents">
-<ul class="toc-numbered-mark">
-<li><a id="stoc-chap" href="#toc-chap">1 chap</a></li>
-<li><a id="stoc-chap-fr" href="#toc-chap-fr">2 chap fr</a></li>
-</ul>
-</div>
-</div>
</div>
<hr>
<div class="nav-panel">
diff --git a/tp/t/results/moresectioning/contents_and_shortcontents.pl
b/tp/t/results/moresectioning/contents_and_shortcontents.pl
index 28c3c2f7bb..8b8e135ecd 100644
--- a/tp/t/results/moresectioning/contents_and_shortcontents.pl
+++ b/tp/t/results/moresectioning/contents_and_shortcontents.pl
@@ -759,6 +759,24 @@ ul.toc-numbered-mark {list-style: none}
<div class="top-level-extent" id="top">
<h1 class="top"><span>top<a class="copiable-link" href="#top">
¶</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><ul class="toc-numbered-mark">
+<li><a id="stoc-chapter" href="#toc-chapter">1 chapter</a></li>
+</ul></li>
+<li><a id="stoc-part" href="#toc-part">part</a><ul class="toc-numbered-mark">
+<li><a id="stoc-chapter-in-part" href="#toc-chapter-in-part">2 chapter in
part</a></li>
+<li><a id="stoc-second-chapter-in-part" href="#toc-second-chapter-in-part">3
second chapter in part</a></li>
+<li><a id="stoc-unnumbered" href="#toc-unnumbered">unnumbered</a></li>
+</ul></li>
+<li><a id="stoc-appendix" href="#toc-appendix">Appendix A appendix</a></li>
+
+</ul>
+</div>
+</div>
<div class="element-contents" id="SEC_Contents">
<h2 class="contents-heading">Table of Contents</h2>
@@ -788,24 +806,6 @@ ul.toc-numbered-mark {list-style: none}
<li><a id="toc-appendixsec" href="#appendixsec">A.1 appendixsec</a></li>
</ul></li>
-</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><ul class="toc-numbered-mark">
-<li><a id="stoc-chapter" href="#toc-chapter">1 chapter</a></li>
-</ul></li>
-<li><a id="stoc-part" href="#toc-part">part</a><ul class="toc-numbered-mark">
-<li><a id="stoc-chapter-in-part" href="#toc-chapter-in-part">2 chapter in
part</a></li>
-<li><a id="stoc-second-chapter-in-part" href="#toc-second-chapter-in-part">3
second chapter in part</a></li>
-<li><a id="stoc-unnumbered" href="#toc-unnumbered">unnumbered</a></li>
-</ul></li>
-<li><a id="stoc-appendix" href="#toc-appendix">Appendix A appendix</a></li>
-
</ul>
</div>
</div>
diff --git a/tp/t/results/sectioning/contents_and_parts.pl
b/tp/t/results/sectioning/contents_and_parts.pl
index ffc1615bae..ef4fd9af13 100644
--- a/tp/t/results/sectioning/contents_and_parts.pl
+++ b/tp/t/results/sectioning/contents_and_parts.pl
@@ -1004,6 +1004,22 @@ Next: <a href="#chapter-1-node" accesskey="n"
rel="next">chapter 1</a> [<
<h1 class="top" id="top"><span>top<a class="copiable-link" href="#top">
¶</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-part-1_003a-part-1" href="#toc-part-1_003a-part-1">part 1:
part 1</a><ul class="toc-numbered-mark">
+<li><a id="stoc-chapter-1" href="#toc-chapter-1">1 chapter 1</a></li>
+<li><a id="stoc-chapter-2" href="#toc-chapter-2">2 chapter 2</a></li>
+</ul></li>
+<li><a id="stoc-part2_003a-part2" href="#toc-part2_003a-part2">part2:
part2</a><ul class="toc-numbered-mark">
+<li><a id="stoc-chapter-3" href="#toc-chapter-3">3 chapter 3</a></li>
+</ul></li>
+
+</ul>
+</div>
+</div>
<div class="element-contents" id="SEC_Contents">
<h2 class="contents-heading">Table of Contents</h2>
@@ -1019,22 +1035,6 @@ Next: <a href="#chapter-1-node" accesskey="n"
rel="next">chapter 1</a> [<
<li><a id="toc-chapter-3" href="#chapter-3-node">3 chapter 3</a></li>
</ul></li>
-</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-part-1_003a-part-1" href="#toc-part-1_003a-part-1">part 1:
part 1</a><ul class="toc-numbered-mark">
-<li><a id="stoc-chapter-1" href="#toc-chapter-1">1 chapter 1</a></li>
-<li><a id="stoc-chapter-2" href="#toc-chapter-2">2 chapter 2</a></li>
-</ul></li>
-<li><a id="stoc-part2_003a-part2" href="#toc-part2_003a-part2">part2:
part2</a><ul class="toc-numbered-mark">
-<li><a id="stoc-chapter-3" href="#toc-chapter-3">3 chapter 3</a></li>
-</ul></li>
-
</ul>
</div>
</div>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: Swap contents and shortcontents,
Gavin D. Smith <=