oberdiek update (5sep09)

git-svn-id: svn://tug.org/texlive/trunk@15145 c570f23f-e606-0410-a88d-b1316a301751

26 files changed, 596 insertions, 451 deletions

diff --git a/Master/texmf-dist/tex/generic/oberdiek/alphalph.sty b/Master/texmf-dist/tex/generic/oberdiek/alphalph.sty
index 0946a887970..215721290e9 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/alphalph.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/alphalph.sty
@@ -34,29 +34,26 @@
   \catcode46 12 % .
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode123 1 % {
+  \catcode125 2 % }
   \expandafter\let\expandafter\x\csname ver@alphalph.sty\endcsname
-  \ifcase 0%
-    \ifx\x\relax % plain
+  \ifx\x\relax % plain-TeX, first loading
+  \else
+    \def\empty{}%
+    \ifx\x\empty % LaTeX, first loading,
+      % variable is initialized, but \ProvidesPackage not yet seen
     \else
-      \ifx\x\empty % LaTeX
+      \catcode35 6 % #
+      \expandafter\ifx\csname PackageInfo\endcsname\relax
+        \def\x#1#2{%
+          \immediate\write-1{Package #1 Info: #2.}%
+        }%
       \else
-        1%
+        \def\x#1#2{\PackageInfo{#1}{#2, stopped}}%
       \fi
+      \x{alphalph}{The package is already loaded}%
+      \aftergroup\endinput
     \fi
-  \else
-    \catcode35 6 % #
-    \catcode123 1 % {
-    \catcode125 2 % }
-    \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{alphalph}{The package is already loaded}%
-    \endgroup
-    \expandafter\endinput
   \fi
 \endgroup
 \begingroup
@@ -69,6 +66,8 @@
   \catcode47 12 % /
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode91 12 % [
+  \catcode93 12 % ]
   \catcode123 1 % {
   \catcode125 2 % }
   \expandafter\ifx\csname ProvidesPackage\endcsname\relax
diff --git a/Master/texmf-dist/tex/generic/oberdiek/atbegshi.sty b/Master/texmf-dist/tex/generic/oberdiek/atbegshi.sty
index d325a493373..aef8073450d 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/atbegshi.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/atbegshi.sty
@@ -34,29 +34,26 @@
   \catcode46 12 % .
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode123 1 % {
+  \catcode125 2 % }
   \expandafter\let\expandafter\x\csname ver@atbegshi.sty\endcsname
-  \ifcase 0%
-    \ifx\x\relax % plain
+  \ifx\x\relax % plain-TeX, first loading
+  \else
+    \def\empty{}%
+    \ifx\x\empty % LaTeX, first loading,
+      % variable is initialized, but \ProvidesPackage not yet seen
     \else
-      \ifx\x\empty % LaTeX
+      \catcode35 6 % #
+      \expandafter\ifx\csname PackageInfo\endcsname\relax
+        \def\x#1#2{%
+          \immediate\write-1{Package #1 Info: #2.}%
+        }%
       \else
-        1%
+        \def\x#1#2{\PackageInfo{#1}{#2, stopped}}%
       \fi
+      \x{atbegshi}{The package is already loaded}%
+      \aftergroup\endinput
     \fi
-  \else
-    \catcode35 6 % #
-    \catcode123 1 % {
-    \catcode125 2 % }
-    \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{atbegshi}{The package is already loaded}%
-    \endgroup
-    \expandafter\endinput
   \fi
 \endgroup
 \begingroup
@@ -69,6 +66,8 @@
   \catcode47 12 % /
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode91 12 % [
+  \catcode93 12 % ]
   \catcode123 1 % {
   \catcode125 2 % }
   \expandafter\ifx\csname ProvidesPackage\endcsname\relax
diff --git a/Master/texmf-dist/tex/generic/oberdiek/bigintcalc.sty b/Master/texmf-dist/tex/generic/oberdiek/bigintcalc.sty
index ac36c3eccc6..a78d7195e7d 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/bigintcalc.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/bigintcalc.sty
@@ -34,29 +34,26 @@
   \catcode46 12 % .
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode123 1 % {
+  \catcode125 2 % }
   \expandafter\let\expandafter\x\csname ver@bigintcalc.sty\endcsname
-  \ifcase 0%
-    \ifx\x\relax % plain
+  \ifx\x\relax % plain-TeX, first loading
+  \else
+    \def\empty{}%
+    \ifx\x\empty % LaTeX, first loading,
+      % variable is initialized, but \ProvidesPackage not yet seen
     \else
-      \ifx\x\empty % LaTeX
+      \catcode35 6 % #
+      \expandafter\ifx\csname PackageInfo\endcsname\relax
+        \def\x#1#2{%
+          \immediate\write-1{Package #1 Info: #2.}%
+        }%
       \else
-        1%
+        \def\x#1#2{\PackageInfo{#1}{#2, stopped}}%
       \fi
+      \x{bigintcalc}{The package is already loaded}%
+      \aftergroup\endinput
     \fi
-  \else
-    \catcode35 6 % #
-    \catcode123 1 % {
-    \catcode125 2 % }
-    \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{bigintcalc}{The package is already loaded}%
-    \endgroup
-    \expandafter\endinput
   \fi
 \endgroup
 \begingroup
@@ -69,6 +66,8 @@
   \catcode47 12 % /
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode91 12 % [
+  \catcode93 12 % ]
   \catcode123 1 % {
   \catcode125 2 % }
   \expandafter\ifx\csname ProvidesPackage\endcsname\relax
diff --git a/Master/texmf-dist/tex/generic/oberdiek/bitset.sty b/Master/texmf-dist/tex/generic/oberdiek/bitset.sty
index c080f6ef63b..46de1ce5b12 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/bitset.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/bitset.sty
@@ -33,29 +33,26 @@
   \catcode46 12 % .
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode123 1 % {
+  \catcode125 2 % }
   \expandafter\let\expandafter\x\csname ver@bitset.sty\endcsname
-  \ifcase 0%
-    \ifx\x\relax % plain
+  \ifx\x\relax % plain-TeX, first loading
+  \else
+    \def\empty{}%
+    \ifx\x\empty % LaTeX, first loading,
+      % variable is initialized, but \ProvidesPackage not yet seen
     \else
