[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
|
From: |
Patrice Dumas |
|
Date: |
Wed, 3 Apr 2024 18:18:50 -0400 (EDT) |
branch: master
commit 657a9358254deae960820b6a6b039b2f849219a8
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu Apr 4 00:18:37 2024 +0200
Remove USE_UP_NODE_FOR_ELEMENT_UP customization variable
* NEWS, doc/texinfo.texi (Other Customization Variables),
tp/Texinfo/Convert/HTML.pm (_set_variables_texi2html),
tp/Texinfo/Structuring.pm (units_directions),
tp/Texinfo/XS/main/output_unit.c (units_directions),
tp/Texinfo/options_data.txt: remove USE_UP_NODE_FOR_ELEMENT_UP
customization variable. It would only be relevant if @top is not
present, which should never be the case and is quite confusing as
it does the reverse as the usual determination of direction based on
chapter structuring commands.
---
ChangeLog | 14 ++++++++++++++
NEWS | 3 ++-
doc/texinfo.texi | 5 -----
tp/Texinfo/Convert/HTML.pm | 1 -
tp/Texinfo/Structuring.pm | 13 -------------
tp/Texinfo/XS/main/output_unit.c | 13 -------------
tp/Texinfo/options_data.txt | 1 -
.../res_html/index.html | 2 +-
.../res_html/third-node.html | 2 +-
...nodes_after_top_before_section_texi2html_use_nodes.html | 4 ++--
.../res_html/index.html | 4 ++--
11 files changed, 22 insertions(+), 40 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d822ec8e90..17c828f024 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2024-04-03 Patrice Dumas <pertusus@free.fr>
+
+ Remove USE_UP_NODE_FOR_ELEMENT_UP customization variable
+
+ * NEWS, doc/texinfo.texi (Other Customization Variables),
+ tp/Texinfo/Convert/HTML.pm (_set_variables_texi2html),
+ tp/Texinfo/Structuring.pm (units_directions),
+ tp/Texinfo/XS/main/output_unit.c (units_directions),
+ tp/Texinfo/options_data.txt: remove USE_UP_NODE_FOR_ELEMENT_UP
+ customization variable. It would only be relevant if @top is not
+ present, which should never be the case and is quite confusing as
+ it does the reverse as the usual determination of direction based on
+ chapter structuring commands.
+
2024-04-03 Patrice Dumas <pertusus@free.fr>
Remove NO_USE_SETFILENAME customization variable
diff --git a/NEWS b/NEWS
index 1bdf910550..61c19253c0 100644
--- a/NEWS
+++ b/NEWS
@@ -27,7 +27,8 @@ See the manual for detailed information.
use of Unicode collation when sorting indices
. remove SIMPLE_MENU customization option and tree transformation.
. remove FRAMES and FRAMESET_DOCTYPE customization options.
- . remove AVOID_MENU_REDUNDANCY and NO_USE_SETFILENAME customization options.
+ . remove AVOID_MENU_REDUNDANCY, NO_USE_SETFILENAME and
+ USE_UP_NODE_FOR_ELEMENT_UP customization options.
. set CHECK_NORMAL_MENU_STRUCTURE in the default case.
. rename COMPLEX_FORMAT_IN_TABLE customization option as
INDENTED_BLOCK_COMMANDS_IN_TABLE.
diff --git a/doc/texinfo.texi b/doc/texinfo.texi
index 0351305248..610ac24c22 100644
--- a/doc/texinfo.texi
+++ b/doc/texinfo.texi
@@ -16035,11 +16035,6 @@ are separated. The default is true.
For HTML, XML and DocBook@. If set, use numeric entities instead of named
entities. By default, set to true for DocBook output.
-@item USE_UP_NODE_FOR_ELEMENT_UP
-Fill in up sectioning direction with node direction when there is no
-sectioning up direction. In practice this can only happen when there
-is no @@top section. Not set by default.
-
@item USE_SETFILENAME_EXTENSION
Default is on for Info, off for other output. If set, use exactly
what @code{@@setfilename} gives for the output file name, including
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 14c094a151..f459df40b2 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -13606,7 +13606,6 @@ sub _set_variables_texi2html($)
['NODE_NAME_IN_MENU', 0],
['SHORT_TOC_LINK_TO_TOC', 0],
['SHOW_TITLE', 1],
- ['USE_UP_NODE_FOR_ELEMENT_UP', 1],
['USE_REL_REV', 0],
['USE_LINKS', 0],
['USE_NODES', 0],
diff --git a/tp/Texinfo/Structuring.pm b/tp/Texinfo/Structuring.pm
index 64748b820f..efc4095057 100644
--- a/tp/Texinfo/Structuring.pm
+++ b/tp/Texinfo/Structuring.pm
@@ -2097,19 +2097,6 @@ sub units_directions($$$)
= $output_unit;
}
}
- # Use node up for Up if there is no section up.
- # Not done in the default case.
- if ($customization_information->get_conf('USE_UP_NODE_FOR_ELEMENT_UP')
- and !$directions->{'Up'} and defined($node)
- and $node->{'extra'}->{'node_directions'}
- and $node->{'extra'}->{'node_directions'}->{'up'}
- and (!$node_top or ($node ne $node_top))) {
- #print STDERR "Node for up: ".output_unit_texi($output_unit)."\n";
- my $up_node_unit_element
- = _label_target_unit_element(
- $node->{'extra'}->{'node_directions'}->{'up'});
- $directions->{'Up'} = $up_node_unit_element if ($up_node_unit_element);
- }
if ($output_unit->{'directions'}) {
%{$output_unit->{'directions'}}
= (%{$output_unit->{'directions'}}, %$directions);
diff --git a/tp/Texinfo/XS/main/output_unit.c b/tp/Texinfo/XS/main/output_unit.c
index 024fecc905..2d119937de 100644
--- a/tp/Texinfo/XS/main/output_unit.c
+++ b/tp/Texinfo/XS/main/output_unit.c
@@ -761,19 +761,6 @@ units_directions (OPTIONS *customization_information,
}
}
-
- /* Use node up for Up if there is no section up.
- Not done in the default case. */
- if (customization_information->USE_UP_NODE_FOR_ELEMENT_UP.integer > 0
- && !directions[RUD_type_Up] && node
- && node_directions && node_directions->list[D_up]
- && (!node_top || node != node_top))
- {
- OUTPUT_UNIT *up_node_unit_element
- = label_target_unit_element (node_directions->list[D_up]);
- if (up_node_unit_element)
- directions[RUD_type_Up] = up_node_unit_element;
- }
}
if (customization_information->DEBUG.integer > 0)
{
diff --git a/tp/Texinfo/options_data.txt b/tp/Texinfo/options_data.txt
index a8840ab451..5ae1dcd225 100644
--- a/tp/Texinfo/options_data.txt
+++ b/tp/Texinfo/options_data.txt
@@ -315,7 +315,6 @@ USE_REL_REV converter_customization
undef integer
USE_SETFILENAME_EXTENSION converter_customization undef integer
USE_TITLEPAGE_FOR_TITLE converter_customization undef integer
USE_UNIDECODE converter_customization undef integer
-USE_UP_NODE_FOR_ELEMENT_UP converter_customization undef integer
USE_XML_SYNTAX converter_customization undef integer
VERTICAL_HEAD_NAVIGATION converter_customization undef integer
WORDS_IN_PAGE converter_customization undef integer
diff --git
a/tp/t/results/sectioning/nodes_after_top_before_chapter_texi2html_use_nodes_chapter/res_html/index.html
b/tp/t/results/sectioning/nodes_after_top_before_chapter_texi2html_use_nodes_chapter/res_html/index.html
index d311bb0fbb..2ac650e35c 100644
---
a/tp/t/results/sectioning/nodes_after_top_before_chapter_texi2html_use_nodes_chapter/res_html/index.html
+++
b/tp/t/results/sectioning/nodes_after_top_before_chapter_texi2html_use_nodes_chapter/res_html/index.html
@@ -46,7 +46,7 @@ td.menu-entry-destination {vertical-align: top}
<a class="node-id" id="second-node"></a><table class="nav-panel"
cellpadding="1" cellspacing="1" border="0">
<tr><td>[ << ]</td>
<td>[<a href="#Top" title="Previous section in reading order"> < </a>]</td>
-<td>[<a href="#Top" title="Up section"> Up </a>]</td>
+<td>[ Up ]</td>
<td>[<a href="third-node.html" title="Next section in reading order"> >
</a>]</td>
<td>[ >> ]</td>
<td> </td>
diff --git
a/tp/t/results/sectioning/nodes_after_top_before_chapter_texi2html_use_nodes_chapter/res_html/third-node.html
b/tp/t/results/sectioning/nodes_after_top_before_chapter_texi2html_use_nodes_chapter/res_html/third-node.html
index a09f8c1943..d74fd2fb7d 100644
---
a/tp/t/results/sectioning/nodes_after_top_before_chapter_texi2html_use_nodes_chapter/res_html/third-node.html
+++
b/tp/t/results/sectioning/nodes_after_top_before_chapter_texi2html_use_nodes_chapter/res_html/third-node.html
@@ -27,7 +27,7 @@ span:hover a.copiable-link {visibility: visible}
<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
<tr><td>[ << ]</td>
<td>[<a href="index.html#second-node" title="Previous section in reading
order"> < </a>]</td>
-<td>[<a href="index.html#Top" title="Up section"> Up </a>]</td>
+<td>[ Up ]</td>
<td>[ > ]</td>
<td>[ >> ]</td>
<td> </td>
diff --git
a/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes/res_html/nodes_after_top_before_section_texi2html_use_nodes.html
b/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes/res_html/nodes_after_top_before_section_texi2html_use_nodes.html
index ffdb827599..611a814cf5 100644
---
a/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes/res_html/nodes_after_top_before_section_texi2html_use_nodes.html
+++
b/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes/res_html/nodes_after_top_before_section_texi2html_use_nodes.html
@@ -48,7 +48,7 @@ td.name-direction-about {text-align:center}
<a class="node-id" id="chap-node"></a><table class="nav-panel" cellpadding="1"
cellspacing="1" border="0">
<tr><td>[ << ]</td>
<td>[<a href="#Top" title="Previous section in reading order"> < </a>]</td>
-<td>[<a href="#Top" title="Up section"> Up </a>]</td>
+<td>[ Up ]</td>
<td>[<a href="#third-node" title="Next section in reading order"> >
</a>]</td>
<td>[ >> ]</td>
<td> </td>
@@ -69,7 +69,7 @@ td.name-direction-about {text-align:center}
<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
<tr><td>[ << ]</td>
<td>[<a href="#chap-node" title="Previous section in reading order"> <
</a>]</td>
-<td>[<a href="#Top" title="Up section"> Up </a>]</td>
+<td>[ Up ]</td>
<td>[ > ]</td>
<td>[ >> ]</td>
<td> </td>
diff --git
a/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes_chapter/res_html/index.html
b/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes_chapter/res_html/index.html
index 0904114ce2..a47d103309 100644
---
a/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes_chapter/res_html/index.html
+++
b/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes_chapter/res_html/index.html
@@ -46,7 +46,7 @@ td.menu-entry-destination {vertical-align: top}
<a class="node-id" id="chap-node"></a><table class="nav-panel" cellpadding="1"
cellspacing="1" border="0">
<tr><td>[ << ]</td>
<td>[<a href="#Top" title="Previous section in reading order"> < </a>]</td>
-<td>[<a href="#Top" title="Up section"> Up </a>]</td>
+<td>[ Up ]</td>
<td>[<a href="#third-node" title="Next section in reading order"> >
</a>]</td>
<td>[ >> ]</td>
<td> </td>
@@ -67,7 +67,7 @@ td.menu-entry-destination {vertical-align: top}
<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
<tr><td>[ << ]</td>
<td>[<a href="#chap-node" title="Previous section in reading order"> <
</a>]</td>
-<td>[<a href="#Top" title="Up section"> Up </a>]</td>
+<td>[ Up ]</td>
<td>[ > ]</td>
<td>[ >> ]</td>
<td> </td>