summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/web2c/ctangleboot.cin2
-rw-r--r--Build/source/texk/web2c/cwebboot.cin5
-rw-r--r--Build/source/texk/web2c/cwebdir/ChangeLog6
-rw-r--r--Build/source/texk/web2c/cwebdir/comm-w2c.ch12
-rw-r--r--Build/source/texk/web2c/cwebdir/ctang-w2c.ch2
-rw-r--r--Build/source/texk/web2c/cwebdir/ctwill-w2c.ch2
-rw-r--r--Build/source/texk/web2c/cwebdir/cweav-w2c.ch2
7 files changed, 20 insertions, 11 deletions
diff --git a/Build/source/texk/web2c/ctangleboot.cin b/Build/source/texk/web2c/ctangleboot.cin
index ed118418a3f..267be8fc151 100644
--- a/Build/source/texk/web2c/ctangleboot.cin
+++ b/Build/source/texk/web2c/ctangleboot.cin
@@ -33,7 +33,7 @@
/*:62*/
#line 65 "cwebdir/ctangle.w"
-#define banner _("This is CTANGLE, Version 3.64") \
+#define banner "This is CTANGLE, Version 3.64" \
\
#define max_bytes 1000000 \
diff --git a/Build/source/texk/web2c/cwebboot.cin b/Build/source/texk/web2c/cwebboot.cin
index bce9b6de131..e0487f3254b 100644
--- a/Build/source/texk/web2c/cwebboot.cin
+++ b/Build/source/texk/web2c/cwebboot.cin
@@ -59,6 +59,9 @@ typedef bool boolean;
#define CWEB
#include "help.h"
+
+
+
/*:90*/
#line 59 "cwebdir/common.w"
@@ -1641,7 +1644,7 @@ void cb_show_banner(void)
assert(cb_banner[0]!='\0');
textdomain("cweb-tl");
-printf("%s%s\n",cb_banner,versionstring);
+printf("%s%s\n",_(cb_banner),versionstring);
textdomain("cweb");
}
diff --git a/Build/source/texk/web2c/cwebdir/ChangeLog b/Build/source/texk/web2c/cwebdir/ChangeLog
index f1c7fc207ca..1e6dbd622a3 100644
--- a/Build/source/texk/web2c/cwebdir/ChangeLog
+++ b/Build/source/texk/web2c/cwebdir/ChangeLog
@@ -1,3 +1,9 @@
+2019-01-17 Andreas Scherer <https://ascherer.github.io>
+
+ * comm-w2c.ch, comm-w2c.h,
+ * ctang-w2c.ch, ctwill-w2c.ch, cweav-w2c.ch:
+ Translate 'banner' if HAVE_GETTEXT set and cweb-tl.mo available.
+
2019-01-16 Andreas Scherer <https://ascherer.github.io>
* comm-w2c.ch: Correct usage of 'kpse_var_expand';
diff --git a/Build/source/texk/web2c/cwebdir/comm-w2c.ch b/Build/source/texk/web2c/cwebdir/comm-w2c.ch
index 2c195b66ac5..fa44e8ab8f8 100644
--- a/Build/source/texk/web2c/cwebdir/comm-w2c.ch
+++ b/Build/source/texk/web2c/cwebdir/comm-w2c.ch
@@ -1246,7 +1246,7 @@ setlocale(LC_MESSAGES, setlocale(LC_CTYPE, ""));
texmf_locale = kpse_var_expand (TEXMF_LOCALE);
bindtextdomain("cweb",
bindtextdomain("cweb-tl",
- bindtextdomain("web2c-help",
+ bindtextdomain("web2c-help", @|
strcmp(texmf_locale, TEXMF_LOCALE) ?
texmf_locale : "/usr/share/locale")));
free(texmf_locale);
@@ -1283,16 +1283,16 @@ typedef bool boolean;
#define CWEB
#include "help.h"
-@ The simple file searching is replaced by the ``path searching'' mechanism
-that the \Kpathsea/ library provides.
+@q The simple file searching is replaced by the ``path searching'' mechanism @>
+@q that the \Kpathsea/ library provides.@>
-We set |kpse_program_name| to `\.{cweb}'. This means if the variable
+@ We set |kpse_program_name| to `\.{cweb}'. This means if the variable
\.{CWEBINPUTS.cweb} is present in \.{texmf.cnf} (or \.{CWEBINPUTS\_cweb}
in the environment) its value will be used as the search path for
filenames. This allows different flavors of \.{CWEB} to have
different search paths.
-\&{FIXME}: Not sure this is the best way to go about this.
+@q \&{FIXME}: Not sure this is the best way to go about this. @>
@<Set up |PROGNAME| feature and initialize the search path mechanism@>=
kpse_set_program_name(argv[0], "cweb");
@@ -1342,7 +1342,7 @@ void cb_show_banner (void)
assert(cb_banner[0]!='\0');
textdomain("cweb-tl");
@.cweb-tl.mo@>
- printf("%s%s\n", cb_banner, versionstring);
+ printf("%s%s\n", _(cb_banner), versionstring);
textdomain("cweb");
@.cweb.mo@>
}
diff --git a/Build/source/texk/web2c/cwebdir/ctang-w2c.ch b/Build/source/texk/web2c/cwebdir/ctang-w2c.ch
index 755020f2613..c525c88bd37 100644
--- a/Build/source/texk/web2c/cwebdir/ctang-w2c.ch
+++ b/Build/source/texk/web2c/cwebdir/ctang-w2c.ch
@@ -35,7 +35,7 @@
@x
@d banner "This is CTANGLE (Version 3.64)\n"
@y
-@d banner _("This is CTANGLE, Version 3.64")
+@d banner "This is CTANGLE, Version 3.64"
/* will be extended by the \TeX~Live |versionstring| */
@z
diff --git a/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch b/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch
index 30d5671bf3a..edca3c31bcc 100644
--- a/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch
+++ b/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch
@@ -93,7 +93,7 @@ reprinted in {\sl Digital Typography\/} (1999), 225--245.
The ``banner line'' defined here should be changed whenever \.{CTWILL} is
modified. The version number parallels the corresponding version of \.{CWEAVE}.
-@d banner _("This is CTWILL, Version 3.64")
+@d banner "This is CTWILL, Version 3.64"
/* will be extended by the \TeX~Live |versionstring| */
@z
diff --git a/Build/source/texk/web2c/cwebdir/cweav-w2c.ch b/Build/source/texk/web2c/cwebdir/cweav-w2c.ch
index 6ec384d0491..795b5fcb6db 100644
--- a/Build/source/texk/web2c/cwebdir/cweav-w2c.ch
+++ b/Build/source/texk/web2c/cwebdir/cweav-w2c.ch
@@ -35,7 +35,7 @@
@x
@d banner "This is CWEAVE (Version 3.64)\n"
@y
-@d banner _("This is CWEAVE, Version 3.64")
+@d banner "This is CWEAVE, Version 3.64"
/* will be extended by the \TeX~Live |versionstring| */
@z