summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/ChangeLog5
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/patch-02-WIN3213
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/patch-20-TL-binary22
-rw-r--r--Build/source/texk/lcdf-typetools/otftotfm/automatic.cc4
-rw-r--r--Build/source/texk/lcdf-typetools/t1dotlessj/t1dotlessj.cc4
5 files changed, 39 insertions, 9 deletions
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/ChangeLog b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/ChangeLog
index 915f9243c02..70d1f284bf1 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/ChangeLog
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-13 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-02-WIN32: More WIN32.
+ * patch-20-TL-binary: More binary mode for output files.
+
2012-08-11 Peter Breitenlohner <peb@mppmu.mpg.de>
* patch-02-WIN32 (new): Adapt for WIN32.
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/patch-02-WIN32 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/patch-02-WIN32
index 5905e60855f..9f50b9d2da0 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/patch-02-WIN32
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/patch-02-WIN32
@@ -1,13 +1,15 @@
diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.94.orig/otftotfm/automatic.cc lcdf-typetools-2.94/otftotfm/automatic.cc
--- lcdf-typetools-2.94.orig/otftotfm/automatic.cc 2011-11-03 17:51:58.000000000 +0100
+++ lcdf-typetools-2.94/otftotfm/automatic.cc 2012-08-11 17:49:05.000000000 +0200
-@@ -40,6 +40,18 @@
+@@ -40,6 +40,20 @@
#ifdef WIN32
# define mkdir(dir, access) mkdir(dir)
+# define COPY_CMD "copy"
++# define CMD_SEP "&"
+#else
+# define COPY_CMD "cp"
++# define CMD_SEP ";"
+#endif
+
+/* kpathsea may already have defined this */
@@ -20,7 +22,7 @@ diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetoo
#endif
#if HAVE_AUTO_T1DOTLESSJ
-@@ -307,7 +319,11 @@
+@@ -307,7 +321,11 @@
if (!success && writable_texdir.find_left('\'') < 0 && directory.find_left('\'') < 0 && file.find_left('\'') < 0) {
// look for mktexupd script
if (!mktexupd_tried) {
@@ -41,7 +43,12 @@ diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetoo
retval = mysystem(command.c_str(), errh);
if (retval == 127)
errh->error("could not run %<%s%>", command.c_str());
-@@ -731,7 +747,7 @@
+@@ -727,11 +741,11 @@
+ int slash = filename.find_right('\'');
+ if (slash >= 0)
+ filename = filename.substring(slash + 1);
+- String command = "updmap --nomkmap --enable Map " + shell_quote(filename) + "; updmap";
++ String command = "updmap --nomkmap --enable Map " + shell_quote(filename) + CMD_SEP " updmap";
if (verbose)
command += " 1>&2";
else
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/patch-20-TL-binary b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/patch-20-TL-binary
index b921936e5d3..078a4d801d6 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/patch-20-TL-binary
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/patch-20-TL-binary
@@ -12,8 +12,8 @@ diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetoo
}
diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.94.orig/otftotfm/automatic.cc lcdf-typetools-2.94/otftotfm/automatic.cc
--- lcdf-typetools-2.94.orig/otftotfm/automatic.cc 2012-08-11 17:49:05.000000000 +0200
-+++ lcdf-typetools-2.94/otftotfm/automatic.cc 2012-08-11 17:57:54.000000000 +0200
-@@ -309,7 +309,7 @@
++++ lcdf-typetools-2.94/otftotfm/automatic.cc 2012-08-13 13:40:24.000000000 +0200
+@@ -311,7 +311,7 @@
String ls_r = writable_texdir + "ls-R";
bool success = false;
if (access(ls_r.c_str(), R_OK) >= 0) // make sure it already exists
@@ -22,7 +22,7 @@ diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetoo
fprintf(f, "./%s:\n%s\n", directory.c_str(), file.c_str());
success = true;
fclose(f);
-@@ -680,7 +680,7 @@
+@@ -682,7 +682,7 @@
#endif
{
fclose(f);
@@ -52,6 +52,22 @@ diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetoo
fd = fileno(f);
}
+diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.94.orig/t1dotlessj/t1dotlessj.cc lcdf-typetools-2.94/t1dotlessj/t1dotlessj.cc
+--- lcdf-typetools-2.94.orig/t1dotlessj/t1dotlessj.cc 2011-11-03 17:51:58.000000000 +0100
++++ lcdf-typetools-2.94/t1dotlessj/t1dotlessj.cc 2012-08-13 13:25:10.000000000 +0200
+@@ -403,10 +403,10 @@
+ // write it to output
+ if (!outputf)
+ outputf = stdout;
+- if (binary) {
+ #if defined(_MSDOS) || defined(_WIN32)
+- _setmode(_fileno(outputf), _O_BINARY);
++ _setmode(_fileno(outputf), _O_BINARY);
+ #endif
++ if (binary) {
+ Type1PFBWriter w(outputf);
+ dotless_font->write(w);
+ } else {
diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.94.orig/t1rawafm/t1rawafm.cc lcdf-typetools-2.94/t1rawafm/t1rawafm.cc
--- lcdf-typetools-2.94.orig/t1rawafm/t1rawafm.cc 2011-11-03 17:51:58.000000000 +0100
+++ lcdf-typetools-2.94/t1rawafm/t1rawafm.cc 2012-08-11 16:01:57.000000000 +0200
diff --git a/Build/source/texk/lcdf-typetools/otftotfm/automatic.cc b/Build/source/texk/lcdf-typetools/otftotfm/automatic.cc
index 585dc69ec70..f6222122c93 100644
--- a/Build/source/texk/lcdf-typetools/otftotfm/automatic.cc
+++ b/Build/source/texk/lcdf-typetools/otftotfm/automatic.cc
@@ -41,8 +41,10 @@
#ifdef WIN32
# define mkdir(dir, access) mkdir(dir)
# define COPY_CMD "copy"
+# define CMD_SEP "&"
#else
# define COPY_CMD "cp"
+# define CMD_SEP ";"
#endif
/* kpathsea may already have defined this */
@@ -743,7 +745,7 @@ update_autofont_map(const String &fontname, String mapline, ErrorHandler *errh)
int slash = filename.find_right('\'');
if (slash >= 0)
filename = filename.substring(slash + 1);
- String command = "updmap --nomkmap --enable Map " + shell_quote(filename) + "; updmap";
+ String command = "updmap --nomkmap --enable Map " + shell_quote(filename) + CMD_SEP " updmap";
if (verbose)
command += " 1>&2";
else
diff --git a/Build/source/texk/lcdf-typetools/t1dotlessj/t1dotlessj.cc b/Build/source/texk/lcdf-typetools/t1dotlessj/t1dotlessj.cc
index 86d708f6ed7..67c752b70cc 100644
--- a/Build/source/texk/lcdf-typetools/t1dotlessj/t1dotlessj.cc
+++ b/Build/source/texk/lcdf-typetools/t1dotlessj/t1dotlessj.cc
@@ -403,10 +403,10 @@ particular purpose.\n");
// write it to output
if (!outputf)
outputf = stdout;
- if (binary) {
#if defined(_MSDOS) || defined(_WIN32)
- _setmode(_fileno(outputf), _O_BINARY);
+ _setmode(_fileno(outputf), _O_BINARY);
#endif
+ if (binary) {
Type1PFBWriter w(outputf);
dotless_font->write(w);
} else {