summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/graphicxpsd
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-01-30 00:03:23 +0000
committerKarl Berry <karl@freefriends.org>2018-01-30 00:03:23 +0000
commit999a277e66606bd3a0ec8b526f96bd899f960699 (patch)
treeef511890f507604dc653ac7bcffdd5488247290d /Master/texmf-dist/tex/latex/graphicxpsd
parent00c969bbe1be9fd05838637447be71627dffc9fd (diff)
graphicxpsd (29jan18)
git-svn-id: svn://tug.org/texlive/trunk@46477 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/graphicxpsd')
-rw-r--r--Master/texmf-dist/tex/latex/graphicxpsd/graphicxpsd.sty31
1 files changed, 21 insertions, 10 deletions
diff --git a/Master/texmf-dist/tex/latex/graphicxpsd/graphicxpsd.sty b/Master/texmf-dist/tex/latex/graphicxpsd/graphicxpsd.sty
index b4d4b9dcab6..3f170d9c2ff 100644
--- a/Master/texmf-dist/tex/latex/graphicxpsd/graphicxpsd.sty
+++ b/Master/texmf-dist/tex/latex/graphicxpsd/graphicxpsd.sty
@@ -13,9 +13,10 @@
%%
%% This package is licensed under the terms of the MIT License.
%%
+\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{graphicxpsd}
- [2018/01/26 v1.0 Adobe Photoshop Data format (PSD) support for graphicx package
- with sips (Darwin/macOS)/convert (ImageMagick) command]
+ [2018/01/30 v1.1 Adobe Photoshop Data format (PSD) support for graphicx package
+ with sips (Darwin/macOS)/magick (ImageMagick) command]
%% declare package errors
\def\gfxpsd@error{\PackageError{graphicxpsd}}
@@ -31,10 +32,18 @@
\DeclareOption{luatex}{\@gfxpsd@dvipdfmxfalse\@gfxpsd@pdftextrue}
\DeclareOption{pdftex}{\@gfxpsd@dvipdfmxfalse\@gfxpsd@pdftextrue}
-%% support two psd-to-pdf command: sips (Darwin/macOS), convert (ImageMagick)
+%% support two psd-to-pdf commands:
+%% sips (Darwin/macOS), magick/convert (ImageMagick)
+\newif\if@gfxpsd@imagemagick \@gfxpsd@imagemagickfalse
\def\@gfxpsd@psdtopdf{sips}%% as default
-\DeclareOption{imagemagick}{\gdef\@gfxpsd@psdtopdf{convert}}
-\DeclareOption{sips}{\gdef\@gfxpsd@psdtopdf{sips}}
+\DeclareOption{sips}{%
+ \@gfxpsd@imagemagickfalse\gdef\@gfxpsd@psdtopdf{sips}}
+\DeclareOption{imagemagick}{%
+ \@gfxpsd@imagemagicktrue\gdef\@gfxpsd@psdtopdf{magick}}
+\DeclareOption{magick}{%
+ \@gfxpsd@imagemagicktrue\gdef\@gfxpsd@psdtopdf{magick}}
+\DeclareOption{convert}{%
+ \@gfxpsd@imagemagicktrue\gdef\@gfxpsd@psdtopdf{convert}}
\ProcessOptions\relax
@@ -46,12 +55,14 @@
\@namedef{Gin@rule@.PSD}#1{{psdtopdf}{.pdf}{#1}}
\@namedef{Gin@rule@.psd}#1{{psdtopdf}{.pdf}{#1}}
\else
- \grnchry@error{Please choice specific dviware driver from the following list
+ \gfxpsd@error{Please choice specific dviware driver from the following list
and set the one as a documentclass option.^^J
available dviware drivers: dvipdfmx, xetex, luatex, pdftex}%
\fi\fi
%% then, include .psd file as converted PDF
+\@ifundefined{Ginclude@pdf}{\gfxpsd@error{%
+ Please load 'graphicxpsd' package after loading 'graphicx' package.}}\relax
\let\Ginclude@psdtopdf\Ginclude@pdf
%% compatibility for TL16 or lower version
@@ -69,11 +80,11 @@
\let\clone@Gread@pdf\Gread@pdf
\def\Gread@psdtopdf#1{%
\typeout{converting: \Gin@base\Gin@ext\GPT@space -> \Gin@base4gfxpsd.pdf}%
- \def\gfxpsd@tmp{sips}\ifx\@gfxpsd@psdtopdf\gfxpsd@tmp
+ \if@gfxpsd@imagemagick
+ \ShellEscape{\@gfxpsd@psdtopdf\GPT@space\Gin@base\Gin@ext\GPT@space\Gin@base4gfxpsd.pdf}%
+ \else
\ShellEscape{sips -s format pdf \Gin@base\Gin@ext\GPT@space --out \Gin@base4gfxpsd.pdf}%
- \else\def\gfxpsd@tmp{convert}\ifx\@gfxpsd@psdtopdf\gfxpsd@tmp
- \ShellEscape{convert \Gin@base\Gin@ext\GPT@space\Gin@base4gfxpsd.pdf}%
- \fi\fi
+ \fi
%% renamed inside: foo.psd -> foo4gfxpsd.pdf
\let\clone@Gin@base\Gin@base
\def\Gin@base{\clone@Gin@base4gfxpsd}%