texlive[46970] Build/source/texk/makejvf: texk/makejvf: Modify

[commits+takuji at tug.org]

Revision: 46970
          http://tug.org/svn/texlive?view=revision&revision=46970
Author:   takuji
Date:     2018-03-15 12:54:25 +0100 (Thu, 15 Mar 2018)
Log Message:
-----------
texk/makejvf: Modify treatment of comment (ver 20180315)

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

Modified: trunk/Build/source/texk/makejvf/ChangeLog
===================================================================
--- trunk/Build/source/texk/makejvf/ChangeLog	2018-03-15 01:23:59 UTC (rev 46969)
+++ trunk/Build/source/texk/makejvf/ChangeLog	2018-03-15 11:54:25 UTC (rev 46970)
@@ -1,3 +1,9 @@
+2018-03-15  TANAKA Takuji  <ttk at t-lab.opal.ne.jp>
+
+	* usrtable.c: Do not initialize CHARSET flag at
+	continuous lines of a CHARSET entry.
+	* version.h: Bump version.
+
 2018-03-03  TANAKA Takuji  <ttk at t-lab.opal.ne.jp>
 
 	* write.c: Add U+2329, U+232A, U+301A, U+301B, U+FE59..FE5E.

Modified: trunk/Build/source/texk/makejvf/usrtable.c
===================================================================
--- trunk/Build/source/texk/makejvf/usrtable.c	2018-03-15 01:23:59 UTC (rev 46969)
+++ trunk/Build/source/texk/makejvf/usrtable.c	2018-03-15 11:54:25 UTC (rev 46970)
@@ -29,14 +29,11 @@
 		exit(1);
 	}
 	for (l = 0; fgets(buf, BUF_SIZE, fp) != NULL; l++) {
+		if (strncmp(buf, "+", 1) && strncmp(buf, "%", 1)) charset_mode = 0;
 		if ((endptr=strchr(buf, '%')) != NULL) strcpy(endptr,"\n");  /* ignore after '%'  */
-		if (!strncmp(buf, "\n", 1)) { /* empty line */
-			charset_mode = 0;
-			continue;
-		}
+		if (!strncmp(buf, "\n", 1)) continue;                        /* ignore empty line */
 		tok = strtok(buf, "\t");
 		if (!strcmp(tok, "REPLACE")) {
-			charset_mode = 0;
 			if (usertable_replace_max >= MAX_TABLE) goto buferr;
 			usertable_replace[usertable_replace_max].codepoint = strtol(strtok(NULL, "\t\n"), &endptr, 16);
 			if (*endptr != '\0') goto taberr;
@@ -47,7 +44,6 @@
 			continue;
 		}
 		if (!strcmp(tok, "MOVE")) {
-			charset_mode = 0;
 			if (usertable_move_max >= MAX_TABLE) goto buferr;
 			usertable_move[usertable_move_max].codepoint = strtol(strtok(NULL, "\t\n"), &endptr, 16);
 			if (*endptr != '\0') goto taberr;

Modified: trunk/Build/source/texk/makejvf/version.h
===================================================================
--- trunk/Build/source/texk/makejvf/version.h	2018-03-15 01:23:59 UTC (rev 46969)
+++ trunk/Build/source/texk/makejvf/version.h	2018-03-15 11:54:25 UTC (rev 46970)
@@ -1,2 +1,2 @@
-#define VERSION "20180303"
+#define VERSION "20180315"
 #define BUG_ADDRESS "issue at texjp.org"