summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorHironobu Yamashita <h.y.acetaminophen@gmail.com>2017-07-11 22:38:37 +0000
committerHironobu Yamashita <h.y.acetaminophen@gmail.com>2017-07-11 22:38:37 +0000
commitcf511642d5cba1b4a975cafdd92220d4d054c28b (patch)
treebdadc1db1539969c407fe5ee1d819b6b98f873d2 /Build
parent972f02fef1a69cbf44309aa84d431c60b95bf5b2 (diff)
makejvf/write.c: Fix a bug when -3 and -K are used at the same time
git-svn-id: svn://tug.org/texlive/trunk@44775 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/makejvf/ChangeLog6
-rw-r--r--Build/source/texk/makejvf/write.c8
2 files changed, 11 insertions, 3 deletions
diff --git a/Build/source/texk/makejvf/ChangeLog b/Build/source/texk/makejvf/ChangeLog
index 6b5913d0027..c3b6b61e00b 100644
--- a/Build/source/texk/makejvf/ChangeLog
+++ b/Build/source/texk/makejvf/ChangeLog
@@ -1,3 +1,9 @@
+2017-07-11 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * write.c: Fix a bug which occurs when —3 and -K are used at
+ the same time (Thanks Takayuki YATO). Char code consistency in
+ AFM parsing (though -a option is never supported).
+
2017-07-10 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
* write.c: Fix a bug in -m option on UCS mode.
diff --git a/Build/source/texk/makejvf/write.c b/Build/source/texk/makejvf/write.c
index 121841a8f12..7d58728940d 100644
--- a/Build/source/texk/makejvf/write.c
+++ b/Build/source/texk/makejvf/write.c
@@ -520,9 +520,9 @@ void writevfu(int code, FILE *fp)
if (jfm_id == 9 && minute) { /* ½Ä½ñ¤­»þ¤Ï¥ß¥Ë¥å¡¼¥È¤ØÊÑ´¹ */
if (afp) {
if (code == 0x2019)
- sprintf(buf2,"CH <216C>");
+ sprintf(buf2,"CH <2032>");
else
- sprintf(buf2,"CH <216D>");
+ sprintf(buf2,"CH <2033>");
rewind(afp);
while (fgets(buf,255,afp)!=NULL) {
if (jfm_id==9 && !strncmp(buf,"FontBBox ",9)) {
@@ -762,10 +762,12 @@ void writevfu(int code, FILE *fp)
}
}
else {
- if (kanatfm || code>=0x10000)
+ if (kanatfm)
cc=4;
else
cc=3;
+ if (code>=0x10000)
+ cc+=1;
if (skip)
cc+=numcount(skip)+1;
if (skip2)