diff options
Diffstat (limited to 'Master')
| -rw-r--r-- | Master/texmf-dist/doc/latex/autopdf/README.txt (renamed from Master/texmf-dist/doc/latex/autopdf/README) | 19 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/autopdf/autopdf.pdf | bin | 245652 -> 228808 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/latex/autopdf/autopdf.dtx | 80 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/autopdf/autopdf.sty | 59 | ||||
| -rwxr-xr-x | Master/tlpkg/libexec/ctan2tds | 2 |
5 files changed, 80 insertions, 80 deletions
diff --git a/Master/texmf-dist/doc/latex/autopdf/README b/Master/texmf-dist/doc/latex/autopdf/README.txt index 68a5965e91f..3213ad92d53 100644 --- a/Master/texmf-dist/doc/latex/autopdf/README +++ b/Master/texmf-dist/doc/latex/autopdf/README.txt @@ -7,7 +7,7 @@ %% autopdf.dtx (with options: `readme') %% 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,12 +19,19 @@ %% and version 1.2 or later is part of all distributions of LaTeX version %% 1999/12/01 or later. -autopdf - automatic conversion of various graphics - formats to pdfLaTeX-compatible graphics +autopdf - automatic conversion of various graphics formats to + pdfLaTeX-compatible graphics -Run pdfLaTeX on the master DocStrip file (autopdf.dtx) to -generate this README, the package style file (autopdf.sty), -and the documentation (autopdf.pdf). +Run pdfLaTeX on the master DocStrip file (autopdf.dtx) to generate this +README, the package style file (autopdf.sty), and the documentation +(autopdf.pdf). + +Changelog: +* v1.0 (2012/04/22): + - Initial version +* v1.1 (2013/12/10): + - Always use identify to read size of images (even EPS files); + graphicx seems to no longer support EPS file reading in PDF mode %% %% diff --git a/Master/texmf-dist/doc/latex/autopdf/autopdf.pdf b/Master/texmf-dist/doc/latex/autopdf/autopdf.pdf Binary files differindex 7444b86a3d7..e2ad6c82e93 100644 --- a/Master/texmf-dist/doc/latex/autopdf/autopdf.pdf +++ b/Master/texmf-dist/doc/latex/autopdf/autopdf.pdf diff --git a/Master/texmf-dist/source/latex/autopdf/autopdf.dtx b/Master/texmf-dist/source/latex/autopdf/autopdf.dtx index d582caf8a3b..cbab0e5e336 100644 --- a/Master/texmf-dist/source/latex/autopdf/autopdf.dtx +++ b/Master/texmf-dist/source/latex/autopdf/autopdf.dtx @@ -1,6 +1,6 @@ % \iffalse % -% 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 @@ -17,12 +17,19 @@ %</driver> %<*readme> -autopdf - automatic conversion of various graphics - formats to pdfLaTeX-compatible graphics +autopdf - automatic conversion of various graphics formats to + pdfLaTeX-compatible graphics -Run pdfLaTeX on the master DocStrip file (autopdf.dtx) to -generate this README, the package style file (autopdf.sty), -and the documentation (autopdf.pdf). +Run pdfLaTeX on the master DocStrip file (autopdf.dtx) to generate this +README, the package style file (autopdf.sty), and the documentation +(autopdf.pdf). + +Changelog: +* v1.0 (2012/04/22): + - Initial version +* v1.1 (2013/12/10): + - Always use identify to read size of images (even EPS files); + graphicx seems to no longer support EPS file reading in PDF mode %</readme> %<*driver> @@ -34,7 +41,7 @@ and the documentation (autopdf.pdf). \preamble 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 @@ -58,7 +65,7 @@ and version 1.2 or later is part of all distributions of LaTeX version \NeedsTeXFormat{LaTeX2e}[2005/08/01] % pdfTeX 3.141592-1.30.0 %</driver|package> %<*package> -\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] %</package> %<*driver> \ProvidesFile{autopdf.dtx} @@ -71,7 +78,7 @@ and version 1.2 or later is part of all distributions of LaTeX version % % \fi % -% \CheckSum{1022} +% \CheckSum{1014} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -608,10 +615,31 @@ and version 1.2 or later is part of all distributions of LaTeX version \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% @@ -637,34 +665,6 @@ and version 1.2 or later is part of all distributions of LaTeX version \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"% - }{}% - }% -} % \end{macrocode} % Replace the internal \textsf{graphicx} command \verb|\Ginclude@graphics| with % a new version, which performs any required graphics conversions before inclusion. 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% diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 06c7db46646..fd781c5e300 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -2046,6 +2046,7 @@ $standardsource='\.(bat|c|drv|dtx|fea|fdd|ins|sfd)$|configure.*|install-sh'; # normal choices, and get the most general. %specialins = ( 'aastex', 'NULL', # everything is pregenerated + 'autopdf', 'NULL', # everything is pregenerated 'base', 'NULL', 'booktabs-de', 'NULL', # doc, no need to build 'blacklettert1','NULL', # don't try to do fontinst @@ -2107,7 +2108,6 @@ my $core_latex = "$Master/texmf-dist/tex/latex"; %specialinsrunner = ( 'antomega' => 'latex', # requires interaction 'apa6e' => 'latex', # requires interaction - 'autopdf' => 'pdflatex', # requires interaction 'babel-serbianc' => 'latex',# requires interaction 'beamersubframe' => 'latex',# requires interaction 'basque-date' => 'latex', # requires interaction |