summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/kpathsea/ChangeLog9
-rw-r--r--Build/source/texk/kpathsea/texmf.cnf6
2 files changed, 13 insertions, 2 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 9c623337c8b..1810652e8d8 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,13 +1,20 @@
+2013-06-25 Karl Berry <karl@tug.org>
+
+ * texmf.cnf (guess_input_kanji_encoding): config variable,
+ off by default. Per Akira.
+
2013-06-25 Peter Breitenlohner <peb@mppmu.mpg.de>
* config.h: Remove definition of EXEEXT, comes from c-auto.h.
2013-06-25 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+ * config.h: define EXEEXT if DOSISH is defined.
+
* win32lib.c: Unify two win32lib.c's in w32 sources.
+
* progname.c, texmf.cnf: Define SELFAUTOGRANDPARENT to give a
robust TEXMFLOCAL.
- * config.h: define EXEEXT if DOSISH is defined.
2013-06-16 Peter Breitenlohner <peb@mppmu.mpg.de>
diff --git a/Build/source/texk/kpathsea/texmf.cnf b/Build/source/texk/kpathsea/texmf.cnf
index 36227bb14f8..84009f51a45 100644
--- a/Build/source/texk/kpathsea/texmf.cnf
+++ b/Build/source/texk/kpathsea/texmf.cnf
@@ -672,7 +672,7 @@ BIBTEX_CSFILE = 88591lat.csf
%TEXLIVE_WINDOWS_TRY_EXTERNAL_PERL = 0
-% Part 3: Array and other sizes for TeX (and Metafont).
+% Part 3: Array and other sizes for TeX, Metafont, etc.
%
% If you want to change some of these sizes only for a certain TeX
% variant, the usual dot notation works, e.g.,
@@ -780,3 +780,7 @@ max_strings.pbibtex = 35307
line_length.gftype = 500
max_rows.gftype = 8191
max_cols.gftype = 8191
+
+% Guess input encoding (SJIS vs. Unicode, etc.) in pTeX and friends?
+% Default is 0, to not guess.
+guess_input_kanji_encoding = 0