summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-05-06 08:36:50 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-05-06 08:36:50 +0000
commit8d0b4468c07b64f83f7ccc240ec9ee2fd6766fc0 (patch)
tree5fb3e453dd3db6c405ff3c2bbd36ed53c366366e /Build
parente32c88ce7825f06c60d6979514ed58eb9d52ad1f (diff)
kpathsea: win32lib.[ch]: Copyright 2012
git-svn-id: svn://tug.org/texlive/trunk@26227 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/dvipdfmx/dvipdfmx-20120420-PATCHES/ChangeLog5
-rw-r--r--Build/source/texk/dvipdfmx/dvipdfmx-20120420-PATCHES/patch-04-pdftex_map37
-rw-r--r--Build/source/texk/dvipdfmx/dvipdfmx-20120420/ChangeLog3
-rw-r--r--Build/source/texk/kpathsea/ChangeLog4
-rw-r--r--Build/source/texk/kpathsea/win32lib.c4
-rw-r--r--Build/source/texk/kpathsea/win32lib.h4
6 files changed, 50 insertions, 7 deletions
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20120420-PATCHES/ChangeLog b/Build/source/texk/dvipdfmx/dvipdfmx-20120420-PATCHES/ChangeLog
index c6cab2ea57b..dc18e126a3e 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20120420-PATCHES/ChangeLog
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420-PATCHES/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-06 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
+ * patch-04-pdftex_map (new): Fix a typo in fontmap.c.
+ * fontmap.c: Allow pdftex.map without PS name.
+
2012-04-27 Peter Breitenlohner <peb@mppmu.mpg.de>
* patch-03-trivial (new): Reduce differences between dvipdfmx
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20120420-PATCHES/patch-04-pdftex_map b/Build/source/texk/dvipdfmx/dvipdfmx-20120420-PATCHES/patch-04-pdftex_map
new file mode 100644
index 00000000000..67249eec78e
--- /dev/null
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420-PATCHES/patch-04-pdftex_map
@@ -0,0 +1,37 @@
+diff -ur dvipdfmx-20120420.orig/src/fontmap.c dvipdfmx-20120420/src/fontmap.c
+--- dvipdfmx-20120420.orig/src/fontmap.c 2011-03-07 18:11:26.000000000 +0100
++++ dvipdfmx-20120420/src/fontmap.c 2012-05-06 04:59:09.000000000 +0200
+@@ -566,13 +566,17 @@
+ skip_blank(&p, endptr);
+
+ /* The first field (after TFM name) must be PostScript name. */
+- if (p < endptr) {
+- q = parse_string_value(&p, endptr);
+- if (q) RELEASE(q);
+- skip_blank(&p, endptr);
+- } else {
+- WARN("Missing a PostScript font name.");
+- return -1;
++ /* However, pdftex.map allows a line without PostScript name. */
++
++ if (*p != '"' && *p != '<') {
++ if (p < endptr) {
++ q = parse_string_value(&p, endptr);
++ if (q) RELEASE(q);
++ skip_blank(&p, endptr);
++ } else {
++ WARN("Missing a PostScript font name.");
++ return -1;
++ }
+ }
+
+ if (p >= endptr) return 0;
+@@ -604,7 +608,7 @@
+ if ((t = parse_string_value(&r, e))) {
+ if (strcmp(t, "SlantFont") == 0)
+ mrec->opt.slant = atof(s);
+- else if (strcmp(r, "ExtendFont") == 0)
++ else if (strcmp(t, "ExtendFont") == 0)
+ mrec->opt.extend = atof(s);
+ RELEASE(t);
+ }
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20120420/ChangeLog b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/ChangeLog
index d1b67915c5f..b79a235a309 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20120420/ChangeLog
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20120420/ChangeLog
@@ -2,9 +2,6 @@ $Header: /home/cvsroot/dvipdfmx/ChangeLog,v 1.290 2011/03/11 03:15:31 chofchof E
ChangeLog: Changes for DVIPDFMx
===============================
-2012-05-06 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
-
- * fontmap.c: fix a typo. allow pdftex.map without PS name.
2012-04-20 Norbert Preining <preining@logic.at>
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index ed2bea5af96..e521092dc90 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-05 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * win32lib.[ch]: Copyright 2012.
+
2012-05-05 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
* win32lib.c: rewrite xftell64 for W32.
diff --git a/Build/source/texk/kpathsea/win32lib.c b/Build/source/texk/kpathsea/win32lib.c
index e572d813dd3..47753c3a456 100644
--- a/Build/source/texk/kpathsea/win32lib.c
+++ b/Build/source/texk/kpathsea/win32lib.c
@@ -1,7 +1,7 @@
/* win32lib.c: bits and pieces for win32 and msvc.
- Copyright 1996, 1997. 1998 Fabrice Popineau.
- Copyright 2006, 2011 Akira Kakuto.
+ Copyright 1996, 1997. 1998, 1999 Fabrice Popineau.
+ Copyright 2006, 2011, 2012 Akira Kakuto.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
diff --git a/Build/source/texk/kpathsea/win32lib.h b/Build/source/texk/kpathsea/win32lib.h
index a91c9eb85e8..fc14d55895b 100644
--- a/Build/source/texk/kpathsea/win32lib.h
+++ b/Build/source/texk/kpathsea/win32lib.h
@@ -1,7 +1,7 @@
/* win32lib.h: bits and pieces for win32 and msvc.
- Copyright 1996, 1997, 1998 Fabrice Popineau.
- Copyright 2006, 2011 Akira Kakuto.
+ Copyright 1996, 1997, 1998, 1999 Fabrice Popineau.
+ Copyright 2006, 2010, 2011, 2012 Akira Kakuto.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public