summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHironobu Yamashita <h.y.acetaminophen@gmail.com>2017-08-01 14:20:45 +0000
committerHironobu Yamashita <h.y.acetaminophen@gmail.com>2017-08-01 14:20:45 +0000
commitb26f035ced2518fea3f81bb1c8bd54de090262df (patch)
treec705ae202594234cb3ad959daaa0489bd68dca3d
parent9f9b4f9e7b6d9abbae3d8147b490c624e8d0699a (diff)
makejvf/write.c: simplify code, more hankaku characters
git-svn-id: svn://tug.org/texlive/trunk@44932 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/makejvf/ChangeLog10
-rw-r--r--Build/source/texk/makejvf/version.h2
-rw-r--r--Build/source/texk/makejvf/write.c22
3 files changed, 17 insertions, 17 deletions
diff --git a/Build/source/texk/makejvf/ChangeLog b/Build/source/texk/makejvf/ChangeLog
index 5ecf8b81b61..1f663f8cefe 100644
--- a/Build/source/texk/makejvf/ChangeLog
+++ b/Build/source/texk/makejvf/ChangeLog
@@ -1,9 +1,15 @@
+2017-08-01 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ makejvf version 20170801.
+ * write.c: Simplify code, add more hankaku characters.
+ * version.h: Bump version.
+
2017-07-31 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
makejvf version 20170731.
* tfmread.c: Support large GLUEKERN table.
* write.c: Add support for 0x00AB and 0x00BB in writevfu().
- * version.h: Adjusted.
+ * version.h: Bump version.
2017-07-24 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
@@ -22,7 +28,7 @@
* tfmread.c, makejvf.h: Declare "rightamount" as signed,
to be consistent with "skip" in write.c.
* write.c: Improve -m option for UCS mode.
- * version.h: Adjusted.
+ * version.h: Bump version.
* makejvf.1: Add documentation of -m option.
2017-07-17 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
diff --git a/Build/source/texk/makejvf/version.h b/Build/source/texk/makejvf/version.h
index a2b27658c60..fee2a5685d6 100644
--- a/Build/source/texk/makejvf/version.h
+++ b/Build/source/texk/makejvf/version.h
@@ -1,2 +1,2 @@
-#define VERSION "20170731"
+#define VERSION "20170801"
#define BUG_ADDRESS "issue@texjp.org"
diff --git a/Build/source/texk/makejvf/write.c b/Build/source/texk/makejvf/write.c
index 42053621c2a..5d41b26c6f5 100644
--- a/Build/source/texk/makejvf/write.c
+++ b/Build/source/texk/makejvf/write.c
@@ -605,22 +605,16 @@ void writevfu(int code, FILE *fp)
case 0x2032: /* ¡ì */
case 0x2033: /* ¡í */
break;
- case 0xFF61: case 0xFF62: case 0xFF63: case 0xFF64: case 0xFF65: case 0xFF66: case 0xFF67:
- case 0xFF68: case 0xFF69: case 0xFF6A: case 0xFF6B: case 0xFF6C: case 0xFF6D: case 0xFF6E: case 0xFF6F:
- case 0xFF70: case 0xFF71: case 0xFF72: case 0xFF73: case 0xFF74: case 0xFF75: case 0xFF76: case 0xFF77:
- case 0xFF78: case 0xFF79: case 0xFF7A: case 0xFF7B: case 0xFF7C: case 0xFF7D: case 0xFF7E: case 0xFF7F:
- case 0xFF80: case 0xFF81: case 0xFF82: case 0xFF83: case 0xFF84: case 0xFF85: case 0xFF86: case 0xFF87:
- case 0xFF88: case 0xFF89: case 0xFF8A: case 0xFF8B: case 0xFF8C: case 0xFF8D: case 0xFF8E: case 0xFF8F:
- case 0xFF90: case 0xFF91: case 0xFF92: case 0xFF93: case 0xFF94: case 0xFF95: case 0xFF96: case 0xFF97:
- case 0xFF98: case 0xFF99: case 0xFF9A: case 0xFF9B: case 0xFF9C: case 0xFF9D: case 0xFF9E: case 0xFF9F:
- if (jfm_id == 11 && hankana) { /* Ⱦ³ÑÊÒ²¾Ì¾¡¢²£½ñ¤­»þ */
- pstfm_codes[pstfm_nt-1]=code;
- pstfm_nt+=1;
- rightamount=0; /* discard jfmread() result */
- break;
- }
default:
if (w != zw) {
+ if ((code >= 0xFF61 && code <= 0xFFDC) || (code >= 0xFFE8 && code <= 0xFFEE)) {
+ if (jfm_id == 11 && hankana) { /* Ⱦ³ÑÊÒ²¾Ì¾¤Ê¤É¡¢²£½ñ¤­»þ */
+ pstfm_codes[pstfm_nt-1]=code;
+ pstfm_nt+=1;
+ rightamount=0; /* discard jfmread() result */
+ break;
+ }
+ }
if (!uniblock_iskanji && kanatume>=0) {
sprintf(buf2,"CH <%X>",code);
rewind(afp);