xdvipdfmx 0.7.8, Mac-only fix for Snow Leopard fonts

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

4 files changed, 19 insertions, 13 deletions

diff --git a/Build/source/texk/xdvipdfmx/configure b/Build/source/texk/xdvipdfmx/configure
index c1f510cd591..d840e4f0890 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.7.
+# Generated by GNU Autoconf 2.63 for xdvipdfmx 0.7.8.
 #
 # 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.7'
-PACKAGE_STRING='xdvipdfmx 0.7.7'
+PACKAGE_VERSION='0.7.8'
+PACKAGE_STRING='xdvipdfmx 0.7.8'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 
 ac_unique_file="src/dvipdfmx.c"
@@ -1513,7 +1513,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.7 to adapt to many kinds of systems.
+\`configure' configures xdvipdfmx 0.7.8 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1583,7 +1583,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of xdvipdfmx 0.7.7:";;
+     short | recursive ) echo "Configuration of xdvipdfmx 0.7.8:";;
    esac
   cat <<\_ACEOF
 
@@ -1711,7 +1711,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xdvipdfmx configure 0.7.7
+xdvipdfmx configure 0.7.8
 generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1725,7 +1725,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.7, which was
+It was created by xdvipdfmx $as_me 0.7.8, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
@@ -6985,7 +6985,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xdvipdfmx'
- VERSION='0.7.7'
+ VERSION='0.7.8'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -16387,7 +16387,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-xdvipdfmx config.lt 0.7.7
+xdvipdfmx config.lt 0.7.8
 configured by $0, generated by GNU Autoconf 2.63.
 
 Copyright (C) 2008 Free Software Foundation, Inc.
@@ -19593,7 +19593,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.7, which was
+This file was extended by xdvipdfmx $as_me 0.7.8, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -19656,7 +19656,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.7
+xdvipdfmx config.status 0.7.8
 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 792407402ae..0fa06df401a 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.7], [tex-k@tug.org])
+AC_INIT([xdvipdfmx], [0.7.8], [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/cidtype2.c b/Build/source/texk/xdvipdfmx/src/cidtype2.c
index 7f32f684ed5..734bea33c94 100644
--- a/Build/source/texk/xdvipdfmx/src/cidtype2.c
+++ b/Build/source/texk/xdvipdfmx/src/cidtype2.c
@@ -552,8 +552,10 @@ CIDFont_type2_dofont (CIDFont *font)
       ERROR("Invalid TTC index in %s.", font->ident);
     break;
   case SFNT_TYPE_TRUETYPE:
+#ifndef XETEX_MAC
     if (font->options->index > 0)
       ERROR("Found TrueType font file while expecting TTC file (%s).", font->ident);
+#endif
     offset = 0;
     break;
   case SFNT_TYPE_DFONT:
@@ -953,11 +955,15 @@ CIDFont_type2_open (CIDFont *font, const char *name,
     offset = ttc_read_offset(sfont, opt->index);
     break;
   case SFNT_TYPE_TRUETYPE:
+#ifdef XETEX_MAC /* disable the index check here because of how .dfonts are handled */
+    offset = 0;
+#else
     if (opt->index > 0) {
       ERROR("Invalid TTC index (not TTC font): %s", name);
     } else {
       offset = 0;
     }
+#endif
     break;
   case SFNT_TYPE_DFONT:
     offset = sfont->offset;
diff --git a/Build/source/texk/xdvipdfmx/src/fontmap.c b/Build/source/texk/xdvipdfmx/src/fontmap.c
index a4a76f67795..0396d4c05ea 100644
--- a/Build/source/texk/xdvipdfmx/src/fontmap.c
+++ b/Build/source/texk/xdvipdfmx/src/fontmap.c
@@ -1184,7 +1184,7 @@ pdf_load_native_font (const char *ps_name,
             FT_Face face;
             ftErr = FT_New_Face(ftLib, (char*)path, index, &face);
             if (ftErr == 0) {
-              error = pdf_insert_native_fontmap_record(ps_name, NULL, 0, face,
+              error = pdf_insert_native_fontmap_record(ps_name, NULL, index, face,
                                                        layout_dir, extend, slant, embolden);
             }
           }