[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: Use HTMLXREF customization variable information o
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: Use HTMLXREF customization variable information only if TEST |
|
Date: |
Thu, 04 Aug 2022 16:31:53 -0400 |
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 a566c85e44 Use HTMLXREF customization variable information only if TEST
a566c85e44 is described below
commit a566c85e44fe25121436d96156affc253e962b5a
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu Aug 4 22:31:40 2022 +0200
Use HTMLXREF customization variable information only if TEST
* tp/Texinfo/Convert/HTML.pm (_load_htmlxref_files): use the
HTMLXREF value for file name only if TEST is set.
---
ChangeLog | 7 +++++++
doc/texinfo.texi | 11 +++++++++--
tp/Texinfo/Convert/HTML.pm | 16 ++++++++++------
3 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c62d507915..8e124746ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2022-08-04 Patrice Dumas <pertusus@free.fr>
+
+ Use HTMLXREF customization variable information only if TEST
+
+ * tp/Texinfo/Convert/HTML.pm (_load_htmlxref_files): use the
+ HTMLXREF value for file name only if TEST is set.
+
2022-08-04 Patrice Dumas <pertusus@free.fr>
Remove KEEP_TOP_EXTERNAL_REF.
diff --git a/doc/texinfo.texi b/doc/texinfo.texi
index 3cbfc535b2..365011948c 100644
--- a/doc/texinfo.texi
+++ b/doc/texinfo.texi
@@ -594,7 +594,7 @@ HTML Cross-references
* Command Expansion: HTML Xref Command Expansion.
* 8-bit Expansion: HTML Xref 8-bit Character Expansion.
* Mismatch: HTML Xref Mismatch.
-* Configuration: HTML Xref Configuration. htmlxref.cnf.
+* Configuration: HTML Xref Configuration. @file{htmlxref.cnf}.
@@-Command Details
@@ -16538,6 +16538,13 @@ set to @samp{l2h}, which uses @command{latex2html}
Use that string for the @code{<html>} HTML document root element.
Default undefined.
+@c not documented, only relevant for tests
+@c @item HTMLXREF
+@c Does nothing unless @code{TEST} is set. If @code{TEST} is set,
+@c set cross-references to other manuals information to be used and use
+@c the value instead of @file{htmlxref.cnf} for the file name
+@c (@pxref{HTML Xref Configuration}).
+
@item ICONS
Use icons for the navigation panel; default false.
@@ -18488,7 +18495,7 @@ The algorithm was primarily devised by Patrice Dumas in
2003--04.
* Command Expansion: HTML Xref Command Expansion.
* 8-bit Expansion: HTML Xref 8-bit Character Expansion.
* Mismatch: HTML Xref Mismatch.
-* Configuration: HTML Xref Configuration. htmlxref.cnf.
+* Configuration: HTML Xref Configuration. @file{htmlxref.cnf}.
@end menu
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index d3162a1eae..dc249718af 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -6649,12 +6649,16 @@ sub _load_htmlxref_files {
my @texinfo_htmlxref_files;
my $htmlxref_file_name = 'htmlxref.cnf';
- my $htmlxref_file_name_from_conf = $self->get_conf('HTMLXREF');
- $htmlxref_file_name = $htmlxref_file_name_from_conf
- if (defined($htmlxref_file_name_from_conf));
-
# no htmlxref for tests, unless explicitely specified with HTMLXREF
- if (!$self->get_conf('TEST') or defined($htmlxref_file_name_from_conf)) {
+ if ($self->get_conf('TEST')) {
+ if (defined($self->get_conf('HTMLXREF'))) {
+ $htmlxref_file_name = $self->get_conf('HTMLXREF');
+ } else {
+ $htmlxref_file_name = undef;
+ }
+ }
+
+ if (defined($htmlxref_file_name)) {
my ($encoded_htmlxref_file_name, $htmlxref_file_encoding)
= $self->encoded_output_file_name($htmlxref_file_name);
@texinfo_htmlxref_files
@@ -6664,7 +6668,7 @@ sub _load_htmlxref_files {
$self->{'htmlxref_files'} = \@texinfo_htmlxref_files;
$self->{'htmlxref'} = {};
- if ($self->{'htmlxref_files'}) {
+ if (scalar(@{$self->{'htmlxref_files'}})) {
$self->{'htmlxref'} = _parse_htmlxref_files($self,
$self->{'htmlxref_files'});
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: Use HTMLXREF customization variable information only if TEST,
Patrice Dumas <=