summaryrefslogtreecommitdiff
path: root/Build/source/texk/lcdf-typetools
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2019-01-30 22:10:46 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2019-01-30 22:10:46 +0000
commit56024c9972d18c28ea75874262e2ed510c7bff1f (patch)
treeb6fbc31f495f447eb656cd3a07c5bd3cc5d13e02 /Build/source/texk/lcdf-typetools
parent8b9628a6ce655ac1a3883973ae993ae431cd6641 (diff)
remove wrong changes
git-svn-id: svn://tug.org/texlive/trunk@49873 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/lcdf-typetools')
-rw-r--r--Build/source/texk/lcdf-typetools/ChangeLog2
-rw-r--r--Build/source/texk/lcdf-typetools/TLpatches/ChangeLog6
-rw-r--r--Build/source/texk/lcdf-typetools/TLpatches/patch-03-w3239
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/automatic.cc13
4 files changed, 18 insertions, 42 deletions
diff --git a/Build/source/texk/lcdf-typetools/ChangeLog b/Build/source/texk/lcdf-typetools/ChangeLog
index 9d36d197d09..b846e857844 100644
--- a/Build/source/texk/lcdf-typetools/ChangeLog
+++ b/Build/source/texk/lcdf-typetools/ChangeLog
@@ -1,4 +1,4 @@
-2019-01-28 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+2019-01-28 Akira Kakuto <kakuto@w32tex.org>
Import lcdf-typetools-2.108.
* version.ac: Adapted.
diff --git a/Build/source/texk/lcdf-typetools/TLpatches/ChangeLog b/Build/source/texk/lcdf-typetools/TLpatches/ChangeLog
index ab0096ba7cd..a626ca3bda3 100644
--- a/Build/source/texk/lcdf-typetools/TLpatches/ChangeLog
+++ b/Build/source/texk/lcdf-typetools/TLpatches/ChangeLog
@@ -1,4 +1,8 @@
-2019-01-28 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+2019-01-30 Akira Kakuto <kakuto@w32tex.org>
+
+ * patch-03-w32: Remove wrong changes.
+
+2019-01-28 Akira Kakuto <kakuto@w32tex.org>
Import lcdf-typetools-2.108.
* patch-02-mingw64, patch-03-w32: Adapted.
diff --git a/Build/source/texk/lcdf-typetools/TLpatches/patch-03-w32 b/Build/source/texk/lcdf-typetools/TLpatches/patch-03-w32
index 4511911edda..e01b835b9db 100644
--- a/Build/source/texk/lcdf-typetools/TLpatches/patch-03-w32
+++ b/Build/source/texk/lcdf-typetools/TLpatches/patch-03-w32
@@ -1,6 +1,6 @@
diff -ur lcdf-typetools-2.108/liblcdf/filename.cc lcdf-typetools-src/liblcdf/filename.cc
--- lcdf-typetools-2.108/liblcdf/filename.cc Mon Jan 28 03:39:19 2019
-+++ lcdf-typetools-src/liblcdf/filename.cc Mon Jan 28 08:02:02 2019
++++ lcdf-typetools-src/liblcdf/filename.cc Thu Jan 31 06:16:24 2019
@@ -126,5 +126,5 @@
if (_actual || !_path)
return _actual;
@@ -10,7 +10,7 @@ diff -ur lcdf-typetools-2.108/liblcdf/filename.cc lcdf-typetools-src/liblcdf/fil
}
diff -ur lcdf-typetools-2.108/otftotfm/automatic.cc lcdf-typetools-src/otftotfm/automatic.cc
--- lcdf-typetools-2.108/otftotfm/automatic.cc Mon Jan 28 03:39:20 2019
-+++ lcdf-typetools-src/otftotfm/automatic.cc Mon Jan 28 08:19:16 2019
++++ lcdf-typetools-src/otftotfm/automatic.cc Thu Jan 31 06:35:14 2019
@@ -39,7 +39,9 @@
#include <algorithm>
@@ -55,7 +55,7 @@ diff -ur lcdf-typetools-2.108/otftotfm/automatic.cc lcdf-typetools-src/otftotfm/
// look for mktexupd script
if (!mktexupd_tried) {
+#ifdef _WIN32
-+ mktexupd = "mktexupd";
++ mktexupd = "mktexupd.exe";
+#else
mktexupd = kpsei_string(kpsei_find_file("mktexupd", KPSEI_FMT_WEB2C));
+#endif
@@ -71,27 +71,9 @@ diff -ur lcdf-typetools-2.108/otftotfm/automatic.cc lcdf-typetools-src/otftotfm/
fd = fileno(f);
}
-@@ -746,7 +763,16 @@
- if (slash >= 0)
- filename = filename.substring(slash + 1);
- String redirect = verbose ? " 1>&2" : " >" DEV_NULL " 2>&1";
-- String command = updmap_prog + " --nomkmap --enable Map " + shell_quote(filename) + redirect
-+#if defined(W32TEX)
-+// jtex_filetype is defined only in W32TeX
-+ char *p = kpsei_var_value("jtex_filetype");
-+ if (p != NULL) { // W32TeX
-+ free(p);
-+ String option = "--add ";
-+ } else // TeXLive
-+#endif
-+ String option = "--enable Map ";
-+ String command = "updmap --nomkmap " + option + shell_quote(filename) + redirect
- + CMD_SEP " " + updmap_prog + redirect;
- int retval = mysystem(command.c_str(), errh);
- if (retval == 127)
diff -ur lcdf-typetools-2.108/otftotfm/kpseinterface.c lcdf-typetools-src/otftotfm/kpseinterface.c
--- lcdf-typetools-2.108/otftotfm/kpseinterface.c Mon Jan 28 03:39:20 2019
-+++ lcdf-typetools-src/otftotfm/kpseinterface.c Mon Jan 28 08:21:16 2019
++++ lcdf-typetools-src/otftotfm/kpseinterface.c Thu Jan 31 06:37:34 2019
@@ -21,6 +21,9 @@
#include <kpathsea/expand.h>
#include <kpathsea/c-pathch.h>
@@ -116,7 +98,7 @@ diff -ur lcdf-typetools-2.108/otftotfm/kpseinterface.c lcdf-typetools-src/otftot
+#endif
diff -ur lcdf-typetools-2.108/otftotfm/kpseinterface.h lcdf-typetools-src/otftotfm/kpseinterface.h
--- lcdf-typetools-2.108/otftotfm/kpseinterface.h Thu Jun 23 21:25:52 2016
-+++ lcdf-typetools-src/otftotfm/kpseinterface.h Mon Jan 28 08:22:18 2019
++++ lcdf-typetools-src/otftotfm/kpseinterface.h Thu Jan 31 06:38:40 2019
@@ -13,6 +13,10 @@
char* kpsei_find_file(const char* name, int format);
void kpsei_set_debug_flags(unsigned flags);
@@ -130,7 +112,7 @@ diff -ur lcdf-typetools-2.108/otftotfm/kpseinterface.h lcdf-typetools-src/otftot
#endif
diff -ur lcdf-typetools-2.108/otftotfm/otftotfm.cc lcdf-typetools-src/otftotfm/otftotfm.cc
--- lcdf-typetools-2.108/otftotfm/otftotfm.cc Mon Jan 28 03:39:20 2019
-+++ lcdf-typetools-src/otftotfm/otftotfm.cc Mon Jan 28 08:25:14 2019
++++ lcdf-typetools-src/otftotfm/otftotfm.cc Thu Jan 31 06:40:59 2019
@@ -63,6 +63,9 @@
#ifdef HAVE_FCNTL_H
# include <fcntl.h>
@@ -161,7 +143,7 @@ diff -ur lcdf-typetools-2.108/otftotfm/otftotfm.cc lcdf-typetools-src/otftotfm/o
diff -ur lcdf-typetools-2.108/t1dotlessj/t1dotlessj.cc lcdf-typetools-src/t1dotlessj/t1dotlessj.cc
--- lcdf-typetools-2.108/t1dotlessj/t1dotlessj.cc Mon Jan 28 03:39:20 2019
-+++ lcdf-typetools-src/t1dotlessj/t1dotlessj.cc Mon Jan 28 08:29:20 2019
++++ lcdf-typetools-src/t1dotlessj/t1dotlessj.cc Thu Jan 31 06:43:35 2019
@@ -410,10 +410,10 @@
// write it to output
if (!outputf)
@@ -177,7 +159,7 @@ diff -ur lcdf-typetools-2.108/t1dotlessj/t1dotlessj.cc lcdf-typetools-src/t1dotl
} else {
diff -ur lcdf-typetools-2.108/t1rawafm/t1rawafm.cc lcdf-typetools-src/t1rawafm/t1rawafm.cc
--- lcdf-typetools-2.108/t1rawafm/t1rawafm.cc Mon Jan 28 03:39:20 2019
-+++ lcdf-typetools-src/t1rawafm/t1rawafm.cc Mon Jan 28 08:30:38 2019
++++ lcdf-typetools-src/t1rawafm/t1rawafm.cc Thu Jan 31 06:44:47 2019
@@ -359,6 +359,9 @@
if (!outf)
errh->fatal("%s: %s", output_file, strerror(errno));
@@ -190,7 +172,7 @@ diff -ur lcdf-typetools-2.108/t1rawafm/t1rawafm.cc lcdf-typetools-src/t1rawafm/t
diff -ur lcdf-typetools-2.108/t1reencode/t1reencode.cc lcdf-typetools-src/t1reencode/t1reencode.cc
--- lcdf-typetools-2.108/t1reencode/t1reencode.cc Mon Jan 28 03:39:20 2019
-+++ lcdf-typetools-src/t1reencode/t1reencode.cc Mon Jan 28 08:32:09 2019
++++ lcdf-typetools-src/t1reencode/t1reencode.cc Thu Jan 31 06:46:38 2019
@@ -1094,10 +1094,10 @@
if (!outf)
errh->fatal("%s: %s", output_file, strerror(errno));
@@ -206,7 +188,7 @@ diff -ur lcdf-typetools-2.108/t1reencode/t1reencode.cc lcdf-typetools-src/t1reen
} else {
diff -ur lcdf-typetools-2.108/t1testpage/t1testpage.cc lcdf-typetools-src/t1testpage/t1testpage.cc
--- lcdf-typetools-2.108/t1testpage/t1testpage.cc Mon Jan 28 03:39:20 2019
-+++ lcdf-typetools-src/t1testpage/t1testpage.cc Mon Jan 28 08:33:12 2019
++++ lcdf-typetools-src/t1testpage/t1testpage.cc Thu Jan 31 06:47:51 2019
@@ -665,6 +665,9 @@
if (!outf)
errh->fatal("%s: %s", output_file, strerror(errno));
@@ -216,4 +198,3 @@ diff -ur lcdf-typetools-2.108/t1testpage/t1testpage.cc lcdf-typetools-src/t1test
+#endif
//font->undo_synthetic();
-
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/automatic.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/automatic.cc
index f0722f99e40..0567de51e2c 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/automatic.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-src/otftotfm/automatic.cc
@@ -337,7 +337,7 @@ update_odir(int o, String file, ErrorHandler *errh)
// look for mktexupd script
if (!mktexupd_tried) {
#ifdef _WIN32
- mktexupd = "mktexupd";
+ mktexupd = "mktexupd.exe";
#else
mktexupd = kpsei_string(kpsei_find_file("mktexupd", KPSEI_FMT_WEB2C));
#endif
@@ -763,16 +763,7 @@ update_autofont_map(const String &fontname, String mapline, ErrorHandler *errh)
if (slash >= 0)
filename = filename.substring(slash + 1);
String redirect = verbose ? " 1>&2" : " >" DEV_NULL " 2>&1";
-#if defined(W32TEX)
-// jtex_filetype is defined only in W32TeX
- char *p = kpsei_var_value("jtex_filetype");
- if (p != NULL) { // W32TeX
- free(p);
- String option = "--add ";
- } else // TeXLive
-#endif
- String option = "--enable Map ";
- String command = "updmap --nomkmap " + option + shell_quote(filename) + redirect
+ String command = updmap_prog + " --nomkmap --enable Map " + shell_quote(filename) + redirect
+ CMD_SEP " " + updmap_prog + redirect;
int retval = mysystem(command.c_str(), errh);
if (retval == 127)