-      \ifx\x\empty % LaTeX
+      \catcode35 6 % #
+      \expandafter\ifx\csname PackageInfo\endcsname\relax
+        \def\x#1#2{%
+          \immediate\write-1{Package #1 Info: #2.}%
+        }%
       \else
-        1%
+        \def\x#1#2{\PackageInfo{#1}{#2, stopped}}%
       \fi
+      \x{bitset}{The package is already loaded}%
+      \aftergroup\endinput
     \fi
-  \else
-    \catcode35 6 % #
-    \catcode123 1 % {
-    \catcode125 2 % }
-    \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{bitset}{The package is already loaded}%
-    \endgroup
-    \expandafter\endinput
   \fi
 \endgroup
 \begingroup
@@ -68,6 +65,8 @@
   \catcode47 12 % /
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode91 12 % [
+  \catcode93 12 % ]
   \catcode123 1 % {
   \catcode125 2 % }
   \expandafter\ifx\csname ProvidesPackage\endcsname\relax
diff --git a/Master/texmf-dist/tex/generic/oberdiek/catchfile.sty b/Master/texmf-dist/tex/generic/oberdiek/catchfile.sty
index c7b1d5d3a6e..e0585ab4256 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/catchfile.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/catchfile.sty
@@ -34,29 +34,26 @@
   \catcode46 12 % .
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode123 1 % {
+  \catcode125 2 % }
   \expandafter\let\expandafter\x\csname ver@catchfile.sty\endcsname
-  \ifcase 0%
-    \ifx\x\relax % plain
+  \ifx\x\relax % plain-TeX, first loading
+  \else
+    \def\empty{}%
+    \ifx\x\empty % LaTeX, first loading,
+      % variable is initialized, but \ProvidesPackage not yet seen
     \else
-      \ifx\x\empty % LaTeX
+      \catcode35 6 % #
+      \expandafter\ifx\csname PackageInfo\endcsname\relax
+        \def\x#1#2{%
+          \immediate\write-1{Package #1 Info: #2.}%
+        }%
       \else
-        1%
+        \def\x#1#2{\PackageInfo{#1}{#2, stopped}}%
       \fi
+      \x{catchfile}{The package is already loaded}%
+      \aftergroup\endinput
     \fi
-  \else
-    \catcode35 6 % #
-    \catcode123 1 % {
-    \catcode125 2 % }
-    \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{catchfile}{The package is already loaded}%
-    \endgroup
-    \expandafter\endinput
   \fi
 \endgroup
 \begingroup
@@ -69,6 +66,8 @@
   \catcode47 12 % /
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode91 12 % [
+  \catcode93 12 % ]
   \catcode123 1 % {
   \catcode125 2 % }
   \expandafter\ifx\csname ProvidesPackage\endcsname\relax
diff --git a/Master/texmf-dist/tex/generic/oberdiek/engord.sty b/Master/texmf-dist/tex/generic/oberdiek/engord.sty
index 0d0808c35fb..3ed14b5b98c 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/engord.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/engord.sty
@@ -33,29 +33,26 @@
   \catcode46 12 % .
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode123 1 % {
+  \catcode125 2 % }
   \expandafter\let\expandafter\x\csname ver@engord.sty\endcsname
-  \ifcase 0%
-    \ifx\x\relax % plain
+  \ifx\x\relax % plain-TeX, first loading
+  \else
+    \def\empty{}%
+    \ifx\x\empty % LaTeX, first loading,
+      % variable is initialized, but \ProvidesPackage not yet seen
     \else
-      \ifx\x\empty % LaTeX
+      \catcode35 6 % #
+      \expandafter\ifx\csname PackageInfo\endcsname\relax
+        \def\x#1#2{%
+          \immediate\write-1{Package #1 Info: #2.}%
+        }%
       \else
-        1%
+        \def\x#1#2{\PackageInfo{#1}{#2, stopped}}%
       \fi
+      \x{engord}{The package is already loaded}%
+      \aftergroup\endinput
     \fi
-  \else
-    \catcode35 6 % #
-    \catcode123 1 % {
-    \catcode125 2 % }
-    \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{engord}{The package is already loaded}%
-    \endgroup
-    \expandafter\endinput
   \fi
 \endgroup
 \begingroup
@@ -68,6 +65,8 @@
   \catcode47 12 % /
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode91 12 % [
+  \catcode93 12 % ]
   \catcode123 1 % {
   \catcode125 2 % }
   \expandafter\ifx\csname ProvidesPackage\endcsname\relax
diff --git a/Master/texmf-dist/tex/generic/oberdiek/etexcmds.sty b/Master/texmf-dist/tex/generic/oberdiek/etexcmds.sty
index 3550e42a177..3821b2e07e6 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/etexcmds.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/etexcmds.sty
@@ -34,29 +34,26 @@
   \catcode46 12 % .
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode123 1 % {
+  \catcode125 2 % }
   \expandafter\let\expandafter\x\csname ver@etexcmds.sty\endcsname
-  \ifcase 0%
-    \ifx\x\relax % plain
+  \ifx\x\relax % plain-TeX, first loading
+  \else
+    \def\empty{}%
+    \ifx\x\empty % LaTeX, first loading,
+      % variable is initialized, but \ProvidesPackage not yet seen
     \else
-      \ifx\x\empty % LaTeX
+      \catcode35 6 % #
+      \expandafter\ifx\csname PackageInfo\endcsname\relax
+        \def\x#1#2{%
+          \immediate\write-1{Package #1 Info: #2.}%
+        }%
       \else
-        1%
+        \def\x#1#2{\PackageInfo{#1}{#2, stopped}}%
       \fi
+      \x{etexcmds}{The package is already loaded}%
+      \aftergroup\endinput
     \fi
-  \else
-    \catcode35 6 % #
-    \catcode123 1 % {
-    \catcode125 2 % }
-    \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
@@ -69,6 +66,8 @@
   \catcode47 12 % /
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode91 12 % [
+  \catcode93 12 % ]
   \catcode123 1 % {
   \catcode125 2 % }
   \expandafter\ifx\csname ProvidesPackage\endcsname\relax
