xdvipdfmx bugfix for reading metrics, thanks to Tomáš Janoušek

git-svn-id: svn://tug.org/texlive/trunk@13651 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 14 insertions, 14 deletions

diff --git a/Build/source/texk/xdvipdfmx/configure b/Build/source/texk/xdvipdfmx/configure
index b282f8c0e64..a287070d14d 100755
--- a/Build/source/texk/xdvipdfmx/configure
+++ b/Build/source/texk/xdvipdfmx/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for xdvipdfmx 0.7.3.
+# Generated by GNU Autoconf 2.63 for xdvipdfmx 0.7.4.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -745,8 +745,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='xdvipdfmx'
 PACKAGE_TARNAME='xdvipdfmx'
-PACKAGE_VERSION='0.7.3'
-PACKAGE_STRING='xdvipdfmx 0.7.3'
+PACKAGE_VERSION='0.7.4'
+PACKAGE_STRING='xdvipdfmx 0.7.4'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 
 ac_unique_file="src/dvipdfmx.c"
@@ -1510,7 +1510,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 xdvipdfmx 0.7.3 to adapt to many kinds of systems.
+\`configure' configures xdvipdfmx 0.7.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1580,7 +1580,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of xdvipdfmx 0.7.3:";;
+     short | recursive ) echo "Configuration of xdvipdfmx 0.7.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1703,7 +1703,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xdvipdfmx configure 0.7.3
+xdvipdfmx configure 0.7.4
 generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1717,7 +1717,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 xdvipdfmx $as_me 0.7.3, which was
+It was created by xdvipdfmx $as_me 0.7.4, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
@@ -6962,7 +6962,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xdvipdfmx'
- VERSION='0.7.3'
+ VERSION='0.7.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -16326,7 +16326,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-xdvipdfmx config.lt 0.7.3
+xdvipdfmx config.lt 0.7.4
 configured by $0, generated by GNU Autoconf 2.63.
 
 Copyright (C) 2008 Free Software Foundation, Inc.
@@ -19520,7 +19520,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by xdvipdfmx $as_me 0.7.3, which was
+This file was extended by xdvipdfmx $as_me 0.7.4, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -19583,7 +19583,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-xdvipdfmx config.status 0.7.3
+xdvipdfmx config.status 0.7.4
 configured by $0, generated by GNU Autoconf 2.63,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/Build/source/texk/xdvipdfmx/configure.ac b/Build/source/texk/xdvipdfmx/configure.ac
index cca3a23559d..054d1d96929 100644
--- a/Build/source/texk/xdvipdfmx/configure.ac
+++ b/Build/source/texk/xdvipdfmx/configure.ac
@@ -6,7 +6,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([xdvipdfmx], [0.7.3], [tex-k@tug.org])
+AC_INIT([xdvipdfmx], [0.7.4], [tex-k@tug.org])
 AC_PREREQ([2.63])
 AC_CONFIG_SRCDIR([src/dvipdfmx.c])
 AC_CONFIG_AUX_DIR([../../build-aux])
diff --git a/Build/source/texk/xdvipdfmx/src/tt_table.c b/Build/source/texk/xdvipdfmx/src/tt_table.c
index 56c4d68a50d..5cd14565063 100644
--- a/Build/source/texk/xdvipdfmx/src/tt_table.c
+++ b/Build/source/texk/xdvipdfmx/src/tt_table.c
@@ -189,7 +189,7 @@ tt_read_hhea_table (sfnt *sfont)
   ULONG  len;
   struct tt_hhea_table *table = NULL;
 
-  len = sfnt_find_table_len(sfont, "hhea");
+  len = sfnt_find_table_len(sfont, "hmtx");
   sfnt_locate_table(sfont, "hhea");
 
   table = NEW(1, struct tt_hhea_table);
@@ -252,7 +252,7 @@ struct tt_vhea_table *tt_read_vhea_table (sfnt *sfont)
 
   table = NEW(1, struct tt_vhea_table);
 
-  len = sfnt_find_table_len(sfont, "vhea");
+  len = sfnt_find_table_len(sfont, "vmtx");
   sfnt_locate_table(sfont, "vhea");
   table->version = sfnt_get_ulong(sfont);
   table->vertTypoAscender = sfnt_get_short (sfont);