summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/oberdiek/bmpsize.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/oberdiek/bmpsize.dtx')
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/bmpsize.dtx200
1 files changed, 115 insertions, 85 deletions
diff --git a/Master/texmf-dist/source/latex/oberdiek/bmpsize.dtx b/Master/texmf-dist/source/latex/oberdiek/bmpsize.dtx
index b85d24db910..982ef023778 100644
--- a/Master/texmf-dist/source/latex/oberdiek/bmpsize.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/bmpsize.dtx
@@ -73,12 +73,13 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: bmpsize 2007/05/01 v1.3 Extract size and resolution data from bitmap files (HO)}
+\Msg{* Package: bmpsize 2007/11/11 v1.4 Extract size and resolution data from bitmap files (HO)}
\Msg{************************************************************************}
\keepsilent
\askforoverwritefalse
+\let\MetaPrefix\relax
\preamble
This is a generated file.
@@ -104,6 +105,7 @@ and the derived files
bmpsize-dvipdfm.def, bmpsize-dvipdfmx.def.
\endpreamble
+\let\MetaPrefix\DoubleperCent
\generate{%
\file{bmpsize.ins}{\from{bmpsize.dtx}{install}}%
@@ -127,6 +129,10 @@ and the derived files
\Msg{* bmpsize-dvips.def, bmpsize-dvipdfm.def,}
\Msg{* bmpsize-dvipdfmx.def}
\Msg{*}
+\Msg{* And install the following script file:}
+\Msg{*}
+\Msg{* }
+\Msg{*}
\Msg{* To produce the documentation run the file `bmpsize.drv'}
\Msg{* through LaTeX.}
\Msg{*}
@@ -142,16 +148,16 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{bmpsize.drv}%
- [2007/05/01 v1.3 Extract size and resolution data from bitmap files (HO)]%
+ [2007/11/11 v1.4 Extract size and resolution data from bitmap files (HO)]%
\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2007/10/21]
+\usepackage{holtxdoc}[2007/11/11]
\begin{document}
\DocInput{bmpsize.dtx}%
\end{document}
%</driver>
% \fi
%
-% \CheckSum{3562}
+% \CheckSum{3585}
%
% \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
@@ -172,7 +178,7 @@ and the derived files
% \GetFileInfo{bmpsize.drv}
%
% \title{The \xpackage{bmpsize} package}
-% \date{2007/05/01 v1.3}
+% \date{2007/11/11 v1.4}
% \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
%
% \maketitle
@@ -368,7 +374,7 @@ and the derived files
% \begin{macrocode}
%<*base>
\ProvidesPackage{bmpsize-base}%
- [2007/05/01 v1.3 Basic part of bmpsize (HO)]%
+ [2007/11/11 v1.4 Basic part of bmpsize (HO)]%
% \end{macrocode}
% Modules of package \xpackage{fp} are used for calculations.
% \begin{macrocode}
@@ -391,6 +397,9 @@ and the derived files
% \end{macrocode}
% \end{macro}
% \begin{macrocode}
+\RequirePackage{pdftexcmds}[2007/11/11]
+% \end{macrocode}
+% \begin{macrocode}
\newif\ifbmpsize@ok
\let\@bmpsize@ok\bmpsize@oktrue
@@ -425,7 +434,7 @@ and the derived files
\def\@bmpsize@break#1\@bmpsize@loop#2{}
\def\@bmpsize@size#1#2#3{%
- \edef#3{\pdffilesize{#1}}%
+ \edef#3{\pdf@filesize{#1}}%
\ifx#3\@empty
\expandafter\@bmpsize@stop
\fi
@@ -435,7 +444,7 @@ and the derived files
}
\def\@bmpsize@read#1#2#3{%
- \edef\@bmpsize@buf{\pdffiledump offset#3length#2{#1}}%
+ \edef\@bmpsize@buf{\pdf@filedump{#3}{#2}{#1}}%
\edef\@bmpsize@temp{%
\noexpand\@bmpsize@check@byte{#2}\@bmpsize@buf{}{}\noexpand\\%
}%
@@ -449,8 +458,7 @@ and the derived files
\fi
{%
\edef\@bmpsize@buf{%
- \pdffiledump offset\bmpsize@offset
- length\bmpsize@fillbuflength{#1}%
+ \pdf@filedump{\bmpsize@offset}{\bmpsize@fillbuflength}{#1}%
}%
\ifx\@bmpsize@buf\@empty
\expandafter\@bmpsize@stop
@@ -468,13 +476,13 @@ and the derived files
}
\def\@bmpsize@iswhite#1{%
- \ifnum\pdfstrcmp{#1}{09}=\z@
+ \ifnum\pdf@strcmp{#1}{09}=\z@
\else
- \ifnum\pdfstrcmp{#1}{0A}=\z@
+ \ifnum\pdf@strcmp{#1}{0A}=\z@
\else
- \ifnum\pdfstrcmp{#1}{0D}=\z@
+ \ifnum\pdf@strcmp{#1}{0D}=\z@
\else
- \ifnum\pdfstrcmp{#1}{20}=\z@
+ \ifnum\pdf@strcmp{#1}{20}=\z@
\else
1%
\fi
@@ -484,10 +492,10 @@ and the derived files
\space
}
\def\@bmpsize@isdigit#1{%
- \ifnum\pdfstrcmp{#1}{30}<\z@
+ \ifnum\pdf@strcmp{#1}{30}<\z@
1%
\else
- \ifnum\pdfstrcmp{#1}{39}>\z@
+ \ifnum\pdf@strcmp{#1}{39}>\z@
1%
\fi
\fi
@@ -550,7 +558,7 @@ and the derived files
\if@bmpsize@absnum
\ifnum"\expandafter\@car#1\@nil>7 %
\edef#1{\expandafter\@bmpsize@abs@byte#1\relax}%
- \ifnum\pdfstrcmp{#1}{7FFFFFFF}=\z@
+ \ifnum\pdf@strcmp{#1}{7FFFFFFF}=\z@
\let\@bmpsize@temp\@bmpsize@stop
\else
\def\@bmpsize@temp{\edef#1{\the\numexpr#1+1}}%
@@ -588,7 +596,7 @@ and the derived files
\@bmpsize@grab#14%
\@bmpsize@swap@maybe#1%
\@bmpsize@abs@maybe#1%
- \ifnum\pdfstrcmp{#1}{7FFFFFFF}>\z@
+ \ifnum\pdf@strcmp{#1}{7FFFFFFF}>\z@
\expandafter\@bmpsize@stop
\fi
\edef#1{\number"#1}%
@@ -834,14 +842,14 @@ and the derived files
\@bmpsize@grab\bmpsize@temp{8}%
\@bmpsize@skip@four
\@bmpsize@skip@four
- \ifnum\pdfstrcmp{\bmpsize@temp}{89504E470D0A1A0A}=\z@
+ \ifnum\pdf@strcmp{\bmpsize@temp}{89504E470D0A1A0A}=\z@
\else
\expandafter\@bmpsize@stop
\fi
\@bmpsize@num@four\bmpsize@length
\@bmpsize@grab\bmpsize@temp{4}%
\@bmpsize@skip@four
- \ifnum\pdfstrcmp{\bmpsize@temp}{49484452}=\z@
+ \ifnum\pdf@strcmp{\bmpsize@temp}{49484452}=\z@
\else
\expandafter\@bmpsize@stop
\fi
@@ -854,7 +862,7 @@ and the derived files
\@bmpsize@num@four\bmpsize@length
\@bmpsize@grab\bmpsize@temp{4}%
\@bmpsize@skip@four
- \ifnum\pdfstrcmp{\bmpsize@temp}{49444154}=\z@
+ \ifnum\pdf@strcmp{\bmpsize@temp}{49444154}=\z@
\expandafter\@firstofone
\else
\expandafter\@gobble
@@ -862,7 +870,7 @@ and the derived files
{%
\@bmpsize@stop
}%
- \ifnum\pdfstrcmp{\bmpsize@temp}{70485973}=\z@
+ \ifnum\pdf@strcmp{\bmpsize@temp}{70485973}=\z@
\expandafter\@firstofone
\else
\expandafter\@gobble
@@ -1089,7 +1097,7 @@ and the derived files
\@bmpsize@grab\bmpsize@temp{3}%
\@bmpsize@skip@two
\@bmpsize@skip@one
- \ifnum\pdfstrcmp{\bmpsize@temp}{FFD8FF}=\z@
+ \ifnum\pdf@strcmp{\bmpsize@temp}{FFD8FF}=\z@
\else
\expandafter\@bmpsize@stop
\fi
@@ -1099,7 +1107,7 @@ and the derived files
\@bmpsize@read{#1}{4}{\bmpsize@offset}%
\@bmpsize@grab\bmpsize@temp{1}%
\@bmpsize@skip@one
- \ifnum\pdfstrcmp{\bmpsize@temp}{FF}=\z@
+ \ifnum\pdf@strcmp{\bmpsize@temp}{FF}=\z@
\else
\expandafter\@bmpsize@stop
\fi
@@ -1135,7 +1143,7 @@ and the derived files
\@bmpsize@grab\bmpsize@temp{5}%
\@bmpsize@skip@four
\@bmpsize@skip@one
- \ifnum\pdfstrcmp{\bmpsize@temp}{4A46494600}=\z@
+ \ifnum\pdf@strcmp{\bmpsize@temp}{4A46494600}=\z@
\expandafter\@firstofone
\else
\expandafter\@gobble
@@ -1186,7 +1194,7 @@ and the derived files
\@bmpsize@grab\bmpsize@temp{6}%
\@bmpsize@skip@four
\@bmpsize@skip@two
- \ifnum\pdfstrcmp{\bmpsize@temp}{457869660000}=\z@
+ \ifnum\pdf@strcmp{\bmpsize@temp}{457869660000}=\z@
\expandafter\@firstofone
\else
\expandafter\@gobble
@@ -1195,7 +1203,7 @@ and the derived files
\edef\bmpsize@exifoffset{\the\numexpr\bmpsize@offset+10}%
\@bmpsize@grab\bmpsize@temp{2}%
\@bmpsize@skip@two
- \ifnum\pdfstrcmp{\bmpsize@temp}{4949}=\z@
+ \ifnum\pdf@strcmp{\bmpsize@temp}{4949}=\z@
\expandafter\@firstoftwo
\else
\expandafter\@secondoftwo
@@ -1203,7 +1211,7 @@ and the derived files
{%
\@bmpsize@bigendianfalse
}{%
- \ifnum\pdfstrcmp{\bmpsize@temp}{4D4D}=\z@
+ \ifnum\pdf@strcmp{\bmpsize@temp}{4D4D}=\z@
\else
\expandafter\@bmpsize@stop
\fi
@@ -1444,7 +1452,7 @@ and the derived files
\@bmpsize@read{#1}{26}{0}%
\@bmpsize@grab\bmpsize@temp{2}%
\@bmpsize@skip@two
- \ifnum\pdfstrcmp{\bmpsize@temp}{424D}=\z@
+ \ifnum\pdf@strcmp{\bmpsize@temp}{424D}=\z@
\else
\expandafter\@bmpsize@stop
\fi
@@ -1531,7 +1539,7 @@ and the derived files
\@bmpsize@grab\bmpsize@temp{3}%
\@bmpsize@skip@two
\@bmpsize@skip@one
- \ifnum\pdfstrcmp{\bmpsize@temp}{474946}=\z@
+ \ifnum\pdf@strcmp{\bmpsize@temp}{474946}=\z@
\else
\expandafter\@bmpsize@stop
\fi
@@ -1657,7 +1665,7 @@ and the derived files
\@bmpsize@read{#1}{8}{0}%
\@bmpsize@grab\bmpsize@temp{2}%
\@bmpsize@skip@two
- \ifnum\pdfstrcmp{\bmpsize@temp}{4949}=\z@
+ \ifnum\pdf@strcmp{\bmpsize@temp}{4949}=\z@
\expandafter\@firstoftwo
\else
\expandafter\@secondoftwo
@@ -1665,7 +1673,7 @@ and the derived files
{%
\@bmpsize@bigendianfalse
}{%
- \ifnum\pdfstrcmp{\bmpsize@temp}{4D4D}=\z@
+ \ifnum\pdf@strcmp{\bmpsize@temp}{4D4D}=\z@
\else
\expandafter\@bmpsize@stop
\fi
@@ -1882,16 +1890,16 @@ and the derived files
\def\bmpsize@offset{3}%
\@bmpsize@grab\bmpsize@temp{1}%
\@bmpsize@skip@one
- \ifnum\pdfstrcmp{\bmpsize@temp}{50}=\z@
+ \ifnum\pdf@strcmp{\bmpsize@temp}{50}=\z@
\else
\expandafter\@bmpsize@stop
\fi
\@bmpsize@grab\bmpsize@temp{1}%
\@bmpsize@skip@one
- \ifnum\pdfstrcmp{\bmpsize@temp}{31}<\z@
+ \ifnum\pdf@strcmp{\bmpsize@temp}{31}<\z@
\expandafter\@bmpsize@stop
\fi
- \ifnum\pdfstrcmp{\bmpsize@temp}{36}>\z@
+ \ifnum\pdf@strcmp{\bmpsize@temp}{36}>\z@
\expandafter\@bmpsize@stop
\fi
\@bmpsize@grab\bmpsize@temp{1}%
@@ -1914,7 +1922,7 @@ and the derived files
\expandafter\@firstofone
\fi
{%
- \ifnum\pdfstrcmp{\bmpsize@temp}{23}=\z@
+ \ifnum\pdf@strcmp{\bmpsize@temp}{23}=\z@
\expandafter\@firstoftwo
\else
\expandafter\@secondoftwo
@@ -1924,7 +1932,7 @@ and the derived files
\@bmpsize@fillbuf{#1}%
\@bmpsize@grab\bmpsize@temp{1}%
\@bmpsize@skip@one
- \ifnum\pdfstrcmp{\bmpsize@temp}{0A}=\z@
+ \ifnum\pdf@strcmp{\bmpsize@temp}{0A}=\z@
\expandafter\@firstoftwo
\else
\expandafter\@secondoftwo
@@ -1932,7 +1940,7 @@ and the derived files
{%
\@bmpsize@break
}{%
- \ifnum\pdfstrcmp{\bmpsize@temp}{0D}=\z@
+ \ifnum\pdf@strcmp{\bmpsize@temp}{0D}=\z@
\expandafter\@firstofone
\else
\expandafter\@gobble
@@ -1973,7 +1981,7 @@ and the derived files
}%
}%
}%
- \edef\bmpsize@pixelwidth{\pdfunescapehex{\bmpsize@tempnum}}%
+ \edef\bmpsize@pixelwidth{\pdf@unescapehex{\bmpsize@tempnum}}%
\@bmpsize@loop{%
\@bmpsize@fillbuf{#1}%
\@bmpsize@grab\bmpsize@temp{1}%
@@ -2013,7 +2021,7 @@ and the derived files
}%
}%
}%
- \edef\bmpsize@pixelheight{\pdfunescapehex{\bmpsize@tempnum}}%
+ \edef\bmpsize@pixelheight{\pdf@unescapehex{\bmpsize@tempnum}}%
\@bmpsize@ok
\@bmpsize@stop
\@nil
@@ -2176,7 +2184,7 @@ and the derived files
\@bmpsize@grab\bmpsize@temp{3}%
\@bmpsize@skip@two
\@bmpsize@skip@one
- \ifnum\pdfstrcmp{\bmpsize@temp}{50370A}=\z@
+ \ifnum\pdf@strcmp{\bmpsize@temp}{50370A}=\z@
\else
\expandafter\@bmpsize@stop
\fi
@@ -2192,7 +2200,7 @@ and the derived files
{%
\edef\bmpsize@off{\the\numexpr\bmpsize@off+1}%
}{%
- \ifnum\pdfstrcmp{\bmpsize@temp}{23}=\z@
+ \ifnum\pdf@strcmp{\bmpsize@temp}{23}=\z@
\expandafter\@firstoftwo
\else
\expandafter\@secondoftwo
@@ -2204,7 +2212,7 @@ and the derived files
\@bmpsize@grab\bmpsize@temp{1}%
\@bmpsize@skip@one
\edef\bmpsize@off{\the\numexpr\bmpsize@off+1}%
- \ifnum\pdfstrcmp{\bmpsize@temp}{0A}=\z@
+ \ifnum\pdf@strcmp{\bmpsize@temp}{0A}=\z@
\expandafter\@firstofone
\else
\expandafter\@gobble
@@ -2219,7 +2227,7 @@ and the derived files
\@bmpsize@grab\bmpsize@head{5}%
\@bmpsize@skip@four
\@bmpsize@skip@one
- \ifnum\pdfstrcmp{\bmpsize@head}{5749445448}=\z@
+ \ifnum\pdf@strcmp{\bmpsize@head}{5749445448}=\z@
\expandafter\@firstoftwo
\else
\expandafter\@secondoftwo
@@ -2274,7 +2282,7 @@ and the derived files
\@bmpsize@grab\bmpsize@temp{1}%
\@bmpsize@skip@one
\edef\bmpsize@off{\the\numexpr\bmpsize@off+1}%
- \ifnum\pdfstrcmp{\bmpsize@temp}{0A}=\z@
+ \ifnum\pdf@strcmp{\bmpsize@temp}{0A}=\z@
\expandafter\@firstofone
\else
\expandafter\@gobble
@@ -2283,12 +2291,12 @@ and the derived files
\@bmpsize@break
}%
}%
- \edef\bmpsize@pixelwidth{\pdfunescapehex{\bmpsize@tempnum}}%
+ \edef\bmpsize@pixelwidth{\pdf@unescapehex{\bmpsize@tempnum}}%
}{%
\@bmpsize@grab\bmpsize@temp{1}%
\@bmpsize@skip@one
\@bmpsize@append\bmpsize@head\bmpsize@head\bmpsize@temp
- \ifnum\pdfstrcmp{\bmpsize@head}{454E44484452}=\z@
+ \ifnum\pdf@strcmp{\bmpsize@head}{454E44484452}=\z@
\expandafter\@firstoftwo
\else
\expandafter\@secondoftwo
@@ -2297,7 +2305,7 @@ and the derived files
\@bmpsize@ok
\@bmpsize@stop
}{%
- \ifnum\pdfstrcmp{\bmpsize@head}{484549474854}=\z@
+ \ifnum\pdf@strcmp{\bmpsize@head}{484549474854}=\z@
\expandafter\@firstoftwo
\else
\expandafter\@secondoftwo
@@ -2352,7 +2360,7 @@ and the derived files
\@bmpsize@grab\bmpsize@temp{1}%
\@bmpsize@skip@one
\edef\bmpsize@off{\the\numexpr\bmpsize@off+1}%
- \ifnum\pdfstrcmp{\bmpsize@temp}{0A}=\z@
+ \ifnum\pdf@strcmp{\bmpsize@temp}{0A}=\z@
\expandafter\@firstofone
\else
\expandafter\@gobble
@@ -2361,7 +2369,7 @@ and the derived files
\@bmpsize@break
}%
}%
- \edef\bmpsize@pixelheight{\pdfunescapehex{\bmpsize@tempnum}}%
+ \edef\bmpsize@pixelheight{\pdf@unescapehex{\bmpsize@tempnum}}%
}{%
\@bmpsize@pushback\bmpsize@head
\@bmpsize@loop{%
@@ -2369,7 +2377,7 @@ and the derived files
\@bmpsize@grab\bmpsize@temp{1}%
\@bmpsize@skip@one
\edef\bmpsize@off{\the\numexpr\bmpsize@off+1}%
- \ifnum\pdfstrcmp{\bmpsize@temp}{0A}=\z@
+ \ifnum\pdf@strcmp{\bmpsize@temp}{0A}=\z@
\expandafter\@firstofone
\else
\expandafter\@gobble
@@ -2508,7 +2516,7 @@ and the derived files
\@bmpsize@skip@four
\@bmpsize@skip@one
\def\bmpsize@offset{9}%
- \ifnum\pdfstrcmp{\bmpsize@temp}{2F2A2058504D202A2F}=\z@
+ \ifnum\pdf@strcmp{\bmpsize@temp}{2F2A2058504D202A2F}=\z@
\else
\expandafter\@bmpsize@stop
\fi
@@ -2516,7 +2524,7 @@ and the derived files
\@bmpsize@fillbuf{#1}%
\@bmpsize@grab\bmpsize@temp{1}%
\@bmpsize@skip@one
- \ifnum\pdfstrcmp{\bmpsize@temp}{22}=\z@
+ \ifnum\pdf@strcmp{\bmpsize@temp}{22}=\z@
\expandafter\@firstofone
\else
\expandafter\@gobble
@@ -2524,7 +2532,7 @@ and the derived files
{%
\@bmpsize@break
}%
- \ifnum\pdfstrcmp{\bmpsize@temp}{2F}=\z@
+ \ifnum\pdf@strcmp{\bmpsize@temp}{2F}=\z@
\expandafter\@firstofone
\else
\expandafter\@gobble
@@ -2533,7 +2541,7 @@ and the derived files
\@bmpsize@fillbuf{#1}%
\@bmpsize@grab\bmpsize@temp{1}%
\@bmpsize@skip@one
- \ifnum\pdfstrcmp{\bmpsize@temp}{2A}=\z@
+ \ifnum\pdf@strcmp{\bmpsize@temp}{2A}=\z@
\expandafter\@firstofone
\else
\expandafter\@gobble
@@ -2543,7 +2551,7 @@ and the derived files
\@bmpsize@fillbuf{#1}%
\@bmpsize@grab\bmpsize@temp{1}%
\@bmpsize@skip@one
- \ifnum\pdfstrcmp{\bmpsize@temp}{2A}=\z@
+ \ifnum\pdf@strcmp{\bmpsize@temp}{2A}=\z@
\expandafter\@firstofone
\else
\expandafter\@gobble
@@ -2553,7 +2561,7 @@ and the derived files
\@bmpsize@fillbuf{#1}%
\@bmpsize@grab\bmpsize@temp{1}%
\@bmpsize@skip@one
- \ifnum\pdfstrcmp{\bmpsize@temp}{2F}=\z@
+ \ifnum\pdf@strcmp{\bmpsize@temp}{2F}=\z@
\expandafter\@firstofone
\else
\expandafter\@gobble
@@ -2561,7 +2569,7 @@ and the derived files
{%
\@bmpsize@break
}%
- \ifnum\pdfstrcmp{\bmpsize@temp}{2A}=\z@
+ \ifnum\pdf@strcmp{\bmpsize@temp}{2A}=\z@
\expandafter\@gobble
\else
\expandafter\@firstofone
@@ -2570,7 +2578,7 @@ and the derived files
\@bmpsize@break
}%
}%
- \ifnum\pdfstrcmp{\bmpsize@temp}{2F}=\z@
+ \ifnum\pdf@strcmp{\bmpsize@temp}{2F}=\z@
\expandafter\@firstofone
\else
\expandafter\@gobble
@@ -2631,7 +2639,7 @@ and the derived files
}%
}%
}%
- \edef\bmpsize@pixelwidth{\pdfunescapehex{\bmpsize@tempnum}}%
+ \edef\bmpsize@pixelwidth{\pdf@unescapehex{\bmpsize@tempnum}}%
\def\bmpsize@tempnum{}%
\@bmpsize@loop{%
\@bmpsize@fillbuf{#1}%
@@ -2680,7 +2688,7 @@ and the derived files
}%
}%
}%
- \edef\bmpsize@pixelheight{\pdfunescapehex{\bmpsize@tempnum}}%
+ \edef\bmpsize@pixelheight{\pdf@unescapehex{\bmpsize@tempnum}}%
\@bmpsize@ok
\@bmpsize@stop
\@nil
@@ -2745,13 +2753,13 @@ and the derived files
\@bmpsize@read{#1}{16}{1}%
\@bmpsize@grab\bmpsize@temp{1}%
\@bmpsize@skip@one
- \ifnum\pdfstrcmp{\bmpsize@temp}{00}=\z@
+ \ifnum\pdf@strcmp{\bmpsize@temp}{00}=\z@
\expandafter\@gobble
\else
\expandafter\@firstofone
\fi
{%
- \ifnum\pdfstrcmp{\bmpsize@temp}{01}=\z@
+ \ifnum\pdf@strcmp{\bmpsize@temp}{01}=\z@
\expandafter\@gobble
\else
\expandafter\@firstofone
@@ -2775,7 +2783,7 @@ and the derived files
\@bmpsize@skip@four
\@bmpsize@skip@four
\@bmpsize@skip@two
- \ifnum\pdfstrcmp{\bmpsize@temp}{54525545564953494F4E2D5846494C452E00}=\z@
+ \ifnum\pdf@strcmp{\bmpsize@temp}{54525545564953494F4E2D5846494C452E00}=\z@
\expandafter\@gobble
\else
\expandafter\@firstofone
@@ -2848,7 +2856,7 @@ and the derived files
\@bmpsize@read{#1}{16}{0}%
\@bmpsize@grab\bmpsize@temp{1}%
\@bmpsize@skip@one
- \ifnum\pdfstrcmp{\bmpsize@temp}{0A}=\z@
+ \ifnum\pdf@strcmp{\bmpsize@temp}{0A}=\z@
\else
\expandafter\@bmpsize@stop
\fi
@@ -2924,13 +2932,13 @@ and the derived files
\@bmpsize@read{#1}{16}{0}%
\@bmpsize@grab\bmpsize@temp{4}%
\@bmpsize@skip@four
- \ifnum\pdfstrcmp{\bmpsize@temp}{44616E4D}=\z@
+ \ifnum\pdf@strcmp{\bmpsize@temp}{44616E4D}=\z@
\expandafter\@gobble
\else
\expandafter\@firstofone
\fi
{%
- \ifnum\pdfstrcmp{\bmpsize@temp}{4C696E53}=\z@
+ \ifnum\pdf@strcmp{\bmpsize@temp}{4C696E53}=\z@
\else
\expandafter\@bmpsize@stop
\fi
@@ -2986,7 +2994,7 @@ and the derived files
\@bmpsize@read{#1}{10}{0}%
\@bmpsize@grab\bmpsize@temp{2}%
\@bmpsize@skip@two
- \ifnum\pdfstrcmp{\bmpsize@temp}{01DA}=\z@
+ \ifnum\pdf@strcmp{\bmpsize@temp}{01DA}=\z@
\else
\expandafter\@bmpsize@stop
\fi
@@ -3015,24 +3023,39 @@ and the derived files
% \begin{macrocode}
%<*package>
\ProvidesPackage{bmpsize}%
- [2007/05/01 v1.3 Extract size and resolution data from bitmap files (HO)]%
+ [2007/11/11 v1.4 Extract size and resolution data from bitmap files (HO)]%
\RequirePackage{ifpdf}
\ifpdf
\PackageInfo{bmpsize}{Superseded by pdfTeX in PDF mode}%
\expandafter\endinput
\fi
+\RequirePackage{pdftexcmds}[2007/11/11]
\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname pdffiledump\endcsname\relax
+\expandafter\ifx\csname pdf@filedump\endcsname\relax
\PackageError{bmpsize}{%
You need pdfTeX 1.30.0 or newer%
}{Package loading is aborted.}%
\expandafter\endinput
\fi
+\RequirePackage{infwarerr}[2007/09/09]
\RequirePackage{graphics}
-\RequirePackage{keyval}
+% \end{macrocode}
+% In case of \plainTeX\ options are not executed
+% and \cs{KV@err} and \cs{KV@errx} are undefined.
+% \begin{macrocode}
+\RequirePackage{keyval}\relax
+\expandafter\ifx\csname KV@errx\endcsname\relax
+ \def\KV@errx#1{%
+ \@PackageError{keyval}{#1}\@ehc
+ }%
+\fi
+\expandafter\ifx\csname KV@err\endcsname\relax
+ \let\KV@err\KV@errx
+\fi
+% \end{macrocode}
+% \begin{macrocode}
\RequirePackage{bmpsize-base}
-\RequirePackage{infwarerr}
\InputIfFileExists{bmpsize-\Gin@driver}{}{}
@@ -3058,18 +3081,18 @@ and the derived files
\x{ }
\def\@bmpsize@read@resolution#1#2 #3 #4\@nil{%
\ifcase 0\ifx\\#2\\1\fi
- \ifnum\pdfstrcmp{#2}{\Gin@exclamation}=\z@
+ \ifnum\pdf@strcmp{#2}{\Gin@exclamation}=\z@
\ifx\\#3\\1\fi
- \ifnum\pdfstrcmp{#3}{\Gin@exclamation}=\z@
+ \ifnum\pdf@strcmp{#3}{\Gin@exclamation}=\z@
1%
\fi
\fi
- \ifcase\pdfstrcmp{#2}{\Gin@exclamation}\relax
+ \ifcase\pdf@strcmp{#2}{\Gin@exclamation}\relax
\let\bmpsize@pixelx@default\Gin@exclamation
\else
\edef\bmpsize@pixelx@default{#2}%
\fi
- \ifcase\pdfstrcmp{#3}{\Gin@exclamation}\relax
+ \ifcase\pdf@strcmp{#3}{\Gin@exclamation}\relax
\let\bmpsize@pixely@default\Gin@exclamation
\else
\ifx\\#3\\%
@@ -3091,7 +3114,7 @@ and the derived files
\let\@bmpsize@org@setfile\Gin@setfile
\def\Gin@setfile#1#2#3{%
- \ifcase\pdfstrcmp{#1}{bmp}\relax
+ \ifcase\pdf@strcmp{#1}{bmp}\relax
\expandafter\@firstofone
\else
\expandafter\@gobble
@@ -3188,7 +3211,7 @@ and the derived files
% \begin{macrocode}
%<*dvips>
\ProvidesFile{bmpsize-dvips.def}%
- [2007/05/01 v1.3 Graphics bitmap driver for dvips (HO)]%
+ [2007/11/11 v1.4 Graphics bitmap driver for dvips (HO)]%
% \end{macrocode}
% Ensure correct catcodes.
% \begin{macrocode}
@@ -3311,11 +3334,11 @@ and the derived files
% \begin{macrocode}
%<*dvipdfm>
\ProvidesFile{bmpsize-dvipdfm.def}%
- [2007/05/01 v1.3 Graphics bitmap driver for dvipdfm (HO)]%
+ [2007/11/11 v1.4 Graphics bitmap driver for dvipdfm (HO)]%
%</dvipdfm>
%<*dvipdfmx>
\ProvidesFile{bmpsize-dvipdfmx.def}%
- [2007/05/01 v1.3 Graphics bitmap driver for dvipdfmx (HO)]%
+ [2007/11/11 v1.4 Graphics bitmap driver for dvipdfmx (HO)]%
%</dvipdfmx>
%<*dvipdfm|dvipdfmx>
% \end{macrocode}
@@ -3350,10 +3373,10 @@ and the derived files
% \begin{macro}{\@bmpsize@pdfescapestring}
% \begin{macrocode}
\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname pdfescapestring\endcsname\relax
+\expandafter\ifx\csname pdf@escapestring\endcsname\relax
\def\@bmpsize@pdfescapestring#1{#1}%
\else
- \let\@bmpsize@pdfescapestring\pdfescapestring
+ \let\@bmpsize@pdfescapestring\pdf@escapestring
\fi
% \end{macrocode}
% \end{macro}
@@ -3529,7 +3552,7 @@ and the derived files
% \begin{macrocode}
%<*test>
\expandafter\ifx\csname NeedsTeXFormat\endcsname\relax
-\input miniltx
+ \input miniltx\relax
\fi
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname pdfoutput\endcsname\relax
@@ -3560,7 +3583,7 @@ and the derived files
\csname @@end\endcsname
\end
}{%
- \ifnum\pdfstrcmp{\imagename}{opt}=\z@
+ \ifnum\pdf@strcmp{\imagename}{opt}=\z@
\expandafter\optionmenu
\else
\startimg
@@ -3630,7 +3653,7 @@ and the derived files
\fi
}%
\ifx\@found\@empty
- \edef\@file@date{\pdffilemoddate{\imagename}}%
+ \edef\@file@date{\pdf@filemoddate{\imagename}}%
\ifx\@file@date\@empty
\msg{\space\space --> File not found <--}%
\else
@@ -3931,6 +3954,13 @@ and the derived files
% \item
% Some support for Exif's orientation tag.
% \end{Version}
+% \begin{Version}{2007/11/11 v1.4}
+% \item
+% Use of package \xpackage{pdftexcmds} for \LuaTeX\ support.
+% \item
+% Fix of bug of package \xpackage{keyval}: \cs{KV@err} and \cs{KV@errx}
+% are used, but undefined if loaded by \plainTeX.
+% \end{Version}
% \end{History}
%
% \PrintIndex