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

[commits+hironobu at tug.org]

Revision: 44778
          http://tug.org/svn/texlive?view=revision&revision=44778
Author:   hironobu
Date:     2017-07-12 16:41:36 +0200 (Wed, 12 Jul 2017)
Log Message:
-----------
makejvf/write.c: Fix a bug in generating non-Kanji TFM on UCS mode

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

Modified: trunk/Build/source/texk/makejvf/ChangeLog
===================================================================
--- trunk/Build/source/texk/makejvf/ChangeLog	2017-07-12 00:17:44 UTC (rev 44777)
+++ trunk/Build/source/texk/makejvf/ChangeLog	2017-07-12 14:41:36 UTC (rev 44778)
@@ -1,3 +1,9 @@
+2017-07-12  Hironobu Yamashita  <h.y.acetaminophen at gmail.com>
+
+	* write.c: Fix a bug in generating non-Kanji TFM on UCS mode.
+	Now all non-Kanji char codes are included in non-Kanji TFM.
+	* makejvf.1: -a and -k options are never supported, per README.txt.
+
 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

Modified: trunk/Build/source/texk/makejvf/makejvf.1
===================================================================
--- trunk/Build/source/texk/makejvf/makejvf.1	2017-07-12 00:17:44 UTC (rev 44777)
+++ trunk/Build/source/texk/makejvf/makejvf.1	2017-07-12 14:41:36 UTC (rev 44778)
@@ -29,11 +29,13 @@
 .TP 10
 \fB-a\fI <AFMfile>\fR
 Name of the AFM file. Used for Kana-tsume mode.
+This option is unsupported.
 .TP 10
 \fB-k\fI <integer>\fR
 Kana-tsume (narrower spaces between Kana characters) margin amount;
 the \fIinteger\fR represents a relative value, using the character width
 as a base of 1000. This option should be accompanied with \fB-a\fR option.
+This option is unsupported.
 .TP 10
 \fB-u\fI <Charset>\fR
 UCS mode. Available charsets are: gb (GB = Simplified Chinese),

Modified: trunk/Build/source/texk/makejvf/write.c
===================================================================
--- trunk/Build/source/texk/makejvf/write.c	2017-07-12 00:17:44 UTC (rev 44777)
+++ trunk/Build/source/texk/makejvf/write.c	2017-07-12 14:41:36 UTC (rev 44778)
@@ -670,7 +670,7 @@
 		}
 	default:
 		if (w != zw) {
-			if (((code >= 0x3041 && code <= 0x30F6) || code == 0x30FC ) && kanatume>=0) {
+			if ((code >= 0x3041 && code <= 0x33FF) && kanatume>=0) {
 				sprintf(buf2,"CH <%X>",code);
 				rewind(afp);
 				while (fgets(buf,255,afp)!=NULL) {
@@ -788,7 +788,7 @@
 		fputnum2(skip2,fp);
 	}
 	if (kanatfm) {
-		if (code <= 0x30F6)
+		if (code <= 0x33FF)
 			fputc(173+fidshift,fp); /* FONT_NUM_2 */
 		else
 			fputc(172+fidshift,fp); /* FONT_NUM_1 */