From 4e5a349b757ab489a460da70cc62e66736fde2f9 Mon Sep 17 00:00:00 2001 From: Hironobu Yamashita Date: Wed, 12 Jul 2017 14:41:36 +0000 Subject: makejvf/write.c: Fix a bug in generating non-Kanji TFM on UCS mode git-svn-id: svn://tug.org/texlive/trunk@44778 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/makejvf/ChangeLog | 6 ++++++ Build/source/texk/makejvf/makejvf.1 | 2 ++ Build/source/texk/makejvf/write.c | 4 ++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Build/source/texk/makejvf/ChangeLog b/Build/source/texk/makejvf/ChangeLog index 60a7a1c9787..c49e4c8ea66 100644 --- a/Build/source/texk/makejvf/ChangeLog +++ b/Build/source/texk/makejvf/ChangeLog @@ -1,3 +1,9 @@ +2017-07-12 Hironobu Yamashita + + * 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 * write.c: Fix a bug which occurs when -3 and -K are used at diff --git a/Build/source/texk/makejvf/makejvf.1 b/Build/source/texk/makejvf/makejvf.1 index 46575021327..34c4ceb28a4 100644 --- a/Build/source/texk/makejvf/makejvf.1 +++ b/Build/source/texk/makejvf/makejvf.1 @@ -29,11 +29,13 @@ Replace single/double quotation marks (', '') with prime quotation marks .TP 10 \fB-a\fI \fR Name of the AFM file. Used for Kana-tsume mode. +This option is unsupported. .TP 10 \fB-k\fI \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 \fR UCS mode. Available charsets are: gb (GB = Simplified Chinese), diff --git a/Build/source/texk/makejvf/write.c b/Build/source/texk/makejvf/write.c index 7d58728940d..18831e4fa9f 100644 --- a/Build/source/texk/makejvf/write.c +++ b/Build/source/texk/makejvf/write.c @@ -670,7 +670,7 @@ void writevfu(int code, FILE *fp) } 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 @@ void writevfu(int code, FILE *fp) 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 */ -- cgit v1.2.3