summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2007-10-25 00:14:21 +0000
committerKarl Berry <karl@freefriends.org>2007-10-25 00:14:21 +0000
commit3a17bfd79ba2527e8947328a85d40bb12a75cedb (patch)
tree14d6a30c876712ca634fc72acdb683873ff7a0a6 /Master/texmf-dist/tex
parent7d6ef8fd8f6ae3043dd7aa5c350ac30e8ee509ec (diff)
oberdiek update, kvoptions3.0 askinclude2.0 ... (24oct07)
git-svn-id: svn://tug.org/texlive/trunk@5275 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/alphalph.sty2
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/etexcmds.sty2
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-ascii.def2
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-cp1250.def2
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-cp1251.def2
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-cp1252.def2
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-cp1257.def2
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-cp437.def2
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-cp850.def2
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-cp852.def2
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-cp855.def2
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-cp858.def2
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-cp865.def2
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-cp866.def2
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-dec-mcs.def2
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-1.def2
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-10.def2
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-11.def2
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-13.def2
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-14.def2
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-15.def2
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-16.def2
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-2.def2
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-3.def2
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-4.def2
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-5.def2
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-6.def2
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-7.def2
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-8.def2
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-9.def2
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-koi8-r.def2
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-mac-centeuro.def2
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-mac-cyrillic.def2
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-mac-roman.def2
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-nextstep.def2
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-pdfdoc.def2
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-utf16le.def2
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-utf32be.def2
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-utf32le.def2
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-utf8.def2
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/stringenc.sty32
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/askinclude.sty665
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/auxhook.sty2
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/bmpsize-base.sty2
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfm.def2
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfmx.def2
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvips.def2
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/bmpsize.sty2
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/holtxdoc.sty22
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/kvoptions-patch.sty489
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty465
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/listingsutf8.sty140
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/pdflscape.sty146
53 files changed, 1491 insertions, 560 deletions
diff --git a/Master/texmf-dist/tex/generic/oberdiek/alphalph.sty b/Master/texmf-dist/tex/generic/oberdiek/alphalph.sty
index d8bad96e21f..e40fda0fc14 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/alphalph.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/alphalph.sty
@@ -80,7 +80,7 @@
\fi
\expandafter\x\csname ver@alphalph.sty\endcsname
\ProvidesPackage{alphalph}%
- [2007/04/11 v2.0 Converting numbers to letters (HO)]
+ [2007/09/09 v2.0 Converting numbers to letters (HO)]
\expandafter\edef\csname AlPh@AtEnd\endcsname{%
\catcode64 \the\catcode64\relax
}
diff --git a/Master/texmf-dist/tex/generic/oberdiek/etexcmds.sty b/Master/texmf-dist/tex/generic/oberdiek/etexcmds.sty
index 8759319a8ab..1d0c163fa55 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/etexcmds.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/etexcmds.sty
@@ -80,7 +80,7 @@
\fi
\expandafter\x\csname ver@etexcmds.sty\endcsname
\ProvidesPackage{etexcmds}%
- [2007/09/09 v1.1 Providing prefix for e-TeX command names (HO)]
+ [2007/09/09 v1.1 Prefix for e-TeX command names (HO)]
\expandafter\edef\csname etexcmds@AtEnd\endcsname{%
\catcode64 \the\catcode64\relax
}
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-ascii.def b/Master/texmf-dist/tex/generic/oberdiek/se-ascii.def
index 870697befed..6fe9f49c520 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-ascii.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-ascii.def
@@ -39,7 +39,7 @@
%% se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
%% stringenc-test2.tex.
%%
-\ProvidesFile{se-ascii.def}[2007/09/09 v1.2 stringenc: US-ASCII]
+\ProvidesFile{se-ascii.def}[2007/10/22 v1.3 stringenc: US-ASCII]
\expandafter\gdef\csname\SE@PrefixTo ascii\endcsname#1#2#3#4{%
\ifnum"#1#2#3<8 %
\SE@ResultAdd{#3#4}%
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp1250.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp1250.def
index e1734571ef8..b54a3ff5ec3 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-cp1250.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp1250.def
@@ -39,7 +39,7 @@
%% se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
%% stringenc-test2.tex.
%%
-\ProvidesFile{se-cp1250.def}[2007/09/09 v1.2 stringenc: cp1250]
+\ProvidesFile{se-cp1250.def}[2007/10/22 v1.3 stringenc: cp1250]
\def\SE@this{cp1250}
\global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
\SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp1251.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp1251.def
index 08cc42397d6..dfc70e3d945 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-cp1251.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp1251.def
@@ -39,7 +39,7 @@
%% se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
%% stringenc-test2.tex.
%%
-\ProvidesFile{se-cp1251.def}[2007/09/09 v1.2 stringenc: cp1251]
+\ProvidesFile{se-cp1251.def}[2007/10/22 v1.3 stringenc: cp1251]
\def\SE@this{cp1251}
\global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
\SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp1252.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp1252.def
index a10cfa7d64c..bcd8af69776 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-cp1252.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp1252.def
@@ -39,7 +39,7 @@
%% se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
%% stringenc-test2.tex.
%%
-\ProvidesFile{se-cp1252.def}[2007/09/09 v1.2 stringenc: cp1252]
+\ProvidesFile{se-cp1252.def}[2007/10/22 v1.3 stringenc: cp1252]
\expandafter\gdef\csname\SE@PrefixTo cp1252\endcsname#1#2#3#4{%
\ifcase\ifnum"#1#2=\SE@zero
\ifnum"#3#4<"80 %
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp1257.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp1257.def
index 7f0abe81f3f..848ce5a212e 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-cp1257.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp1257.def
@@ -39,7 +39,7 @@
%% se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
%% stringenc-test2.tex.
%%
-\ProvidesFile{se-cp1257.def}[2007/09/09 v1.2 stringenc: cp1257]
+\ProvidesFile{se-cp1257.def}[2007/10/22 v1.3 stringenc: cp1257]
\def\SE@this{cp1257}
\global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
\SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp437.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp437.def
index b7ddfdd825c..e71b0ce77a4 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-cp437.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp437.def
@@ -39,7 +39,7 @@
%% se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
%% stringenc-test2.tex.
%%
-\ProvidesFile{se-cp437.def}[2007/09/09 v1.2 stringenc: cp437]
+\ProvidesFile{se-cp437.def}[2007/10/22 v1.3 stringenc: cp437]
\def\SE@this{cp437}
\global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
\SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp850.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp850.def
index cd57f1b8750..976c8188f9b 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-cp850.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp850.def
@@ -39,7 +39,7 @@
%% se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
%% stringenc-test2.tex.
%%
-\ProvidesFile{se-cp850.def}[2007/09/09 v1.2 stringenc: cp850]
+\ProvidesFile{se-cp850.def}[2007/10/22 v1.3 stringenc: cp850]
\def\SE@this{cp850}
\global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
\SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp852.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp852.def
index 582be4fd3a7..860e12b0faf 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-cp852.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp852.def
@@ -39,7 +39,7 @@
%% se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
%% stringenc-test2.tex.
%%
-\ProvidesFile{se-cp852.def}[2007/09/09 v1.2 stringenc: cp852]
+\ProvidesFile{se-cp852.def}[2007/10/22 v1.3 stringenc: cp852]
\def\SE@this{cp852}
\global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
\SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp855.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp855.def
index fb98b68485f..ba6e972954e 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-cp855.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp855.def
@@ -39,7 +39,7 @@
%% se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
%% stringenc-test2.tex.
%%
-\ProvidesFile{se-cp855.def}[2007/09/09 v1.2 stringenc: cp855]
+\ProvidesFile{se-cp855.def}[2007/10/22 v1.3 stringenc: cp855]
\def\SE@this{cp855}
\global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
\SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp858.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp858.def
index 4c97d7eecc3..feeaecdbd47 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-cp858.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp858.def
@@ -39,7 +39,7 @@
%% se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
%% stringenc-test2.tex.
%%
-\ProvidesFile{se-cp858.def}[2007/09/09 v1.2 stringenc: cp858]
+\ProvidesFile{se-cp858.def}[2007/10/22 v1.3 stringenc: cp858]
\def\SE@this{cp858}
\global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
\SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp865.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp865.def
index 3c8ade1f4e5..563c807b71a 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-cp865.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp865.def
@@ -39,7 +39,7 @@
%% se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
%% stringenc-test2.tex.
%%
-\ProvidesFile{se-cp865.def}[2007/09/09 v1.2 stringenc: cp865]
+\ProvidesFile{se-cp865.def}[2007/10/22 v1.3 stringenc: cp865]
\def\SE@this{cp865}
\global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
\SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp866.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp866.def
index 08b2e0c151d..2ae2a2c923a 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-cp866.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp866.def
@@ -39,7 +39,7 @@
%% se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
%% stringenc-test2.tex.
%%
-\ProvidesFile{se-cp866.def}[2007/09/09 v1.2 stringenc: cp866]
+\ProvidesFile{se-cp866.def}[2007/10/22 v1.3 stringenc: cp866]
\def\SE@this{cp866}
\global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
\SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-dec-mcs.def b/Master/texmf-dist/tex/generic/oberdiek/se-dec-mcs.def
index 73c4f3caa17..db79bfe2e53 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-dec-mcs.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-dec-mcs.def
@@ -39,7 +39,7 @@
%% se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
%% stringenc-test2.tex.
%%
-\ProvidesFile{se-dec-mcs.def}[2007/09/09 v1.2 stringenc: DEC-MCS]
+\ProvidesFile{se-dec-mcs.def}[2007/10/22 v1.3 stringenc: DEC-MCS]
\def\SE@this{dec-mcs}
\global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
\SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-1.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-1.def
index 7f050203240..b25eefa571a 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-1.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-1.def
@@ -39,7 +39,7 @@
%% se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
%% stringenc-test2.tex.
%%
-\ProvidesFile{se-iso-8859-1.def}[2007/09/09 v1.2 stringenc: ISO-8859-1]
+\ProvidesFile{se-iso-8859-1.def}[2007/10/22 v1.3 stringenc: ISO-8859-1]
\expandafter\gdef\csname\SE@PrefixTo iso-8859-1\endcsname#1#2#3#4{%
\ifcase\ifnum"#1#2=\SE@zero
\ifnum"#3#4<"80 %
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-10.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-10.def
index 09d4d64de20..3ed1c16a025 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-10.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-10.def
@@ -39,7 +39,7 @@
%% se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
%% stringenc-test2.tex.
%%
-\ProvidesFile{se-iso-8859-10.def}[2007/09/09 v1.2 stringenc: ISO-8859-10]
+\ProvidesFile{se-iso-8859-10.def}[2007/10/22 v1.3 stringenc: ISO-8859-10]
\def\SE@this{iso-8859-10}
\global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
\SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-11.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-11.def
index 2e2022f678b..cc807529d2d 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-11.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-11.def
@@ -39,7 +39,7 @@
%% se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
%% stringenc-test2.tex.
%%
-\ProvidesFile{se-iso-8859-11.def}[2007/09/09 v1.2 stringenc: ISO-8859-11]
+\ProvidesFile{se-iso-8859-11.def}[2007/10/22 v1.3 stringenc: ISO-8859-11]
\def\SE@this{iso-8859-11}
\global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
\SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-13.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-13.def
index 458a192b12c..9e9e7a8b4d6 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-13.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-13.def
@@ -39,7 +39,7 @@
%% se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
%% stringenc-test2.tex.
%%
-\ProvidesFile{se-iso-8859-13.def}[2007/09/09 v1.2 stringenc: ISO-8859-13]
+\ProvidesFile{se-iso-8859-13.def}[2007/10/22 v1.3 stringenc: ISO-8859-13]
\def\SE@this{iso-8859-13}
\global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
\SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-14.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-14.def
index bc267bfb83e..517fa311d7e 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-14.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-14.def
@@ -39,7 +39,7 @@
%% se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
%% stringenc-test2.tex.
%%
-\ProvidesFile{se-iso-8859-14.def}[2007/09/09 v1.2 stringenc: ISO-8859-14]
+\ProvidesFile{se-iso-8859-14.def}[2007/10/22 v1.3 stringenc: ISO-8859-14]
\def\SE@this{iso-8859-14}
\global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
\SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-15.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-15.def
index 5b76e8b31db..949c276970f 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-15.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-15.def
@@ -39,7 +39,7 @@
%% se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
%% stringenc-test2.tex.
%%
-\ProvidesFile{se-iso-8859-15.def}[2007/09/09 v1.2 stringenc: ISO-8859-15]
+\ProvidesFile{se-iso-8859-15.def}[2007/10/22 v1.3 stringenc: ISO-8859-15]
\def\SE@this{iso-8859-15}
\global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
\SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-16.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-16.def
index 237b52740c4..a4d781f8a71 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-16.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-16.def
@@ -39,7 +39,7 @@
%% se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
%% stringenc-test2.tex.
%%
-\ProvidesFile{se-iso-8859-16.def}[2007/09/09 v1.2 stringenc: ISO-8859-16]
+\ProvidesFile{se-iso-8859-16.def}[2007/10/22 v1.3 stringenc: ISO-8859-16]
\def\SE@this{iso-8859-16}
\global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
\SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-2.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-2.def
index 568475018f8..78dc10833f2 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-2.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-2.def
@@ -39,7 +39,7 @@
%% se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
%% stringenc-test2.tex.
%%
-\ProvidesFile{se-iso-8859-2.def}[2007/09/09 v1.2 stringenc: ISO-8859-2]
+\ProvidesFile{se-iso-8859-2.def}[2007/10/22 v1.3 stringenc: ISO-8859-2]
\def\SE@this{iso-8859-2}
\global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
\SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-3.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-3.def
index 380de149dc3..1fdb0372d62 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-3.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-3.def
@@ -39,7 +39,7 @@
%% se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
%% stringenc-test2.tex.
%%
-\ProvidesFile{se-iso-8859-3.def}[2007/09/09 v1.2 stringenc: ISO-8859-3]
+\ProvidesFile{se-iso-8859-3.def}[2007/10/22 v1.3 stringenc: ISO-8859-3]
\def\SE@this{iso-8859-3}
\global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
\SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-4.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-4.def
index 332d4b559f1..e7fb67a64d0 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-4.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-4.def
@@ -39,7 +39,7 @@
%% se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
%% stringenc-test2.tex.
%%
-\ProvidesFile{se-iso-8859-4.def}[2007/09/09 v1.2 stringenc: ISO-8859-4]
+\ProvidesFile{se-iso-8859-4.def}[2007/10/22 v1.3 stringenc: ISO-8859-4]
\def\SE@this{iso-8859-4}
\global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
\SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-5.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-5.def
index 49ffc4247ae..59a0550bacb 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-5.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-5.def
@@ -39,7 +39,7 @@
%% se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
%% stringenc-test2.tex.
%%
-\ProvidesFile{se-iso-8859-5.def}[2007/09/09 v1.2 stringenc: ISO-8859-5]
+\ProvidesFile{se-iso-8859-5.def}[2007/10/22 v1.3 stringenc: ISO-8859-5]
\def\SE@this{iso-8859-5}
\global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
\SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-6.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-6.def
index 2bda08178f0..0d77d513e1a 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-6.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-6.def
@@ -39,7 +39,7 @@
%% se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
%% stringenc-test2.tex.
%%
-\ProvidesFile{se-iso-8859-6.def}[2007/09/09 v1.2 stringenc: ISO-8859-6]
+\ProvidesFile{se-iso-8859-6.def}[2007/10/22 v1.3 stringenc: ISO-8859-6]
\def\SE@this{iso-8859-6}
\global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
\SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-7.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-7.def
index abee5520fcf..c4cae2337e7 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-7.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-7.def
@@ -39,7 +39,7 @@
%% se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
%% stringenc-test2.tex.
%%
-\ProvidesFile{se-iso-8859-7.def}[2007/09/09 v1.2 stringenc: ISO-8859-7]
+\ProvidesFile{se-iso-8859-7.def}[2007/10/22 v1.3 stringenc: ISO-8859-7]
\def\SE@this{iso-8859-7}
\global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
\SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-8.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-8.def
index a89e7bee45e..54ca4ad1753 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-8.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-8.def
@@ -39,7 +39,7 @@
%% se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
%% stringenc-test2.tex.
%%
-\ProvidesFile{se-iso-8859-8.def}[2007/09/09 v1.2 stringenc: ISO-8859-8]
+\ProvidesFile{se-iso-8859-8.def}[2007/10/22 v1.3 stringenc: ISO-8859-8]
\def\SE@this{iso-8859-8}
\global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
\SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-9.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-9.def
index ce4ed07d93f..b3c85342a90 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-9.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-9.def
@@ -39,7 +39,7 @@
%% se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
%% stringenc-test2.tex.
%%
-\ProvidesFile{se-iso-8859-9.def}[2007/09/09 v1.2 stringenc: ISO-8859-9]
+\ProvidesFile{se-iso-8859-9.def}[2007/10/22 v1.3 stringenc: ISO-8859-9]
\def\SE@this{iso-8859-9}
\global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
\SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-koi8-r.def b/Master/texmf-dist/tex/generic/oberdiek/se-koi8-r.def
index 7f21b1dd755..2e840b42010 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-koi8-r.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-koi8-r.def
@@ -39,7 +39,7 @@
%% se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
%% stringenc-test2.tex.
%%
-\ProvidesFile{se-koi8-r.def}[2007/09/09 v1.2 stringenc: KOI8-R]
+\ProvidesFile{se-koi8-r.def}[2007/10/22 v1.3 stringenc: KOI8-R]
\def\SE@this{koi8-r}
\global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
\SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-mac-centeuro.def b/Master/texmf-dist/tex/generic/oberdiek/se-mac-centeuro.def
index 1c059d3713d..dd998f6cc57 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-mac-centeuro.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-mac-centeuro.def
@@ -39,7 +39,7 @@
%% se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
%% stringenc-test2.tex.
%%
-\ProvidesFile{se-mac-centeuro.def}[2007/09/09 v1.2 stringenc: Mac OS Central European]
+\ProvidesFile{se-mac-centeuro.def}[2007/10/22 v1.3 stringenc: Mac OS Central European]
\def\SE@this{mac-centeuro}
\global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
\SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-mac-cyrillic.def b/Master/texmf-dist/tex/generic/oberdiek/se-mac-cyrillic.def
index b60ec02d105..d2eb680f429 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-mac-cyrillic.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-mac-cyrillic.def
@@ -39,7 +39,7 @@
%% se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
%% stringenc-test2.tex.
%%
-\ProvidesFile{se-mac-cyrillic.def}[2007/09/09 v1.2 stringenc: Mac OS Cyrillic]
+\ProvidesFile{se-mac-cyrillic.def}[2007/10/22 v1.3 stringenc: Mac OS Cyrillic]
\def\SE@this{mac-cyrillic}
\global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
\SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-mac-roman.def b/Master/texmf-dist/tex/generic/oberdiek/se-mac-roman.def
index cbf1a67bae6..9e7102f25d6 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-mac-roman.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-mac-roman.def
@@ -39,7 +39,7 @@
%% se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
%% stringenc-test2.tex.
%%
-\ProvidesFile{se-mac-roman.def}[2007/09/09 v1.2 stringenc: Mac OS Roman]
+\ProvidesFile{se-mac-roman.def}[2007/10/22 v1.3 stringenc: Mac OS Roman]
\def\SE@this{mac-roman}
\global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
\SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-nextstep.def b/Master/texmf-dist/tex/generic/oberdiek/se-nextstep.def
index 868d2ada602..b48938aad48 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-nextstep.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-nextstep.def
@@ -39,7 +39,7 @@
%% se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
%% stringenc-test2.tex.
%%
-\ProvidesFile{se-nextstep.def}[2007/09/09 v1.2 stringenc: NextStep]
+\ProvidesFile{se-nextstep.def}[2007/10/22 v1.3 stringenc: NextStep]
\def\SE@this{nextstep}
\global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname
\SE@to@general
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-pdfdoc.def b/Master/texmf-dist/tex/generic/oberdiek/se-pdfdoc.def
index 4828c682011..5be53592648 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-pdfdoc.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-pdfdoc.def
@@ -39,7 +39,7 @@
%% se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
%% stringenc-test2.tex.
%%
-\ProvidesFile{se-pdfdoc.def}[2007/09/09 v1.2 stringenc: PDFDocEncoding]
+\ProvidesFile{se-pdfdoc.def}[2007/10/22 v1.3 stringenc: PDFDocEncoding]
\expandafter\gdef\csname\SE@PrefixTo pdfdoc\endcsname#1#2#3#4{%
\ifcase\ifnum"#1#2#3#4<256 %
\ifnum"#1#2#3#4>160 %
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-utf16le.def b/Master/texmf-dist/tex/generic/oberdiek/se-utf16le.def
index 162cd25c837..41cf377f2a0 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-utf16le.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-utf16le.def
@@ -39,7 +39,7 @@
%% se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
%% stringenc-test2.tex.
%%
-\ProvidesFile{se-utf16le.def}[2007/09/09 v1.2 stringenc: UTF-16LE]
+\ProvidesFile{se-utf16le.def}[2007/10/22 v1.3 stringenc: UTF-16LE]
\expandafter\gdef\csname\SE@PrefixTo utf16le\endcsname#1#2#3#4{%
\SE@ResultAdd{#3#4#1#2}%
}
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-utf32be.def b/Master/texmf-dist/tex/generic/oberdiek/se-utf32be.def
index ddd097fa8b5..31f987c65c2 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-utf32be.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-utf32be.def
@@ -39,7 +39,7 @@
%% se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
%% stringenc-test2.tex.
%%
-\ProvidesFile{se-utf32be.def}[2007/09/09 v1.2 stringenc: UTF-32BE]
+\ProvidesFile{se-utf32be.def}[2007/10/22 v1.3 stringenc: UTF-32BE]
\expandafter\gdef\csname\SE@PrefixTo utf32be\endcsname#1#2#3#4{%
\SE@ResultAdd{0000#1#2#3#4}%
}
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-utf32le.def b/Master/texmf-dist/tex/generic/oberdiek/se-utf32le.def
index e75b2f2b332..8323f09e622 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-utf32le.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-utf32le.def
@@ -39,7 +39,7 @@
%% se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
%% stringenc-test2.tex.
%%
-\ProvidesFile{se-utf32le.def}[2007/09/09 v1.2 stringenc: UTF-32LE]
+\ProvidesFile{se-utf32le.def}[2007/10/22 v1.3 stringenc: UTF-32LE]
\expandafter\gdef\csname\SE@PrefixTo utf32le\endcsname#1#2#3#4{%
\SE@ResultAdd{#3#4#1#20000}%
}
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-utf8.def b/Master/texmf-dist/tex/generic/oberdiek/se-utf8.def
index 161b69724c5..c7bd217bf74 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-utf8.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-utf8.def
@@ -39,7 +39,7 @@
%% se-cp1251.def, se-cp1257.def, stringenc-test1.tex,
%% stringenc-test2.tex.
%%
-\ProvidesFile{se-utf8.def}[2007/09/09 v1.2 stringenc: UTF-8]
+\ProvidesFile{se-utf8.def}[2007/10/22 v1.3 stringenc: UTF-8]
\expandafter\gdef\csname\SE@PrefixTo utf8\endcsname#1#2#3#4{%
\ifnum"#1#2#3#4<"80 %
\SE@ResultAdd{#3#4}%
diff --git a/Master/texmf-dist/tex/generic/oberdiek/stringenc.sty b/Master/texmf-dist/tex/generic/oberdiek/stringenc.sty
index 9ed85d874c8..8b034b61690 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/stringenc.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/stringenc.sty
@@ -91,7 +91,7 @@
\fi
\expandafter\x\csname ver@stringenc.sty\endcsname
\ProvidesPackage{stringenc}%
- [2007/09/09 v1.2 Converts strings between encodings (HO)]
+ [2007/10/22 v1.3 Converts strings between encodings (HO)]
\expandafter\edef\csname SE@AtEnd\endcsname{%
\catcode64 \the\catcode64\relax
}
@@ -262,23 +262,15 @@
\def\StringEncodingLoad#1{%
\begingroup
\catcode32=10 % space/space
- \catcode34=12 % "
\catcode35=6 % #/parameter
\catcode37=14 % percent/comment character
- \catcode45=12 % -
- \catcode46=12 % .
- \catcode47=12 % /
- \catcode58=12 % :
- \catcode60=12 % <
- \catcode61=12 % =
- \catcode62=12 % >
- \catcode64=11 % @
- \catcode91=12 % [
\catcode92=0 % backslash/escape character
- \catcode93=12 % ]
\catcode123=1 % {/beginning of group
\catcode125=2 % }/end of group
\endlinechar=-1 %
+ \SE@MakeLetters @ABCDEFGHIKLMNOPRSTU%
+ abcdefghiklmnoprstuvwxyz\relax
+ \SE@MakeOthers "-./:<=>[]0123456789\relax
\expandafter\ifx\csname ProvidesFile\endcsname\relax
\def\ProvidesFile##1[##2]{%
\immediate\write-1{File: ##1 ##2}%
@@ -287,6 +279,20 @@
\SE@InputIfFileExists{se-#1.def}%
\endgroup
}
+\def\SE@MakeLetters#1{%
+ \ifx#1\relax
+ \else
+ \catcode`#1=11 %
+ \expandafter\SE@MakeLetters
+ \fi
+}
+\def\SE@MakeOthers#1{%
+ \ifx#1\relax
+ \else
+ \catcode`#1=12 %
+ \expandafter\SE@MakeOthers
+ \fi
+}
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname IfFileExists\endcsname\relax
\begingroup\expandafter\expandafter\expandafter\endgroup
@@ -709,7 +715,7 @@ $ \fi
\SE@temp{mac-cyrillic}
\SE@temp{mac-roman}
\SE@temp{nextstep}
-\def\SE@EncodingFileList{%
+\def\StringEncodingList{%
ascii,%
cp437,%
cp850,%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/askinclude.sty b/Master/texmf-dist/tex/latex/oberdiek/askinclude.sty
new file mode 100644
index 00000000000..47ce9af4d6d
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/oberdiek/askinclude.sty
@@ -0,0 +1,665 @@
+%%
+%% This is file `askinclude.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% askinclude.dtx (with options: `package')
+%%
+%% This is a generated file.
+%%
+%% Copyright (C) 1991-1994 by Pablo A. Straub
+%% 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 askinclude.dtx
+%% and the derived files
+%% askinclude.sty, askinclude.pdf, askinclude.ins, askinclude.drv,
+%% askinclude-a.tex, askinclude-b.tex, askinclude-c.tex,
+%% askinclude-test1.tex, askinclude-test2.tex,
+%% askinclude-test3.tex, askinclude-test4.tex,
+%% askinclude-test5.tex, askinclude-test6.tex,
+%% askinclude-test7.tex, askinclude-test8.tex,
+%% askinclude-test9.tex, askinclude-test10.tex,
+%% askinclude-test11.tex, askinclude-test12.tex,
+%% askinclude-test13.tex, askinclude-test14.tex,
+%% askinclude-test15.tex, askinclude-test16.tex,
+%% askinclude-test17.tex, askinclude-test18.tex,
+%% askinclude-test19.tex, askinclude-test20.tex,
+%% askinclude-test21.tex, askinclude-test22.tex,
+%% askinclude-test23.tex, askinclude-test24.tex.
+%%
+\NeedsTeXFormat{LaTeX2e}
+\expandafter\edef\csname AskInc@AtEnd\endcsname{%
+ \catcode64 \the\catcode64\relax
+}
+\catcode64 11 % @
+\def\TMP@EnsureCode#1#2{%
+ \edef\AskInc@AtEnd{%
+ \AskInc@AtEnd
+ \catcode#1 \the\catcode#1\relax
+ }%
+ \catcode#1 #2\relax
+}
+\TMP@EnsureCode{33}{12}% !
+\TMP@EnsureCode{39}{12}% '
+\TMP@EnsureCode{40}{12}% (
+\TMP@EnsureCode{41}{12}% )
+\TMP@EnsureCode{42}{12}% *
+\TMP@EnsureCode{43}{12}% +
+\TMP@EnsureCode{44}{12}% ,
+\TMP@EnsureCode{45}{12}% -
+\TMP@EnsureCode{46}{12}% .
+\TMP@EnsureCode{47}{12}% /
+\TMP@EnsureCode{58}{12}% :
+\TMP@EnsureCode{61}{12}% =
+\TMP@EnsureCode{62}{12}% >
+\TMP@EnsureCode{63}{12}% ?
+\TMP@EnsureCode{91}{12}% [
+\TMP@EnsureCode{93}{12}% ]
+\TMP@EnsureCode{96}{12}% `
+\ProvidesPackage{askinclude}%
+ [2007/10/23 v2.0 Interactive asking of included files]%
+\AtBeginDocument{%
+ \let\AskInc@AtBeginDocument\@firstofone
+}
+\providecommand*{\AskInc@AtBeginDocument}{\AtBeginDocument}
+\def\AskInc@WriteAux#1#2{%
+ \AskInc@AtBeginDocument{%
+ \if@filesw
+ \immediate\write\@mainaux{#1}%
+ #2%
+ \fi
+ }%
+}
+\edef\AskInc@CharHash{\string#}
+\def\AskInc@WriteDefAddList{%
+ \AskInc@WriteAux{%
+ \string\providecommand*\string\AskInc@AddList[2]{%
+ \string\ifcase\string\ifx\AskInc@CharHash1\string\@undefined
+ \string\else
+ \string\ifx\AskInc@CharHash1\string\relax
+ \string\else
+ \string\ifx\AskInc@CharHash1\string\@empty
+ \string\else
+ 1%
+ \string\fi
+ \string\fi
+ \string\fi
+ 0 %
+ \string\gdef\AskInc@CharHash1{\AskInc@CharHash2}%
+ \string\else
+ \string\g@addto@macro\AskInc@CharHash1{,\AskInc@CharHash2}%
+ \string\fi
+ }%
+ }{%
+ \global\let\AskInc@WriteDefAddList\relax
+ }%
+}
+\def\AskInc@WriteDefAddFile{%
+ \AskInc@WriteDefAddList
+ \AskInc@WriteAux{%
+ \string\providecommand\string\AskInc@AddFile{%
+ \string\AskInc@AddList\string\AskInc@Files
+ }%
+ }{%
+ \global\let\AskInc@WriteDefAddFile\relax
+ }%
+}
+\AtBeginDocument{%
+ \global\let\AskInc@AddFile\@gobble
+}
+\def\AskInc@WriteAddFile#1{%
+ \AskInc@WriteDefAddFile
+ \AskInc@WriteAux{%
+ \string\AskInc@AddFile{#1}%
+ }{}%
+}
+\providecommand*{\AskInc@Files}{}
+\newcommand{\AskInc@OrgInclude}{}
+\let\AskInc@OrgInclude\include
+\let\AskInc@AskFile\@gobble
+\let\AskInc@MatchFile\@gobble
+\renewcommand*{\include}[1]{%
+ \AskInc@WriteAddFile{#1}%
+ \AskInc@AskFile{#1}%
+ \AskInc@MatchFile{#1}%
+ \AskInc@OrgInclude{#1}%
+}
+\AtEndOfPackage{%
+ \AtBeginDocument{%
+ \@ifundefined{AskInc@Answer}{}{%
+ \AskInc@WriteAux{%
+ \string\gdef\string\AskInc@Answer{\AskInc@Answer}%
+ }{}%
+ }%
+ \@ifundefined{AskInc@MatchMethod}{}{%
+ \AskInc@WriteAux{%
+ \string\gdef\string\AskInc@MatchMethod{\AskInc@MatchMethod}%
+ }{}%
+ }%
+ }%
+}
+\providecommand*{\@includeonly}[1]{%
+ \gdef\AskInc@Answer{#1}%
+ \ifx\AskInc@Answer\@empty
+ \gdef\AskInc@Answer{-}%
+ \fi
+ \global\let\AskInc@MatchMethod\@empty
+}
+\if@partsw
+ \PackageWarningNoLine{askinclude}{%
+ Previous \string\includeonly\space detected,\MessageBreak
+ therefore asking for files is suppressed%
+ }%
+ \DeclareOption{makematch}{}%
+ \DeclareOption{pdfmatch}{}%
+ \DeclareOption{noregexp}{}%
+ \ProcessOptions*%
+ \@ifundefined{AskInc@MatchFiles}{%
+ }{%
+ \ifx\AskInc@MatchMethod\@empty
+ \else
+ \AskInc@WriteAux{%
+ \string\gdef\string\AskInc@MatchFiles{\AskInc@MatchFiles}%
+ }{}%
+ \fi
+ }%
+ \AskInc@AtEnd
+ \expandafter\endinput
+\fi
+\newcommand{\AskInc@OrgIncludeOnly}{}%
+\let\AskInc@OrgIncludeOnly\includeonly
+\renewcommand*{\includeonly}[1]{%
+ \PackageWarning{askinclude}{%
+ \string\includeonly\space is managed by package `askinclude',%
+ \MessageBreak
+ therefore it is ignored%
+ }%
+}
+\def\AskInc@StringNoRegExp{noregexp}
+\def\AskInc@StringMakeMatch{makematch}
+\def\AskInc@StringPdfMatch{pdfmatch}
+\newif\ifAskInc@PdfMatchAvailable
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname pdfmatch\endcsname\relax
+\else
+ \AskInc@PdfMatchAvailabletrue
+\fi
+\DeclareOption{makematch}{%
+ \let\AskInc@MatchOption\AskInc@StringMakeMatch
+}
+\ifAskInc@PdfMatchAvailable
+ \DeclareOption{pdfmatch}{%
+ \let\AskInc@MatchOption\AskInc@StringPdfMatch
+ }%
+\else
+ \DeclareOption{pdfmatch}{%
+ \PackageWarningNoLine{askinclude}{%
+ Option `pdfmatch' is not available because\MessageBreak
+ your pdfTeX does not provide \string\pdfmatch
+ }%
+ }%
+\fi
+\DeclareOption{noregexp}{%
+ \let\AskInc@MatchOption\@empty
+}
+\ProcessOptions*
+\def\AskInc@CharAsterisk{*}
+\def\AskInc@CharMinus{-}
+\def\AskInc@CharPlus{+}
+\def\AskInc@CharQuestion{?}
+\def\AskInc@CharExclam{!}
+\def\AskInc@CharYes{y}
+\def\AskInc@CharNo{n}
+\def\AskInc@CharAll{A}
+\def\AskInc@CharNone{N}
+\def\AskInc@CharDefault{D}
+\def\AskInc@SanitizeAnswer#1#2{%
+ \begingroup
+ \escapechar=`\\%
+ \edef\[{\string\[}%
+ \edef\]{\string\]}%
+ \edef\({\string\(}%
+ \edef\){\string\)}%
+ \edef\*{\string\*}%
+ \edef\+{\string\+}%
+ \edef\?{\string\?}%
+ \edef\|{\string\|}%
+ \edef\^{\string\^}%
+ \edef\${\string\$}%
+ \edef\{{\string\{}%
+ \edef\}{\string\}}%
+ \edef\.{\string\.}%
+ \xdef#1{%
+ \expandafter\expandafter\expandafter\zap@space
+ \expandafter#2\space\@empty
+ }%
+ \endgroup
+}
+\AtBeginDocument{%
+ \@ifundefined{AskInc@Answer}{%
+ \global\let\AskInc@Answer\AskInc@CharAsterisk
+ }{%
+ \AskInc@SanitizeAnswer\AskInc@Answer\AskInc@Answer
+ }%
+ \global\let\AskInc@PreviousAnswer\AskInc@Answer
+ \@ifundefined{AskInc@MatchMethod}{%
+ \global\let\AskInc@MatchMethod\@empty
+ }{}%
+ \global\let\AskInc@PreviousMatchMethod\AskInc@MatchMethod
+ \@ifundefined{AskInc@MatchOption}{%
+ \let\AskInc@MatchOption\AskInc@MatchMethod
+ }{}%
+ \ifx\AskInc@MatchOption\AskInc@StringPdfMatch
+ \ifAskInc@PdfMatchAvailable
+ \else
+ \let\AskInc@MatchOption\@empty
+ \fi
+ \fi
+ \@ifundefined{AskInc@MatchFiles}{%
+ \let\AskInc@MatchFiles\@empty
+ }{}%
+}
+\def\AskInc@QuestionHeader{%
+ \typeout{}%
+ \typeout{***********************************}%
+ \typeout{*** Package askinclude Question ***}%
+ \typeout{***********************************}%
+ \typeout{}%
+}
+\def\AskInc@TypeoutFiles{%
+ \global\let\AskInc@PreviousMatches\@empty
+ \ifx\AskInc@Files\@empty
+ \else
+ \typeout{Files, found by previous run in \string\include:}%
+ \@for\AskInc@File:=\AskInc@Files\do{%
+ \ifx\AskInc@Answer\AskInc@CharAsterisk
+ \let\AskInc@Mark\AskInc@CharPlus
+ \else
+ \let\AskInc@Mark\AskInc@CharMinus
+ \ifx\AskInc@Answer\AskInc@CharMinus
+ \else
+ \ifx\AskInc@MatchMethod\@empty
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi
+ {\@for\AskInc@Temp:=\AskInc@Answer}%
+ {\@for\AskInc@Temp:=\AskInc@MatchFiles}%
+ \do{%
+ \ifx\AskInc@File\AskInc@Temp
+ \let\AskInc@Mark\AskInc@CharPlus
+ \fi
+ }%
+ \fi
+ \fi
+ \typeout{ \@spaces(\AskInc@Mark) \AskInc@File}%
+ \ifx\AskInc@Mark\AskInc@CharPlus
+ \ifx\AskInc@PreviousMatches\@empty
+ \global\let\AskInc@PreviousMatches\AskInc@File
+ \else
+ \expandafter\g@addto@macro
+ \expandafter\AskInc@PreviousMatches{%
+ \expandafter,\AskInc@File
+ }%
+ \fi
+ \fi
+ }%
+ \typeout{}%
+ \fi
+}
+\def\AskInc@TypeoutPreviousAnswer{%
+ \typeout{%
+ Previous answer (%
+ \ifx\AskInc@MatchMethod\@empty
+ noregexp%
+ \else
+ \AskInc@MatchMethod
+ \fi
+ ):%
+ }%
+ \typeout{ \@spaces[\AskInc@Answer]}%
+ \typeout{}%
+}
+\def\AskInc@TypeoutMatchMethod{%
+ \typeout{Regular expressions:}%
+ \AskInc@TypeoutMethod\@empty{noregexp}{%
+ \space disabled%
+ }%
+ \AskInc@TypeoutMethod\AskInc@StringMakeMatch{makematch}{%
+ enabled, using package `makematch'%
+ }%
+ \ifAskInc@PdfMatchAvailable
+ \AskInc@TypeoutMethod\AskInc@StringPdfMatch{pdfmatch}{%
+ \space enabled, using pdfTeX's \string\pdfmatch
+ }%
+ \fi
+ \typeout{}%
+}
+\def\AskInc@TypeoutMethod#1#2#3{%
+ \typeout{%
+ \ifx#1\AskInc@MatchOption \space--> \else\@spaces\space\fi
+ [#2] #3% hash-ok
+ }%
+}
+\def\AskInc@TypeoutMainQuestion{%
+ \typeout{Which files do you want to include?}%
+ \typeout{ \@spaces[foo,bar] \space\space
+ comma separated file or pattern list}%
+ \typeout{ \@spaces[*] \@spaces\@spaces all files}%
+ \typeout{ \@spaces[-] \@spaces\@spaces no files}%
+ \typeout{ \@spaces[?] \@spaces\@spaces ask for each file}%
+}
+\def\AskInc@MainQuestion{%
+ \AskInc@QuestionHeader
+ \AskInc@TypeoutFiles
+ \AskInc@TypeoutPreviousAnswer
+ \AskInc@TypeoutMatchMethod
+ \AskInc@TypeoutMainQuestion
+ \begingroup
+ \@makeother\*%
+ \@makeother\-%
+ \@makeother\?%
+ \@makeother\,%
+ \@makeother\!%
+ \@makeother\^%
+ \@makeother\$%
+ \@makeother\(%
+ \@makeother\)%
+ \@makeother\+%
+ \@makeother\[%
+ \@makeother\]%
+ \@makeother\\%
+ \@makeother\|%
+ \@makeother\:%
+ \@makeother\.%
+ \typein[\answer]%
+ { \@spaces[] \space\@spaces\@spaces use the previous answer}%
+ \typeout{}%
+ \AskInc@SanitizeAnswer\AskInc@@Answer\answer
+ \endgroup
+ \let\AskInc@Next\AskInc@MainQuestion
+ \ifx\AskInc@@Answer\AskInc@StringNoRegExp
+ \let\AskInc@MatchOption\@empty
+ \else
+ \ifx\AskInc@@Answer\AskInc@StringMakeMatch
+ \let\AskInc@MatchOption\AskInc@StringMakeMatch
+ \else
+ \ifx\AskInc@@Answer\AskInc@StringPdfMatch
+ \ifAskInc@PdfMatchAvailable
+ \let\AskInc@MatchOption\AskInc@StringPdfMatch
+ \else
+ \PackageWarning{askinclude}{%
+ Method `pdfmatch' is not available because\MessageBreak
+ your pdfTeX does not provide \string\pdfmatch
+ }%
+ \let\AskInc@MatchOption\@empty
+ \fi
+ \else
+ \ifx\AskInc@@Answer\@empty
+ \global\let\AskInc@@Answer\AskInc@Answer
+ \fi
+ \let\AskInc@Next\AskInc@MainAnswer
+ \fi
+ \fi
+ \fi
+ \AskInc@Next
+}
+\def\AskInc@MainAnswer{%
+ \ifx\AskInc@@Answer\AskInc@CharQuestion
+ \global\let\AskInc@Answer\@empty
+ \global\let\AskInc@MatchMethod\@empty
+ \global\let\AskInc@AskFile\AskInc@DoAskFile
+ \AskInc@OrgIncludeOnly{}%
+ \else
+ \global\let\AskInc@Answer\AskInc@@Answer
+ \ifx\AskInc@@Answer\AskInc@CharAsterisk
+ \global\let\AskInc@MatchMethod\@empty
+ \else
+ \ifx\AskInc@@Answer\AskInc@CharMinus
+ \global\let\AskInc@MatchMethod\@empty
+ \AskInc@OrgIncludeOnly{}%
+ \else
+ \global\let\AskInc@MatchMethod\AskInc@MatchOption
+ \ifx\AskInc@MatchOption\@empty
+ \expandafter\AskInc@OrgIncludeOnly\expandafter{%
+ \AskInc@Answer
+ }%
+ \else
+ \AskInc@MatchInit
+ \AskInc@OrgIncludeOnly{}%
+ \fi
+ \fi
+ \fi
+ \fi
+ \let\AskInc@Include\AskInc@DoInclude
+}
+\def\AskInc@MatchInit{%
+ \RequirePackage{kvsetkeys}[2007/09/29]%
+ \expandafter\comma@normalize\expandafter{\AskInc@Answer}%
+ \global\let\AskInc@MatchList\comma@list
+ \def\AskInc@MatchFile##1{%
+ \AskInc@DoMatch{##1}{%
+ \AskInc@WriteAddMatch{##1}%
+ \ifx\@partlist\@empty
+ \gdef\@partlist{##1}%
+ \else
+ \g@addto@macro\@partlist{,##1}%
+ \fi
+ }%
+ }%
+ \ifx\AskInc@MatchMethod\AskInc@StringMakeMatch
+ \AskInc@MakeMatchInit
+ \else
+ \AskInc@PdfMatchInit
+ \fi
+ \let\AskInc@MatchInit\@undefined
+}
+\def\AskInc@MakeMatchInit{%
+ \RequirePackage{makematch}%
+ \def\AskInc@DoMatch##1{%
+ \def\AskInc@Temp{%
+ \MakeMatcher[,]\AskInc@Temp
+ }%
+ \expandafter\AskInc@Temp\expandafter{\AskInc@MatchList}%
+ \AskInc@Temp{{##1}}\@firstofone\@gobble
+ }%
+ \let\AskInc@MakeMatchInit\@undefined
+}
+\def\AskInc@PdfMatchInit{%
+ \newif\ifAskInc@Found
+ \def\AskInc@DoMatch##1{%
+ \AskInc@Foundfalse
+ \expandafter\comma@parse@normalized\expandafter
+ {\AskInc@MatchList}{\AskInc@CheckMatch{##1}}%
+ \ifAskInc@Found
+ \expandafter\@firstofone
+ \else
+ \expandafter\@gobble
+ \fi
+ }%
+ \def\AskInc@CheckMatch##1##2{%
+ \AskInc@@CheckMatch##2\@empty\@nil{##1}%
+ }%
+ \def\AskInc@@CheckMatch##1##2\@nil##3{%
+ \def\AskInc@Temp{##1}%
+ \ifx\AskInc@Temp\AskInc@CharExclam
+ \ifcase\pdfmatch{##2}{##3}=1 %
+ \or
+ \AskInc@Foundfalse
+ \else
+ \AskInc@InvalidPattern{##2}{##1##2}%
+ \fi
+ \else
+ \ifcase\pdfmatch{##1##2}{##3} %
+ \or
+ \AskInc@Foundtrue
+ \else
+ \AskInc@InvalidPattern{##1##2}{##1##2}%
+ \fi
+ \fi
+ }%
+ \def\AskInc@InvalidPattern##1##2{%
+ \edef\AskInc@Temp{##1}%
+ \PackageWarningNoLine{askinclude}{%
+ Invalid pattern `\AskInc@Temp' for \string\pdfmatch
+ }%
+ \edef\AskInc@Temp{##2}%
+ \global\expandafter\let\expandafter\AskInc@MatchList
+ \expandafter\@empty
+ \expandafter\comma@parse@normalized\expandafter
+ {\AskInc@MatchList}\AskInc@FilterPattern
+ }%
+ \def\AskInc@FilterPattern##1{%
+ \edef\AskInc@Pattern{##1}%
+ \ifx\AskInc@Temp\AskInc@Pattern
+ \else
+ \ifx\AskInc@MatchList\@empty
+ \global\let\AskInc@MatchList\AskInc@Pattern
+ \else
+ \expandafter\g@addto@macro\expandafter\AskInc@MatchList{%
+ \expandafter,\AskInc@Pattern
+ }%
+ \fi
+ \fi
+ }%
+ \let\AskInc@PdfMatchInit\@undefined
+}
+\def\AskInc@WriteDefAddMatch{%
+ \AskInc@WriteDefAddList
+ \AskInc@WriteAux{%
+ \string\providecommand\string\AskInc@AddMatch{%
+ \string\AskInc@AddList\string\AskInc@MatchFiles
+ }%
+ }{%
+ \global\let\AskInc@WriteDefAddMatch\relax
+ }%
+}
+\AtBeginDocument{%
+ \global\let\AskInc@AddMatch\@gobble
+}
+\def\AskInc@WriteAddMatch#1{%
+ \AskInc@WriteDefAddMatch
+ \AskInc@WriteAux{%
+ \string\AskInc@AddMatch{#1}%
+ }{}%
+}
+\def\AskInc@SaveAnswer{%
+ \AskInc@WriteAux{%
+ \string\gdef\string\AskInc@Answer{\AskInc@Answer}%
+ }{}%
+}
+\@ifundefined{AskInc@PreviousAnswer}{%
+ \let\AskInc@PreviousAnswer\AskInc@CharAsterisk
+}{}
+\@ifundefined{AskInc@PreviousMatchMethod}{%
+ \let\AskInc@PreviousMatchMethod\@empty
+}{}
+\def\AskInc@DoAskFile#1{%
+ \edef\AskInc@File{#1}%
+ \ifx\AskInc@PreviousAnswer\AskInc@CharAsterisk
+ \let\AskInc@Default\AskInc@CharYes
+ \else
+ \let\AskInc@Default\AskInc@CharNo
+ \ifx\AskInc@PreviousAnswer\AskInc@CharMinus
+ \else
+ \ifx\AskInc@PreviousMatchMethod\@empty
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi
+ {\@for\AskInc@Temp:=\AskInc@PreviousAnswer}%
+ {\@for\AskInc@Temp:=\AskInc@MatchFiles}%
+ \do{%
+ \ifx\AskInc@Temp\AskInc@File
+ \let\AskInc@Default\AskInc@CharYes
+ \fi
+ }%
+ \fi
+ \ifx\AskInc@Default\AskInc@CharNo
+ \let\AskInc@Default\AskInc@CharYes
+ \@for\AskInc@Temp:=\AskInc@Files\do{%
+ \ifx\AskInc@Temp\AskInc@File
+ \let\AskInc@Default\AskInc@CharNo
+ \fi
+ }%
+ \fi
+ \fi
+ \let\AskInc@@QuestionHeader\AskInc@QuestionHeader
+ \AskInc@AskQuestion
+ \ifx\AskInc@AskResult\AskInc@CharYes
+ \ifx\AskInc@Answer\@empty
+ \gdef\AskInc@Answer{#1}%
+ \else
+ \g@addto@macro\AskInc@Answer{,#1}%
+ \fi
+ \AskInc@SaveAnswer
+ \let\@partlist\AskInc@Answer
+ \fi
+}
+\def\AskInc@AskQuestion{%
+ \let\AskInc@Temp\answer
+ \AskInc@@QuestionHeader
+ \let\AskInc@@QuestionHeader\relax
+ \typein[\answer]{%
+ Include `\AskInc@File'? [y]es, [n]o, [A]ll, [N]one, [D]efault %
+ (\AskInc@Default):%
+ }%
+ \typeout{}%
+ \let\AskInc@AskResult\answer
+ \let\answer\AskInc@Temp
+ \ifx\AskInc@AskResult\@empty
+ \let\AskInc@AskResult\AskInc@Default
+ \let\AskInc@Next\relax
+ \else
+ \ifx\AskInc@AskResult\AskInc@CharYes
+ \let\AskInc@Next\relax
+ \else
+ \ifx\AskInc@AskResult\AskInc@CharNo
+ \let\AskInc@Next\relax
+ \else
+ \ifx\AskInc@AskResult\AskInc@CharAll
+ \gdef\AskInc@AskQuestion{%
+ \let\AskInc@AskResult\AskInc@CharYes
+ }%
+ \else
+ \ifx\AskInc@AskResult\AskInc@CharNone
+ \gdef\AskInc@AskQuestion{%
+ \let\AskInc@AskResult\AskInc@CharNo
+ }%
+ \else
+ \ifx\AskInc@AskResult\AskInc@CharDefault
+ \gdef\AskInc@AskQuestion{%
+ \let\AskInc@AskResult\AskInc@Default
+ }%
+ \else
+ \PackageWarningNoLine{askinclude}{%
+ Invalid answer [\AskInc@AskResult].\MessageBreak
+ Answer must be one letter out of [ynAND]%
+ }%
+ \fi
+ \fi
+ \fi
+ \let\AskInc@Next\AskInc@AskQuestion
+ \fi
+ \fi
+ \fi
+ \AskInc@Next
+}
+\AtBeginDocument{\AskInc@MainQuestion}
+\AskInc@AtEnd
+\endinput
+%%
+%% End of file `askinclude.sty'.
diff --git a/Master/texmf-dist/tex/latex/oberdiek/auxhook.sty b/Master/texmf-dist/tex/latex/oberdiek/auxhook.sty
index 600488955b0..96f8ebe2e59 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/auxhook.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/auxhook.sty
@@ -28,7 +28,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{auxhook}%
- [2006/04/06 v1.1 Hooks for auxiliary files (HO)]%
+ [2007/04/06 v1.1 Hooks for auxiliary files (HO)]%
\providecommand*{\@beginmainauxhook}{}
\providecommand*{\@beginpartauxhook}{}
\newcommand{\AddLineBeginMainAux}[1]{%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-base.sty b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-base.sty
index 8a9ecaf4efd..4dbc977a358 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/29 v1.3 Basic part of bmpsize (HO)]%
+ [2007/05/01 v1.3 Basic part of bmpsize (HO)]%
\RequirePackage{fp-basic}
\RequirePackage{fp-snap}
\long\def\@bmpsize@plain@loop#1\repeat{%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfm.def b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfm.def
index ae09c031f20..042cd5f363c 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/29 v1.3 Graphics bitmap driver for dvipdfm (HO)]%
+ [2007/05/01 v1.3 Graphics bitmap driver for dvipdfm (HO)]%
\expandafter\edef\csname @bmpsize@driver@catcodes\endcsname{%
\catcode44 \the\catcode44 % ,
\catcode46 \the\catcode46 % .
diff --git a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfmx.def b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfmx.def
index 18360665b9a..cf88f50f985 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfmx.def
+++ b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfmx.def
@@ -29,7 +29,7 @@
%% bmpsize-dvipdfm.def, bmpsize-dvipdfmx.def.
%%
\ProvidesFile{bmpsize-dvipdfmx.def}%
- [2007/04/29 v1.3 Graphics bitmap driver for dvipdfmx (HO)]%
+ [2007/05/01 v1.3 Graphics bitmap driver for dvipdfmx (HO)]%
\expandafter\edef\csname @bmpsize@driver@catcodes\endcsname{%
\catcode44 \the\catcode44 % ,
\catcode46 \the\catcode46 % .
diff --git a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvips.def b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvips.def
index 6e019336a00..1582bec1cb2 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/29 v1.3 Graphics bitmap driver for dvips (HO)]%
+ [2007/05/01 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.sty b/Master/texmf-dist/tex/latex/oberdiek/bmpsize.sty
index 42e934543ec..bc7be80416f 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/29 v1.3 Extract size and resolution data from bitmap files (HO)]%
+ [2007/05/01 v1.3 Extract size and resolution data from bitmap files (HO)]%
\RequirePackage{ifpdf}
\ifpdf
\PackageInfo{bmpsize}{Superseded by pdfTeX in PDF mode}%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/holtxdoc.sty b/Master/texmf-dist/tex/latex/oberdiek/holtxdoc.sty
index 407c5d19ff2..75ab3f2dd14 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/holtxdoc.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/holtxdoc.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 1999-2006 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
+%% Copyright (C) 1999-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,7 +28,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{holtxdoc}%
- [2006/06/02 v0.7 Private additional ltxdoc support (HO)]
+ [2007/10/21 v0.8 Private additional ltxdoc support (HO)]
\RequirePackage[numbered]{hypdoc}
\RequirePackage{array}
\def\hld@info#1{%
@@ -137,6 +137,24 @@
\providecommand*{\eTeX}{\mbox{$\varepsilon$-\TeX}}
\providecommand*{\pdfTeX}{pdf\TeX}
\providecommand*{\pdfLaTeX}{pdf\LaTeX}
+\def\@temp#1#2{%
+ \providecommand*{#1}{%
+ \begingroup
+ X%
+ \@ifundefined{rotatebox}{e}{%
+ \lower0.5ex\hbox{%
+ \setbox0=\hbox{E}%
+ \dimen0=\ht0 %
+ \advance\dimen0 by \dp0 %
+ \raise\dimen0\hbox{\rotatebox{180}{\box0}}%
+ }%
+ }%
+ #2%
+ \endgroup
+ }%
+}
+\@temp\XeTeX\TeX
+\@temp\XeLaTeX\LaTeX
\providecommand*{\teTeX}{te\TeX}
\providecommand*{\mikTeX}{mik\TeX}
\providecommand*{\MakeIndex}{\textsl{MakeIndex}}
diff --git a/Master/texmf-dist/tex/latex/oberdiek/kvoptions-patch.sty b/Master/texmf-dist/tex/latex/oberdiek/kvoptions-patch.sty
new file mode 100644
index 00000000000..975343b7574
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/oberdiek/kvoptions-patch.sty
@@ -0,0 +1,489 @@
+%%
+%% This is file `kvoptions-patch.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% kvoptions.dtx (with options: `patch')
+%%
+%% This is a generated file.
+%%
+%% Copyright (C) 2004, 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
+%% 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 kvoptions.dtx
+%% and the derived files
+%% kvoptions.sty, kvoptions.pdf, kvoptions.ins, kvoptions.drv,
+%% kvoptions-patch.sty, example-mycolorsetup.sty,
+%% kvoptions-test1.tex, kvoptions-test2.tex.
+%%
+%% No we don't need the option 'color'.
+%% With color support option 'emphcolor' will dynamically
+%% change the color of \emph statements.
+\NeedsTeXFormat{LaTeX2e}
+\expandafter\edef\csname KVO@AtEnd\endcsname{%
+ \catcode64 \the\catcode64\relax
+}
+\catcode64 11 % @
+\def\TMP@EnsureCode#1#2{%
+ \edef\KVO@AtEnd{%
+ \KVO@AtEnd
+ \catcode#1 \the\catcode#1\relax
+ }%
+ \catcode#1 #2\relax
+}
+\TMP@EnsureCode{39}{12}% '
+\TMP@EnsureCode{40}{12}% (
+\TMP@EnsureCode{41}{12}% )
+\TMP@EnsureCode{43}{12}% +
+\TMP@EnsureCode{44}{12}% ,
+\TMP@EnsureCode{45}{12}% -
+\TMP@EnsureCode{46}{12}% .
+\TMP@EnsureCode{47}{12}% /
+\TMP@EnsureCode{58}{12}% :
+\TMP@EnsureCode{60}{12}% <
+\TMP@EnsureCode{61}{12}% =
+\TMP@EnsureCode{62}{12}% >
+\TMP@EnsureCode{91}{12}% [
+\TMP@EnsureCode{93}{12}% ]
+\TMP@EnsureCode{96}{12}% `
+\TMP@EnsureCode{124}{12}% |
+\edef\KVO@AtEnd{%
+ \KVO@AtEnd
+ \noexpand\endinput
+}
+\ProvidesPackage{kvoptions-patch}%
+ [2007/10/18 v3.0 LaTeX patch for keyval options (HO)]%
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname eTeXversion\endcsname\relax
+ \PackageWarningNoLine{kvoptions-patch}{%
+ Package loading is aborted, because e-TeX is missing%
+ }%
+ \expandafter\KVO@AtEnd
+\fi
+\RequirePackage{etexcmds}[2007/09/09]
+\ifetex@unexpanded
+\else
+ \PackageError{kvoptions-patch}{%
+ Could not find eTeX's \string\unexpanded.\MessageBreak
+ Try adding \string\RequirePackage\string{etexcmds\string} %
+ before \string\documentclass%
+ }\@ehd
+ \expandafter\KVO@AtEnd
+\fi
+\@ifpackageloaded{xkvltxp}{%
+ \PackageWarningNoLine{kvoptions}{%
+ Option `patch' cannot be used together with\MessageBreak
+ package `xkvltxp' that is already loaded.\MessageBreak
+ Therefore package loading is aborted%
+ }%
+ \KVO@AtEnd
+}{}
+\def\@if@ptions#1#2#3{%
+ \begingroup
+ \KVO@normalize\KVO@temp{#3}%
+ \edef\x{\endgroup
+ \noexpand\@if@pti@ns{%
+ \detokenize\expandafter\expandafter\expandafter{%
+ \csname opt@#2.#1\endcsname
+ }%
+ }{%
+ \detokenize\expandafter{\KVO@temp}%
+ }%
+ }%
+ \x
+}
+\def\@pass@ptions#1#2#3{%
+ \KVO@normalize\KVO@temp{#2}%
+ \@ifundefined{opt@#3.#1}{%
+ \expandafter\gdef\csname opt@#3.#1%
+ \expandafter\endcsname\expandafter{%
+ \KVO@temp
+ }%
+ }{%
+ \expandafter\gdef\csname opt@#3.#1%
+ \expandafter\expandafter\expandafter\endcsname
+ \expandafter\expandafter\expandafter{%
+ \csname opt@#3.#1\expandafter\endcsname\expandafter,\KVO@temp
+ }%
+ }%
+}
+\def\ProcessOptions{%
+ \let\ds@\@empty
+ \@ifundefined{opt@\@currname.\@currext}{%
+ \let\@curroptions\@empty
+ }{%
+ \expandafter\expandafter\expandafter\def
+ \expandafter\expandafter\expandafter\@curroptions
+ \expandafter\expandafter\expandafter{%
+ \csname opt@\@currname.\@currext\endcsname
+ }%
+ }%
+ \@ifstar\KVO@xprocess@ptions\KVO@process@ptions
+}
+\def\KVO@process@ptions{%
+ \@for\CurrentOption:=\@declaredoptions\do{%
+ \ifx\CurrentOption\@empty
+ \else
+ \begingroup
+ \ifx\@currext\@clsextension
+ \toks@{}%
+ \else
+ \toks@\expandafter{\@classoptionslist,}%
+ \fi
+ \toks\tw@\expandafter{\@curroptions}%
+ \edef\x{\endgroup
+ \noexpand\in@{,\CurrentOption,}{,\the\toks@\the\toks\tw@,}%
+ }%
+ \x
+ \ifin@
+ \KVO@use@ption
+ \expandafter\let\csname ds@\CurrentOption\endcsname\@empty
+ \fi
+ \fi
+ }%
+ \KVO@process@pti@ns
+}
+\def\KVO@xprocess@ptions{%
+ \ifx\@currext\@clsextension
+ \else
+ \@for\CurrentOption:=\@classoptionslist\do{%
+ \ifx\CurrentOption\@empty
+ \else
+ \KVO@in@\CurrentOption\@declaredoptions
+ \ifin@
+ \KVO@use@ption
+ \expandafter\let\csname ds@\CurrentOption\endcsname\@empty
+ \fi
+ \fi
+ }%
+ \fi
+ \KVO@process@pti@ns
+}
+\def\KVO@in@#1#2{%
+ \in@false
+ \begingroup
+ \@for\x:=#2\do{%
+ \ifx\x#1\relax
+ \in@true
+ \fi
+ }%
+ \edef\x{\endgroup
+ \ifin@
+ \noexpand\in@true
+ \fi
+ }%
+ \x
+}
+\def\KVO@process@pti@ns{%
+ \@for\CurrentOption:=\@curroptions\do{%
+ \@ifundefined{ds@\KVO@SanitizedCurrentOption}{%
+ \KVO@use@ption
+ \default@ds
+ }%
+ \KVO@use@ption
+ }%
+ \@for\CurrentOption:=\@declaredoptions\do{%
+ \expandafter\let\csname ds@\CurrentOption\endcsname\relax
+ }%
+ \let\CurrentOption\@empty
+ \let\@fileswith@pti@ns\@@fileswith@pti@ns
+ \AtEndOfPackage{\let\@unprocessedoptions\relax}%
+}
+\def\KVO@use@ption{%
+ \begingroup
+ \edef\x{\endgroup
+ \noexpand\@removeelement{%
+ \detokenize\expandafter{\CurrentOption}%
+ }{%
+ \detokenize\expandafter{\@unusedoptionlist}%
+ }%
+ }%
+ \x\@unusedoptionlist
+ \csname ds@\KVO@SanitizedCurrentOption\endcsname
+}
+\def\OptionNotUsed{%
+ \ifx\@currext\@clsextension
+ \xdef\@unusedoptionlist{%
+ \ifx\@unusedoptionlist\@empty
+ \else
+ \detokenize\expandafter{\@unusedoptionlist,}%
+ \fi
+ \detokenize\expandafter{\CurrentOption}%
+ }%
+ \fi
+}
+\def\CurrentOption@SaveLevel{0}
+\def\ExecuteOptions{%
+ \expandafter\KVO@ExecuteOptions
+ \csname CurrentOption@\CurrentOption@SaveLevel\endcsname
+}
+\def\KVO@ExecuteOptions#1#2{%
+ \let#1\CurrentOption
+ \edef\CurrentOption@SaveLevel{%
+ \the\numexpr\CurrentOption@SaveLevel+1%
+ }%
+ \@for\CurrentOption:=#2\do{%
+ \csname ds@\CurrentOption\endcsname
+ }%
+ \edef\CurrentOption@SaveLevel{%
+ \the\numexpr\CurrentOption@SaveLevel-1%
+ }%
+ \let\CurrentOption#1%
+}
+\def\KVO@fileswith@pti@ns#1[#2]#3[#4]{%
+ \ifx#1\@clsextension
+ \ifx\@classoptionslist\relax
+ \KVO@normalize\KVO@temp{#2}%
+ \expandafter\gdef\expandafter\@classoptionslist\expandafter{%
+ \KVO@temp
+ }%
+ \def\reserved@a{%
+ \KVO@onefilewithoptions{#3}[{#2}][{#4}]#1%
+ \@documentclasshook
+ }%
+ \else
+ \def\reserved@a{%
+ \KVO@onefilewithoptions{#3}[{#2}][{#4}]#1%
+ }%
+ \fi
+ \else
+ \begingroup
+ \let\KVO@temp\relax
+ \let\KVO@onefilewithoptions\relax
+ \let\@pkgextension\relax
+ \def\reserved@b##1,{%
+ \ifx\@nil##1\relax
+ \else
+ \ifx\relax##1\relax
+ \else
+ \KVO@onefilewithoptions{##1}[{\KVO@temp}][{#4}]%
+ \@pkgextension
+ \fi
+ \expandafter\reserved@b
+ \fi
+ }%
+ \edef\reserved@a{\zap@space#3 \@empty}%
+ \edef\reserved@a{\expandafter\reserved@b\reserved@a,\@nil,}%
+ \toks@{#2}%
+ \def\KVO@temp{\the\toks@}%
+ \edef\reserved@a{\endgroup \reserved@a}%
+ \fi
+ \reserved@a
+}
+\def\KVO@onefilewithoptions#1[#2][#3]#4{%
+ \@pushfilename
+ \xdef\@currname{#1}%
+ \global\let\@currext#4%
+ \expandafter\let\csname\@currname.\@currext-h@@k\endcsname\@empty
+ \let\CurrentOption\@empty
+ \@reset@ptions
+ \makeatletter
+ \def\reserved@a{%
+ \@ifl@aded\@currext{#1}{%
+ \@if@ptions\@currext{#1}{#2}{%
+ }{%
+ \begingroup
+ \@ifundefined{opt@#1.\@currext}{%
+ \def\x{}%
+ }{%
+ \edef\x{%
+ \expandafter\expandafter\expandafter\strip@prefix
+ \expandafter\meaning\csname opt@#1.\@currext\endcsname
+ }%
+ }%
+ \def\y{#2}%
+ \edef\y{\expandafter\strip@prefix\meaning\y}%
+ \@latex@error{Option clash for \@cls@pkg\space #1}{%
+ The package #1 has already been loaded %
+ with options:\MessageBreak
+ \space\space[\x]\MessageBreak
+ There has now been an attempt to load it %
+ with options\MessageBreak
+ \space\space[\y]\MessageBreak
+ Adding the global options:\MessageBreak
+ \space\space
+ \x,\y\MessageBreak
+ to your \noexpand\documentclass declaration may fix this.%
+ \MessageBreak
+ Try typing \space <return> \space to proceed.%
+ }%
+ \endgroup
+ }%
+ }{%
+ \@pass@ptions\@currext{#2}{#1}%
+ \global\expandafter
+ \let\csname ver@\@currname.\@currext\endcsname\@empty
+ \InputIfFileExists
+ {\@currname.\@currext}%
+ {}%
+ {\@missingfileerror\@currname\@currext}%
+ \let\@unprocessedoptions\@@unprocessedoptions
+ \csname\@currname.\@currext-h@@k\endcsname
+ \expandafter\let\csname\@currname.\@currext-h@@k\endcsname
+ \@undefined
+ \@unprocessedoptions
+ }%
+ \@ifl@ter\@currext{#1}{#3}{%
+ }{%
+ \@latex@warning@no@line{%
+ You have requested,\on@line, %
+ version\MessageBreak
+ #3' of \@cls@pkg\space #1,\MessageBreak
+ but only version\MessageBreak
+ `\csname ver@#1.\@currext\endcsname'\MessageBreak
+ is available%
+ }%
+ }%
+ \ifx\@currext\@clsextension\let\LoadClass\@twoloadclasserror\fi
+ \@popfilename
+ \@reset@ptions
+ }%
+ \reserved@a
+}
+\def\@unknownoptionerror{%
+ \@latex@error{%
+ Unknown option `\KVO@SanitizedCurrentOption' %
+ for \@cls@pkg\space`\@currname'%
+ }{%
+ The option `\KVO@SanitizedCurrentOption' was not declared in %
+ \@cls@pkg\space`\@currname', perhaps you\MessageBreak
+ misspelled its name. %
+ Try typing \space <return> %
+ \space to proceed.%
+ }%
+}
+\def\@@unprocessedoptions{%
+ \ifx\@currext\@pkgextension
+ \@ifundefined{opt@\@currname.\@currext}{%
+ \let\@curroptions\@empty
+ }{%
+ \expandafter\let\expandafter\@curroptions
+ \csname opt@\@currname.\@currext\endcsname
+ }%
+ \@for\CurrentOption:=\@curroptions\do{%
+ \ifx\CurrentOption\@empty\else\@unknownoptionerror\fi
+ }%
+ \fi
+}
+\def\KVO@SanitizedCurrentOption{%
+ \expandafter\strip@prefix\meaning\CurrentOption
+}
+\def\KVO@normalize#1#2{%
+ \let\KVO@result\@empty
+ \KVO@splitcomma#2,\@nil
+ \let#1\KVO@result
+}
+\def\KVO@splitcomma#1,#2\@nil{%
+ \KVO@ifempty{#1}{}{%
+ \KVO@checkkv#1=\@nil
+ }%
+ \KVO@ifempty{#2}{}{\KVO@splitcomma#2\@nil}%
+}
+\def\KVO@ifempty#1{%
+ \expandafter\ifx\expandafter\\\detokenize{#1}\\%
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi
+}
+\def\KVO@checkkv#1=#2\@nil{%
+ \KVO@ifempty{#2}{%
+ % option without value
+ \edef\KVO@x{\zap@space#1 \@empty}%
+ \ifx\KVO@x\@empty
+ % ignore empty option
+ \else
+ % append to list
+ \edef\KVO@result{%
+ \etex@unexpanded\expandafter{\KVO@result},\KVO@x
+ }%
+ \fi
+ }{%
+ % #1: "key", #2: "value="
+ % add key part
+ \edef\KVO@result{%
+ \etex@unexpanded\expandafter{\KVO@result},%
+ \zap@space#1 \@empty
+ }%
+ \futurelet\@let@token\KVO@checkfirsttok#2 \@nil| = \@nil|\KVO@nil
+ }%
+}
+\def\KVO@checkfirsttok{%
+ \ifx\@let@token\bgroup
+ % no space at start
+ \expandafter\KVO@removelastspace\expandafter=%
+ % "<value><spaceopt>= \@nil"
+ \else
+ \expandafter\KVO@checkfirstA
+ \fi
+}
+\def\KVO@checkfirstA#1 #2\@nil{%
+ \KVO@ifempty{#2}{%
+ \KVO@removelastspace=#1 \@nil
+ }{%
+ \KVO@ifempty{#1}{%
+ \KVO@removelastspace=#2\@nil
+ }{%
+ \KVO@removelastspace=#1 #2\@nil
+ }%
+ }%
+}
+\def\KVO@removelastspace#1 = \@nil|#2\KVO@nil{%
+ \KVO@ifempty{#2}{%
+ \edef\KVO@result{%
+ \etex@unexpanded\expandafter{\KVO@result}%
+ \etex@unexpanded\expandafter{\KVO@removegarbage#1\KVO@nil}%
+ }%
+ }{%
+ \edef\KVO@result{%
+ \etex@unexpanded\expandafter{\KVO@result}%
+ \etex@unexpanded{#1}%
+ }%
+ }%
+}
+\def\KVO@removegarbage#1= \@nil#2\KVO@nil{#1}%
+\def\KVO@removeelement#1#2{%
+ \begingroup
+ \toks@={}%
+ \@for\x:=#2\do{%
+ \ifx\x\@empty
+ \else
+ \ifx\x#1\relax
+ \else
+ \edef\t{\the\toks@}%
+ \ifx\t\@empty
+ \else
+ \toks@\expandafter{\the\toks@,}%
+ \fi
+ \toks@\expandafter{\the\expandafter\toks@\x}%
+ \fi
+ \fi
+ }%
+ \edef\x{\endgroup
+ \def\noexpand#2{\the\toks@}%
+ }%
+ \x
+}
+\let\@@fileswith@pti@ns\KVO@fileswith@pti@ns
+\ifx\@fileswith@pti@ns\@badrequireerror
+\else
+ \let\@fileswith@pti@ns\KVO@fileswith@pti@ns
+\fi
+\let\KVO@Patch=Y
+\KVO@AtEnd
+\endinput
+%%
+%% End of file `kvoptions-patch.sty'.
diff --git a/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty b/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty
index 1a222383f32..329903bff66 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty
@@ -26,7 +26,8 @@
%% This work consists of the main source file kvoptions.dtx
%% and the derived files
%% kvoptions.sty, kvoptions.pdf, kvoptions.ins, kvoptions.drv,
-%% example-mycolorsetup.sty, kvoptions-test1.tex.
+%% kvoptions-patch.sty, example-mycolorsetup.sty,
+%% kvoptions-test1.tex, kvoptions-test2.tex.
%%
%% No we don't need the option 'color'.
%% With color support option 'emphcolor' will dynamically
@@ -83,7 +84,7 @@
\fi
\expandafter\x\csname ver@kvoptions.sty\endcsname
\ProvidesPackage{kvoptions}%
- [2007/10/02 v2.8 Connects package keyval with LaTeX options (HO)]
+ [2007/10/18 v3.0 Keyval support for LaTeX options (HO)]
\expandafter\edef\csname KVO@AtEnd\endcsname{%
\catcode64 \the\catcode64\relax
}
@@ -103,6 +104,7 @@
\TMP@EnsureCode{41}{12}% )
\TMP@EnsureCode{42}{12}% *
\TMP@EnsureCode{44}{12}% ,
+\TMP@EnsureCode{45}{12}% -
\TMP@EnsureCode{46}{12}% .
\TMP@EnsureCode{47}{12}% /
\TMP@EnsureCode{58}{12}% :
@@ -134,7 +136,11 @@
\def\@currext{}%
}{}
\DeclareOption{debugshow}{\catcode\@ne=9 }
-\DeclareOption{patch}{\catcode\tw@=9 }
+\DeclareOption{patch}{%
+ \AtEndOfPackage{%
+ \RequirePackage{kvoptions-patch}[2007/10/18]%
+ }%
+}
\ProcessOptions\relax
\define@key{KVO}{family}{%
\expandafter\edef\csname KVO@family@%
@@ -506,17 +512,26 @@
\@ifundefined{KV@#1@\expandafter\KVO@getkey
\KVO@CurrentOption=\@nil}{%
}{%
- \edef\KVO@temp{%
-^^B \etex@unexpanded\expandafter{%
+ \ifx\KVO@Patch Y%
+ \edef\KVO@temp{%
+ \etex@unexpanded\expandafter{%
+ \KVO@temp
+ }%
+ ,%
+ \etex@unexpanded\expandafter{%
+ \KVO@CurrentOption
+ }%
+ ,%
+ }%
+ \@onelevel@sanitize\KVO@CurrentOption
+ \else
+ \edef\KVO@temp{%
\KVO@temp
-^^B }%
- ,%
-^^B \etex@unexpanded\expandafter{%
+ ,%
\KVO@CurrentOption
-^^B }%
- ,%
- }%
-^^B \@onelevel@sanitize\KVO@CurrentOption
+ ,%
+ }%
+ \fi
\@expandtwoargs\@removeelement\KVO@CurrentOption
\@unusedoptionlist\@unusedoptionlist
}%
@@ -538,7 +553,9 @@
\@ifundefined{%
KV@#1@\expandafter\KVO@getkey\CurrentOption=\@nil
}{%
-^^B \@onelevel@sanitize\CurrentOption
+ \ifx\KVO@Patch Y%
+ \@onelevel@sanitize\CurrentOption
+ \fi
\ifx\@unusedoptionlist\@empty
\global\let\@unusedoptionlist\CurrentOption
\else
@@ -621,428 +638,8 @@
\def\ProcessKeyvalOptions{%
\@ifstar{}\@gobble
}%
- \catcode\tw@=14 %
-\fi
-^^B\@gobbletwo
-\KVO@AtEnd\endinput
-\PackageInfo{kvoptions}{Patching LaTeX's option system}
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname eTeXversion\endcsname\relax
- \PackageWarningNoLine{kvoptions}{%
- Option `patch' ignored, because e-TeX is missing%
- }%
- \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
- package `xkvltxp' that is already loaded.\MessageBreak
- Therefore option `patch' will be ignored%
- }%
- \endinput
-}{}
-\def\@if@ptions#1#2#3{%
- \begingroup
- \KVO@normalize\KVO@temp{#3}%
- \edef\x{\endgroup
- \noexpand\@if@pti@ns{%
- \detokenize\expandafter\expandafter\expandafter{%
- \csname opt@#2.#1\endcsname
- }%
- }{%
- \detokenize\expandafter{\KVO@temp}%
- }%
- }%
- \x
-}
-\def\@pass@ptions#1#2#3{%
- \KVO@normalize\KVO@temp{#2}%
- \@ifundefined{opt@#3.#1}{%
- \expandafter\gdef\csname opt@#3.#1%
- \expandafter\endcsname\expandafter{%
- \KVO@temp
- }%
- }{%
- \expandafter\gdef\csname opt@#3.#1%
- \expandafter\expandafter\expandafter\endcsname
- \expandafter\expandafter\expandafter{%
- \csname opt@#3.#1\expandafter\endcsname\expandafter,\KVO@temp
- }%
- }%
-}
-\def\ProcessOptions{%
- \let\ds@\@empty
- \@ifundefined{opt@\@currname.\@currext}{%
- \let\@curroptions\@empty
- }{%
- \expandafter\expandafter\expandafter\def
- \expandafter\expandafter\expandafter\@curroptions
- \expandafter\expandafter\expandafter{%
- \csname opt@\@currname.\@currext\endcsname
- }%
- }%
- \@ifstar\KVO@xprocess@ptions\KVO@process@ptions
-}
-\def\KVO@process@ptions{%
- \@for\CurrentOption:=\@declaredoptions\do{%
- \ifx\CurrentOption\@empty
- \else
- \begingroup
- \ifx\@currext\@clsextension
- \toks@{}%
- \else
- \toks@\expandafter{\@classoptionslist,}%
- \fi
- \toks\tw@\expandafter{\@curroptions}%
- \edef\x{\endgroup
- \noexpand\in@{,\CurrentOption,}{,\the\toks@\the\toks\tw@,}%
- }%
- \x
- \ifin@
- \KVO@use@ption
- \expandafter\let\csname ds@\CurrentOption\endcsname\@empty
- \fi
- \fi
- }%
- \KVO@process@pti@ns
-}
-\def\KVO@xprocess@ptions{%
- \ifx\@currext\@clsextension
- \else
- \@for\CurrentOption:=\@classoptionslist\do{%
- \ifx\CurrentOption\@empty
- \else
- \KVO@in@\CurrentOption\@declaredoptions
- \ifin@
- \KVO@use@ption
- \expandafter\let\csname ds@\CurrentOption\endcsname\@empty
- \fi
- \fi
- }%
- \fi
- \KVO@process@pti@ns
-}
-\def\KVO@in@#1#2{%
- \in@false
- \begingroup
- \@for\x:=#2\do{%
- \ifx\x#1\relax
- \in@true
- \fi
- }%
- \edef\x{\endgroup
- \ifin@
- \noexpand\in@true
- \fi
- }%
- \x
-}
-\def\KVO@process@pti@ns{%
- \@for\CurrentOption:=\@curroptions\do{%
- \@ifundefined{ds@\KVO@SanitizedCurrentOption}{%
- \KVO@use@ption
- \default@ds
- }%
- \KVO@use@ption
- }%
- \@for\CurrentOption:=\@declaredoptions\do{%
- \expandafter\let\csname ds@\CurrentOption\endcsname\relax
- }%
- \let\CurrentOption\@empty
- \let\@fileswith@pti@ns\@@fileswith@pti@ns
- \AtEndOfPackage{\let\@unprocessedoptions\relax}%
-}
-\def\KVO@use@ption{%
- \begingroup
- \edef\x{\endgroup
- \noexpand\@removeelement{%
- \detokenize\expandafter{\CurrentOption}%
- }{%
- \detokenize\expandafter{\@unusedoptionlist}%
- }%
- }%
- \x\@unusedoptionlist
- \csname ds@\KVO@SanitizedCurrentOption\endcsname
-}
-\def\OptionNotUsed{%
- \ifx\@currext\@clsextension
- \xdef\@unusedoptionlist{%
- \ifx\@unusedoptionlist\@empty
- \else
- \detokenize\expandafter{\@unusedoptionlist,}%
- \fi
- \detokenize\expandafter{\CurrentOption}%
- }%
- \fi
-}
-\def\CurrentOption@SaveLevel{0}
-\def\ExecuteOptions{%
- \expandafter\KVO@ExecuteOptions
- \csname CurrentOption@\CurrentOption@SaveLevel\endcsname
-}
-\def\KVO@ExecuteOptions#1#2{%
- \let#1\CurrentOption
- \edef\CurrentOption@SaveLevel{%
- \the\numexpr\CurrentOption@SaveLevel+1%
- }%
- \@for\CurrentOption:=#2\do{%
- \csname ds@\CurrentOption\endcsname
- }%
- \edef\CurrentOption@SaveLevel{%
- \the\numexpr\CurrentOption@SaveLevel-1%
- }%
- \let\CurrentOption#1%
-}
-\def\KVO@fileswith@pti@ns#1[#2]#3[#4]{%
- \ifx#1\@clsextension
- \ifx\@classoptionslist\relax
- \KVO@normalize\KVO@temp{#2}%
- \expandafter\gdef\expandafter\@classoptionslist\expandafter{%
- \KVO@temp
- }%
- \def\reserved@a{%
- \KVO@onefilewithoptions{#3}[{#2}][{#4}]#1%
- \@documentclasshook
- }%
- \else
- \def\reserved@a{%
- \KVO@onefilewithoptions{#3}[{#2}][{#4}]#1%
- }%
- \fi
- \else
- \begingroup
- \let\KVO@temp\relax
- \let\KVO@onefilewithoptions\relax
- \let\@pkgextension\relax
- \def\reserved@b##1,{%
- \ifx\@nil##1\relax
- \else
- \ifx\relax##1\relax
- \else
- \KVO@onefilewithoptions{##1}[{\KVO@temp}][{#4}]%
- \@pkgextension
- \fi
- \expandafter\reserved@b
- \fi
- }%
- \edef\reserved@a{\zap@space#3 \@empty}%
- \edef\reserved@a{\expandafter\reserved@b\reserved@a,\@nil,}%
- \toks@{#2}%
- \def\KVO@temp{\the\toks@}%
- \edef\reserved@a{\endgroup \reserved@a}%
- \fi
- \reserved@a
-}
-\def\KVO@onefilewithoptions#1[#2][#3]#4{%
- \@pushfilename
- \xdef\@currname{#1}%
- \global\let\@currext#4%
- \expandafter\let\csname\@currname.\@currext-h@@k\endcsname\@empty
- \let\CurrentOption\@empty
- \@reset@ptions
- \makeatletter
- \def\reserved@a{%
- \@ifl@aded\@currext{#1}{%
- \@if@ptions\@currext{#1}{#2}{%
- }{%
- \begingroup
- \@ifundefined{opt@#1.\@currext}{%
- \def\x{}%
- }{%
- \edef\x{%
- \expandafter\expandafter\expandafter\strip@prefix
- \expandafter\meaning\csname opt@#1.\@currext\endcsname
- }%
- }%
- \def\y{#2}%
- \edef\y{\expandafter\strip@prefix\meaning\y}%
- \@latex@error{Option clash for \@cls@pkg\space #1}{%
- The package #1 has already been loaded %
- with options:\MessageBreak
- \space\space[\x]\MessageBreak
- There has now been an attempt to load it %
- with options\MessageBreak
- \space\space[\y]\MessageBreak
- Adding the global options:\MessageBreak
- \space\space
- \x,\y\MessageBreak
- to your \noexpand\documentclass declaration may fix this.%
- \MessageBreak
- Try typing \space <return> \space to proceed.%
- }%
- \endgroup
- }%
- }{%
- \@pass@ptions\@currext{#2}{#1}%
- \global\expandafter
- \let\csname ver@\@currname.\@currext\endcsname\@empty
- \InputIfFileExists
- {\@currname.\@currext}%
- {}%
- {\@missingfileerror\@currname\@currext}%
- \let\@unprocessedoptions\@@unprocessedoptions
- \csname\@currname.\@currext-h@@k\endcsname
- \expandafter\let\csname\@currname.\@currext-h@@k\endcsname
- \@undefined
- \@unprocessedoptions
- }%
- \@ifl@ter\@currext{#1}{#3}{%
- }{%
- \@latex@warning@no@line{%
- You have requested,\on@line, %
- version\MessageBreak
- #3' of \@cls@pkg\space #1,\MessageBreak
- but only version\MessageBreak
- `\csname ver@#1.\@currext\endcsname'\MessageBreak
- is available%
- }%
- }%
- \ifx\@currext\@clsextension\let\LoadClass\@twoloadclasserror\fi
- \@popfilename
- \@reset@ptions
- }%
- \reserved@a
-}
-\def\@unknownoptionerror{%
- \@latex@error{%
- Unknown option `\KVO@SanitizedCurrentOption' %
- for \@cls@pkg\space`\@currname'%
- }{%
- The option `\KVO@SanitizedCurrentOption' was not declared in %
- \@cls@pkg\space`\@currname', perhaps you\MessageBreak
- misspelled its name. %
- Try typing \space <return> %
- \space to proceed.%
- }%
-}
-\def\@@unprocessedoptions{%
- \ifx\@currext\@pkgextension
- \@ifundefined{opt@\@currname.\@currext}{%
- \let\@curroptions\@empty
- }{%
- \expandafter\let\expandafter\@curroptions
- \csname opt@\@currname.\@currext\endcsname
- }%
- \@for\CurrentOption:=\@curroptions\do{%
- \ifx\CurrentOption\@empty\else\@unknownoptionerror\fi
- }%
- \fi
-}
-\def\KVO@SanitizedCurrentOption{%
- \expandafter\strip@prefix\meaning\CurrentOption
-}
-\def\KVO@normalize#1#2{%
- \let\KVO@result\@empty
- \KVO@splitcomma#2,\@nil
- \let#1\KVO@result
-}
-\def\KVO@splitcomma#1,#2\@nil{%
- \KVO@ifempty{#1}{}{%
- \KVO@checkkv#1=\@nil
- }%
- \KVO@ifempty{#2}{}{\KVO@splitcomma#2\@nil}%
-}
-\def\KVO@ifempty#1{%
- \expandafter\ifx\expandafter\\\detokenize{#1}\\%
- \expandafter\@firstoftwo
- \else
- \expandafter\@secondoftwo
- \fi
-}
-\def\KVO@checkkv#1=#2\@nil{%
- \KVO@ifempty{#2}{%
- % option without value
- \edef\KVO@x{\zap@space#1 \@empty}%
- \ifx\KVO@x\@empty
- % ignore empty option
- \else
- % append to list
- \edef\KVO@result{%
- \etex@unexpanded\expandafter{\KVO@result},\KVO@x
- }%
- \fi
- }{%
- % #1: "key", #2: "value="
- % add key part
- \edef\KVO@result{%
- \etex@unexpanded\expandafter{\KVO@result},%
- \zap@space#1 \@empty
- }%
- \futurelet\@let@token\KVO@checkfirsttok#2 \@nil| = \@nil|\KVO@nil
- }%
-}
-\def\KVO@checkfirsttok{%
- \ifx\@let@token\bgroup
- % no space at start
- \expandafter\KVO@removelastspace\expandafter=%
- % "<value><spaceopt>= \@nil"
- \else
- \expandafter\KVO@checkfirstA
- \fi
-}
-\def\KVO@checkfirstA#1 #2\@nil{%
- \KVO@ifempty{#2}{%
- \KVO@removelastspace=#1 \@nil
- }{%
- \KVO@ifempty{#1}{%
- \KVO@removelastspace=#2\@nil
- }{%
- \KVO@removelastspace=#1 #2\@nil
- }%
- }%
-}
-\def\KVO@removelastspace#1 = \@nil|#2\KVO@nil{%
- \KVO@ifempty{#2}{%
- \edef\KVO@result{%
- \etex@unexpanded\expandafter{\KVO@result}%
- \etex@unexpanded\expandafter{\KVO@removegarbage#1\KVO@nil}%
- }%
- }{%
- \edef\KVO@result{%
- \etex@unexpanded\expandafter{\KVO@result}%
- \etex@unexpanded{#1}%
- }%
- }%
-}
-\def\KVO@removegarbage#1= \@nil#2\KVO@nil{#1}%
-\def\KVO@removeelement#1#2{%
- \begingroup
- \toks@={}%
- \@for\x:=#2\do{%
- \ifx\x\@empty
- \else
- \ifx\x#1\relax
- \else
- \edef\t{\the\toks@}%
- \ifx\t\@empty
- \else
- \toks@\expandafter{\the\toks@,}%
- \fi
- \toks@\expandafter{\the\expandafter\toks@\x}%
- \fi
- \fi
- }%
- \edef\x{\endgroup
- \def\noexpand#2{\the\toks@}%
- }%
- \x
-}
-\let\@@fileswith@pti@ns\KVO@fileswith@pti@ns
-\ifx\@fileswith@pti@ns\@badrequireerror
-\else
- \let\@fileswith@pti@ns\KVO@fileswith@pti@ns
\fi
-KVO@AtEnd
+\KVO@AtEnd
\endinput
%%
%% End of file `kvoptions.sty'.
diff --git a/Master/texmf-dist/tex/latex/oberdiek/listingsutf8.sty b/Master/texmf-dist/tex/latex/oberdiek/listingsutf8.sty
new file mode 100644
index 00000000000..8df07faa148
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/oberdiek/listingsutf8.sty
@@ -0,0 +1,140 @@
+%%
+%% This is file `listingsutf8.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% listingsutf8.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 listingsutf8.dtx
+%% and the derived files
+%% listingsutf8.sty, listingsutf8.pdf, listingsutf8.ins, listingsutf8.drv,
+%% listingsutf8-test1.tex, listingsutf8-test2.tex,
+%% listingsutf8-test3.tex, listingsutf8-test4.tex,
+%% listingsutf8-test5.tex.
+%%
+\expandafter\edef\csname lstU@AtEnd\endcsname{%
+ \catcode64 \the\catcode64\relax
+}
+\catcode64 11 % @
+\def\TMP@EnsureCode#1#2{%
+ \edef\lstU@AtEnd{%
+ \lstU@AtEnd
+ \catcode#1 \the\catcode#1\relax
+ }%
+ \catcode#1 #2\relax
+}
+\TMP@EnsureCode{10}{12}% ^^J
+\TMP@EnsureCode{33}{12}% !
+\TMP@EnsureCode{36}{3}% $
+\TMP@EnsureCode{38}{4}% &
+\TMP@EnsureCode{39}{12}% '
+\TMP@EnsureCode{40}{12}% (
+\TMP@EnsureCode{41}{12}% )
+\TMP@EnsureCode{42}{12}% *
+\TMP@EnsureCode{43}{12}% +
+\TMP@EnsureCode{44}{12}% ,
+\TMP@EnsureCode{45}{12}% -
+\TMP@EnsureCode{46}{12}% .
+\TMP@EnsureCode{47}{12}% /
+\TMP@EnsureCode{58}{12}% :
+\TMP@EnsureCode{60}{12}% <
+\TMP@EnsureCode{61}{12}% =
+\TMP@EnsureCode{62}{12}% >
+\TMP@EnsureCode{94}{7}% ^ (superscript)
+\TMP@EnsureCode{95}{8}% _ (subscript)
+\TMP@EnsureCode{96}{12}% `
+\TMP@EnsureCode{124}{12}% |
+\TMP@EnsureCode{126}{13}% ~ (active)
+\g@addto@macro\lstU@AtEnd{\endinput}
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{listingsutf8}%
+ [2007/10/22 v1.0 Adding support for UTF-8 to listings (HO)]
+\DeclareOption*{%
+ \PassOptionsToPackage\CurrentOption{listings}%
+}
+\ProcessOptions*
+\RequirePackage{listings}[2002/04/01]
+\AtBeginDocument{%
+ \@ifundefined{inputencoding}{%
+ \RequirePackage{inputenc}%
+ }{}%
+}
+\def\lstU@temp#1#2{%
+ \begingroup\expandafter\expandafter\expandafter\endgroup
+ \expandafter\ifx\csname #1\endcsname\relax
+ \PackageWarningNoLine{listingsutf8}{%
+ Package loading is aborted because of missing %
+ \@backslashchar#1.\MessageBreak
+ #2%
+ }%
+ \expandafter\lstU@AtEnd
+ \fi
+}
+\lstU@temp{scantokens}{It is provided by e-TeX}
+\lstU@temp{pdfunescapehex}{It is provided by pdfTeX >= 1.30}
+\lstU@temp{pdffiledump}{It is provided by pdfTeX >= 1.30}
+\lstU@temp{pdffilesize}{It is provided by pdfTeX >= 1.30}
+\RequirePackage{stringenc}[2007/10/22]
+\newif\iflstU@utfviii
+\def\lstU@inputenc#1{%
+ \expandafter\lstU@@inputenc#1utf8/utf8/\@nil
+}
+\def\lstU@@inputenc#1utf8/#2utf8/#3\@nil{%
+ \ifx\\#1\\%
+ \lstU@utfviiitrue
+ \def\lst@inputenc{#2}%
+ \else
+ \lstU@utfviiifalse
+ \fi
+}
+\lst@Key{inputencoding}\relax{%
+ \def\lst@inputenc{#1}%
+ \lstU@inputenc{#1}%
+}
+\def\lstU@input#1{%
+ \iflstU@utfviii
+ \edef\lstU@text{%
+ \pdfunescapehex{%
+ \pdffiledump length\pdffilesize{#1}{#1}%
+ }%
+ }%
+ \StringEncodingConvert\lstU@text\lstU@text{utf8}\lst@inputenc
+ \def\lstU@temp{%
+ \scantokens\expandafter{\lstU@text}%
+ }%
+ \else
+ \def\lstU@temp{%
+ \input{#1}%
+ }%
+ \fi
+ \lstU@temp
+}
+\def\lstU@temp#1\def\lst@next#2#3\@nil{%
+ \def\lst@InputListing##1{%
+ #1%
+ \def\lst@next{\lstU@input{##1}}%
+ #3%
+ }%
+}
+\expandafter\lstU@temp\lst@InputListing{#1}\@nil
+\lstU@AtEnd
+\endinput
+%%
+%% End of file `listingsutf8.sty'.
diff --git a/Master/texmf-dist/tex/latex/oberdiek/pdflscape.sty b/Master/texmf-dist/tex/latex/oberdiek/pdflscape.sty
index 9e4a56f9f6f..16b8dbd52d3 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/pdflscape.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/pdflscape.sty
@@ -25,103 +25,119 @@
%%
%% This work consists of the main source file pdflscape.dtx
%% and the derived files
-%% pdflscape.sty, pdflscape.pdf, pdflscape.ins, pdflscape.drv.
+%% pdflscape.sty, pdflscape.pdf, pdflscape.ins, pdflscape.drv,
+%% pdflscape-test1.tex, pdflscape-test2.tex,
+%% pdflscape-test3.tex, pdflscape-test4.tex,
+%% pdflscape-test5.tex, pdflscape-test6.tex,
+%% pdflscape-test6.txt, ExtractRotate.java.
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pdflscape}%
- [2007/04/17 v0.8 Landscape pages in PDF (HO)]
+ [2007/10/21 v0.9 Landscape pages in PDF (HO)]
+\let\PLS@option\@empty
\let\PLS@driver\@empty
-\DeclareOption{pdftex}{%
- \PassOptionsToPackage\CurrentOption{lscape}%
- \def\PLS@driver{pdftex}%
-}
-\DeclareOption{dvips}{%
- \PassOptionsToPackage\CurrentOption{lscape}%
- \def\PLS@driver{dvips}%
-}
-\DeclareOption{dvipsone}{%
- \PassOptionsToPackage\CurrentOption{lscape}%
- \def\PLS@driver{dvips}%
-}
-\DeclareOption{pctexps}{%
- \PassOptionsToPackage\CurrentOption{lscape}%
- \def\PLS@driver{dvips}%
+\def\PLS@temp#1#2{%
+ \DeclareOption{#1}{%
+ \let\PLS@option\CurrentOption
+ \def\PLS@driver{#2}%
+ }%
}
-\DeclareOption{dvipdfm}{%
- \PassOptionsToPackage\CurrentOption{dvipdfm}%
- \def\PLS@driver{dvipdfm}%
+\PLS@temp{pdftex}{pdftex}
+\PLS@temp{dvips}{dvips}
+\PLS@temp{dvipsone}{dvips}
+\PLS@temp{pctexps}{dvips}
+\PLS@temp{dvipdfm}{dvipdfm}
+\PLS@temp{dvipdfmx}{dvipdfm}
+\PLS@temp{xetex}{dvipdfm}
+\let\PLS@temp\@empty
+\DeclareOption*{%
+ \ifx\PLS@temp\@empty
+ \let\PLS@temp\CurrentOption
+ \else
+ \edef\PLS@temp{\PLS@temp,\CurrentOption}%
+ \fi
}
-\DeclareOption*{\PassOptionsToPackage\CurrentOption{lscape}}
-\ProcessOptions
+\ProcessOptions*
+\ifx\PLS@option\@empty
+\else
+ \expandafter\PassOptionsToPackage\expandafter{\PLS@option}{lscape}%
+\fi
+\ifx\PLS@temp\@empty
+\else
+ \expandafter\PassOptionsToPackage\expandafter{\PLS@temp}{lscape}%
+\fi
\RequirePackage{lscape}
+\RequirePackage{ifpdf}[2006/02/20]
\def\PLS@temp{pdftex}
-\ifnum 1=0\ifx\pdfoutput\@undefined
- \else
- \ifx\pdfoutput\relax
- \else
- \ifnum\pdfoutput>0 %
- 1%
- \fi
- \fi
- \fi
- \space
+\ifpdf
\ifx\PLS@driver\@empty
\let\PLS@driver\PLS@temp
- \PackageInfo{pdflscape}{Auto-detected driver: `\PLS@temp'}%
+ \PackageInfo{pdflscape}{Auto-detected driver: \PLS@temp}%
\fi
\ifx\PLS@driver\PLS@temp
\else
\PackageError{pdflscape}{%
- The driver option `\PLS@driver' is not compatible\MessageBreak
+ The driver option `\PLS@option' is not compatible\MessageBreak
with pdfTeX in PDF mode, using driver `pdftex' instead%
}\@ehc
\let\PLS@driver\PLS@temp
\fi
\fi
-\def\PLS@temp{dvips}
-\ifnum 1=0\ifx\Gin@PS@raw\@undefined
- \else
- \ifx\Gin@PS@raw\relax
- \else
- \ifx\Gin@PS@raw\@empty
- \else
- 1%
- \fi
- \fi
- \fi
- \space
+\RequirePackage{ifxetex}%
+\def\PLS@temp{dvipdfm}
+\ifxetex
\ifx\PLS@driver\@empty
\let\PLS@driver\PLS@temp
- \PackageInfo{pdflscape}{Auto-detected driver: `\PLS@temp'}%
+ \PackageInfo{pdflscape}{%
+ Auto-detected driver: \PLS@temp\space(xetex)%
+ }%
\fi
\ifx\PLS@driver\PLS@temp
\else
\PackageError{pdflscape}{%
- The driver option `\PLS@driver' is not compatible\MessageBreak
- with detected PostScript driver,\MessageBreak
- Will try using driver `dvips'%
+ The driver option `\PLS@option' is not compatible\MessageBreak
+ with XeTeX, using driver for XeTeX (dvipdfm) instead%
}\@ehc
\let\PLS@driver\PLS@temp
\fi
\fi
-\def\PLS@temp{dvipdfm.def}
-\ifx\PLS@temp\Gin@driver
- \def\PLS@temp{dvipdfm}%
+\def\PLS@temp#1#2{%
\ifx\PLS@driver\@empty
- \let\PLS@driver\PLS@temp
- \PackageInfo{pdflscape}{Auto-detected driver: `\PLS@temp'}%
+ \begingroup
+ \def\PLS@temp{#1.def}%
+ \expandafter\endgroup
+ \ifx\PLS@temp\Gin@driver
+ \def\PLS@driver{#2}%
+ \PackageInfo{pdflscape}{%
+ Auto-detected driver: \PLS@driver\space(#1)%
+ }%
+ \fi
\fi
- \ifx\PLS@driver\PLS@temp
- \else
- \PackageError{pdflscape}{%
- Graphics driver `dvipdfm.def' is loaded, but this\MessageBreak
- is incompatible with driver `\PLS@driver'.\MessageBreak
- Will try using driver `dvipdfm'%
- }\@ehc
+}
+\PLS@temp{dvipdfm}{dvipdfm}
+\PLS@temp{dvipdfmx}{dvipdfm}
+\PLS@temp{dvips}{dvips}
+\PLS@temp{dvipsone}{dvips}
+\PLS@temp{pctexps}{dvips}
+\ifx\PLS@driver\@empty
+ \def\PLS@temp{dvips}%
+ \ifnum 1=0\ifx\Gin@PS@raw\@undefined
+ \else
+ \ifx\Gin@PS@raw\relax
+ \else
+ \ifx\Gin@PS@raw\@empty
+ \else
+ 1%
+ \fi
+ \fi
+ \fi
+ \space
\let\PLS@driver\PLS@temp
+ \PackageInfo{pdflscape}{%
+ Auto-detected driver: \PLS@temp\space(PostScript)%
+ }%
\fi
\fi
-
\ifx\PLS@driver\@empty
\PackageError{pdflscape}{%
Neither pdfTeX, PostScript, nor dvipdfm driver found%
@@ -208,8 +224,8 @@
\else
\count@=#1\relax
\fi
- \@whilenum\count@>359\do{\addtocounter\count@ -360 }%
- \@whilenum\count@<-359\do{\addtocounter\count@ 360 }%
+ \@whilenum\count@>359\do{\advance\count@ -360 }%
+ \@whilenum\count@<-359\do{\advance\count@ 360 }%
\ifnum 1=0\ifnum\count@=0 \else
\ifnum\count@=90 \else
\ifnum\count@=-90 \else