[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
From: |
Patrice Dumas |
Date: |
Tue, 24 Dec 2024 16:06:41 -0500 (EST) |
branch: master
commit 85896e869df19e0f9cf46e2df873d6bf01d99b58
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Tue Dec 24 22:05:40 2024 +0100
* tp/Texinfo/XS/texi2any.c, tp/Texinfo/XS/Makefile.am
(teximakehtml_SOURCES, ctexi2any_SOURCES): rename teximakehtml.c as
texi2any.c.
* tp/texi2any.pl: remove end of line from translated string.
* tp/Texinfo/XS/texi2any.c (main): use the leading message of
texi2any.pl.
---
ChangeLog | 11 +++++++++++
tp/Texinfo/XS/Makefile.am | 4 ++--
tp/Texinfo/XS/{teximakehtml.c => texi2any.c} | 13 ++++++++++---
tp/texi2any.pl | 2 +-
4 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 01401dea62..b171848d57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2024-12-24 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/XS/texi2any.c, tp/Texinfo/XS/Makefile.am
+ (teximakehtml_SOURCES, ctexi2any_SOURCES): rename teximakehtml.c as
+ texi2any.c.
+
+ * tp/texi2any.pl: remove end of line from translated string.
+
+ * tp/Texinfo/XS/texi2any.c (main): use the leading message of
+ texi2any.pl.
+
2024-12-24 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/XS/teximakehtml.c (formats_table, long_options)
diff --git a/tp/Texinfo/XS/Makefile.am b/tp/Texinfo/XS/Makefile.am
index 187d022add..020ee45053 100644
--- a/tp/Texinfo/XS/Makefile.am
+++ b/tp/Texinfo/XS/Makefile.am
@@ -616,7 +616,7 @@ endif
teximakehtml_SOURCES = \
$(C_libtexinfo_sources) \
$(C_libtexinfo_convert_sources) \
- teximakehtml.c \
+ texi2any.c \
main/replace_perl_api_call.c \
convert/replace_perl_call_html_function.c \
convert/replace_call_conversion_perl.c
@@ -636,7 +636,7 @@ endif
endif
ctexi2any_SOURCES = \
- teximakehtml.c
+ texi2any.c
# NOTE PERL_LIBS is needed on GNU/Linux too, but see just below ExtUtils::Embed
# should be used
diff --git a/tp/Texinfo/XS/teximakehtml.c b/tp/Texinfo/XS/texi2any.c
similarity index 99%
rename from tp/Texinfo/XS/teximakehtml.c
rename to tp/Texinfo/XS/texi2any.c
index 90863c1f2b..ba94731e6b 100644
--- a/tp/Texinfo/XS/teximakehtml.c
+++ b/tp/Texinfo/XS/texi2any.c
@@ -1,4 +1,4 @@
-/* teximakehtml.c -- conversion of Texinfo to HTML
+/* texi2any.c -- conversion of Texinfo
Copyright 2010-2024 Free Software Foundation, Inc.
@@ -1589,8 +1589,15 @@ main (int argc, char *argv[], char *env[])
_("Usage: %s [OPTION]... TEXINFO-FILE..."), program_file);
text_append_n (&help_message, "\n\n", 2);
/* no added translations, reuse translations with they already exist */
- text_append (&help_message,
- "Translate Texinfo source documentation to various other formats.\n\n");
+ if (default_is_html)
+ text_append (&help_message,
+ "Translate Texinfo source documentation to various other formats.");
+ else
+ /* lie on the name, but this is no such a big lie */
+ text_append (&help_message,
+ _("Translate Texinfo source documentation to various other formats, by
default\nInfo files suitable for reading online with Emacs or standalone GNU
Info.\n\nThis program is commonly installed as both `makeinfo' and
`texi2any';\nthe behavior is identical, and does not depend on the installed
name."));
+ text_append_n (&help_message, "\n\n", 2);
+
text_append (&help_message, _("General options:"));
text_append_n (&help_message, "\n", 1);
text_append (&help_message,
diff --git a/tp/texi2any.pl b/tp/texi2any.pl
index 3d22fd35b2..e0f3ec9dfe 100755
--- a/tp/texi2any.pl
+++ b/tp/texi2any.pl
@@ -979,7 +979,7 @@ __("Translate Texinfo source documentation to various other
formats, by default
Info files suitable for reading online with Emacs or standalone GNU Info.
This program is commonly installed as both `makeinfo' and `texi2any';
-the behavior is identical, and does not depend on the installed name.\n")
+the behavior is identical, and does not depend on the installed name.")."\n"
."\n";
$makeinfo_help .= __("General options:")."\n"
.__(" --document-language=STR locale to use in translating Texinfo
keywords