texlive[57024] Build/source/texk/dvipsk: texk/dvipsk: Accept Japanese

[commits+takuji at tug.org]

Revision: 57024
          http://tug.org/svn/texlive?view=revision&revision=57024
Author:   takuji
Date:     2020-11-28 02:32:41 +0100 (Sat, 28 Nov 2020)
Log Message:
-----------
texk/dvipsk: Accept Japanese vf without character definitions

Modified Paths:
--------------
    trunk/Build/source/texk/dvipsk/ChangeLog
    trunk/Build/source/texk/dvipsk/virtualfont.c

Modified: trunk/Build/source/texk/dvipsk/ChangeLog
===================================================================
--- trunk/Build/source/texk/dvipsk/ChangeLog	2020-11-28 01:03:14 UTC (rev 57023)
+++ trunk/Build/source/texk/dvipsk/ChangeLog	2020-11-28 01:32:41 UTC (rev 57024)
@@ -1,3 +1,9 @@
+2020-11-28  TANAKA Takuji  <ttk at t-lab.opal.ne.jp>
+
+	* virtualfont.c:
+	Accept Japanese virtual fonts without character definitions.
+	https://github.com/texjporg/tex-jp-build/issues/99
+
 2020-05-20  Karl Berry  <karl at freefriends.org>
 
 	* dvips.texi (Virtual fonts): add brief mention of this new vf/jfm

Modified: trunk/Build/source/texk/dvipsk/virtualfont.c
===================================================================
--- trunk/Build/source/texk/dvipsk/virtualfont.c	2020-11-28 01:03:14 UTC (rev 57023)
+++ trunk/Build/source/texk/dvipsk/virtualfont.c	2020-11-28 01:32:41 UTC (rev 57024)
@@ -213,7 +213,10 @@
  * Now we look for font definitions.
  */
    fm = NULL;
+   id = 0;
    while ((cmd=vfbyte())>=243) {
+      if (cmd==248 && (id == 9 || id == 11)) /* parent is jfm and no character definitions */
+         goto close_vf;
       if (cmd>246)
          badvf("unexpected command in preamble");
       newf = vfontdef(scaledsize, cmd-242);
@@ -221,8 +224,7 @@
          fm->next = newf;
       else {
          curfnt->localfonts = newf;
-         id = 0;
-         if (!noptex) {
+         if (!noptex && id==0) {
             tfmopen(curfnt->localfonts->desc); /* We check if parent is jfm or not. */
             id = tfm16();
             fclose(tfmfile);
@@ -307,6 +309,7 @@
    } while (cmd < 243);
    if (cmd != 248)
       badvf("missing postamble");
+ close_vf:
    fclose(vffile);
    curfnt->loaded = 2;
    if (maxcc+1<no_of_chars) {