diff --git a/Master/texmf-dist/tex/generic/oberdiek/hyphsubst.sty b/Master/texmf-dist/tex/generic/oberdiek/hyphsubst.sty
index bbef4f3e871..2cbb9e42dd5 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/hyphsubst.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/hyphsubst.sty
@@ -33,29 +33,26 @@
   \catcode46 12 % .
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode123 1 % {
+  \catcode125 2 % }
   \expandafter\let\expandafter\x\csname ver@hyphsubst.sty\endcsname
-  \ifcase 0%
-    \ifx\x\relax % plain
+  \ifx\x\relax % plain-TeX, first loading
+  \else
+    \def\empty{}%
+    \ifx\x\empty % LaTeX, first loading,
+      % variable is initialized, but \ProvidesPackage not yet seen
     \else
-      \ifx\x\empty % LaTeX
+      \catcode35 6 % #
+      \expandafter\ifx\csname PackageInfo\endcsname\relax
+        \def\x#1#2{%
+          \immediate\write-1{Package #1 Info: #2.}%
+        }%
       \else
-        1%
+        \def\x#1#2{\PackageInfo{#1}{#2, stopped}}%
       \fi
+      \x{hyphsubst}{The package is already loaded}%
+      \aftergroup\endinput
     \fi
-  \else
-    \catcode35 6 % #
-    \catcode123 1 % {
-    \catcode125 2 % }
-    \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{hyphsubst}{The package is already loaded}%
-    \endgroup
-    \expandafter\endinput
   \fi
 \endgroup
 \begingroup
@@ -68,6 +65,8 @@
   \catcode47 12 % /
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode91 12 % [
+  \catcode93 12 % ]
   \catcode123 1 % {
   \catcode125 2 % }
   \expandafter\ifx\csname ProvidesPackage\endcsname\relax
diff --git a/Master/texmf-dist/tex/generic/oberdiek/iflang.sty b/Master/texmf-dist/tex/generic/oberdiek/iflang.sty
index c9b64c0acd8..69f88f1ca2a 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/iflang.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/iflang.sty
@@ -34,29 +34,26 @@
   \catcode46 12 % .
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode123 1 % {
+  \catcode125 2 % }
   \expandafter\let\expandafter\x\csname ver@iflang.sty\endcsname
-  \ifcase 0%
-    \ifx\x\relax % plain
+  \ifx\x\relax % plain-TeX, first loading
+  \else
+    \def\empty{}%
+    \ifx\x\empty % LaTeX, first loading,
+      % variable is initialized, but \ProvidesPackage not yet seen
     \else
-      \ifx\x\empty % LaTeX
+      \catcode35 6 % #
+      \expandafter\ifx\csname PackageInfo\endcsname\relax
+        \def\x#1#2{%
+          \immediate\write-1{Package #1 Info: #2.}%
+        }%
       \else
-        1%
+        \def\x#1#2{\PackageInfo{#1}{#2, stopped}}%
       \fi
+      \x{iflang}{The package is already loaded}%
+      \aftergroup\endinput
     \fi
-  \else
-    \catcode35 6 % #
-    \catcode123 1 % {
-    \catcode125 2 % }
-    \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{iflang}{The package is already loaded}%
-    \endgroup
-    \expandafter\endinput
   \fi
 \endgroup
 \begingroup
@@ -69,6 +66,8 @@
   \catcode47 12 % /
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode91 12 % [
+  \catcode93 12 % ]
   \catcode123 1 % {
   \catcode125 2 % }
   \expandafter\ifx\csname ProvidesPackage\endcsname\relax
diff --git a/Master/texmf-dist/tex/generic/oberdiek/ifluatex.sty b/Master/texmf-dist/tex/generic/oberdiek/ifluatex.sty
index 88905e0a284..79a3001d079 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/ifluatex.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/ifluatex.sty
@@ -33,29 +33,26 @@
   \catcode46 12 % .
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode123 1 % {
+  \catcode125 2 % }
   \expandafter\let\expandafter\x\csname ver@ifluatex.sty\endcsname
-  \ifcase 0%
-    \ifx\x\relax % plain
+  \ifx\x\relax % plain-TeX, first loading
+  \else
+    \def\empty{}%
+    \ifx\x\empty % LaTeX, first loading,
+      % variable is initialized, but \ProvidesPackage not yet seen
     \else
-      \ifx\x\empty % LaTeX
+      \catcode35 6 % #
+      \expandafter\ifx\csname PackageInfo\endcsname\relax
+        \def\x#1#2{%
+          \immediate\write-1{Package #1 Info: #2.}%
+        }%
       \else
-        1%
+        \def\x#1#2{\PackageInfo{#1}{#2, stopped}}%
       \fi
+      \x{ifluatex}{The package is already loaded}%
+      \aftergroup\endinput
     \fi
-  \else
-    \catcode35 6 % #
-    \catcode123 1 % {
-    \catcode125 2 % }
-    \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{ifluatex}{The package is already loaded}%
-    \endgroup
-    \expandafter\endinput
   \fi
 \endgroup
 \begingroup
@@ -68,6 +65,8 @@
   \catcode47 12 % /
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode91 12 % [
+  \catcode93 12 % ]
   \catcode123 1 % {
   \catcode125 2 % }
   \expandafter\ifx\csname ProvidesPackage\endcsname\relax
diff --git a/Master/texmf-dist/tex/generic/oberdiek/ifpdf.sty b/Master/texmf-dist/tex/generic/oberdiek/ifpdf.sty
index 5f7ad4edf8a..26305bc982f 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/ifpdf.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/ifpdf.sty
@@ -33,29 +33,26 @@
   \catcode46 12 % .
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode123 1 % {
+  \catcode125 2 % }
   \expandafter\let\expandafter\x\csname ver@ifpdf.sty\endcsname
-  \ifcase 0%
-    \ifx\x\relax % plain
+  \ifx\x\relax % plain-TeX, first loading
+  \else
+    \def\empty{}%
+    \ifx\x\empty % LaTeX, first loading,
+      % variable is initialized, but \ProvidesPackage not yet seen
     \else
-      \ifx\x\empty % LaTeX
+      \catcode35 6 % #
+      \expandafter\ifx\csname PackageInfo\endcsname\relax
+        \def\x#1#2{%
+          \immediate\write-1{Package #1 Info: #2.}%
+        }%
       \else
