texlive[44775] Build/source/texk/makejvf: makejvf/write.c: Fix a bug

[commits+hironobu at tug.org]

Revision: 44775
          http://tug.org/svn/texlive?view=revision&revision=44775
Author:   hironobu
Date:     2017-07-12 00:38:37 +0200 (Wed, 12 Jul 2017)
Log Message:
-----------
makejvf/write.c: Fix a bug when -3 and -K are used at the same time

Modified Paths:
--------------
    trunk/Build/source/texk/makejvf/ChangeLog
    trunk/Build/source/texk/makejvf/write.c

Modified: trunk/Build/source/texk/makejvf/ChangeLog
===================================================================
--- trunk/Build/source/texk/makejvf/ChangeLog	2017-07-11 00:21:14 UTC (rev 44774)
+++ trunk/Build/source/texk/makejvf/ChangeLog	2017-07-11 22:38:37 UTC (rev 44775)
@@ -1,3 +1,9 @@
+2017-07-11  Hironobu Yamashita  <h.y.acetaminophen at 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 at gmail.com>
 
 	* write.c: Fix a bug in -m option on UCS mode.

Modified: trunk/Build/source/texk/makejvf/write.c
===================================================================
--- trunk/Build/source/texk/makejvf/write.c	2017-07-11 00:21:14 UTC (rev 44774)
+++ trunk/Build/source/texk/makejvf/write.c	2017-07-11 22:38:37 UTC (rev 44775)
@@ -520,9 +520,9 @@
 		if (jfm_id == 9 && minute) { /* \xBDĽ񤭻\xFE\xA4ϥߥ˥塼\xA5Ȥ\xD8\xCAѴ\xB9 */
 			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 @@
 			}
 		}
 		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)