summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfmx.def
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-09-05 22:54:26 +0000
committerKarl Berry <karl@freefriends.org>2009-09-05 22:54:26 +0000
commit874ece84a0d160db419570dff359a6e4c3c44063 (patch)
tree4ee6c8290f49de79ad922ba8f839da431c78aaad /Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfmx.def
parent427bf11201b13e9a0778a390b930f70f8b697b8e (diff)
oberdiek update (5sep09)
git-svn-id: svn://tug.org/texlive/trunk@15145 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfmx.def')
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfmx.def27
1 files changed, 11 insertions, 16 deletions
diff --git a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfmx.def b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfmx.def
index a93b408697e..8f273657ab7 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfmx.def
+++ b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfmx.def
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2006-2008 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
+%% Copyright (C) 2006-2009 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -29,7 +29,7 @@
%% bmpsize-dvipdfm.def, bmpsize-dvipdfmx.def.
%%
\ProvidesFile{bmpsize-dvipdfmx.def}%
- [2008/08/11 v1.5 Graphics bitmap driver for dvipdfmx (HO)]%
+ [2009/09/04 v1.6 Graphics bitmap driver for dvipdfmx (HO)]%
\expandafter\edef\csname @bmpsize@driver@catcodes\endcsname{%
\catcode44 \the\catcode44 % ,
\catcode46 \the\catcode46 % .
@@ -56,7 +56,6 @@
\else
\let\@bmpsize@pdfescapestring\pdf@escapestring
\fi
-\def\bmpsize@dvipdfmx@factor{1.3837}
\def\Ginclude@bmp#1{%
\message{<#1>}%
\ifGin@clip
@@ -109,7 +108,7 @@
\expandafter\ifx\csname bmpsize@pixelwidth\endcsname\relax
\else
\expandafter\xdef\csname\@bmpsize@temp\endcsname{%
- \the\@bmpsize@count:\bmpsize@pixelwidth:\bmpsize@pixelheight
+ \the\@bmpsize@count:\bmpsize@width:\bmpsize@height
}%
\fi
\special{%
@@ -121,16 +120,12 @@
}{%
\expandafter\expandafter\expandafter\@bmpsize@extract
\csname\@bmpsize@temp\endcsname\@nil
- \edef\@bmpsize@xscale{%
- \strip@pt\dimexpr
- \bmpsize@dvipdfmx@factor\Gin@req@width\relax
- }%
- \edef\@bmpsize@yscale{%
- \strip@pt\dimexpr
- \bmpsize@dvipdfmx@factor\Gin@req@height\relax
- }%
- \@bmpsize@div\@bmpsize@xscale\@bmpsize@xscale\@bmpsize@pixelwidth
- \@bmpsize@div\@bmpsize@yscale\@bmpsize@yscale\@bmpsize@pixelheight
+ \edef\@bmpsize@xscale{\strip@pt\Gin@req@width}%
+ \edef\@bmpsize@temp{\strip@pt\dimexpr\@bmpsize@width bp}%
+ \@bmpsize@div\@bmpsize@xscale\@bmpsize@xscale\@bmpsize@temp
+ \edef\@bmpsize@yscale{\strip@pt\Gin@req@height}%
+ \edef\@bmpsize@temp{\strip@pt\dimexpr\@bmpsize@height bp}%
+ \@bmpsize@div\@bmpsize@yscale\@bmpsize@yscale\@bmpsize@temp
\special{%
pdf:bt %
xscale \@bmpsize@xscale\space
@@ -153,8 +148,8 @@
}
\def\@bmpsize@extract#1:#2:#3\@nil{%
\def\@bmpsize@imgnum{#1}%
- \def\@bmpsize@pixelwidth{#2}%
- \def\@bmpsize@pixelheight{#3}%
+ \def\@bmpsize@width{#2}%
+ \def\@bmpsize@height{#3}%
}
\@bmpsize@driver@catcodes
\endinput