diff options
Diffstat (limited to 'Build')
| -rw-r--r-- | Build/source/texk/README | 4 | ||||
| -rw-r--r-- | Build/source/texk/dvipdfmx/ChangeLog | 14 | ||||
| -rwxr-xr-x | Build/source/texk/dvipdfmx/configure | 22 | ||||
| -rw-r--r-- | Build/source/texk/dvipdfmx/configure.ac | 2 | ||||
| -rw-r--r-- | Build/source/texk/dvipdfmx/src/dvipdfmx.c | 6 | ||||
| -rw-r--r-- | Build/source/texk/dvipdfmx/src/pdfximage.c | 33 | ||||
| -rw-r--r-- | Build/source/texk/dvipdfmx/src/pdfximage.h | 6 | ||||
| -rw-r--r-- | Build/source/texk/dvipdfmx/src/spc_pdfm.c | 6 |
8 files changed, 74 insertions, 19 deletions
diff --git a/Build/source/texk/README b/Build/source/texk/README index ab8a9851081..1224417b5be 100644 --- a/Build/source/texk/README +++ b/Build/source/texk/README @@ -42,9 +42,9 @@ dvidvi - ? dviljk - maintained here, by Joachim Schrod -dvipdfmx - checked 26may09 +dvipdfmx - checked 17jul09 http://project.ktug.or.kr/dvipdfmx/snapshot/latest/ - http://project.ktug.or.kr/dvipdfmx/snapshot/latest/dvipdfmx-20090522.tar.gz + http://project.ktug.or.kr/dvipdfmx/snapshot/latest/dvipdfmx-20090708.tar.gz dvipdfmx@project.ktug.or.kr (ChoF, Hirata, Matthias) dvipng - checked 12apr09 diff --git a/Build/source/texk/dvipdfmx/ChangeLog b/Build/source/texk/dvipdfmx/ChangeLog index 22c2f12546a..6b9814b30d7 100644 --- a/Build/source/texk/dvipdfmx/ChangeLog +++ b/Build/source/texk/dvipdfmx/ChangeLog @@ -1,8 +1,20 @@ -$Header: /home/cvsroot/dvipdfmx/ChangeLog,v 1.260 2009/05/22 07:59:59 chofchof Exp $ +$Header: /home/cvsroot/dvipdfmx/ChangeLog,v 1.263 2009/07/08 09:33:22 chofchof Exp $ ChangeLog: Changes for DVIPDFMx =============================== +2009-07-08 Jin-Hwan Cho + + * dvipdfmx.c: + Add -E option that enables DVIPDFM emulation mode in DVIPDFMx. + +2009-07-07 Jin-Hwan Cho + + * pdfximage.c, pdfximage.h, spc_pdfm.c: + Add pdf_ximage_set_attr() and pdf_ximage_get_subtype() + to resolve the conflict with bmpsize package in dvipdfm + emulation mode; reported by Heiko Oberdiek. + 2009-05-22 Jin-Hwan Cho * generic/pgf-doc-diff.version2cvs, generic/pgf-generic-diff.version2cvs: diff --git a/Build/source/texk/dvipdfmx/configure b/Build/source/texk/dvipdfmx/configure index 5eb19cb3912..1fbca8d2e77 100755 --- a/Build/source/texk/dvipdfmx/configure +++ b/Build/source/texk/dvipdfmx/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for dvipdfmx 20090522. +# Generated by GNU Autoconf 2.63 for dvipdfmx 20090708. # # Report bugs to <dvipdfmx@project.ktug.or.kr>. # @@ -745,8 +745,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='dvipdfmx' PACKAGE_TARNAME='dvipdfmx' -PACKAGE_VERSION='20090522' -PACKAGE_STRING='dvipdfmx 20090522' +PACKAGE_VERSION='20090708' +PACKAGE_STRING='dvipdfmx 20090708' PACKAGE_BUGREPORT='dvipdfmx@project.ktug.or.kr' ac_unique_file="src/dvipdfmx.c" @@ -1497,7 +1497,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 dvipdfmx 20090522 to adapt to many kinds of systems. +\`configure' configures dvipdfmx 20090708 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1567,7 +1567,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of dvipdfmx 20090522:";; + short | recursive ) echo "Configuration of dvipdfmx 20090708:";; esac cat <<\_ACEOF @@ -1687,7 +1687,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -dvipdfmx configure 20090522 +dvipdfmx configure 20090708 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1701,7 +1701,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 dvipdfmx $as_me 20090522, which was +It was created by dvipdfmx $as_me 20090708, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -6961,7 +6961,7 @@ fi # Define the identity of the package. PACKAGE='dvipdfmx' - VERSION='20090522' + VERSION='20090708' cat >>confdefs.h <<_ACEOF @@ -16363,7 +16363,7 @@ Usage: $0 [OPTIONS] Report bugs to <bug-libtool@gnu.org>." lt_cl_version="\ -dvipdfmx config.lt 20090522 +dvipdfmx config.lt 20090708 configured by $0, generated by GNU Autoconf 2.63. Copyright (C) 2008 Free Software Foundation, Inc. @@ -18769,7 +18769,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 dvipdfmx $as_me 20090522, which was +This file was extended by dvipdfmx $as_me 20090708, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18832,7 +18832,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -dvipdfmx config.status 20090522 +dvipdfmx config.status 20090708 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/dvipdfmx/configure.ac b/Build/source/texk/dvipdfmx/configure.ac index a7425d5c261..7a05b3ccd6c 100644 --- a/Build/source/texk/dvipdfmx/configure.ac +++ b/Build/source/texk/dvipdfmx/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([dvipdfmx], [20090522], [dvipdfmx@project.ktug.or.kr]) +AC_INIT([dvipdfmx], [20090708], [dvipdfmx@project.ktug.or.kr]) AC_PREREQ([2.63]) AC_CONFIG_SRCDIR([src/dvipdfmx.c]) AC_CONFIG_AUX_DIR([../../build-aux]) diff --git a/Build/source/texk/dvipdfmx/src/dvipdfmx.c b/Build/source/texk/dvipdfmx/src/dvipdfmx.c index 4c324a2aca4..44685bb20a0 100644 --- a/Build/source/texk/dvipdfmx/src/dvipdfmx.c +++ b/Build/source/texk/dvipdfmx/src/dvipdfmx.c @@ -1,4 +1,4 @@ -/* $Header: /home/cvsroot/dvipdfmx/src/dvipdfmx.c,v 1.76 2009/05/10 17:04:54 matthias Exp $ +/* $Header: /home/cvsroot/dvipdfmx/src/dvipdfmx.c,v 1.77 2009/07/08 09:33:22 chofchof Exp $ This is DVIPDFMx, an eXtended version of DVIPDFM by Mark A. Wicks. @@ -168,6 +168,7 @@ usage (void) fprintf (stdout, "\t\tPositive values are always ORed with previously given flags.\n"); fprintf (stdout, "\t\tAnd negative values replace old values.\n"); fprintf (stdout, "-D template\tPS->PDF conversion command line template [none]\n"); + fprintf (stdout, "-E \t\tEnable DVIPDFM emulation mode\n"); fprintf (stdout, "-K number\tEncryption key bits [40]\n"); fprintf (stdout, "-O number\tSet maximum depth of open bookmark items [0]\n"); fprintf (stdout, "-P number\tSet permission flags for PDF encryption [0x003C]\n"); @@ -530,6 +531,9 @@ do_args (int argc, char *argv[]) } POP_ARG(); break; + case 'E': + compat_mode = 1; + break; case 'e': if (compat_mode) { WARN("dvipdfm \"-e\" option not supported."); diff --git a/Build/source/texk/dvipdfmx/src/pdfximage.c b/Build/source/texk/dvipdfmx/src/pdfximage.c index b51541c8e67..8052e1a9bb0 100644 --- a/Build/source/texk/dvipdfmx/src/pdfximage.c +++ b/Build/source/texk/dvipdfmx/src/pdfximage.c @@ -1,4 +1,4 @@ -/* $Header: /home/cvsroot/dvipdfmx/src/pdfximage.c,v 1.23 2009/05/03 00:13:04 matthias Exp $ +/* $Header: /home/cvsroot/dvipdfmx/src/pdfximage.c,v 1.25 2009/07/07 11:48:34 chofchof Exp $ This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks. @@ -585,6 +585,37 @@ pdf_ximage_get_resname (int id) return I->res_name; } +int +pdf_ximage_get_subtype (int id) +{ + struct ic_ *ic = &_ic; + pdf_ximage *I; + + CHECK_ID(ic, id); + + I = GET_IMAGE(ic, id); + + return I->subtype; +} + +void +pdf_ximage_set_attr (int id, long width, long height, double xdensity, double ydensity, double llx, double lly, double urx, double ury) +{ + struct ic_ *ic = &_ic; + pdf_ximage *I; + + CHECK_ID(ic, id); + + I = GET_IMAGE(ic, id); + I->attr.width = width; + I->attr.height = height; + I->attr.xdensity = xdensity; + I->attr.ydensity = ydensity; + I->attr.bbox.llx = llx; + I->attr.bbox.lly = lly; + I->attr.bbox.urx = urx; + I->attr.bbox.ury = ury; +} /* depth... * Dvipdfm treat "depth" as "yoffset" for pdf:image and pdf:uxobj diff --git a/Build/source/texk/dvipdfmx/src/pdfximage.h b/Build/source/texk/dvipdfmx/src/pdfximage.h index 34d4ef2518a..770fd754195 100644 --- a/Build/source/texk/dvipdfmx/src/pdfximage.h +++ b/Build/source/texk/dvipdfmx/src/pdfximage.h @@ -1,4 +1,4 @@ -/* $Header: /home/cvsroot/dvipdfmx/src/pdfximage.h,v 1.14 2009/05/03 00:13:04 matthias Exp $ +/* $Header: /home/cvsroot/dvipdfmx/src/pdfximage.h,v 1.16 2009/07/07 11:48:34 chofchof Exp $ This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks. @@ -87,4 +87,8 @@ pdf_ximage_scale_image (int id, /* from dvipdfmx.c */ extern void pdf_ximage_disable_ebb (void); + +/* from spc_pdfm.c */ +extern void pdf_ximgge_get_subtype (int xobj_id); +extern void pdf_ximage_set_attr (int xobj_id, long width, long height, double xdensity, double ydensity, double llx, double lly, double urx, double ury); #endif /* _PDFXIMAGE_H_ */ diff --git a/Build/source/texk/dvipdfmx/src/spc_pdfm.c b/Build/source/texk/dvipdfmx/src/spc_pdfm.c index beed3752125..ca1595e2ca9 100644 --- a/Build/source/texk/dvipdfmx/src/spc_pdfm.c +++ b/Build/source/texk/dvipdfmx/src/spc_pdfm.c @@ -1,4 +1,4 @@ -/* $Header: /home/cvsroot/dvipdfmx/src/spc_pdfm.c,v 1.48 2009/04/29 11:22:19 chofchof Exp $ +/* $Header: /home/cvsroot/dvipdfmx/src/spc_pdfm.c,v 1.50 2009/07/07 11:48:34 chofchof Exp $ This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks. @@ -54,6 +54,7 @@ #include "spc_util.h" #include "spc_pdfm.h" +#include "dvipdfmx.h" #define ENABLE_TOUNICODE 1 @@ -1008,6 +1009,9 @@ spc_handler_pdfm_image (struct spc_env *spe, struct spc_arg *args) pdf_dev_put_image(xobj_id, &ti, spe->x_user, spe->y_user); if (ident) { + if (compat_mode && + pdf_ximage_get_subtype(xobj_id) == PDF_XOBJECT_TYPE_IMAGE) + pdf_ximage_set_attr(xobj_id, 1, 1, 1.0, 1.0, 0.0, 0.0, 0.0, 0.0); addresource(sd, ident, xobj_id); RELEASE(ident); } |