-        1%
+        \def\x#1#2{\PackageInfo{#1}{#2, stopped}}%
       \fi
+      \x{ifpdf}{The package is already loaded}%
+      \aftergroup\endinput
     \fi
-  \else
-    \catcode35 6 % #
-    \catcode123 1 % {
-    \catcode125 2 % }
-    \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{ifpdf}{The package is already loaded}%
-    \endgroup
-    \expandafter\endinput
   \fi
 \endgroup
 \begingroup
@@ -68,6 +65,8 @@
   \catcode47 12 % /
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode91 12 % [
+  \catcode93 12 % ]
   \catcode123 1 % {
   \catcode125 2 % }
   \expandafter\ifx\csname ProvidesPackage\endcsname\relax
diff --git a/Master/texmf-dist/tex/generic/oberdiek/ifvtex.sty b/Master/texmf-dist/tex/generic/oberdiek/ifvtex.sty
index d71bd883acc..8c018cd984e 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/ifvtex.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/ifvtex.sty
@@ -33,29 +33,26 @@
   \catcode46 12 % .
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode123 1 % {
+  \catcode125 2 % }
   \expandafter\let\expandafter\x\csname ver@ifvtex.sty\endcsname
-  \ifcase 0%
-    \ifx\x\relax % plain
+  \ifx\x\relax % plain-TeX, first loading
+  \else
+    \def\empty{}%
+    \ifx\x\empty % LaTeX, first loading,
+      % variable is initialized, but \ProvidesPackage not yet seen
     \else
-      \ifx\x\empty % LaTeX
+      \catcode35 6 % #
+      \expandafter\ifx\csname PackageInfo\endcsname\relax
+        \def\x#1#2{%
+          \immediate\write-1{Package #1 Info: #2.}%
+        }%
       \else
-        1%
+        \def\x#1#2{\PackageInfo{#1}{#2, stopped}}%
       \fi
+      \x{ifvtex}{The package is already loaded}%
+      \aftergroup\endinput
     \fi
-  \else
-    \catcode35 6 % #
-    \catcode123 1 % {
-    \catcode125 2 % }
-    \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{ifvtex}{The package is already loaded}%
-    \endgroup
-    \expandafter\endinput
   \fi
 \endgroup
 \begingroup
@@ -68,6 +65,8 @@
   \catcode47 12 % /
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode91 12 % [
+  \catcode93 12 % ]
   \catcode123 1 % {
   \catcode125 2 % }
   \expandafter\ifx\csname ProvidesPackage\endcsname\relax
diff --git a/Master/texmf-dist/tex/generic/oberdiek/infwarerr.sty b/Master/texmf-dist/tex/generic/oberdiek/infwarerr.sty
index 238f8a808b8..28d68c2bae0 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/infwarerr.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/infwarerr.sty
@@ -34,29 +34,26 @@
   \catcode46 12 % .
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode123 1 % {
+  \catcode125 2 % }
   \expandafter\let\expandafter\x\csname ver@infwarerr.sty\endcsname
-  \ifcase 0%
-    \ifx\x\relax % plain
+  \ifx\x\relax % plain-TeX, first loading
+  \else
+    \def\empty{}%
+    \ifx\x\empty % LaTeX, first loading,
+      % variable is initialized, but \ProvidesPackage not yet seen
     \else
-      \ifx\x\empty % LaTeX
+      \catcode35 6 % #
+      \expandafter\ifx\csname PackageInfo\endcsname\relax
+        \def\x#1#2{%
+          \immediate\write-1{Package #1 Info: #2.}%
+        }%
       \else
-        1%
+        \def\x#1#2{\PackageInfo{#1}{#2, stopped}}%
       \fi
+      \x{infwarerr}{The package is already loaded}%
+      \aftergroup\endinput
     \fi
-  \else
-    \catcode35 6 % #
-    \catcode123 1 % {
-    \catcode125 2 % }
-    \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{infwarerr}{The package is already loaded}%
-    \endgroup
-    \expandafter\endinput
   \fi
 \endgroup
 \begingroup
@@ -69,6 +66,8 @@
   \catcode47 12 % /
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode91 12 % [
+  \catcode93 12 % ]
   \catcode123 1 % {
   \catcode125 2 % }
   \expandafter\ifx\csname ProvidesPackage\endcsname\relax
diff --git a/Master/texmf-dist/tex/generic/oberdiek/intcalc.sty b/Master/texmf-dist/tex/generic/oberdiek/intcalc.sty
index 6084c88a886..f435acbccca 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/intcalc.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/intcalc.sty
@@ -34,29 +34,26 @@
   \catcode46 12 % .
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode123 1 % {
+  \catcode125 2 % }
   \expandafter\let\expandafter\x\csname ver@intcalc.sty\endcsname
-  \ifcase 0%
-    \ifx\x\relax % plain
+  \ifx\x\relax % plain-TeX, first loading
+  \else
+    \def\empty{}%
+    \ifx\x\empty % LaTeX, first loading,
+      % variable is initialized, but \ProvidesPackage not yet seen
     \else
-      \ifx\x\empty % LaTeX
+      \catcode35 6 % #
+      \expandafter\ifx\csname PackageInfo\endcsname\relax
+        \def\x#1#2{%
+          \immediate\write-1{Package #1 Info: #2.}%
+        }%
       \else
-        1%
+        \def\x#1#2{\PackageInfo{#1}{#2, stopped}}%
       \fi
+      \x{intcalc}{The package is already loaded}%
+      \aftergroup\endinput
     \fi
-  \else
-    \catcode35 6 % #
-    \catcode123 1 % {
-    \catcode125 2 % }
-    \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{intcalc}{The package is already loaded}%
-    \endgroup
-    \expandafter\endinput
   \fi
 \endgroup
 \begingroup
@@ -69,6 +66,8 @@
   \catcode47 12 % /
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode91 12 % [
+  \catcode93 12 % ]
   \catcode123 1 % {
   \catcode125 2 % }
   \expandafter\ifx\csname ProvidesPackage\endcsname\relax
