summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/accsupp.pdfbin156937 -> 156937 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/aliascnt.pdfbin139325 -> 139325 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/alphalph.pdfbin164339 -> 164338 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/atbegshi.pdfbin197859 -> 197860 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/atenddvi.pdfbin128869 -> 128870 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/attachfile2.pdfbin216295 -> 216294 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/auxhook.pdfbin133802 -> 133802 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/bmpsize.pdfbin282657 -> 294407 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/bookmark.pdfbin233995 -> 233994 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/centernot.pdfbin117867 -> 117866 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/chemarr.pdfbin128877 -> 128877 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/classlist.pdfbin124630 -> 124630 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/colonequals.pdfbin135298 -> 135298 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/dvipscol.pdfbin116876 -> 116875 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/embedfile.pdfbin167693 -> 167693 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/engord.pdfbin148043 -> 148042 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/epstopdf.pdfbin130788 -> 130787 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/etexcmds-test1.tex42
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/etexcmds-test2.tex43
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/etexcmds-test3.tex52
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/etexcmds.pdfbin0 -> 130679 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/example-mycolorsetup.sty2
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/flags.pdfbin133365 -> 133365 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/grffile.pdfbin151919 -> 151920 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/holtxdoc.pdfbin137284 -> 137285 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/hycolor-test1.tex2
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/hycolor-test2.tex2
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/hycolor.pdfbin193619 -> 193616 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/hypbmsec.pdfbin145074 -> 145074 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/hypcap.pdfbin130743 -> 130743 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/hypdestopt.pdfbin154936 -> 154936 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/hypdoc.pdfbin152038 -> 152038 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/ifdraft.pdfbin121354 -> 121354 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/iflang-test1.tex2
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/iflang.pdfbin163053 -> 163052 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/ifpdf.pdfbin137970 -> 137971 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/ifvtex.pdfbin130482 -> 130482 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/infwarerr.pdfbin152320 -> 152320 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/inputenx.pdfbin487131 -> 487130 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/kvoptions.pdfbin245718 -> 246557 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/kvsetkeys.pdfbin161693 -> 161693 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/makerobust.pdfbin123514 -> 123514 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/oberdiek.pdfbin536036 -> 542967 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/pagesel.pdfbin159927 -> 159926 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/pdfcolfoot.pdfbin132788 -> 132789 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/pdfcolmk.pdfbin160529 -> 160529 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/pdfcrypt.pdfbin164551 -> 164551 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/pdfescape-test1.tex2
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/pdfescape-test2.tex2
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/pdfescape-test3.tex2
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/pdfescape.pdfbin206406 -> 206403 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/pdflscape.pdfbin141645 -> 141645 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/picture.pdfbin139299 -> 139300 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/pmboxdraw.pdfbin182058 -> 182059 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/refcount.pdfbin135373 -> 135373 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/setouterhbox.pdfbin164971 -> 164972 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/settobox.pdfbin143234 -> 143234 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/stackrel.pdfbin126851 -> 128693 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/tabularht.pdfbin168271 -> 168271 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/tabularkv.pdfbin117010 -> 117010 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/telprint.pdfbin143007 -> 143007 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/transparent.pdfbin124269 -> 124269 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/twoopt.pdfbin137391 -> 137391 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/zref.pdfbin290682 -> 291613 bytes
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/bmpsize.dtx194
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/etexcmds.dtx534
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/hycolor.dtx2
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/iflang.dtx2
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/kvoptions.dtx48
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/oberdiek.ins3
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/oberdiek.tex23
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/pdfescape.dtx2
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/stackrel.dtx48
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/zref.dtx114
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/etexcmds.sty135
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/bmpsize-base.sty28
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfm.def8
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfmx.def124
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvips.def2
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/bmpsize-test.tex4
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/bmpsize.sty32
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty28
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/stackrel.sty34
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty4
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-base.sty17
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty4
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty6
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty4
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty4
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty6
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty4
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty14
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty8
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-user.sty4
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty6
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref.sty6
-rw-r--r--Master/texmf-dist/tpm/oberdiek.tpm16
-rw-r--r--Master/texmf/lists/oberdiek6
98 files changed, 1360 insertions, 265 deletions
diff --git a/Master/texmf-dist/doc/latex/oberdiek/accsupp.pdf b/Master/texmf-dist/doc/latex/oberdiek/accsupp.pdf
index 58d6b495e35..b401ba91ba9 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/accsupp.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/accsupp.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/aliascnt.pdf b/Master/texmf-dist/doc/latex/oberdiek/aliascnt.pdf
index c8a4bde0e3a..228dae592ea 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/aliascnt.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/aliascnt.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/alphalph.pdf b/Master/texmf-dist/doc/latex/oberdiek/alphalph.pdf
index 65bae40d61f..59d0f7d81a0 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/alphalph.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/alphalph.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/atbegshi.pdf b/Master/texmf-dist/doc/latex/oberdiek/atbegshi.pdf
index 6d008267c4d..3bcf5961199 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/atbegshi.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/atbegshi.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/atenddvi.pdf b/Master/texmf-dist/doc/latex/oberdiek/atenddvi.pdf
index ed0bb268008..78be6a388ab 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/atenddvi.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/atenddvi.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/attachfile2.pdf b/Master/texmf-dist/doc/latex/oberdiek/attachfile2.pdf
index 627bda08e0c..aea51434b72 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/attachfile2.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/attachfile2.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/auxhook.pdf b/Master/texmf-dist/doc/latex/oberdiek/auxhook.pdf
index 91aeb62c0ef..a7b2c59a18b 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/auxhook.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/auxhook.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/bmpsize.pdf b/Master/texmf-dist/doc/latex/oberdiek/bmpsize.pdf
index 908f9eb80e7..02c0b0d0987 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/bmpsize.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/bmpsize.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/bookmark.pdf b/Master/texmf-dist/doc/latex/oberdiek/bookmark.pdf
index 407bf45cbb1..bc7b70bdde3 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/bookmark.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/bookmark.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/centernot.pdf b/Master/texmf-dist/doc/latex/oberdiek/centernot.pdf
index 8d309f13c9c..3644b382558 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/centernot.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/centernot.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/chemarr.pdf b/Master/texmf-dist/doc/latex/oberdiek/chemarr.pdf
index 66ca793a520..d70edf24175 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/chemarr.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/chemarr.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/classlist.pdf b/Master/texmf-dist/doc/latex/oberdiek/classlist.pdf
index 0a984d75bb9..c447eaa4342 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/classlist.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/classlist.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/colonequals.pdf b/Master/texmf-dist/doc/latex/oberdiek/colonequals.pdf
index 7ce11513f0f..851e9ed4705 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/colonequals.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/colonequals.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/dvipscol.pdf b/Master/texmf-dist/doc/latex/oberdiek/dvipscol.pdf
index d0427f7115c..6ce5e66aaab 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/dvipscol.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/dvipscol.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/embedfile.pdf b/Master/texmf-dist/doc/latex/oberdiek/embedfile.pdf
index 6277dac3210..7f7c382f841 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/embedfile.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/embedfile.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/engord.pdf b/Master/texmf-dist/doc/latex/oberdiek/engord.pdf
index a2c623fb5f6..ba3c24718d1 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/engord.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/engord.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/epstopdf.pdf b/Master/texmf-dist/doc/latex/oberdiek/epstopdf.pdf
index 745c9c1305c..cce86ae801a 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/epstopdf.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/epstopdf.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/etexcmds-test1.tex b/Master/texmf-dist/doc/latex/oberdiek/etexcmds-test1.tex
new file mode 100644
index 00000000000..0ec94b6e822
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/oberdiek/etexcmds-test1.tex
@@ -0,0 +1,42 @@
+%%
+%% This is file `etexcmds-test1.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% etexcmds.dtx (with options: `test1')
+%%
+%% This is a generated file.
+%%
+%% Copyright (C) 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
+%% version 1.3 of this license or (at your option) any later
+%% version. The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of
+%% LaTeX version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status "maintained".
+%%
+%% This Current Maintainer of this work is Heiko Oberdiek.
+%%
+%% This work consists of the main source file etexcmds.dtx
+%% and the derived files
+%% etexcmds.sty, etexcmds.pdf, etexcmds.ins, etexcmds.drv,
+%% etexcmds-test1.tex, etexcmds-test2.tex, etexcmds-test3.tex.
+%%
+\immediate\write16{etexcmds-test1.tex: test file for plainTeX}
+\input etexcmds.sty\relax
+\catcode`\@=11 %
+\edef\x{\string\unexpanded}
+\edef\y{\meaning\etex@unexpanded}
+\ifx\x\y
+\else
+ \@PackageError{etexcmds-test1}{Test failed}\@ehc
+\fi
+\end
+\endinput
+%%
+%% End of file `etexcmds-test1.tex'.
diff --git a/Master/texmf-dist/doc/latex/oberdiek/etexcmds-test2.tex b/Master/texmf-dist/doc/latex/oberdiek/etexcmds-test2.tex
new file mode 100644
index 00000000000..8fd244c79d2
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/oberdiek/etexcmds-test2.tex
@@ -0,0 +1,43 @@
+%%
+%% This is file `etexcmds-test2.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% etexcmds.dtx (with options: `test2')
+%%
+%% This is a generated file.
+%%
+%% Copyright (C) 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
+%% version 1.3 of this license or (at your option) any later
+%% version. The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of
+%% LaTeX version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status "maintained".
+%%
+%% This Current Maintainer of this work is Heiko Oberdiek.
+%%
+%% This work consists of the main source file etexcmds.dtx
+%% and the derived files
+%% etexcmds.sty, etexcmds.pdf, etexcmds.ins, etexcmds.drv,
+%% etexcmds-test1.tex, etexcmds-test2.tex, etexcmds-test3.tex.
+%%
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesFile{etexcmds-test2.tex}[2007/05/06 v1.0 Test file for LaTeX]
+\RequirePackage{etexcmds}
+\makeatletter
+\edef\x{\string\unexpanded}
+\edef\y{\meaning\etex@unexpanded}
+\ifx\x\y
+\else
+ \@PackageError{etexcmds-test2}{Test failed}\@ehc
+\fi
+\stop
+\endinput
+%%
+%% End of file `etexcmds-test2.tex'.
diff --git a/Master/texmf-dist/doc/latex/oberdiek/etexcmds-test3.tex b/Master/texmf-dist/doc/latex/oberdiek/etexcmds-test3.tex
new file mode 100644
index 00000000000..1aacdd3fb4d
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/oberdiek/etexcmds-test3.tex
@@ -0,0 +1,52 @@
+%%
+%% This is file `etexcmds-test3.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% etexcmds.dtx (with options: `test3')
+%%
+%% This is a generated file.
+%%
+%% Copyright (C) 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
+%% version 1.3 of this license or (at your option) any later
+%% version. The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of
+%% LaTeX version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status "maintained".
+%%
+%% This Current Maintainer of this work is Heiko Oberdiek.
+%%
+%% This work consists of the main source file etexcmds.dtx
+%% and the derived files
+%% etexcmds.sty, etexcmds.pdf, etexcmds.ins, etexcmds.drv,
+%% etexcmds-test1.tex, etexcmds-test2.tex, etexcmds-test3.tex.
+%%
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesFile{etexcmds-test3.tex}[2007/05/06 v1.0 Test file for LaTeX]
+\documentclass{article}
+\usepackage{m-pictex}
+\usepackage{m-ch-de}
+\usepackage{etexcmds}
+\makeatletter
+\ifetex@unexpanded
+ \edef\x{\string\unexpanded}%
+ \edef\y{\meaning\etex@unexpanded}%
+ \ifx\x\y
+ \else
+ \@PackageWarningNoLine{etexcmds-test3}{Test failed}%
+ \fi
+\else
+ \@PackageWarningNoLine{etexcmds-test3}{%
+ Test failed because of ConTeXt%
+ }%
+\fi
+\stop
+\endinput
+%%
+%% End of file `etexcmds-test3.tex'.
diff --git a/Master/texmf-dist/doc/latex/oberdiek/etexcmds.pdf b/Master/texmf-dist/doc/latex/oberdiek/etexcmds.pdf
new file mode 100644
index 00000000000..786db8265b6
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/oberdiek/etexcmds.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/example-mycolorsetup.sty b/Master/texmf-dist/doc/latex/oberdiek/example-mycolorsetup.sty
index fadbfb8ca78..7d3369d429e 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/example-mycolorsetup.sty
+++ b/Master/texmf-dist/doc/latex/oberdiek/example-mycolorsetup.sty
@@ -34,7 +34,7 @@
% Package identification
% -----------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{example-mycolorsetup}[2007/04/11 Managing my colors]
+\ProvidesPackage{example-mycolorsetup}[2007/05/06 Managing my colors]
\RequirePackage{ifpdf}
\RequirePackage{kvoptions}
diff --git a/Master/texmf-dist/doc/latex/oberdiek/flags.pdf b/Master/texmf-dist/doc/latex/oberdiek/flags.pdf
index 123a6269016..a255f5efe7d 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/flags.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/flags.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/grffile.pdf b/Master/texmf-dist/doc/latex/oberdiek/grffile.pdf
index 9528c1f4d2a..96a63c6101e 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/grffile.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/grffile.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/holtxdoc.pdf b/Master/texmf-dist/doc/latex/oberdiek/holtxdoc.pdf
index 9a732fd1903..d289ce74e10 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/holtxdoc.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/holtxdoc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/hycolor-test1.tex b/Master/texmf-dist/doc/latex/oberdiek/hycolor-test1.tex
index 9cce1297a98..ef4fbe62e87 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/hycolor-test1.tex
+++ b/Master/texmf-dist/doc/latex/oberdiek/hycolor-test1.tex
@@ -32,7 +32,7 @@
\usepackage{qstest}
\IncludeTests{*}
-\LogTests{lgout}{*}{*}
+\LogTests{log}{*}{*}
\makeatletter
diff --git a/Master/texmf-dist/doc/latex/oberdiek/hycolor-test2.tex b/Master/texmf-dist/doc/latex/oberdiek/hycolor-test2.tex
index 9c8df6098b7..4bc989d1f9e 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/hycolor-test2.tex
+++ b/Master/texmf-dist/doc/latex/oberdiek/hycolor-test2.tex
@@ -33,7 +33,7 @@
\usepackage{qstest}
\IncludeTests{*}
-\LogTests{lgout}{*}{*}
+\LogTests{log}{*}{*}
\makeatletter
diff --git a/Master/texmf-dist/doc/latex/oberdiek/hycolor.pdf b/Master/texmf-dist/doc/latex/oberdiek/hycolor.pdf
index f0586ff4323..11ce885656a 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/hycolor.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/hycolor.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/hypbmsec.pdf b/Master/texmf-dist/doc/latex/oberdiek/hypbmsec.pdf
index e83aa400d12..115ca188cf3 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/hypbmsec.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/hypbmsec.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/hypcap.pdf b/Master/texmf-dist/doc/latex/oberdiek/hypcap.pdf
index acc454b441a..a11c8ea1f9b 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/hypcap.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/hypcap.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/hypdestopt.pdf b/Master/texmf-dist/doc/latex/oberdiek/hypdestopt.pdf
index cc7ae18f704..937b5d128ac 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/hypdestopt.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/hypdestopt.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/hypdoc.pdf b/Master/texmf-dist/doc/latex/oberdiek/hypdoc.pdf
index 2ba52b72d48..29c9ff0461e 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/hypdoc.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/hypdoc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/ifdraft.pdf b/Master/texmf-dist/doc/latex/oberdiek/ifdraft.pdf
index fbcf5ccf969..d614451d3ef 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/ifdraft.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/ifdraft.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/iflang-test1.tex b/Master/texmf-dist/doc/latex/oberdiek/iflang-test1.tex
index 070e7a6dd73..fe588f78abd 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/iflang-test1.tex
+++ b/Master/texmf-dist/doc/latex/oberdiek/iflang-test1.tex
@@ -32,7 +32,7 @@
\documentclass{minimal}
\usepackage{qstest}
\IncludeTests{*}
-\LogTests{lgout}{*}{*}
+\LogTests{log}{*}{*}
\usepackage[english,naustrian,ngerman]{babel}
\usepackage{iflang}
\begin{document}
diff --git a/Master/texmf-dist/doc/latex/oberdiek/iflang.pdf b/Master/texmf-dist/doc/latex/oberdiek/iflang.pdf
index 3916359c67f..41cbb97dd63 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/iflang.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/iflang.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/ifpdf.pdf b/Master/texmf-dist/doc/latex/oberdiek/ifpdf.pdf
index 43522c04226..a16dd575d4d 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/ifpdf.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/ifpdf.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/ifvtex.pdf b/Master/texmf-dist/doc/latex/oberdiek/ifvtex.pdf
index 82536bf732d..5e8508d6c92 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/ifvtex.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/ifvtex.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/infwarerr.pdf b/Master/texmf-dist/doc/latex/oberdiek/infwarerr.pdf
index 1d97128d41e..c61d4a96f75 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/infwarerr.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/infwarerr.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/inputenx.pdf b/Master/texmf-dist/doc/latex/oberdiek/inputenx.pdf
index af98c1fca3f..080bcd7d6e6 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/inputenx.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/inputenx.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/kvoptions.pdf b/Master/texmf-dist/doc/latex/oberdiek/kvoptions.pdf
index 65e9b605bc1..510ca94a97e 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/kvoptions.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/kvoptions.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/kvsetkeys.pdf b/Master/texmf-dist/doc/latex/oberdiek/kvsetkeys.pdf
index 0c9fc9b5efd..b6c7833db72 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/kvsetkeys.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/kvsetkeys.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/makerobust.pdf b/Master/texmf-dist/doc/latex/oberdiek/makerobust.pdf
index 4f870d8b729..ddb48e67040 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/makerobust.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/makerobust.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/oberdiek.pdf b/Master/texmf-dist/doc/latex/oberdiek/oberdiek.pdf
index 92a4ee6eba4..5bf7fa9e6ff 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/oberdiek.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/oberdiek.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/pagesel.pdf b/Master/texmf-dist/doc/latex/oberdiek/pagesel.pdf
index d761b559f65..d5773dcb133 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/pagesel.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/pagesel.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/pdfcolfoot.pdf b/Master/texmf-dist/doc/latex/oberdiek/pdfcolfoot.pdf
index 1f7e6af1a13..adce5b38126 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/pdfcolfoot.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/pdfcolfoot.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/pdfcolmk.pdf b/Master/texmf-dist/doc/latex/oberdiek/pdfcolmk.pdf
index f427ca42910..79fc51bc8e3 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/pdfcolmk.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/pdfcolmk.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/pdfcrypt.pdf b/Master/texmf-dist/doc/latex/oberdiek/pdfcrypt.pdf
index cbe6bd2b8a6..3b521429a4d 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/pdfcrypt.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/pdfcrypt.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/pdfescape-test1.tex b/Master/texmf-dist/doc/latex/oberdiek/pdfescape-test1.tex
index 6192ccfd13c..d1194643b7f 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/pdfescape-test1.tex
+++ b/Master/texmf-dist/doc/latex/oberdiek/pdfescape-test1.tex
@@ -40,7 +40,7 @@
}{}
\RequirePackage{qstest}
\IncludeTests{*}
-\LogTests{lgout}{*}{*}
+\LogTests{log}{*}{*}
\newcommand*{\ExpectVar}[2]{%
\ifx#1#2%
diff --git a/Master/texmf-dist/doc/latex/oberdiek/pdfescape-test2.tex b/Master/texmf-dist/doc/latex/oberdiek/pdfescape-test2.tex
index 92872756884..9c6d260f7f7 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/pdfescape-test2.tex
+++ b/Master/texmf-dist/doc/latex/oberdiek/pdfescape-test2.tex
@@ -44,7 +44,7 @@
}{}
\RequirePackage{qstest}
\IncludeTests{*}
-\LogTests{lgout}{*}{*}
+\LogTests{log}{*}{*}
\newcommand*{\ExpectVar}[2]{%
\ifx#1#2%
diff --git a/Master/texmf-dist/doc/latex/oberdiek/pdfescape-test3.tex b/Master/texmf-dist/doc/latex/oberdiek/pdfescape-test3.tex
index 09de50d18dc..e242d423ff8 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/pdfescape-test3.tex
+++ b/Master/texmf-dist/doc/latex/oberdiek/pdfescape-test3.tex
@@ -38,7 +38,7 @@
\let\pdfescapestring\@undefined
\RequirePackage{qstest}
\IncludeTests{*}
-\LogTests{lgout}{*}{*}
+\LogTests{log}{*}{*}
\newcommand*{\ExpectVar}[2]{%
\ifx#1#2%
diff --git a/Master/texmf-dist/doc/latex/oberdiek/pdfescape.pdf b/Master/texmf-dist/doc/latex/oberdiek/pdfescape.pdf
index 4a0d510d3a0..589e5bf054d 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/pdfescape.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/pdfescape.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/pdflscape.pdf b/Master/texmf-dist/doc/latex/oberdiek/pdflscape.pdf
index bf8b50f20bc..9b643c4522c 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/pdflscape.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/pdflscape.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/picture.pdf b/Master/texmf-dist/doc/latex/oberdiek/picture.pdf
index fbeccc6ac86..80f578bd81c 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/picture.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/picture.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/pmboxdraw.pdf b/Master/texmf-dist/doc/latex/oberdiek/pmboxdraw.pdf
index 5a4c7fa86d6..cf1d47eb77f 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/pmboxdraw.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/pmboxdraw.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/refcount.pdf b/Master/texmf-dist/doc/latex/oberdiek/refcount.pdf
index a4d01487f29..1900ed3a31a 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/refcount.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/refcount.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/setouterhbox.pdf b/Master/texmf-dist/doc/latex/oberdiek/setouterhbox.pdf
index 41c40b33538..96443ba3267 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/setouterhbox.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/setouterhbox.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/settobox.pdf b/Master/texmf-dist/doc/latex/oberdiek/settobox.pdf
index 5b81627525c..8de6fecf80f 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/settobox.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/settobox.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/stackrel.pdf b/Master/texmf-dist/doc/latex/oberdiek/stackrel.pdf
index b2225461fc4..76c9bf223eb 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/stackrel.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/stackrel.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/tabularht.pdf b/Master/texmf-dist/doc/latex/oberdiek/tabularht.pdf
index 330371a54ef..3c08dfc8a32 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/tabularht.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/tabularht.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/tabularkv.pdf b/Master/texmf-dist/doc/latex/oberdiek/tabularkv.pdf
index bdb9e8bea6c..04599ef00f2 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/tabularkv.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/tabularkv.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/telprint.pdf b/Master/texmf-dist/doc/latex/oberdiek/telprint.pdf
index 096b21bd116..72116aaee37 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/telprint.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/telprint.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/transparent.pdf b/Master/texmf-dist/doc/latex/oberdiek/transparent.pdf
index 468a7f2028c..1a90af3c371 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/transparent.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/transparent.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/twoopt.pdf b/Master/texmf-dist/doc/latex/oberdiek/twoopt.pdf
index 690ef774cbc..601705cab49 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/twoopt.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/twoopt.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/zref.pdf b/Master/texmf-dist/doc/latex/oberdiek/zref.pdf
index c53c32a72be..253e69bb3fc 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/zref.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/zref.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/oberdiek/bmpsize.dtx b/Master/texmf-dist/source/latex/oberdiek/bmpsize.dtx
index 60251dc0a91..e2528b0e34d 100644
--- a/Master/texmf-dist/source/latex/oberdiek/bmpsize.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/bmpsize.dtx
@@ -73,7 +73,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: bmpsize 2007/04/11 v1.2 Extract size and resolution data from bitmap files (HO)}
+\Msg{* Package: bmpsize 2007/04/29 v1.3 Extract size and resolution data from bitmap files (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -142,7 +142,7 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{bmpsize.drv}%
- [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)]%
\documentclass{ltxdoc}
\usepackage{holtxdoc}
\begin{document}
@@ -151,7 +151,7 @@ and the derived files
%</driver>
% \fi
%
-% \CheckSum{3510}
+% \CheckSum{3562}
%
% \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 +172,7 @@ and the derived files
% \GetFileInfo{bmpsize.drv}
%
% \title{The \xpackage{bmpsize} package}
-% \date{2007/04/11 v1.2}
+% \date{2007/04/29 v1.3}
% \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
%
% \maketitle
@@ -368,7 +368,7 @@ and the derived files
% \begin{macrocode}
%<*base>
\ProvidesPackage{bmpsize-base}%
- [2007/04/11 v1.2 Basic part of bmpsize (HO)]%
+ [2007/04/29 v1.3 Basic part of bmpsize (HO)]%
% \end{macrocode}
% Modules of package \xpackage{fp} are used for calculations.
% \begin{macrocode}
@@ -413,6 +413,7 @@ and the derived files
\let\bmpsize@unit\relax
\let\bmpsize@pixelxdenom\relax
\let\bmpsize@pixelydenom\relax
+ \let\bmpsize@orientation\relax
}
\def\@bmpsize@stop#1\@nil{}
@@ -998,6 +999,15 @@ and the derived files
% fi
% % 256 ImageWidth (use width of JPG part)
% % 257 ImageHeight (use height of JPG part)
+% if numeq $tag 274 % Orientation
+% skip 6 % type: 3 (short), count: 1
+% num 2 -> $temp
+% if numge $temp 0
+% if numle $temp 8
+% assign $temp -> $orientation
+% fi
+% fi
+% fi
% if numeq $tag 282 % XResolution
% skip 6
% num 4 -> $temp
@@ -1254,6 +1264,31 @@ and the derived files
\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
@@ -2980,7 +3015,7 @@ and the derived files
% \begin{macrocode}
%<*package>
\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}%
@@ -2997,29 +3032,7 @@ and the derived files
\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}{}{}
@@ -3110,7 +3123,7 @@ and the derived files
\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}%
@@ -3122,12 +3135,12 @@ and the derived files
\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
@@ -3175,7 +3188,7 @@ and the derived files
% \begin{macrocode}
%<*dvips>
\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)]%
% \end{macrocode}
% Ensure correct catcodes.
% \begin{macrocode}
@@ -3292,13 +3305,19 @@ and the derived files
%</dvips>
% \end{macrocode}
%
-% \subsubsection{dvipdfm}
+% \subsubsection{dvipdfm and dvipdfmx}
%
% Identification.
% \begin{macrocode}
%<*dvipdfm>
\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)]%
+%</dvipdfm>
+%<*dvipdfmx>
+\ProvidesFile{bmpsize-dvipdfmx.def}%
+ [2007/04/29 v1.3 Graphics bitmap driver for dvipdfmx (HO)]%
+%</dvipdfmx>
+%<*dvipdfm|dvipdfmx>
% \end{macrocode}
% Ensure correct catcodes.
% \begin{macrocode}
@@ -3338,15 +3357,26 @@ and the derived files
\fi
% \end{macrocode}
% \end{macro}
-% The size of reused images of dvipdfm 0.13.2c is 1bp.
+% The size of reused images of dvipdfm 0.13.2c is 1bp. It is
+% the default size of an image object in user space.
% Thus the reused image must be scaled to the requested
% width and height. The factor is just the conversion
% from pt to bp (72/72.27).
% \begin{macro}{\bmpsize@dvipdfm@factor}
% \begin{macrocode}
-\@ifundefined{bmpsize@dvipdfm@factor}{%
- \def\bmpsize@dvipdfm@factor{.99626}%
-}{}
+%<dvipdfm>\def\bmpsize@dvipdfm@factor{.99626}
+% \end{macrocode}
+% Unhappily dvipdfmx behaves differently. It remembers the
+% size assuming a resolution of 100 dots per inch and additionally
+% scales the reused image to this size. Thus the scaling factor
+% also depends on the pixel sizes of the image:
+% \begin{itemize}
+% \item width: (72 / 72.27) * (100 / 72) / pixelwidth =\\
+% \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}
% \end{macro}
% \begin{macro}{\Ginclude@bmp}
@@ -3413,16 +3443,27 @@ and the derived files
\edef\@bmpsize@temp{@IMG@\@bmpsize@pdfescapestring{#1}}%
\@ifundefined{\@bmpsize@temp}{%
\global\advance\@bmpsize@count\@ne
+%<*dvipdfm>
\expandafter\xdef\csname\@bmpsize@temp\endcsname{%
\the\@bmpsize@count
}%
+%</dvipdfm>
+%<*dvipdfmx>
+ \expandafter\ifx\csname bmpsize@pixelwidth\endcsname\relax
+ \else
+ \expandafter\xdef\csname\@bmpsize@temp\endcsname{%
+ \the\@bmpsize@count:\bmpsize@pixelwidth:\bmpsize@pixelheight
+ }%
+ \fi
+%</dvipdfmx>
\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})%
}%
}{%
+%<*dvipdfm>
\special{%
pdf:bt %
xscale \strip@pt\dimexpr
@@ -3432,6 +3473,28 @@ and the derived files
}%
\special{pdf:uxobj @IMG\csname\@bmpsize@temp\endcsname}%
\special{pdf:et}%
+%</dvipdfm>
+%<*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
+ \special{%
+ pdf:bt %
+ xscale \@bmpsize@xscale\space
+ yscale \@bmpsize@yscale
+ }%
+ \special{pdf:uxobj @IMG\@bmpsize@imgnum}%
+ \special{pdf:et}%
+%</dvipdfmx>
}%
\ifdim\dimen@=\z@
\else
@@ -3446,46 +3509,19 @@ and the derived files
\fi
}
% \end{macrocode}
-% \end{macro}
-% \begin{macrocode}
-\@bmpsize@driver@catcodes
-%</dvipdfm>
-% \end{macrocode}
-%
-% \subsubsection{dvipdfmx}
-%
-% Identification.
% \begin{macrocode}
%<*dvipdfmx>
-\ProvidesFile{bmpsize-dvipdfmx.def}%
- [2007/04/11 v1.2 Graphics bitmap driver for dvipdfmx (HO)]%
-% \end{macrocode}
-% Ensure correct catcodes.
-% \begin{macrocode}
-\expandafter\edef\csname @bmpsize@driver@catcodes\endcsname{%
- \catcode46 \the\catcode46 % .
- \catcode64 \the\catcode64 % @
+\def\@bmpsize@extract#1:#2:#3\@nil{%
+ \def\@bmpsize@imgnum{#1}%
+ \def\@bmpsize@pixelwidth{#2}%
+ \def\@bmpsize@pixelheight{#3}%
}
-\catcode64 11 %
-\@makeother\.
-% \end{macrocode}
-% The size of reused images of dvipdfmx-20050823 is 1in in opposite
-% the 1bp of dvipdfm.
-% The reused image must be scaled to the requested
-% width and height. The factor is the conversion
-% from in to pt (1/72.27).
-% \begin{macro}{\bmpsize@dvipdfm@factor}
-% \begin{macrocode}
-\@ifundefined{bmpsize@dvipdfm@factor}{%
- \def\bmpsize@dvipdfm@factor{.01384}%
-}{}
+%</dvipdfmx>
% \end{macrocode}
% \end{macro}
-% The rest is the same as for dvipdfm.
% \begin{macrocode}
\@bmpsize@driver@catcodes
-\input{bmpsize-dvipdfm.def}
-%</dvipdfmx>
+%</dvipdfm|dvipdfmx>
% \end{macrocode}
%
% \subsection{Test program \xpackage{bmpsize-test.tex}}
@@ -3586,6 +3622,10 @@ and the derived files
\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
}%
@@ -3828,6 +3868,14 @@ and the derived files
% \item
% Line ends sanitized.
% \end{Version}
+% \begin{Version}{2007/05/01 v1.3}
+% \item
+% Uses package \xpackage{infwarerr}.
+% \item
+% Image reuse algorithm fixed for dvipdfmx.
+% \item
+% Some support for Exif's orientation tag.
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/etexcmds.dtx b/Master/texmf-dist/source/latex/oberdiek/etexcmds.dtx
new file mode 100644
index 00000000000..2e905ea76c3
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/etexcmds.dtx
@@ -0,0 +1,534 @@
+% \iffalse meta-comment
+%
+% Copyright (C) 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
+% version 1.3 of this license or (at your option) any later
+% version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of
+% LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status "maintained".
+%
+% This Current Maintainer of this work is Heiko Oberdiek.
+%
+% This work consists of the main source file etexcmds.dtx
+% and the derived files
+% etexcmds.sty, etexcmds.pdf, etexcmds.ins, etexcmds.drv,
+% etexcmds-test1.tex, etexcmds-test2.tex, etexcmds-test3.tex.
+%
+% Distribution:
+% CTAN:macros/latex/contrib/oberdiek/etexcmds.dtx
+% CTAN:macros/latex/contrib/oberdiek/etexcmds.pdf
+%
+% Unpacking:
+% (a) If etexcmds.ins is present:
+% tex etexcmds.ins
+% (b) Without etexcmds.ins:
+% tex etexcmds.dtx
+% (c) If you insist on using LaTeX
+% latex \let\install=y\input{etexcmds.dtx}
+% (quote the arguments according to the demands of your shell)
+%
+% Documentation:
+% (a) If etexcmds.drv is present:
+% latex etexcmds.drv
+% (b) Without etexcmds.drv:
+% latex etexcmds.dtx; ...
+% The class ltxdoc loads the configuration file ltxdoc.cfg
+% if available. Here you can specify further options, e.g.
+% use A4 as paper format:
+% \PassOptionsToClass{a4paper}{article}
+%
+% Programm calls to get the documentation (example):
+% pdflatex etexcmds.dtx
+% makeindex -s gind.ist etexcmds.idx
+% pdflatex etexcmds.dtx
+% makeindex -s gind.ist etexcmds.idx
+% pdflatex etexcmds.dtx
+%
+% Installation:
+% TDS:tex/generic/oberdiek/etexcmds.sty
+% TDS:doc/latex/oberdiek/etexcmds.pdf
+% TDS:doc/latex/oberdiek/etexcmds-test1.tex
+% TDS:doc/latex/oberdiek/etexcmds-test2.tex
+% TDS:doc/latex/oberdiek/etexcmds-test3.tex
+% TDS:source/latex/oberdiek/etexcmds.dtx
+%
+%<*ignore>
+\begingroup
+ \def\x{LaTeX2e}%
+\expandafter\endgroup
+\ifcase 0\ifx\install y1\fi\expandafter
+ \ifx\csname processbatchFile\endcsname\relax\else1\fi
+ \ifx\fmtname\x\else 1\fi\relax
+\else\csname fi\endcsname
+%</ignore>
+%<*install>
+\input docstrip.tex
+\Msg{************************************************************************}
+\Msg{* Installation}
+\Msg{* Package: etexcmds 2007/05/06 v1.0 Providing prefix for e-TeX command names (HO)}
+\Msg{************************************************************************}
+
+\keepsilent
+\askforoverwritefalse
+
+\preamble
+
+This is a generated file.
+
+Copyright (C) 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
+version 1.3 of this license or (at your option) any later
+version. The latest version of this license is in
+ http://www.latex-project.org/lppl.txt
+and version 1.3 or later is part of all distributions of
+LaTeX version 2005/12/01 or later.
+
+This work has the LPPL maintenance status "maintained".
+
+This Current Maintainer of this work is Heiko Oberdiek.
+
+This work consists of the main source file etexcmds.dtx
+and the derived files
+ etexcmds.sty, etexcmds.pdf, etexcmds.ins, etexcmds.drv,
+ etexcmds-test1.tex, etexcmds-test2.tex, etexcmds-test3.tex.
+
+\endpreamble
+
+\generate{%
+ \file{etexcmds.ins}{\from{etexcmds.dtx}{install}}%
+ \file{etexcmds.drv}{\from{etexcmds.dtx}{driver}}%
+ \usedir{tex/generic/oberdiek}%
+ \file{etexcmds.sty}{\from{etexcmds.dtx}{package}}%
+ \usedir{doc/latex/oberdiek}%
+ \file{etexcmds-test1.tex}{\from{etexcmds.dtx}{test1}}%
+ \file{etexcmds-test2.tex}{\from{etexcmds.dtx}{test2}}%
+ \file{etexcmds-test3.tex}{\from{etexcmds.dtx}{test3}}%
+}
+
+\obeyspaces
+\Msg{************************************************************************}
+\Msg{*}
+\Msg{* To finish the installation you have to move the following}
+\Msg{* file into a directory searched by TeX:}
+\Msg{*}
+\Msg{* etexcmds.sty}
+\Msg{*}
+\Msg{* To produce the documentation run the file `etexcmds.drv'}
+\Msg{* through LaTeX.}
+\Msg{*}
+\Msg{* Happy TeXing!}
+\Msg{*}
+\Msg{************************************************************************}
+
+\endbatchfile
+%</install>
+%<*ignore>
+\fi
+%</ignore>
+%<*driver>
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesFile{etexcmds.drv}%
+ [2007/05/06 v1.0 Providing prefix for e-TeX command names (HO)]%
+\documentclass{ltxdoc}
+\usepackage{holtxdoc}
+\begin{document}
+ \DocInput{etexcmds.dtx}%
+\end{document}
+%</driver>
+% \fi
+%
+% \CheckSum{249}
+%
+% \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
+% Lower-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
+% Digits \0\1\2\3\4\5\6\7\8\9
+% Exclamation \! Double quote \" Hash (number) \#
+% Dollar \$ Percent \% Ampersand \&
+% Acute accent \' Left paren \( Right paren \)
+% Asterisk \* Plus \+ Comma \,
+% Minus \- Point \. Solidus \/
+% Colon \: Semicolon \; Less than \<
+% Equals \= Greater than \> Question mark \?
+% Commercial at \@ Left bracket \[ Backslash \\
+% Right bracket \] Circumflex \^ Underscore \_
+% Grave accent \` Left brace \{ Vertical bar \|
+% Right brace \} Tilde \~}
+%
+% \GetFileInfo{etexcmds.drv}
+%
+% \title{The \xpackage{etexcmds} package}
+% \date{2007/05/06 v1.0}
+% \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
+%
+% \maketitle
+%
+% \begin{abstract}
+% New primitive commands are introduced in \eTeX. Sometimes the
+% names collide with existing macros. This package solves this
+% name clashes by adding a prefix to \eTeX's commands. For example,
+% \eTeX's \cs{unexpanded} is provided as \cs{etex@unexpanded}.
+% \end{abstract}
+%
+% \tableofcontents
+%
+% \section{Documentation}
+%
+% New primitive commands are introduced in \eTeX. Unhappily
+% \cs{unexpanded} collides with a macro in Con\TeX t with the
+% same name. This also affects the \LaTeX\ world. For example,
+% package \xpackage{m-ch-de} loads \xfile{base/syst-gen.tex}
+% that redefines \cs{unexpanded}. Thus this package defines
+% \cs{etex@unexpanded} to get rid of the name clash.
+%
+% \StopEventually{
+% }
+%
+% \section{Implementation}
+%
+% \begin{macrocode}
+%<*package>
+% \end{macrocode}
+%
+% \subsection{Reload check and package identification}
+% Reload check, especially if the package is not used with \LaTeX.
+% \begin{macrocode}
+\begingroup
+ \catcode44 12 % ,
+ \catcode45 12 % -
+ \catcode46 12 % .
+ \catcode58 12 % :
+ \catcode64 11 % @
+ \expandafter\let\expandafter\x\csname ver@etexcmds.sty\endcsname
+ \ifcase 0%
+ \ifx\x\relax % plain
+ \else
+ \ifx\x\empty % LaTeX
+ \else
+ 1%
+ \fi
+ \fi
+ \else
+ \expandafter\ifx\csname PackageInfo\endcsname\relax
+ \def\x#1#2{%
+ \immediate\write-1{Package #1 Info: #2.}%
+ }%
+ \else
+ \def\x#1#2{\PackageInfo{#1}{#2, stopped}}%
+ \fi
+ \x{etexcmds}{The package is already loaded}%
+ \endgroup
+ \expandafter\endinput
+ \fi
+\endgroup
+% \end{macrocode}
+% Package identification:
+% \begin{macrocode}
+\begingroup
+ \catcode44 12 % ,
+ \catcode45 12 % -
+ \catcode46 12 % .
+ \catcode58 12 % :
+ \catcode64 11 % @
+ \expandafter\ifx\csname ProvidesPackage\endcsname\relax
+ \def\x#1#2#3[#4]{\endgroup
+ \immediate\write-1{Package: #3 #4}%
+ \xdef#1{#4}%
+ }%
+ \else
+ \def\x#1#2[#3]{\endgroup
+ #2[{#3}]%
+ \ifx#1\relax
+ \xdef#1{#3}%
+ \fi
+ }%
+ \fi
+\expandafter\x\csname ver@etexcmds.sty\endcsname
+\ProvidesPackage{etexcmds}%
+ [2007/05/06 v1.0 Providing prefix for e-TeX command names (HO)]
+% \end{macrocode}
+%
+% \subsection{Catcodes}
+%
+% \begin{macrocode}
+\expandafter\edef\csname etexcmds@End\endcsname{%
+ \catcode44 \the\catcode44\relax % ,
+ \catcode45 \the\catcode45\relax % -
+ \catcode46 \the\catcode46\relax % .
+ \catcode61 \the\catcode61\relax % =
+ \catcode64 \the\catcode64\relax % @
+ \noexpand\endinput
+}
+\catcode44 12 % ,
+\catcode45 12 % -
+\catcode46 12 % .
+\catcode61 12 % =
+\catcode64 11 % @
+% \end{macrocode}
+%
+% \subsection{Load package \xpackage{infwarerr}}
+%
+% \begin{macrocode}
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname RequirePackage\endcsname\relax
+ \input infwarerr.sty\relax
+\else
+ \RequirePackage{infwarerr}%
+\fi
+% \end{macrocode}
+%
+% \subsection{\cs{unexpanded}}
+%
+% \begin{macro}{\ifetex@unexpanded}
+% \begin{macrocode}
+\newif\ifetex@unexpanded
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\etex@unexpanded}
+% \begin{macrocode}
+\begingroup
+\escapechar=92 % backslash
+\edef\x{\string\unexpanded}%
+\edef\y{\meaning\unexpanded}%
+\ifx\x\y
+ \endgroup
+ \let\etex@unexpanded\unexpanded
+ \etex@unexpandedtrue
+\else
+ \edef\y{\meaning\normalunexpanded}%
+ \ifx\x\y
+ \endgroup
+ \let\etex@unexpanded\normalunexpanded
+ \etex@unexpandedtrue
+ \else
+ \edef\y{\meaning\@@unexpanded}%
+ \ifx\y
+ \endgroup
+ \let\etex@unexpanded\@@unexpanded
+ \etex@unexpandedtrue
+ \else
+ \endgroup
+ \@PackageInfoNoLine{etexcmds}{%
+ Could not find \string\unexpanded.\MessageBreak
+ That can mean that you are not using e-TeX or\MessageBreak
+ that some package has redefined \string\unexpanded.\MessageBreak
+ In the latter case, load this package earlier%
+ }%
+ \etex@unexpandedfalse
+ \fi
+ \fi
+\fi
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macrocode}
+\InfWarErr@End
+%</package>
+% \end{macrocode}
+%
+% \section{Test}
+%
+% \begin{macrocode}
+%<*test1>
+\immediate\write16{etexcmds-test1.tex: test file for plainTeX}
+\input etexcmds.sty\relax
+\catcode`\@=11 %
+\edef\x{\string\unexpanded}
+\edef\y{\meaning\etex@unexpanded}
+\ifx\x\y
+\else
+ \@PackageError{etexcmds-test1}{Test failed}\@ehc
+\fi
+\end
+%</test1>
+% \end{macrocode}
+%
+% \begin{macrocode}
+%<*test2>
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesFile{etexcmds-test2.tex}[2007/05/06 v1.0 Test file for LaTeX]
+\RequirePackage{etexcmds}
+\makeatletter
+\edef\x{\string\unexpanded}
+\edef\y{\meaning\etex@unexpanded}
+\ifx\x\y
+\else
+ \@PackageError{etexcmds-test2}{Test failed}\@ehc
+\fi
+\stop
+%</test2>
+% \end{macrocode}
+%
+% \begin{macrocode}
+%<*test3>
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesFile{etexcmds-test3.tex}[2007/05/06 v1.0 Test file for LaTeX]
+\documentclass{article}
+\usepackage{m-pictex}
+\usepackage{m-ch-de}
+\usepackage{etexcmds}
+\makeatletter
+\ifetex@unexpanded
+ \edef\x{\string\unexpanded}%
+ \edef\y{\meaning\etex@unexpanded}%
+ \ifx\x\y
+ \else
+ \@PackageWarningNoLine{etexcmds-test3}{Test failed}%
+ \fi
+\else
+ \@PackageWarningNoLine{etexcmds-test3}{%
+ Test failed because of ConTeXt%
+ }%
+\fi
+\stop
+%</test3>
+% \end{macrocode}
+% \section{Installation}
+%
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
+% CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/etexcmds.dtx}] The source file.
+% \item[\CTAN{macros/latex/contrib/oberdiek/etexcmds.pdf}] Documentation.
+% \end{description}
+%
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}]
+% \end{description}
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+% |unzip oberdiek-tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
+% \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
+% \docstrip\ archive. The files are extracted by running the
+% \xfile{.dtx} through \plainTeX:
+% \begin{quote}
+% \verb|tex etexcmds.dtx|
+% \end{quote}
+%
+% \paragraph{TDS.} Now the different files must be moved into
+% the different directories in your installation TDS tree
+% (also known as \xfile{texmf} tree):
+% \begin{quote}
+% \sbox0{^^A
+% \begin{tabular}{@{}>{\ttfamily}l@{$\quad\rightarrow\quad$}>{\ttfamily}l@{}}
+% etexcmds.sty & tex/generic/oberdiek/etexcmds.sty\\
+% etexcmds.pdf & doc/latex/oberdiek/etexcmds.pdf\\
+% etexcmds-test1.tex & doc/latex/oberdiek/etexcmds-test1.tex\\
+% etexcmds-test2.tex & doc/latex/oberdiek/etexcmds-test2.tex\\
+% etexcmds-test3.tex & doc/latex/oberdiek/etexcmds-test3.tex\\
+% etexcmds.dtx & source/latex/oberdiek/etexcmds.dtx\\
+% \end{tabular}^^A
+% }%
+% \ifdim\wd0>\linewidth
+% \mbox{}\nobreak\hskip0pt minus\leftmargin
+% \usebox0
+% \nobreak\hskip0pt minus\rightmargin
+% \else
+% \usebox0
+% \fi
+% \end{quote}
+% If you have a \xfile{docstrip.cfg} that configures and enables \docstrip's
+% TDS installing feature, then some files can already be in the right
+% place, see the documentation of \docstrip.
+%
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
+% these. For example, \teTeX\ users run \verb|texhash| or
+% \verb|mktexlsr|.
+%
+% \subsection{Some details for the interested}
+%
+% \paragraph{Attached source.}
+%
+% The PDF documentation on CTAN also includes the
+% \xfile{.dtx} source file. It can be extracted by
+% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
+% e.g. unpack the file into the current directory:
+% \begin{quote}
+% \verb|pdftk etexcmds.pdf unpack_files output .|
+% \end{quote}
+%
+% \paragraph{Unpacking with \LaTeX.}
+% The \xfile{.dtx} chooses its action depending on the format:
+% \begin{description}
+% \item[\plainTeX:] Run \docstrip\ and extract the files.
+% \item[\LaTeX:] Generate the documentation.
+% \end{description}
+% If you insist on using \LaTeX\ for \docstrip\ (really,
+% \docstrip\ does not need \LaTeX), then inform the autodetect routine
+% about your intention:
+% \begin{quote}
+% \verb|latex \let\install=y\input{etexcmds.dtx}|
+% \end{quote}
+% Do not forget to quote the argument according to the demands
+% of your shell.
+%
+% \paragraph{Generating the documentation.}
+% You can use both the \xfile{.dtx} or the \xfile{.drv} to generate
+% the documentation. The process can be configured by the
+% configuration file \xfile{ltxdoc.cfg}. For instance, put this
+% line into this file, if you want to have A4 as paper format:
+% \begin{quote}
+% \verb|\PassOptionsToClass{a4paper}{article}|
+% \end{quote}
+% An example follows how to generate the
+% documentation with pdf\LaTeX:
+% \begin{quote}
+%\begin{verbatim}
+%pdflatex etexcmds.dtx
+%makeindex -s gind.ist etexcmds.idx
+%pdflatex etexcmds.dtx
+%makeindex -s gind.ist etexcmds.idx
+%pdflatex etexcmds.dtx
+%\end{verbatim}
+% \end{quote}
+%
+% \begin{History}
+% \begin{Version}{2007/04/26 v1.0}
+% \item
+% First version.
+% \end{Version}
+% \end{History}
+%
+% \PrintIndex
+%
+% \Finale
+\endinput
diff --git a/Master/texmf-dist/source/latex/oberdiek/hycolor.dtx b/Master/texmf-dist/source/latex/oberdiek/hycolor.dtx
index 4d32f2b1efa..fa81a607376 100644
--- a/Master/texmf-dist/source/latex/oberdiek/hycolor.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/hycolor.dtx
@@ -1066,7 +1066,7 @@ and the derived files
\usepackage{qstest}
\IncludeTests{*}
-\LogTests{lgout}{*}{*}
+\LogTests{log}{*}{*}
\makeatletter
diff --git a/Master/texmf-dist/source/latex/oberdiek/iflang.dtx b/Master/texmf-dist/source/latex/oberdiek/iflang.dtx
index 8762ad48fba..e429d8d305c 100644
--- a/Master/texmf-dist/source/latex/oberdiek/iflang.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/iflang.dtx
@@ -600,7 +600,7 @@ and the derived files
\documentclass{minimal}
\usepackage{qstest}
\IncludeTests{*}
-\LogTests{lgout}{*}{*}
+\LogTests{log}{*}{*}
\usepackage[english,naustrian,ngerman]{babel}
\usepackage{iflang}
\begin{document}
diff --git a/Master/texmf-dist/source/latex/oberdiek/kvoptions.dtx b/Master/texmf-dist/source/latex/oberdiek/kvoptions.dtx
index 7c76961ae2d..b0eed0fc6a8 100644
--- a/Master/texmf-dist/source/latex/oberdiek/kvoptions.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/kvoptions.dtx
@@ -69,7 +69,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: kvoptions 2007/04/11 v2.5 Connects package keyval with LaTeX options (HO)}
+\Msg{* Package: kvoptions 2007/05/06 v2.6 Connects package keyval with LaTeX options (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -133,7 +133,7 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{kvoptions.drv}%
- [2007/04/11 v2.5 Connects package keyval with LaTeX options (HO)]%
+ [2007/05/06 v2.6 Connects package keyval with LaTeX options (HO)]%
\documentclass{ltxdoc}
\usepackage{holtxdoc}
\begin{document}
@@ -142,7 +142,7 @@ and the derived files
%</driver>
% \fi
%
-% \CheckSum{1519}
+% \CheckSum{1536}
%
% \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
@@ -163,7 +163,7 @@ and the derived files
% \GetFileInfo{kvoptions.drv}
%
% \title{The \xpackage{kvoptions} package}
-% \date{2007/04/11 v2.5}
+% \date{2007/05/06 v2.6}
% \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
%
% \maketitle
@@ -626,7 +626,7 @@ and the derived files
% Package identification
% -----------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{example-mycolorsetup}[2007/04/11 Managing my colors]
+\ProvidesPackage{example-mycolorsetup}[2007/05/06 Managing my colors]
\RequirePackage{ifpdf}
\RequirePackage{kvoptions}
@@ -803,7 +803,7 @@ and the derived files
% \end{quote}
% Some remarks:
% \begin{itemize}
-% \item The patch and requires \eTeX, its \cs{unexpanded} feature
+% \item The patch requires \eTeX, its \cs{unexpanded} feature
% is much to nice. It is possible to work around using token
% registers. But the code becomes longer, slower, more difficult
% to read and maintain. The package without option \xoption{patch}
@@ -928,7 +928,7 @@ and the derived files
%<*package>
\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)]%
% \end{macrocode}
%
% \paragraph{External resources.}
@@ -1504,11 +1504,11 @@ and the derived files
\@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 }%
,%
@@ -1678,6 +1678,20 @@ and the derived files
\fi
% \end{macrocode}
%
+% Package \xpackage{etexcmds} for \cs{etex@unexpanded}.
+% \begin{macrocode}
+\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
+% \end{macrocode}
+%
% Check for package \xpackage{xkvltxp}.
% \begin{macrocode}
\@ifpackageloaded{xkvltxp}{%
@@ -2050,14 +2064,14 @@ and the derived files
\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
@@ -2086,13 +2100,13 @@ and the derived files
\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}%
}%
}%
}
@@ -2353,6 +2367,10 @@ and the derived files
% \item
% Line ends sanitized.
% \end{Version}
+% \begin{Version}{2007/05/06 v2.6}
+% \item
+% Uses package \xpackage{etexcmds}.
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins b/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins
index 13069237b11..5d92bb40259 100644
--- a/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins
+++ b/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins
@@ -1,5 +1,5 @@
% oberdiek.ins
-% 2007/04/27
+% 2007/05/09
%
% Copyright (C) 1999, 2001, 2006 by
% Heiko Oberdiek <oberdiek@uni-freiburg.de>
@@ -39,6 +39,7 @@
\batchinput{embedfile.dtx}
\batchinput{engord.dtx}
\batchinput{epstopdf.dtx}
+\batchinput{etexcmds.dtx}
\batchinput{flags.dtx}
\batchinput{grffile.dtx}
\batchinput{holtxdoc.dtx}
diff --git a/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex b/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex
index ba9606c23e6..312d0701c37 100644
--- a/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex
+++ b/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex
@@ -6,7 +6,7 @@
\newcommand*{\Subject}{CTAN:\CTANdir}
\newcommand*{\Author}{Heiko Oberdiek}
\newcommand*{\Email}{oberdiek@uni-freiburg.de}
-\newcommand*{\Date}{2007/04/27}
+\newcommand*{\Date}{2007/05/09}
% Copyright (C) 2006 by
% Heiko Oberdiek <oberdiek@uni-freiburg.de>
@@ -170,7 +170,7 @@
[\entrysep]
\entry{auxhook}{2006/04/06}{1.1}{Hooks for auxiliary files}%
[\entrysep]
-\entry{bmpsize}{2007/04/11}{1.2}{Extract size and resolution data from bitmap files}%
+\entry{bmpsize}{2007/04/29}{1.3}{Extract size and resolution data from bitmap files}%
[\entrysep]
\entry{bookmark}{2007/04/25}{0.9}{PDF bookmarks}%
[\entrysep]
@@ -190,6 +190,8 @@
[\entrysep]
\entry{epstopdf}{2007/04/26}{1.4}{Conversion with epstopdf on the fly}%
[\entrysep]
+\entry{etexcmds}{2007/05/06}{1.0}{Providing prefix for e-TeX command names}%
+[\entrysep]
\entry{flags}{2007/03/07}{0.3}{Flag setting in bit fields}%
[\entrysep]
\entry{grffile}{2007/04/11}{1.3}{Extended file name support for graphics}%
@@ -218,7 +220,7 @@
[\entrysep]
\entry{inputenx}{2007/04/11}{1.1}{Enhanced input encoding handling}%
[\entrysep]
-\entry{kvoptions}{2007/04/11}{2.5}{Connects package keyval with \LaTeX{} options}%
+\entry{kvoptions}{2007/05/06}{2.6}{Connects package keyval with \LaTeX{} options}%
[\entrysep]
\entry{kvsetkeys}{2006/10/19}{1.1}{Key value parser with default handler support}%
[\entrysep]
@@ -246,7 +248,7 @@
[\entrysep]
\entry{settobox}{2007/04/11}{1.3}{Getting box sizes}%
[\entrysep]
-\entry{stackrel}{2006/12/02}{1.0}{Adding subscript option to stackrel}%
+\entry{stackrel}{2007/05/06}{1.1}{Adding subscript option to stackrel}%
[\entrysep]
\entry{tabularht}{2007/04/11}{2.5}{Tabular with height specification}%
[\entrysep]
@@ -258,7 +260,7 @@
[\entrysep]
\entry{twoopt}{2006/02/20}{1.4}{Definitions with two optional arguments}%
[\entrysep]
-\entry{zref}{2007/04/22}{1.8}{New reference scheme for \LaTeXe{}}%
+\entry{zref}{2007/05/06}{2.0}{New reference scheme for \LaTeXe{}}%
\end{overview}
\section{Packages}
@@ -447,6 +449,17 @@ epstopdf is automatically called to convert it to pdf format.
\tocinclude{epstopdf}
\newpage
+\subsection{\pkgsectformat{etexcmds}}
+\label{etexcmds}
+\begin{abstract}
+New primitive commands are introduced in \eTeX. Sometimes the
+names collide with existing macros. This package solves this
+name clashes by adding a prefix to \eTeX's commands. For example,
+\eTeX's \cs{unexpanded} is provided as \cs{etex@unexpanded}.
+\end{abstract}
+\tocinclude{etexcmds}
+
+\newpage
\subsection{\pkgsectformat{flags}}
\label{flags}
\begin{abstract}
diff --git a/Master/texmf-dist/source/latex/oberdiek/pdfescape.dtx b/Master/texmf-dist/source/latex/oberdiek/pdfescape.dtx
index f68dd90b1aa..2ebf207e4b4 100644
--- a/Master/texmf-dist/source/latex/oberdiek/pdfescape.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/pdfescape.dtx
@@ -1233,7 +1233,7 @@ and the derived files
% \begin{macrocode}
\RequirePackage{qstest}
\IncludeTests{*}
-\LogTests{lgout}{*}{*}
+\LogTests{log}{*}{*}
\newcommand*{\ExpectVar}[2]{%
\ifx#1#2%
diff --git a/Master/texmf-dist/source/latex/oberdiek/stackrel.dtx b/Master/texmf-dist/source/latex/oberdiek/stackrel.dtx
index 3cce4a5dcfe..e623f5962e9 100644
--- a/Master/texmf-dist/source/latex/oberdiek/stackrel.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/stackrel.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% 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
@@ -66,7 +66,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: stackrel 2006/12/02 v1.0 Adding subscript option to stackrel (HO)}
+\Msg{* Package: stackrel 2007/05/06 v1.1 Adding subscript option to stackrel (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -76,7 +76,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
@@ -126,7 +126,7 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{stackrel.drv}%
- [2006/12/02 v1.0 Adding subscript option to stackrel (HO)]%
+ [2007/05/06 v1.1 Adding subscript option to stackrel (HO)]%
\documentclass{ltxdoc}
\usepackage{holtxdoc}
\usepackage{amsmath}
@@ -137,7 +137,7 @@ and the derived files
%</driver>
% \fi
%
-% \CheckSum{97}
+% \CheckSum{89}
%
% \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
@@ -158,7 +158,7 @@ and the derived files
% \GetFileInfo{stackrel.drv}
%
% \title{The \xpackage{stackrel} package}
-% \date{2006/12/02 v1.0}
+% \date{2007/05/06 v1.1}
% \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
%
% \maketitle
@@ -205,7 +205,7 @@ and the derived files
%<*package>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{stackrel}
- [2006/12/02 v1.0 Adding subscript option to stackrel (HO)]%
+ [2007/05/06 v1.1 Adding subscript option to stackrel (HO)]%
% \end{macrocode}
%
% Given the original definition of \cs{stackrel} the addition
@@ -220,26 +220,15 @@ and the derived files
% define macros with arguments).
% \begin{macro}{\stack@relbin}
% \begin{macrocode}
-\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
+\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
}%
@@ -251,6 +240,17 @@ and the derived files
\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
% \end{macrocode}
% \end{macro}
@@ -404,6 +404,10 @@ and the derived files
% \item
% First version.
% \end{Version}
+% \begin{Version}{2007/05/06 v1.1}
+% \item
+% Uses package \xpackage{etexcmds}.
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/zref.dtx b/Master/texmf-dist/source/latex/oberdiek/zref.dtx
index 39b20839f2f..e2a04d2c7b8 100644
--- a/Master/texmf-dist/source/latex/oberdiek/zref.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/zref.dtx
@@ -84,7 +84,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: zref 2007/04/22 v1.8 New reference scheme for LaTeX2e (HO)}
+\Msg{* Package: zref 2007/05/06 v2.0 New reference scheme for LaTeX2e (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -166,7 +166,7 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{zref.drv}%
- [2007/04/22 v1.8 New reference scheme for LaTeX2e (HO)]%
+ [2007/05/06 v2.0 New reference scheme for LaTeX2e (HO)]%
\documentclass{ltxdoc}
\usepackage{holtxdoc}
\begin{document}
@@ -175,7 +175,7 @@ and the derived files
%</driver>
% \fi
%
-% \CheckSum{1513}
+% \CheckSum{1537}
%
% \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
@@ -196,7 +196,7 @@ and the derived files
% \GetFileInfo{zref.drv}
%
% \title{The \xpackage{zref} package}
-% \date{2007/04/22 v1.8}
+% \date{2007/05/06 v2.0}
% \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
%
% \maketitle
@@ -1157,13 +1157,13 @@ the height difference of the two baselines is
%<*package>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref}
- [2007/04/22 v1.8 New reference scheme for LaTeX2e (HO)]%
+ [2007/05/06 v2.0 New reference scheme for LaTeX2e (HO)]%
% \end{macrocode}
%
% \subsubsection{Load basic module}
%
% \begin{macrocode}
-\RequirePackage{zref-base}[2007/04/22]
+\RequirePackage{zref-base}[2007/05/06]
% \end{macrocode}
% Abort package loading if \xpackage{zref-base} could not be
% loaded successfully.
@@ -1178,7 +1178,7 @@ the height difference of the two baselines is
\def\ZREF@temp#1{%
\DeclareOption{#1}{%
\AtEndOfPackage{%
- \RequirePackage{zref-#1}[2007/04/22]%
+ \RequirePackage{zref-#1}[2007/05/06]%
}%
}%
}
@@ -1238,7 +1238,7 @@ the height difference of the two baselines is
%<*base>
\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)]%
% \end{macrocode}
%
% \subsubsection{Utilities}
@@ -1315,6 +1315,22 @@ the height difference of the two baselines is
\endgroup
% \end{macrocode}
%
+% \begin{macrocode}
+\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
+% \end{macrocode}
+%
% \subsubsection{Auxiliary file stuff}
%
% We are using some commands in the \xfile{.aux} files.
@@ -1787,7 +1803,7 @@ the height difference of the two baselines is
% \begin{macro}{\zref@wrapper@unexpanded}
% \begin{macrocode}
\long\def\zref@wrapper@unexpanded#1{%
- \let\ZREF@unexpanded\unexpanded
+ \let\ZREF@unexpanded\etex@unexpanded
#1%
\let\ZREF@unexpanded\@firstofone
}
@@ -1930,8 +1946,8 @@ the height difference of the two baselines is
%<*user>
\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}{}
% \end{macrocode}
%
@@ -2005,8 +2021,8 @@ the height difference of the two baselines is
%<*abspage>
\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}{}
% \end{macrocode}
%
@@ -2050,8 +2066,8 @@ the height difference of the two baselines is
%<*counter>
\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}{}
% \end{macrocode}
%
@@ -2087,8 +2103,8 @@ the height difference of the two baselines is
%<*lastpage>
\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}{}
% \end{macrocode}
%
@@ -2121,16 +2137,16 @@ the height difference of the two baselines is
%<*totpages>
\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}{}
% \end{macrocode}
%
% The absolute page number of the last page is the total
% page number.
% \begin{macrocode}
-\RequirePackage{zref-abspage}[2007/04/22]
-\RequirePackage{zref-lastpage}[2007/04/22]
+\RequirePackage{zref-abspage}[2007/05/06]
+\RequirePackage{zref-lastpage}[2007/05/06]
% \end{macrocode}
%
% \begin{macro}{\ztotpages}
@@ -2160,8 +2176,8 @@ the height difference of the two baselines is
%<*perpage>
\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}{}
% \end{macrocode}
%
@@ -2173,7 +2189,7 @@ the height difference of the two baselines is
% For detecting changed pages module \xoption{abspage}
% is loaded.
% \begin{macrocode}
-\RequirePackage{zref-abspage}[2007/04/22]
+\RequirePackage{zref-abspage}[2007/05/06]
% \end{macrocode}
%
% We group the properties for the needed references
@@ -2317,8 +2333,8 @@ the height difference of the two baselines is
%<*titleref>
\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}{}
% \end{macrocode}
%
@@ -2599,7 +2615,21 @@ the height difference of the two baselines is
}%
}%
}{}%
-}%
+% \end{macrocode}
+%
+% Package \xpackage{longtable}: some support for its \cs{caption}.
+% However \cs{label} inside the caption is not supported.
+%
+% \begin{macrocode}
+ \@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}%
+ }%
+ }%
+ }{}%
+}
% \end{macrocode}
%
% \begin{macrocode}
@@ -2613,8 +2643,8 @@ the height difference of the two baselines is
%<*xr>
\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}{}
% \end{macrocode}
% \begin{macrocode}
@@ -2765,7 +2795,7 @@ the height difference of the two baselines is
\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
@@ -2957,8 +2987,8 @@ the height difference of the two baselines is
%<*hyperref>
\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}{}
% \end{macrocode}
%
@@ -2986,8 +3016,8 @@ the height difference of the two baselines is
%<*savepos>
\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}{}
% \end{macrocode}
%
@@ -3092,15 +3122,15 @@ the height difference of the two baselines is
%<*dotfill>
\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}{}
% \end{macrocode}
%
% For measuring the width of \cs{zdotfill} we use the features
% provided by module \xoption{savepos}.
% \begin{macrocode}
-\RequirePackage{zref-savepos}[2007/04/22]
+\RequirePackage{zref-savepos}[2007/05/06]
% \end{macrocode}
% For automatically generated label names we use the unique
% counter of module \xoption{base}.
@@ -3395,6 +3425,16 @@ the height difference of the two baselines is
% if babel is not used or \cs{if@safe@actives} is already set to true.
% (Feature request of Josselin Noirel)
% \end{Version}
+% \begin{Version}{2007/05/02 v1.9}
+% \item
+% Module titleref: Some support for \cs{caption} of package
+% \xpackage{longtable}, but only if \cs{label} is given after
+% \cs{caption}.
+% \end{Version}
+% \begin{Version}{2007/05/06 v2.0}
+% \item
+% Uses package \xpackage{etexcmds} for accessing \eTeX's \cs{unexpanded}.
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/Master/texmf-dist/tex/generic/oberdiek/etexcmds.sty b/Master/texmf-dist/tex/generic/oberdiek/etexcmds.sty
new file mode 100644
index 00000000000..bbb2cdc104a
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/oberdiek/etexcmds.sty
@@ -0,0 +1,135 @@
+%%
+%% This is file `etexcmds.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% etexcmds.dtx (with options: `package')
+%%
+%% This is a generated file.
+%%
+%% Copyright (C) 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
+%% version 1.3 of this license or (at your option) any later
+%% version. The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of
+%% LaTeX version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status "maintained".
+%%
+%% This Current Maintainer of this work is Heiko Oberdiek.
+%%
+%% This work consists of the main source file etexcmds.dtx
+%% and the derived files
+%% etexcmds.sty, etexcmds.pdf, etexcmds.ins, etexcmds.drv,
+%% etexcmds-test1.tex, etexcmds-test2.tex, etexcmds-test3.tex.
+%%
+\begingroup
+ \catcode44 12 % ,
+ \catcode45 12 % -
+ \catcode46 12 % .
+ \catcode58 12 % :
+ \catcode64 11 % @
+ \expandafter\let\expandafter\x\csname ver@etexcmds.sty\endcsname
+ \ifcase 0%
+ \ifx\x\relax % plain
+ \else
+ \ifx\x\empty % LaTeX
+ \else
+ 1%
+ \fi
+ \fi
+ \else
+ \expandafter\ifx\csname PackageInfo\endcsname\relax
+ \def\x#1#2{%
+ \immediate\write-1{Package #1 Info: #2.}%
+ }%
+ \else
+ \def\x#1#2{\PackageInfo{#1}{#2, stopped}}%
+ \fi
+ \x{etexcmds}{The package is already loaded}%
+ \endgroup
+ \expandafter\endinput
+ \fi
+\endgroup
+\begingroup
+ \catcode44 12 % ,
+ \catcode45 12 % -
+ \catcode46 12 % .
+ \catcode58 12 % :
+ \catcode64 11 % @
+ \expandafter\ifx\csname ProvidesPackage\endcsname\relax
+ \def\x#1#2#3[#4]{\endgroup
+ \immediate\write-1{Package: #3 #4}%
+ \xdef#1{#4}%
+ }%
+ \else
+ \def\x#1#2[#3]{\endgroup
+ #2[{#3}]%
+ \ifx#1\relax
+ \xdef#1{#3}%
+ \fi
+ }%
+ \fi
+\expandafter\x\csname ver@etexcmds.sty\endcsname
+\ProvidesPackage{etexcmds}%
+ [2007/05/06 v1.0 Providing prefix for e-TeX command names (HO)]
+\expandafter\edef\csname etexcmds@End\endcsname{%
+ \catcode44 \the\catcode44\relax % ,
+ \catcode45 \the\catcode45\relax % -
+ \catcode46 \the\catcode46\relax % .
+ \catcode61 \the\catcode61\relax % =
+ \catcode64 \the\catcode64\relax % @
+ \noexpand\endinput
+}
+\catcode44 12 % ,
+\catcode45 12 % -
+\catcode46 12 % .
+\catcode61 12 % =
+\catcode64 11 % @
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname RequirePackage\endcsname\relax
+ \input infwarerr.sty\relax
+\else
+ \RequirePackage{infwarerr}%
+\fi
+\newif\ifetex@unexpanded
+\begingroup
+\escapechar=92 % backslash
+\edef\x{\string\unexpanded}%
+\edef\y{\meaning\unexpanded}%
+\ifx\x\y
+ \endgroup
+ \let\etex@unexpanded\unexpanded
+ \etex@unexpandedtrue
+\else
+ \edef\y{\meaning\normalunexpanded}%
+ \ifx\x\y
+ \endgroup
+ \let\etex@unexpanded\normalunexpanded
+ \etex@unexpandedtrue
+ \else
+ \edef\y{\meaning\@@unexpanded}%
+ \ifx\y
+ \endgroup
+ \let\etex@unexpanded\@@unexpanded
+ \etex@unexpandedtrue
+ \else
+ \endgroup
+ \@PackageInfoNoLine{etexcmds}{%
+ Could not find \string\unexpanded.\MessageBreak
+ That can mean that you are not using e-TeX or\MessageBreak
+ that some package has redefined \string\unexpanded.\MessageBreak
+ In the latter case, load this package earlier%
+ }%
+ \etex@unexpandedfalse
+ \fi
+ \fi
+\fi
+\InfWarErr@End
+\endinput
+%%
+%% End of file `etexcmds.sty'.
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]%
}%
}%
}
diff --git a/Master/texmf-dist/tpm/oberdiek.tpm b/Master/texmf-dist/tpm/oberdiek.tpm
index e6fec8ed562..0157578ffce 100644
--- a/Master/texmf-dist/tpm/oberdiek.tpm
+++ b/Master/texmf-dist/tpm/oberdiek.tpm
@@ -3,20 +3,21 @@
<rdf:Description about="http://texlive.dante.de/texlive/Package/oberdiek.zip">
<TPM:Name>oberdiek</TPM:Name>
<TPM:Type>Package</TPM:Type>
- <TPM:Date>2007/04/27 01:47:54</TPM:Date>
+ <TPM:Date>2007/05/09 13:37:51</TPM:Date>
<TPM:Version></TPM:Version>
<TPM:Creator>rahtz</TPM:Creator>
<TPM:Title>Packages written by Heiko Oberdiek</TPM:Title>
<TPM:Description></TPM:Description>
<TPM:Author>Heiko Oberdiek</TPM:Author>
- <TPM:Size>11556017</TPM:Size>
+ <TPM:Size>11831348</TPM:Size>
<TPM:License></TPM:License>
<TPM:Build/>
- <TPM:RunFiles size="877867">
+ <TPM:RunFiles size="886192">
texmf-dist/scripts/oberdiek/pdfatfi.pl
texmf-dist/tex/generic/oberdiek/alphalph.sty
texmf-dist/tex/generic/oberdiek/atbegshi.sty
texmf-dist/tex/generic/oberdiek/engord.sty
+texmf-dist/tex/generic/oberdiek/etexcmds.sty
texmf-dist/tex/generic/oberdiek/iflang.sty
texmf-dist/tex/generic/oberdiek/ifpdf.sty
texmf-dist/tex/generic/oberdiek/ifvtex.sty
@@ -133,7 +134,7 @@ texmf-dist/tex/latex/oberdiek/zref-xr.sty
texmf-dist/tex/latex/oberdiek/zref.sty
texmf-dist/tpm/oberdiek.tpm
</TPM:RunFiles>
- <TPM:DocFiles size="9142874">
+ <TPM:DocFiles size="9299929">
texmf-dist/doc/latex/oberdiek/accsupp-example.tex
texmf-dist/doc/latex/oberdiek/accsupp.pdf
texmf-dist/doc/latex/oberdiek/aliascnt.pdf
@@ -157,6 +158,10 @@ texmf-dist/doc/latex/oberdiek/embedfile-example-plain.tex
texmf-dist/doc/latex/oberdiek/embedfile.pdf
texmf-dist/doc/latex/oberdiek/engord.pdf
texmf-dist/doc/latex/oberdiek/epstopdf.pdf
+texmf-dist/doc/latex/oberdiek/etexcmds-test1.tex
+texmf-dist/doc/latex/oberdiek/etexcmds-test2.tex
+texmf-dist/doc/latex/oberdiek/etexcmds-test3.tex
+texmf-dist/doc/latex/oberdiek/etexcmds.pdf
texmf-dist/doc/latex/oberdiek/example-mycolorsetup.sty
texmf-dist/doc/latex/oberdiek/flags.pdf
texmf-dist/doc/latex/oberdiek/grffile.pdf
@@ -217,7 +222,7 @@ texmf-dist/doc/latex/oberdiek/twoopt.pdf
texmf-dist/doc/latex/oberdiek/zref-example.tex
texmf-dist/doc/latex/oberdiek/zref.pdf
</TPM:DocFiles>
- <TPM:SourceFiles size="1810607">
+ <TPM:SourceFiles size="1830348">
texmf-dist/source/latex/oberdiek/accsupp.dtx
texmf-dist/source/latex/oberdiek/aliascnt.dtx
texmf-dist/source/latex/oberdiek/alphalph.dtx
@@ -235,6 +240,7 @@ texmf-dist/source/latex/oberdiek/dvipscol.dtx
texmf-dist/source/latex/oberdiek/embedfile.dtx
texmf-dist/source/latex/oberdiek/engord.dtx
texmf-dist/source/latex/oberdiek/epstopdf.dtx
+texmf-dist/source/latex/oberdiek/etexcmds.dtx
texmf-dist/source/latex/oberdiek/flags.dtx
texmf-dist/source/latex/oberdiek/grffile.dtx
texmf-dist/source/latex/oberdiek/holtxdoc.dtx
diff --git a/Master/texmf/lists/oberdiek b/Master/texmf/lists/oberdiek
index 5d34e6bad7b..fb47f56a238 100644
--- a/Master/texmf/lists/oberdiek
+++ b/Master/texmf/lists/oberdiek
@@ -21,6 +21,10 @@ texmf-dist/doc/latex/oberdiek/embedfile-example-plain.tex
texmf-dist/doc/latex/oberdiek/embedfile.pdf
texmf-dist/doc/latex/oberdiek/engord.pdf
texmf-dist/doc/latex/oberdiek/epstopdf.pdf
+texmf-dist/doc/latex/oberdiek/etexcmds-test1.tex
+texmf-dist/doc/latex/oberdiek/etexcmds-test2.tex
+texmf-dist/doc/latex/oberdiek/etexcmds-test3.tex
+texmf-dist/doc/latex/oberdiek/etexcmds.pdf
texmf-dist/doc/latex/oberdiek/example-mycolorsetup.sty
texmf-dist/doc/latex/oberdiek/flags.pdf
texmf-dist/doc/latex/oberdiek/grffile.pdf
@@ -97,6 +101,7 @@ texmf-dist/source/latex/oberdiek/dvipscol.dtx
texmf-dist/source/latex/oberdiek/embedfile.dtx
texmf-dist/source/latex/oberdiek/engord.dtx
texmf-dist/source/latex/oberdiek/epstopdf.dtx
+texmf-dist/source/latex/oberdiek/etexcmds.dtx
texmf-dist/source/latex/oberdiek/flags.dtx
texmf-dist/source/latex/oberdiek/grffile.dtx
texmf-dist/source/latex/oberdiek/holtxdoc.dtx
@@ -139,6 +144,7 @@ texmf-dist/scripts/oberdiek/pdfatfi.pl
texmf-dist/tex/generic/oberdiek/alphalph.sty
texmf-dist/tex/generic/oberdiek/atbegshi.sty
texmf-dist/tex/generic/oberdiek/engord.sty
+texmf-dist/tex/generic/oberdiek/etexcmds.sty
texmf-dist/tex/generic/oberdiek/iflang.sty
texmf-dist/tex/generic/oberdiek/ifpdf.sty
texmf-dist/tex/generic/oberdiek/ifvtex.sty