[dvips] Bug in slim vf (#99)

source/texk/dvipsk/ChangeLog

@@ -1,3 +1,11 @@
+2021-04-10  TANAKA Takuji  <[email protected]>
+
+	* {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
+	* configure.ac: version 2021.2.
+
 2021-03-23  Karl Berry  <[email protected]>
 
 	* TL'21.

source/texk/dvipsk/configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for dvipsk (TeX Live) 2021.1.
+# Generated by GNU Autoconf 2.69 for dvipsk (TeX Live) 2021.2.
 #
 # Report bugs to <[email protected]>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='dvipsk (TeX Live)'
 PACKAGE_TARNAME='dvipsk--tex-live-'
-PACKAGE_VERSION='2021.1'
-PACKAGE_STRING='dvipsk (TeX Live) 2021.1'
+PACKAGE_VERSION='2021.2'
+PACKAGE_STRING='dvipsk (TeX Live) 2021.2'
 PACKAGE_BUGREPORT='[email protected]'
 PACKAGE_URL=''
 
@@ -1330,7 +1330,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures dvipsk (TeX Live) 2021.1 to adapt to many kinds of systems.
+\`configure' configures dvipsk (TeX Live) 2021.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1401,7 +1401,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of dvipsk (TeX Live) 2021.1:";;
+     short | recursive ) echo "Configuration of dvipsk (TeX Live) 2021.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1520,7 +1520,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-dvipsk (TeX Live) configure 2021.1
+dvipsk (TeX Live) configure 2021.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2359,7 +2359,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by dvipsk (TeX Live) $as_me 2021.1, which was
+It was created by dvipsk (TeX Live) $as_me 2021.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -8042,7 +8042,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='dvipsk--tex-live-'
- VERSION='2021.1'
+ VERSION='2021.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -14159,7 +14159,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <[email protected]>."
 
 lt_cl_version="\
-dvipsk (TeX Live) config.lt 2021.1
+dvipsk (TeX Live) config.lt 2021.2
 configured by $0, generated by GNU Autoconf 2.69.
 
 Copyright (C) 2011 Free Software Foundation, Inc.
@@ -15756,7 +15756,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by dvipsk (TeX Live) $as_me 2021.1, which was
+This file was extended by dvipsk (TeX Live) $as_me 2021.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15822,7 +15822,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-dvipsk (TeX Live) config.status 2021.1
+dvipsk (TeX Live) config.status 2021.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

source/texk/dvipsk/configure.ac

@@ -8,7 +8,7 @@ dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
 dnl   with or without modifications, as long as this notice is preserved.
 dnl
-AC_INIT([dvipsk (TeX Live)], [2021.1], [[email protected]])
+AC_INIT([dvipsk (TeX Live)], [2021.2], [[email protected]])
 AC_PREREQ([2.65])
 AC_CONFIG_SRCDIR([dvips.c])
 AC_CONFIG_AUX_DIR([../../build-aux])

source/texk/dvipsk/pprescan.c

@@ -147,6 +147,11 @@ case 128: case 133: cmd = dvibyte(); /* set1, put1 commands drops through */
                   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)));

source/texk/dvipsk/scanpage.c

@@ -227,6 +227,11 @@ case 128: case 133: cmd = dvibyte(); /* set1, put1 commands drops through */
                   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)));