diff --git a/Master/texmf-dist/tex/generic/oberdiek/kvsetkeys.sty b/Master/texmf-dist/tex/generic/oberdiek/kvsetkeys.sty
index 7fd6ba87c7a..2a51a70ac21 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/kvsetkeys.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/kvsetkeys.sty
@@ -35,29 +35,26 @@
   \catcode46 12 % .
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode123 1 % {
+  \catcode125 2 % }
   \expandafter\let\expandafter\x\csname ver@kvsetkeys.sty\endcsname
-  \ifcase 0%
-    \ifx\x\relax % plain
+  \ifx\x\relax % plain-TeX, first loading
+  \else
+    \def\empty{}%
+    \ifx\x\empty % LaTeX, first loading,
+      % variable is initialized, but \ProvidesPackage not yet seen
     \else
-      \ifx\x\empty % LaTeX
+      \catcode35 6 % #
+      \expandafter\ifx\csname PackageInfo\endcsname\relax
+        \def\x#1#2{%
+          \immediate\write-1{Package #1 Info: #2.}%
+        }%
       \else
-        1%
+        \def\x#1#2{\PackageInfo{#1}{#2, stopped}}%
       \fi
+      \x{kvsetkeys}{The package is already loaded}%
+      \aftergroup\endinput
     \fi
-  \else
-    \catcode35 6 % #
-    \catcode123 1 % {
-    \catcode125 2 % }
-    \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{kvsetkeys}{The package is already loaded}%
-    \endgroup
-    \expandafter\endinput
   \fi
 \endgroup
 \begingroup
@@ -70,6 +67,8 @@
   \catcode47 12 % /
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode91 12 % [
+  \catcode93 12 % ]
   \catcode123 1 % {
   \catcode125 2 % }
   \expandafter\ifx\csname ProvidesPackage\endcsname\relax
@@ -90,7 +89,7 @@
   \fi
 \expandafter\x\csname ver@kvsetkeys.sty\endcsname
 \ProvidesPackage{kvsetkeys}%
-  [2009/07/19 v1.4 Key value parser with default handler support (HO)]
+  [2009/07/30 v1.5 Key value parser with default handler support (HO)]
 \begingroup
   \catcode123 1 % {
   \catcode125 2 % }
diff --git a/Master/texmf-dist/tex/generic/oberdiek/ltxcmds.sty b/Master/texmf-dist/tex/generic/oberdiek/ltxcmds.sty
new file mode 100644
index 00000000000..9917a775167
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/oberdiek/ltxcmds.sty
@@ -0,0 +1,170 @@
+%%
+%% This is file `ltxcmds.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% ltxcmds.dtx  (with options: `package')
+%% 
+%% This is a generated file.
+%% 
+%% Copyright (C) 2009 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either
+%% 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 ltxcmds.dtx
+%% and the derived files
+%%    ltxcmds.sty, ltxcmds.pdf, ltxcmds.ins, ltxcmds.drv,
+%%    ltxcmds-test1.tex.
+%% 
+\begingroup
+  \catcode44 12 % ,
+  \catcode45 12 % -
+  \catcode46 12 % .
+  \catcode58 12 % :
+  \catcode64 11 % @
+  \catcode123 1 % {
+  \catcode125 2 % }
+  \expandafter\let\expandafter\x\csname ver@ltxcmds.sty\endcsname
+  \ifx\x\relax % plain-TeX, first loading
+  \else
+    \def\empty{}%
+    \ifx\x\empty % LaTeX, first loading,
+      % variable is initialized, but \ProvidesPackage not yet seen
+    \else
+      \catcode35 6 % #
+      \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{ltxcmds}{The package is already loaded}%
+      \aftergroup\endinput
+    \fi
+  \fi
+\endgroup
+\begingroup
+  \catcode35 6 % #
+  \catcode40 12 % (
+  \catcode41 12 % )
+  \catcode44 12 % ,
+  \catcode45 12 % -
+  \catcode46 12 % .
+  \catcode47 12 % /
+  \catcode58 12 % :
+  \catcode64 11 % @
+  \catcode91 12 % [
+  \catcode93 12 % ]
+  \catcode123 1 % {
+  \catcode125 2 % }
+  \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\@undefined
+        \xdef#1{#3}%
+      \fi
+      \ifx#1\relax
+        \xdef#1{#3}%
+      \fi
+    }%
+  \fi
+\expandafter\x\csname ver@ltxcmds.sty\endcsname
+\ProvidesPackage{ltxcmds}%
+  [2009/08/05 v1.0 Some LaTeX kernel commands for general use (HO)]
+\begingroup
+  \catcode123 1 % {
+  \catcode125 2 % }
+  \def\x{\endgroup
+    \expandafter\edef\csname ltx@AtEnd\endcsname{%
+      \catcode35 \the\catcode35\relax
+      \catcode64 \the\catcode64\relax
+      \catcode123 \the\catcode123\relax
+      \catcode125 \the\catcode125\relax
+    }%
+  }%
+\x
+\catcode35 6 % #
+\catcode64 11 % @
+\catcode123 1 % {
+\catcode125 2 % }
+\def\TMP@EnsureCode#1#2{%
+  \edef\ltx@AtEnd{%
+    \ltx@AtEnd
+    \catcode#1 \the\catcode#1\relax
+  }%
+  \catcode#1 #2\relax
+}
+\TMP@EnsureCode{61}{12}% =
+\TMP@EnsureCode{96}{12}% `
+\long\def\ltx@gobble#1{}
+\long\def\ltx@gobbletwo#1#2{}
+\long\def\ltx@gobblethree#1#2#3{}
+\long\def\ltx@gobblefour#1#2#3#4{}
+\long\def\ltx@firstofone#1{#1}
+\long\def\ltx@firstoftwo#1#2{#1}
+\long\def\ltx@secondoftwo#1#2{#2}
+\long\def\ltx@car#1#2\@nil{#1}
+\long\def\ltx@cdr#1#2\@nil{#2}
+\long\def\ltx@ReturnAfterFi#1\fi{#1}
+\long\def\ltx@ReturnAfterFi#1\else#2\fi{#1}
+\def\ltx@empty{}
+\def\ltx@space{ }
+\begingroup
+  \lccode`0=`\%\relax
+\lowercase{\endgroup
+  \def\ltx@percentchar{0}%
+}
+\begingroup
+  \lccode`0=`\\\relax
+\lowercase{\endgroup
+  \def\ltx@backslashchar{0}%
+}
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname ifcsname\endcsname\relax
+  \def\ltx@ifundefined#1{%
+    \expandafter\ifx\csname #1\endcsname\relax
+      \expandafter\ltx@firstoftwo
+    \else
+      \expandafter\ltx@secondoftwo
+    \fi
+  }%
+  \expandafter\ltx@gobble
+\else
+  \expandafter\ltx@firstofone
+\fi
+{%
+  \def\ltx@ifundefined#1{%
+    \ifcsname #1\endcsname
+      \expandafter\ltx@secondoftwo
+    \else
+      \expandafter\ltx@firstoftwo
+    \fi
+  }%
+}
+\def\ltx@LocalExpandAfter{%
+  \begingroup
+    \expandafter\expandafter\expandafter
+  \endgroup
+  \expandafter
+}
+\ltx@AtEnd
+\endinput
+%%
+%% End of file `ltxcmds.sty'.
diff --git a/Master/texmf-dist/tex/generic/oberdiek/luatex-loader.sty b/Master/texmf-dist/tex/generic/oberdiek/luatex-loader.sty
index dfb0b3ba664..7eaee9de037 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/luatex-loader.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/luatex-loader.sty
@@ -34,29 +34,26 @@
   \catcode46 12 % .
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode123 1 % {
+  \catcode125 2 % }
   \expandafter\let\expandafter\x\csname ver@luatex-loader.sty\endcsname
