texlive[58812] Build/source/texk/dvipsk: dvips: Fix bug in fallback

[commits+takuji at tug.org]

Revision: 58812
          http://tug.org/svn/texlive?view=revision&revision=58812
Author:   takuji
Date:     2021-04-10 15:03:22 +0200 (Sat, 10 Apr 2021)
Log Message:
-----------
dvips: Fix bug in fallback multibyte character in virtual font

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

Modified: trunk/Build/source/texk/dvipsk/ChangeLog
===================================================================
--- trunk/Build/source/texk/dvipsk/ChangeLog	2021-04-10 08:09:15 UTC (rev 58811)
+++ trunk/Build/source/texk/dvipsk/ChangeLog	2021-04-10 13:03:22 UTC (rev 58812)
@@ -1,3 +1,10 @@
+2021-04-10  TANAKA Takuji  <ttk at t-lab.opal.ne.jp>
+
+	* {pprescan,scanpage}.c:
+	Fix bug in fallback multibyte character in virtual font for (u)pTeX.
+	Thanks 流橋 利樹-san for the report.
+	https://oku.edu.mie-u.ac.jp/tex/mod/forum/discuss.php?d=3068
+
 2021-03-23  Karl Berry  <karl at tug.org>
 
 	* TL'21.

Modified: trunk/Build/source/texk/dvipsk/pprescan.c
===================================================================
--- trunk/Build/source/texk/dvipsk/pprescan.c	2021-04-10 08:09:15 UTC (rev 58811)
+++ trunk/Build/source/texk/dvipsk/pprescan.c	2021-04-10 13:03:22 UTC (rev 58812)
@@ -147,6 +147,11 @@
                   curfnt = NULL;
                else
                   ppreselectfont(ffont0->desc);
+               --frp;
+               curfnt = frp->curf;
+               ffont = frp->ff;
+               curlim = frp->curl;
+               curpos = frp->curp;
             } else {
                curpos = cd->packptr + 2;
                curlim = curpos + (256*(long)(*cd->packptr)+(*(cd->packptr+1)));

Modified: trunk/Build/source/texk/dvipsk/scanpage.c
===================================================================
--- trunk/Build/source/texk/dvipsk/scanpage.c	2021-04-10 08:09:15 UTC (rev 58811)
+++ trunk/Build/source/texk/dvipsk/scanpage.c	2021-04-10 13:03:22 UTC (rev 58812)
@@ -227,6 +227,11 @@
                   curfnt = NULL;
                else if (!preselectfont(ffont0->desc))
                   goto outofmem;
+               --frp;
+               curfnt = frp->curf;
+               ffont = frp->ff;
+               curlim = frp->curl;
+               curpos = frp->curp;
             } else {
                curpos = cd->packptr + 2;
                curlim = curpos + (256*(long)(*cd->packptr)+(*(cd->packptr+1)));