diff options
author | Karl Berry <karl@freefriends.org> | 2009-09-05 22:54:26 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2009-09-05 22:54:26 +0000 |
commit | 874ece84a0d160db419570dff359a6e4c3c44063 (patch) | |
tree | 4ee6c8290f49de79ad922ba8f839da431c78aaad /Master/texmf-dist/source/latex/oberdiek/bmpsize.dtx | |
parent | 427bf11201b13e9a0778a390b930f70f8b697b8e (diff) |
oberdiek update (5sep09)
git-svn-id: svn://tug.org/texlive/trunk@15145 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/oberdiek/bmpsize.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/oberdiek/bmpsize.dtx | 66 |
1 files changed, 37 insertions, 29 deletions
diff --git a/Master/texmf-dist/source/latex/oberdiek/bmpsize.dtx b/Master/texmf-dist/source/latex/oberdiek/bmpsize.dtx index dd05d6ac521..7c7fac44c1b 100644 --- a/Master/texmf-dist/source/latex/oberdiek/bmpsize.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/bmpsize.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% 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 @@ -73,7 +73,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: bmpsize 2008/08/11 v1.5 Extract size and resolution data from bitmap files (HO)} +\Msg{* Package: bmpsize 2009/09/04 v1.6 Extract size and resolution data from bitmap files (HO)} \Msg{************************************************************************} \keepsilent @@ -84,7 +84,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 @@ -148,7 +148,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bmpsize.drv}% - [2008/08/11 v1.5 Extract size and resolution data from bitmap files (HO)]% + [2009/09/04 v1.6 Extract size and resolution data from bitmap files (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2008/08/11] \begin{document} @@ -157,7 +157,7 @@ and the derived files %</driver> % \fi % -% \CheckSum{3585} +% \CheckSum{3587} % % \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 @@ -178,7 +178,7 @@ and the derived files % \GetFileInfo{bmpsize.drv} % % \title{The \xpackage{bmpsize} package} -% \date{2008/08/11 v1.5} +% \date{2009/09/04 v1.6} % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}} % % \maketitle @@ -360,9 +360,15 @@ and the derived files % However, there is a difference between \xoption{dvipdfm} and % \xoption{dvipdfmx}, especially if images are reused. In the % former case the reused box has width and height of 1bp, in the -% latter case 1in. Thus the correct driver option must be given. +% latter case its natural width. Thus the correct driver option must be given. % \xoption{dvipdfm} and \xoption{dvipdfmx} are not equivalent. % +% Older versions of \xoption{dvipdfmx} uses a size of 1in. However I do +% want to distinguish between versions of the same program. Therefore the +% support of these older versions has stopped with version 1.6 of this package. +% Use version dvipdfmx-20090708 or newer (some few versions before will +% probably also work, but I don't want to investigate this further). +% % \StopEventually{ % } % @@ -374,7 +380,7 @@ and the derived files % \begin{macrocode} %<*base> \ProvidesPackage{bmpsize-base}% - [2008/08/11 v1.5 Basic part of bmpsize (HO)]% + [2009/09/04 v1.6 Basic part of bmpsize (HO)]% % \end{macrocode} % Modules of package \xpackage{fp} are used for calculations. % \begin{macrocode} @@ -3071,7 +3077,7 @@ and the derived files % \begin{macrocode} %<*package> \ProvidesPackage{bmpsize}% - [2008/08/11 v1.5 Extract size and resolution data from bitmap files (HO)]% + [2009/09/04 v1.6 Extract size and resolution data from bitmap files (HO)]% \RequirePackage{ifpdf} \ifpdf \PackageInfo{bmpsize}{Superseded by pdfTeX in PDF mode}% @@ -3259,7 +3265,7 @@ and the derived files % \begin{macrocode} %<*dvips> \ProvidesFile{bmpsize-dvips.def}% - [2008/08/11 v1.5 Graphics bitmap driver for dvips (HO)]% + [2009/09/04 v1.6 Graphics bitmap driver for dvips (HO)]% % \end{macrocode} % Ensure correct catcodes. % \begin{macrocode} @@ -3382,11 +3388,11 @@ and the derived files % \begin{macrocode} %<*dvipdfm> \ProvidesFile{bmpsize-dvipdfm.def}% - [2008/08/11 v1.5 Graphics bitmap driver for dvipdfm (HO)]% + [2009/09/04 v1.6 Graphics bitmap driver for dvipdfm (HO)]% %</dvipdfm> %<*dvipdfmx> \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)]% %</dvipdfmx> %<*dvipdfm|dvipdfmx> % \end{macrocode} @@ -3446,9 +3452,9 @@ and the derived files % \mbox{}\hphantom{width:} 100 / 72.27 / pixelwidth % \item height: 100 / 72.27 / pixelheight % \end{itemize} -% \begin{macrocode} -%<dvipdfmx>\def\bmpsize@dvipdfmx@factor{1.3837} -% \end{macrocode} +% Recent versions however use the natural size of the reused image. +% Thus the factor is the difference between the requested size and +% the natural size. % \end{macro} % \begin{macro}{\Ginclude@bmp} % Added features: support for viewport/trim, clip, and image reuse. @@ -3509,7 +3515,8 @@ and the derived files \fi % \end{macrocode} % Reuse support, dvipdfm just remember the image. The requested -% sizes, clipping, \dots do not matter. +% sizes, clipping, \dots do not matter. In case of dvipdfmx +% we also must remember the natural size. % \begin{macrocode} \edef\@bmpsize@temp{@IMG@\@bmpsize@pdfescapestring{#1}}% \@ifundefined{\@bmpsize@temp}{% @@ -3523,7 +3530,7 @@ and the derived files \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 %</dvipdfmx> @@ -3548,16 +3555,12 @@ and the derived files %<*dvipdfmx> \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 @@ -3584,8 +3587,8 @@ and the derived files %<*dvipdfmx> \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}% } %</dvipdfmx> % \end{macrocode} @@ -4015,6 +4018,11 @@ and the derived files % \item % Update of URLs. % \end{Version} +% \begin{Version}{2009/09/04 v1.6} +% \item +% Fixes for reusing objects with dvipdfmx-20090708. +% Older versions of dvipdfmx are no longer supported. +% \end{Version} % \end{History} % % \PrintIndex |