-  \ifcase 0%
-    \ifx\x\relax % plain
+  \ifx\x\relax % plain-TeX, first loading
+  \else
+    \def\empty{}%
+    \ifx\x\empty % LaTeX, first loading,
+      % variable is initialized, but \ProvidesPackage not yet seen
     \else
-      \ifx\x\empty % LaTeX
+      \catcode35 6 % #
+      \expandafter\ifx\csname PackageInfo\endcsname\relax
+        \def\x#1#2{%
+          \immediate\write-1{Package #1 Info: #2.}%
+        }%
       \else
-        1%
+        \def\x#1#2{\PackageInfo{#1}{#2, stopped}}%
       \fi
+      \x{luatex-loader}{The package is already loaded}%
+      \aftergroup\endinput
     \fi
-  \else
-    \catcode35 6 % #
-    \catcode123 1 % {
-    \catcode125 2 % }
-    \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{luatex-loader}{The package is already loaded}%
-    \endgroup
-    \expandafter\endinput
   \fi
 \endgroup
 \begingroup
@@ -69,6 +66,8 @@
   \catcode47 12 % /
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode91 12 % [
+  \catcode93 12 % ]
   \catcode123 1 % {
   \catcode125 2 % }
   \expandafter\ifx\csname ProvidesPackage\endcsname\relax
diff --git a/Master/texmf-dist/tex/generic/oberdiek/luatex.sty b/Master/texmf-dist/tex/generic/oberdiek/luatex.sty
index c932a0b5f9e..2cecb45c386 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/luatex.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/luatex.sty
@@ -34,29 +34,26 @@
   \catcode46 12 % .
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode123 1 % {
+  \catcode125 2 % }
   \expandafter\let\expandafter\x\csname ver@luatex.sty\endcsname
-  \ifcase 0%
-    \ifx\x\relax % plain
+  \ifx\x\relax % plain-TeX, first loading
+  \else
+    \def\empty{}%
+    \ifx\x\empty % LaTeX, first loading,
+      % variable is initialized, but \ProvidesPackage not yet seen
     \else
-      \ifx\x\empty % LaTeX
+      \catcode35 6 % #
+      \expandafter\ifx\csname PackageInfo\endcsname\relax
+        \def\x#1#2{%
+          \immediate\write-1{Package #1 Info: #2.}%
+        }%
       \else
-        1%
+        \def\x#1#2{\PackageInfo{#1}{#2, stopped}}%
       \fi
+      \x{luatex}{The package is already loaded}%
+      \aftergroup\endinput
     \fi
-  \else
-    \catcode35 6 % #
-    \catcode123 1 % {
-    \catcode125 2 % }
-    \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{luatex}{The package is already loaded}%
-    \endgroup
-    \expandafter\endinput
   \fi
 \endgroup
 \begingroup
@@ -69,6 +66,8 @@
   \catcode47 12 % /
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode91 12 % [
+  \catcode93 12 % ]
   \catcode123 1 % {
   \catcode125 2 % }
   \expandafter\ifx\csname ProvidesPackage\endcsname\relax
diff --git a/Master/texmf-dist/tex/generic/oberdiek/magicnum.sty b/Master/texmf-dist/tex/generic/oberdiek/magicnum.sty
index fbceb2ded81..81513e8d6b4 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/magicnum.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/magicnum.sty
@@ -34,29 +34,26 @@
   \catcode46 12 % .
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode123 1 % {
+  \catcode125 2 % }
   \expandafter\let\expandafter\x\csname ver@magicnum.sty\endcsname
-  \ifcase 0%
-    \ifx\x\relax % plain
+  \ifx\x\relax % plain-TeX, first loading
+  \else
+    \def\empty{}%
+    \ifx\x\empty % LaTeX, first loading,
+      % variable is initialized, but \ProvidesPackage not yet seen
     \else
-      \ifx\x\empty % LaTeX
+      \catcode35 6 % #
+      \expandafter\ifx\csname PackageInfo\endcsname\relax
+        \def\x#1#2{%
+          \immediate\write-1{Package #1 Info: #2.}%
+        }%
       \else
-        1%
+        \def\x#1#2{\PackageInfo{#1}{#2, stopped}}%
       \fi
+      \x{magicnum}{The package is already loaded}%
+      \aftergroup\endinput
     \fi
-  \else
-    \catcode35 6 % #
-    \catcode123 1 % {
-    \catcode125 2 % }
-    \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{magicnum}{The package is already loaded}%
-    \endgroup
-    \expandafter\endinput
   \fi
 \endgroup
 \begingroup
@@ -69,6 +66,8 @@
   \catcode47 12 % /
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode91 12 % [
+  \catcode93 12 % ]
   \catcode123 1 % {
   \catcode125 2 % }
   \expandafter\ifx\csname ProvidesPackage\endcsname\relax
