diff options
author | Karl Berry <karl@freefriends.org> | 2007-05-09 21:54:51 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2007-05-09 21:54:51 +0000 |
commit | 1b38d8b54a69cadeaa6385690a7c81d829136b57 (patch) | |
tree | 04211e793c0561074765e235bccf1e6ccb3ff23b /Master/texmf-dist/tex/latex/oberdiek | |
parent | 64ae38fe6e63257c9c5387838608ac4e8f664446 (diff) |
oberdiek update
git-svn-id: svn://tug.org/texlive/trunk@4272 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/oberdiek')
21 files changed, 250 insertions, 97 deletions
diff --git a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-base.sty b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-base.sty index 0c83ee38925..8a9ecaf4efd 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-base.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-base.sty @@ -29,7 +29,7 @@ %% bmpsize-dvipdfm.def, bmpsize-dvipdfmx.def. %% \ProvidesPackage{bmpsize-base}% - [2007/04/11 v1.2 Basic part of bmpsize (HO)]% + [2007/04/29 v1.3 Basic part of bmpsize (HO)]% \RequirePackage{fp-basic} \RequirePackage{fp-snap} \long\def\@bmpsize@plain@loop#1\repeat{% @@ -62,6 +62,7 @@ \let\bmpsize@unit\relax \let\bmpsize@pixelxdenom\relax \let\bmpsize@pixelydenom\relax + \let\bmpsize@orientation\relax } \def\@bmpsize@stop#1\@nil{} @@ -669,6 +670,31 @@ \let\bmpsize@exifdensity\bmpsize@exifdensity \fi }% + \ifnum\bmpsize@tag=274\relax + \expandafter\@firstofone + \else + \expandafter\@gobble + \fi + {% + \@bmpsize@skip@four + \@bmpsize@skip@two + \@bmpsize@num@two\bmpsize@temp + \unless\ifnum\bmpsize@temp<0\relax + \expandafter\@firstofone + \else + \expandafter\@gobble + \fi + {% + \unless\ifnum\bmpsize@temp>8\relax + \expandafter\@firstofone + \else + \expandafter\@gobble + \fi + {% + \let\bmpsize@orientation\bmpsize@temp + }% + }% + }% \ifnum\bmpsize@tag=282\relax \expandafter\@firstofone \else diff --git a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfm.def b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfm.def index 73e6b410714..ae09c031f20 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfm.def +++ b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfm.def @@ -29,7 +29,7 @@ %% bmpsize-dvipdfm.def, bmpsize-dvipdfmx.def. %% \ProvidesFile{bmpsize-dvipdfm.def}% - [2007/04/11 v1.2 Graphics bitmap driver for dvipdfm (HO)]% + [2007/04/29 v1.3 Graphics bitmap driver for dvipdfm (HO)]% \expandafter\edef\csname @bmpsize@driver@catcodes\endcsname{% \catcode44 \the\catcode44 % , \catcode46 \the\catcode46 % . @@ -56,9 +56,7 @@ \else \let\@bmpsize@pdfescapestring\pdfescapestring \fi -\@ifundefined{bmpsize@dvipdfm@factor}{% - \def\bmpsize@dvipdfm@factor{.99626}% -}{} +\def\bmpsize@dvipdfm@factor{.99626} \def\Ginclude@bmp#1{% \message{<#1>}% \ifGin@clip @@ -112,7 +110,7 @@ \the\@bmpsize@count }% \special{% - pdf:image @IMG\csname\@bmpsize@temp\endcsname\space + pdf:image @IMG\the\@bmpsize@count\space width \the\Gin@req@width\space height \the\Gin@req@height\space depth 0pt (\@bmpsize@pdfescapestring{#1})% diff --git a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfmx.def b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfmx.def index dacf67b3f06..18360665b9a 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfmx.def +++ b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfmx.def @@ -29,18 +29,134 @@ %% bmpsize-dvipdfm.def, bmpsize-dvipdfmx.def. %% \ProvidesFile{bmpsize-dvipdfmx.def}% - [2007/04/11 v1.2 Graphics bitmap driver for dvipdfmx (HO)]% + [2007/04/29 v1.3 Graphics bitmap driver for dvipdfmx (HO)]% \expandafter\edef\csname @bmpsize@driver@catcodes\endcsname{% + \catcode44 \the\catcode44 % , \catcode46 \the\catcode46 % . + \catcode58 \the\catcode58 % : + \catcode60 \the\catcode60 % < + \catcode61 \the\catcode61 % = + \catcode62 \the\catcode62 % > \catcode64 \the\catcode64 % @ } \catcode64 11 % +\@makeother\, \@makeother\. -\@ifundefined{bmpsize@dvipdfm@factor}{% - \def\bmpsize@dvipdfm@factor{.01384}% +\@makeother\: +\@makeother\< +\@makeother\= +\@makeother\> +\@ifundefined{@bmpsize@count}{% + \csname newcount\endcsname\@bmpsize@count + \@bmpsize@count=\z@ }{} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname pdfescapestring\endcsname\relax + \def\@bmpsize@pdfescapestring#1{#1}% +\else + \let\@bmpsize@pdfescapestring\pdfescapestring +\fi +\def\bmpsize@dvipdfmx@factor{1.3837} +\def\Ginclude@bmp#1{% + \message{<#1>}% + \ifGin@clip + \global\advance\@bmpsize@count\@ne + \edef\@bmpsize@clip@name{@CLIP@\the\@bmpsize@count}% + \special{% + pdf:bxobj \@bmpsize@clip@name\space + width \the\Gin@req@width\space + height \the\Gin@req@height + }% + \fi + \hbox to \z@{% + \@ifundefined{Gin@ollx}{% + \dimen@\z@ + }{% + \ifx\Gin@scalex\Gin@exclamation + \let\Gin@scalex\Gin@scaley + \fi + \ifx\Gin@scaley\Gin@exclamation + \let\Gin@scaley\Gin@scalex + \fi + \@ifundefined{bmpsize@width}{% + \let\bmpsize@width\Gin@ourx + \let\bmpsize@height\Gin@oury + }{}% + \dimen@=\Gin@llx bp\relax + \dimen@=\Gin@scalex\dimen@ + \kern-\dimen@ + \advance\Gin@req@width\dimen@ + \dimen@=\bmpsize@width bp\relax + \advance\dimen@ by -\Gin@urx bp\relax + \dimen@=\Gin@scalex\dimen@ + \advance\Gin@req@width\dimen@ + \dimen@=\bmpsize@height bp\relax + \advance\dimen@ by -\Gin@ury bp\relax + \dimen@=\Gin@scaley\dimen@ + \advance\Gin@req@height\dimen@ + \dimen@=\Gin@lly bp\relax + \dimen@=\Gin@scaley\dimen@ + \advance\Gin@req@height\dimen@ + }% + \ifdim\dimen@=\z@ + \else + \vbox to\z@\bgroup + \kern\dimen@ + \fi + \edef\@bmpsize@temp{@IMG@\@bmpsize@pdfescapestring{#1}}% + \@ifundefined{\@bmpsize@temp}{% + \global\advance\@bmpsize@count\@ne + \expandafter\ifx\csname bmpsize@pixelwidth\endcsname\relax + \else + \expandafter\xdef\csname\@bmpsize@temp\endcsname{% + \the\@bmpsize@count:\bmpsize@pixelwidth:\bmpsize@pixelheight + }% + \fi + \special{% + pdf:image @IMG\the\@bmpsize@count\space + width \the\Gin@req@width\space + height \the\Gin@req@height\space + depth 0pt (\@bmpsize@pdfescapestring{#1})% + }% + }{% + \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 + \special{% + pdf:bt % + xscale \@bmpsize@xscale\space + yscale \@bmpsize@yscale + }% + \special{pdf:uxobj @IMG\@bmpsize@imgnum}% + \special{pdf:et}% + }% + \ifdim\dimen@=\z@ + \else + \vss + \egroup + \fi + \hss + }% + \ifGin@clip + \special{pdf:exobj}% + \special{pdf:uxobj \@bmpsize@clip@name}% + \fi +} +\def\@bmpsize@extract#1:#2:#3\@nil{% + \def\@bmpsize@imgnum{#1}% + \def\@bmpsize@pixelwidth{#2}% + \def\@bmpsize@pixelheight{#3}% +} \@bmpsize@driver@catcodes -\input{bmpsize-dvipdfm.def} \endinput %% %% End of file `bmpsize-dvipdfmx.def'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvips.def b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvips.def index b2c50d30628..6e019336a00 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvips.def +++ b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvips.def @@ -29,7 +29,7 @@ %% bmpsize-dvipdfm.def, bmpsize-dvipdfmx.def. %% \ProvidesFile{bmpsize-dvips.def}% - [2007/04/11 v1.2 Graphics bitmap driver for dvips (HO)]% + [2007/04/29 v1.3 Graphics bitmap driver for dvips (HO)]% \expandafter\edef\csname @bmpsize@driver@catcodes\endcsname{% \catcode44 \the\catcode44 % , \catcode58 \the\catcode58 % : diff --git a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-test.tex b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-test.tex index 7eed5335e0a..2639a1be762 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-test.tex +++ b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-test.tex @@ -122,6 +122,10 @@ \fi \msg{\space\space Width: \bmpsize@width\space bp}% \msg{\space\space Height: \bmpsize@height\space bp}% + \ifx\bmpsize@orientation\relax + \else + \msg{\space\space Orientation: \bmpsize@orientation}% + \fi \fi \fi }% diff --git a/Master/texmf-dist/tex/latex/oberdiek/bmpsize.sty b/Master/texmf-dist/tex/latex/oberdiek/bmpsize.sty index e30608f5b74..42e934543ec 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bmpsize.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/bmpsize.sty @@ -29,7 +29,7 @@ %% bmpsize-dvipdfm.def, bmpsize-dvipdfmx.def. %% \ProvidesPackage{bmpsize}% - [2007/04/11 v1.2 Extract size and resolution data from bitmap files (HO)]% + [2007/04/29 v1.3 Extract size and resolution data from bitmap files (HO)]% \RequirePackage{ifpdf} \ifpdf \PackageInfo{bmpsize}{Superseded by pdfTeX in PDF mode}% @@ -46,29 +46,7 @@ \RequirePackage{graphics} \RequirePackage{keyval} \RequirePackage{bmpsize-base} - -\begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname PackageWarning\endcsname\relax - \def\@bmpsize@warning#1#2{% - \begingroup - \newlinechar=10 % - \def\MessageBreak{% - ^^J% - (bmpsize) % - \space\space\space\space - \space\space\space\space - \space\space\space\space - \space\space\space - }% - \immediate\write16{% - Package bmpsize Warning: #2 % - on input line \the\inputlineno.% - }% - \endgroup - }% -\else - \def\@bmpsize@warning{\PackageWarning{bmpsize}}% -\fi +\RequirePackage{infwarerr} \InputIfFileExists{bmpsize-\Gin@driver}{}{} @@ -159,7 +137,7 @@ \ifbmpsize@ok \ifGin@bbox \@ifundefined{Gin@vllx}{% - \@bmpsize@warning{Explicit bounding box is ignored}% + \@PackageWarning{bmpsize}{Explicit bounding box is ignored}% }{% \ifx\Gin@viewport@code\relax \def\Gin@ollx{0}% @@ -171,12 +149,12 @@ \let\Gin@vurx\Gin@urx \let\Gin@vury\Gin@ury \let\Gin@viewport@code\Gin@viewport - \@bmpsize@warning{% + \@PackageWarning{bmpsize}{% Explicit bounding box replaced by\MessageBreak viewport setting% }% \else - \@bmpsize@warning{Explicit bounding box is ignored}% + \@PackageWarning{bmpsize}{Explicit bounding box is ignored}% \fi }% \fi diff --git a/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty b/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty index 508bf4740a5..4b29380e6ac 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty @@ -33,7 +33,7 @@ %% the color of \emph statements. \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{kvoptions} - [2007/04/11 v2.5 Connects package keyval with LaTeX options (HO)]% + [2007/05/06 v2.6 Connects package keyval with LaTeX options (HO)]% \RequirePackage{keyval} \begingroup \edef\x{\endgroup @@ -413,11 +413,11 @@ \@ifundefined{KV@#1@\expandafter\KVO@getkey\KVO@CurrentOption=\@nil}{% }{% \edef\KVO@temp{% -^^B \unexpanded\expandafter{% +^^B \etex@unexpanded\expandafter{% \KVO@temp ^^B }% ,% -^^B \unexpanded\expandafter{% +^^B \etex@unexpanded\expandafter{% \KVO@CurrentOption ^^B }% ,% @@ -532,6 +532,16 @@ }% \expandafter\endinput \fi +\RequirePackage{etexcmds} +\ifetex@unexpanded +\else + \PackageError{kvoptions}{% + Could not find eTeX's \string\unexpanded.\MessageBreak + Try adding \string\RequirePackage\string{etexcmds\string} % + before \string\documentclass% + }\@ehd + \expandafter\endinput +\fi \@ifpackageloaded{xkvltxp}{% \PackageWarningNoLine{kvoptions}{% Option `patch' cannot be used together with\MessageBreak @@ -852,14 +862,14 @@ \else % append to list \edef\KVO@result{% - \unexpanded\expandafter{\KVO@result},\KVO@x + \etex@unexpanded\expandafter{\KVO@result},\KVO@x }% \fi }{% % #1: "key", #2: "value=" % add key part \edef\KVO@result{% - \unexpanded\expandafter{\KVO@result},% + \etex@unexpanded\expandafter{\KVO@result},% \zap@space#1 \@empty }% \futurelet\@let@token\KVO@checkfirsttok#2 \@nil| = \@nil|\KVO@nil @@ -888,13 +898,13 @@ \def\KVO@removelastspace#1 = \@nil|#2\KVO@nil{% \KVO@ifempty{#2}{% \edef\KVO@result{% - \unexpanded\expandafter{\KVO@result}% - \unexpanded\expandafter{\KVO@removegarbage#1\KVO@nil}% + \etex@unexpanded\expandafter{\KVO@result}% + \etex@unexpanded\expandafter{\KVO@removegarbage#1\KVO@nil}% }% }{% \edef\KVO@result{% - \unexpanded\expandafter{\KVO@result}% - \unexpanded{#1}% + \etex@unexpanded\expandafter{\KVO@result}% + \etex@unexpanded{#1}% }% }% } diff --git a/Master/texmf-dist/tex/latex/oberdiek/stackrel.sty b/Master/texmf-dist/tex/latex/oberdiek/stackrel.sty index df90b264be1..a6cf3ac5131 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/stackrel.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/stackrel.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006 by Heiko Oberdiek <oberdiek@uni-freiburg.de> +%% Copyright (C) 2006, 2007 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 @@ -28,27 +28,16 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{stackrel} - [2006/12/02 v1.0 Adding subscript option to stackrel (HO)]% -\begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname unexpanded\endcsname\relax - \newcommand*{\stack@relbin}[3][]{% - \mathop{#3}\limits - \toks@{#1}% - \edef\reserved@a{\the\toks@}% - \ifx\reserved@a\@empty\else_{#1}\fi - \toks@{#2}% - \edef\reserved@a{\the\toks@}% - \ifx\reserved@a\@empty\else^{#2}\fi - \egroup - }% -\else + [2007/05/06 v1.1 Adding subscript option to stackrel (HO)]% +\RequirePackage{etexcmds} +\ifetex@unexpanded \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname pdfstrcmp\endcsname\relax \newcommand*{\stack@relbin}[3][]{% \mathop{#3}\limits - \edef\reserved@a{\unexpanded{#1}}% + \edef\reserved@a{\etex@unexpanded{#1}}% \ifx\reserved@a\@empty\else_{#1}\fi - \edef\reserved@a{\unexpanded{#2}}% + \edef\reserved@a{\etex@unexpanded{#2}}% \ifx\reserved@a\@empty\else^{#2}\fi \egroup }% @@ -60,6 +49,17 @@ \egroup }% \fi +\else + \newcommand*{\stack@relbin}[3][]{% + \mathop{#3}\limits + \toks@{#1}% + \edef\reserved@a{\the\toks@}% + \ifx\reserved@a\@empty\else_{#1}\fi + \toks@{#2}% + \edef\reserved@a{\the\toks@}% + \ifx\reserved@a\@empty\else^{#2}\fi + \egroup + }% \fi \renewcommand*{\stackrel}{% \mathrel\bgroup\stack@relbin diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty index 36aabc02ad4..cc9f8250e18 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty @@ -33,8 +33,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-abspage}% - [2007/04/22 v1.8 Module abspage for zref (HO)]% -\RequirePackage{zref-base}[2007/04/22] + [2007/05/06 v2.0 Module abspage for zref (HO)]% +\RequirePackage{zref-base}[2007/05/06] \@ifundefined{ZREF@baseok}{\endinput}{} \RequirePackage{atbegshi}% \begingroup diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty index eef1fc7003c..0619bb02286 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty @@ -33,7 +33,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-base}% - [2007/04/22 v1.8 Module base for zref (HO)]% + [2007/05/06 v2.0 Module base for zref (HO)]% \def\ZREF@name{zref} \def\ZREF@ErrorNoLine#1#2{% \begingroup @@ -65,6 +65,19 @@ \endinput }{}% \endgroup +\RequirePackage{etexcmds} +\ifetex@unexpanded +\else + \ZREF@ErrorNoLine{% + Missing e-TeX's \string\unexpanded.\MessageBreak + Add \string\RequirePackage\string{etexcmds\string} before % + \string\documentclass% + }{% + Probably you are using some package (e.g. ConTeXt) that % + redefines \string\unexpanded% + }% + \expandafter\endinput +\fi \RequirePackage{auxhook} \AddLineBeginAux{% \string\providecommand\string\zref@newlabel[2]{}% @@ -313,7 +326,7 @@ }% } \long\def\zref@wrapper@unexpanded#1{% - \let\ZREF@unexpanded\unexpanded + \let\ZREF@unexpanded\etex@unexpanded #1% \let\ZREF@unexpanded\@firstofone } diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty index d02351efecb..34498158e13 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty @@ -33,8 +33,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-counter}% - [2007/04/22 v1.8 Module counter for zref (HO)]% -\RequirePackage{zref-base}[2007/04/22] + [2007/05/06 v2.0 Module counter for zref (HO)]% +\RequirePackage{zref-base}[2007/05/06] \@ifundefined{ZREF@baseok}{\endinput}{} \zref@newprop{counter}{} \zref@addprop\ZREF@mainlist{counter} diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty index 98cb6ff93a2..8a8ff3e05ba 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty @@ -33,10 +33,10 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-dotfill}% - [2007/04/22 v1.8 Module dotfill for zref (HO)]% -\RequirePackage{zref-base}[2007/04/22] + [2007/05/06 v2.0 Module dotfill for zref (HO)]% +\RequirePackage{zref-base}[2007/05/06] \@ifundefined{ZREF@baseok}{\endinput}{} -\RequirePackage{zref-savepos}[2007/04/22] +\RequirePackage{zref-savepos}[2007/05/06] \zref@require@unique \RequirePackage{keyval} \define@key{ZREF@DF}{unit}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty index dde5f52f209..6acfa189891 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty @@ -33,8 +33,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-hyperref}% - [2007/04/22 v1.8 Module hyperref for zref (HO)]% -\RequirePackage{zref-base}[2007/04/22] + [2007/05/06 v2.0 Module hyperref for zref (HO)]% +\RequirePackage{zref-base}[2007/05/06] \@ifundefined{ZREF@baseok}{\endinput}{} \zref@newprop{anchor}[]{% \@ifundefined{@currentHref}{}{\@currentHref}% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty index 6104efc1981..abb105a3174 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty @@ -33,8 +33,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-lastpage}% - [2007/04/22 v1.8 Module lastpage for zref (HO)]% -\RequirePackage{zref-base}[2007/04/22] + [2007/05/06 v2.0 Module lastpage for zref (HO)]% +\RequirePackage{zref-base}[2007/05/06] \@ifundefined{ZREF@baseok}{\endinput}{} \AtBeginDocument{% \AtEndDocument{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty index d381dcad5fb..ff5d698fd13 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty @@ -33,10 +33,10 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-perpage}% - [2007/04/22 v1.8 Module perpage for zref (HO)]% -\RequirePackage{zref-base}[2007/04/22] + [2007/05/06 v2.0 Module perpage for zref (HO)]% +\RequirePackage{zref-base}[2007/05/06] \@ifundefined{ZREF@baseok}{\endinput}{} -\RequirePackage{zref-abspage}[2007/04/22] +\RequirePackage{zref-abspage}[2007/05/06] \zref@newprop*{pagevalue}[0]{\number\c@page} \zref@newlist{perpage} \zref@addprop{perpage}{abspage} diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty index de98de15cd2..8e646ebcccb 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty @@ -33,8 +33,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-savepos}% - [2007/04/22 v1.8 Module savepos for zref (HO)]% -\RequirePackage{zref-base}[2007/04/22] + [2007/05/06 v2.0 Module savepos for zref (HO)]% +\RequirePackage{zref-base}[2007/05/06] \@ifundefined{ZREF@baseok}{\endinput}{} \begingroup \@ifundefined{pdfsavepos}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty index 12825c9eadd..6cc952cb316 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty @@ -33,8 +33,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-titleref}% - [2007/04/22 v1.8 Module titleref for zref (HO)]% -\RequirePackage{zref-base}[2007/04/22] + [2007/05/06 v2.0 Module titleref for zref (HO)]% +\RequirePackage{zref-base}[2007/05/06] \@ifundefined{ZREF@baseok}{\endinput}{} \RequirePackage{keyval} \let\zref@titleref@current\@empty @@ -181,7 +181,15 @@ }% }% }{}% -}% + \@ifpackageloaded{longtable}{% + \ZREF@patch{LT@c@ption}{% + \def\LT@c@ption#1[#2]#3{% + \ZREF@org@LT@c@ption{#1}[{#2}]{#3}% + \zref@titlesec@setcurrent{#2}% + }% + }% + }{}% +} \endinput %% %% End of file `zref-titleref.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty index 1ebe4fe9b8f..b2aaf5db138 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty @@ -33,11 +33,11 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-totpages}% - [2007/04/22 v1.8 Module totpages for zref (HO)]% -\RequirePackage{zref-base}[2007/04/22] + [2007/05/06 v2.0 Module totpages for zref (HO)]% +\RequirePackage{zref-base}[2007/05/06] \@ifundefined{ZREF@baseok}{\endinput}{} -\RequirePackage{zref-abspage}[2007/04/22] -\RequirePackage{zref-lastpage}[2007/04/22] +\RequirePackage{zref-abspage}[2007/05/06] +\RequirePackage{zref-lastpage}[2007/05/06] \newcommand*{\ztotpages}{% \zref@extractdefault{LastPage}{abspage}{0}% } diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty index e544fc85091..72896ad5cb3 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty @@ -33,8 +33,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-user}% - [2007/04/22 v1.8 Module user for zref (HO)]% -\RequirePackage{zref-base}[2007/04/22] + [2007/05/06 v2.0 Module user for zref (HO)]% +\RequirePackage{zref-base}[2007/05/06] \@ifundefined{ZREF@baseok}{\endinput}{} \newcommand*\zlabel{% \ifx\label\@gobble diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty index 3597900ca3a..71ea7ff559c 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty @@ -33,8 +33,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-xr}% - [2007/04/22 v1.8 Module xr for zref (HO)]% -\RequirePackage{zref-base}[2007/04/22] + [2007/05/06 v2.0 Module xr for zref (HO)]% +\RequirePackage{zref-base}[2007/05/06] \@ifundefined{ZREF@baseok}{\endinput}{} \RequirePackage{keyval} \zref@newprop{url}{}% @@ -119,7 +119,7 @@ \fi \ifx\x\ZREF@xr@@input \edef\ZREF@xr@filelist{% - \unexpanded\expandafter{\ZREF@xr@filelist}% + \etex@unexpanded\expandafter{\ZREF@xr@filelist}% {\filename@area\the\toks@}% }% \fi diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref.sty b/Master/texmf-dist/tex/latex/oberdiek/zref.sty index 3cc3caca012..5661eaebea9 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref.sty @@ -33,13 +33,13 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref} - [2007/04/22 v1.8 New reference scheme for LaTeX2e (HO)]% -\RequirePackage{zref-base}[2007/04/22] + [2007/05/06 v2.0 New reference scheme for LaTeX2e (HO)]% +\RequirePackage{zref-base}[2007/05/06] \@ifundefined{ZREF@baseok}{\endinput}{} \def\ZREF@temp#1{% \DeclareOption{#1}{% \AtEndOfPackage{% - \RequirePackage{zref-#1}[2007/04/22]% + \RequirePackage{zref-#1}[2007/05/06]% }% }% } |