diff options
| -rw-r--r-- | Build/source/texk/makejvf/ChangeLog | 6 | ||||
| -rw-r--r-- | Build/source/texk/makejvf/usrtable.c | 8 | ||||
| -rw-r--r-- | Build/source/texk/makejvf/version.h | 2 |
3 files changed, 9 insertions, 7 deletions
diff --git a/Build/source/texk/makejvf/ChangeLog b/Build/source/texk/makejvf/ChangeLog index 5c2ccba7518..5eeaedd51ab 100644 --- a/Build/source/texk/makejvf/ChangeLog +++ b/Build/source/texk/makejvf/ChangeLog @@ -1,3 +1,9 @@ +2018-03-15 TANAKA Takuji <ttk@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@t-lab.opal.ne.jp> * write.c: Add U+2329, U+232A, U+301A, U+301B, U+FE59..FE5E. diff --git a/Build/source/texk/makejvf/usrtable.c b/Build/source/texk/makejvf/usrtable.c index 13c9e2d6917..0ac8d766150 100644 --- a/Build/source/texk/makejvf/usrtable.c +++ b/Build/source/texk/makejvf/usrtable.c @@ -29,14 +29,11 @@ void get_usertable(char *name) 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 @@ void get_usertable(char *name) 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; diff --git a/Build/source/texk/makejvf/version.h b/Build/source/texk/makejvf/version.h index d86fcea1668..6faea53d1c5 100644 --- a/Build/source/texk/makejvf/version.h +++ b/Build/source/texk/makejvf/version.h @@ -1,2 +1,2 @@ -#define VERSION "20180303" +#define VERSION "20180315" #define BUG_ADDRESS "issue@texjp.org" |