texlive[54319] Build/source/texk/dvipdfm-x: texk/dvipdfm-x: Fallback
commits+takuji at tug.org
commits+takuji at tug.org
Sun Mar 15 04:54:33 CET 2020
Revision: 54319
http://tug.org/svn/texlive?view=revision&revision=54319
Author: takuji
Date: 2020-03-15 04:54:33 +0100 (Sun, 15 Mar 2020)
Log Message:
-----------
texk/dvipdfm-x: Fallback multibyte character in VF for (u)pTeX
Modified Paths:
--------------
trunk/Build/source/texk/dvipdfm-x/ChangeLog
trunk/Build/source/texk/dvipdfm-x/configure
trunk/Build/source/texk/dvipdfm-x/configure.ac
trunk/Build/source/texk/dvipdfm-x/tfm.c
trunk/Build/source/texk/dvipdfm-x/tfm.h
trunk/Build/source/texk/dvipdfm-x/vf.c
Modified: trunk/Build/source/texk/dvipdfm-x/ChangeLog
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/ChangeLog 2020-03-15 01:41:46 UTC (rev 54318)
+++ trunk/Build/source/texk/dvipdfm-x/ChangeLog 2020-03-15 03:54:33 UTC (rev 54319)
@@ -1,3 +1,9 @@
+2020-03-15 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
+
+ * tfm.c, tfm.h, vf.c: Fallback multibyte character
+ in virtual font for (u)pTeX.
+ * configure.ac: version 20200315.
+
2020-02-29 Hironobu Yamashita <h.y.acetaminophen at gmail.com>
* pdfdev.c: Revert the commit on 2019-06-30: see
Modified: trunk/Build/source/texk/dvipdfm-x/configure
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/configure 2020-03-15 01:41:46 UTC (rev 54318)
+++ trunk/Build/source/texk/dvipdfm-x/configure 2020-03-15 03:54:33 UTC (rev 54319)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for dvipdfm-x (TeX Live) 20200116.
+# Generated by GNU Autoconf 2.69 for dvipdfm-x (TeX Live) 20200315.
#
# Report bugs to <dvipdfmx at tug.org>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='dvipdfm-x (TeX Live)'
PACKAGE_TARNAME='dvipdfm-x--tex-live-'
-PACKAGE_VERSION='20200116'
-PACKAGE_STRING='dvipdfm-x (TeX Live) 20200116'
+PACKAGE_VERSION='20200315'
+PACKAGE_STRING='dvipdfm-x (TeX Live) 20200315'
PACKAGE_BUGREPORT='dvipdfmx at tug.org'
PACKAGE_URL=''
@@ -1350,7 +1350,7 @@
# 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 dvipdfm-x (TeX Live) 20200116 to adapt to many kinds of systems.
+\`configure' configures dvipdfm-x (TeX Live) 20200315 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1421,7 +1421,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of dvipdfm-x (TeX Live) 20200116:";;
+ short | recursive ) echo "Configuration of dvipdfm-x (TeX Live) 20200315:";;
esac
cat <<\_ACEOF
@@ -1551,7 +1551,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-dvipdfm-x (TeX Live) configure 20200116
+dvipdfm-x (TeX Live) configure 20200315
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2390,7 +2390,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by dvipdfm-x (TeX Live) $as_me 20200116, which was
+It was created by dvipdfm-x (TeX Live) $as_me 20200315, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -8077,7 +8077,7 @@
# Define the identity of the package.
PACKAGE='dvipdfm-x--tex-live-'
- VERSION='20200116'
+ VERSION='20200315'
cat >>confdefs.h <<_ACEOF
@@ -14746,7 +14746,7 @@
Report bugs to <bug-libtool at gnu.org>."
lt_cl_version="\
-dvipdfm-x (TeX Live) config.lt 20200116
+dvipdfm-x (TeX Live) config.lt 20200315
configured by $0, generated by GNU Autoconf 2.69.
Copyright (C) 2011 Free Software Foundation, Inc.
@@ -16636,7 +16636,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by dvipdfm-x (TeX Live) $as_me 20200116, which was
+This file was extended by dvipdfm-x (TeX Live) $as_me 20200315, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16706,7 +16706,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-dvipdfm-x (TeX Live) config.status 20200116
+dvipdfm-x (TeX Live) config.status 20200315
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Modified: trunk/Build/source/texk/dvipdfm-x/configure.ac
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/configure.ac 2020-03-15 01:41:46 UTC (rev 54318)
+++ trunk/Build/source/texk/dvipdfm-x/configure.ac 2020-03-15 03:54:33 UTC (rev 54319)
@@ -8,7 +8,7 @@
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([dvipdfm-x (TeX Live)], [20200116], [dvipdfmx at tug.org])
+AC_INIT([dvipdfm-x (TeX Live)], [20200315], [dvipdfmx at tug.org])
AC_PREREQ([2.65])
AC_CONFIG_SRCDIR([agl.c])
AC_CONFIG_AUX_DIR([../../build-aux])
Modified: trunk/Build/source/texk/dvipdfm-x/tfm.c
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/tfm.c 2020-03-15 01:41:46 UTC (rev 54318)
+++ trunk/Build/source/texk/dvipdfm-x/tfm.c 2020-03-15 03:54:33 UTC (rev 54319)
@@ -1209,7 +1209,23 @@
#endif /* !WITHOUT_ASCII_PTEX */
#endif
+#ifndef WITHOUT_ASCII_PTEX
int
+tfm_is_jfm (int font_id)
+{
+ CHECK_ID(font_id);
+
+ return (fms[font_id].source == SOURCE_TYPE_JFM) ? 1 : 0;
+}
+#else /* WITHOUT_ASCII_PTEX */
+int
+tfm_is_jfm (int font_id)
+{
+ return 0;
+}
+#endif /* !WITHOUT_ASCII_PTEX */
+
+int
tfm_exists (const char *tfm_name)
{
char *fullname;
Modified: trunk/Build/source/texk/dvipdfm-x/tfm.h
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/tfm.h 2020-03-15 01:41:46 UTC (rev 54318)
+++ trunk/Build/source/texk/dvipdfm-x/tfm.h 2020-03-15 03:54:33 UTC (rev 54319)
@@ -50,6 +50,7 @@
extern char *tfm_get_codingscheme (int font_id);
extern int tfm_is_vert (int font_id);
#endif
+extern int tfm_is_jfm (int font_id);
extern int tfm_exists (const char *tfm_name);
Modified: trunk/Build/source/texk/dvipdfm-x/vf.c
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/vf.c 2020-03-15 01:41:46 UTC (rev 54318)
+++ trunk/Build/source/texk/dvipdfm-x/vf.c 2020-03-15 03:54:33 UTC (rev 54319)
@@ -413,6 +413,16 @@
dvi_vf_init (default_font);
if (ch >= vf_fonts[vf_font].num_chars ||
!(start = (vf_fonts[vf_font].ch_pkt)[ch])) {
+ if (tfm_is_jfm((vf_fonts[vf_font].dev_fonts[0]).tfm_id) &&
+ ch < 0x1000000 && dpx_conf.compat_mode != dpx_mode_xdv_mode) {
+ /* fallback multibyte character for (u)pTeX */
+ if (dpx_conf.verbose_level > 0)
+ WARN ("Fallback multibyte character in virtual font: name=%s char=0x%06x(%d)",
+ vf_fonts[vf_font].tex_name, ch, ch);
+ dvi_set (ch);
+ dvi_vf_finish();
+ return;
+ }
fprintf (stderr, "\nchar=0x%x(%d)\n", ch, ch);
fprintf (stderr, "Tried to set a nonexistent character in a virtual font");
start = end = NULL;
More information about the tex-live-commits
mailing list.