summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-03-02 23:59:23 +0000
committerKarl Berry <karl@freefriends.org>2010-03-02 23:59:23 +0000
commite733cbfe3512600688e296c70149a128c63c6399 (patch)
treed308e0668a1738e52e6f2aef66bbdd10dedc32b1 /Master/texmf-dist/tex
parentb976ea0454de996a49ec858311ab475bd0821263 (diff)
oberdiek update (2mar10)
git-svn-id: svn://tug.org/texlive/trunk@17292 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/alphalph.sty6
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/atbegshi.sty75
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/catchfile.sty8
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/embedfile.sty (renamed from Master/texmf-dist/tex/latex/oberdiek/embedfile.sty)159
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/engord.sty8
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/ifluatex.sty26
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/ifvtex.sty40
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/kvdefinekeys.sty145
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/kvsetkeys.sty38
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/ltxcmds.sty59
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/pdfcol.sty7
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/pdfescape.sty22
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty6
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-ascii-print.def6
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-ascii.def4
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-clean7bit.def4
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-cp1250.def4
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-cp1251.def4
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-cp1252.def20
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-cp1257.def4
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-cp437.def4
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-cp850.def4
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-cp852.def4
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-cp855.def4
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-cp858.def4
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-cp865.def4
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-cp866.def4
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-dec-mcs.def4
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-1.def20
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-10.def4
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-11.def4
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-13.def4
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-14.def4
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-15.def4
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-16.def4
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-2.def4
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-3.def4
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-4.def4
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-5.def4
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-6.def4
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-7.def4
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-8.def4
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-9.def4
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-koi8-r.def4
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-mac-centeuro.def4
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-mac-cyrillic.def4
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-mac-roman.def4
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-nextstep.def4
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-pdfdoc.def22
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-utf16le.def4
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-utf32be.def26
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-utf32le.def26
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/se-utf8.def70
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/stringenc.sty138
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/dtx-attach.sty15
55 files changed, 646 insertions, 428 deletions
diff --git a/Master/texmf-dist/tex/generic/oberdiek/alphalph.sty b/Master/texmf-dist/tex/generic/oberdiek/alphalph.sty
index 882401411d9..312520b7d35 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/alphalph.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/alphalph.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 1999, 2006-2008 by
+%% Copyright (C) 1999, 2006-2008, 2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
%%
%% This work may be distributed and/or modified under the
@@ -93,7 +93,7 @@
\fi
\expandafter\x\csname ver@alphalph.sty\endcsname
\ProvidesPackage{alphalph}%
- [2008/08/11 v2.1 Converting numbers to letters (HO)]
+ [2010/03/01 v2.2 Converting numbers to letters (HO)]
\begingroup
\catcode123 1 % {
\catcode125 2 % }
@@ -228,7 +228,7 @@
\AlPh@ExpSearch2!{#1}%
\fi
}
-\newif\ifAlPh@Unavailable
+\let\ifAlPh@Unavailable\iffalse
\def\AlPh@Unavailabletrue{%
\global\let\ifAlPh@Unavailable\iftrue
}
diff --git a/Master/texmf-dist/tex/generic/oberdiek/atbegshi.sty b/Master/texmf-dist/tex/generic/oberdiek/atbegshi.sty
index 090004b4cf7..16602bcecb8 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/atbegshi.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/atbegshi.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2007, 2008, 2009 by
+%% Copyright (C) 2007-2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
%%
%% This work may be distributed and/or modified under the
@@ -94,7 +94,7 @@
\fi
\expandafter\x\csname ver@atbegshi.sty\endcsname
\ProvidesPackage{atbegshi}%
- [2009/12/02 v1.10 At begin shipout hook (HO)]
+ [2010/03/01 v1.11 At begin shipout hook (HO)]
\begingroup
\catcode123 1 % {
\catcode125 2 % }
@@ -131,19 +131,21 @@
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname RequirePackage\endcsname\relax
\input infwarerr.sty\relax
+ \input ltxcmds.sty\relax
\else
\RequirePackage{infwarerr}[2007/09/09]%
+ \RequirePackage{ltxcmds}[2010/03/01]%
\fi
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname @ifdefinable\endcsname\relax
\def\AtBegShi@CheckDefinable#1{%
\ifcase\ifx#1\relax
- \@ne
+ \ltx@one
\else
\ifx#1\@undefined
- \@ne
+ \ltx@one
\else
- \z@
+ \ltx@zero
\fi
\fi
\errmessage{%
@@ -158,10 +160,10 @@
\@ifdefinable{#1}{}%
}%
\fi
-\newif\ifAtBegShi@Discarded
+\ltx@newif\ifAtBegShi@Discarded
\AtBegShi@CheckDefinable\AtBeginShipoutDiscard
\def\AtBeginShipoutDiscard{%
- \deadcycles=\z@
+ \deadcycles=\ltx@zero
\global\AtBegShi@Discardedtrue
}
\begingroup\expandafter\expandafter\expandafter\endgroup
@@ -182,7 +184,7 @@ X \global
\setbox\AtBeginShipoutBox=%
}
\def\AtBegShi@Test{%
-X \ifdim\lastkern=\z@
+X \ifdim\lastkern=0pt %
E \ifnum\AtBegShi@GroupLevel<\currentgrouplevel
\expandafter\aftergroup
\fi
@@ -221,19 +223,19 @@ X \endgroup
\def\@empty{}%
\ifx\AtBegShi@HookFirst\@empty
\else
- \setbox\z@=\vbox{%
+ \setbox\ltx@zero=\vbox{%
\begingroup
\AtBegShi@HookFirst
\endgroup
}%
- \wd\z@=\z@
- \ht\z@=\z@
- \dp\z@=\z@
+ \wd\ltx@zero=0pt %
+ \ht\ltx@zero=0pt %
+ \dp\ltx@zero=0pt %
\global\setbox\AtBeginShipoutBox=\vbox{%
- \baselineskip\z@skip
- \lineskip\z@skip
- \lineskiplimit\z@
- \copy\z@
+ \baselineskip 0pt\relax
+ \lineskip 0pt\relax
+ \lineskiplimit 0pt\relax
+ \copy\ltx@zero
\copy\AtBeginShipoutBox
}%
\fi
@@ -266,8 +268,8 @@ X \endgroup
\expandafter\ifx\csname g@addto@macro\endcsname\relax
\long\def\AtBegShi@AddTo#1#2{%
\begingroup
- \toks\z@\expandafter{#1#2}%
- \xdef#1{\the\toks\z@}%
+ \toks\ltx@zero\expandafter{#1#2}%
+ \xdef#1{\the\toks\ltx@zero}%
\endgroup
}%
\else
@@ -291,10 +293,17 @@ X \endgroup
}
\AtBegShi@CheckDefinable\AtBeginShipoutInit
\def\AtBeginShipoutInit{%
- \csname newbox\endcsname\AtBeginShipoutBox
- \AtBegShi@CheckDefinable\AtBeginShipoutOriginalShipout
- \global\let\AtBeginShipoutOriginalShipout\shipout
- \global\let\shipout\AtBegShi@Shipout
+ \ltx@IfUndefined{newbox}{%
+ \@PackageError{atbegshi}{%
+ \string\AtBeginShipoutInit\space failed\MessageBreak
+ because of missing \expandafter\string\csname newbox\endcsname
+ }\@ehc
+ }{%
+ \csname newbox\endcsname\AtBeginShipoutBox
+ \AtBegShi@CheckDefinable\AtBeginShipoutOriginalShipout
+ \global\let\AtBeginShipoutOriginalShipout\shipout
+ \global\let\shipout\AtBegShi@Shipout
+ }%
\gdef\AtBeginShipoutInit{}%
}
\begingroup\expandafter\expandafter\expandafter\endgroup
@@ -345,16 +354,16 @@ X \endgroup
\else
\endgroup
\def\AtBegShi@BeginPicture{%
- \setbox0=\hbox\bgroup
+ \setbox\ltx@zero=\hbox\bgroup
\begingroup
\ignorespaces
}%
\def\AtBegShi@EndPicture{%
\endgroup
\egroup
- \ht0=0pt\relax
- \dp0=0pt\relax
- \copy0 %
+ \ht\ltx@zero=0pt\relax
+ \dp\ltx@zero=0pt\relax
+ \copy\ltx@zero
}%
\fi
\def\AtBeginShipoutUpperLeft#1{%
@@ -460,9 +469,9 @@ X \endgroup
\CROP@@ship
}%
\def\CROP@shiplist{%
- \lineskip\z@
- \lineskiplimit\z@
- \baselineskip\z@
+ \lineskip 0pt\relax
+ \lineskiplimit 0pt\relax
+ \baselineskip 0pt\relax
\CROP@kernel
\box\AtBeginShipoutBox
}%
@@ -544,7 +553,7 @@ X \endgroup
\def\AtBegShi@Everyshi@Output{%
\ifvoid\AtBeginShipoutBox
\else
- \global\setbox\@cclv\box\AtBeginShipoutBox
+ \global\setbox\ltx@cclv\box\AtBeginShipoutBox
\expandafter\@EveryShipout@Output
\fi
}%
@@ -590,12 +599,12 @@ X \endgroup
}%
\ifx\AtBegShi@Memoir@shipi\mem@shipi
\ifcase\ifx\AtBegShi@Memoir@shipiiA\mem@shipii
- \z@
+ \ltx@zero
\else
\ifx\AtBegShi@Memoir@shipiiB\mem@shipii
- \z@
+ \ltx@zero
\else
- \@ne
+ \ltx@one
\fi
\fi
\let\AtBegShi@found\relax
diff --git a/Master/texmf-dist/tex/generic/oberdiek/catchfile.sty b/Master/texmf-dist/tex/generic/oberdiek/catchfile.sty
index 70b9cf8b07e..30ada35f31f 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/catchfile.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/catchfile.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2007 by
+%% Copyright (C) 2007, 2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
%%
%% This work may be distributed and/or modified under the
@@ -94,7 +94,7 @@
\fi
\expandafter\x\csname ver@catchfile.sty\endcsname
\ProvidesPackage{catchfile}%
- [2007/11/11 v1.2 Catches the contents of a file (HO)]
+ [2010/03/01 v1.3 Catches the contents of a file (HO)]
\begingroup
\catcode123 1 % {
\catcode125 2 % }
@@ -137,7 +137,7 @@
\edef\TestMeaning{\meaning\everyeof}%
\ifx\TestString\TestMeaning
\else
- \@PackageErrorNoLine{catchfile}{%
+ \@PackageError{catchfile}{%
Cannot find e-TeX's \string\everyeof,\MessageBreak
package loading is aborted%
}\@ehd
@@ -161,7 +161,7 @@
\Check\input\input{}%
\Check\input\@@input{}%
\Check\pdfprimitive\pdfprimitive\input
- \@PackageErrorNoLine{%
+ \@PackageError{%
Cannot find primitive \string\input,\MessageBreak
package loading is aborted%
}\@ehd
diff --git a/Master/texmf-dist/tex/latex/oberdiek/embedfile.sty b/Master/texmf-dist/tex/generic/oberdiek/embedfile.sty
index c5fe06b0a59..818af148638 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/embedfile.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/embedfile.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2006-2009 by
+%% Copyright (C) 2006-2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
%%
%% This work may be distributed and/or modified under the
@@ -25,12 +25,17 @@
%%
%% This Current Maintainer of this work is Heiko Oberdiek.
%%
+%% The Base Interpreter refers to any `TeX-Format',
+%% because some files are installed in TDS:tex/generic//.
+%%
%% This work consists of the main source file embedfile.dtx
%% and the derived files
%% embedfile.sty, embedfile.pdf, embedfile.ins, embedfile.drv,
-%% dtx-attach.sty, embedfile-example-plain.tex,
+%% \immediate \write 18 {mkdir -p texmf/tex/latex/oberdiek}\edef {texmf/tex/latex/oberdiek}, dtx-attach.sty,
+%% embedfile-example-plain.tex,
%% embedfile-example-collection.tex, embedfile-test1.tex,
-%% embedfile-test2.tex, embedfile-test3.tex.
+%% embedfile-test2.tex, embedfile-test3.tex,
+%% embedfile-test4.tex.
%%
\begingroup
\catcode44 12 % ,
@@ -92,7 +97,7 @@
\fi
\expandafter\x\csname ver@embedfile.sty\endcsname
\ProvidesPackage{embedfile}%
- [2009/09/25 v2.4 embed files into PDF (HO)]
+ [2010/03/01 v2.5 embed files into PDF (HO)]
\begingroup
\catcode123 1 % {
\catcode125 2 % }
@@ -154,7 +159,9 @@
\expandafter\endinput
\fi
\EmFi@RequirePackage{pdftexcmds}[2007/11/11]
-\EmFi@RequirePackage{ltxcmds}[2009/08/05]
+\EmFi@RequirePackage{ltxcmds}[2010/03/01]
+\EmFi@RequirePackage{kvsetkeys}[2010/03/01]
+\EmFi@RequirePackage{kvdefinekeys}[2010/03/01]
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname pdf@filesize\endcsname\relax
\EmFi@Error{%
@@ -184,87 +191,13 @@
\EmFi@temp{descending}
\EmFi@temp{true}
\EmFi@temp{false}
-\newif\ifEmFi@collection
-\newif\ifEmFi@sort
-\newif\ifEmFi@visible
-\newif\ifEmFi@edit
-\newif\ifEmFi@item
-\newif\ifEmFi@finished
-\newif\ifEmFi@id
-\expandafter\ifx\csname define@key\endcsname\relax
- \chardef\EmFi@plain=\z@
- \def\EmFi@temp#1{%
- \begingroup\expandafter\expandafter\expandafter\endgroup
- \expandafter\ifx\csname#1\endcsname\relax
- \chardef\EmFi@plain=\@ne
- \fi
- }%
- \EmFi@temp{NeedsTeXFormat}%
- \EmFi@temp{ProvidesPackage}%
- \EmFi@temp{DeclareOption}%
- \EmFi@temp{ExecuteOptions}%
- \EmFi@temp{ProcessOptions}%
- \ifnum\EmFi@plain=\@ne
- \def\EmFi@temp#1{%
- \expandafter\let\csname EmFi@Org#1\expandafter\endcsname
- \csname#1\endcsname
- \expandafter\def\csname#1\endcsname
- }%
- \EmFi@temp{NeedsTeXFormat}#1{}%
- \EmFi@temp{ProvidesPackage}#1[#2]{}% hash-ok
- \EmFi@temp{DeclareOption}#1{}%
- \EmFi@temp{ExecuteOptions}#1{}%
- \EmFi@temp{ProcessOptions}{}%
- \def\KV@errx#1{%
- \@PackageError{keyval}{#1}\@ehc
- }%
- \expandafter\ifx\csname @ifnextchar\endcsname\relax
- \def\@ifnextchar#1#2#3{%
- \let\reserved@d=#1%
- \def\reserved@a{#2}%
- \def\reserved@b{#3}%
- \futurelet\@let@token\@ifnch
- }%
- \def\@ifnch{%
- \ifx\@let@token\@sptoken
- \let\reserved@c\@xifnch
- \else
- \ifx\@let@token\reserved@d
- \let\reserved@c\reserved@a
- \else
- \let\reserved@c\reserved@b
- \fi
- \fi
- \reserved@c
- }%
- \begingroup
- \def\:{\global\let\@sptoken= }%
- \: % this makes \@sptoken a space token
- \def\:{\@xifnch}%
- \expandafter\gdef\: {%
- \futurelet\@let@token\@ifnch
- }%
- \endgroup
- \fi
- \expandafter\ifx\csname @namedef\endcsname\relax
- \def\@namedef#1{%
- \expandafter\def\csname#1\endcsname
- }%
- \fi
- \fi
- \EmFi@RequirePackage{keyval}[1999/03/16]%
- \ifnum\EmFi@plain=\@ne
- \def\EmFi@temp#1{%
- \expandafter\let\csname#1\expandafter\endcsname
- \csname EmFi@Org#1\endcsname
- }%
- \EmFi@temp{NeedsTeXFormat}%
- \EmFi@temp{ProvidesPackage}%
- \EmFi@temp{DeclareOption}%
- \EmFi@temp{ExecuteOptions}%
- \EmFi@temp{ProcessOptions}%
- \fi
-\fi
+\ltx@newif\ifEmFi@collection
+\ltx@newif\ifEmFi@sort
+\ltx@newif\ifEmFi@visible
+\ltx@newif\ifEmFi@edit
+\ltx@newif\ifEmFi@item
+\ltx@newif\ifEmFi@finished
+\ltx@newif\ifEmFi@id
\def\EmFi@GlobalKey#1#2{%
\global\expandafter\let\csname KV@#1@#2\expandafter\endcsname
\csname KV@#1@#2\endcsname
@@ -276,7 +209,7 @@
\csname KV@#1@#2@default\endcsname
}
\def\EmFi@DefineKey#1#2{%
- \define@key{EmFi}{#1}{%
+ \kv@define@key{EmFi}{#1}{%
\expandafter\def\csname EmFi@#1\endcsname{##1}%
}%
\expandafter\def\csname EmFi@#1\endcsname{#2}%
@@ -297,14 +230,14 @@
\fi
\fi
}
-\define@key{EmFi}{id}{%
+\kv@define@key{EmFi}{id}{%
\def\EmFi@id{#1}%
\EmFi@idtrue
}
\def\EmFi@defobj#1{%
\ifEmFi@id
\expandafter\xdef\csname EmFi@#1@\EmFi@id\endcsname{%
- \the\pdflastobj\space 0 R%
+ \the\pdflastobj\ltx@space 0 R%
}%
\fi
}
@@ -322,7 +255,7 @@
0 0 R%
}%
}
-\define@key{EmFi}{view}[]{%
+\kv@define@key{EmFi}{view}[]{%
\EdefSanitize\EmFi@temp{#1}%
\def\EmFi@next{%
\global\EmFi@collectiontrue
@@ -349,13 +282,13 @@
\ifEmFi@finished
\def\EmFi@next##1{}%
\EmFi@Error{%
- \string\embedfilefield\space after \string\embedfilefinish
+ \string\embedfilefield\ltx@space after \string\embedfilefinish
}{%
The list of embedded files is already written.%
}%
\else
\def\EmFi@next{%
- \setkeys{EmFi}%
+ \kvsetkeys{EmFi}%
}%
\fi
\EmFi@next
@@ -368,7 +301,7 @@
\def\embedfilefield#1#2{%
\ifEmFi@finished
\EmFi@Error{%
- \string\embedfilefield\space after \string\embedfilefinish
+ \string\embedfilefield\ltx@space after \string\embedfilefinish
}{%
The list of embedded files is already written.%
}%
@@ -384,7 +317,7 @@
\let\EmFi@type\EmFi@S@text
\EmFi@visibletrue
\EmFi@editfalse
- \setkeys{EmFiFi}{#2}%
+ \kvsetkeys{EmFiFi}{#2}%
\EmFi@convert\EmFi@title\EmFi@title
\xdef\EmFi@schema{%
\EmFi@schema
@@ -416,7 +349,7 @@
\do{\EmFi@key}%
}%
\ifx\EmFi@type\EmFi@S@text
- \define@key{EmFi}{\EmFi@key.value}{%
+ \kv@define@key{EmFi}{\EmFi@key.value}{%
\EmFi@itemtrue
\def\EmFi@temp{##1}%
\EmFi@convert\EmFi@temp\EmFi@temp
@@ -427,7 +360,7 @@
}%
\EmFi@GlobalKey{EmFi}{\EmFi@key.value}%
\else\ifx\EmFi@type\EmFi@S@date
- \define@key{EmFi}{\EmFi@key.value}{%
+ \kv@define@key{EmFi}{\EmFi@key.value}{%
\EmFi@itemtrue
\def\EmFi@temp{##1}%
\EmFi@convert\EmFi@temp\EmFi@temp
@@ -438,18 +371,18 @@
}%
\EmFi@GlobalKey{EmFi}{\EmFi@key.value}%
\else\ifx\EmFi@type\EmFi@S@number
- \define@key{EmFi}{\EmFi@key.value}{%
+ \kv@define@key{EmFi}{\EmFi@key.value}{%
\EmFi@itemtrue
\expandafter\EdefSanitize\csname EmFi@V@#1\endcsname{ ##1}%
}%
\EmFi@GlobalKey{EmFi}{\EmFi@key.value}%
\fi\fi\fi
- \define@key{EmFi}{\EmFi@key.prefix}{%
+ \kv@define@key{EmFi}{\EmFi@key.prefix}{%
\EmFi@itemtrue
\expandafter\def\csname EmFi@P@#1\endcsname{##1}%
}%
\EmFi@GlobalKey{EmFi}{\EmFi@key.prefix}%
- \define@key{EmFiSo}{\EmFi@key}[ascending]{%
+ \kv@define@key{EmFiSo}{\EmFi@key}[ascending]{%
\EdefSanitize\EmFi@temp{##1}%
\ifx\EmFi@temp\EmFi@S@ascending
\def\EmFi@temp{true}%
@@ -475,7 +408,7 @@
\else
\xdef\EmFi@sortorders{%
\EmFi@sortorders
- \space
+ \ltx@space
\EmFi@temp
}%
\xdef\EmFi@sortcase{2}%
@@ -491,7 +424,7 @@
\fi
\fi
}
-\define@key{EmFiFi}{type}{%
+\kv@define@key{EmFiFi}{type}{%
\EdefSanitize\EmFi@temp{#1}%
\ifx\EmFi@temp\EmFi@S@text
\let\EmFi@type\EmFi@temp
@@ -517,7 +450,7 @@
}%
\fi\fi\fi\fi\fi\fi\fi\fi
}
-\define@key{EmFiFi}{title}{%
+\kv@define@key{EmFiFi}{title}{%
\def\EmFi@title{#1}%
}
\def\EmFi@setboolean#1#2{%
@@ -535,31 +468,31 @@
\fi
\fi
}
-\define@key{EmFiFi}{visible}[true]{%
+\kv@define@key{EmFiFi}{visible}[true]{%
\EmFi@setboolean{visible}{#1}%
}
-\define@key{EmFiFi}{edit}[true]{%
+\kv@define@key{EmFiFi}{edit}[true]{%
\EmFi@setboolean{edit}{#1}%
}
\def\EmFi@sortkeys{}
\def\EmFi@sortorders{}
\def\embedfilesort{%
- \setkeys{EmFiSo}%
+ \kvsetkeys{EmFiSo}%
}
\def\embedfile{%
- \@ifnextchar[\EmFi@embedfile{\EmFi@embedfile[]}%
+ \ltx@ifnextchar[\EmFi@embedfile{\EmFi@embedfile[]}%
}
\def\EmFi@embedfile[#1]#2{%
\ifEmFi@finished
\EmFi@Error{%
- \string\embedfile\space after \string\embedfilefinish
+ \string\embedfile\ltx@space after \string\embedfilefinish
}{%
The list of embedded files is already written.%
}%
\else
\begingroup
\def\EmFi@file{#2}%
- \setkeys{EmFi}{#1}%
+ \kvsetkeys{EmFi}{#1}%
\expandafter\expandafter\expandafter
\ifx\expandafter\expandafter\expandafter
\\\pdf@filesize{\EmFi@file}\\%
@@ -621,17 +554,17 @@
/Desc(\EmFi@@desc)%
\fi
/EF<<%
- /F \the\pdflastobj\space 0 R%
+ /F \the\pdflastobj\ltx@space 0 R%
>>%
\ifEmFi@item
- /CI \EmFi@ci\space 0 R%
+ /CI \EmFi@ci\ltx@space 0 R%
\fi
>>%
}%
\EmFi@defobj{Filespec}%
\EmFi@add{%
\EmFi@@filespec
- }{\the\pdflastobj\space 0 R}%
+ }{\the\pdflastobj\ltx@space 0 R}%
\fi
\endgroup
\fi
@@ -715,7 +648,7 @@
>>%
}%
\pdfnames{%
- /EmbeddedFiles \the\pdflastobj\space 0 R%
+ /EmbeddedFiles \the\pdflastobj\ltx@space 0 R%
}%
\endgroup
\ifx\EmFi@initialfile\ltx@empty
@@ -791,7 +724,7 @@
>>%
}%
\pdfcatalog{%
- /Collection \the\pdflastobj\space0 R%
+ /Collection \the\pdflastobj\ltx@space0 R%
}%
\fi
\fi
diff --git a/Master/texmf-dist/tex/generic/oberdiek/engord.sty b/Master/texmf-dist/tex/generic/oberdiek/engord.sty
index 52aed5192ad..7eaff14511a 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/engord.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/engord.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2000, 2003, 2006-2008 by
+%% Copyright (C) 2000, 2003, 2006-2008, 2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
%%
%% This work may be distributed and/or modified under the
@@ -92,7 +92,7 @@
\fi
\expandafter\x\csname ver@engord.sty\endcsname
\ProvidesPackage{engord}%
- [2008/08/11 v1.7 Provides English ordinal numbers (HO)]
+ [2010/03/01 v1.8 Provides English ordinal numbers (HO)]
\begingroup
\catcode123 1 % {
\catcode125 2 % }
@@ -137,10 +137,12 @@
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname RequirePackage\endcsname\relax
\input infwarerr.sty\relax
+ \input ltxcmds.sty\relax
\else
\RequirePackage{infwarerr}[2007/09/09]%
+ \RequirePackage{ltxcmds}[2010/03/01]%
\fi
-\newif\ifengordraise
+\ltx@newif\ifengordraise
\engordraisetrue
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname DeclareOption\endcsname\relax
diff --git a/Master/texmf-dist/tex/generic/oberdiek/ifluatex.sty b/Master/texmf-dist/tex/generic/oberdiek/ifluatex.sty
index 8c1338addc7..1b0ab97d108 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/ifluatex.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/ifluatex.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2007, 2009 by
+%% Copyright (C) 2007, 2009, 2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
%%
%% This work may be distributed and/or modified under the
@@ -93,7 +93,7 @@
\fi
\expandafter\x\csname ver@ifluatex.sty\endcsname
\ProvidesPackage{ifluatex}%
- [2009/04/17 v1.2 Provides the ifluatex switch (HO)]
+ [2010/03/01 v1.3 Provides the ifluatex switch (HO)]
\begingroup
\catcode123 1 % {
\catcode125 2 % }
@@ -175,7 +175,7 @@
\csname iftrue\endcsname
\begingroup
\newlinechar=10 %
- \endlinechar=\newlinechar %
+ \endlinechar=\newlinechar%
\ifnum0%
\directlua{%
if tex.enableprimitives then
@@ -185,15 +185,15 @@
}%
\ifx\ifluatexluatexversion\@undefined\else 1\fi %
=11 %
- \global\let\luatexversion\ifluatexluatexversion %
- \else %
+ \global\let\luatexversion\ifluatexluatexversion%
+ \else%
\ifluatex@Error{%
Missing \string\luatexversion%
}{%
Update LuaTeX.%
}%
- \fi %
- \endgroup %
+ \fi%
+ \endgroup%
\fi
\fi
\ifluatex
@@ -206,7 +206,7 @@
\let\luatexrevision\@undefined
\fi
\newlinechar=10 %
- \endlinechar=\newlinechar %
+ \endlinechar=\newlinechar%
\ifcase0%
\directlua{%
if tex.enableprimitives then
@@ -215,11 +215,11 @@
tex.print('1')
end
}%
- \ifx\ifluatexluatexrevision\@undefined 1\fi %
- \relax %
- \global\let\luatexrevision\ifluatexluatexrevision
- \fi
- \endgroup
+ \ifx\ifluatexluatexrevision\@undefined 1\fi%
+ \relax%
+ \global\let\luatexrevision\ifluatexluatexrevision%
+ \fi%
+ \endgroup%
\fi
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname luatexrevision\endcsname\relax
diff --git a/Master/texmf-dist/tex/generic/oberdiek/ifvtex.sty b/Master/texmf-dist/tex/generic/oberdiek/ifvtex.sty
index c5709aff54d..d7fb25e6ef7 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/ifvtex.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/ifvtex.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2001, 2006-2008 by
+%% Copyright (C) 2001, 2006-2008, 2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
%%
%% This work may be distributed and/or modified under the
@@ -92,7 +92,7 @@
\fi
\expandafter\x\csname ver@ifvtex.sty\endcsname
\ProvidesPackage{ifvtex}%
- [2008/11/04 v1.4 Switches for detecting VTeX and its modes (HO)]
+ [2010/03/01 v1.5 Switches for detecting VTeX and its modes (HO)]
\begingroup
\catcode123 1 % {
\catcode125 2 % }
@@ -155,7 +155,31 @@
\expandafter\endinput
\fi
\endgroup
-\newif\ifvtex
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname newif\endcsname\relax
+ \def\ifvtex@newif#1{%
+ \begingroup
+ \escapechar=-1 %
+ \expandafter\endgroup
+ \expandafter\ifvtex@@newif\string#1\@nil
+ }%
+ \def\ifvtex@@newif#1#2#3\@nil{%
+ \expandafter\edef\csname#3true\endcsname{%
+ \let
+ \expandafter\noexpand\csname if#3\endcsname
+ \expandafter\noexpand\csname iftrue\endcsname
+ }%
+ \expandafter\edef\csname#3false\endcsname{%
+ \let
+ \expandafter\noexpand\csname if#3\endcsname
+ \expandafter\noexpand\csname iffalse\endcsname
+ }%
+ \csname#3false\endcsname
+ }%
+\else
+ \expandafter\let\expandafter\ifvtex@newif\csname newif\endcsname
+\fi
+\ifvtex@newif\ifvtex
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname VTeXversion\endcsname\relax
\else
@@ -165,11 +189,11 @@
\vtextrue
\fi
\fi
-\newif\ifvtexdvi
-\newif\ifvtexpdf
-\newif\ifvtexps
-\newif\ifvtexhtml
-\newif\ifvtexgex
+\ifvtex@newif\ifvtexdvi
+\ifvtex@newif\ifvtexpdf
+\ifvtex@newif\ifvtexps
+\ifvtex@newif\ifvtexhtml
+\ifvtex@newif\ifvtexgex
\ifvtex
\ifcase\OpMode\relax
\vtexdvitrue
diff --git a/Master/texmf-dist/tex/generic/oberdiek/kvdefinekeys.sty b/Master/texmf-dist/tex/generic/oberdiek/kvdefinekeys.sty
new file mode 100644
index 00000000000..ccc377ae7af
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/oberdiek/kvdefinekeys.sty
@@ -0,0 +1,145 @@
+%%
+%% This is file `kvdefinekeys.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% kvdefinekeys.dtx (with options: `package')
+%%
+%% This is a generated file.
+%%
+%% Copyright (C) 2010 by
+%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either
+%% version 1.3c of this license or (at your option) any later
+%% version. This version of this license is in
+%% http://www.latex-project.org/lppl/lppl-1-3c.txt
+%% and 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.
+%%
+%% The Base Interpreter refers to any `TeX-Format',
+%% because some files are installed in TDS:tex/generic//.
+%%
+%% This work consists of the main source file kvdefinekeys.dtx
+%% and the derived files
+%% kvdefinekeys.sty, kvdefinekeys.pdf, kvdefinekeys.ins, kvdefinekeys.drv,
+%% kvdefinekeys-test1.tex.
+%%
+\begingroup
+ \catcode44 12 % ,
+ \catcode45 12 % -
+ \catcode46 12 % .
+ \catcode58 12 % :
+ \catcode64 11 % @
+ \catcode123 1 % {
+ \catcode125 2 % }
+ \expandafter\let\expandafter\x\csname ver@kvdefinekeys.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{kvdefinekeys}{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@kvdefinekeys.sty\endcsname
+\ProvidesPackage{kvdefinekeys}%
+ [2010/03/01 v1.0 Defining keys (HO)]
+\begingroup
+ \catcode123 1 % {
+ \catcode125 2 % }
+ \def\x{\endgroup
+ \expandafter\edef\csname KVD@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\KVD@AtEnd{%
+ \KVD@AtEnd
+ \catcode#1 \the\catcode#1\relax
+ }%
+ \catcode#1 #2\relax
+}
+\TMP@EnsureCode{46}{12}% .
+\TMP@EnsureCode{47}{12}% /
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname RequirePackage\endcsname\relax
+ \input ltxcmds.sty\relax
+\else
+ \RequirePackage{ltxcmds}[2010/03/01]%
+\fi
+\def\kv@define@key#1#2{%
+ \ltx@ifnextchar[{%
+ \KVD@DefineKeyWithDefault{#1}{#2}%
+ }{%
+ \long\expandafter\def\csname KV@#1@#2\endcsname##1%
+ }%
+}
+\long\def\KVD@DefineKeyWithDefault#1#2[#3]{%
+ \expandafter\def\csname KV@#1@#2@default\expandafter\endcsname
+ \expandafter{%
+ \csname KV@#1@#2\endcsname{#3}%
+ }%
+ \long\expandafter\def\csname KV@#1@#2\endcsname##1%
+}
+\KVD@AtEnd
+\endinput
+%%
+%% End of file `kvdefinekeys.sty'.
diff --git a/Master/texmf-dist/tex/generic/oberdiek/kvsetkeys.sty b/Master/texmf-dist/tex/generic/oberdiek/kvsetkeys.sty
index 435a08cffa2..029b2121e59 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/kvsetkeys.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/kvsetkeys.sty
@@ -94,7 +94,7 @@
\fi
\expandafter\x\csname ver@kvsetkeys.sty\endcsname
\ProvidesPackage{kvsetkeys}%
- [2010/01/28 v1.8 Key value parser (HO)]
+ [2010/03/01 v1.9 Key value parser (HO)]
\begingroup
\catcode123 1 % {
\catcode125 2 % }
@@ -158,7 +158,7 @@
\def\KVS@Empty{}
\long\def\KVS@FirstOfTwo#1#2{#1}
\long\def\KVS@SecondOfTwo#1#2{#2}
-\def\KVS@IfEmpty#1{%
+\long\def\KVS@IfEmpty#1{%
& \edef\KVS@Temp{\etex@unexpanded{#1}}%
$ \begingroup
$ \toks@{#1}%
@@ -170,7 +170,7 @@ $ \expandafter\endgroup
\expandafter\KVS@SecondOfTwo
\fi
}
-\def\kv@normalize#1{%
+\long\def\kv@normalize#1{%
\begingroup
\toks@{,#1,}%
\KVS@Comma
@@ -203,7 +203,7 @@ $ \expandafter\endgroup
\toks@\expandafter{\expandafter}\expandafter
\KVS@@Comma\the\toks@~\KVS@Nil
}%
- \def\KVS@@Comma#1~#2\KVS@Nil{%
+ \long\def\KVS@@Comma#1~#2\KVS@Nil{%
\toks@\expandafter{\the\toks@#1}%
\KVS@IfEmpty{#2}{%
}{%
@@ -211,10 +211,10 @@ $ \expandafter\endgroup
}%
}%
}
-\def\KVS@SpaceComma#1{%
+\long\def\KVS@SpaceComma#1{%
\expandafter\KVS@@SpaceComma\the\toks@#1,\KVS@Nil
}
-\def\KVS@@SpaceComma#1 ,#2\KVS@Nil{%
+\long\def\KVS@@SpaceComma#1 ,#2\KVS@Nil{%
\KVS@IfEmpty{#2}{%
\toks@{#1}%
}{%
@@ -225,7 +225,7 @@ $ \expandafter\endgroup
\def\KVS@CommaSpace{%
\expandafter\KVS@@CommaSpace\the\toks@, \KVS@Nil
}
-\def\KVS@@CommaSpace#1, #2\KVS@Nil{%
+\long\def\KVS@@CommaSpace#1, #2\KVS@Nil{%
\KVS@IfEmpty{#2}{%
\toks@{#1}%
}{%
@@ -236,7 +236,7 @@ $ \expandafter\endgroup
\def\KVS@CommaComma{%
\expandafter\KVS@@CommaComma\the\toks@,\KVS@Nil
}
-\def\KVS@@CommaComma#1,,#2\KVS@Nil{%
+\long\def\KVS@@CommaComma#1,,#2\KVS@Nil{%
\toks@{#1,#2}%
\KVS@IfEmpty{#2}{%
}{%
@@ -251,7 +251,7 @@ $ \expandafter\endgroup
\toks@\expandafter{\expandafter}\expandafter
\KVS@@Equals\the\toks@~\KVS@Nil
}%
- \def\KVS@@Equals#1~#2\KVS@Nil{%
+ \long\def\KVS@@Equals#1~#2\KVS@Nil{%
\edef\KVS@Temp{\the\toks@}%
\ifx\KVS@Temp\KVS@Empty
\expandafter\KVS@FirstOfTwo
@@ -269,10 +269,10 @@ $ \expandafter\endgroup
}%
}%
}
-\def\KVS@SpaceEquals#1{%
+\long\def\KVS@SpaceEquals#1{%
\expandafter\KVS@@SpaceEquals\the\toks@#1=\KVS@Nil
}
-\def\KVS@@SpaceEquals#1 =#2\KVS@Nil{%
+\long\def\KVS@@SpaceEquals#1 =#2\KVS@Nil{%
\KVS@IfEmpty{#2}{%
\toks@{#1}%
}{%
@@ -283,7 +283,7 @@ $ \expandafter\endgroup
\def\KVS@EqualsSpace{%
\expandafter\KVS@@EqualsSpace\the\toks@= \KVS@Nil
}
-\def\KVS@@EqualsSpace#1= #2\KVS@Nil{%
+\long\def\KVS@@EqualsSpace#1= #2\KVS@Nil{%
\KVS@IfEmpty{#2}{%
\toks@{#1}%
}{%
@@ -291,14 +291,14 @@ $ \expandafter\endgroup
\expandafter\KVS@@EqualsSpace\the\toks@\KVS@Nil
}%
}
-\def\kv@parse#1{%
+\long\def\kv@parse#1{%
\kv@normalize{#1}%
\expandafter\kv@parse@normalized\expandafter{\kv@list}%
}
-\def\kv@parse@normalized#1#2{%
+\long\def\kv@parse@normalized#1#2{%
\KVS@Parse#1,\KVS@Nil{#2}%
}
-\def\KVS@Parse#1,#2\KVS@Nil#3{%
+\long\def\KVS@Parse#1,#2\KVS@Nil#3{%
\KVS@IfEmpty{#1}{%
}{%
\KVS@Process#1=\KVS@Nil{#3}%
@@ -308,7 +308,7 @@ $ \expandafter\endgroup
\KVS@Parse#2\KVS@Nil{#3}%
}%
}
-\def\KVS@Process#1=#2\KVS@Nil#3{%
+\long\def\KVS@Process#1=#2\KVS@Nil#3{%
\def\kv@key{#1}%
\KVS@IfEmpty{#2}{%
\let\kv@value\relax
@@ -317,7 +317,7 @@ $ \expandafter\endgroup
\KVS@@Process{#1}#2\KVS@Nil{#3}%
}%
}
-\def\KVS@@Process#1#2=\KVS@Nil#3{%
+\long\def\KVS@@Process#1#2=\KVS@Nil#3{%
& \edef\kv@value{\etex@unexpanded{#2}}%
$ \begingroup
$ \toks@{#2}%
@@ -344,7 +344,7 @@ $ \let\kv@value\KVS@Global
\KVS@CommaParse#2\KVS@Nil{#3}%
}%
}
-\def\kv@processor@default#1#2#3{%
+\long\def\kv@processor@default#1#2#3{%
& \unless\ifcsname KV@#1@#2\endcsname
$ \begingroup\expandafter\expandafter\expandafter\endgroup
$ \expandafter\ifx\csname KV@#1@#2\endcsname\relax
@@ -392,7 +392,7 @@ $ \expandafter\ifx\csname KV@#1@#2@default\endcsname\relax
\@ehc
}%
}
-\def\kvsetkeys#1#2{%
+\long\def\kvsetkeys#1#2{%
\kv@parse{#2}{\kv@processor@default{#1}}%
}
\KVS@AtEnd
diff --git a/Master/texmf-dist/tex/generic/oberdiek/ltxcmds.sty b/Master/texmf-dist/tex/generic/oberdiek/ltxcmds.sty
index 95dc3435a35..930a922dfdc 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/ltxcmds.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/ltxcmds.sty
@@ -93,7 +93,7 @@
\fi
\expandafter\x\csname ver@ltxcmds.sty\endcsname
\ProvidesPackage{ltxcmds}%
- [2010/01/28 v1.2 LaTeX kernel commands for general use (HO)]
+ [2010/03/01 v1.3 LaTeX kernel commands for general use (HO)]
\begingroup
\catcode123 1 % {
\catcode125 2 % }
@@ -130,6 +130,10 @@
\TMP@EnsureCode{93}{12}% ]
\TMP@EnsureCode{94}{12}% ^ (superscript) (!)
\TMP@EnsureCode{124}{12}% |
+\chardef\ltx@zero=0 %
+\chardef\ltx@one=1 %
+\chardef\ltx@two=2 %
+\chardef\ltx@cclv=255 %
\long\def\ltx@gobble#1{}
\long\def\ltx@gobbletwo#1#2{}
\long\def\ltx@gobblethree#1#2#3{}
@@ -153,6 +157,28 @@
\lowercase{\endgroup
\def\ltx@backslashchar{0}%
}
+\def\ltx@newif#1{%
+ \begingroup
+ \escapechar=-1 %
+ \expandafter\endgroup
+ \expandafter\LTXcmds@newif\string#1\@nil
+}
+\begingroup
+ \escapechar=-1 %
+\expandafter\endgroup
+\expandafter\def\expandafter\LTXcmds@newif\string\if#1\@nil{%
+ \expandafter\edef\csname#1true\endcsname{%
+ \let
+ \expandafter\noexpand\csname if#1\endcsname
+ \noexpand\iftrue
+ }%
+ \expandafter\edef\csname#1false\endcsname{%
+ \let
+ \expandafter\noexpand\csname if#1\endcsname
+ \noexpand\iffalse
+ }%
+ \csname#1false\endcsname
+}
\def\ltx@LocalExpandAfter{%
\begingroup
\expandafter\expandafter\expandafter
@@ -302,6 +328,37 @@
\endgroup
\let#1\LTXcmds@gtemp
}
+\long\def\ltx@ifnextchar#1#2#3{%
+ \begingroup
+ \let\LTXcmds@CharToken= #1\relax
+ \toks\ltx@zero{#2}%
+ \toks\ltx@two{#3}%
+ \futurelet\LTXcmds@LetToken\LTXcmds@ifnextchar
+}
+\def\LTXcmds@ifnextchar{%
+ \ifx\LTXcmds@LetToken\LTXcmds@CharToken
+ \expandafter\endgroup\the\toks\expandafter\ltx@zero
+ \else
+ \ifx\LTXcmds@LetToken\LTXcmds@SpaceToken
+ \expandafter\expandafter\expandafter\LTXcmds@@ifnextchar
+ \else
+ \expandafter\endgroup\the\toks
+ \expandafter\expandafter\expandafter\ltx@two
+ \fi
+ \fi
+}
+\begingroup
+ \def\x#1{\endgroup
+ \def\LTXcmds@@ifnextchar#1{%
+ \futurelet\LTXcmds@LetToken\LTXcmds@ifnextchar
+ }%
+ }%
+\x{ }
+\begingroup
+ \def\x#1{\endgroup
+ \let\LTXcmds@SpaceToken= #1%
+ }%
+\x{ }
\LTXcmds@AtEnd
\endinput
%%
diff --git a/Master/texmf-dist/tex/generic/oberdiek/pdfcol.sty b/Master/texmf-dist/tex/generic/oberdiek/pdfcol.sty
index 4d4a4d7d4fc..80cf713ad9c 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/pdfcol.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/pdfcol.sty
@@ -126,8 +126,6 @@
\TMP@EnsureCode{47}{12}% /
\TMP@EnsureCode{61}{12}% =
\TMP@EnsureCode{96}{12}% `
-\newif\ifpdfcolAvailable
-\pdfcolAvailabletrue
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname RequirePackage\endcsname\relax
\def\PDFCOL@RequirePackage#1[#2]{\input #1.sty\relax}%
@@ -136,7 +134,10 @@
\RequirePackage{#1}[{#2}]%
}%
\fi
-\newif\ifPDFCOL@luacolor
+\PDFCOL@RequirePackage{ltxcmds}[2010/03/01]
+\ltx@newif\ifpdfcolAvailable
+\pdfcolAvailabletrue
+\ltx@newif\ifPDFCOL@luacolor
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname ver@luacolor.sty\endcsname\relax
\PDFCOL@luacolorfalse
diff --git a/Master/texmf-dist/tex/generic/oberdiek/pdfescape.sty b/Master/texmf-dist/tex/generic/oberdiek/pdfescape.sty
index ccb21fcd803..fbad931ec12 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/pdfescape.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/pdfescape.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2007 by
+%% Copyright (C) 2007, 2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
%%
%% This work may be distributed and/or modified under the
@@ -95,11 +95,23 @@
\fi
\expandafter\x\csname ver@pdfescape.sty\endcsname
\ProvidesPackage{pdfescape}%
- [2007/11/11 v1.8 Provides hex, PDF name and string conversions (HO)]
-\expandafter\edef\csname PE@AtEnd\endcsname{%
- \catcode64 \the\catcode64\relax
-}
+ [2010/03/01 v1.9 Provides hex, PDF name and string conversions (HO)]
+\begingroup
+ \catcode123 1 % {
+ \catcode125 2 % }
+ \def\x{\endgroup
+ \expandafter\edef\csname PE@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#3{%
\edef\PE@AtEnd{%
\PE@AtEnd
diff --git a/Master/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty b/Master/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty
index 5c52fd24b22..3f4c6b590ce 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2007 by
+%% Copyright (C) 2007, 2009, 2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
%%
%% This work may be distributed and/or modified under the
@@ -94,7 +94,7 @@
\fi
\expandafter\x\csname ver@pdftexcmds.sty\endcsname
\ProvidesPackage{pdftexcmds}%
- [2009/12/12 v0.7 Utility functions of pdfTeX for LuaTeX (HO)]
+ [2010/03/01 v0.8 Utility functions of pdfTeX for LuaTeX (HO)]
\begingroup
\catcode123 1 % {
\catcode125 2 % }
@@ -150,7 +150,7 @@
\input ltxcmds.sty\relax
\else
\RequirePackage{infwarerr}[2007/09/09]%
- \RequirePackage{ifluatex}[2009/04/10]%
+ \RequirePackage{ifluatex}[2010/03/01]%
\RequirePackage{ltxcmds}%
\fi
\ifluatex
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-ascii-print.def b/Master/texmf-dist/tex/generic/oberdiek/se-ascii-print.def
index b9e5d2ad7e5..1adcd3f6729 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-ascii-print.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-ascii-print.def
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2007-2009 by
+%% Copyright (C) 2007-2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
%%
%% This work may be distributed and/or modified under the
@@ -46,9 +46,9 @@
%% se-cp1257.def, stringenc-test1.tex, stringenc-test2.tex.
%%
\ProvidesFile{se-ascii-print.def}%
- [2009/12/15 v1.7 stringenc: Printable ASCII characters]%
+ [2010/03/01 v1.8 stringenc: Printable ASCII characters]%
\expandafter\gdef\csname\SE@PrefixTo ascii-print\endcsname#1#2#3#4{%
- \ifnum"#1#2=\z@ %
+ \ifnum"#1#2=\ltx@zero
\ifnum"#3#4<127 %
\ifnum"#3#4>31 %
\SE@ResultAdd{#3#4}%
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-ascii.def b/Master/texmf-dist/tex/generic/oberdiek/se-ascii.def
index fb34bb9d962..f9450b07a0f 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-ascii.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-ascii.def
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2007-2009 by
+%% Copyright (C) 2007-2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
%%
%% This work may be distributed and/or modified under the
@@ -45,7 +45,7 @@
%% se-cp865.def, se-cp866.def, se-cp1250.def, se-cp1251.def,
%% se-cp1257.def, stringenc-test1.tex, stringenc-test2.tex.
%%
-\ProvidesFile{se-ascii.def}[2009/12/15 v1.7 stringenc: US-ASCII]
+\ProvidesFile{se-ascii.def}[2010/03/01 v1.8 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-clean7bit.def b/Master/texmf-dist/tex/generic/oberdiek/se-clean7bit.def
index ab6d7c9c27f..9b4786c0c0d 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-clean7bit.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-clean7bit.def
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2007-2009 by
+%% Copyright (C) 2007-2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
%%
%% This work may be distributed and/or modified under the
@@ -45,7 +45,7 @@
%% se-cp865.def, se-cp866.def, se-cp1250.def, se-cp1251.def,
%% se-cp1257.def, stringenc-test1.tex, stringenc-test2.tex.
%%
-\ProvidesFile{se-clean7bit.def}[2009/12/15 v1.7 stringenc: Clean7Bit]
+\ProvidesFile{se-clean7bit.def}[2010/03/01 v1.8 stringenc: Clean7Bit]
\expandafter\gdef\csname\SE@PrefixTo clean7bit\endcsname#1#2#3#4{%
\ifnum"#1#2#3<8 %
\ifnum"#3#4<128 %
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp1250.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp1250.def
index 59da55c2b22..fe4a205b527 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-cp1250.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp1250.def
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2007-2009 by
+%% Copyright (C) 2007-2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
%%
%% This work may be distributed and/or modified under the
@@ -45,7 +45,7 @@
%% se-cp865.def, se-cp866.def, se-cp1250.def, se-cp1251.def,
%% se-cp1257.def, stringenc-test1.tex, stringenc-test2.tex.
%%
-\ProvidesFile{se-cp1250.def}[2009/12/15 v1.7 stringenc: cp1250]
+\ProvidesFile{se-cp1250.def}[2010/03/01 v1.8 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 68e3f503ecf..87bffa27074 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-cp1251.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp1251.def
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2007-2009 by
+%% Copyright (C) 2007-2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
%%
%% This work may be distributed and/or modified under the
@@ -45,7 +45,7 @@
%% se-cp865.def, se-cp866.def, se-cp1250.def, se-cp1251.def,
%% se-cp1257.def, stringenc-test1.tex, stringenc-test2.tex.
%%
-\ProvidesFile{se-cp1251.def}[2009/12/15 v1.7 stringenc: cp1251]
+\ProvidesFile{se-cp1251.def}[2010/03/01 v1.8 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 0e0ab5b26a8..65305160083 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-cp1252.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp1252.def
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2007-2009 by
+%% Copyright (C) 2007-2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
%%
%% This work may be distributed and/or modified under the
@@ -45,20 +45,20 @@
%% se-cp865.def, se-cp866.def, se-cp1250.def, se-cp1251.def,
%% se-cp1257.def, stringenc-test1.tex, stringenc-test2.tex.
%%
-\ProvidesFile{se-cp1252.def}[2009/12/15 v1.7 stringenc: cp1252]
+\ProvidesFile{se-cp1252.def}[2010/03/01 v1.8 stringenc: cp1252]
\expandafter\gdef\csname\SE@PrefixTo cp1252\endcsname#1#2#3#4{%
- \ifcase\ifnum"#1#2=\SE@zero
+ \ifcase\ifnum"#1#2=\ltx@zero
\ifnum"#3#4<"80 %
- \SE@one
+ \ltx@one
\else
\ifnum"#3#4>"9F %
- \SE@one
+ \ltx@one
\else
- \SE@zero
+ \ltx@zero
\fi
\fi
\else
- \SE@zero
+ \ltx@zero
\fi
\SE@MapConvertTo{cp1252}{#1#2#3#4}%
\else
@@ -78,12 +78,12 @@
\let\SE@next\relax
\else
\ifcase\ifnum"#1#2<"80 %
- \SE@one
+ \ltx@one
\else
\ifnum"#1#2>"9F %
- \SE@one
+ \ltx@one
\else
- \SE@zero
+ \ltx@zero
\fi
\fi
\SE@MapConvertFrom{cp1252}{#1#2}%
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp1257.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp1257.def
index 438e558c947..aacb0b94f9d 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-cp1257.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp1257.def
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2007-2009 by
+%% Copyright (C) 2007-2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
%%
%% This work may be distributed and/or modified under the
@@ -45,7 +45,7 @@
%% se-cp865.def, se-cp866.def, se-cp1250.def, se-cp1251.def,
%% se-cp1257.def, stringenc-test1.tex, stringenc-test2.tex.
%%
-\ProvidesFile{se-cp1257.def}[2009/12/15 v1.7 stringenc: cp1257]
+\ProvidesFile{se-cp1257.def}[2010/03/01 v1.8 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 401276b0df0..ff6dd9bcc7b 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-cp437.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp437.def
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2007-2009 by
+%% Copyright (C) 2007-2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
%%
%% This work may be distributed and/or modified under the
@@ -45,7 +45,7 @@
%% se-cp865.def, se-cp866.def, se-cp1250.def, se-cp1251.def,
%% se-cp1257.def, stringenc-test1.tex, stringenc-test2.tex.
%%
-\ProvidesFile{se-cp437.def}[2009/12/15 v1.7 stringenc: cp437]
+\ProvidesFile{se-cp437.def}[2010/03/01 v1.8 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 b5093cc891d..110c9f5bda6 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-cp850.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp850.def
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2007-2009 by
+%% Copyright (C) 2007-2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
%%
%% This work may be distributed and/or modified under the
@@ -45,7 +45,7 @@
%% se-cp865.def, se-cp866.def, se-cp1250.def, se-cp1251.def,
%% se-cp1257.def, stringenc-test1.tex, stringenc-test2.tex.
%%
-\ProvidesFile{se-cp850.def}[2009/12/15 v1.7 stringenc: cp850]
+\ProvidesFile{se-cp850.def}[2010/03/01 v1.8 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 c9dd23f1cab..8994eb433f9 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-cp852.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp852.def
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2007-2009 by
+%% Copyright (C) 2007-2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
%%
%% This work may be distributed and/or modified under the
@@ -45,7 +45,7 @@
%% se-cp865.def, se-cp866.def, se-cp1250.def, se-cp1251.def,
%% se-cp1257.def, stringenc-test1.tex, stringenc-test2.tex.
%%
-\ProvidesFile{se-cp852.def}[2009/12/15 v1.7 stringenc: cp852]
+\ProvidesFile{se-cp852.def}[2010/03/01 v1.8 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 28ab9a6a1c3..c69de760292 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-cp855.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp855.def
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2007-2009 by
+%% Copyright (C) 2007-2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
%%
%% This work may be distributed and/or modified under the
@@ -45,7 +45,7 @@
%% se-cp865.def, se-cp866.def, se-cp1250.def, se-cp1251.def,
%% se-cp1257.def, stringenc-test1.tex, stringenc-test2.tex.
%%
-\ProvidesFile{se-cp855.def}[2009/12/15 v1.7 stringenc: cp855]
+\ProvidesFile{se-cp855.def}[2010/03/01 v1.8 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 8ba311ddade..e02bd8cb7c5 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-cp858.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp858.def
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2007-2009 by
+%% Copyright (C) 2007-2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
%%
%% This work may be distributed and/or modified under the
@@ -45,7 +45,7 @@
%% se-cp865.def, se-cp866.def, se-cp1250.def, se-cp1251.def,
%% se-cp1257.def, stringenc-test1.tex, stringenc-test2.tex.
%%
-\ProvidesFile{se-cp858.def}[2009/12/15 v1.7 stringenc: cp858]
+\ProvidesFile{se-cp858.def}[2010/03/01 v1.8 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 e4e39e3ab99..53e5a5e001a 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-cp865.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp865.def
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2007-2009 by
+%% Copyright (C) 2007-2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
%%
%% This work may be distributed and/or modified under the
@@ -45,7 +45,7 @@
%% se-cp865.def, se-cp866.def, se-cp1250.def, se-cp1251.def,
%% se-cp1257.def, stringenc-test1.tex, stringenc-test2.tex.
%%
-\ProvidesFile{se-cp865.def}[2009/12/15 v1.7 stringenc: cp865]
+\ProvidesFile{se-cp865.def}[2010/03/01 v1.8 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 1e1884507fe..c099b1c5cad 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-cp866.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp866.def
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2007-2009 by
+%% Copyright (C) 2007-2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
%%
%% This work may be distributed and/or modified under the
@@ -45,7 +45,7 @@
%% se-cp865.def, se-cp866.def, se-cp1250.def, se-cp1251.def,
%% se-cp1257.def, stringenc-test1.tex, stringenc-test2.tex.
%%
-\ProvidesFile{se-cp866.def}[2009/12/15 v1.7 stringenc: cp866]
+\ProvidesFile{se-cp866.def}[2010/03/01 v1.8 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 1e220d6c1ae..1c2a48ee906 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-dec-mcs.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-dec-mcs.def
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2007-2009 by
+%% Copyright (C) 2007-2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
%%
%% This work may be distributed and/or modified under the
@@ -45,7 +45,7 @@
%% se-cp865.def, se-cp866.def, se-cp1250.def, se-cp1251.def,
%% se-cp1257.def, stringenc-test1.tex, stringenc-test2.tex.
%%
-\ProvidesFile{se-dec-mcs.def}[2009/12/15 v1.7 stringenc: DEC-MCS]
+\ProvidesFile{se-dec-mcs.def}[2010/03/01 v1.8 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 cba26ee46f0..cae70dc5713 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
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2007-2009 by
+%% Copyright (C) 2007-2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
%%
%% This work may be distributed and/or modified under the
@@ -45,20 +45,20 @@
%% se-cp865.def, se-cp866.def, se-cp1250.def, se-cp1251.def,
%% se-cp1257.def, stringenc-test1.tex, stringenc-test2.tex.
%%
-\ProvidesFile{se-iso-8859-1.def}[2009/12/15 v1.7 stringenc: ISO-8859-1]
+\ProvidesFile{se-iso-8859-1.def}[2010/03/01 v1.8 stringenc: ISO-8859-1]
\expandafter\gdef\csname\SE@PrefixTo iso-8859-1\endcsname#1#2#3#4{%
- \ifcase\ifnum"#1#2=\SE@zero
+ \ifcase\ifnum"#1#2=\ltx@zero
\ifnum"#3#4<"80 %
- \SE@one
+ \ltx@one
\else
\ifnum"#3#4>"9F %
- \SE@one
+ \ltx@one
\else
- \SE@zero
+ \ltx@zero
\fi
\fi
\else
- \SE@zero
+ \ltx@zero
\fi
\SE@InvalidCharacter
\else
@@ -78,12 +78,12 @@
\let\SE@next\relax
\else
\ifcase\ifnum"#1#2<"80 %
- \SE@one
+ \ltx@one
\else
\ifnum"#1#2>"9F %
- \SE@one
+ \ltx@one
\else
- \SE@zero
+ \ltx@zero
\fi
\fi
\SE@InvalidCharacter
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 12659b7b359..8803cbac043 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
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2007-2009 by
+%% Copyright (C) 2007-2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
%%
%% This work may be distributed and/or modified under the
@@ -45,7 +45,7 @@
%% se-cp865.def, se-cp866.def, se-cp1250.def, se-cp1251.def,
%% se-cp1257.def, stringenc-test1.tex, stringenc-test2.tex.
%%
-\ProvidesFile{se-iso-8859-10.def}[2009/12/15 v1.7 stringenc: ISO-8859-10]
+\ProvidesFile{se-iso-8859-10.def}[2010/03/01 v1.8 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 adc670b81ee..171b703a99f 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
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2007-2009 by
+%% Copyright (C) 2007-2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
%%
%% This work may be distributed and/or modified under the
@@ -45,7 +45,7 @@
%% se-cp865.def, se-cp866.def, se-cp1250.def, se-cp1251.def,
%% se-cp1257.def, stringenc-test1.tex, stringenc-test2.tex.
%%
-\ProvidesFile{se-iso-8859-11.def}[2009/12/15 v1.7 stringenc: ISO-8859-11]
+\ProvidesFile{se-iso-8859-11.def}[2010/03/01 v1.8 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 278c7cfc1e2..010c01fef08 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
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2007-2009 by
+%% Copyright (C) 2007-2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
%%
%% This work may be distributed and/or modified under the
@@ -45,7 +45,7 @@
%% se-cp865.def, se-cp866.def, se-cp1250.def, se-cp1251.def,
%% se-cp1257.def, stringenc-test1.tex, stringenc-test2.tex.
%%
-\ProvidesFile{se-iso-8859-13.def}[2009/12/15 v1.7 stringenc: ISO-8859-13]
+\ProvidesFile{se-iso-8859-13.def}[2010/03/01 v1.8 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 2cb7a41b2b7..04799752434 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
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2007-2009 by
+%% Copyright (C) 2007-2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
%%
%% This work may be distributed and/or modified under the
@@ -45,7 +45,7 @@
%% se-cp865.def, se-cp866.def, se-cp1250.def, se-cp1251.def,
%% se-cp1257.def, stringenc-test1.tex, stringenc-test2.tex.
%%
-\ProvidesFile{se-iso-8859-14.def}[2009/12/15 v1.7 stringenc: ISO-8859-14]
+\ProvidesFile{se-iso-8859-14.def}[2010/03/01 v1.8 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 41c5e561f99..8a3727aed65 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
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2007-2009 by
+%% Copyright (C) 2007-2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
%%
%% This work may be distributed and/or modified under the
@@ -45,7 +45,7 @@
%% se-cp865.def, se-cp866.def, se-cp1250.def, se-cp1251.def,
%% se-cp1257.def, stringenc-test1.tex, stringenc-test2.tex.
%%
-\ProvidesFile{se-iso-8859-15.def}[2009/12/15 v1.7 stringenc: ISO-8859-15]
+\ProvidesFile{se-iso-8859-15.def}[2010/03/01 v1.8 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 326d0df297c..bcc8301cf8d 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
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2007-2009 by
+%% Copyright (C) 2007-2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
%%
%% This work may be distributed and/or modified under the
@@ -45,7 +45,7 @@
%% se-cp865.def, se-cp866.def, se-cp1250.def, se-cp1251.def,
%% se-cp1257.def, stringenc-test1.tex, stringenc-test2.tex.
%%
-\ProvidesFile{se-iso-8859-16.def}[2009/12/15 v1.7 stringenc: ISO-8859-16]
+\ProvidesFile{se-iso-8859-16.def}[2010/03/01 v1.8 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 c364877e73b..a1d63024339 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
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2007-2009 by
+%% Copyright (C) 2007-2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
%%
%% This work may be distributed and/or modified under the
@@ -45,7 +45,7 @@
%% se-cp865.def, se-cp866.def, se-cp1250.def, se-cp1251.def,
%% se-cp1257.def, stringenc-test1.tex, stringenc-test2.tex.
%%
-\ProvidesFile{se-iso-8859-2.def}[2009/12/15 v1.7 stringenc: ISO-8859-2]
+\ProvidesFile{se-iso-8859-2.def}[2010/03/01 v1.8 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 7b3c02f93cd..c06a8963253 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
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2007-2009 by
+%% Copyright (C) 2007-2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
%%
%% This work may be distributed and/or modified under the
@@ -45,7 +45,7 @@
%% se-cp865.def, se-cp866.def, se-cp1250.def, se-cp1251.def,
%% se-cp1257.def, stringenc-test1.tex, stringenc-test2.tex.
%%
-\ProvidesFile{se-iso-8859-3.def}[2009/12/15 v1.7 stringenc: ISO-8859-3]
+\ProvidesFile{se-iso-8859-3.def}[2010/03/01 v1.8 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 5ba2b02a3e2..9316f6ef53e 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
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2007-2009 by
+%% Copyright (C) 2007-2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
%%
%% This work may be distributed and/or modified under the
@@ -45,7 +45,7 @@
%% se-cp865.def, se-cp866.def, se-cp1250.def, se-cp1251.def,
%% se-cp1257.def, stringenc-test1.tex, stringenc-test2.tex.
%%
-\ProvidesFile{se-iso-8859-4.def}[2009/12/15 v1.7 stringenc: ISO-8859-4]
+\ProvidesFile{se-iso-8859-4.def}[2010/03/01 v1.8 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 4ed9f2b24af..f511e0d9118 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
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2007-2009 by
+%% Copyright (C) 2007-2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
%%
%% This work may be distributed and/or modified under the
@@ -45,7 +45,7 @@
%% se-cp865.def, se-cp866.def, se-cp1250.def, se-cp1251.def,
%% se-cp1257.def, stringenc-test1.tex, stringenc-test2.tex.
%%
-\ProvidesFile{se-iso-8859-5.def}[2009/12/15 v1.7 stringenc: ISO-8859-5]
+\ProvidesFile{se-iso-8859-5.def}[2010/03/01 v1.8 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 30c0af0fa38..f0ab43be938 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
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2007-2009 by
+%% Copyright (C) 2007-2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
%%
%% This work may be distributed and/or modified under the
@@ -45,7 +45,7 @@
%% se-cp865.def, se-cp866.def, se-cp1250.def, se-cp1251.def,
%% se-cp1257.def, stringenc-test1.tex, stringenc-test2.tex.
%%
-\ProvidesFile{se-iso-8859-6.def}[2009/12/15 v1.7 stringenc: ISO-8859-6]
+\ProvidesFile{se-iso-8859-6.def}[2010/03/01 v1.8 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 221370d3285..11439f68cbb 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
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2007-2009 by
+%% Copyright (C) 2007-2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
%%
%% This work may be distributed and/or modified under the
@@ -45,7 +45,7 @@
%% se-cp865.def, se-cp866.def, se-cp1250.def, se-cp1251.def,
%% se-cp1257.def, stringenc-test1.tex, stringenc-test2.tex.
%%
-\ProvidesFile{se-iso-8859-7.def}[2009/12/15 v1.7 stringenc: ISO-8859-7]
+\ProvidesFile{se-iso-8859-7.def}[2010/03/01 v1.8 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 953b90370c9..322ec8b53b8 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
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2007-2009 by
+%% Copyright (C) 2007-2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
%%
%% This work may be distributed and/or modified under the
@@ -45,7 +45,7 @@
%% se-cp865.def, se-cp866.def, se-cp1250.def, se-cp1251.def,
%% se-cp1257.def, stringenc-test1.tex, stringenc-test2.tex.
%%
-\ProvidesFile{se-iso-8859-8.def}[2009/12/15 v1.7 stringenc: ISO-8859-8]
+\ProvidesFile{se-iso-8859-8.def}[2010/03/01 v1.8 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 76c467b99a3..8e935d9b10e 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
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2007-2009 by
+%% Copyright (C) 2007-2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
%%
%% This work may be distributed and/or modified under the
@@ -45,7 +45,7 @@
%% se-cp865.def, se-cp866.def, se-cp1250.def, se-cp1251.def,
%% se-cp1257.def, stringenc-test1.tex, stringenc-test2.tex.
%%
-\ProvidesFile{se-iso-8859-9.def}[2009/12/15 v1.7 stringenc: ISO-8859-9]
+\ProvidesFile{se-iso-8859-9.def}[2010/03/01 v1.8 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 cd0bdebb51a..85bcb8b429d 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-koi8-r.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-koi8-r.def
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2007-2009 by
+%% Copyright (C) 2007-2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
%%
%% This work may be distributed and/or modified under the
@@ -45,7 +45,7 @@
%% se-cp865.def, se-cp866.def, se-cp1250.def, se-cp1251.def,
%% se-cp1257.def, stringenc-test1.tex, stringenc-test2.tex.
%%
-\ProvidesFile{se-koi8-r.def}[2009/12/15 v1.7 stringenc: KOI8-R]
+\ProvidesFile{se-koi8-r.def}[2010/03/01 v1.8 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 fec1c6763bc..2dc52b73154 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-mac-centeuro.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-mac-centeuro.def
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2007-2009 by
+%% Copyright (C) 2007-2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
%%
%% This work may be distributed and/or modified under the
@@ -45,7 +45,7 @@
%% se-cp865.def, se-cp866.def, se-cp1250.def, se-cp1251.def,
%% se-cp1257.def, stringenc-test1.tex, stringenc-test2.tex.
%%
-\ProvidesFile{se-mac-centeuro.def}[2009/12/15 v1.7 stringenc: Mac OS Central European]
+\ProvidesFile{se-mac-centeuro.def}[2010/03/01 v1.8 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 5a06e0a5249..278c271f70a 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-mac-cyrillic.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-mac-cyrillic.def
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2007-2009 by
+%% Copyright (C) 2007-2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
%%
%% This work may be distributed and/or modified under the
@@ -45,7 +45,7 @@
%% se-cp865.def, se-cp866.def, se-cp1250.def, se-cp1251.def,
%% se-cp1257.def, stringenc-test1.tex, stringenc-test2.tex.
%%
-\ProvidesFile{se-mac-cyrillic.def}[2009/12/15 v1.7 stringenc: Mac OS Cyrillic]
+\ProvidesFile{se-mac-cyrillic.def}[2010/03/01 v1.8 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 ecc253e9fa2..e37c9cf63e0 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-mac-roman.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-mac-roman.def
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2007-2009 by
+%% Copyright (C) 2007-2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
%%
%% This work may be distributed and/or modified under the
@@ -45,7 +45,7 @@
%% se-cp865.def, se-cp866.def, se-cp1250.def, se-cp1251.def,
%% se-cp1257.def, stringenc-test1.tex, stringenc-test2.tex.
%%
-\ProvidesFile{se-mac-roman.def}[2009/12/15 v1.7 stringenc: Mac OS Roman]
+\ProvidesFile{se-mac-roman.def}[2010/03/01 v1.8 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 27485b5acda..909ca3b7558 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-nextstep.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-nextstep.def
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2007-2009 by
+%% Copyright (C) 2007-2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
%%
%% This work may be distributed and/or modified under the
@@ -45,7 +45,7 @@
%% se-cp865.def, se-cp866.def, se-cp1250.def, se-cp1251.def,
%% se-cp1257.def, stringenc-test1.tex, stringenc-test2.tex.
%%
-\ProvidesFile{se-nextstep.def}[2009/12/15 v1.7 stringenc: NextStep]
+\ProvidesFile{se-nextstep.def}[2010/03/01 v1.8 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 a122880a2fd..30d9f5ed954 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-pdfdoc.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-pdfdoc.def
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2007-2009 by
+%% Copyright (C) 2007-2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
%%
%% This work may be distributed and/or modified under the
@@ -45,24 +45,24 @@
%% se-cp865.def, se-cp866.def, se-cp1250.def, se-cp1251.def,
%% se-cp1257.def, stringenc-test1.tex, stringenc-test2.tex.
%%
-\ProvidesFile{se-pdfdoc.def}[2009/12/15 v1.7 stringenc: PDFDocEncoding]
+\ProvidesFile{se-pdfdoc.def}[2010/03/01 v1.8 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 %
- \SE@zero
+ \ltx@zero
\else
\ifnum"#1#2#3#4<127 %
\ifnum"#1#2#3#4>31 %
- \SE@zero
+ \ltx@zero
\else
- \SE@one
+ \ltx@one
\fi
\else
- \SE@one
+ \ltx@one
\fi
\fi
\else
- \SE@one
+ \ltx@one
\fi
\SE@ResultAdd{#3#4}%
\else
@@ -85,17 +85,17 @@
\ifnum"#1#2="AD %
2 %
\else
- \SE@zero
+ \ltx@zero
\fi
\else
\ifnum"#1#2<127 %
\ifnum"#1#2>31 %
- \SE@zero
+ \ltx@zero
\else
- \SE@one
+ \ltx@one
\fi
\else
- \SE@one
+ \ltx@one
\fi
\fi
\SE@ResultAdd{00#1#2}%
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-utf16le.def b/Master/texmf-dist/tex/generic/oberdiek/se-utf16le.def
index eca23e739e3..37f2d400492 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-utf16le.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-utf16le.def
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2007-2009 by
+%% Copyright (C) 2007-2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
%%
%% This work may be distributed and/or modified under the
@@ -45,7 +45,7 @@
%% se-cp865.def, se-cp866.def, se-cp1250.def, se-cp1251.def,
%% se-cp1257.def, stringenc-test1.tex, stringenc-test2.tex.
%%
-\ProvidesFile{se-utf16le.def}[2009/12/15 v1.7 stringenc: UTF-16LE]
+\ProvidesFile{se-utf16le.def}[2010/03/01 v1.8 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 f34e7c9dff5..f99fdcc1ba1 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-utf32be.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-utf32be.def
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2007-2009 by
+%% Copyright (C) 2007-2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
%%
%% This work may be distributed and/or modified under the
@@ -45,7 +45,7 @@
%% se-cp865.def, se-cp866.def, se-cp1250.def, se-cp1251.def,
%% se-cp1257.def, stringenc-test1.tex, stringenc-test2.tex.
%%
-\ProvidesFile{se-utf32be.def}[2009/12/15 v1.7 stringenc: UTF-32BE]
+\ProvidesFile{se-utf32be.def}[2010/03/01 v1.8 stringenc: UTF-32BE]
\expandafter\gdef\csname\SE@PrefixTo utf32be\endcsname#1#2#3#4{%
\SE@ResultAdd{0000#1#2#3#4}%
}
@@ -55,17 +55,17 @@
\edef\SE@a{\SE@Nibble@NumToBin{"#3}}%
\edef\SE@c{\SE@Nibble@NumToBin{"#6}}%
\edef\SE@w{%
- \expandafter\SE@GobbleTwo\SE@w
+ \expandafter\ltx@gobbletwo\SE@w
\expandafter\SE@CarTwo\SE@a\@nil
}%
\edef\SE@w{%
\SE@Nibbles@BinToHex\SE@w
}%
- \SE@Add\SE@w{\expandafter"\SE@w}\SE@one
+ \SE@Add\SE@w{\expandafter"\SE@w}\ltx@one
\edef\SE@a{%
- \expandafter\SE@GobbleTwo\SE@a
+ \expandafter\ltx@gobbletwo\SE@a
\SE@Nibble@NumToBin{"#4}%
- \expandafter\SE@GobbleTwo\SE@c
+ \expandafter\ltx@gobbletwo\SE@c
}%
\SE@ResultAdd{%
00%
@@ -98,19 +98,19 @@
\SE@next
}
\gdef\SE@utfxxxii@from#1#2#3#4#5#6#7#8{%
- \ifcase\ifnum"#1#2>\z@
- \SE@zero
+ \ifcase\ifnum"#1#2>\ltx@zero
+ \ltx@zero
\else
\ifnum"#3#4#5#6#7#8>"10FFFF %
- \SE@zero
+ \ltx@zero
\else
\ifnum"#3#4#5#6#7#8<"D800 %
- \SE@one
+ \ltx@one
\else
\ifnum"#3#4#5#6#7#8>"DFFF %
- \SE@one
+ \ltx@one
\else
- \SE@zero
+ \ltx@zero
\fi
\fi
\fi
@@ -131,7 +131,7 @@
\expandafter\SE@CarTwo\SE@low\@nil
}%
\edef\SE@low{%
- 11\expandafter\SE@GobbleTwo\SE@low
+ 11\expandafter\ltx@gobbletwo\SE@low
}%
\SE@ResultAdd{%
D\SE@Nibbles@BinToHex\SE@high
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-utf32le.def b/Master/texmf-dist/tex/generic/oberdiek/se-utf32le.def
index 2794a296381..6e8d1b7ab2c 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-utf32le.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-utf32le.def
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2007-2009 by
+%% Copyright (C) 2007-2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
%%
%% This work may be distributed and/or modified under the
@@ -45,7 +45,7 @@
%% se-cp865.def, se-cp866.def, se-cp1250.def, se-cp1251.def,
%% se-cp1257.def, stringenc-test1.tex, stringenc-test2.tex.
%%
-\ProvidesFile{se-utf32le.def}[2009/12/15 v1.7 stringenc: UTF-32LE]
+\ProvidesFile{se-utf32le.def}[2010/03/01 v1.8 stringenc: UTF-32LE]
\expandafter\gdef\csname\SE@PrefixTo utf32le\endcsname#1#2#3#4{%
\SE@ResultAdd{#3#4#1#20000}%
}
@@ -55,17 +55,17 @@
\edef\SE@a{\SE@Nibble@NumToBin{"#3}}%
\edef\SE@c{\SE@Nibble@NumToBin{"#6}}%
\edef\SE@w{%
- \expandafter\SE@GobbleTwo\SE@w
+ \expandafter\ltx@gobbletwo\SE@w
\expandafter\SE@CarTwo\SE@a\@nil
}%
\edef\SE@w{%
\SE@Nibbles@BinToHex\SE@w
}%
- \SE@Add\SE@w{\expandafter"\SE@w}\SE@one
+ \SE@Add\SE@w{\expandafter"\SE@w}\ltx@one
\edef\SE@a{%
- \expandafter\SE@GobbleTwo\SE@a
+ \expandafter\ltx@gobbletwo\SE@a
\SE@Nibble@NumToBin{"#4}%
- \expandafter\SE@GobbleTwo\SE@c
+ \expandafter\ltx@gobbletwo\SE@c
}%
\SE@utfxxxii@le@add{%
00%
@@ -107,19 +107,19 @@
\SE@next
}
\gdef\SE@utfxxxii@from#1#2#3#4#5#6#7#8{%
- \ifcase\ifnum"#1#2>\z@
- \SE@zero
+ \ifcase\ifnum"#1#2>\ltx@zero
+ \ltx@zero
\else
\ifnum"#3#4#5#6#7#8>"10FFFF %
- \SE@zero
+ \ltx@zero
\else
\ifnum"#3#4#5#6#7#8<"D800 %
- \SE@one
+ \ltx@one
\else
\ifnum"#3#4#5#6#7#8>"DFFF %
- \SE@one
+ \ltx@one
\else
- \SE@zero
+ \ltx@zero
\fi
\fi
\fi
@@ -140,7 +140,7 @@
\expandafter\SE@CarTwo\SE@low\@nil
}%
\edef\SE@low{%
- 11\expandafter\SE@GobbleTwo\SE@low
+ 11\expandafter\ltx@gobbletwo\SE@low
}%
\SE@ResultAdd{%
D\SE@Nibbles@BinToHex\SE@high
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-utf8.def b/Master/texmf-dist/tex/generic/oberdiek/se-utf8.def
index 80a327710ab..e925a341cf0 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/se-utf8.def
+++ b/Master/texmf-dist/tex/generic/oberdiek/se-utf8.def
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2007-2009 by
+%% Copyright (C) 2007-2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
%%
%% This work may be distributed and/or modified under the
@@ -45,7 +45,7 @@
%% se-cp865.def, se-cp866.def, se-cp1250.def, se-cp1251.def,
%% se-cp1257.def, stringenc-test1.tex, stringenc-test2.tex.
%%
-\ProvidesFile{se-utf8.def}[2009/12/15 v1.7 stringenc: UTF-8]
+\ProvidesFile{se-utf8.def}[2010/03/01 v1.8 stringenc: UTF-8]
\expandafter\gdef\csname\SE@PrefixTo utf8\endcsname#1#2#3#4{%
\ifnum"#1#2#3#4<"80 %
\SE@ResultAdd{#3#4}%
@@ -59,7 +59,7 @@
\SE@Nibble@NumToBin{"#2}%
\expandafter\SE@CarTwo\SE@temp\@nil
10%
- \expandafter\SE@GobbleTwo\SE@temp
+ \expandafter\ltx@gobbletwo\SE@temp
}%
\SE@ResultAdd{%
\SE@Nibbles@BinToHex\SE@temp
@@ -74,7 +74,7 @@
\SE@Nibble@NumToBin{"#2}%
\expandafter\SE@CarTwo\SE@temp\@nil
10%
- \expandafter\SE@GobbleTwo\SE@temp
+ \expandafter\ltx@gobbletwo\SE@temp
}%
\SE@ResultAdd{%
E#1%
@@ -92,13 +92,13 @@
\edef\SE@c{\SE@Nibble@NumToBin{"#6}}%
\edef\SE@d{\SE@Nibble@NumToBin{"#7}}%
\edef\SE@w{%
- \expandafter\SE@GobbleTwo\SE@w
+ \expandafter\ltx@gobbletwo\SE@w
\expandafter\SE@CarTwo\SE@a\@nil
}%
\edef\SE@w{%
\SE@Nibbles@BinToHex\SE@w
}%
- \SE@Add\SE@w{\expandafter"\SE@w}\SE@one
+ \SE@Add\SE@w{\expandafter"\SE@w}\ltx@one
\ifnum\SE@w>15 %
\def\SE@char{1}%
\SE@Add\SE@w\SE@w{-16}%
@@ -110,15 +110,15 @@
0\SE@char
\expandafter\SE@CarTwo\SE@w\@nil
10%
- \expandafter\SE@GobbleTwo\SE@w
- \expandafter\SE@GobbleTwo\SE@a
+ \expandafter\ltx@gobbletwo\SE@w
+ \expandafter\ltx@gobbletwo\SE@a
\expandafter\SE@CarTwo\SE@b\@nil
10%
- \expandafter\SE@GobbleTwo\SE@b
- \expandafter\SE@GobbleTwo\SE@c
+ \expandafter\ltx@gobbletwo\SE@b
+ \expandafter\ltx@gobbletwo\SE@c
\expandafter\SE@CarTwo\SE@d\@nil
10%
- \expandafter\SE@GobbleTwo\SE@d
+ \expandafter\ltx@gobbletwo\SE@d
}%
\SE@ResultAdd{%
F%
@@ -127,17 +127,17 @@
}%
}
\expandafter\gdef\csname\SE@PrefixFrom utf8\endcsname#1{%
- \let\SE@temp\SE@Empty
+ \let\SE@temp\ltx@empty
\let\SE@next\SE@utfviii@filter
\expandafter\SE@utfviii@filter#1\relax\relax
\ifcase\ifSE@TestMode
\ifSE@invalid
- \SE@one
+ \ltx@one
\else
- \SE@zero
+ \ltx@zero
\fi
\else
- \SE@zero
+ \ltx@zero
\fi
\expandafter\SE@utfviii@from\SE@temp\relax\relax\relax\relax
\relax\relax\relax\relax
@@ -148,15 +148,15 @@
\let\SE@next\relax
\else
\ifcase\ifnum"#1#2>"F4 %
- \SE@zero
+ \ltx@zero
\else
\ifnum"#1#2="C0 %
- \SE@zero
+ \ltx@zero
\else
\ifnum"#1#2="C1 %
- \SE@zero
+ \ltx@zero
\else
- \SE@one
+ \ltx@one
\fi
\fi
\fi
@@ -206,7 +206,7 @@
\edef\SE@temp{%
0\ifodd"#1 1\else 0\fi
\SE@Nibble@NumToBin{"#2}%
- \expandafter\SE@GobbleTwo\SE@temp
+ \expandafter\ltx@gobbletwo\SE@temp
}%
\SE@ResultAdd{%
0%
@@ -231,19 +231,19 @@
% zzzz yyyy yyxx xxxx
\ifcase\ifnum"#2="D %
\ifnum"#3#4>"9F %
- \SE@zero
+ \ltx@zero
\else
- \SE@one
+ \ltx@one
\fi
\else
- \ifnum"#2=\SE@zero
+ \ifnum"#2=\ltx@zero
\ifnum"#3<"A %
- \SE@zero
+ \ltx@zero
\else
- \SE@one
+ \ltx@one
\fi
\else
- \SE@one
+ \ltx@one
\fi
\fi
\SE@InvalidCharacter
@@ -256,9 +256,9 @@
\edef\SE@a{\SE@Nibble@NumToBin{"#3}}%
\edef\SE@b{\SE@Nibble@NumToBin{"#5}}%
\edef\SE@temp{%
- \expandafter\SE@GobbleTwo\SE@a
+ \expandafter\ltx@gobbletwo\SE@a
\SE@Nibble@NumToBin{"#4}%
- \expandafter\SE@GobbleTwo\SE@b
+ \expandafter\ltx@gobbletwo\SE@b
}%
\SE@ResultAdd{%
#2%
@@ -287,7 +287,7 @@
\edef\SE@w{%
00%
\SE@Nibble@NumToBin{"#2}%
- \expandafter\SE@GobbleTwo\SE@w
+ \expandafter\ltx@gobbletwo\SE@w
}%
\edef\SE@w{\SE@Nibbles@BinToHex\SE@w}%
\SE@Add\SE@w{\expandafter"\SE@w}{-1}%
@@ -297,7 +297,7 @@
\let\SE@next\SE@SkipRemaining
\fi
\else
- \ifnum\SE@w<\SE@zero
+ \ifnum\SE@w<\ltx@zero
\SE@InvalidCharacter
\ifSE@TestMode
\let\SE@next\SE@SkipRemaining
@@ -309,11 +309,11 @@
10%
\SE@Nibble@NumToBin\SE@w
\SE@Nibble@NumToBin{"#4}%
- \expandafter\SE@GobbleTwo\SE@a
+ \expandafter\ltx@gobbletwo\SE@a
1101%
11%
\SE@Nibble@NumToBin{"#6}%
- \expandafter\SE@GobbleTwo\SE@b
+ \expandafter\ltx@gobbletwo\SE@b
}%
\SE@ResultAdd{%
D%
@@ -343,12 +343,12 @@
}
\gdef\SE@utfviii@CheckCont#1{%
\ifnum"#1<8 %
- \SE@zero
+ \ltx@zero
\else
\ifnum"#1<12 %
- \SE@one
+ \ltx@one
\else
- \SE@zero
+ \ltx@zero
\fi
\fi
}
diff --git a/Master/texmf-dist/tex/generic/oberdiek/stringenc.sty b/Master/texmf-dist/tex/generic/oberdiek/stringenc.sty
index 843388233e2..b7a3d0d1e8d 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/stringenc.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/stringenc.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2007-2009 by
+%% Copyright (C) 2007-2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
%%
%% This work may be distributed and/or modified under the
@@ -105,11 +105,23 @@
\fi
\expandafter\x\csname ver@stringenc.sty\endcsname
\ProvidesPackage{stringenc}%
- [2009/12/15 v1.7 Converts strings between encodings (HO)]
-\expandafter\edef\csname SE@AtEnd\endcsname{%
- \catcode64 \the\catcode64\relax
-}
+ [2010/03/01 v1.8 Converts strings between encodings (HO)]
+\begingroup
+ \catcode123 1 % {
+ \catcode125 2 % }
+ \def\x{\endgroup
+ \expandafter\edef\csname SE@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#3{%
\edef\SE@AtEnd{%
\SE@AtEnd
@@ -143,34 +155,52 @@
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname RequirePackage\endcsname\relax
\input infwarerr.sty\relax
+ \input ltxcmds.sty\relax
\input pdfescape.sty\relax
\else
\RequirePackage{infwarerr}[2007/09/09]%
- \RequirePackage{pdfescape}[2007/09/09]%
+ \RequirePackage{ltxcmds}[2010/03/01]%
+ \RequirePackage{pdfescape}[2010/03/01]%
\fi
-\def\SE@Empty{}
-\long\def\SE@FirstOfOne#1{#1}
-\long\def\SE@FirstOfTwo#1#2{#1}
-\long\def\SE@SecondOfTwo#1#2{#2}
-\long\def\SE@GobbleTwo#1#2{}
-\long\def\SE@GobbleFour#1#2#3#4{}
\long\def\SE@GobbleEight#1#2#3#4#5#6#7#8{}
\long\def\SE@CarTwo#1#2#3\@nil{#1#2}
\def\SE@PrefixFrom{SE<}
\def\SE@PrefixSurrogateFrom{SE<<}
\def\SE@PrefixTo{SE>}
\def\SE@PrefixSurrogateTo{SE>>}
-\chardef\SE@zero=0 %
-\chardef\SE@one=1 %
\def\SE@ResultAdd#1{%
\edef\SE@result{\SE@result#1}%
}
-\newif\ifSE@invalid
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname newif\endcsname\relax
+ \def\SE@newif#1{%
+ \begingroup
+ \escapechar=-1 %
+ \expandafter\endgroup
+ \expandafter\SE@@newif\string#1\@nil
+ }%
+ \def\SE@@newif#1#2#3\@nil{%
+ \expandafter\edef\csname#3true\endcsname{%
+ \let
+ \expandafter\noexpand\csname if#3\endcsname
+ \expandafter\noexpand\csname iftrue\endcsname
+ }%
+ \expandafter\edef\csname#3false\endcsname{%
+ \let
+ \expandafter\noexpand\csname if#3\endcsname
+ \expandafter\noexpand\csname iffalse\endcsname
+ }%
+ \csname#3false\endcsname
+ }%
+\else
+ \expandafter\let\expandafter\SE@newif\csname newif\endcsname
+\fi
+\SE@newif\ifSE@invalid
\def\SE@InvalidCharacter{%
\SE@invalidtrue
}
\def\SE@ConvertTo#1#2#3{%
- \let\SE@result\SE@Empty
+ \let\SE@result\ltx@empty
\EdefSanitize\SE@encoding{#3}%
\expandafter\ifx\csname\SE@PrefixTo\SE@encoding\endcsname\relax
\StringEncodingLoad\SE@encoding
@@ -228,12 +258,12 @@
\let\SE@next\relax
\else
\ifcase\ifnum"#1#2#3#4<"DC00 %
- \SE@zero
+ \ltx@zero
\else
\ifnum"#1#2#3#4>"DFFF %
- \SE@zero
+ \ltx@zero
\else
- \SE@one
+ \ltx@one
\fi
\fi
\SE@InvalidCharacter
@@ -258,7 +288,7 @@
\SE@next
}
\def\SE@ConvertFrom#1#2#3{%
- \let\SE@result\SE@Empty
+ \let\SE@result\ltx@empty
\EdefSanitize\SE@encoding{#3}%
\expandafter\ifx\csname\SE@PrefixFrom\SE@encoding\endcsname\relax
\StringEncodingLoad\SE@encoding
@@ -360,7 +390,7 @@
\input#1\relax
}%
\fi
-\newif\ifSE@numexpr
+\SE@newif\ifSE@numexpr
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname numexpr\endcsname\relax
\else
@@ -375,7 +405,7 @@
\fi
\def\SE@Nibble@NumToHex#1{%
$ \ifcase\numexpr#1\relax
-& \expandafter\ifcase\expandafter\SE@FirstOfOne\expandafter{\number#1} %
+& \expandafter\ifcase\expandafter\ltx@firstofone\expandafter{\number#1} %
0\or 1\or 2\or 3\or 4\or 5\or 6\or 7\or
8\or 9\or A\or B\or C\or D\or E\or F%
\fi
@@ -383,7 +413,7 @@ $ \ifcase\numexpr#1\relax
\def\SE@Nibble@NumToBin#1{%
$ \ifcase\numexpr#1\relax
& \expandafter
-& \ifcase\expandafter\SE@FirstOfOne\expandafter{\number#1} %
+& \ifcase\expandafter\ltx@firstofone\expandafter{\number#1} %
0000\or
0001\or
0010\or
@@ -403,39 +433,39 @@ $ \ifcase\numexpr#1\relax
\fi
}
\def\SE@Nibbles@BinToHex#1{%
- \expandafter\SE@@Nibbles@BinToHex#1\SE@Empty\SE@Empty
- \SE@Empty\SE@Empty
+ \expandafter\SE@@Nibbles@BinToHex#1\ltx@empty\ltx@empty
+ \ltx@empty\ltx@empty
}
\def\SE@@Nibbles@BinToHex#1#2#3#4{%
- \ifx#1\SE@Empty
+ \ifx#1\ltx@empty
\else
$ \SE@Nibble@NumToHex{%
$ \numexpr#4+2*(#3+2*(#2+2*#1))\relax
$ }%
-& \ifnum#1>\SE@zero
-& \ifnum#2>\SE@zero
-& \ifnum#3>\SE@zero
-& \ifnum#4>\SE@zero
+& \ifnum#1>\ltx@zero
+& \ifnum#2>\ltx@zero
+& \ifnum#3>\ltx@zero
+& \ifnum#4>\ltx@zero
& F%
& \else
& E%
& \fi
& \else
-& \ifnum#4>\SE@zero
+& \ifnum#4>\ltx@zero
& D%
& \else
& C%
& \fi
& \fi
& \else
-& \ifnum#3>\SE@zero
-& \ifnum#4>\SE@zero
+& \ifnum#3>\ltx@zero
+& \ifnum#4>\ltx@zero
& B%
& \else
& A%
& \fi
& \else
-& \ifnum#4>\SE@zero
+& \ifnum#4>\ltx@zero
& 9%
& \else
& 8%
@@ -443,29 +473,29 @@ $ }%
& \fi
& \fi
& \else
-& \ifnum#2>\SE@zero
-& \ifnum#3>\SE@zero
-& \ifnum#4>\SE@zero
+& \ifnum#2>\ltx@zero
+& \ifnum#3>\ltx@zero
+& \ifnum#4>\ltx@zero
& 7%
& \else
& 6%
& \fi
& \else
-& \ifnum#4>\SE@zero
+& \ifnum#4>\ltx@zero
& 5%
& \else
& 4%
& \fi
& \fi
& \else
-& \ifnum#3>\SE@zero
-& \ifnum#4>\SE@zero
+& \ifnum#3>\ltx@zero
+& \ifnum#4>\ltx@zero
& 3%
& \else
& 2%
& \fi
& \else
-& \ifnum#4>\SE@zero
+& \ifnum#4>\ltx@zero
& 1%
& \else
& 0%
@@ -479,10 +509,10 @@ $ }%
\def\SE@Add#1#2#3{%
$ \edef#1{\the\numexpr(#2)+(#3)\relax}%
& \begingroup
-& \count\SE@zero=#2\relax
-& \advance\count\SE@zero by#3\relax
+& \count\ltx@zero=#2\relax
+& \advance\count\ltx@zero by#3\relax
& \edef\x{\endgroup
-& \def\noexpand#1{\the\count\SE@zero}%
+& \def\noexpand#1{\the\count\ltx@zero}%
& }%
& \x
}
@@ -588,9 +618,9 @@ $ \fi
}
\def\StringEncodingSuccessFailure{%
\ifSE@invalid
- \expandafter\SE@SecondOfTwo
+ \expandafter\ltx@secondoftwo
\else
- \expandafter\SE@FirstOfTwo
+ \expandafter\ltx@firstoftwo
\fi
}
\def\StringEncodingConvertTest#1#2#3#4{%
@@ -599,7 +629,7 @@ $ \fi
\SE@TestModefalse
\StringEncodingSuccessFailure
}
-\newif\ifSE@TestMode
+\SE@newif\ifSE@TestMode
\EdefSanitize\SE@utfxvi{utf16}
\EdefSanitize\SE@utfxvibe{utf16be}
\EdefSanitize\SE@utfxvile{utf16le}
@@ -612,11 +642,11 @@ $ \fi
\def\SE@@CheckByteOrderTwo#1#2#3#4#5\@nil{%
\ifnum"#1#2#3#4="FEFF %
\let\SE@from\SE@utfxvibe
- \edef\SE@result{\expandafter\SE@GobbleFour\SE@result}%
+ \edef\SE@result{\expandafter\ltx@gobblefour\SE@result}%
\else
\ifnum"#3#4#1#2="FEFF %
\let\SE@from\SE@utfxvile
- \edef\SE@result{\expandafter\SE@GobbleFour\SE@result}%
+ \edef\SE@result{\expandafter\ltx@gobblefour\SE@result}%
\else
\let\SE@from\SE@utfxvibe
\fi
@@ -627,12 +657,12 @@ $ \fi
}
\def\SE@@CheckByteOrderFour#1#2#3#4#5#6#7#8#9\@nil{%
\let\SE@from\SE@utfxxxiibe
- \ifnum"#1#2#3#4=\SE@zero
+ \ifnum"#1#2#3#4=\ltx@zero
\ifnum"#5#6#7#8="FEFF %
\edef\SE@result{\expandafter\SE@GobbleEight\SE@result}%
\fi
\else
- \ifnum"#7#8#5#6=\SE@zero
+ \ifnum"#7#8#5#6=\ltx@zero
\ifnum"#3#4#1#2="FEFF %
\let\SE@from\SE@utfxxxiile
\edef\SE@result{\expandafter\SE@GobbleEight\SE@result}%
@@ -642,7 +672,7 @@ $ \fi
}
\def\SE@RemoveByteOrderTwo{%
\expandafter\SE@@RemoveByteOrderTwo\SE@result
- \SE@Empty\SE@Empty\SE@Empty\SE@Empty\@nil
+ \ltx@empty\ltx@empty\ltx@empty\ltx@empty\@nil
}
\def\SE@@RemoveByteOrderTwo#1#2#3#4#5\@nil#6{%
\ifnum"0#1#2#3#4="#6 %
@@ -653,8 +683,8 @@ $ \fi
\def\SE@a{"#1 }%
\def\SE@b{"#2 }%
\expandafter\SE@@RemoveByteOrderFour\SE@result
- \SE@Empty\SE@Empty\SE@Empty\SE@Empty
- \SE@Empty\SE@Empty\SE@Empty\SE@Empty
+ \ltx@empty\ltx@empty\ltx@empty\ltx@empty
+ \ltx@empty\ltx@empty\ltx@empty\ltx@empty
\@nil
}
\def\SE@@RemoveByteOrderFour#1#2#3#4#5#6#7#8#9\@nil{%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/dtx-attach.sty b/Master/texmf-dist/tex/latex/oberdiek/dtx-attach.sty
index 54e1471ff0d..eaccfb6bbf3 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/dtx-attach.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/dtx-attach.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2006-2009 by
+%% Copyright (C) 2006-2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
%%
%% This work may be distributed and/or modified under the
@@ -25,17 +25,22 @@
%%
%% This Current Maintainer of this work is Heiko Oberdiek.
%%
+%% The Base Interpreter refers to any `TeX-Format',
+%% because some files are installed in TDS:tex/generic//.
+%%
%% This work consists of the main source file embedfile.dtx
%% and the derived files
%% embedfile.sty, embedfile.pdf, embedfile.ins, embedfile.drv,
-%% dtx-attach.sty, embedfile-example-plain.tex,
+%% \immediate \write 18 {mkdir -p texmf/tex/latex/oberdiek}\edef {texmf/tex/latex/oberdiek}, dtx-attach.sty,
+%% embedfile-example-plain.tex,
%% embedfile-example-collection.tex, embedfile-test1.tex,
-%% embedfile-test2.tex, embedfile-test3.tex.
+%% embedfile-test2.tex, embedfile-test3.tex,
+%% embedfile-test4.tex.
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{dtx-attach}
- [2009/09/25 v2.4 Embed \string\jobname.dtx (HO)]%
-\RequirePackage{embedfile}[2009/09/25]
+ [2010/03/01 v2.5 Embed \string\jobname.dtx (HO)]%
+\RequirePackage{embedfile}[2010/03/01]
\embedfile[%
stringmethod=escape,%
mimetype=plain/text,%