diff --git a/Master/texmf-dist/tex/generic/oberdiek/pdfcol.sty b/Master/texmf-dist/tex/generic/oberdiek/pdfcol.sty
index 71381bd0660..783ae060db2 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/pdfcol.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/pdfcol.sty
@@ -33,29 +33,26 @@
   \catcode46 12 % .
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode123 1 % {
+  \catcode125 2 % }
   \expandafter\let\expandafter\x\csname ver@pdfcol.sty\endcsname
-  \ifcase 0%
-    \ifx\x\relax % plain
+  \ifx\x\relax % plain-TeX, first loading
+  \else
+    \def\empty{}%
+    \ifx\x\empty % LaTeX, first loading,
+      % variable is initialized, but \ProvidesPackage not yet seen
     \else
-      \ifx\x\empty % LaTeX
+      \catcode35 6 % #
+      \expandafter\ifx\csname PackageInfo\endcsname\relax
+        \def\x#1#2{%
+          \immediate\write-1{Package #1 Info: #2.}%
+        }%
       \else
-        1%
+        \def\x#1#2{\PackageInfo{#1}{#2, stopped}}%
       \fi
+      \x{pdfcol}{The package is already loaded}%
+      \aftergroup\endinput
     \fi
-  \else
-    \catcode35 6 % #
-    \catcode123 1 % {
-    \catcode125 2 % }
-    \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{pdfcol}{The package is already loaded}%
-    \endgroup
-    \expandafter\endinput
   \fi
 \endgroup
 \begingroup
@@ -68,6 +65,8 @@
   \catcode47 12 % /
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode91 12 % [
+  \catcode93 12 % ]
   \catcode123 1 % {
   \catcode125 2 % }
   \expandafter\ifx\csname ProvidesPackage\endcsname\relax
diff --git a/Master/texmf-dist/tex/generic/oberdiek/pdfescape.sty b/Master/texmf-dist/tex/generic/oberdiek/pdfescape.sty
index d5d42dabc7e..fa69e6efe07 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/pdfescape.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/pdfescape.sty
@@ -35,29 +35,26 @@
   \catcode46 12 % .
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode123 1 % {
+  \catcode125 2 % }
   \expandafter\let\expandafter\x\csname ver@pdfescape.sty\endcsname
-  \ifcase 0%
-    \ifx\x\relax % plain
+  \ifx\x\relax % plain-TeX, first loading
+  \else
+    \def\empty{}%
+    \ifx\x\empty % LaTeX, first loading,
+      % variable is initialized, but \ProvidesPackage not yet seen
     \else
-      \ifx\x\empty % LaTeX
+      \catcode35 6 % #
+      \expandafter\ifx\csname PackageInfo\endcsname\relax
+        \def\x#1#2{%
+          \immediate\write-1{Package #1 Info: #2.}%
+        }%
       \else
-        1%
+        \def\x#1#2{\PackageInfo{#1}{#2, stopped}}%
       \fi
+      \x{pdfescape}{The package is already loaded}%
+      \aftergroup\endinput
     \fi
-  \else
-    \catcode35 6 % #
-    \catcode123 1 % {
-    \catcode125 2 % }
-    \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{pdfescape}{The package is already loaded}%
-    \endgroup
-    \expandafter\endinput
   \fi
 \endgroup
 \begingroup
@@ -70,6 +67,8 @@
   \catcode47 12 % /
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode91 12 % [
+  \catcode93 12 % ]
   \catcode123 1 % {
   \catcode125 2 % }
   \expandafter\ifx\csname ProvidesPackage\endcsname\relax
diff --git a/Master/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty b/Master/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty
index 59a32176aac..993edd686e5 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty
@@ -33,29 +33,26 @@
   \catcode46 12 % .
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode123 1 % {
+  \catcode125 2 % }
   \expandafter\let\expandafter\x\csname ver@pdftexcmds.sty\endcsname
-  \ifcase 0%
-    \ifx\x\relax % plain
+  \ifx\x\relax % plain-TeX, first loading
+  \else
+    \def\empty{}%
+    \ifx\x\empty % LaTeX, first loading,
+      % variable is initialized, but \ProvidesPackage not yet seen
     \else
-      \ifx\x\empty % LaTeX
+      \catcode35 6 % #
+      \expandafter\ifx\csname PackageInfo\endcsname\relax
+        \def\x#1#2{%
+          \immediate\write-1{Package #1 Info: #2.}%
+        }%
       \else
-        1%
+        \def\x#1#2{\PackageInfo{#1}{#2, stopped}}%
       \fi
+      \x{pdftexcmds}{The package is already loaded}%
+      \aftergroup\endinput
     \fi
-  \else
-    \catcode35 6 % #
-    \catcode123 1 % {
-    \catcode125 2 % }
-    \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{pdftexcmds}{The package is already loaded}%
-    \endgroup
-    \expandafter\endinput
   \fi
 \endgroup
 \begingroup
@@ -68,6 +65,8 @@
   \catcode47 12 % /
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode91 12 % [
+  \catcode93 12 % ]
   \catcode123 1 % {
   \catcode125 2 % }
   \expandafter\ifx\csname ProvidesPackage\endcsname\relax
diff --git a/Master/texmf-dist/tex/generic/oberdiek/setouterhbox.sty b/Master/texmf-dist/tex/generic/oberdiek/setouterhbox.sty
index e7b68d32742..0a512cdaa17 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/setouterhbox.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/setouterhbox.sty
@@ -35,29 +35,26 @@
   \catcode46 12 % .
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode123 1 % {
+  \catcode125 2 % }
   \expandafter\let\expandafter\x\csname ver@setouterhbox.sty\endcsname
-  \ifcase 0%
-    \ifx\x\relax % plain
+  \ifx\x\relax % plain-TeX, first loading
+  \else
+    \def\empty{}%
+    \ifx\x\empty % LaTeX, first loading,
+      % variable is initialized, but \ProvidesPackage not yet seen
     \else
