summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/web2c/ChangeLog5
-rw-r--r--Build/source/texk/web2c/lib/ChangeLog6
-rw-r--r--Build/source/texk/web2c/lib/texmfmp.c8
-rw-r--r--Build/source/texk/web2c/texmfmp-help.h6
4 files changed, 18 insertions, 7 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index 063a1e429e1..97ed7ab8c10 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-11 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
+ * texmfmp-help.h: The option -kanji-internal=STRING is effective
+ also for pTeX and epTeX.
+
2011-08-29 Peter Breitenlohner <peb@mp.mpg.de>
* texmfmp.h [WIN32]: Allow to build TeX & Co as DLL.
diff --git a/Build/source/texk/web2c/lib/ChangeLog b/Build/source/texk/web2c/lib/ChangeLog
index 7ccfb34a10d..749cf1909e5 100644
--- a/Build/source/texk/web2c/lib/ChangeLog
+++ b/Build/source/texk/web2c/lib/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-11 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
+ * texmfmp.c: Disable options -translate-file, -default-translate-file,
+ and -8bit for Aleph. The option -kanji-internal=STRING is effective
+ also for pTeX and epTeX.
+
2011-09-02 Peter Breitenlohner <peb@mp.mpg.de>
* texmfmp.c: More changes to reduce diffs with W32TeX.
diff --git a/Build/source/texk/web2c/lib/texmfmp.c b/Build/source/texk/web2c/lib/texmfmp.c
index b5909e0501c..e61ce728cd9 100644
--- a/Build/source/texk/web2c/lib/texmfmp.c
+++ b/Build/source/texk/web2c/lib/texmfmp.c
@@ -1416,9 +1416,11 @@ static struct option long_options[]
{ "output-directory", 1, 0, 0 },
{ "parse-first-line", 0, &parsefirstlinep, 1 },
{ "no-parse-first-line", 0, &parsefirstlinep, -1 },
+#if !defined(Aleph)
{ "translate-file", 1, 0, 0 },
{ "default-translate-file", 1, 0, 0 },
{ "8bit", 0, &eightbitp, 1 },
+#endif /* !Aleph */
#if defined(XeTeX)
{ "no-pdf", 0, &nopdfoutput, 1 },
{ "output-driver", 1, 0, 0 },
@@ -1434,8 +1436,6 @@ static struct option long_options[]
{ "no-guess-input-enc", 0, &infile_enc_auto, 0 },
#endif
{ "kanji", 1, 0, 0 },
-#endif
-#if IS_upTeX
{ "kanji-internal", 1, 0, 0 },
#endif
{ 0, 0, 0, 0 } };
@@ -1557,11 +1557,11 @@ parse_options (int argc, string *argv)
pdfdraftmodevalue = 1;
#endif /* pdfTeX */
#if defined (TeX) || defined (MF)
+#if !defined(Aleph)
} else if (ARGUMENT_IS ("translate-file")) {
translate_filename = optarg;
} else if (ARGUMENT_IS ("default-translate-file")) {
default_translate_filename = optarg;
-#if defined(Aleph)
} else if (ARGUMENT_IS ("8bit")) {
/* FIXME: print snippy message? Possibly also for above? */
#endif /* !Aleph */
@@ -1589,8 +1589,6 @@ parse_options (int argc, string *argv)
if (!set_enc_string (optarg, NULL)) {
WARNING1 ("Ignoring unknown argument `%s' to --kanji", optarg);
}
-#endif
-#if IS_upTeX
} else if (ARGUMENT_IS ("kanji-internal")) {
if (!set_enc_string (NULL, optarg)) {
WARNING1 ("Ignoring unknown argument `%s' to --kanji-internal", optarg);
diff --git a/Build/source/texk/web2c/texmfmp-help.h b/Build/source/texk/web2c/texmfmp-help.h
index 59d18e14a7d..b2699cb2cc5 100644
--- a/Build/source/texk/web2c/texmfmp-help.h
+++ b/Build/source/texk/web2c/texmfmp-help.h
@@ -112,6 +112,7 @@ const_string EPTEXHELP[] = {
#endif /* IPC */
"-jobname=STRING set the job name to STRING",
"-kanji=STRING set Japanese encoding (STRING=euc|jis|sjis|utf8)",
+ "-kanji-internal=STRING set Japanese internal encoding (STRING=euc|sjis)",
"-kpathsea-debug=NUMBER set path searching debugging flags according to",
" the bits of NUMBER",
"[-no]-mktex=FMT disable/enable mktexFMT generation (FMT=tex/tfm)",
@@ -239,7 +240,7 @@ const_string EUPTEXHELP[] = {
#endif /* IPC */
"-jobname=STRING set the job name to STRING",
"-kanji=STRING set Japanese encoding (STRING=euc|jis|sjis|utf8|uptex)",
- "-kanji-internal=STRING set Japanese internal encoding",
+ "-kanji-internal=STRING set Japanese internal encoding (STRING=euc|sjis|uptex)",
"-kpathsea-debug=NUMBER set path searching debugging flags according to",
" the bits of NUMBER",
"[-no]-mktex=FMT disable/enable mktexFMT generation (FMT=tex/tfm)",
@@ -414,6 +415,7 @@ const_string PTEXHELP[] = {
#endif /* IPC */
"-jobname=STRING set the job name to STRING",
"-kanji=STRING set Japanese encoding (STRING=euc|jis|sjis|utf8)",
+ "-kanji-internal=STRING set Japanese internal encoding (STRING=euc|sjis)",
"-kpathsea-debug=NUMBER set path searching debugging flags according to",
" the bits of NUMBER",
"[-no]-mktex=FMT disable/enable mktexFMT generation (FMT=tex/tfm)",
@@ -539,7 +541,7 @@ const_string UPTEXHELP[] = {
#endif /* IPC */
"-jobname=STRING set the job name to STRING",
"-kanji=STRING set Japanese encoding (STRING=euc|jis|sjis|utf8|uptex)",
- "-kanji-internal=STRING set Japanese internal encoding",
+ "-kanji-internal=STRING set Japanese internal encoding (STRING=euc|sjis|uptex)",
"-kpathsea-debug=NUMBER set path searching debugging flags according to",
" the bits of NUMBER",
"[-no]-mktex=FMT disable/enable mktexFMT generation (FMT=tex/tfm)",