[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
From: |
Patrice Dumas |
Date: |
Sat, 5 Oct 2024 05:41:31 -0400 (EDT) |
branch: master
commit a3c4402a5fd61e7d29948f9a5dae3613404c4db7
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Aug 31 15:01:53 2024 +0200
* tp/texi2any.pl ($configured_package, $configured_name),
tp/Texinfo/Convert/converters_defaults.txt (PACKAGE, PACKAGE_NAME):
more consistent PACKAGE and PACKAGE_NAME values when not using
values set by configure.
---
ChangeLog | 7 +++++++
tp/Texinfo/Convert/converters_defaults.txt | 2 ++
tp/Texinfo/XS/convert/converters_options.c | 4 ++++
.../customization/res_parser/test_redefine_need/test_need.html | 4 ++--
tp/texi2any.pl | 4 ++--
5 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 6f57174fcb..19274dc3bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2024-08-31 Patrice Dumas <pertusus@free.fr>
+
+ * tp/texi2any.pl ($configured_package, $configured_name),
+ tp/Texinfo/Convert/converters_defaults.txt (PACKAGE, PACKAGE_NAME):
+ more consistent PACKAGE and PACKAGE_NAME values when not using
+ values set by configure.
+
2024-08-31 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/XS/configure.ac (AC_INIT): use the same package name as
diff --git a/tp/Texinfo/Convert/converters_defaults.txt
b/tp/Texinfo/Convert/converters_defaults.txt
index 5bdefbe131..5dea20dbf9 100644
--- a/tp/Texinfo/Convert/converters_defaults.txt
+++ b/tp/Texinfo/Convert/converters_defaults.txt
@@ -30,6 +30,8 @@ documentlanguage undef
# values are what is used in tests of the Converters. These variables are
# customization options, set in the main program when a converter is
# called from the main program.
+PACKAGE texinfo
+PACKAGE_NAME GNU Texinfo
PACKAGE_AND_VERSION texinfo
PACKAGE_VERSION
PACKAGE_URL http://www.gnu.org/software/texinfo/
diff --git a/tp/Texinfo/XS/convert/converters_options.c
b/tp/Texinfo/XS/convert/converters_options.c
index abd6c13ffd..15ce9c3721 100644
--- a/tp/Texinfo/XS/convert/converters_options.c
+++ b/tp/Texinfo/XS/convert/converters_options.c
@@ -15,6 +15,8 @@
void
set_common_regular_options_defaults (OPTIONS *options)
{
+ option_set_conf (&options->PACKAGE, -2, "texinfo");
+ option_set_conf (&options->PACKAGE_NAME, -2, "GNU Texinfo");
option_set_conf (&options->PACKAGE_AND_VERSION, -2, "texinfo");
option_set_conf (&options->PACKAGE_VERSION, -2, "");
option_set_conf (&options->PACKAGE_URL, -2,
"http://www.gnu.org/software/texinfo/");
@@ -24,6 +26,8 @@ set_common_regular_options_defaults (OPTIONS *options)
void
add_common_regular_options_defaults (OPTIONS_LIST *options_list)
{
+ add_new_option_value (options_list, GOT_char, "PACKAGE", -2, "texinfo");
+ add_new_option_value (options_list, GOT_char, "PACKAGE_NAME", -2, "GNU
Texinfo");
add_new_option_value (options_list, GOT_char, "PACKAGE_AND_VERSION", -2,
"texinfo");
add_new_option_value (options_list, GOT_char, "PACKAGE_VERSION", -2, "");
add_new_option_value (options_list, GOT_char, "PACKAGE_URL", -2,
"http://www.gnu.org/software/texinfo/");
diff --git
a/tp/tests/customization/res_parser/test_redefine_need/test_need.html
b/tp/tests/customization/res_parser/test_redefine_need/test_need.html
index 6468156b08..194ec80eb3 100644
--- a/tp/tests/customization/res_parser/test_redefine_need/test_need.html
+++ b/tp/tests/customization/res_parser/test_redefine_need/test_need.html
@@ -28,8 +28,8 @@ span:hover a.copiable-link {visibility: visible}
<div class="top-level-extent" id="Top">
<h1 class="top" id="Test-need"><span>Test need<a class="copiable-link"
href="#Test-need"> ¶</a></span></h1>
-<p>@need </p><!-- need: 0.1 on line following (Texinfo|Texinfo) -->
-<p>@need </p><!-- need: 0.1 (Texinfo|Texinfo) -->
+<p>@need </p><!-- need: 0.1 on line following (texinfo|texinfo) -->
+<p>@need </p><!-- need: 0.1 (texinfo|texinfo) -->
</div>
diff --git a/tp/texi2any.pl b/tp/texi2any.pl
index 0474ae8363..d3449a775c 100755
--- a/tp/texi2any.pl
+++ b/tp/texi2any.pl
@@ -269,9 +269,9 @@ if ($configured_version ne $Texinfo::Common::VERSION
}
my $configured_package = '@PACKAGE@';
-$configured_package = 'Texinfo' if ($configured_package eq '@' . 'PACKAGE@');
+$configured_package = 'texinfo' if ($configured_package eq '@' . 'PACKAGE@');
my $configured_name = '@PACKAGE_NAME@';
-$configured_name = $configured_package
+$configured_name = 'GNU Texinfo'
if ($configured_name eq '@' .'PACKAGE_NAME@');
my $configured_name_version = "$configured_name $configured_version";
my $configured_url = '@PACKAGE_URL@';