diff options
| author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2012-10-20 13:00:56 +0000 |
|---|---|---|
| committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2012-10-20 13:00:56 +0000 |
| commit | 5ffb4c20aaabde2cc7f9444eda638193c26cc8e1 (patch) | |
| tree | 3a6d7c102560c30be129d8db64db83827b7df7b7 | |
| parent | e81822dc091941177017de9429c55d87e83f2a0d (diff) | |
use a variable jtex_filetype to distinguish TeX Live and W32TeX
git-svn-id: svn://tug.org/texlive/trunk@28037 c570f23f-e606-0410-a88d-b1316a301751
4 files changed, 16 insertions, 4 deletions
diff --git a/Build/source/texk/lcdf-typetools/ChangeLog b/Build/source/texk/lcdf-typetools/ChangeLog index 289fb15201e..25e116b72ec 100644 --- a/Build/source/texk/lcdf-typetools/ChangeLog +++ b/Build/source/texk/lcdf-typetools/ChangeLog @@ -1,3 +1,10 @@ +2012-10-20 Akira Kakuto <kakuto@fuk.kindai.ac.jp> + + * lcdf-typetools-2.95-PATHES/patch-30-W32TeX: + * lcdf-typetools-2.95/otftotfm/automatic.cc: + use a texmf.cnf variable jtex_filetype to distinguish TeX Live and + W32TeX. + 2012-09-25 Peter Breitenlohner <peb@mppmu.mpg.de> Import lcdf-typetools-2.95, now into subdirectory. diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95-PATCHES/ChangeLog b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95-PATCHES/ChangeLog index 6dc05863688..451596a2009 100644 --- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95-PATCHES/ChangeLog +++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95-PATCHES/ChangeLog @@ -1,3 +1,8 @@ +2012-10-20 Akira Kakuto <kakuto@fuk.kindai.ac.jp> + + * patch-30-W32TeX: use a texmf.cnf variable jtex_filetype to distinguish + TeX Live and W32TeX. + 2012-09-25 Peter Breitenlohner <peb@mppmu.mpg.de> Import lcdf-typetools-2.95. diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95-PATCHES/patch-30-W32TeX b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95-PATCHES/patch-30-W32TeX index c40f07620e4..6fd75d133b8 100644 --- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95-PATCHES/patch-30-W32TeX +++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95-PATCHES/patch-30-W32TeX @@ -25,8 +25,8 @@ diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetoo if (slash >= 0) filename = filename.substring(slash + 1); +#if defined(W32TEX) -+// guess_input_kanji_encoding is defined only in W32TeX -+ char *p = kpsei_var_value("guess_input_kanji_encoding"); ++// jtex_filetype is defined only in W32TeX ++ char *p = kpsei_var_value("jtex_filetype"); + if (p != NULL) { // W32TeX + free(p); + String command = "updmap --nomkmap --add " + shell_quote(filename) + CMD_SEP " updmap"; diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/automatic.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/automatic.cc index df3268f0c1e..b42e6734d36 100644 --- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/automatic.cc +++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.95/otftotfm/automatic.cc @@ -757,8 +757,8 @@ update_autofont_map(const String &fontname, String mapline, ErrorHandler *errh) if (slash >= 0) filename = filename.substring(slash + 1); #if defined(W32TEX) -// guess_input_kanji_encoding is defined only in W32TeX - char *p = kpsei_var_value("guess_input_kanji_encoding"); +// jtex_filetype is defined only in W32TeX + char *p = kpsei_var_value("jtex_filetype"); if (p != NULL) { // W32TeX free(p); String command = "updmap --nomkmap --add " + shell_quote(filename) + CMD_SEP " updmap"; |