-      \ifx\x\empty % LaTeX
+      \catcode35 6 % #
+      \expandafter\ifx\csname PackageInfo\endcsname\relax
+        \def\x#1#2{%
+          \immediate\write-1{Package #1 Info: #2.}%
+        }%
       \else
-        1%
+        \def\x#1#2{\PackageInfo{#1}{#2, stopped}}%
       \fi
+      \x{setouterhbox}{The package is already loaded}%
+      \aftergroup\endinput
     \fi
-  \else
-    \catcode35 6 % #
-    \catcode123 1 % {
-    \catcode125 2 % }
-    \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{setouterhbox}{The package is already loaded}%
-    \endgroup
-    \expandafter\endinput
   \fi
 \endgroup
 \begingroup
@@ -70,6 +67,8 @@
   \catcode47 12 % /
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode91 12 % [
+  \catcode93 12 % ]
   \catcode123 1 % {
   \catcode125 2 % }
   \expandafter\ifx\csname ProvidesPackage\endcsname\relax
diff --git a/Master/texmf-dist/tex/generic/oberdiek/soulutf8.sty b/Master/texmf-dist/tex/generic/oberdiek/soulutf8.sty
index 423e49ddebf..925cf81f630 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/soulutf8.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/soulutf8.sty
@@ -34,29 +34,26 @@
   \catcode46 12 % .
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode123 1 % {
+  \catcode125 2 % }
   \expandafter\let\expandafter\x\csname ver@soulutf8.sty\endcsname
-  \ifcase 0%
-    \ifx\x\relax % plain
+  \ifx\x\relax % plain-TeX, first loading
+  \else
+    \def\empty{}%
+    \ifx\x\empty % LaTeX, first loading,
+      % variable is initialized, but \ProvidesPackage not yet seen
     \else
-      \ifx\x\empty % LaTeX
+      \catcode35 6 % #
+      \expandafter\ifx\csname PackageInfo\endcsname\relax
+        \def\x#1#2{%
+          \immediate\write-1{Package #1 Info: #2.}%
+        }%
       \else
-        1%
+        \def\x#1#2{\PackageInfo{#1}{#2, stopped}}%
       \fi
+      \x{soulutf8}{The package is already loaded}%
+      \aftergroup\endinput
     \fi
-  \else
-    \catcode35 6 % #
-    \catcode123 1 % {
-    \catcode125 2 % }
-    \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{soulutf8}{The package is already loaded}%
-    \endgroup
-    \expandafter\endinput
   \fi
 \endgroup
 \begingroup
@@ -69,6 +66,8 @@
   \catcode47 12 % /
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode91 12 % [
+  \catcode93 12 % ]
   \catcode123 1 % {
   \catcode125 2 % }
   \expandafter\ifx\csname ProvidesPackage\endcsname\relax
diff --git a/Master/texmf-dist/tex/generic/oberdiek/stringenc.sty b/Master/texmf-dist/tex/generic/oberdiek/stringenc.sty
index 0c01db4be10..dc585acdc93 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/stringenc.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/stringenc.sty
@@ -45,29 +45,26 @@
   \catcode46 12 % .
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode123 1 % {
+  \catcode125 2 % }
   \expandafter\let\expandafter\x\csname ver@stringenc.sty\endcsname
-  \ifcase 0%
-    \ifx\x\relax % plain
+  \ifx\x\relax % plain-TeX, first loading
+  \else
+    \def\empty{}%
+    \ifx\x\empty % LaTeX, first loading,
+      % variable is initialized, but \ProvidesPackage not yet seen
     \else
-      \ifx\x\empty % LaTeX
+      \catcode35 6 % #
+      \expandafter\ifx\csname PackageInfo\endcsname\relax
+        \def\x#1#2{%
+          \immediate\write-1{Package #1 Info: #2.}%
+        }%
       \else
-        1%
+        \def\x#1#2{\PackageInfo{#1}{#2, stopped}}%
       \fi
+      \x{stringenc}{The package is already loaded}%
+      \aftergroup\endinput
     \fi
-  \else
-    \catcode35 6 % #
-    \catcode123 1 % {
-    \catcode125 2 % }
-    \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{stringenc}{The package is already loaded}%
-    \endgroup
-    \expandafter\endinput
   \fi
 \endgroup
 \begingroup
@@ -80,6 +77,8 @@
   \catcode47 12 % /
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode91 12 % [
+  \catcode93 12 % ]
   \catcode123 1 % {
   \catcode125 2 % }
   \expandafter\ifx\csname ProvidesPackage\endcsname\relax
diff --git a/Master/texmf-dist/tex/generic/oberdiek/telprint.sty b/Master/texmf-dist/tex/generic/oberdiek/telprint.sty
index 2ff0b2acbfe..76c5beab4e9 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/telprint.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/telprint.sty
@@ -34,29 +34,26 @@
   \catcode46 12 % .
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode123 1 % {
+  \catcode125 2 % }
   \expandafter\let\expandafter\x\csname ver@telprint.sty\endcsname
-  \ifcase 0%
-    \ifx\x\relax % plain
+  \ifx\x\relax % plain-TeX, first loading
+  \else
+    \def\empty{}%
+    \ifx\x\empty % LaTeX, first loading,
+      % variable is initialized, but \ProvidesPackage not yet seen
     \else
-      \ifx\x\empty % LaTeX
+      \catcode35 6 % #
+      \expandafter\ifx\csname PackageInfo\endcsname\relax
+        \def\x#1#2{%
+          \immediate\write-1{Package #1 Info: #2.}%
+        }%
       \else
-        1%
+        \def\x#1#2{\PackageInfo{#1}{#2, stopped}}%
       \fi
+      \x{telprint}{The package is already loaded}%
+      \aftergroup\endinput
     \fi
-  \else
-    \catcode35 6 % #
-    \catcode123 1 % {
-    \catcode125 2 % }
-    \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{telprint}{The package is already loaded}%
-    \endgroup
-    \expandafter\endinput
   \fi
 \endgroup
 \begingroup
@@ -69,6 +66,8 @@
   \catcode47 12 % /
   \catcode58 12 % :
   \catcode64 11 % @
+  \catcode91 12 % [
+  \catcode93 12 % ]
   \catcode123 1 % {
   \catcode125 2 % }
   \expandafter\ifx\csname ProvidesPackage\endcsname\relax