summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorTakuji Tanaka <ttk@t-lab.opal.ne.jp>2021-04-10 13:03:22 +0000
committerTakuji Tanaka <ttk@t-lab.opal.ne.jp>2021-04-10 13:03:22 +0000
commit6bfda08f1bbd2cfc5a1b75e6197bdf29ffc8724d (patch)
treea65cf28b27c40525516edceb03cdaf19807ff9e8 /Build
parent842ba82ac1597e10d8d4bcd98550ce081a5bf58a (diff)
dvips: Fix bug in fallback multibyte character in virtual font
git-svn-id: svn://tug.org/texlive/trunk@58812 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/dvipsk/ChangeLog7
-rw-r--r--Build/source/texk/dvipsk/pprescan.c5
-rw-r--r--Build/source/texk/dvipsk/scanpage.c5
3 files changed, 17 insertions, 0 deletions
diff --git a/Build/source/texk/dvipsk/ChangeLog b/Build/source/texk/dvipsk/ChangeLog
index 63f695a18ff..38ad9f730db 100644
--- a/Build/source/texk/dvipsk/ChangeLog
+++ b/Build/source/texk/dvipsk/ChangeLog
@@ -1,3 +1,10 @@
+2021-04-10 TANAKA Takuji <ttk@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@tug.org>
* TL'21.
diff --git a/Build/source/texk/dvipsk/pprescan.c b/Build/source/texk/dvipsk/pprescan.c
index b434a93fac1..26aceb17396 100644
--- a/Build/source/texk/dvipsk/pprescan.c
+++ b/Build/source/texk/dvipsk/pprescan.c
@@ -147,6 +147,11 @@ dochar:
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)));
diff --git a/Build/source/texk/dvipsk/scanpage.c b/Build/source/texk/dvipsk/scanpage.c
index 51ad3afb9c7..4c7957f5208 100644
--- a/Build/source/texk/dvipsk/scanpage.c
+++ b/Build/source/texk/dvipsk/scanpage.c
@@ -227,6 +227,11 @@ dochar:
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)));