texlive[44932] Build/source/texk/makejvf: makejvf/write.c: simplify

[commits+hironobu at tug.org]

Revision: 44932
          http://tug.org/svn/texlive?view=revision&revision=44932
Author:   hironobu
Date:     2017-08-01 16:20:45 +0200 (Tue, 01 Aug 2017)
Log Message:
-----------
makejvf/write.c: simplify code, more hankaku characters

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

Modified: trunk/Build/source/texk/makejvf/ChangeLog
===================================================================
--- trunk/Build/source/texk/makejvf/ChangeLog	2017-08-01 00:17:42 UTC (rev 44931)
+++ trunk/Build/source/texk/makejvf/ChangeLog	2017-08-01 14:20:45 UTC (rev 44932)
@@ -1,9 +1,15 @@
+2017-08-01  Hironobu Yamashita  <h.y.acetaminophen at 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 at 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 at 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 at gmail.com>

Modified: trunk/Build/source/texk/makejvf/version.h
===================================================================
--- trunk/Build/source/texk/makejvf/version.h	2017-08-01 00:17:42 UTC (rev 44931)
+++ trunk/Build/source/texk/makejvf/version.h	2017-08-01 14:20:45 UTC (rev 44932)
@@ -1,2 +1,2 @@
-#define VERSION "20170731"
+#define VERSION "20170801"
 #define BUG_ADDRESS "issue at texjp.org"

Modified: trunk/Build/source/texk/makejvf/write.c
===================================================================
--- trunk/Build/source/texk/makejvf/write.c	2017-08-01 00:17:42 UTC (rev 44931)
+++ trunk/Build/source/texk/makejvf/write.c	2017-08-01 14:20:45 UTC (rev 44932)
@@ -605,22 +605,16 @@
 	case 0x2032: /* \xA1\xEC */
 	case 0x2033: /* \xA1\xED */
 		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) { /* Ⱦ\xB3\xD1\xCAҲ\xBE̾\xA1\xA2\xB2\xA3\xBD񤭻\xFE */
-			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) { /* Ⱦ\xB3\xD1\xCAҲ\xBE̾\xA4ʤɡ\xA2\xB2\xA3\xBD񤭻\xFE */
+					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);