From 9851903199929817313a4491deb886351006f68c Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Tue, 10 Dec 2013 23:24:05 +0000
Subject: autopdf (10dec13)

git-svn-id: svn://tug.org/texlive/trunk@32377 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/tex/latex/autopdf/autopdf.sty | 59 +++++++++++--------------
 1 file changed, 26 insertions(+), 33 deletions(-)

(limited to 'Master/texmf-dist/tex/latex/autopdf/autopdf.sty')

diff --git a/Master/texmf-dist/tex/latex/autopdf/autopdf.sty b/Master/texmf-dist/tex/latex/autopdf/autopdf.sty
index f7653da8b44..fbc16b3955e 100644
--- a/Master/texmf-dist/tex/latex/autopdf/autopdf.sty
+++ b/Master/texmf-dist/tex/latex/autopdf/autopdf.sty
@@ -7,7 +7,7 @@
 %% autopdf.dtx  (with options: `package')
 %% This is a generated file.
 %% 
-%% Copyright (C) 2010, 2012 by Karl Wette
+%% Copyright (C) 2010, 2012, 2013 by Karl Wette
 %% 
 %% This file may be distributed and/or modified under the conditions of
 %% the LaTeX Project Public License, either version 1.2 of this license
@@ -19,7 +19,7 @@
 %% and version 1.2 or later is part of all distributions of LaTeX version
 %% 1999/12/01 or later.
 \NeedsTeXFormat{LaTeX2e}[2005/08/01] % pdfTeX 3.141592-1.30.0
-\ProvidesPackage{autopdf}[2012/04/22 v1.0 Automatically convert between graphics file formats]
+\ProvidesPackage{autopdf}[2013/12/10 v1.1 Automatically convert between graphics file formats]
 \RequirePackage{keyval}
 \RequirePackage{ifthen}
 \RequirePackage{ifpdf}
@@ -346,10 +346,31 @@
     \ifGin@bbox%
     \else%
       \autopdf@GetGrType\autopdf@type{#2}%
-      \@ifundefined{Gread@\autopdf@type}{%
-        \autopdf@@ReadGrSize@Other{#1}{#2}%
+      \autopdf@Execute{%
+        \autopdf@GMIDENTIFY~%
+        -units~PixelsPerInch~%
+        -format~"%
+          \\\\def\\\\width{\autopdf@pc[fx:w/image.resolution.x*72]}%
+          \\\\def\\\\height{\autopdf@pc[fx:h/image.resolution.y*72]}%
+          "~%
+        #1#2~\REDIRTO~#1.size~%
+        \OR~\DELETE~#1.size~%
+      }%
+      \IfFileExists{#1.size}{%
+        \def\Gin@llx{0}\def\Gin@lly{0}%
+        \begingroup%
+          \input{#1.size}%
+          \edef\autopdf@a{%
+            \def\noexpand\Gin@urx{\width}%
+            \def\noexpand\Gin@ury{\height}%
+          }%
+          \expandafter%
+        \endgroup\autopdf@a%
+        \autopdf@Execute{\DELETE~#1.size}%
       }{%
-        \csname Gread@\autopdf@type\endcsname{#1#2}%
+        \PackageError{autopdf}{%
+          Could not determine size of "#1#2"%
+        }{}%
       }%
     \fi%
     \Gin@viewport@code%
@@ -375,34 +396,6 @@
     \global\divide\autopdf@height@dpi by 72%
   \endgroup%
 }
-\def\autopdf@@ReadGrSize@Other#1#2{%
-  \autopdf@Execute{%
-    \autopdf@GMIDENTITY~%
-    -units~PixelsPerInch~%
-    -format~"%
-      \\\\def\\\\width{\autopdf@pc[fx:w/image.resolution.x*72]}%
-      \\\\def\\\\height{\autopdf@pc[fx:h/image.resolution.y*72]}%
-      "~%
-    #1#2~\REDIRTO~#1.size~%
-    \OR~\DELETE~#1.size~%
-  }%
-  \IfFileExists{#1.size}{%
-    \def\Gin@llx{0}\def\Gin@lly{0}%
-    \begingroup%
-      \input{#1.size}%
-      \edef\autopdf@a{%
-        \def\noexpand\Gin@urx{\width}%
-        \def\noexpand\Gin@ury{\height}%
-      }%
-      \expandafter%
-    \endgroup\autopdf@a%
-    \autopdf@Execute{\DELETE~#1.size}%
-  }{%
-    \PackageError{autopdf}{%
-      Could not determine size of "#1#2"%
-    }{}%
-  }%
-}
 \def\autopdf@IncludeGraphics#1{%
   \edef\autopdf@to{}%
   \begingroup%
-- 
cgit v1.2.3

