[dvips] tweak {scanpage,pprescan}.c (#99)

texjporg · Apr 19, 2020 · fb18458 · fb18458
1 parent eca7562
commit fb18458
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 10 deletions.
diff --git a/source/texk/dvipsk/pprescan.c b/source/texk/dvipsk/pprescan.c
@@ -142,15 +142,20 @@ case 128: case 133: cmd = dvibyte(); /* set1, put1 commands drops through */
                   fprintf(stderr, "Wrong char code: %04X\n", mychar);
                   error("! a non-existent virtual character is being used; check vf/tfm files");
                }
+               ffont0 = curfnt->localfonts;
+               if (ffont0==NULL)
+                  curfnt = NULL;
+               else
+                  ppreselectfont(ffont0->desc);
             } else {
                curpos = cd->packptr + 2;
                curlim = curpos + (256*(long)(*cd->packptr)+(*(cd->packptr+1)));
+               ffont = curfnt->localfonts;
+               if (ffont==NULL)
+                  curfnt = NULL;
+               else
+                  ppreselectfont(ffont->desc);
             }
-            ffont0 = curfnt->localfonts;
-            if (ffont0==NULL)
-               curfnt = NULL;
-            else
-               ppreselectfont(ffont0->desc);
          } else if (curfnt->loaded == 3)
             curfnt->chardesc[mychar].flags = EXISTS;
          break;

diff --git a/source/texk/dvipsk/scanpage.c b/source/texk/dvipsk/scanpage.c
@@ -222,15 +222,20 @@ case 128: case 133: cmd = dvibyte(); /* set1, put1 commands drops through */
                   fprintf(stderr, "Wrong char code: %04X\n", mychar);
                   error("! a non-existent virtual character is being used; check vf/tfm files");
                }
+               ffont0 = curfnt->localfonts;
+               if (ffont0==NULL)
+                  curfnt = NULL;
+               else if (!preselectfont(ffont0->desc))
+                  goto outofmem;
             } else {
                curpos = cd->packptr + 2;
                curlim = curpos + (256*(long)(*cd->packptr)+(*(cd->packptr+1)));
+               ffont = curfnt->localfonts;
+               if (ffont==NULL)
+                  curfnt = NULL;
+               else if (!preselectfont(ffont->desc))
+                  goto outofmem;
             }
-            ffont0 = curfnt->localfonts;
-            if (ffont0==NULL)
-               curfnt = NULL;
-            else if (!preselectfont(ffont0->desc))
-               goto outofmem;
          } else {
             pagecost++;
             if (!prescanchar(curfnt->chardesc + mychar))