diff options
| author | Karl Berry <karl@freefriends.org> | 2012-05-02 21:50:45 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2012-05-02 21:50:45 +0000 |
| commit | aa1776c78dfdb456e2228fbceaa886e64e36174c (patch) | |
| tree | 7967af7f0f2079a632809a813221918af16ba8cc /Master/texmf-dist/tex | |
| parent | a86d14742b305868a1c2b1f33f1263a6b7d0e03d (diff) | |
oberdiek (1may12)
git-svn-id: svn://tug.org/texlive/trunk@26177 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
186 files changed, 5703 insertions, 1206 deletions
diff --git a/Master/texmf-dist/tex/generic/oberdiek/alphalph.sty b/Master/texmf-dist/tex/generic/oberdiek/alphalph.sty index 00542784192..a5d42f10189 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/alphalph.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/alphalph.sty @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: alphalph -%% Version: 2010/04/18 v2.3 +%% Version: 2011/05/13 v2.4 %% -%% Copyright (C) 1999, 2006-2008, 2010 by +%% Copyright (C) 1999, 2006-2008, 2010, 2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -102,7 +102,7 @@ \fi \expandafter\x\csname ver@alphalph.sty\endcsname \ProvidesPackage{alphalph}% - [2010/04/18 v2.3 Converting numbers to letters (HO)]% + [2011/05/13 v2.4 Convert numbers to letters (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % diff --git a/Master/texmf-dist/tex/generic/oberdiek/atbegshi.sty b/Master/texmf-dist/tex/generic/oberdiek/atbegshi.sty index 120d3b1f319..35436d226c0 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/atbegshi.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/atbegshi.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: atbegshi -%% Version: 2011/01/30 v1.15 +%% Version: 2011/10/05 v1.16 %% %% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -103,7 +103,7 @@ \fi \expandafter\x\csname ver@atbegshi.sty\endcsname \ProvidesPackage{atbegshi}% - [2011/01/30 v1.15 At begin shipout hook (HO)]% + [2011/10/05 v1.16 At begin shipout hook (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -237,36 +237,32 @@ X \endgroup \else \AtBegShi@First \let\protect\AtBegShi@OrgProtect + \AtBegShi@GetBoxSize\AtBeginShipoutBox + \ltx@ifundefined{AtNextShipout}{% + }{% + \AtNextShipout{\AtBegShi@GetBoxSize\@cclv}% + }% \AtBeginShipoutOriginalShipout\box\AtBeginShipoutBox \fi \fi } +\def\AtBegShi@GetBoxSize#1{% + \xdef\AtBeginShipoutBoxWidth{\the\wd#1}% + \xdef\AtBeginShipoutBoxHeight{\the\ht#1}% + \xdef\AtBeginShipoutBoxDepth{\the\dp#1}% +} +\def\AtBeginShipoutBoxWidth{0pt} +\def\AtBeginShipoutBoxHeight{0pt} +\def\AtBeginShipoutBoxDepth{0pt} \catcode`\X=11 % \catcode`\E=11 % \def\AtBegShi@First{% - \begingroup - \def\@empty{}% - \ifx\AtBegShi@HookFirst\@empty - \else - \setbox\ltx@zero=\vbox{% - \begingroup - \AtBegShi@HookFirst - \endgroup - }% - \wd\ltx@zero=0pt % - \ht\ltx@zero=0pt % - \dp\ltx@zero=0pt % - \global\setbox\AtBeginShipoutBox=\vbox{% - \baselineskip 0pt\relax - \lineskip 0pt\relax - \lineskiplimit 0pt\relax - \copy\ltx@zero - \copy\AtBeginShipoutBox - }% - \fi - \global\let\AtBegShi@First\@empty - \global\let\AtBeginShipoutFirst\AtBegShi@FirstDisabled - \endgroup + \ifx\AtBegShi@HookFirst\ltx@empty + \else + \AtBeginShipoutAddToBox{\AtBegShi@HookFirst}% + \fi + \global\let\AtBegShi@First\ltx@empty + \global\let\AtBeginShipoutFirst\AtBegShi@FirstDisabled } \gdef\AtBegShi@Hook{} \gdef\AtBegShi@HookNext{} @@ -340,11 +336,138 @@ X \endgroup \else \AtBeginDocument{\AtBeginShipoutInit}% \fi +\def\AtBeginShipoutAddToBox#1{% + \ifhbox\AtBeginShipoutBox + \edef\AtBegShi@restore{% + \hfuzz=\the\hfuzz\relax + \hbadness=\the\hbadness\relax + }% + \hfuzz=1073741823sp\relax + \hbadness=2147483647\relax + \setbox\AtBeginShipoutBox=\hbox to \wd\AtBeginShipoutBox{% + \setbox\ltx@zero=\hbox{% + \begingroup + \AtBegShi@restore + #1% + \endgroup + }% + \wd\ltx@zero=0pt\relax + \ht\ltx@zero=0pt\relax + \dp\ltx@zero=0pt\relax + \raise\ht\AtBeginShipoutBox\copy\ltx@zero + \unhcopy\AtBeginShipoutBox + }% + \AtBegShi@restore + \else + \ifvbox\AtBeginShipoutBox + \edef\AtBegShi@restore{% + \vfuzz=\the\vfuzz\relax + \vbadness=\the\vbadness\relax + \dimen\ltx@zero=\the\dimen\ltx@zero\relax + }% + \edef\AtBegShi@restorebox{% + \ht\AtBeginShipoutBox=\the\ht\AtBeginShipoutBox\relax + \dp\AtBeginShipoutBox=\the\dp\AtBeginShipoutBox\relax + }% + \vfuzz=1073741823sp\relax + \vbadness=2147483647\relax + \dimen\ltx@zero=\ht\AtBeginShipoutBox + \advance\dimen\ltx@zero by \dp\AtBeginShipoutBox + \setbox\AtBeginShipoutBox=\vbox to \dimen\ltx@zero{% + \setbox\ltx@zero=\hbox{% + \begingroup + \AtBegShi@restore + #1% + \endgroup + }% + \wd\ltx@zero=0pt\relax + \ht\ltx@zero=0pt\relax + \dp\ltx@zero=0pt\relax + \baselineskip=0pt\relax + \lineskip=0pt\relax + \lineskiplimit=0pt\relax + \copy\ltx@zero + \unvbox\AtBeginShipoutBox + \kern0pt% + }% + \AtBegShi@restore + \AtBegShi@restorebox + \fi + \fi +} +\def\AtBeginShipoutAddToBoxForeground#1{% + \ifhbox\AtBeginShipoutBox + \edef\AtBegShi@restore{% + \hfuzz=\the\hfuzz\relax + \hbadness=\the\hbadness\relax + }% + \hfuzz=1073741823sp\relax + \hbadness=2147483647\relax + \setbox\AtBeginShipoutBox=\hbox to \wd\AtBeginShipoutBox{% + \unhcopy\AtBeginShipoutBox + \kern-\wd\AtBeginShipoutBox + \setbox\ltx@zero=\hbox{% + \begingroup + \AtBegShi@restore + #1% + \endgroup + }% + \wd\ltx@zero=0pt\relax + \ht\ltx@zero=0pt\relax + \dp\ltx@zero=0pt\relax + \raise\ht\AtBeginShipoutBox\copy\ltx@zero + \kern\wd\AtBeginShipoutBox + }% + \AtBegShi@restore + \else + \ifvbox\AtBeginShipoutBox + \edef\AtBegShi@restore{% + \vfuzz=\the\vfuzz\relax + \vbadness=\the\vbadness\relax + \dimen\ltx@zero=\the\dimen\ltx@zero\relax + }% + \edef\AtBegShi@restorebox{% + \ht\AtBeginShipoutBox=\the\ht\AtBeginShipoutBox\relax + \dp\AtBeginShipoutBox=\the\dp\AtBeginShipoutBox\relax + }% + \vfuzz=1073741823sp\relax + \vbadness=2147483647\relax + \dimen\ltx@zero=\ht\AtBeginShipoutBox + \advance\dimen\ltx@zero by \dp\AtBeginShipoutBox + \setbox\AtBeginShipoutBox=\vbox to \dimen\ltx@zero{% + \setbox\ltx@zero=\hbox{% + \begingroup + \AtBegShi@restore + #1% + \endgroup + }% + \wd\ltx@zero=0pt\relax + \ht\ltx@zero=0pt\relax + \dp\ltx@zero=0pt\relax + \baselineskip=0pt\relax + \lineskip=0pt\relax + \lineskiplimit=0pt\relax + \unvbox\AtBeginShipoutBox + \kern-\dimen\ltx@zero + \copy\ltx@zero + \kern\dimen\ltx@zero + }% + \AtBegShi@restore + \AtBegShi@restorebox + \fi + \fi +} \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname RequirePackage\endcsname\relax - \input ifpdf.sty\relax + \def\TMP@RequirePackage#1[#2]{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname ver@#1.sty\endcsname\relax + \input #1.sty\relax + \fi + }% + \TMP@RequirePackage{ifpdf}[2011/01/30]% \else - \RequirePackage{ifpdf}\relax + \RequirePackage{ifpdf}[2011/01/30]% \fi \ifpdf \def\AtBegShi@horigin{\pdfhorigin}% @@ -395,38 +518,27 @@ X \endgroup }% \fi \def\AtBeginShipoutUpperLeft#1{% - \global\setbox\AtBeginShipoutBox=\hbox{% - \rlap{% - \kern-\AtBegShi@horigin\relax - \vbox to 0pt{% - \kern-\AtBegShi@vorigin\relax - \kern-\ht\AtBeginShipoutBox - \AtBegShi@BeginPicture - #1% - \AtBegShi@EndPicture - \vss - }% + \AtBeginShipoutAddToBox{% + \kern-\AtBegShi@horigin\relax + \vbox to 0pt{% + \kern-\AtBegShi@vorigin\relax + \AtBegShi@BeginPicture + #1% + \AtBegShi@EndPicture + \vss }% - \box\AtBeginShipoutBox }% } \def\AtBeginShipoutUpperLeftForeground#1{% - \global\setbox\AtBeginShipoutBox=\hbox to \wd\AtBeginShipoutBox{% - \rlap{% - \copy\AtBeginShipoutBox + \AtBeginShipoutAddToBoxForeground{% + \kern-\AtBegShi@horigin\relax + \vbox to 0pt{% + \kern-\AtBegShi@vorigin\relax + \AtBegShi@BeginPicture + #1% + \AtBegShi@EndPicture + \vss }% - \rlap{% - \kern-\AtBegShi@horigin\relax - \vbox to 0pt{% - \kern-\AtBegShi@vorigin\relax - \kern-\ht\AtBeginShipoutBox - \AtBegShi@BeginPicture - #1% - \AtBegShi@EndPicture - \vss - }% - }% - \hss }% } \def\AtBegShi@AbortIfUndefined#1{% @@ -508,6 +620,7 @@ X \endgroup \setbox\AtBeginShipoutBox=\vbox{% \CROP@shiplist }% + \AtBegShi@GetBoxSize\AtBeginShipoutBox \expandafter\CROP@shipout \expandafter\box \expandafter\AtBeginShipoutBox @@ -624,16 +737,81 @@ X \endgroup }% \fi }% + \def\AtBegShi@Memoir@PatchAB{% + \ifvoid\AtBeginShipoutBox + \else + \setbox\AtBeginShipoutBox=\vbox{% + \trimmarks + \ifvbox\AtBeginShipoutBox + \unvbox\AtBeginShipoutBox + \else + \box\AtBeginShipoutBox + \fi + }% + \AtBegShi@GetBoxSize\AtBeginShipoutBox + \expandafter\mem@oldshipout + \expandafter\box + \expandafter\AtBeginShipoutBox + \fi + }% + \def\AtBegShi@Memoir@shipiiC{% 2008/08/07 v1.6180339a + \ifvoid\@cclv + \mem@oldshipout\box\@cclv + \else + \ifshowtrims + \mem@oldshipout\vbox{\trimmarks\unvbox\@cclv}% + \else + \mem@oldshipout\box\@cclv + \fi + \fi + }% + \def\AtBegShi@Memoir@shipiiD{% 2011/03/06 v3.6j + \ifvoid\@cclv + \mem@oldshipout\box\@cclv + \else + \ifshowtrims + \mem@oldshipout\vbox{% + \trimmarks + \nointerlineskip + \box\@cclv + }% + \else + \mem@oldshipout\box\@cclv + \fi + \fi + }% + \def\AtBegShi@Memoir@PatchCD{% + \ifvoid\AtBeginShipoutBox + \else + \ifshowtrims + \setbox\AtBeginShipoutBox=\vbox{% + \trimmarks + \nointerlineskip + \box\AtBeginShipoutBox + }% + \fi + \AtBegShi@GetBoxSize\AtBeginShipoutBox + \expandafter\mem@oldshipout + \expandafter\box + \expandafter\AtBeginShipoutBox + \fi + }% \ifx\AtBegShi@Memoir@shipi\mem@shipi - \ifcase\ifx\AtBegShi@Memoir@shipiiA\mem@shipii - \ltx@zero - \else - \ifx\AtBegShi@Memoir@shipiiB\mem@shipii - \ltx@zero - \else - \ltx@one - \fi - \fi + \let\AtBegShi@found\ltx@one + \ifx\AtBegShi@Memoir@shipiiA\mem@shipii + \let\AtBegShi@found\ltx@zero + \global\let\AtBegShi@Memoir@PatchX\AtBegShi@Memoir@PatchAB + \else\ifx\AtBegShi@Memoir@shipiiB\mem@shipii + \let\AtBegShi@found\ltx@zero + \global\let\AtBegShi@Memoir@PatchX\AtBegShi@Memoir@PatchAB + \else\ifx\AtBegShi@Memoir@shipiiC\mem@shipii + \let\AtBegShi@found\ltx@zero + \global\let\AtBegShi@Memoir@PatchX\AtBegShi@Memoir@PatchCD + \else\ifx\AtBegShi@Memoir@shipiiD\mem@shipii + \let\AtBegShi@found\ltx@zero + \global\let\AtBegShi@Memoir@PatchX\AtBegShi@Memoir@PatchCD + \fi\fi\fi\fi + \ifcase\AtBegShi@found \let\AtBegShi@found\relax \ifx\shipout\AtBegShi@Memoir@shipout \def\AtBegShi@found{\shipout}% @@ -663,22 +841,7 @@ X \endgroup \fi \mem@shipii }% - \def\mem@shipii{% - \ifvoid\AtBeginShipoutBox - \else - \setbox\AtBeginShipoutBox=\vbox{% - \trimmarks - \ifvbox\AtBeginShipoutBox - \unvbox\AtBeginShipoutBox - \else - \box\AtBeginShipoutBox - \fi - }% - \expandafter\mem@oldshipout - \expandafter\box - \expandafter\AtBeginShipoutBox - \fi - }% + \let\mem@shipii\AtBegShi@Memoir@PatchX \@PackageInfoNoLine{atbegshi}{Class `memoir' patched}% \begingroup \fi diff --git a/Master/texmf-dist/tex/generic/oberdiek/bigintcalc.sty b/Master/texmf-dist/tex/generic/oberdiek/bigintcalc.sty index 24a92cae1d8..57de6053acb 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/bigintcalc.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/bigintcalc.sty @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: bigintcalc -%% Version: 2011/01/30 v1.2 +%% Version: 2012/04/08 v1.3 %% -%% Copyright (C) 2007, 2011 by +%% Copyright (C) 2007, 2011, 2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -103,7 +103,7 @@ \fi \expandafter\x\csname ver@bigintcalc.sty\endcsname \ProvidesPackage{bigintcalc}% - [2011/01/30 v1.2 Expandable big integer calculations (HO)]% + [2012/04/08 v1.3 Expandable calculations on big integers (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -184,6 +184,7 @@ }% \TMP@RequirePackage{pdftexcmds}[2007/11/11]% \else + \RequirePackage{pdftexcmds}[2007/11/11]% \fi \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname pdf@escapehex\endcsname\relax diff --git a/Master/texmf-dist/tex/generic/oberdiek/bitset.sty b/Master/texmf-dist/tex/generic/oberdiek/bitset.sty index 41b24c74ef3..e8049537f39 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/bitset.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/bitset.sty @@ -102,7 +102,7 @@ \fi \expandafter\x\csname ver@bitset.sty\endcsname \ProvidesPackage{bitset}% - [2011/01/30 v1.1 Data type bit set (HO)]% + [2011/01/30 v1.1 Handle bit-vector datatype (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % diff --git a/Master/texmf-dist/tex/generic/oberdiek/catchfile.sty b/Master/texmf-dist/tex/generic/oberdiek/catchfile.sty index 80733c9c8d1..0b064a57fea 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/catchfile.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/catchfile.sty @@ -103,7 +103,7 @@ \fi \expandafter\x\csname ver@catchfile.sty\endcsname \ProvidesPackage{catchfile}% - [2011/03/01 v1.6 Catches the contents of a file (HO)]% + [2011/03/01 v1.6 Catch the contents of a file (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % diff --git a/Master/texmf-dist/tex/generic/oberdiek/embedfile.sty b/Master/texmf-dist/tex/generic/oberdiek/embedfile.sty index c2fbda00310..491b5e8f309 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/embedfile.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/embedfile.sty @@ -105,7 +105,7 @@ \fi \expandafter\x\csname ver@embedfile.sty\endcsname \ProvidesPackage{embedfile}% - [2011/04/13 v2.6 embed files into PDF (HO)]% + [2011/04/13 v2.6 Embed files into PDF (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % diff --git a/Master/texmf-dist/tex/generic/oberdiek/eolgrab.sty b/Master/texmf-dist/tex/generic/oberdiek/eolgrab.sty index a24d3c2a0f2..9863de3c31c 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/eolgrab.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/eolgrab.sty @@ -104,7 +104,7 @@ \fi \expandafter\x\csname ver@eolgrab.sty\endcsname \ProvidesPackage{eolgrab}% - [2011/01/12 v1.0 Grab line end delimited argument (HO)]% + [2011/01/12 v1.0 Catch arguments delimited by end of line (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % diff --git a/Master/texmf-dist/tex/generic/oberdiek/etexcmds.sty b/Master/texmf-dist/tex/generic/oberdiek/etexcmds.sty index 8ae0beddf8b..669cb30e60c 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/etexcmds.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/etexcmds.sty @@ -103,7 +103,7 @@ \fi \expandafter\x\csname ver@etexcmds.sty\endcsname \ProvidesPackage{etexcmds}% - [2011/02/16 v1.5 Prefix for e-TeX command names (HO)]% + [2011/02/16 v1.5 Avoid name clashes with e-TeX commands (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % diff --git a/Master/texmf-dist/tex/generic/oberdiek/fibnum.sty b/Master/texmf-dist/tex/generic/oberdiek/fibnum.sty new file mode 100644 index 00000000000..8ec6b88fa15 --- /dev/null +++ b/Master/texmf-dist/tex/generic/oberdiek/fibnum.sty @@ -0,0 +1,313 @@ +%% +%% This is file `fibnum.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% fibnum.dtx (with options: `package') +%% +%% This is a generated file. +%% +%% Project: fibnum +%% Version: 2012/04/08 v1.0 +%% +%% Copyright (C) 2012 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 fibnum.dtx +%% and the derived files +%% fibnum.sty, fibnum.pdf, fibnum.ins, fibnum.drv, fibnum.bib, +%% fibnum-test1.tex, fibnum-test-calc.tex. +%% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } + \expandafter\let\expandafter\x\csname ver@fibnum.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 + \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{fibnum}{The package is already loaded}% + \aftergroup\endinput + \fi + \fi +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \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@fibnum.sty\endcsname +\ProvidesPackage{fibnum}% + [2012/04/08 v1.0 Fibonacci numbers (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ + \def\x{\endgroup + \expandafter\edef\csname FibNum@AtEnd\endcsname{% + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax + }% + }% +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } +\def\TMP@EnsureCode#1#2{% + \edef\FibNum@AtEnd{% + \FibNum@AtEnd + \catcode#1=\the\catcode#1\relax + }% + \catcode#1=#2\relax +} +\TMP@EnsureCode{33}{12}% ! +\TMP@EnsureCode{40}{12}% ( +\TMP@EnsureCode{41}{12}% ) +\TMP@EnsureCode{45}{12}% - +\TMP@EnsureCode{46}{12}% . +\TMP@EnsureCode{47}{12}% / +\TMP@EnsureCode{58}{12}% : +\TMP@EnsureCode{60}{12}% < +\TMP@EnsureCode{62}{12}% > +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] +\edef\FibNum@AtEnd{\FibNum@AtEnd\noexpand\endinput} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname RequirePackage\endcsname\relax + \def\TMP@RequirePackage#1[#2]{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname ver@#1.sty\endcsname\relax + \input #1.sty\relax + \fi + }% + \TMP@RequirePackage{ltxcmds}[2011/04/18]% + \TMP@RequirePackage{intcalc}[2007/09/27]% + \TMP@RequirePackage{bigintcalc}[2007/11/11]% +\else + \RequirePackage{ltxcmds}[2011/04/18]% + \RequirePackage{intcalc}[2007/09/27]% + \RequirePackage{bigintcalc}[2007/11/11]% +\fi +\def\FibNum@temp#1{% + \expandafter\def\csname FibNum@#1\endcsname +} +\catcode46=9 % dots are ignored +\FibNum@temp{0}{0} +\FibNum@temp{1}{1} +\FibNum@temp{2}{1} +\FibNum@temp{3}{2} +\FibNum@temp{4}{3} +\FibNum@temp{5}{5} +\FibNum@temp{6}{8} +\FibNum@temp{7}{13} +\FibNum@temp{8}{21} +\FibNum@temp{9}{34} +\FibNum@temp{10}{55} +\FibNum@temp{11}{89} +\FibNum@temp{12}{144} +\FibNum@temp{13}{233} +\FibNum@temp{14}{377} +\FibNum@temp{15}{610} +\FibNum@temp{16}{987} +\FibNum@temp{17}{1.597} +\FibNum@temp{18}{2.584} +\FibNum@temp{19}{4.181} +\FibNum@temp{20}{6.765} +\FibNum@temp{21}{10.946} +\FibNum@temp{22}{17.711} +\FibNum@temp{23}{28.657} +\FibNum@temp{24}{46.368} +\FibNum@temp{25}{75.025} +\FibNum@temp{26}{121.393} +\FibNum@temp{27}{196.418} +\FibNum@temp{28}{317.811} +\FibNum@temp{29}{514.229} +\FibNum@temp{30}{832.040} +\FibNum@temp{31}{1.346.269} +\FibNum@temp{32}{2.178.309} +\FibNum@temp{33}{3.524.578} +\FibNum@temp{34}{5.702.887} +\FibNum@temp{35}{9.227.465} +\FibNum@temp{36}{14.930.352} +\FibNum@temp{37}{24.157.817} +\FibNum@temp{38}{39.088.169} +\FibNum@temp{39}{63.245.986} +\FibNum@temp{40}{102.334.155} +\FibNum@temp{41}{165.580.141} +\FibNum@temp{42}{267.914.296} +\FibNum@temp{43}{433.494.437} +\FibNum@temp{44}{701.408.733} +\FibNum@temp{45}{1.134.903.170} +\FibNum@temp{46}{1.836.311.903} +\def\FibNum@max{46} +\def\fibnumPreCalc#1{% + \expandafter\expandafter\expandafter + \FibNum@PreCalc\intcalcNum{#1}/% +} +\def\FibNum@PreCalc#1/{% + \ifnum#1<\ltx@zero + \expandafter\FibNum@PreCalc\ltx@gobble#1/% + \else + \ifnum#1>\FibNum@max + \begingroup + \ltx@LocDimenA=#1sp\relax + \countdef\FibNum@i=255\relax + \FibNum@i=\FibNum@max\relax + \edef\FibNum@temp{% + \csname FibNum@\the\FibNum@i\endcsname/% + }% + \advance\FibNum@i by -1\relax + \edef\FibNum@temp{% + \FibNum@temp + \csname FibNum@\the\FibNum@i\endcsname + }% + \advance\FibNum@i\ltx@two + \iftrue + \expandafter\FibNum@PreCalcAux\FibNum@temp + \fi + \endgroup + \fi + \fi +} +\def\FibNum@PreCalcAux#1/#2\fi{% + \fi + \edef\FibNum@temp{\BigIntCalcAdd#1!#2!}% + \global\expandafter + \let\csname FibNum@\the\FibNum@i\endcsname\FibNum@temp + \ifnum\FibNum@i=\ltx@LocDimenA + \xdef\FibNum@max{\the\FibNum@i}% + \else + \advance\FibNum@i\ltx@one + \expandafter\FibNum@PreCalcAux\FibNum@temp/#1% + \fi +} +\def\fibnum#1{% + \romannumeral + \expandafter\expandafter\expandafter\FibNum@Do\intcalcNum{#1}/% +} +\def\FibNum@Do#1/{% + \ifnum#1<\ltx@zero + \FibNum@ReturnAfterElseFiFi{% + \ifodd#1 % + \expandafter\expandafter\expandafter\ltx@zero + \else + \expandafter\expandafter\expandafter\ltx@zero + \expandafter\expandafter\expandafter-% + \fi + \romannumeral + \expandafter\FibNum@Do\ltx@gobble#1/% + }% + \else + \ifnum\FibNum@max<#1 % + \ltx@ReturnAfterElseFi{% + \expandafter + \FibNum@ExpCalc\number\expandafter\IntCalcInc\FibNum@max!% + \expandafter\expandafter\expandafter/% + \csname FibNum@\FibNum@max + \expandafter\expandafter\expandafter\endcsname + \expandafter\expandafter\expandafter/% + \csname FibNum@\expandafter\IntCalcDec\FibNum@max!% + \endcsname/% + #1% + }% + \else + \expandafter\expandafter\expandafter\ltx@zero + \csname FibNum@#1\expandafter\expandafter\expandafter\endcsname + \fi + \fi +} +\def\FibNum@ReturnAfterElseFiFi#1\else#2\fi\fi{\fi#1} +\def\FibNum@ExpCalc#1/#2/#3/#4\fi{% + \fi + \ifnum#1=#4 % + \ltx@ReturnAfterElseFi{% + \expandafter\expandafter\expandafter\ltx@zero + \BigIntCalcAdd#2!#3!% + }% + \else + \expandafter\FibNum@ExpCalc + \number\IntCalcInc#1!% + \expandafter\expandafter\expandafter/% + \BigIntCalcAdd#2!#3!/% + #2/#4% + \fi +} +\FibNum@AtEnd% +\endinput +%% +%% End of file `fibnum.sty'. diff --git a/Master/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty b/Master/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty index 96665d7caac..f30d2b0243d 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty @@ -39,9 +39,9 @@ %% This is a generated file. %% %% Project: hobsub -%% Version: 2011/04/23 v1.4 +%% Version: 2012/04/25 v1.12 %% -%% Copyright (C) 2011 by +%% Copyright (C) 2011, 2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -132,7 +132,7 @@ \fi \expandafter\x\csname ver@hobsub-generic.sty\endcsname \ProvidesPackage{hobsub-generic}% - [2011/04/23 v1.4 Bundle oberdiek, subset generic (HO)]% + [2012/04/25 v1.12 Bundle oberdiek, subset generic (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -256,11 +256,11 @@ \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname ProvidesPackage\endcsname\relax \immediate\write-1{% - Package: hobsub 2011/04/23 v1.4 Subsetting bundle oberdiek (HO)% + Package: hobsub 2012/04/25 v1.12 Construct package bundles (HO)% }% \else \ProvidesPackage{hobsub}% - [2011/04/23 v1.4 Subsetting bundle oberdiek (HO)]% + [2012/04/25 v1.12 Construct package bundles (HO)]% \fi \endinput <hobsub> @@ -332,7 +332,7 @@ \fi \expandafter\x\csname ver@infwarerr.sty\endcsname \ProvidesPackage{infwarerr}% - [2010/04/08 v1.3 Providing info/warning/message (HO)]% + [2010/04/08 v1.3 Providing info/warning/error messages (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -616,7 +616,7 @@ \fi \expandafter\x\csname ver@ltxcmds.sty\endcsname \ProvidesPackage{ltxcmds}% - [2011/04/18 v1.20 LaTeX kernel commands for general use (HO)]% + [2011/11/09 v1.22 LaTeX kernel commands for general use (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -728,16 +728,30 @@ \long\def\ltx@secondoffour#1#2#3#4{#2} \long\def\ltx@thirdoffour#1#2#3#4{#3}% \long\def\ltx@fourthoffour#1#2#3#4{#4}% -\long\def\ltx@car#1#2\@nil{#1} -\long\def\ltx@cdr#1#2\@nil{#2} \long\def\ltx@carzero#1\@nil{}% -\long\def\ltx@cdrzero#1\@nil{#1}% +\long\def\LTXcmds@cdrzero#1\@nil{#1} +\def\ltx@cdrzero{% +\romannumeral\LTXcmds@cdrzero\ltx@zero +} +\long\def\ltx@car#1#2\@nil{#1} +\long\def\ltx@cdr#1{% +\romannumeral\LTXcmds@cdrzero\ltx@zero +} \long\def\ltx@cartwo#1#2#3\@nil{#1#2} -\long\def\ltx@cdrtwo#1#2#3\@nil{#3} +\long\def\ltx@carsecond#1#2#3\@nil{#2} +\long\def\ltx@cdrtwo#1#2{% +\romannumeral\LTXcmds@cdrzero\ltx@zero +} \long\def\ltx@carthree#1#2#3#4\@nil{#1#2#3} -\long\def\ltx@cdrthree#1#2#3#4\@nil{#4} +\long\def\ltx@carthird#1#2#3#4\@nil{#3} +\long\def\ltx@cdrthree#1#2#3{% +\romannumeral\LTXcmds@cdrzero\ltx@zero +} \long\def\ltx@carfour#1#2#3#4#5\@nil{#1#2#3#4} -\long\def\ltx@cdrfour#1#2#3#4#5\@nil{#5} +\long\def\ltx@carfourth#1#2#3#4#5\@nil{#4} +\long\def\ltx@cdrfour#1#2#3#4{% +\romannumeral\LTXcmds@cdrzero\ltx@zero +} \def\ltx@CarNum#1{% \romannumeral \csname LTXcmds@CarNumFinish% @@ -757,12 +771,22 @@ \ltx@zero #1% } +\def\ltx@CarNumth#1{% +\romannumeral +\expandafter\expandafter\expandafter +\LTXcmds@CarNumth +\ltx@GobbleNum{#1}{}% +} +\long\def\LTXcmds@CarNumth#1#2\@nil{% +\ltx@zero +#1% +} \def\ltx@CdrNum#1{% -\romannumeral0% -\expandafter\expandafter\expandafter\LTXcmds@CdrNum +\romannumeral% +\expandafter\expandafter\expandafter\ltx@cdrzero +\expandafter\expandafter\expandafter\ltx@zero \ltx@GobbleNum{#1}% } -\long\def\LTXcmds@CdrNum#1\@nil{ #1}% \long\def\ltx@ReturnAfterFi#1\fi{\fi#1} \long\def\ltx@ReturnAfterElseFi#1\else#2\fi{\fi#1} \def\ltx@empty{} @@ -988,6 +1012,36 @@ \endgroup \let#1\LTXcmds@gtemp } +\long\def\ltx@GlobalPrependToMacro#1#2{% +\ifx\ltx@undefined#1% +\let#1\ltx@empty +\else +\ifx\relax#1% +\let#1\ltx@empty +\fi +\fi +\begingroup +\ltx@LocToksA{#2}% +\ltx@LocToksB\expandafter{#1}% +\xdef#1{\the\ltx@LocToksA\the\ltx@LocToksB}% +\endgroup +} +\long\def\ltx@LocalPrependToMacro#1#2{% +\global\let\LTXcmds@gtemp#1% +\ifx\ltx@undefined\LTXcmds@gtemp +\global\let\LTXcmds@gtemp\ltx@empty +\else +\ifx\relax\LTXcmds@gtemp +\global\letLTXcmds@gtemp\ltx@empty +\fi +\fi +\begingroup +\ltx@LocToksA{#2}% +\ltx@LocToksB\expandafter{\LTXcmds@gtemp}% +\xdef\LTXcmds@gtemp{\the\ltx@LocToksA\the\ltx@LocToksB}% +\endgroup +\let#1\LTXcmds@gtemp +} \long\def\ltx@ifnextchar#1#2#3{% \begingroup \let\LTXcmds@CharToken= #1\relax @@ -1497,7 +1551,7 @@ $ \next \fi \expandafter\x\csname ver@ifvtex.sty\endcsname \ProvidesPackage{ifvtex}% - [2010/03/01 v1.5 Switches for detecting VTeX and its modes (HO)]% + [2010/03/01 v1.5 Detect VTeX and its facilities (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -1722,7 +1776,7 @@ $ \next \fi \expandafter\x\csname ver@intcalc.sty\endcsname \ProvidesPackage{intcalc}% - [2007/09/27 v1.1 Expandable integer calculations (HO)]% + [2007/09/27 v1.1 Expandable calculations with integers (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -3646,7 +3700,7 @@ $ \next \fi \expandafter\x\csname ver@etexcmds.sty\endcsname \ProvidesPackage{etexcmds}% - [2011/02/16 v1.5 Prefix for e-TeX command names (HO)]% + [2011/02/16 v1.5 Avoid name clashes with e-TeX commands (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -3895,7 +3949,7 @@ $ \next \fi \expandafter\x\csname ver@kvsetkeys.sty\endcsname \ProvidesPackage{kvsetkeys}% - [2011/04/07 v1.13 Key value parser (HO)]% + [2012/04/25 v1.16 Key value parser (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -3931,7 +3985,9 @@ $ \next \TMP@EnsureCode{36}{3}% $ \TMP@EnsureCode{38}{4}% & \TMP@EnsureCode{39}{12}% ' +\TMP@EnsureCode{43}{12}% + \TMP@EnsureCode{44}{12}% , +\TMP@EnsureCode{45}{12}% - \TMP@EnsureCode{46}{12}% . \TMP@EnsureCode{47}{12}% / \TMP@EnsureCode{91}{12}% [ @@ -3992,11 +4048,11 @@ $ \expandafter\endgroup \begingroup \toks@{,#1,}% \KVS@Comma -\KVS@SpaceComma{ }% +\KVS@SpaceComma \KVS@CommaSpace \KVS@CommaComma \KVS@Equals -\KVS@SpaceEquals{ }% +\KVS@SpaceEquals \KVS@EqualsSpace \xdef\KVS@Global{\the\toks@}% \endgroup @@ -4006,7 +4062,7 @@ $ \expandafter\endgroup \begingroup \toks@{,#1,}% \KVS@Comma -\KVS@SpaceComma{ }% +\KVS@SpaceComma \KVS@CommaSpace \KVS@CommaComma \xdef\KVS@Global{\the\toks@}% @@ -4029,15 +4085,17 @@ $ \expandafter\endgroup }% }% } -\long\def\KVS@SpaceComma#1{% +\def\KVS@SpaceComma#1{% +\def\KVS@SpaceComma{% \expandafter\KVS@@SpaceComma\the\toks@#1,\KVS@Nil +}% } +\KVS@SpaceComma{ } \long\def\KVS@@SpaceComma#1 ,#2\KVS@Nil{% \KVS@IfEmpty{#2}{% \toks@{#1}% }{% -\toks@{#1,#2}% -\expandafter\KVS@@SpaceComma\the\toks@\KVS@Nil +\KVS@@SpaceComma#1,#2\KVS@Nil }% } \def\KVS@CommaSpace{% @@ -4047,18 +4105,17 @@ $ \expandafter\endgroup \KVS@IfEmpty{#2}{% \toks@{#1}% }{% -\toks@{#1,#2}% -\expandafter\KVS@@CommaSpace\the\toks@\KVS@Nil +\KVS@@CommaSpace#1,#2\KVS@Nil }% } \def\KVS@CommaComma{% \expandafter\KVS@@CommaComma\the\toks@,\KVS@Nil } \long\def\KVS@@CommaComma#1,,#2\KVS@Nil{% -\toks@{#1,#2}% \KVS@IfEmpty{#2}{% +\toks@{#1,}% (!) }{% -\expandafter\KVS@@CommaComma\the\toks@\KVS@Nil +\KVS@@CommaComma#1,#2\KVS@Nil }% } \begingroup @@ -4087,15 +4144,17 @@ $ \expandafter\endgroup }% }% } -\long\def\KVS@SpaceEquals#1{% +\def\KVS@SpaceEquals#1{% +\def\KVS@SpaceEquals{% \expandafter\KVS@@SpaceEquals\the\toks@#1=\KVS@Nil +}% } +\KVS@SpaceEquals{ } \long\def\KVS@@SpaceEquals#1 =#2\KVS@Nil{% \KVS@IfEmpty{#2}{% \toks@{#1}% }{% -\toks@{#1=#2}% -\expandafter\KVS@@SpaceEquals\the\toks@\KVS@Nil +\KVS@@SpaceEquals#1=#2\KVS@Nil }% } \def\KVS@EqualsSpace{% @@ -4105,8 +4164,7 @@ $ \expandafter\endgroup \KVS@IfEmpty{#2}{% \toks@{#1}% }{% -\toks@{#1=#2}% -\expandafter\KVS@@EqualsSpace\the\toks@\KVS@Nil +\KVS@@EqualsSpace#1=#2\KVS@Nil }% } \long\def\kv@parse#1{% @@ -4175,6 +4233,13 @@ $ \let\kv@value\KVS@Global \def\comma@break{% \let\KVS@MaybeBreak\KVS@break } +\def\kv@handled@false{% +\let\ifkv@handled@\iffalse +} +\def\kv@handled@true{% +\let\ifkv@handled@\iftrue +} +\kv@handled@true \def\kv@processor@default#1#2{% \begingroup \csname @safe@activestrue\endcsname @@ -4185,6 +4250,7 @@ $ \let\kv@value\KVS@Global \KVS@temp } \long\def\KVS@ProcessorDefault#1#2#3{% +\def\kv@fam{#1}% & \unless\ifcsname KV@#1@#2\endcsname $ \begingroup\expandafter\expandafter\expandafter\endgroup $ \expandafter\ifx\csname KV@#1@#2\endcsname\relax @@ -4193,8 +4259,13 @@ $ \begingroup\expandafter\expandafter\expandafter\endgroup $ \expandafter\ifx\csname KVS@#1@handler\endcsname\relax \kv@error@unknownkey{#1}{#2}% \else +\kv@handled@true \csname KVS@#1@handler\endcsname{#2}{#3}% \relax +\ifkv@handled@ +\else +\kv@error@unknownkey{#1}{#2}% +\fi \fi \else \ifx\kv@value\relax @@ -4211,6 +4282,66 @@ $ \expandafter\ifx\csname KV@#1@#2@default\endcsname\relax \fi \fi } +\def\kv@processor@known#1#2#3{% +\begingroup +\csname @safe@activestrue\endcsname +\let\ifincsname\iftrue +\edef\KVS@temp{\endgroup +\noexpand\KVS@ProcessorKnown{#1}\noexpand#2{#3}% +}% +\KVS@temp +} +\long\def\KVS@ProcessorKnown#1#2#3#4{% +\def\kv@fam{#1}% +& \unless\ifcsname KV@#1@#3\endcsname +$ \begingroup\expandafter\expandafter\expandafter\endgroup +$ \expandafter\ifx\csname KV@#1@#3\endcsname\relax +& \unless\ifcsname KVS@#1@handler\endcsname +$ \begingroup\expandafter\expandafter\expandafter\endgroup +$ \expandafter\ifx\csname KVS@#1@handler\endcsname\relax +\KVS@AddUnhandled#2{#3}{#4}% +\else +\kv@handled@true +\csname KVS@#1@handler\endcsname{#3}{#4}% +\relax +\ifkv@handled@ +\else +\KVS@AddUnhandled#2{#3}{#4}% +\fi +\fi +\else +\ifx\kv@value\relax +& \unless\ifcsname KV@#1@#2@default\endcsname +$ \begingroup\expandafter\expandafter\expandafter\endgroup +$ \expandafter\ifx\csname KV@#1@#3@default\endcsname\relax +\kv@error@novalue{#1}{#3}% +\else +\csname KV@#1@#3@default\endcsname +\relax +\fi +\else +\csname KV@#1@#3\endcsname{#4}% +\fi +\fi +} +\long\def\KVS@AddUnhandled#1#2#3{% +& \edef#1{% +& \ifx#1\KVS@empty +& \else +& \etex@unexpanded{#1},% +& \fi +& \etex@unexpanded{{#2}={#3}}% +& }% +$ \begingroup +$ \ifx#1\KVS@empty +$ \toks@{{#2}={#3}}% +$ \else +$ \toks@\expandafter{#1,{#2}={#3}}% +$ \fi +$ \xdef\KVS@Global{\the\toks@}% +$ \endgroup +$ \let#1\KVS@Global +} \long\def\kv@set@family@handler#1#2{% \begingroup \csname @safe@activestrue\endcsname @@ -4218,6 +4349,13 @@ $ \expandafter\ifx\csname KV@#1@#2@default\endcsname\relax \expandafter\endgroup \expandafter\def\csname KVS@#1@handler\endcsname##1##2{#2}% } +\long\def\kv@unset@family@handler#1#2{% +\begingroup +\csname @safe@activestrue\endcsname +\let\ifincsname\iftrue +\expandafter\endgroup +\expandafter\let\csname KVS@#1@handler\endcsname\@UnDeFiNeD +} \def\kv@error@novalue{% \kv@error@generic{No value specified for}% } @@ -4237,6 +4375,49 @@ $ \expandafter\ifx\csname KV@#1@#2@default\endcsname\relax \long\def\kvsetkeys#1#2{% \kv@parse{#2}{\kv@processor@default{#1}}% } +\def\kvsetkeys@expandafter#1#2{% +\expandafter\kv@parse\expandafter{#2}{% +\kv@processor@default{#1}% +}% +} +\def\KVS@cmd{0}% +\def\KVS@cmd@inc{% +& \edef\KVS@cmd{\the\numexpr\KVS@cmd+1}% +$ \begingroup +$ \count255=\KVS@cmd\relax +$ \advance\count255 by 1\relax +$ \edef\x{\endgroup +$ \noexpand\def\noexpand\KVS@cmd{\number\count255}% +$ }% +$ \x +} +\def\KVS@cmd@dec{% +& \edef\KVS@cmd{\the\numexpr\KVS@cmd-1}% +$ \begingroup +$ \count255=\KVS@cmd\relax +$ \advance\count255 by -1\relax +$ \edef\x{\endgroup +$ \noexpand\def\noexpand\KVS@cmd{\number\count255}% +$ }% +$ \x +} +\def\KVS@empty{} +\def\kvsetknownkeys{% +\expandafter +\KVS@setknownkeys\csname KVS@cmd\KVS@cmd\endcsname{}% +} +\long\def\KVS@setknownkeys#1#2#3#4#5{% +\let#1\KVS@empty +\KVS@cmd@inc +#2\kv@parse#2{#5}{\kv@processor@known{#3}#1}% +\KVS@cmd@dec +\let#4=#1% +} +\def\kvsetknownkeys@expandafter{% +\expandafter +\KVS@setknownkeys +\csname KVS@cmd\KVS@cmd\endcsname\expandafter +} \KVS@AtEnd% \endinput <hobsub> @@ -4308,7 +4489,7 @@ $ \expandafter\ifx\csname KV@#1@#2@default\endcsname\relax \fi \expandafter\x\csname ver@kvdefinekeys.sty\endcsname \ProvidesPackage{kvdefinekeys}% - [2011/04/07 v1.3 Defining keys (HO)]% + [2011/04/07 v1.3 Define keys (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -4571,7 +4752,7 @@ $ \expandafter\ifx\csname KV@#1@#2@default\endcsname\relax \fi \expandafter\x\csname ver@pdftexcmds.sty\endcsname \ProvidesPackage{pdftexcmds}% - [2011/04/22 v0.16 Utilities of pdfTeX for LuaTeX (HO)]% + [2011/11/29 v0.20 Utility functions of pdfTeX for LuaTeX (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -4717,6 +4898,17 @@ $ \expandafter\ifx\csname KV@#1@#2@default\endcsname\relax \def\pdf@system#{% \immediate\write18% }% +\def\pdftexcmds@temp#1{% +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname pdf#1\endcsname\relax +\pdftexcmds@nopdftex +\else +\expandafter\let\csname pdf@#1\expandafter\endcsname +\csname pdf#1\endcsname +\fi +}% +\pdftexcmds@temp{resettimer}% +\pdftexcmds@temp{elapsedtime}% \fi \ifluatex \ifnum\luatexversion<36 % @@ -4774,7 +4966,8 @@ $ \expandafter\ifx\csname KV@#1@#2@default\endcsname\relax \endgroup \let\pdf@primitive\@undefined \@PackageInfoNoLine{pdftexcmds}{% -\string\pdf@primitive disabled, because\MessageBreak +\string\pdf@primitive\space disabled, % + because\MessageBreak \string\pdfprimitive\space is broken until pdfTeX 1.40.4% }% \begingroup @@ -4944,8 +5137,23 @@ $ \expandafter\ifx\csname KV@#1@#2@default\endcsname\relax \pdftexcmds@directlua{% require("oberdiek.pdftexcmds")% } +\ifnum\luatexversion>37 % +\ifnum0% +\pdftexcmds@directlua{% + if status.ini_version then % + tex.write("1")% + end% +}>0 % +\everyjob\expandafter{% +\the\everyjob +\pdftexcmds@directlua{% + require("oberdiek.pdftexcmds")% +}% +}% +\fi +\fi \begingroup -\def\x{2011/04/22 v0.16}% +\def\x{2011/11/29 v0.20}% \ltx@onelevel@sanitize\x \edef\y{% \pdftexcmds@directlua{% @@ -5092,6 +5300,54 @@ $ \expandafter\ifx\csname KV@#1@#2@default\endcsname\relax oberdiek.pdftexcmds.filemdfivesum("\luaescapestring{#1}")% }% }% +\let\pdftexcmds@temp=Y% +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname protected\endcsname\relax +\pdftexcmds@directlua0{% + if tex.enableprimitives then % + tex.enableprimitives('', {'protected'})% + end% +}% +\fi +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname protected\endcsname\relax +\let\pdftexcmds@temp=N% +\fi +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname numexpr\endcsname\relax +\pdftexcmds@directlua0{% + if tex.enableprimitives then % + tex.enableprimitives('', {'numexpr'})% + end% +}% +\fi +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname numexpr\endcsname\relax +\let\pdftexcmds@temp=N% +\fi +\ifx\pdftexcmds@temp N% +\@PackageWarningNoLine{pdftexcmds}{% + Definitions of \ltx@backslashchar pdf@resettimer and% +\MessageBreak +\ltx@backslashchar pdf@elapsedtime are skipped, because% +\MessageBreak + e-TeX's \ltx@backslashchar protected or % +\ltx@backslashchar numexpr are missing% +}% +\else +\protected\def\pdf@resettimer{% +\pdftexcmds@directlua0{% + oberdiek.pdftexcmds.resettimer()% +}% +}% +\protected\def\pdf@elapsedtime{% +\numexpr +\pdftexcmds@directlua0{% + oberdiek.pdftexcmds.elapsedtime()% +}% +\relax +}% +\fi \ifnum\luatexversion<68 % \else \def\pdf@shellescape{% @@ -5204,7 +5460,7 @@ $ \expandafter\ifx\csname KV@#1@#2@default\endcsname\relax \fi \expandafter\x\csname ver@pdfescape.sty\endcsname \ProvidesPackage{pdfescape}% - [2011/04/04 v1.12 Provides string conversions (HO)]% + [2011/11/25 v1.13 Implements pdfTeX's escape features (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -5239,6 +5495,8 @@ $ \expandafter\ifx\csname KV@#1@#2@default\endcsname\relax } \TMP@EnsureCode\catcode{0}{12}% ^^@ \TMP@EnsureCode\catcode{34}{12}% " +\TMP@EnsureCode\catcode{36}{3}% $ +\TMP@EnsureCode\catcode{38}{4}% & \TMP@EnsureCode\catcode{39}{12}% ' \TMP@EnsureCode\catcode{42}{12}% * \TMP@EnsureCode\catcode{45}{12}% - @@ -5536,12 +5794,35 @@ $ \expandafter\ifx\csname KV@#1@#2@default\endcsname\relax } \def\PE@OctII#1#2{% \ifcase\PE@TestOctDigit#2% -\def\PE@next{\PE@OctAll{#1#2}}% +\def\PE@next{\PE@OctIII#1#2}% \else \def\PE@next{\PE@OctAll{#1}#2}% \fi \PE@next } +\ltx@IfUndefined{numexpr}{% +\catcode`\$=9 % +\catcode`\&=14 % +}{% +\catcode`\$=14 % +\catcode`\&=9 % +} +\def\PE@OctIII#1#2#3{% +\ifnum#1<4 % +\def\PE@next{\PE@OctAll{#1#2#3}}% +\else +$ \count\ltx@cclv#1 % +$ \advance\count\ltx@cclv -4 % +\edef\PE@next{% +\noexpand\PE@OctAll{% +$ \the\count\ltx@cclv +& \the\numexpr#1-4\relax +#2#3% +}% +}% +\fi +\PE@next +} \def\PE@OctAll#1{% \uccode\ltx@zero='#1\relax \uppercase{% @@ -5917,7 +6198,7 @@ $ \expandafter\ifx\csname KV@#1@#2@default\endcsname\relax \fi \expandafter\x\csname ver@bigintcalc.sty\endcsname \ProvidesPackage{bigintcalc}% - [2011/01/30 v1.2 Expandable big integer calculations (HO)]% + [2012/04/08 v1.3 Expandable calculations on big integers (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -5998,6 +6279,7 @@ $ \expandafter\ifx\csname KV@#1@#2@default\endcsname\relax }% \TMP@RequirePackage{pdftexcmds}[2007/11/11]% \else +\RequirePackage{pdftexcmds}[2007/11/11]% \fi \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname pdf@escapehex\endcsname\relax @@ -7704,7 +7986,7 @@ $ \BIC@Temp 9{18\or27\or36\or45\or54\or63\or72\or81}% \fi \expandafter\x\csname ver@bitset.sty\endcsname \ProvidesPackage{bitset}% - [2011/01/30 v1.1 Data type bit set (HO)]% + [2011/01/30 v1.1 Handle bit-vector datatype (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -9114,7 +9396,7 @@ $ \BIC@Temp 9{18\or27\or36\or45\or54\or63\or72\or81}% \fi \expandafter\x\csname ver@uniquecounter.sty\endcsname \ProvidesPackage{uniquecounter}% - [2011/01/30 v1.2 Provides unlimited unique counter (HO)]% + [2011/01/30 v1.2 Provide unlimited unique counter (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % diff --git a/Master/texmf-dist/tex/generic/oberdiek/hobsub-hyperref.sty b/Master/texmf-dist/tex/generic/oberdiek/hobsub-hyperref.sty index 71354f61e92..47f9af78aa4 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/hobsub-hyperref.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/hobsub-hyperref.sty @@ -23,9 +23,9 @@ %% This is a generated file. %% %% Project: hobsub -%% Version: 2011/04/23 v1.4 +%% Version: 2012/04/25 v1.12 %% -%% Copyright (C) 2011 by +%% Copyright (C) 2011, 2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -116,7 +116,7 @@ \fi \expandafter\x\csname ver@hobsub-hyperref.sty\endcsname \ProvidesPackage{hobsub-hyperref}% - [2011/04/23 v1.4 Bundle oberdiek, subset hyperref (HO)]% + [2012/04/25 v1.12 Bundle oberdiek, subset hyperref (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -161,7 +161,7 @@ \TMP@EnsureCode{96}{12}% ` \edef\HOBsub@AtEnd{\HOBsub@AtEnd\noexpand\endinput} \NeedsTeXFormat{LaTeX2e} -\RequirePackage{hobsub-generic}[2011/04/23] +\RequirePackage{hobsub-generic}[2012/04/25] \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname ver@hobsub.sty\endcsname\relax \else @@ -242,11 +242,11 @@ \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname ProvidesPackage\endcsname\relax \immediate\write-1{% - Package: hobsub 2011/04/23 v1.4 Subsetting bundle oberdiek (HO)% + Package: hobsub 2012/04/25 v1.12 Construct package bundles (HO)% }% \else \ProvidesPackage{hobsub}% - [2011/04/23 v1.4 Subsetting bundle oberdiek (HO)]% + [2012/04/25 v1.12 Construct package bundles (HO)]% \fi \endinput <hobsub> @@ -471,7 +471,7 @@ \edef\HOpatch@AtEnd{\HOpatch@AtEnd\noexpand\endinput} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{hopatch}% - [2011/01/30 v1.0 Wrapper for package hooks (HO)] + [2011/06/24 v1.1 Wrapper for package hooks (HO)] \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname RequirePackage\endcsname\relax \def\TMP@RequirePackage#1[#2]{% @@ -543,9 +543,12 @@ } \AtBeginDocument{\HOpatch@list} \ltx@ifundefined{AtEndPreamble}{}{% +\ltx@ifundefined{@endpreamblehook}{}{% \AtEndPreamble{\HOpatch@list}% +}% } \ltx@ifundefined{AfterEndPreamble}{}{% +\ltx@ifundefined{@afterendpreamblehook}{}{% \AfterEndPreamble{% \let\HOpatch@OrgIfPackageLoaded\@ifpackageloaded \let\HOpatch@OrgIfPackageLater\@ifpackagelater @@ -561,6 +564,7 @@ \let\@ifclassloaded\HOpatch@OrgIfClassLoaded \let\@ifclasslater\HOpatch@OrgIfClassLater }% +}% } \HOpatch@AtEnd% \endinput @@ -769,7 +773,7 @@ \edef\AtVeryEnd@AtEnd{\AtVeryEnd@AtEnd\noexpand\endinput} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{atveryend}% - [2011/04/23 v1.7 Hooks at very end of document (HO)] + [2011/06/30 v1.8 Hooks at the very end of document (HO)] \def\AtVeryEnd@ifundefined#1{% \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname #1\endcsname\relax @@ -930,6 +934,81 @@ \Call@AtVeryVeryEnd \@@end } +\expandafter\def\csname AtVeryEnd@test@standard20110627\endcsname{% +\let\AtEndDocument\@firstofone +\@enddocumenthook +\@checkend{document}% +\clearpage +\begingroup +\if@filesw +\immediate\closeout\@mainaux +\let\@setckpt\@gobbletwo +\let\@newl@bel\@testdef +\@tempswafalse +\makeatletter +\@@input\jobname.aux % +\fi +\@dofilelist +\ifdim \font@submax >\fontsubfuzz\relax +\@font@warning{Size substitutions with differences\MessageBreak + up to \font@submax\space have occurred.\@gobbletwo}% +\fi +\@defaultsubs +\@refundefined +\if@filesw +\ifx \@multiplelabels \relax +\if@tempswa +\@latex@warning@no@line{Label(s) may have changed. % + Rerun to get cross-references right}% +\fi +\else +\@multiplelabels +\fi +\fi +\endgroup +\deadcycles\z@ +\@@end +} +\expandafter\def\csname AtVeryEnd@enddocument@standard20110627\endcsname{% +\let\AtEndDocument\@firstofone +\@enddocumenthook +\@checkend{document}% +\Call@BeforeClearDocument +\clearpage +\Call@AfterLastShipout +\begingroup +\if@filesw +\immediate\closeout\@mainaux +\let\@setckpt\@gobbletwo +\let\@newl@bel\@testdef +\@tempswafalse +\makeatletter +\@@input\jobname.aux % +\fi +\Call@AtVeryEndDocument +\@dofilelist +\Call@AtEndAfterFileList +\ifdim \font@submax >\fontsubfuzz\relax +\@font@warning{Size substitutions with differences\MessageBreak + up to \font@submax\space have occurred.\@gobbletwo}% +\fi +\@defaultsubs +\@refundefined +\if@filesw +\ifx \@multiplelabels \relax +\if@tempswa +\@latex@warning@no@line{Label(s) may have changed. % + Rerun to get cross-references right}% +\fi +\else +\@multiplelabels +\fi +\fi +\endgroup +\deadcycles\z@ +\Call@AtVeryVeryEnd +\@@end +} \expandafter\def\expandafter\AtVeryEnd@test@booklet\expandafter{% \expandafter\twoupclearpage \AtVeryEnd@test@standard @@ -1142,6 +1221,7 @@ \def\AtVeryEnd@RedefEndDocument#1{% \ifx#1\@undefined \else +\AtVeryEnd@Test#1{standard20110627}% \AtVeryEnd@Test#1{standard}% \AtVeryEnd@Test#1{booklet}% \AtVeryEnd@Test#1{dinbrief}% @@ -1389,7 +1469,7 @@ \fi \expandafter\x\csname ver@atbegshi.sty\endcsname \ProvidesPackage{atbegshi}% - [2011/01/30 v1.15 At begin shipout hook (HO)]% + [2011/10/05 v1.16 At begin shipout hook (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -1523,36 +1603,32 @@ X \endgroup \else \AtBegShi@First \let\protect\AtBegShi@OrgProtect +\AtBegShi@GetBoxSize\AtBeginShipoutBox +\ltx@ifundefined{AtNextShipout}{% +}{% +\AtNextShipout{\AtBegShi@GetBoxSize\@cclv}% +}% \AtBeginShipoutOriginalShipout\box\AtBeginShipoutBox \fi \fi } +\def\AtBegShi@GetBoxSize#1{% +\xdef\AtBeginShipoutBoxWidth{\the\wd#1}% +\xdef\AtBeginShipoutBoxHeight{\the\ht#1}% +\xdef\AtBeginShipoutBoxDepth{\the\dp#1}% +} +\def\AtBeginShipoutBoxWidth{0pt} +\def\AtBeginShipoutBoxHeight{0pt} +\def\AtBeginShipoutBoxDepth{0pt} \catcode`\X=11 % \catcode`\E=11 % \def\AtBegShi@First{% -\begingroup -\def\@empty{}% -\ifx\AtBegShi@HookFirst\@empty +\ifx\AtBegShi@HookFirst\ltx@empty \else -\setbox\ltx@zero=\vbox{% -\begingroup -\AtBegShi@HookFirst -\endgroup -}% -\wd\ltx@zero=0pt % -\ht\ltx@zero=0pt % -\dp\ltx@zero=0pt % -\global\setbox\AtBeginShipoutBox=\vbox{% -\baselineskip 0pt\relax -\lineskip 0pt\relax -\lineskiplimit 0pt\relax -\copy\ltx@zero -\copy\AtBeginShipoutBox -}% +\AtBeginShipoutAddToBox{\AtBegShi@HookFirst}% \fi -\global\let\AtBegShi@First\@empty +\global\let\AtBegShi@First\ltx@empty \global\let\AtBeginShipoutFirst\AtBegShi@FirstDisabled -\endgroup } \gdef\AtBegShi@Hook{} \gdef\AtBegShi@HookNext{} @@ -1626,11 +1702,138 @@ X \endgroup \else \AtBeginDocument{\AtBeginShipoutInit}% \fi +\def\AtBeginShipoutAddToBox#1{% +\ifhbox\AtBeginShipoutBox +\edef\AtBegShi@restore{% +\hfuzz=\the\hfuzz\relax +\hbadness=\the\hbadness\relax +}% +\hfuzz=1073741823sp\relax +\hbadness=2147483647\relax +\setbox\AtBeginShipoutBox=\hbox to \wd\AtBeginShipoutBox{% +\setbox\ltx@zero=\hbox{% +\begingroup +\AtBegShi@restore +#1% +\endgroup +}% +\wd\ltx@zero=0pt\relax +\ht\ltx@zero=0pt\relax +\dp\ltx@zero=0pt\relax +\raise\ht\AtBeginShipoutBox\copy\ltx@zero +\unhcopy\AtBeginShipoutBox +}% +\AtBegShi@restore +\else +\ifvbox\AtBeginShipoutBox +\edef\AtBegShi@restore{% +\vfuzz=\the\vfuzz\relax +\vbadness=\the\vbadness\relax +\dimen\ltx@zero=\the\dimen\ltx@zero\relax +}% +\edef\AtBegShi@restorebox{% +\ht\AtBeginShipoutBox=\the\ht\AtBeginShipoutBox\relax +\dp\AtBeginShipoutBox=\the\dp\AtBeginShipoutBox\relax +}% +\vfuzz=1073741823sp\relax +\vbadness=2147483647\relax +\dimen\ltx@zero=\ht\AtBeginShipoutBox +\advance\dimen\ltx@zero by \dp\AtBeginShipoutBox +\setbox\AtBeginShipoutBox=\vbox to \dimen\ltx@zero{% +\setbox\ltx@zero=\hbox{% +\begingroup +\AtBegShi@restore +#1% +\endgroup +}% +\wd\ltx@zero=0pt\relax +\ht\ltx@zero=0pt\relax +\dp\ltx@zero=0pt\relax +\baselineskip=0pt\relax +\lineskip=0pt\relax +\lineskiplimit=0pt\relax +\copy\ltx@zero +\unvbox\AtBeginShipoutBox +\kern0pt% +}% +\AtBegShi@restore +\AtBegShi@restorebox +\fi +\fi +} +\def\AtBeginShipoutAddToBoxForeground#1{% +\ifhbox\AtBeginShipoutBox +\edef\AtBegShi@restore{% +\hfuzz=\the\hfuzz\relax +\hbadness=\the\hbadness\relax +}% +\hfuzz=1073741823sp\relax +\hbadness=2147483647\relax +\setbox\AtBeginShipoutBox=\hbox to \wd\AtBeginShipoutBox{% +\unhcopy\AtBeginShipoutBox +\kern-\wd\AtBeginShipoutBox +\setbox\ltx@zero=\hbox{% +\begingroup +\AtBegShi@restore +#1% +\endgroup +}% +\wd\ltx@zero=0pt\relax +\ht\ltx@zero=0pt\relax +\dp\ltx@zero=0pt\relax +\raise\ht\AtBeginShipoutBox\copy\ltx@zero +\kern\wd\AtBeginShipoutBox +}% +\AtBegShi@restore +\else +\ifvbox\AtBeginShipoutBox +\edef\AtBegShi@restore{% +\vfuzz=\the\vfuzz\relax +\vbadness=\the\vbadness\relax +\dimen\ltx@zero=\the\dimen\ltx@zero\relax +}% +\edef\AtBegShi@restorebox{% +\ht\AtBeginShipoutBox=\the\ht\AtBeginShipoutBox\relax +\dp\AtBeginShipoutBox=\the\dp\AtBeginShipoutBox\relax +}% +\vfuzz=1073741823sp\relax +\vbadness=2147483647\relax +\dimen\ltx@zero=\ht\AtBeginShipoutBox +\advance\dimen\ltx@zero by \dp\AtBeginShipoutBox +\setbox\AtBeginShipoutBox=\vbox to \dimen\ltx@zero{% +\setbox\ltx@zero=\hbox{% +\begingroup +\AtBegShi@restore +#1% +\endgroup +}% +\wd\ltx@zero=0pt\relax +\ht\ltx@zero=0pt\relax +\dp\ltx@zero=0pt\relax +\baselineskip=0pt\relax +\lineskip=0pt\relax +\lineskiplimit=0pt\relax +\unvbox\AtBeginShipoutBox +\kern-\dimen\ltx@zero +\copy\ltx@zero +\kern\dimen\ltx@zero +}% +\AtBegShi@restore +\AtBegShi@restorebox +\fi +\fi +} \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname RequirePackage\endcsname\relax -\input ifpdf.sty\relax +\def\TMP@RequirePackage#1[#2]{% +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname ver@#1.sty\endcsname\relax +\input #1.sty\relax +\fi +}% +\TMP@RequirePackage{ifpdf}[2011/01/30]% \else -\RequirePackage{ifpdf}\relax +\RequirePackage{ifpdf}[2011/01/30]% \fi \ifpdf \def\AtBegShi@horigin{\pdfhorigin}% @@ -1681,39 +1884,28 @@ X \endgroup }% \fi \def\AtBeginShipoutUpperLeft#1{% -\global\setbox\AtBeginShipoutBox=\hbox{% -\rlap{% +\AtBeginShipoutAddToBox{% \kern-\AtBegShi@horigin\relax \vbox to 0pt{% \kern-\AtBegShi@vorigin\relax -\kern-\ht\AtBeginShipoutBox \AtBegShi@BeginPicture #1% \AtBegShi@EndPicture \vss }% }% -\box\AtBeginShipoutBox -}% } \def\AtBeginShipoutUpperLeftForeground#1{% -\global\setbox\AtBeginShipoutBox=\hbox to \wd\AtBeginShipoutBox{% -\rlap{% -\copy\AtBeginShipoutBox -}% -\rlap{% +\AtBeginShipoutAddToBoxForeground{% \kern-\AtBegShi@horigin\relax \vbox to 0pt{% \kern-\AtBegShi@vorigin\relax -\kern-\ht\AtBeginShipoutBox \AtBegShi@BeginPicture #1% \AtBegShi@EndPicture \vss }% }% -\hss -}% } \def\AtBegShi@AbortIfUndefined#1{% \begingroup\expandafter\expandafter\expandafter\endgroup @@ -1794,6 +1986,7 @@ X \endgroup \setbox\AtBeginShipoutBox=\vbox{% \CROP@shiplist }% +\AtBegShi@GetBoxSize\AtBeginShipoutBox \expandafter\CROP@shipout \expandafter\box \expandafter\AtBeginShipoutBox @@ -1910,16 +2103,81 @@ X \endgroup }% \fi }% -\ifx\AtBegShi@Memoir@shipi\mem@shipi -\ifcase\ifx\AtBegShi@Memoir@shipiiA\mem@shipii -\ltx@zero +\def\AtBegShi@Memoir@PatchAB{% +\ifvoid\AtBeginShipoutBox \else -\ifx\AtBegShi@Memoir@shipiiB\mem@shipii -\ltx@zero +\setbox\AtBeginShipoutBox=\vbox{% +\trimmarks +\ifvbox\AtBeginShipoutBox +\unvbox\AtBeginShipoutBox \else -\ltx@one +\box\AtBeginShipoutBox +\fi +}% +\AtBegShi@GetBoxSize\AtBeginShipoutBox +\expandafter\mem@oldshipout +\expandafter\box +\expandafter\AtBeginShipoutBox +\fi +}% +\def\AtBegShi@Memoir@shipiiC{% 2008/08/07 v1.6180339a +\ifvoid\@cclv +\mem@oldshipout\box\@cclv +\else +\ifshowtrims +\mem@oldshipout\vbox{\trimmarks\unvbox\@cclv}% +\else +\mem@oldshipout\box\@cclv +\fi +\fi +}% +\def\AtBegShi@Memoir@shipiiD{% 2011/03/06 v3.6j +\ifvoid\@cclv +\mem@oldshipout\box\@cclv +\else +\ifshowtrims +\mem@oldshipout\vbox{% +\trimmarks +\nointerlineskip +\box\@cclv +}% +\else +\mem@oldshipout\box\@cclv \fi \fi +}% +\def\AtBegShi@Memoir@PatchCD{% +\ifvoid\AtBeginShipoutBox +\else +\ifshowtrims +\setbox\AtBeginShipoutBox=\vbox{% +\trimmarks +\nointerlineskip +\box\AtBeginShipoutBox +}% +\fi +\AtBegShi@GetBoxSize\AtBeginShipoutBox +\expandafter\mem@oldshipout +\expandafter\box +\expandafter\AtBeginShipoutBox +\fi +}% +\ifx\AtBegShi@Memoir@shipi\mem@shipi +\let\AtBegShi@found\ltx@one +\ifx\AtBegShi@Memoir@shipiiA\mem@shipii +\let\AtBegShi@found\ltx@zero +\global\let\AtBegShi@Memoir@PatchX\AtBegShi@Memoir@PatchAB +\else\ifx\AtBegShi@Memoir@shipiiB\mem@shipii +\let\AtBegShi@found\ltx@zero +\global\let\AtBegShi@Memoir@PatchX\AtBegShi@Memoir@PatchAB +\else\ifx\AtBegShi@Memoir@shipiiC\mem@shipii +\let\AtBegShi@found\ltx@zero +\global\let\AtBegShi@Memoir@PatchX\AtBegShi@Memoir@PatchCD +\else\ifx\AtBegShi@Memoir@shipiiD\mem@shipii +\let\AtBegShi@found\ltx@zero +\global\let\AtBegShi@Memoir@PatchX\AtBegShi@Memoir@PatchCD +\fi\fi\fi\fi +\ifcase\AtBegShi@found \let\AtBegShi@found\relax \ifx\shipout\AtBegShi@Memoir@shipout \def\AtBegShi@found{\shipout}% @@ -1949,22 +2207,7 @@ X \endgroup \fi \mem@shipii }% -\def\mem@shipii{% -\ifvoid\AtBeginShipoutBox -\else -\setbox\AtBeginShipoutBox=\vbox{% -\trimmarks -\ifvbox\AtBeginShipoutBox -\unvbox\AtBeginShipoutBox -\else -\box\AtBeginShipoutBox -\fi -}% -\expandafter\mem@oldshipout -\expandafter\box -\expandafter\AtBeginShipoutBox -\fi -}% +\let\mem@shipii\AtBegShi@Memoir@PatchX \@PackageInfoNoLine{atbegshi}{Class `memoir' patched}% \begingroup \fi @@ -2049,7 +2292,7 @@ X \endgroup \fi \expandafter\x\csname ver@refcount.sty\endcsname \ProvidesPackage{refcount}% - [2010/12/01 v3.2 Data extraction from references (HO)]% + [2011/10/16 v3.4 Data extraction from label references (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -2097,7 +2340,7 @@ X \endgroup \input ltxcmds.sty\relax \input infwarerr.sty\relax \else -\RequirePackage{ltxcmds}[2010/04/08]% +\RequirePackage{ltxcmds}[2011/11/09]% \RequirePackage{infwarerr}[2010/04/08]% \fi \ltx@IfUndefined{@ifdefinable}{% @@ -2126,12 +2369,22 @@ X \endgroup #1\def#3##1{#4}% }% }% +\def\rc@RobustDefZero#1#2{% +\rc@IfDefinable#1{% +\def#1{#2}% +}% +}% }{% \def\rc@RobustDefOne#1#2#3#4{% \rc@IfDefinable#3{% \DeclareRobustCommand#2#3[1]{#4}% }% }% +\def\rc@RobustDefZero#1#2{% +\rc@IfDefinable#1{% +\DeclareRobustCommand#1{#2}% +}% +}% }% }{% \def\rc@RobustDefOne#1#2#3#4{% @@ -2139,6 +2392,11 @@ X \endgroup \protected#1\def#3##1{#4}% }% }% +\def\rc@RobustDefZero#1#2{% +\rc@IfDefinable#1{% +\protected\def#1{#2}% +}% +}% } \ltx@IfUndefined{newcommand}{% \def\rc@newcommand*#1[#2]#3{% hash-ok @@ -2202,7 +2460,7 @@ X \endgroup \def\rc@set#1#2#3#4{% \begingroup \csname @safe@activestrue\endcsname -\rc@refused{#4}% +\refused{#4}% \expandafter\rc@@set\csname r@#4\endcsname{#1}{#2}{#3}% \endgroup } @@ -2215,17 +2473,17 @@ X \endgroup }% \fi } -\rc@newcommand*{\setcounterref}[0]{% +\rc@RobustDefZero\setcounterref{% \rc@set\setcounter\ltx@car } -\rc@newcommand*{\addtocounterref}[0]{% +\rc@RobustDefZero\addtocounterref{% \rc@set\addtocounter\ltx@car } -\rc@newcommand*{\setcounterpageref}[0]{% -\rc@set\setcounter\ltx@cartwo +\rc@RobustDefZero\setcounterpageref{% +\rc@set\setcounter\ltx@carsecond } -\rc@newcommand*{\addtocounterpageref}[0]{% -\rc@set\addtocounter\ltx@cartwo +\rc@RobustDefZero\addtocounterpageref{% +\rc@set\addtocounter\ltx@carsecond } \rc@newcommand*{\getrefnumber}[1]{% \romannumeral @@ -2333,7 +2591,7 @@ X \endgroup \hobsub@StartPackage{hycolor} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{hycolor}% - [2011/01/30 v1.7 Color options of hyperref/bookmark (HO)]% + [2011/01/30 v1.7 Color options for hyperref/bookmark (HO)]% \RequirePackage{xcolor-patch}[2011/01/30] \begingroup \catcode`\!=13 % diff --git a/Master/texmf-dist/tex/generic/oberdiek/hobsub.sty b/Master/texmf-dist/tex/generic/oberdiek/hobsub.sty index 0b6371c8bd7..8f87aca8f95 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/hobsub.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/hobsub.sty @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: hobsub -%% Version: 2011/04/23 v1.4 +%% Version: 2012/04/25 v1.12 %% -%% Copyright (C) 2011 by +%% Copyright (C) 2011, 2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -102,7 +102,7 @@ \fi \expandafter\x\csname ver@hobsub.sty\endcsname \ProvidesPackage{hobsub}% - [2011/04/23 v1.4 Subsetting bundle oberdiek (HO)]% + [2012/04/25 v1.12 Construct package bundles (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % diff --git a/Master/texmf-dist/tex/generic/oberdiek/hologo.sty b/Master/texmf-dist/tex/generic/oberdiek/hologo.sty index e582816df51..642bce61e03 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/hologo.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/hologo.sty @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: hologo -%% Version: 2011/04/21 v1.5 +%% Version: 2012/04/26 v1.10 %% -%% Copyright (C) 2010, 2011 by +%% Copyright (C) 2010-2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -33,8 +33,9 @@ %% %% This work consists of the main source file hologo.dtx %% and the derived files -%% hologo.sty, hologo.pdf, hologo.ins, hologo.drv, hologo-test1.tex, -%% hologo-test-spacefactor.tex. +%% hologo.sty, hologo.pdf, hologo.ins, hologo.drv, hologo-example.tex, +%% hologo-test1.tex, hologo-test-spacefactor.tex, +%% hologo-test-list.tex. %% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M @@ -102,7 +103,7 @@ \fi \expandafter\x\csname ver@hologo.sty\endcsname \ProvidesPackage{hologo}% - [2011/04/21 v1.5 Logo collection (HO)]% + [2012/04/26 v1.10 A logo collection with bookmark support (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -137,7 +138,9 @@ } \TMP@EnsureCode{10}{12}% ^^J \TMP@EnsureCode{33}{12}% ! +\TMP@EnsureCode{34}{12}% " \TMP@EnsureCode{36}{3}% $ +\TMP@EnsureCode{38}{4}% & \TMP@EnsureCode{39}{12}% ' \TMP@EnsureCode{40}{12}% ( \TMP@EnsureCode{41}{12}% ) @@ -164,19 +167,94 @@ \noexpand\endinput } \escapechar=92 % +\def\hologoList{% + \hologoEntry{(La)TeX}{}{2011/10/01}% + \hologoEntry{AmSLaTeX}{}{2010/04/16}% + \hologoEntry{AmSTeX}{}{2010/04/16}% + \hologoEntry{biber}{}{2011/10/01}% + \hologoEntry{BibTeX}{}{2011/10/01}% + \hologoEntry{BibTeX}{sf}{2011/10/01}% + \hologoEntry{BibTeX}{sc}{2011/10/01}% + \hologoEntry{BibTeX8}{}{2011/11/22}% + \hologoEntry{ConTeXt}{}{2011/03/25}% + \hologoEntry{ConTeXt}{narrow}{2011/03/25}% + \hologoEntry{ConTeXt}{simple}{2011/03/25}% + \hologoEntry{emTeX}{}{2010/04/26}% + \hologoEntry{eTeX}{}{2010/04/08}% + \hologoEntry{ExTeX}{}{2011/10/01}% + \hologoEntry{HanTheThanh}{}{2011/11/29}% + \hologoEntry{iniTeX}{}{2011/10/01}% + \hologoEntry{KOMAScript}{}{2011/10/01}% + \hologoEntry{La}{}{2010/05/08}% + \hologoEntry{LaTeX}{}{2010/04/08}% + \hologoEntry{LaTeX2e}{}{2010/04/08}% + \hologoEntry{LaTeX3}{}{2010/04/24}% + \hologoEntry{LaTeXe}{}{2010/04/08}% + \hologoEntry{LaTeXML}{}{2011/11/22}% + \hologoEntry{LaTeXTeX}{}{2011/10/01}% + \hologoEntry{LuaLaTeX}{}{2010/04/08}% + \hologoEntry{LuaTeX}{}{2010/04/08}% + \hologoEntry{LyX}{}{2011/10/01}% + \hologoEntry{METAFONT}{}{2011/10/01}% + \hologoEntry{MetaFun}{}{2011/10/01}% + \hologoEntry{METAPOST}{}{2011/10/01}% + \hologoEntry{MetaPost}{}{2011/10/01}% + \hologoEntry{MiKTeX}{}{2011/10/01}% + \hologoEntry{NTS}{}{2011/10/01}% + \hologoEntry{OzMF}{}{2011/10/01}% + \hologoEntry{OzMP}{}{2011/10/01}% + \hologoEntry{OzTeX}{}{2011/10/01}% + \hologoEntry{OzTtH}{}{2011/10/01}% + \hologoEntry{PCTeX}{}{2011/10/01}% + \hologoEntry{pdfTeX}{}{2011/10/01}% + \hologoEntry{pdfLaTeX}{}{2011/10/01}% + \hologoEntry{PiC}{}{2011/10/01}% + \hologoEntry{PiCTeX}{}{2011/10/01}% + \hologoEntry{plainTeX}{}{2010/04/08}% + \hologoEntry{plainTeX}{space}{2010/04/16}% + \hologoEntry{plainTeX}{hyphen}{2010/04/16}% + \hologoEntry{plainTeX}{runtogether}{2010/04/16}% + \hologoEntry{SageTeX}{}{2011/11/22}% + \hologoEntry{SLiTeX}{}{2011/10/01}% + \hologoEntry{SLiTeX}{lift}{2011/10/01}% + \hologoEntry{SLiTeX}{narrow}{2011/10/01}% + \hologoEntry{SLiTeX}{simple}{2011/10/01}% + \hologoEntry{SliTeX}{}{2011/10/01}% + \hologoEntry{SliTeX}{narrow}{2011/10/01}% + \hologoEntry{SliTeX}{simple}{2011/10/01}% + \hologoEntry{SliTeX}{lift}{2011/10/01}% + \hologoEntry{teTeX}{}{2011/10/01}% + \hologoEntry{TeX}{}{2010/04/08}% + \hologoEntry{TeX4ht}{}{2011/11/22}% + \hologoEntry{TTH}{}{2011/11/22}% + \hologoEntry{virTeX}{}{2011/10/01}% + \hologoEntry{VTeX}{}{2010/04/24}% + \hologoEntry{Xe}{}{2010/04/08}% + \hologoEntry{XeLaTeX}{}{2010/04/08}% + \hologoEntry{XeTeX}{}{2010/04/08}% +} \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname RequirePackage\endcsname\relax - \input ltxcmds.sty\relax - \input infwarerr.sty\relax - \input kvsetkeys.sty\relax - \input kvdefinekeys.sty\relax - \input pdftexcmds.sty\relax - \input ifpdf.sty\relax - \input ifluatex.sty\relax - \input ifxetex.sty\relax - \input ifvtex.sty\relax + \def\TMP@RequirePackage#1[#2]{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname ver@#1.sty\endcsname\relax + \input #1.sty\relax + \fi + }% + \TMP@RequirePackage{ltxcmds}[2011/02/04]% + \TMP@RequirePackage{infwarerr}[2010/04/08]% + \TMP@RequirePackage{kvsetkeys}[2010/03/01]% + \TMP@RequirePackage{kvdefinekeys}[2010/03/01]% + \TMP@RequirePackage{pdftexcmds}[2010/04/01]% + \TMP@RequirePackage{ifpdf}[2010/01/28]% + \TMP@RequirePackage{ifluatex}[2010/03/01]% + \ltx@IfUndefined{newif}{% + \expandafter\let\csname newif\endcsname\ltx@newif + }{}% + \TMP@RequirePackage{ifxetex}[2009/01/23]% + \TMP@RequirePackage{ifvtex}[2010/03/01]% \else - \RequirePackage{ltxcmds}[2010/04/16]% + \RequirePackage{ltxcmds}[2011/02/04]% \RequirePackage{infwarerr}[2010/04/08]% \RequirePackage{kvsetkeys}[2010/03/01]% \RequirePackage{kvdefinekeys}[2010/03/01]% @@ -207,7 +285,7 @@ \@PackageError{hologo}{% Unknown logo `\HOLOGO@name'% }\@ehc - \@gobble + \ltx@gobble }{% \HOLOGO@Setup }% @@ -370,6 +448,128 @@ #1% \fi } +\def\HoLogoFont@font#1#2#3{% + \begingroup + \ltx@IfUndefined{HoLogoFont@logo@#1.#2}{% + \ltx@IfUndefined{HoLogoFont@font@#2}{% + \@PackageWarning{hologo}{% + Missing font `#2' for logo `#1'% + }% + #3% + }{% + \csname HoLogoFont@font@#2\endcsname{#3}% + }% + }{% + \csname HoLogoFont@logo@#1.#2\endcsname{#3}% + }% + \endgroup +} +\def\HoLogoFont@Def#1{% + \expandafter\def\csname HoLogoFont@font@#1\endcsname +} +\def\HoLogoFont@LogoDef#1#2{% + \expandafter\def\csname HoLogoFont@logo@#1.#2\endcsname +} +\HoLogoFont@Def{general}{}% +\ltx@IfUndefined{rmfamily}{% + \ltx@IfUndefined{rm}{% + }{% + \HoLogoFont@Def{rm}{\rm}% + }% +}{% + \HoLogoFont@Def{rm}{\rmfamily}% +} +\ltx@IfUndefined{sffamily}{% + \ltx@IfUndefined{sf}{% + }{% + \HoLogoFont@Def{sf}{\sf}% + }% +}{% + \HoLogoFont@Def{sf}{\sffamily}% +} +\ltx@IfUndefined{selectfont}{% + \ltx@IfUndefined{tensc}{% + \font\tensc=cmcsc10\relax + }{}% + \HoLogoFont@Def{bibsf}{\tensc}% +}{% + \HoLogoFont@Def{bibsf}{% + $\mathsurround=0pt$% + \csname S@\f@size\endcsname + \fontsize\sf@size{0pt}% + \math@fontsfalse + \selectfont + }% +} +\ltx@IfUndefined{scshape}{% + \ltx@IfUndefined{tensc}{% + \font\tensc=cmcsc10\relax + }{}% + \HoLogoFont@Def{sc}{\tensc}% +}{% + \HoLogoFont@Def{sc}{\scshape}% +} +\ltx@IfUndefined{usefont}{% + \ltx@IfUndefined{tensy}{% + }{% + \HoLogoFont@Def{sy}{\tensy}% + }% +}{% + \HoLogoFont@Def{sy}{% + \usefont{OMS}{cmsy}{m}{n}% + }% +} +\begingroup + \def\x{LaTeX2e}% +\expandafter\endgroup +\ifx\fmtname\x + \ltx@IfUndefined{logofamily}{% + \DeclareRobustCommand\logofamily{% + \not@math@alphabet\logofamily\relax + \fontencoding{U}% + \fontfamily{logo}% + \selectfont + }% + }{}% + \ltx@IfUndefined{logofamily}{% + }{% + \HoLogoFont@Def{logo}{\logofamily}% + }% +\else + \ltx@IfUndefined{tenlogo}{% + \font\tenlogo=logo10\relax + }{}% + \HoLogoFont@Def{logo}{\tenlogo}% +\fi +\def\hologoFontSetup{% + \let\HOLOGO@name\relax + \HOLOGO@FontSetup +} +\def\hologoLogoFontSetup#1{% + \edef\HOLOGO@name{#1}% + \ltx@IfUndefined{HoLogo@\HOLOGO@name}{% + \@PackageError{hologo}{% + Unknown logo `\HOLOGO@name'% + }\@ehc + \ltx@gobble + }{% + \HOLOGO@FontSetup + }% +} +\def\HOLOGO@FontSetup{% + \kvsetkeys{HoLogoFont}% +} +\def\HOLOGO@temp#1{% + \kv@define@key{HoLogoFont}{#1}{% + \ifx\HOLOGO@name\relax + \HoLogoFont@Def{#1}{##1}% + \else + \HoLogoFont@LogoDef\HOLOGO@name{#1}{##1}% + \fi + }% +} +\HOLOGO@temp{general} +\HOLOGO@temp{sf} \HOLOGO@IfExists\hologo{% \@PackageError{hologo}{% \string\hologo\ltx@space is already defined.\MessageBreak @@ -377,77 +577,243 @@ }\@ehc \HOLOGO@AtEnd }% -\HOLOGO@IfExists\hologorobust{% +\HOLOGO@IfExists\hologoRobust{% \@PackageError{hologo}{% - \string\hologorobust\ltx@space is already defined.\MessageBreak + \string\hologoRobust\ltx@space is already defined.\MessageBreak Package loading is aborted% }\@ehc \HOLOGO@AtEnd }% +\ifluatex + \expandafter\ltx@firstofone +\else + \expandafter\ltx@gobble +\fi +{% + \ltx@IfUndefined{ifincsname}{% + \ifnum\luatexversion<36 % + \expandafter\ltx@gobble + \else + \expandafter\ltx@firstofone + \fi + {% + \begingroup + \ifcase0% + \directlua{% + if tex.enableprimitives then % + tex.enableprimitives('HOLOGO@', {'ifincsname'})% + else % + tex.print('1')% + end% + }% + \ifx\HOLOGO@ifincsname\@undefined 1\fi% + \relax + \expandafter\ltx@firstofone + \else + \endgroup + \expandafter\ltx@gobble + \fi + {% + \global\let\ifincsname\HOLOGO@ifincsname + }% + \HOLOGO@temp + }% + }{}% +} +\ltx@IfUndefined{ifincsname}{% + \catcode`$=14 % +}{% + \catcode`$=9 % +} +\def\hologo#1{% +$ \ifincsname +$ \ltx@ifundefined{HoLogoCs@\HOLOGO@Variant{#1}}{% +$ #1% +$ }{% +$ \csname HoLogoCs@\HOLOGO@Variant{#1}\endcsname\ltx@firstoftwo +$ }% +$ \else + \HOLOGO@IfExists\texorpdfstring\texorpdfstring\ltx@firstoftwo + {% + \hologoRobust{#1}% + }{% + \ltx@ifundefined{HoLogoBkm@\HOLOGO@Variant{#1}}{% + \ltx@ifundefined{HoLogo@#1}{?#1?}{#1}% + }{% + \csname HoLogoBkm@\HOLOGO@Variant{#1}\endcsname + \ltx@firstoftwo + }% + }% +$ \fi +} +\def\Hologo#1{% +$ \ifincsname +$ \ltx@ifundefined{HoLogoCs@\HOLOGO@Variant{#1}}{% +$ #1% +$ }{% +$ \csname HoLogoCs@\HOLOGO@Variant{#1}\endcsname\ltx@secondoftwo +$ }% +$ \else + \HOLOGO@IfExists\texorpdfstring\texorpdfstring\ltx@firstoftwo + {% + \HologoRobust{#1}% + }{% + \ltx@ifundefined{HoLogoBkm@\HOLOGO@Variant{#1}}{% + \ltx@ifundefined{HoLogo@#1}{?#1?}{#1}% + }{% + \csname HoLogoBkm@\HOLOGO@Variant{#1}\endcsname + \ltx@secondoftwo + }% + }% +$ \fi +} +\def\hologoVariant#1#2{% + \ifx\relax#2\relax + \hologo{#1}% + \else +$ \ifincsname +$ \ltx@ifundefined{HoLogoCs@#1@#2}{% +$ #1% +$ }{% +$ \csname HoLogoCs@#1@#2\endcsname\ltx@firstoftwo +$ }% +$ \else + \HOLOGO@IfExists\texorpdfstring\texorpdfstring\ltx@firstoftwo + {% + \hologoVariantRobust{#1}{#2}% + }{% + \ltx@ifundefined{HoLogoBkm@#1@#2}{% + \ltx@ifundefined{HoLogo@#1}{?#1?}{#1}% + }{% + \csname HoLogoBkm@#1@#2\endcsname + \ltx@firstoftwo + }% + }% +$ \fi + \fi +} +\def\HologoVariant#1#2{% + \ifx\relax#2\relax + \Hologo{#1}% + \else +$ \ifincsname +$ \ltx@ifundefined{HoLogoCs@#1@#2}{% +$ #1% +$ }{% +$ \csname HoLogoCs@#1@#2\endcsname\ltx@secondoftwo +$ }% +$ \else + \HOLOGO@IfExists\texorpdfstring\texorpdfstring\ltx@firstoftwo + {% + \HologoVariantRobust{#1}{#2}% + }{% + \ltx@ifundefined{HoLogoBkm@#1@#2}{% + \ltx@ifundefined{HoLogo@#1}{?#1?}{#1}% + }{% + \csname HoLogoBkm@#1@#2\endcsname + \ltx@secondoftwo + }% + }% +$ \fi + \fi +} +\catcode`\$=3 % \ltx@IfUndefined{protected}{% \ltx@IfUndefined{DeclareRobustCommand}{% - \def\hologorobust#1% + \def\hologoRobust#1% }{% - \DeclareRobustCommand*\hologorobust[1]% + \DeclareRobustCommand*\hologoRobust[1]% }% }{% - \protected\def\hologorobust#1% + \protected\def\hologoRobust#1% }% {% \edef\HOLOGO@name{#1}% - \ltx@ifundefined{HoLogo@\HOLOGO@Variant\HOLOGO@name}{% + \ltx@IfUndefined{HoLogo@\HOLOGO@Variant\HOLOGO@name}{% \@PackageError{hologo}{% Unknown logo `\HOLOGO@name'% }\@ehc ?\HOLOGO@name?% }{% - \csname HoLogo@\HOLOGO@Variant\HOLOGO@name\endcsname\ltx@firstoftwo - }% -} -\def\hologo#1{% - \HOLOGO@IfExists\texorpdfstring\texorpdfstring\ltx@firstoftwo - {% - \hologorobust{#1}% - }{% - \ltx@ifundefined{HoLogoBkm@\HOLOGO@Variant{#1}}{% - \ltx@ifundefined{HoLogo@#1}{?#1?}{#1}% + \ltx@IfUndefined{ver@tex4ht.sty}{% + \HoLogoFont@font\HOLOGO@name{general}{% + \csname HoLogo@\HOLOGO@Variant\HOLOGO@name\endcsname + \ltx@firstoftwo + }% }{% - \csname HoLogoBkm@\HOLOGO@Variant{#1}\endcsname\ltx@firstoftwo + \ltx@IfUndefined{HoLogoHtml@\HOLOGO@Variant\HOLOGO@name}{% + \HOLOGO@name + }{% + \csname HoLogoHtml@\HOLOGO@Variant\HOLOGO@name\endcsname + \ltx@firstoftwo + }% }% }% } \ltx@IfUndefined{protected}{% \ltx@IfUndefined{DeclareRobustCommand}{% - \def\Hologorobust#1% + \def\HologoRobust#1% }{% - \DeclareRobustCommand*\Hologorobust[1]% + \DeclareRobustCommand*\HologoRobust[1]% }% }{% - \protected\def\Hologorobust#1% + \protected\def\HologoRobust#1% }% {% \edef\HOLOGO@name{#1}% - \ltx@ifundefined{HoLogo@\HOLOGO@Variant\HOLOGO@name}{% + \ltx@IfUndefined{HoLogo@\HOLOGO@Variant\HOLOGO@name}{% \@PackageError{hologo}{% Unknown logo `\HOLOGO@name'% }\@ehc ?\HOLOGO@name?% }{% - \csname HoLogo@\HOLOGO@Variant\HOLOGO@name\endcsname\ltx@secondoftwo + \ltx@IfUndefined{ver@tex4ht.sty}{% + \HoLogoFont@font\HOLOGO@name{general}{% + \csname HoLogo@\HOLOGO@Variant\HOLOGO@name\endcsname + \ltx@secondoftwo + }% + }{% + \ltx@IfUndefined{HoLogoHtml@\HOLOGO@Variant\HOLOGO@name}{% + \expandafter\HOLOGO@Uppercase\HOLOGO@name + }{% + \csname HoLogoHtml@\HOLOGO@Variant\HOLOGO@name\endcsname + \ltx@secondoftwo + }% + }% }% } -\def\Hologo#1{% - \HOLOGO@IfExists\texorpdfstring\texorpdfstring\ltx@firstoftwo - {% - \Hologorobust{#1}% +\ltx@IfUndefined{protected}{% + \ltx@IfUndefined{DeclareRobustCommand}{% + \def\hologoVariantRobust#1#2% }{% - \ltx@ifundefined{HoLogoBkm@\HOLOGO@Variant{#1}}{% - \ltx@ifundefined{HoLogo@#1}{?#1?}{#1}% - }{% - \csname HoLogoBkm@\HOLOGO@Variant{#1}\endcsname\ltx@secondoftwo - }% + \DeclareRobustCommand*\hologoVariantRobust[2]% }% +}{% + \protected\def\hologoVariantRobust#1#2% +}% +{% + \begingroup + \hologoLogoSetup{#1}{variant={#2}}% + \hologoRobust{#1}% + \endgroup } +\ltx@IfUndefined{protected}{% + \ltx@IfUndefined{DeclareRobustCommand}{% + \def\HologoVariantRobust#1#2% + }{% + \DeclareRobustCommand*\HologoVariantRobust[2]% + }% +}{% + \protected\def\HologoVariantRobust#1#2% +}% +{% + \begingroup + \hologoLogoSetup{#1}{variant={#2}}% + \HologoRobust{#1}% + \endgroup +} +\def\hologorobust{\hologoRobust} +\def\HOLOGO@Uppercase#1{\uppercase{#1}} \def\HOLOGO@PdfdocUnicode{% \ifx\ifHy@unicode\iftrue \expandafter\ltx@secondoftwo @@ -487,30 +853,103 @@ \def\HOLOGO@SpaceFactor{% \spacefactor1000 % } +\def\HOLOGO@Span#1#2{% + \HCode{<span class="HoLogo-#1">}% + #2% + \HCode{</span>}% +} +\def\HOLOGO@SubScript#1{% + \ltx@IfUndefined{textsubscript}{% + \ltx@IfUndefined{text}{% + \ltx@mbox{% + \mathsurround=0pt\relax + $% + _{% + \ltx@IfUndefined{sf@size}{% + \mathrm{#1}% + }{% + \mbox{% + \fontsize\sf@size{0pt}\selectfont + #1% + }% + }% + }% + $% + }% + }{% + \ltx@mbox{% + \mathsurround=0pt\relax + $_{\text{#1}}$% + }% + }% + }{% + \textsubscript{#1}% + }% +} \def\HoLogo@TeX#1{% T\kern-.1667em\lower.5ex\hbox{E}\kern-.125emX\HOLOGO@SpaceFactor } +\def\HoLogoHtml@TeX#1{% + \HoLogoCss@TeX + \HOLOGO@Span{TeX}{% + T% + \HOLOGO@Span{e}{% + E% + }% + X% + }% +} +\def\HoLogoCss@TeX{% + \Css{% + span.HoLogo-TeX span.HoLogo-e{% + position:relative;% + top:.5ex;% + margin-left:-.1667em;% + margin-right:-.125em;% + }% + }% + \Css{% + a span.HoLogo-TeX span.HoLogo-e{% + text-decoration:none;% + }% + }% + \global\let\HoLogoCss@TeX\relax +} \def\HoLogo@plainTeX@space#1{% \HOLOGO@mbox{#1{p}{P}lain}\HOLOGO@space\hologo{TeX}% } +\def\HoLogoCs@plainTeX@space#1{#1{p}{P}lain TeX}% \def\HoLogoBkm@plainTeX@space#1{% #1{p}{P}lain \hologo{TeX}% } +\def\HoLogoHtml@plainTeX@space#1{% + #1{p}{P}lain \hologo{TeX}% +} \def\HoLogo@plainTeX@hyphen#1{% \HOLOGO@mbox{#1{p}{P}lain}\HOLOGO@hyphen\hologo{TeX}% } +\def\HoLogoCs@plainTeX@hyphen#1{#1{p}{P}lain-TeX} \def\HoLogoBkm@plainTeX@hyphen#1{% #1{p}{P}lain-\hologo{TeX}% } +\def\HoLogoHtml@plainTeX@hyphen#1{% + #1{p}{P}lain-\hologo{TeX}% +} \def\HoLogo@plainTeX@runtogether#1{% \HOLOGO@mbox{#1{p}{P}lain\hologo{TeX}}% } +\def\HoLogoCs@plainTeX@runtogether#1{#1{p}{P}lainTeX} \def\HoLogoBkm@plainTeX@runtogether#1{% #1{p}{P}lain\hologo{TeX}% } +\def\HoLogoHtml@plainTeX@runtogether#1{% + #1{p}{P}lain\hologo{TeX}% +} \def\HoLogo@plainTeX{\HoLogo@plainTeX@space} +\def\HoLogoCs@plainTeX{\HoLogoCs@plainTeX@space} \def\HoLogoBkm@plainTeX{\HoLogoBkm@plainTeX@space} -\def\HoLogo@LaTeX#1{% +\def\HoLogoHtml@plainTeX{\HoLogoHtml@plainTeX@space} +\def\HoLogo@La#1{% L% \kern-.36em% \begingroup @@ -521,7 +960,7 @@ \csname sevenrm\endcsname }{% \check@mathfonts - \fontsize\sf@size\z@ + \fontsize\sf@size{0pt}% \math@fontsfalse\selectfont }% A% @@ -529,9 +968,82 @@ \vss }% \endgroup +} +\def\HoLogo@LaTeX#1{% + \hologo{La}% + \kern-.15em% + \hologo{TeX}% +} +\def\HoLogoHtml@LaTeX#1{% + \HoLogoCss@LaTeX + \HOLOGO@Span{LaTeX}{% + L% + \HOLOGO@Span{a}{% + A% + }% + \hologo{TeX}% + }% +} +\def\HoLogoCss@LaTeX{% + \Css{% + span.HoLogo-LaTeX span.HoLogo-a{% + position:relative;% + top:-.5ex;% + margin-left:-.36em;% + margin-right:-.15em;% + font-size:85\%;% + }% + }% + \global\let\HoLogoCss@LaTeX\relax +} +\def\HoLogo@LaTeXTeX#1{% + (% + \kern-.15em% + \hologo{La}% + \kern-.2em% + )% \kern-.15em% \hologo{TeX}% } +\def\HoLogoBkm@LaTeXTeX#1{(La)TeX} +\expandafter +\let\csname HoLogo@(La)TeX\endcsname\HoLogo@LaTeXTeX +\expandafter +\let\csname HoLogoBkm@(La)TeX\endcsname\HoLogoBkm@LaTeXTeX +\def\HoLogoHtml@LaTeXTeX#1{% + \HoLogoCss@LaTeXTeX + \HOLOGO@Span{LaTeXTeX}{% + (% + \HOLOGO@Span{L}{L}% + \HOLOGO@Span{a}{A}% + \HOLOGO@Span{ParenRight}{)}% + \hologo{TeX}% + }% +} +\expandafter +\let\csname HoLogoHtml@(La)TeX\endcsname\HoLogoHtml@LaTeXTeX +\def\HoLogoCss@LaTeXTeX{% + \Css{% + span.HoLogo-LaTeXTeX span.HoLogo-L{% + margin-left:-.1em;% + }% + }% + \Css{% + span.HoLogo-LaTeXTeX span.HoLogo-a{% + position:relative;% + top:-.5ex;% + margin-left:-.36em;% + margin-right:-.1em;% + font-size:85\%;% + }% + }% + \Css{% + span.HoLogo-LaTeXTeX span.HoLogo-ParenRight{% + margin-right:-.15em;% + }% + }% + \global\let\HoLogoCss@LaTeXTeX\relax +} \def\HoLogo@LaTeXe#1{% \hologo{LaTeX}% \kern.15em% @@ -541,13 +1053,59 @@ $_{\textstyle\varepsilon}$% }% } +\ifnum64=`\^^^^0040\relax % test for big chars of LuaTeX/XeTeX + \catcode`\$=9 % + \catcode`\&=14 % +\else + \catcode`\$=14 % + \catcode`\&=9 % +\fi +\def\HoLogoCs@LaTeXe#1{% + LaTeX2% +$ \string ^^^^0395% +& e% +}% +\catcode`\$=3 % +\catcode`\&=4 % \def\HoLogoBkm@LaTeXe#1{% \hologo{LaTeX}% 2% \HOLOGO@PdfdocUnicode{e}{\textepsilon}% } -\expandafter\let\csname HoLogo@LaTeX2e\endcsname\HoLogo@LaTeXe -\expandafter\let\csname HoLogoBkm@LaTeX2e\endcsname\HoLogoBkm@LaTeXe +\def\HoLogoHtml@LaTeXe#1{% + \HoLogoCss@LaTeXe + \HOLOGO@Span{LaTeX2e}{% + \hologo{LaTeX}% + \HOLOGO@Span{2}{2}% + \HOLOGO@Span{e}{% + \HOLOGO@MathSetup + \ensuremath{\textstyle\varepsilon}% + }% + }% +} +\def\HoLogoCss@LaTeXe{% + \Css{% + span.HoLogo-LaTeX2e span.HoLogo-2{% + padding-left:.15em;% + }% + }% + \Css{% + span.HoLogo-LaTeX2e span.HoLogo-e{% + position:relative;% + top:.35ex;% + text-decoration:none;% + }% + }% + \global\let\HoLogoCss@LaTeXe\relax +} +\expandafter +\let\csname HoLogo@LaTeX2e\endcsname\HoLogo@LaTeXe +\expandafter +\let\csname HoLogoCs@LaTeX2e\endcsname\HoLogoCs@LaTeXe +\expandafter +\let\csname HoLogoBkm@LaTeX2e\endcsname\HoLogoBkm@LaTeXe +\expandafter +\let\csname HoLogoHtml@LaTeX2e\endcsname\HoLogoHtml@LaTeXe \expandafter\def\csname HoLogo@LaTeX3\endcsname#1{% \hologo{LaTeX}% 3% @@ -556,32 +1114,208 @@ \hologo{LaTeX}% 3% } +\expandafter +\let\csname HoLogoHtml@LaTeX3\expandafter\endcsname +\csname HoLogo@LaTeX3\endcsname +\def\HoLogo@LaTeXML#1{% + \HOLOGO@mbox{% + \hologo{La}% + \kern-.15em% + T% + \kern-.1667em% + \lower.5ex\hbox{E}% + \kern-.125em% + \HoLogoFont@font{LaTeXML}{sc}{xml}% + }% +} +\def\HoLogoHtml@LaTeXML#1{% + \HOLOGO@Span{LaTeXML}{% + \HoLogoCss@LaTeX + \HoLogoCss@TeX + \HOLOGO@Span{LaTeX}{% + L% + \HOLOGO@Span{a}{% + A% + }% + }% + \HOLOGO@Span{TeX}{% + T% + \HOLOGO@Span{e}{% + E% + }% + }% + \HCode{<span style="font-variant: small-caps;">}% + xml% + \HCode{</span>}% + }% +} \def\HoLogo@eTeX#1{% \ltx@mbox{% - \hbox{% - \HOLOGO@MathSetup - $\varepsilon$% - -% - \HOLOGO@NegativeKerning{-T,T-,To}% - \hologo{TeX}% - }% + \HOLOGO@MathSetup + $\varepsilon$% + -% + \HOLOGO@NegativeKerning{-T,T-,To}% + \hologo{TeX}% }% } +\ifnum64=`\^^^^0040\relax % test for big chars of LuaTeX/XeTeX + \catcode`\$=9 % + \catcode`\&=14 % +\else + \catcode`\$=14 % + \catcode`\&=9 % +\fi +\def\HoLogoCs@eTeX#1{% +$ #1{\string ^^^^0395}{\string ^^^^03b5}% +& #1{e}{E}% + TeX% +}% +\catcode`\$=3 % +\catcode`\&=4 % \def\HoLogoBkm@eTeX#1{% \HOLOGO@PdfdocUnicode{#1{e}{E}}{\textepsilon}% -% \hologo{TeX}% } +\def\HoLogoHtml@eTeX#1{% + \ltx@mbox{% + \HOLOGO@MathSetup + $\varepsilon$% + -% + \hologo{TeX}% + }% +} \def\HoLogo@iniTeX#1{% \HOLOGO@mbox{% - ini\hologo{TeX}% + #1{i}{I}ni\hologo{TeX}% }% } +\def\HoLogoCs@iniTeX#1{#1{i}{I}niTeX} +\def\HoLogoBkm@iniTeX#1{% + #1{i}{I}ni\hologo{TeX}% +} +\let\HoLogoHtml@iniTeX\HoLogo@iniTeX \def\HoLogo@virTeX#1{% \HOLOGO@mbox{% - ini\hologo{TeX}% + #1{v}{V}ir\hologo{TeX}% + }% +} +\def\HoLogoCs@virTeX#1{#1{v}{V}irTeX} +\def\HoLogoBkm@virTeX#1{% + #1{v}{V}ir\hologo{TeX}% +} +\let\HoLogoHtml@virTeX\HoLogo@virTeX +\def\HoLogo@SLiTeX@lift#1{% + \HoLogoFont@font{SliTeX}{rm}{% + S% + \kern-.06em% + L% + \kern-.18em% + \raise.32ex\hbox{\HoLogoFont@font{SliTeX}{sc}{i}}% + \HOLOGO@discretionary + \kern-.06em% + \hologo{TeX}% + }% +} +\def\HoLogoBkm@SLiTeX@lift#1{SLiTeX} +\def\HoLogoHtml@SLiTeX@lift#1{% + \HoLogoCss@SLiTeX@lift + \HOLOGO@Span{SLiTeX-lift}{% + \HoLogoFont@font{SliTeX}{rm}{% + S% + \HOLOGO@Span{L}{L}% + \HOLOGO@Span{i}{i}% + \hologo{TeX}% + }% + }% +} +\def\HoLogoCss@SLiTeX@lift{% + \Css{% + span.HoLogo-SLiTeX-lift span.HoLogo-L{% + margin-left:-.06em;% + margin-right:-.18em;% + }% + }% + \Css{% + span.HoLogo-SLiTeX-lift span.HoLogo-i{% + position:relative;% + top:-.32ex;% + margin-right:-.06em;% + font-variant:small-caps;% + }% + }% + \global\let\HoLogoCss@SLiTeX@lift\relax +} +\def\HoLogo@SliTeX@simple#1{% + \HoLogoFont@font{SliTeX}{rm}{% + \ltx@mbox{% + \HoLogoFont@font{SliTeX}{sc}{Sli}% + }% + \HOLOGO@discretionary + \hologo{TeX}% + }% +} +\def\HoLogoBkm@SliTeX@simple#1{SliTeX} +\let\HoLogoHtml@SliTeX@simple\HoLogo@SliTeX@simple +\def\HoLogo@SliTeX@narrow#1{% + \HoLogoFont@font{SliTeX}{rm}{% + \ltx@mbox{% + S% + \kern-.06em% + \HoLogoFont@font{SliTeX}{sc}{% + l% + \kern-.035em% + i% + }% + }% + \HOLOGO@discretionary + \kern-.06em% + \hologo{TeX}% + }% +} +\def\HoLogoBkm@SliTeX@narrow#1{SliTeX} +\def\HoLogoHtml@SliTeX@narrow#1{% + \HoLogoCss@SliTeX@narrow + \HOLOGO@Span{SliTeX-narrow}{% + \HoLogoFont@font{SliTeX}{rm}{% + S% + \HOLOGO@Span{l}{l}% + \HOLOGO@Span{i}{i}% + \hologo{TeX}% + }% + }% +} +\def\HoLogoCss@SliTeX@narrow{% + \Css{% + span.HoLogo-SliTeX-narrow span.HoLogo-l{% + margin-left:-.06em;% + margin-right:-.035em;% + font-variant:small-caps;% + }% }% + \Css{% + span.HoLogo-SliTeX-narrow span.HoLogo-i{% + margin-right:-.06em;% + font-variant:small-caps;% + }% + }% + \global\let\HoLogoCss@SliTeX@narrow\relax } +\def\HoLogo@SLiTeX@simple{\HoLogo@SliTeX@simple} +\def\HoLogoBkm@SLiTeX@simple{\HoLogoBkm@SliTeX@simple} +\def\HoLogoHtml@SLiTeX@simple{\HoLogoHtml@SliTeX@simple} +\def\HoLogo@SLiTeX@narrow{\HoLogo@SliTeX@narrow} +\def\HoLogoBkm@SLiTeX@narrow{\HoLogoBkm@SliTeX@narrow} +\def\HoLogoHtml@SLiTeX@narrow{\HoLogoHtml@SliTeX@narrow} +\def\HoLogo@SliTeX@lift{\HoLogo@SLiTeX@lift} +\def\HoLogoBkm@SliTeX@lift{\HoLogoBkm@SLiTeX@lift} +\def\HoLogoHtml@SliTeX@lift{\HoLogoHtml@SLiTeX@lift} +\def\HoLogo@SLiTeX{\HoLogo@SLiTeX@lift} +\def\HoLogoBkm@SLiTeX{\HoLogoBkm@SLiTeX@lift} +\def\HoLogoHtml@SLiTeX{\HoLogoHtml@SLiTeX@lift} +\def\HoLogo@SliTeX{\HoLogo@SliTeX@narrow} +\def\HoLogoBkm@SliTeX{\HoLogoBkm@SliTeX@narrow} +\def\HoLogoHtml@SliTeX{\HoLogoHtml@SliTeX@narrow} \def\HoLogo@LuaTeX#1{% \HOLOGO@mbox{% Lua% @@ -589,261 +1323,1010 @@ \hologo{TeX}% }% } +\let\HoLogoHtml@LuaTeX\HoLogo@LuaTeX \def\HoLogo@LuaLaTeX#1{% \HOLOGO@mbox{% Lua% \hologo{LaTeX}% }% } +\let\HoLogoHtml@LuaLaTeX\HoLogo@LuaLaTeX +\ifluatex + \ifnum\luatexversion<36 % + \else + \def\HOLOGO@IfCharExists#1{% + \ifnum + \directlua{% + if font and font.fonts and font.current then % + local f = font.fonts[font.current()]% + if f.characters and f.characters[\number#1] then % + tex.print("1")% + end % + end% + }0=\ltx@zero + \expandafter\ltx@secondoftwo + \else + \expandafter\ltx@firstoftwo + \fi + }% + \fi +\fi +\ltx@IfUndefined{HOLOGO@IfCharExists}{% + \def\HOLOGO@@IfCharExists#1{% + \begingroup + \tracinglostchars=\ltx@zero + \setbox\ltx@zero=\hbox{% + \kern7sp\char#1\relax + \ifnum\lastkern>\ltx@zero + \expandafter\aftergroup\csname iffalse\endcsname + \else + \expandafter\aftergroup\csname iftrue\endcsname + \fi + }% + % \if{true|false} from \aftergroup + \endgroup + \expandafter\ltx@firstoftwo + \else + \endgroup + \expandafter\ltx@secondoftwo + \fi + }% + \ifxetex + \ltx@IfUndefined{XeTeXfonttype}{}{% + \ltx@IfUndefined{XeTeXcharglyph}{}{% + \def\HOLOGO@IfCharExists#1{% + \ifnum\XeTeXfonttype\font>\ltx@zero + \expandafter\ltx@firstofthree + \else + \expandafter\ltx@gobble + \fi + {% + \ifnum\XeTeXcharglyph#1>\ltx@zero + \expandafter\ltx@firstoftwo + \else + \expandafter\ltx@secondoftwo + \fi + }% + \HOLOGO@@IfCharExists{#1}% + }% + }% + }% + \fi +}{} +\ltx@ifundefined{HOLOGO@IfCharExists}{% + \ifnum64=`\^^^^0040\relax % test for big chars of LuaTeX/XeTeX + \let\HOLOGO@IfCharExists\HOLOGO@@IfCharExists + \else + \def\HOLOGO@IfCharExists#1{% + \ifnum#1>255 % + \expandafter\ltx@fourthoffour + \fi + \HOLOGO@@IfCharExists{#1}% + }% + \fi +}{} \def\HoLogo@Xe#1{% X% \kern-.1em\relax - \ltx@IfUndefined{HOLOGO@ReflectBox}\ltx@firstoftwo{% - \ltx@IfUndefined{HOLOGO@ReflectBox@\hologodriver}% - \ltx@firstoftwo\ltx@secondoftwo + \HOLOGO@IfCharExists{"018E}{% + \lower.5ex\hbox{\char"018E}% + }{% + \chardef\HOLOGO@choice=\ltx@zero + \ifdim\fontdimen\ltx@one\font>0pt % + \ltx@IfUndefined{rotatebox}{% + \ltx@IfUndefined{pgftext}{% + \ltx@IfUndefined{psscalebox}{% + \ltx@IfUndefined{HOLOGO@ScaleBox@\hologoDriver}{% + }{% + \chardef\HOLOGO@choice=4 % + }% + }{% + \chardef\HOLOGO@choice=3 % + }% + }{% + \chardef\HOLOGO@choice=2 % + }% + }{% + \chardef\HOLOGO@choice=1 % + }% + \ifcase\HOLOGO@choice + \HOLOGO@WarningUnsupportedDriver{Xe}% + e% + \or % 1: \rotatebox + \begingroup + \setbox\ltx@zero\hbox{\rotatebox{180}{E}}% + \ltx@LocDimenA=\dp\ltx@zero + \advance\ltx@LocDimenA by -.5ex\relax + \raise\ltx@LocDimenA\box\ltx@zero + \endgroup + \or % 2: \pgftext + \lower.5ex\hbox{% + \pgfpicture + \pgftext[rotate=180]{E}% + \endpgfpicture + }% + \or % 3: \psscalebox + \begingroup + \setbox\ltx@zero\hbox{\psscalebox{-1 -1}{E}}% + \ltx@LocDimenA=\dp\ltx@zero + \advance\ltx@LocDimenA by -.5ex\relax + \raise\ltx@LocDimenA\box\ltx@zero + \endgroup + \or % 4: \HOLOGO@PointReflectBox + \lower.5ex\hbox{\HOLOGO@PointReflectBox{E}}% + \else + \@PackageError{hologo}{Internal error (choice/it}\@ehc + \fi + \else + \ltx@IfUndefined{reflectbox}{% + \ltx@IfUndefined{pgftext}{% + \ltx@IfUndefined{psscalebox}{% + \ltx@IfUndefined{HOLOGO@ScaleBox@\hologoDriver}{% + }{% + \chardef\HOLOGO@choice=4 % + }% + }{% + \chardef\HOLOGO@choice=3 % + }% + }{% + \chardef\HOLOGO@choice=2 % + }% + }{% + \chardef\HOLOGO@choice=1 % + }% + \ifcase\HOLOGO@choice + \HOLOGO@WarningUnsupportedDriver{Xe}% + e% + \or % 1: reflectbox + \lower.5ex\hbox{% + \reflectbox{E}% + }% + \or % 2: \pgftext + \lower.5ex\hbox{% + \pgfpicture + \pgftransformxscale{-1}% + \pgftext{E}% + \endpgfpicture + }% + \or % 3: \psscalebox + \lower.5ex\hbox{% + \psscalebox{-1 1}{E}% + }% + \or % 4: \HOLOGO@Reflectbox + \lower.5ex\hbox{% + \HOLOGO@ReflectBox{E}% + }% + \else + \@PackageError{hologo}{Internal error (choice/up)}\@ehc + \fi + \fi + }% +} +\def\HoLogoHtml@Xe#1{% + \HoLogoCss@Xe + \HOLOGO@Span{Xe}{% + X% + \HOLOGO@Span{e}{% + \HCode{&\ltx@hashchar x018e;}% + }% }% - {e}{% - \lower.5ex\hbox{% - \HOLOGO@ReflectBox{E}% +} +\def\HoLogoCss@Xe{% + \Css{% + span.HoLogo-Xe span.HoLogo-e{% + position:relative;% + top:.5ex;% + left-margin:-.1em;% }% }% + \global\let\HoLogoCss@Xe\relax } \def\HoLogo@XeTeX#1{% \hologo{Xe}% \kern-.15em\relax \hologo{TeX}% } +\def\HoLogoHtml@XeTeX#1{% + \HoLogoCss@XeTeX + \HOLOGO@Span{XeTeX}{% + \hologo{Xe}% + \hologo{TeX}% + }% +} +\def\HoLogoCss@XeTeX{% + \Css{% + span.HoLogo-XeTeX span.HoLogo-TeX{% + margin-left:-.15em;% + }% + }% + \global\let\HoLogoCss@XeTeX\relax +} \def\HoLogo@XeLaTeX#1{% \hologo{Xe}% + \kern-.13em% \hologo{LaTeX}% } +\def\HoLogoHtml@XeLaTeX#1{% + \HoLogoCss@XeLaTeX + \HOLOGO@Span{XeLaTeX}{% + \hologo{Xe}% + \hologo{LaTeX}% + }% +} +\def\HoLogoCss@XeLaTeX{% + \Css{% + span.HoLogo-XeLaTeX span.HoLogo-Xe{% + margin-right:-.13em;% + }% + }% + \global\let\HoLogoCss@XeLaTeX\relax +} \def\HoLogo@pdfTeX#1{% \HOLOGO@mbox{% #1{p}{P}df\hologo{TeX}% }% } +\def\HoLogoCs@pdfTeX#1{#1{p}{P}dfTeX} +\def\HoLogoBkm@pdfTeX#1{% + #1{p}{P}df\hologo{TeX}% +} +\let\HoLogoHtml@pdfTeX\HoLogo@pdfTeX \def\HoLogo@pdfLaTeX#1{% \HOLOGO@mbox{% #1{p}{P}df\hologo{LaTeX}% }% } +\def\HoLogoCs@pdfLaTeX#1{#1{p}{P}dfLaTeX} +\def\HoLogoBkm@pdfLaTeX#1{% + #1{p}{P}df\hologo{LaTeX}% +} +\let\HoLogoHtml@pdfLaTeX\HoLogo@pdfLaTeX \def\HoLogo@VTeX#1{% \HOLOGO@mbox{% V\hologo{TeX}% }% } +\let\HoLogoHtml@VTeX\HoLogo@VTeX \def\HoLogo@AmS#1{% - \begingroup - \usefont{OMS}{cmsy}{m}{n}% + \HoLogoFont@font{AmS}{sy}{% A% \kern-.1667em% \lower.5ex\hbox{M}% \kern-.125em% S% - \endgroup + }% } \def\HoLogoBkm@AmS#1{AmS} +\def\HoLogoHtml@AmS#1{% + \HoLogoCss@AmS + \HOLOGO@Span{AmS}{% + A% + \HOLOGO@Span{M}{M}% + S% + }% +} +\def\HoLogoCss@AmS{% + \Css{% + span.HoLogo-AmS span.HoLogo-M{% + position:relative;% + top:.5ex;% + margin-left:-.1667em;% + margin-right:-.125em;% + text-decoration:none;% + }% + }% + \global\let\HoLogoCss@AmS\relax +} \def\HoLogo@AmSTeX#1{% \hologo{AmS}% \HOLOGO@hyphen \hologo{TeX}% } -\def\HoLogoBkm@AmSLaTeX#1{AmS-TeX}% +\def\HoLogoBkm@AmSTeX#1{AmS-TeX}% +\let\HoLogoHtml@AmSTeX\HoLogo@AmSTeX \def\HoLogo@AmSLaTeX#1{% \hologo{AmS}% \HOLOGO@hyphen \hologo{LaTeX}% } \def\HoLogoBkm@AmSLaTeX#1{AmS-LaTeX}% +\let\HoLogoHtml@AmSLaTeX\HoLogo@AmSLaTeX +\def\HoLogo@BibTeX@sc#1{% + B% + \kern-.05em% + \HoLogoFont@font{BibTeX}{sc}{% + i% + \kern-.025em% + b% + }% + \HOLOGO@discretionary + \kern-.08em% + \hologo{TeX}% +} +\def\HoLogoHtml@BibTeX@sc#1{% + \HoLogoCss@BibTeX@sc + \HOLOGO@Span{BibTeX-sc}{% + B% + \HOLOGO@Span{i}{i}% + \HOLOGO@Span{b}{b}% + \hologo{TeX}% + }% +} +\def\HoLogoCss@BibTeX@sc{% + \Css{% + span.HoLogo-BibTeX-sc span.HoLogo-i{% + margin-left:-.05em;% + margin-right:-.025em;% + font-variant:small-caps;% + }% + }% + \Css{% + span.HoLogo-BibTeX-sc span.HoLogo-b{% + margin-right:-.08em;% + font-variant:small-caps;% + }% + }% + \global\let\HoLogoCss@BibTeX@sc\relax +} +\def\HoLogo@BibTeX@sf#1{% + B% + \kern-.05em% + \HoLogoFont@font{BibTeX}{bibsf}{% + I% + \kern-.025em% + B% + }% + \HOLOGO@discretionary + \kern-.08em% + \hologo{TeX}% +} +\def\HoLogoHtml@BibTeX@sf#1{% + \HoLogoCss@BibTeX@sf + \HOLOGO@Span{BibTeX-sf}{% + B% + \HoLogoFont@font{BibTeX}{bibsf}{% + \HOLOGO@Span{i}{I}% + B% + }% + \hologo{TeX}% + }% +} +\def\HoLogoCss@BibTeX@sf{% + \Css{% + span.HoLogo-BibTeX-sf span.HoLogo-i{% + margin-left:-.05em;% + margin-right:-.025em;% + }% + }% + \Css{% + span.HoLogo-BibTeX-sf span.HoLogo-TeX{% + margin-left:-.08em;% + }% + }% + \global\let\HoLogoCss@BibTeX@sf\relax +} +\def\HoLogo@BibTeX{\HoLogo@BibTeX@sf} +\def\HoLogoHtml@BibTeX{\HoLogoHtml@BibTeX@sf} +\expandafter\def\csname HoLogo@BibTeX8\endcsname#1{% + \hologo{BibTeX}% + 8% +} +\expandafter\def\csname HoLogoBkm@BibTeX8\endcsname#1{% + \hologo{BibTeX}% + 8% +} +\expandafter +\let\csname HoLogoHtml@BibTeX8\expandafter\endcsname +\csname HoLogo@BibTeX8\endcsname \def\HoLogo@ConTeXt@simple#1{% \HOLOGO@mbox{Con}% \HOLOGO@discretionary \HOLOGO@mbox{\hologo{TeX}t}% } +\let\HoLogoHtml@ConTeXt@simple\HoLogo@ConTeXt@simple \def\HoLogo@ConTeXt@narrow#1{% \HOLOGO@mbox{C\kern-.0333emon}% \HOLOGO@discretionary \kern-.0667em% \HOLOGO@mbox{\hologo{TeX}\kern-.0333emt}% } +\def\HoLogoHtml@ConTeXt@narrow#1{% + \HoLogoCss@ConTeXt@narrow + \HOLOGO@Span{ConTeXt-narrow}{% + \HOLOGO@Span{C}{C}% + on% + \hologo{TeX}% + t% + }% +} +\def\HoLogoCss@ConTeXt@narrow{% + \Css{% + span.HoLogo-ConTeXt-narrow span.HoLogo-C{% + margin-left:-.0333em;% + }% + }% + \Css{% + span.HoLogo-ConTeXt-narrow span.HoLogo-TeX{% + margin-left:-.0667em;% + margin-right:-.0333em;% + }% + }% + \global\let\HoLogoCss@ConTeXt@narrow\relax +} \def\HoLogo@ConTeXt{\HoLogo@ConTeXt@narrow} +\def\HoLogoHtml@ConTeXt{\HoLogoHtml@ConTeXt@narrow} +\def\HoLogo@emTeX#1{% + \HOLOGO@mbox{#1{e}{E}m}% + \HOLOGO@discretionary + \hologo{TeX}% +} +\def\HoLogoCs@emTeX#1{#1{e}{E}mTeX}% +\def\HoLogoBkm@emTeX#1{% + #1{e}{E}m\hologo{TeX}% +} +\let\HoLogoHtml@emTeX\HoLogo@emTeX +\def\HoLogo@ExTeX#1{% + \HoLogoFont@font{ExTeX}{rm}{% + \ltx@mbox{% + \HOLOGO@MathSetup + $% + \textstyle + \varepsilon_{% + \kern-0.15em% + \HoLogoFont@font{ExTeX}{sy}{X}% + }% + $% + }% + \HOLOGO@discretionary + \kern-.15em% + \hologo{TeX}% + }% +} +\def\HoLogoHtml@ExTeX#1{% + \HoLogoCss@ExTeX + \HoLogoFont@font{ExTeX}{rm}{% + \HOLOGO@Span{ExTeX}{% + \ltx@mbox{% + \HOLOGO@MathSetup + $\textstyle\varepsilon$% + \HOLOGO@Span{X}{$\textstyle\chi$}% + \hologo{TeX}% + }% + }% + }% +} +\def\HoLogoBkm@ExTeX#1{% + \HOLOGO@PdfdocUnicode{#1{e}{E}x}{\textepsilon\textchi}% + \hologo{TeX}% +} +\def\HoLogoCss@ExTeX{% + \Css{% + span.HoLogo-ExTeX{% + font-family:serif;% + }% + }% + \Css{% + span.HoLogo-ExTeX span.HoLogo-TeX{% + margin-left:-.15em;% + }% + }% + \global\let\HoLogoCss@ExTeX\relax +} +\def\HoLogo@MiKTeX#1{% + \HOLOGO@mbox{MiK}% + \HOLOGO@discretionary + \hologo{TeX}% +} +\let\HoLogoHtml@MiKTeX\HoLogo@MiKTeX +\def\HoLogo@OzTeX#1{% + O% + \kern-.03em % + z% + \kern-.15em % + \hologo{TeX}% +} +\def\HoLogoHtml@OzTeX#1{% + \HoLogoCss@OzTeX + \HOLOGO@Span{OzTeX}{% + O% + \HOLOGO@Span{z}{z}% + \hologo{TeX}% + }% +} +\def\HoLogoCss@OzTeX{% + \Css{% + span.HoLogo-OzTeX span.HoLogo-z{% + margin-left:-.03em;% + margin-right:-.15em;% + }% + }% + \global\let\HoLogoCss@OzTeX\relax +} +\def\HoLogo@OzMF#1{% + \HOLOGO@mbox{OzMF}% +} +\def\HoLogo@OzMP#1{% + \HOLOGO@mbox{OzMP}% +} +\def\HoLogo@OzTtH#1{% + \HOLOGO@mbox{OzTtH}% +} +\def\HoLogo@PCTeX#1{% + \HOLOGO@mbox{PC}% + \hologo{TeX}% +} +\let\HoLogoHtml@PCTeX\HoLogo@PCTeX +\def\HoLogo@PiC#1{% + P% + \kern-.12em% + \lower.5ex\hbox{I}% + \kern-.075em% + C% + \HOLOGO@SpaceFactor +} +\def\HoLogoHtml@PiC#1{% + \HoLogoCss@PiC + \HOLOGO@Span{PiC}{% + P% + \HOLOGO@Span{i}{I}% + C% + }% +} +\def\HoLogoCss@PiC{% + \Css{% + span.HoLogo-PiC span.HoLogo-i{% + position:relative;% + top:.5ex;% + margin-left:-.12em;% + margin-right:-.075em;% + text-decoration:none;% + }% + }% + \global\let\HoLogoCss@PiC\relax +} +\def\HoLogo@PiCTeX#1{% + \hologo{PiC}% + \HOLOGO@discretionary + \kern-.11em% + \hologo{TeX}% +} +\def\HoLogoHtml@PiCTeX#1{% + \HoLogoCss@PiCTeX + \HOLOGO@Span{PiCTeX}{% + \hologo{PiC}% + \hologo{TeX}% + }% +} +\def\HoLogoCss@PiCTeX{% + \Css{% + span.HoLogo-PiCTeX span.HoLogo-PiC{% + margin-right:-.11em;% + }% + }% + \global\let\HoLogoCss@PiCTeX\relax +} +\def\HoLogo@teTeX#1{% + \HOLOGO@mbox{#1{t}{T}e}% + \HOLOGO@discretionary + \hologo{TeX}% +} +\def\HoLogoCs@teTeX#1{#1{t}{T}dfTeX} +\def\HoLogoBkm@teTeX#1{% + #1{t}{T}e\hologo{TeX}% +} +\let\HoLogoHtml@teTeX\HoLogo@teTeX +\expandafter\def\csname HoLogo@TeX4ht\endcsname#1{% + \HOLOGO@mbox{\hologo{TeX}4ht}% +} +\expandafter +\let\csname HoLogoHtml@TeX4ht\expandafter\endcsname +\csname HoLogo@TeX4ht\endcsname +\def\HoLogo@SageTeX#1{% + \HOLOGO@mbox{Sage}% + \HOLOGO@discretionary + \HOLOGO@NegativeKerning{eT,oT,To}% + \hologo{TeX}% +} +\let\HoLogoHtml@SageTeX\HoLogo@SageTeX +\def\HoLogo@METAFONT#1{% + \HoLogoFont@font{METAFONT}{logo}{% + \HOLOGO@mbox{META}% + \HOLOGO@discretionary + \HOLOGO@mbox{FONT}% + }% +} +\def\HoLogo@METAPOST#1{% + \HoLogoFont@font{METAPOST}{logo}{% + \HOLOGO@mbox{META}% + \HOLOGO@discretionary + \HOLOGO@mbox{POST}% + }% +} +\def\HoLogo@MetaFun#1{% + \HOLOGO@mbox{Meta}% + \HOLOGO@discretionary + \HOLOGO@mbox{Fun}% +} +\def\HoLogo@MetaPost#1{% + \HOLOGO@mbox{Meta}% + \HOLOGO@discretionary + \HOLOGO@mbox{Post}% +} +\def\HoLogo@biber#1{% + \HOLOGO@mbox{#1{b}{B}i}% + \HOLOGO@discretionary + \HOLOGO@mbox{ber}% +} +\def\HoLogoCs@biber#1{#1{b}{B}iber} +\def\HoLogoBkm@biber#1{% + #1{b}{B}iber% +} +\let\HoLogoHtml@biber\HoLogo@biber +\def\HoLogo@KOMAScript#1{% + \HoLogoFont@font{KOMAScript}{sf}{% + \HOLOGO@mbox{% + K\kern.05em% + O\kern.05em% + M\kern.05em% + A% + }% + \kern.1em% + \HOLOGO@hyphen + \kern.1em% + \HOLOGO@mbox{Script}% + }% +} +\def\HoLogoBkm@KOMAScript#1{% + KOMA-Script% +} +\def\HoLogoHtml@KOMAScript#1{% + \HoLogoCss@KOMAScript + \HoLogoFont@font{KOMAScript}{sf}{% + \HOLOGO@Span{KOMAScript}{% + K% + \HOLOGO@Span{O}{O}% + M% + \HOLOGO@Span{A}{A}% + \HOLOGO@Span{hyphen}{-}% + Script% + }% + }% +} +\def\HoLogoCss@KOMAScript{% + \Css{% + span.HoLogo-KOMAScript{% + font-family:sans-serif;% + }% + }% + \Css{% + span.HoLogo-KOMAScript span.HoLogo-O{% + padding-left:.05em;% + padding-right:.05em;% + }% + }% + \Css{% + span.HoLogo-KOMAScript span.HoLogo-A{% + padding-left:.05em;% + }% + }% + \Css{% + span.HoLogo-KOMAScript span.HoLogo-hyphen{% + padding-left:.1em;% + padding-right:.1em;% + }% + }% + \global\let\HoLogoCss@KOMAScript\relax +} +\def\HoLogo@LyX#1{% + L% + \kern-.1667em% + \lower.25em\hbox{Y}% + \kern-.125em% + X% + \HOLOGO@SpaceFactor +} +\def\HoLogoHtml@LyX#1{% + \HoLogoCss@LyX + \HOLOGO@Span{LyX}{% + L% + \HOLOGO@Span{y}{Y}% + X% + }% +} +\def\HoLogoCss@LyX{% + \Css{% + span.HoLogo-LyX span.HoLogo-y{% + position:relative;% + top:.25em;% + margin-left:-.1667em;% + margin-right:-.125em;% + text-decoration:none;% + }% + }% + \global\let\HoLogoCss@LyX\relax +} +\def\HoLogo@NTS#1{% + \HoLogoFont@font{NTS}{sy}{% + N\/% + \kern-.35em% + \lower.5ex\hbox{T\/}% + \kern-.2em% + S\/% + }% + \HOLOGO@SpaceFactor +} +\def\HoLogo@TTH#1{% + \ltx@mbox{% + T\HOLOGO@SubScript{T}H% + }% + \HOLOGO@SpaceFactor +} +\def\HoLogoHtml@TTH#1{% + T\HCode{<sub>}T\HCode{</sub>}H% +} +\def\HoLogo@HanTheThanh#1{% + \ltx@mbox{H\`an}% + \HOLOGO@space + \ltx@mbox{% + Th% + \HOLOGO@IfCharExists{"1EBF}{% + \char"1EBF\relax + }{% + \^e\hbox to 0pt{\hss\raise .5ex\hbox{\'{}}}% + }% + }% + \HOLOGO@space + \ltx@mbox{Th\`anh}% +} +\def\HoLogoBkm@HanTheThanh#1{% + H\`an % + Th\HOLOGO@PdfdocUnicode{\^e}{\9036\277} % + Th\`anh% +} +\def\HoLogoHtml@HanTheThanh#1{% + H\`an % + Th\HCode{&\ltx@hashchar x1ebf;} % + Th\`anh% +} \HOLOGO@IfExists\InputIfFileExists{% \InputIfFileExists{hologo.cfg}{}{}% }{% \ltx@IfUndefined{pdf@filesize}{% - \chardef\HOLOGO@temp=15 % - \def\HOLOGO@CheckRead{% + \def\HOLOGO@InputIfExists{% + \openin\HOLOGO@temp=hologo.cfg\relax \ifeof\HOLOGO@temp + \closein\HOLOGO@temp \else - \ifcase\HOLOGO@temp - \csname newread\endcsname\HOLOGO@temp + \closein\HOLOGO@temp + \begingroup + \def\x{LaTeX2e}% + \expandafter\endgroup + \ifx\fmtname\x + \input{hologo.cfg}% \else - \begingroup - \count\ltx@cclv=\HOLOGO@temp - \advance\ltx@cclv by -1 % - \edef\x{\endgroup - \chardef\noexpand\HOLOGO@temp=\the\count\ltx@cclv\relax - }% - \x - \expandafter\expandafter\expandafter\HOLOGO@CheckRead + \input hologo.cfg\relax \fi \fi }% - \ifeof\HOLOGO@temp - \@PackageWarningNoLine{hologo}{% - Configuration file ignored, because\MessageBreak - a free read register could not be found% + \ltx@IfUndefined{newread}{% + \chardef\HOLOGO@temp=15 % + \def\HOLOGO@CheckRead{% + \ifeof\HOLOGO@temp + \HOLOGO@InputIfExists + \else + \ifcase\HOLOGO@temp + \@PackageWarningNoLine{hologo}{% + Configuration file ignored, because\MessageBreak + a free read register could not be found% + }% + \else + \begingroup + \count\ltx@cclv=\HOLOGO@temp + \advance\ltx@cclv by \ltx@minusone + \edef\x{\endgroup + \chardef\noexpand\HOLOGO@temp=\the\count\ltx@cclv + \relax + }% + \x + \fi + \fi }% - \else - \openin\HOLOGO@temp=hologo.cfg\relax - \ifeof\HOLOGO@temp - \closein\HOLOGO@temp - \else - \closein\HOLOGO@temp - \input hologo.cfg\relax - \fi - \fi + }{% + \csname newread\endcsname\HOLOGO@temp + \HOLOGO@InputIfExists + }% }{% \edef\HOLOGO@temp{\pdf@filesize{hologo.cfg}}% \ifx\HOLOGO@temp\ltx@empty \else - \input hologo.cfg\relax - \fi - }% -} -\ltx@IfUndefined{DeclareOption}{% - \ltx@gobble -}{% - \ltx@IfUndefined{ProcessOptions}\ltx@gobble\ltx@firstofone -}% -{% - \def\HOLOGO@temp#1#2{% - \DeclareOption{#1}{\edef\hologodriver{#2}}% - }% - \kv@parse@normalized{% - pdftex,% - luatex=pdftex,% - dvipdfm,% - dvipdfmx=dvipdfm,% - dvips,% - dvipsone=dvips,% - xdvi=dvips,% - xetex,% - vtex,% - }{% - \ifx\kv@value\relax - \expandafter\HOLOGO@temp\expandafter{\kv@key}\kv@key - \else - \expandafter\HOLOGO@temp\expandafter{\kv@key}\kv@value + \ifnum\HOLOGO@temp>0 % + \begingroup + \def\x{LaTeX2e}% + \expandafter\endgroup + \ifx\fmtname\x + \input{hologo.cfg}% + \else + \input hologo.cfg\relax + \fi + \else + \@PackageInfoNoLine{hologo}{% + Empty configuration file `hologo.cfg' ignored% + }% + \fi \fi - \ltx@gobbletwo }% - \ProcessOptions*% } -\ifpdf - \def\hologodriver{pdftex}% - \let\HOLOGO@pdfliteral\pdfliteral - \ifluatex - \ltx@IfUndefined{HOLOGO@pdfliteral}{% - \ifnum\luatexversion<36 % +\def\HOLOGO@temp#1#2{% + \kv@define@key{HoLogoDriver}{#1}[]{% + \begingroup + \def\HOLOGO@temp{##1}% + \ltx@onelevel@sanitize\HOLOGO@temp + \ifx\HOLOGO@temp\ltx@empty \else - \begingroup - \let\HOLOGO@temp\endgroup - \ifcase0% - \directlua{% - if tex.enableprimitives then % - tex.enableprimitives('HOLOGO@', {'pdfliteral'})% - else % - tex.print('1')% - end% - }% - \ifx\HOLOGO@pdfliteral\@undefined 1\fi% - \relax% - \endgroup - \let\HOLOGO@temp\relax - \global\let\HOLOGO@pdfliteral\HOLOGO@pdfliteral - \fi% - \HOLOGO@temp + \@PackageError{hologo}{% + Value (\HOLOGO@temp) not permitted for option `#1'% + }% + \@ehc \fi - }{}% + \endgroup + \def\hologoDriver{#2}% + }% +}% +\def\HOLOGO@@temp#1#2{% + \ifx\kv@value\relax + \HOLOGO@temp{#1}{#1}% + \else + \HOLOGO@temp{#1}{#2}% \fi - \ltx@IfUndefined{HOLOGO@pdfliteral}{% - \@PackageWarningNoLine{hologo}{% - Cannot find \string\pdfliteral - }% +}% +\kv@parse@normalized{% + pdftex,% + luatex=pdftex,% + dvipdfm,% + dvipdfmx=dvipdfm,% + dvips,% + dvipsone=dvips,% + xdvi=dvips,% + xetex,% + vtex,% +}\HOLOGO@@temp +\kv@define@key{HoLogoDriver}{driverfallback}{% + \def\HOLOGO@DriverFallback{#1}% +} +\def\HOLOGO@DriverFallback{dvips} +\def\hologoDriverSetup{% + \let\hologoDriver\ltx@undefined + \HOLOGO@DriverSetup +} +\def\HOLOGO@DriverSetup#1{% + \kvsetkeys{HoLogoDriver}{#1}% + \HOLOGO@CheckDriver + \ltx@ifundefined{hologoDriver}{% + \begingroup + \edef\x{\endgroup + \noexpand\kvsetkeys{HoLogoDriver}{\HOLOGO@DriverFallback}% + }\x }{}% -\else - \ifxetex - \def\hologodriver{xetex}% + \@PackageInfoNoLine{hologo}{Using driver `\hologoDriver'}% +} +\def\HOLOGO@CheckDriver{% + \ifpdf + \def\hologoDriver{pdftex}% + \let\HOLOGO@pdfliteral\pdfliteral + \ifluatex + \ltx@IfUndefined{HOLOGO@pdfliteral}{% + \ifnum\luatexversion<36 % + \else + \begingroup + \let\HOLOGO@temp\endgroup + \ifcase0% + \directlua{% + if tex.enableprimitives then % + tex.enableprimitives('HOLOGO@', {'pdfliteral'})% + else % + tex.print('1')% + end% + }% + \ifx\HOLOGO@pdfliteral\@undefined 1\fi% + \relax% + \endgroup + \let\HOLOGO@temp\relax + \global\let\HOLOGO@pdfliteral\HOLOGO@pdfliteral + \fi% + \HOLOGO@temp + \fi + }{}% + \fi + \ltx@IfUndefined{HOLOGO@pdfliteral}{% + \@PackageWarningNoLine{hologo}{% + Cannot find \string\pdfliteral + }% + }{}% \else - \ifvtex - \def\hologodriver{vtex}% + \ifxetex + \def\hologoDriver{xetex}% + \else + \ifvtex + \def\hologoDriver{vtex}% + \fi \fi \fi -\fi +} +\def\HOLOGO@WarningUnsupportedDriver#1{% + \@PackageWarningNoLine{hologo}{% + Logo `#1' needs driver specific macros,\MessageBreak + but driver `\hologoDriver' is not supported.\MessageBreak + Use a different driver or\MessageBreak + load package `graphics' or `pgf'% + }% +} \ltx@IfUndefined{reflectbox}{}{% - \def\HOLOGO@ReflectBox{% - \reflectbox + \ltx@IfUndefined{rotatebox}{}{% + \HOLOGO@AtEnd }% +} +\ltx@IfUndefined{pgftext}{}{% \HOLOGO@AtEnd -}% -\ltx@ifundefined{hologodriver}{% - \def\hologodriver{dvips}% - \@PackageInfoNoLine{hologo}{Using default driver `\hologodriver'}% -}{% - \@PackageInfoNoLine{hologo}{Using driver `\hologodriver'}% } +\ltx@IfUndefined{psscalebox}{}{% + \HOLOGO@AtEnd +} +\def\HOLOGO@temp{LaTeX2e} +\ifx\fmtname\HOLOGO@temp + \RequirePackage{kvoptions}[2011/06/30]% + \ProcessKeyvalOptions{HoLogoDriver}% +\fi +\HOLOGO@DriverSetup{} \def\HOLOGO@ReflectBox#1{% - \ltx@IfUndefined{HOLOGO@ReflectBox@\hologodriver}{% - \@PackageWarning{hologo}{% - Driver `\hologodriver' misses support for \string\reflectbox - }% - #1% - }{% - \begingroup - \setbox\ltx@zero\hbox{\begingroup#1\endgroup}% - \setbox\ltx@two\hbox{% - \kern\wd\ltx@zero - \csname HOLOGO@ReflectBox@\hologodriver\endcsname{% - \hbox to 0pt{\copy\z@\hss}% - }% + \begingroup + \setbox\ltx@zero\hbox{\begingroup#1\endgroup}% + \setbox\ltx@two\hbox{% + \kern\wd\ltx@zero + \csname HOLOGO@ScaleBox@\hologoDriver\endcsname{-1}{1}{% + \hbox to 0pt{\copy\ltx@zero\hss}% }% - \wd\ltx@two=\wd\ltx@zero - \box\ltx@two - \endgroup - }% + }% + \wd\ltx@two=\wd\ltx@zero + \box\ltx@two + \endgroup } -\def\HOLOGO@temp#1{% +\def\HOLOGO@PointReflectBox#1{% \begingroup - \def\x{#1}% - \expandafter\endgroup - \ifx\x\hologodriver - \expandafter\ltx@firstofone - \else - \expandafter\ltx@gobble - \fi + \setbox\ltx@zero\hbox{\begingroup#1\endgroup}% + \setbox\ltx@two\hbox{% + \kern\wd\ltx@zero + \raise\ht\ltx@zero\hbox{% + \csname HOLOGO@ScaleBox@\hologoDriver\endcsname{-1}{-1}{% + \hbox to 0pt{\copy\ltx@zero\hss}% + }% + }% + }% + \wd\ltx@two=\wd\ltx@zero + \box\ltx@two + \endgroup } +\def\HOLOGO@temp#1#2{#2} \HOLOGO@temp{pdftex}{% - \def\HOLOGO@ReflectBox@pdftex#1{% + \def\HOLOGO@ScaleBox@pdftex#1#2#3{% \HOLOGO@pdfliteral{% - q -1 0 0 1 0 0 cm% + q #1 0 0 #2 0 0 cm% }% - #1% + #3% \HOLOGO@pdfliteral{% Q% }% }% } \HOLOGO@temp{dvips}{% - \def\HOLOGO@ReflectBox@dvips#1{% + \def\HOLOGO@ScaleBox@dvips#1#2#3{% \special{ps:% gsave % currentpoint % currentpoint translate % - -1 1 scale % + #1 #2 scale % neg exch neg exch translate% }% - #1% + #3% \special{ps:% currentpoint % grestore % @@ -852,20 +2335,20 @@ }% } \HOLOGO@temp{dvipdfm}{% - \let\HOLOGO@ReflectBox@dvipdfm\HOLOGO@ReflectBox@dvips + \let\HOLOGO@ScaleBox@dvipdfm\HOLOGO@ScaleBox@dvips } \HOLOGO@temp{xetex}{% - \def\HOLOGO@ReflectBox@xetex#1{% + \def\HOLOGO@ScaleBox@xetex#1#2#3{% \special{x:gsave}% - \special{x:scale -1 1}% - #1% + \special{x:scale #1 #2}% + #3% \special{x:grestore}% }% } \HOLOGO@temp{vtex}{% - \def\HOLOGO@ReflectBox@vtex#1{% - \special{r(-1,0,0,1,0,0}% - #1% + \def\HOLOGO@ScaleBox@vtex#1#2#3{% + \special{r(#1,0,0,#2,0,0}% + #3% \special{r)}% }% } diff --git a/Master/texmf-dist/tex/generic/oberdiek/iflang.sty b/Master/texmf-dist/tex/generic/oberdiek/iflang.sty index b05ba6eb1d4..5e5734230ac 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/iflang.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/iflang.sty @@ -103,7 +103,7 @@ \fi \expandafter\x\csname ver@iflang.sty\endcsname \ProvidesPackage{iflang}% - [2007/11/11 v1.5 Language checks (HO)]% + [2007/11/11 v1.5 Checks for the current language (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % diff --git a/Master/texmf-dist/tex/generic/oberdiek/ifvtex.sty b/Master/texmf-dist/tex/generic/oberdiek/ifvtex.sty index 166312f934d..2bc95e84e6a 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/ifvtex.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/ifvtex.sty @@ -101,7 +101,7 @@ \fi \expandafter\x\csname ver@ifvtex.sty\endcsname \ProvidesPackage{ifvtex}% - [2010/03/01 v1.5 Switches for detecting VTeX and its modes (HO)]% + [2010/03/01 v1.5 Detect VTeX and its facilities (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % diff --git a/Master/texmf-dist/tex/generic/oberdiek/infwarerr.sty b/Master/texmf-dist/tex/generic/oberdiek/infwarerr.sty index 6013f0dd6fd..29aa6274505 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/infwarerr.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/infwarerr.sty @@ -103,7 +103,7 @@ \fi \expandafter\x\csname ver@infwarerr.sty\endcsname \ProvidesPackage{infwarerr}% - [2010/04/08 v1.3 Providing info/warning/message (HO)]% + [2010/04/08 v1.3 Providing info/warning/error messages (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % diff --git a/Master/texmf-dist/tex/generic/oberdiek/intcalc.sty b/Master/texmf-dist/tex/generic/oberdiek/intcalc.sty index 00786b69eb7..205f43a9ee5 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/intcalc.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/intcalc.sty @@ -103,7 +103,7 @@ \fi \expandafter\x\csname ver@intcalc.sty\endcsname \ProvidesPackage{intcalc}% - [2007/09/27 v1.1 Expandable integer calculations (HO)]% + [2007/09/27 v1.1 Expandable calculations with integers (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % diff --git a/Master/texmf-dist/tex/generic/oberdiek/kvdefinekeys.sty b/Master/texmf-dist/tex/generic/oberdiek/kvdefinekeys.sty index 5a21eea29a2..793c6abbe87 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/kvdefinekeys.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/kvdefinekeys.sty @@ -102,7 +102,7 @@ \fi \expandafter\x\csname ver@kvdefinekeys.sty\endcsname \ProvidesPackage{kvdefinekeys}% - [2011/04/07 v1.3 Defining keys (HO)]% + [2011/04/07 v1.3 Define keys (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % diff --git a/Master/texmf-dist/tex/generic/oberdiek/kvsetkeys.sty b/Master/texmf-dist/tex/generic/oberdiek/kvsetkeys.sty index 5ef5a0edab5..44cc56ca72c 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/kvsetkeys.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/kvsetkeys.sty @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: kvsetkeys -%% Version: 2011/04/07 v1.13 +%% Version: 2012/04/25 v1.16 %% -%% Copyright (C) 2006, 2007, 2009-2011 by +%% Copyright (C) 2006, 2007, 2009-2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -35,7 +35,8 @@ %% and the derived files %% kvsetkeys.sty, kvsetkeys.pdf, kvsetkeys.ins, kvsetkeys.drv, %% kvsetkeys-example.tex, kvsetkeys-test1.tex, -%% kvsetkeys-test2.tex, kvsetkeys-test3.tex. +%% kvsetkeys-test2.tex, kvsetkeys-test3.tex, +%% kvsetkeys-test4.tex. %% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M @@ -103,7 +104,7 @@ \fi \expandafter\x\csname ver@kvsetkeys.sty\endcsname \ProvidesPackage{kvsetkeys}% - [2011/04/07 v1.13 Key value parser (HO)]% + [2012/04/25 v1.16 Key value parser (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -139,7 +140,9 @@ \TMP@EnsureCode{36}{3}% $ \TMP@EnsureCode{38}{4}% & \TMP@EnsureCode{39}{12}% ' +\TMP@EnsureCode{43}{12}% + \TMP@EnsureCode{44}{12}% , +\TMP@EnsureCode{45}{12}% - \TMP@EnsureCode{46}{12}% . \TMP@EnsureCode{47}{12}% / \TMP@EnsureCode{91}{12}% [ @@ -200,11 +203,11 @@ $ \expandafter\endgroup \begingroup \toks@{,#1,}% \KVS@Comma - \KVS@SpaceComma{ }% + \KVS@SpaceComma \KVS@CommaSpace \KVS@CommaComma \KVS@Equals - \KVS@SpaceEquals{ }% + \KVS@SpaceEquals \KVS@EqualsSpace \xdef\KVS@Global{\the\toks@}% \endgroup @@ -214,7 +217,7 @@ $ \expandafter\endgroup \begingroup \toks@{,#1,}% \KVS@Comma - \KVS@SpaceComma{ }% + \KVS@SpaceComma \KVS@CommaSpace \KVS@CommaComma \xdef\KVS@Global{\the\toks@}% @@ -237,15 +240,17 @@ $ \expandafter\endgroup }% }% } -\long\def\KVS@SpaceComma#1{% - \expandafter\KVS@@SpaceComma\the\toks@#1,\KVS@Nil +\def\KVS@SpaceComma#1{% + \def\KVS@SpaceComma{% + \expandafter\KVS@@SpaceComma\the\toks@#1,\KVS@Nil + }% } +\KVS@SpaceComma{ } \long\def\KVS@@SpaceComma#1 ,#2\KVS@Nil{% \KVS@IfEmpty{#2}{% \toks@{#1}% }{% - \toks@{#1,#2}% - \expandafter\KVS@@SpaceComma\the\toks@\KVS@Nil + \KVS@@SpaceComma#1,#2\KVS@Nil }% } \def\KVS@CommaSpace{% @@ -255,18 +260,17 @@ $ \expandafter\endgroup \KVS@IfEmpty{#2}{% \toks@{#1}% }{% - \toks@{#1,#2}% - \expandafter\KVS@@CommaSpace\the\toks@\KVS@Nil + \KVS@@CommaSpace#1,#2\KVS@Nil }% } \def\KVS@CommaComma{% \expandafter\KVS@@CommaComma\the\toks@,\KVS@Nil } \long\def\KVS@@CommaComma#1,,#2\KVS@Nil{% - \toks@{#1,#2}% \KVS@IfEmpty{#2}{% + \toks@{#1,}% (!) }{% - \expandafter\KVS@@CommaComma\the\toks@\KVS@Nil + \KVS@@CommaComma#1,#2\KVS@Nil }% } \begingroup @@ -295,15 +299,17 @@ $ \expandafter\endgroup }% }% } -\long\def\KVS@SpaceEquals#1{% - \expandafter\KVS@@SpaceEquals\the\toks@#1=\KVS@Nil +\def\KVS@SpaceEquals#1{% + \def\KVS@SpaceEquals{% + \expandafter\KVS@@SpaceEquals\the\toks@#1=\KVS@Nil + }% } +\KVS@SpaceEquals{ } \long\def\KVS@@SpaceEquals#1 =#2\KVS@Nil{% \KVS@IfEmpty{#2}{% \toks@{#1}% }{% - \toks@{#1=#2}% - \expandafter\KVS@@SpaceEquals\the\toks@\KVS@Nil + \KVS@@SpaceEquals#1=#2\KVS@Nil }% } \def\KVS@EqualsSpace{% @@ -313,8 +319,7 @@ $ \expandafter\endgroup \KVS@IfEmpty{#2}{% \toks@{#1}% }{% - \toks@{#1=#2}% - \expandafter\KVS@@EqualsSpace\the\toks@\KVS@Nil + \KVS@@EqualsSpace#1=#2\KVS@Nil }% } \long\def\kv@parse#1{% @@ -383,6 +388,13 @@ $ \let\kv@value\KVS@Global \def\comma@break{% \let\KVS@MaybeBreak\KVS@break } +\def\kv@handled@false{% + \let\ifkv@handled@\iffalse +} +\def\kv@handled@true{% + \let\ifkv@handled@\iftrue +} +\kv@handled@true \def\kv@processor@default#1#2{% \begingroup \csname @safe@activestrue\endcsname @@ -393,6 +405,7 @@ $ \let\kv@value\KVS@Global \KVS@temp } \long\def\KVS@ProcessorDefault#1#2#3{% + \def\kv@fam{#1}% & \unless\ifcsname KV@#1@#2\endcsname $ \begingroup\expandafter\expandafter\expandafter\endgroup $ \expandafter\ifx\csname KV@#1@#2\endcsname\relax @@ -401,8 +414,13 @@ $ \begingroup\expandafter\expandafter\expandafter\endgroup $ \expandafter\ifx\csname KVS@#1@handler\endcsname\relax \kv@error@unknownkey{#1}{#2}% \else + \kv@handled@true \csname KVS@#1@handler\endcsname{#2}{#3}% \relax + \ifkv@handled@ + \else + \kv@error@unknownkey{#1}{#2}% + \fi \fi \else \ifx\kv@value\relax @@ -419,6 +437,66 @@ $ \expandafter\ifx\csname KV@#1@#2@default\endcsname\relax \fi \fi } +\def\kv@processor@known#1#2#3{% + \begingroup + \csname @safe@activestrue\endcsname + \let\ifincsname\iftrue + \edef\KVS@temp{\endgroup + \noexpand\KVS@ProcessorKnown{#1}\noexpand#2{#3}% + }% + \KVS@temp +} +\long\def\KVS@ProcessorKnown#1#2#3#4{% + \def\kv@fam{#1}% +& \unless\ifcsname KV@#1@#3\endcsname +$ \begingroup\expandafter\expandafter\expandafter\endgroup +$ \expandafter\ifx\csname KV@#1@#3\endcsname\relax +& \unless\ifcsname KVS@#1@handler\endcsname +$ \begingroup\expandafter\expandafter\expandafter\endgroup +$ \expandafter\ifx\csname KVS@#1@handler\endcsname\relax + \KVS@AddUnhandled#2{#3}{#4}% + \else + \kv@handled@true + \csname KVS@#1@handler\endcsname{#3}{#4}% + \relax + \ifkv@handled@ + \else + \KVS@AddUnhandled#2{#3}{#4}% + \fi + \fi + \else + \ifx\kv@value\relax +& \unless\ifcsname KV@#1@#2@default\endcsname +$ \begingroup\expandafter\expandafter\expandafter\endgroup +$ \expandafter\ifx\csname KV@#1@#3@default\endcsname\relax + \kv@error@novalue{#1}{#3}% + \else + \csname KV@#1@#3@default\endcsname + \relax + \fi + \else + \csname KV@#1@#3\endcsname{#4}% + \fi + \fi +} +\long\def\KVS@AddUnhandled#1#2#3{% +& \edef#1{% +& \ifx#1\KVS@empty +& \else +& \etex@unexpanded{#1},% +& \fi +& \etex@unexpanded{{#2}={#3}}% +& }% +$ \begingroup +$ \ifx#1\KVS@empty +$ \toks@{{#2}={#3}}% +$ \else +$ \toks@\expandafter{#1,{#2}={#3}}% +$ \fi +$ \xdef\KVS@Global{\the\toks@}% +$ \endgroup +$ \let#1\KVS@Global +} \long\def\kv@set@family@handler#1#2{% \begingroup \csname @safe@activestrue\endcsname @@ -426,6 +504,13 @@ $ \expandafter\ifx\csname KV@#1@#2@default\endcsname\relax \expandafter\endgroup \expandafter\def\csname KVS@#1@handler\endcsname##1##2{#2}% } +\long\def\kv@unset@family@handler#1#2{% + \begingroup + \csname @safe@activestrue\endcsname + \let\ifincsname\iftrue + \expandafter\endgroup + \expandafter\let\csname KVS@#1@handler\endcsname\@UnDeFiNeD +} \def\kv@error@novalue{% \kv@error@generic{No value specified for}% } @@ -445,6 +530,49 @@ $ \expandafter\ifx\csname KV@#1@#2@default\endcsname\relax \long\def\kvsetkeys#1#2{% \kv@parse{#2}{\kv@processor@default{#1}}% } +\def\kvsetkeys@expandafter#1#2{% + \expandafter\kv@parse\expandafter{#2}{% + \kv@processor@default{#1}% + }% +} +\def\KVS@cmd{0}% +\def\KVS@cmd@inc{% +& \edef\KVS@cmd{\the\numexpr\KVS@cmd+1}% +$ \begingroup +$ \count255=\KVS@cmd\relax +$ \advance\count255 by 1\relax +$ \edef\x{\endgroup +$ \noexpand\def\noexpand\KVS@cmd{\number\count255}% +$ }% +$ \x +} +\def\KVS@cmd@dec{% +& \edef\KVS@cmd{\the\numexpr\KVS@cmd-1}% +$ \begingroup +$ \count255=\KVS@cmd\relax +$ \advance\count255 by -1\relax +$ \edef\x{\endgroup +$ \noexpand\def\noexpand\KVS@cmd{\number\count255}% +$ }% +$ \x +} +\def\KVS@empty{} +\def\kvsetknownkeys{% + \expandafter + \KVS@setknownkeys\csname KVS@cmd\KVS@cmd\endcsname{}% +} +\long\def\KVS@setknownkeys#1#2#3#4#5{% + \let#1\KVS@empty + \KVS@cmd@inc + #2\kv@parse#2{#5}{\kv@processor@known{#3}#1}% + \KVS@cmd@dec + \let#4=#1% +} +\def\kvsetknownkeys@expandafter{% + \expandafter + \KVS@setknownkeys + \csname KVS@cmd\KVS@cmd\endcsname\expandafter +} \KVS@AtEnd% \endinput %% diff --git a/Master/texmf-dist/tex/generic/oberdiek/ltxcmds.sty b/Master/texmf-dist/tex/generic/oberdiek/ltxcmds.sty index 44459240356..9113f512993 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/ltxcmds.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/ltxcmds.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: ltxcmds -%% Version: 2011/04/18 v1.20 +%% Version: 2011/11/09 v1.22 %% %% Copyright (C) 2009-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -36,7 +36,8 @@ %% ltxcmds.sty, ltxcmds.pdf, ltxcmds.ins, ltxcmds.drv, %% ltxcmds-test1.tex, ltxcmds-test-gobble.tex, %% ltxcmds-test-ifempty.tex, ltxcmds-test-zapspace.tex, -%% ltxcmds-test-ifboxempty.tex, ltxcmds-test-nextchar.tex. +%% ltxcmds-test-ifboxempty.tex, ltxcmds-test-nextchar.tex, +%% ltxcmds-test-carcdr.tex. %% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M @@ -104,7 +105,7 @@ \fi \expandafter\x\csname ver@ltxcmds.sty\endcsname \ProvidesPackage{ltxcmds}% - [2011/04/18 v1.20 LaTeX kernel commands for general use (HO)]% + [2011/11/09 v1.22 LaTeX kernel commands for general use (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -216,16 +217,30 @@ \long\def\ltx@secondoffour#1#2#3#4{#2} \long\def\ltx@thirdoffour#1#2#3#4{#3}% \long\def\ltx@fourthoffour#1#2#3#4{#4}% -\long\def\ltx@car#1#2\@nil{#1} -\long\def\ltx@cdr#1#2\@nil{#2} \long\def\ltx@carzero#1\@nil{}% -\long\def\ltx@cdrzero#1\@nil{#1}% +\long\def\LTXcmds@cdrzero#1\@nil{#1} +\def\ltx@cdrzero{% + \romannumeral\LTXcmds@cdrzero\ltx@zero +} +\long\def\ltx@car#1#2\@nil{#1} +\long\def\ltx@cdr#1{% + \romannumeral\LTXcmds@cdrzero\ltx@zero +} \long\def\ltx@cartwo#1#2#3\@nil{#1#2} -\long\def\ltx@cdrtwo#1#2#3\@nil{#3} +\long\def\ltx@carsecond#1#2#3\@nil{#2} +\long\def\ltx@cdrtwo#1#2{% + \romannumeral\LTXcmds@cdrzero\ltx@zero +} \long\def\ltx@carthree#1#2#3#4\@nil{#1#2#3} -\long\def\ltx@cdrthree#1#2#3#4\@nil{#4} +\long\def\ltx@carthird#1#2#3#4\@nil{#3} +\long\def\ltx@cdrthree#1#2#3{% + \romannumeral\LTXcmds@cdrzero\ltx@zero +} \long\def\ltx@carfour#1#2#3#4#5\@nil{#1#2#3#4} -\long\def\ltx@cdrfour#1#2#3#4#5\@nil{#5} +\long\def\ltx@carfourth#1#2#3#4#5\@nil{#4} +\long\def\ltx@cdrfour#1#2#3#4{% + \romannumeral\LTXcmds@cdrzero\ltx@zero +} \def\ltx@CarNum#1{% \romannumeral \csname LTXcmds@CarNumFinish% @@ -245,12 +260,22 @@ \ltx@zero #1% } +\def\ltx@CarNumth#1{% + \romannumeral + \expandafter\expandafter\expandafter + \LTXcmds@CarNumth + \ltx@GobbleNum{#1}{}% +} +\long\def\LTXcmds@CarNumth#1#2\@nil{% + \ltx@zero + #1% +} \def\ltx@CdrNum#1{% - \romannumeral0% - \expandafter\expandafter\expandafter\LTXcmds@CdrNum + \romannumeral% + \expandafter\expandafter\expandafter\ltx@cdrzero + \expandafter\expandafter\expandafter\ltx@zero \ltx@GobbleNum{#1}% } -\long\def\LTXcmds@CdrNum#1\@nil{ #1}% \long\def\ltx@ReturnAfterFi#1\fi{\fi#1} \long\def\ltx@ReturnAfterElseFi#1\else#2\fi{\fi#1} \def\ltx@empty{} @@ -476,6 +501,36 @@ \endgroup \let#1\LTXcmds@gtemp } +\long\def\ltx@GlobalPrependToMacro#1#2{% + \ifx\ltx@undefined#1% + \let#1\ltx@empty + \else + \ifx\relax#1% + \let#1\ltx@empty + \fi + \fi + \begingroup + \ltx@LocToksA{#2}% + \ltx@LocToksB\expandafter{#1}% + \xdef#1{\the\ltx@LocToksA\the\ltx@LocToksB}% + \endgroup +} +\long\def\ltx@LocalPrependToMacro#1#2{% + \global\let\LTXcmds@gtemp#1% + \ifx\ltx@undefined\LTXcmds@gtemp + \global\let\LTXcmds@gtemp\ltx@empty + \else + \ifx\relax\LTXcmds@gtemp + \global\letLTXcmds@gtemp\ltx@empty + \fi + \fi + \begingroup + \ltx@LocToksA{#2}% + \ltx@LocToksB\expandafter{\LTXcmds@gtemp}% + \xdef\LTXcmds@gtemp{\the\ltx@LocToksA\the\ltx@LocToksB}% + \endgroup + \let#1\LTXcmds@gtemp +} \long\def\ltx@ifnextchar#1#2#3{% \begingroup \let\LTXcmds@CharToken= #1\relax diff --git a/Master/texmf-dist/tex/generic/oberdiek/magicnum.sty b/Master/texmf-dist/tex/generic/oberdiek/magicnum.sty index e6e5081922f..3216c27beef 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/magicnum.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/magicnum.sty @@ -11,7 +11,7 @@ %% Project: magicnum %% Version: 2011/04/10 v1.4 %% -%% Copyright (C) 2007, 2009, 2010, 2011 by +%% Copyright (C) 2007, 2009-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the diff --git a/Master/texmf-dist/tex/generic/oberdiek/mleftright.sty b/Master/texmf-dist/tex/generic/oberdiek/mleftright.sty index 81f11545fa4..fb49dd42705 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/mleftright.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/mleftright.sty @@ -102,7 +102,7 @@ \fi \expandafter\x\csname ver@mleftright.sty\endcsname \ProvidesPackage{mleftright}% - [2010/09/25 v1.0 Usual delimiter spacing with left and right (HO)]% + [2010/09/25 v1.0 Math left/right delim. as open/close (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -188,7 +188,7 @@ \ltx@IfUndefined{currentgrouplevel}{% \catcode38=14 % & = comment }{% - \catcode38=9 % & = ignore_ + \catcode38=9 % & = ignore } & \def\mleftright@GroupLevel{-1}% & \def\mleftright@WrongGroup#1(#2){% diff --git a/Master/texmf-dist/tex/generic/oberdiek/pdfcol.sty b/Master/texmf-dist/tex/generic/oberdiek/pdfcol.sty index 5ea6a6ec811..57f586f48a4 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/pdfcol.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/pdfcol.sty @@ -102,7 +102,7 @@ \fi \expandafter\x\csname ver@pdfcol.sty\endcsname \ProvidesPackage{pdfcol}% - [2007/12/12 v1.2 Maintaining additional color stacks for pdfTeX (HO)]% + [2007/12/12 v1.2 Handle new color stacks for pdfTeX (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % diff --git a/Master/texmf-dist/tex/generic/oberdiek/pdfcrypt.sty b/Master/texmf-dist/tex/generic/oberdiek/pdfcrypt.sty index 375244e35d8..1a0c4b1ae10 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/pdfcrypt.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/pdfcrypt.sty @@ -111,7 +111,7 @@ \def\@empty{}% }{} \ProvidesPackage{pdfcrypt}% - [2007/04/26 v1.0 Setting pdf encryption (HO)]% + [2007/04/26 v1.0 Allows the setting of PDF encryption (HO)]% \@ifundefined{pdfcryptsetup}{% \let\pdfcryptsetup\@gobble }{% diff --git a/Master/texmf-dist/tex/generic/oberdiek/pdfescape.sty b/Master/texmf-dist/tex/generic/oberdiek/pdfescape.sty index 06d3294fd9c..8f576770434 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/pdfescape.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/pdfescape.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: pdfescape -%% Version: 2011/04/04 v1.12 +%% Version: 2011/11/25 v1.13 %% %% Copyright (C) 2007, 2010, 2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -104,7 +104,7 @@ \fi \expandafter\x\csname ver@pdfescape.sty\endcsname \ProvidesPackage{pdfescape}% - [2011/04/04 v1.12 Provides string conversions (HO)]% + [2011/11/25 v1.13 Implements pdfTeX's escape features (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -139,6 +139,8 @@ } \TMP@EnsureCode\catcode{0}{12}% ^^@ \TMP@EnsureCode\catcode{34}{12}% " +\TMP@EnsureCode\catcode{36}{3}% $ +\TMP@EnsureCode\catcode{38}{4}% & \TMP@EnsureCode\catcode{39}{12}% ' \TMP@EnsureCode\catcode{42}{12}% * \TMP@EnsureCode\catcode{45}{12}% - @@ -436,12 +438,35 @@ } \def\PE@OctII#1#2{% \ifcase\PE@TestOctDigit#2% - \def\PE@next{\PE@OctAll{#1#2}}% + \def\PE@next{\PE@OctIII#1#2}% \else \def\PE@next{\PE@OctAll{#1}#2}% \fi \PE@next } +\ltx@IfUndefined{numexpr}{% + \catcode`\$=9 % + \catcode`\&=14 % +}{% + \catcode`\$=14 % + \catcode`\&=9 % +} +\def\PE@OctIII#1#2#3{% + \ifnum#1<4 % + \def\PE@next{\PE@OctAll{#1#2#3}}% + \else +$ \count\ltx@cclv#1 % +$ \advance\count\ltx@cclv -4 % + \edef\PE@next{% + \noexpand\PE@OctAll{% +$ \the\count\ltx@cclv +& \the\numexpr#1-4\relax + #2#3% + }% + }% + \fi + \PE@next +} \def\PE@OctAll#1{% \uccode\ltx@zero='#1\relax \uppercase{% diff --git a/Master/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty b/Master/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty index 8d9895d56c7..b2b48f13ab7 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: pdftexcmds -%% Version: 2011/04/22 v0.16 +%% Version: 2011/11/29 v0.20 %% %% Copyright (C) 2007, 2009-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -34,7 +34,7 @@ %% This work consists of the main source file pdftexcmds.dtx %% and the derived files %% pdftexcmds.sty, pdftexcmds.pdf, pdftexcmds.ins, pdftexcmds.drv, -%% pdftexcmds-test1.tex, pdftexcmds-test2.tex, +%% pdftexcmds.bib, pdftexcmds-test1.tex, pdftexcmds-test2.tex, %% pdftexcmds-test-shell.tex, pdftexcmds-test-escape.tex, %% oberdiek.pdftexcmds.lua, pdftexcmds.lua. %% @@ -104,7 +104,7 @@ \fi \expandafter\x\csname ver@pdftexcmds.sty\endcsname \ProvidesPackage{pdftexcmds}% - [2011/04/22 v0.16 Utilities of pdfTeX for LuaTeX (HO)]% + [2011/11/29 v0.20 Utility functions of pdfTeX for LuaTeX (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -250,6 +250,17 @@ \def\pdf@system#{% \immediate\write18% }% + \def\pdftexcmds@temp#1{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname pdf#1\endcsname\relax + \pdftexcmds@nopdftex + \else + \expandafter\let\csname pdf@#1\expandafter\endcsname + \csname pdf#1\endcsname + \fi + }% + \pdftexcmds@temp{resettimer}% + \pdftexcmds@temp{elapsedtime}% \fi \ifluatex \ifnum\luatexversion<36 % @@ -307,7 +318,8 @@ \endgroup \let\pdf@primitive\@undefined \@PackageInfoNoLine{pdftexcmds}{% - \string\pdf@primitive disabled, because\MessageBreak + \string\pdf@primitive\space disabled, % + because\MessageBreak \string\pdfprimitive\space is broken until pdfTeX 1.40.4% }% \begingroup @@ -477,8 +489,23 @@ \pdftexcmds@directlua{% require("oberdiek.pdftexcmds")% } +\ifnum\luatexversion>37 % + \ifnum0% + \pdftexcmds@directlua{% + if status.ini_version then % + tex.write("1")% + end% + }>0 % + \everyjob\expandafter{% + \the\everyjob + \pdftexcmds@directlua{% + require("oberdiek.pdftexcmds")% + }% + }% + \fi +\fi \begingroup - \def\x{2011/04/22 v0.16}% + \def\x{2011/11/29 v0.20}% \ltx@onelevel@sanitize\x \edef\y{% \pdftexcmds@directlua{% @@ -625,6 +652,54 @@ oberdiek.pdftexcmds.filemdfivesum("\luaescapestring{#1}")% }% }% +\let\pdftexcmds@temp=Y% +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname protected\endcsname\relax + \pdftexcmds@directlua0{% + if tex.enableprimitives then % + tex.enableprimitives('', {'protected'})% + end% + }% +\fi +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname protected\endcsname\relax + \let\pdftexcmds@temp=N% +\fi +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname numexpr\endcsname\relax + \pdftexcmds@directlua0{% + if tex.enableprimitives then % + tex.enableprimitives('', {'numexpr'})% + end% + }% +\fi +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname numexpr\endcsname\relax + \let\pdftexcmds@temp=N% +\fi +\ifx\pdftexcmds@temp N% + \@PackageWarningNoLine{pdftexcmds}{% + Definitions of \ltx@backslashchar pdf@resettimer and% + \MessageBreak + \ltx@backslashchar pdf@elapsedtime are skipped, because% + \MessageBreak + e-TeX's \ltx@backslashchar protected or % + \ltx@backslashchar numexpr are missing% + }% +\else + \protected\def\pdf@resettimer{% + \pdftexcmds@directlua0{% + oberdiek.pdftexcmds.resettimer()% + }% + }% + \protected\def\pdf@elapsedtime{% + \numexpr + \pdftexcmds@directlua0{% + oberdiek.pdftexcmds.elapsedtime()% + }% + \relax + }% +\fi \ifnum\luatexversion<68 % \else \def\pdf@shellescape{% diff --git a/Master/texmf-dist/tex/generic/oberdiek/protecteddef.sty b/Master/texmf-dist/tex/generic/oberdiek/protecteddef.sty index 9301de0007c..a7fd774ed05 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/protecteddef.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/protecteddef.sty @@ -102,7 +102,7 @@ \fi \expandafter\x\csname ver@protecteddef.sty\endcsname \ProvidesPackage{protecteddef}% - [2011/01/31 v1.0 Definition of protected macros (HO)]% + [2011/01/31 v1.0 Define protected commands (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % diff --git a/Master/texmf-dist/tex/generic/oberdiek/rotchiffre.sty b/Master/texmf-dist/tex/generic/oberdiek/rotchiffre.sty index c0cb6ec349b..3dbbb6025d1 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/rotchiffre.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/rotchiffre.sty @@ -102,7 +102,7 @@ \fi \expandafter\x\csname ver@rotchiffre.sty\endcsname \ProvidesPackage{rotchiffre}% - [2010/11/12 v1.0 Provides ROT13, ROT5, ROT18, ROT47 (HO)]% + [2010/11/12 v1.0 Perform simple rotation ciphers (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % 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 20ef751ede8..187ab25eb91 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-ascii-print.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-ascii-print.def @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: stringenc -%% Version: 2010/03/01 v1.8 +%% Version: 2011/12/02 v1.10 %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -49,7 +49,7 @@ %% se-cp1257.def, stringenc-test1.tex, stringenc-test2.tex. %% \ProvidesFile{se-ascii-print.def}% - [2010/03/01 v1.8 stringenc: Printable ASCII characters]% + [2011/12/02 v1.10 stringenc: Printable ASCII characters]% \expandafter\gdef\csname\SE@PrefixTo ascii-print\endcsname#1#2#3#4{% \ifnum"#1#2=\ltx@zero \ifnum"#3#4<127 % diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-ascii.def b/Master/texmf-dist/tex/generic/oberdiek/se-ascii.def index 57121dbffbf..6c87425e093 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-ascii.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-ascii.def @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: stringenc -%% Version: 2010/03/01 v1.8 +%% Version: 2011/12/02 v1.10 %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -48,7 +48,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}[2010/03/01 v1.8 stringenc: US-ASCII] +\ProvidesFile{se-ascii.def}[2011/12/02 v1.10 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 f80ba29f628..95f85ddb94c 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-clean7bit.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-clean7bit.def @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: stringenc -%% Version: 2010/03/01 v1.8 +%% Version: 2011/12/02 v1.10 %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -48,7 +48,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}[2010/03/01 v1.8 stringenc: Clean7Bit] +\ProvidesFile{se-clean7bit.def}[2011/12/02 v1.10 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 3ab38592910..576d245382f 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-cp1250.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp1250.def @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: stringenc -%% Version: 2010/03/01 v1.8 +%% Version: 2011/12/02 v1.10 %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -48,7 +48,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}[2010/03/01 v1.8 stringenc: cp1250] +\ProvidesFile{se-cp1250.def}[2011/12/02 v1.10 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 d572a973fb2..bd7d5b71caf 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-cp1251.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp1251.def @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: stringenc -%% Version: 2010/03/01 v1.8 +%% Version: 2011/12/02 v1.10 %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -48,7 +48,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}[2010/03/01 v1.8 stringenc: cp1251] +\ProvidesFile{se-cp1251.def}[2011/12/02 v1.10 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 a3809595685..9b3c230ab43 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-cp1252.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp1252.def @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: stringenc -%% Version: 2010/03/01 v1.8 +%% Version: 2011/12/02 v1.10 %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -48,7 +48,7 @@ %% 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}[2010/03/01 v1.8 stringenc: cp1252] +\ProvidesFile{se-cp1252.def}[2011/12/02 v1.10 stringenc: cp1252] \expandafter\gdef\csname\SE@PrefixTo cp1252\endcsname#1#2#3#4{% \ifcase\ifnum"#1#2=\ltx@zero \ifnum"#3#4<"80 % diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp1257.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp1257.def index 0b08898a0b4..e94ce137d0c 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-cp1257.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp1257.def @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: stringenc -%% Version: 2010/03/01 v1.8 +%% Version: 2011/12/02 v1.10 %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -48,7 +48,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}[2010/03/01 v1.8 stringenc: cp1257] +\ProvidesFile{se-cp1257.def}[2011/12/02 v1.10 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 9fef63502fd..025845e1140 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-cp437.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp437.def @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: stringenc -%% Version: 2010/03/01 v1.8 +%% Version: 2011/12/02 v1.10 %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -48,7 +48,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}[2010/03/01 v1.8 stringenc: cp437] +\ProvidesFile{se-cp437.def}[2011/12/02 v1.10 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 b0236a32168..399f76bdb93 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-cp850.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp850.def @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: stringenc -%% Version: 2010/03/01 v1.8 +%% Version: 2011/12/02 v1.10 %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -48,7 +48,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}[2010/03/01 v1.8 stringenc: cp850] +\ProvidesFile{se-cp850.def}[2011/12/02 v1.10 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 c6b1e4dc3e8..18b5d30459c 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-cp852.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp852.def @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: stringenc -%% Version: 2010/03/01 v1.8 +%% Version: 2011/12/02 v1.10 %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -48,7 +48,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}[2010/03/01 v1.8 stringenc: cp852] +\ProvidesFile{se-cp852.def}[2011/12/02 v1.10 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 1aec757bd21..1881ce4b49c 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-cp855.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp855.def @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: stringenc -%% Version: 2010/03/01 v1.8 +%% Version: 2011/12/02 v1.10 %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -48,7 +48,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}[2010/03/01 v1.8 stringenc: cp855] +\ProvidesFile{se-cp855.def}[2011/12/02 v1.10 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 ec5174097e9..dbe4a5c7f91 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-cp858.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp858.def @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: stringenc -%% Version: 2010/03/01 v1.8 +%% Version: 2011/12/02 v1.10 %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -48,7 +48,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}[2010/03/01 v1.8 stringenc: cp858] +\ProvidesFile{se-cp858.def}[2011/12/02 v1.10 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 aacb043ce6f..7f5f47390b6 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-cp865.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp865.def @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: stringenc -%% Version: 2010/03/01 v1.8 +%% Version: 2011/12/02 v1.10 %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -48,7 +48,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}[2010/03/01 v1.8 stringenc: cp865] +\ProvidesFile{se-cp865.def}[2011/12/02 v1.10 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 ad98abc2490..e43f0513847 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-cp866.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp866.def @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: stringenc -%% Version: 2010/03/01 v1.8 +%% Version: 2011/12/02 v1.10 %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -48,7 +48,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}[2010/03/01 v1.8 stringenc: cp866] +\ProvidesFile{se-cp866.def}[2011/12/02 v1.10 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 87259b5e823..535326cce9c 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-dec-mcs.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-dec-mcs.def @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: stringenc -%% Version: 2010/03/01 v1.8 +%% Version: 2011/12/02 v1.10 %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -48,7 +48,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}[2010/03/01 v1.8 stringenc: DEC-MCS] +\ProvidesFile{se-dec-mcs.def}[2011/12/02 v1.10 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 6db494b85d8..9a390f0ac74 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 @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: stringenc -%% Version: 2010/03/01 v1.8 +%% Version: 2011/12/02 v1.10 %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -48,7 +48,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-1.def}[2010/03/01 v1.8 stringenc: ISO-8859-1] +\ProvidesFile{se-iso-8859-1.def}[2011/12/02 v1.10 stringenc: ISO-8859-1] \expandafter\gdef\csname\SE@PrefixTo iso-8859-1\endcsname#1#2#3#4{% \ifcase\ifnum"#1#2=\ltx@zero \ifnum"#3#4<"80 % diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-10.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-10.def index abbaa199588..d2a46b49db1 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 @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: stringenc -%% Version: 2010/03/01 v1.8 +%% Version: 2011/12/02 v1.10 %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -48,7 +48,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}[2010/03/01 v1.8 stringenc: ISO-8859-10] +\ProvidesFile{se-iso-8859-10.def}[2011/12/02 v1.10 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 2673c9c97cb..2eb802f2907 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 @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: stringenc -%% Version: 2010/03/01 v1.8 +%% Version: 2011/12/02 v1.10 %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -48,7 +48,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}[2010/03/01 v1.8 stringenc: ISO-8859-11] +\ProvidesFile{se-iso-8859-11.def}[2011/12/02 v1.10 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 27eeb0a88a5..cfb4689635d 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 @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: stringenc -%% Version: 2010/03/01 v1.8 +%% Version: 2011/12/02 v1.10 %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -48,7 +48,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}[2010/03/01 v1.8 stringenc: ISO-8859-13] +\ProvidesFile{se-iso-8859-13.def}[2011/12/02 v1.10 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 05857978836..2408ad2fb5f 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 @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: stringenc -%% Version: 2010/03/01 v1.8 +%% Version: 2011/12/02 v1.10 %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -48,7 +48,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}[2010/03/01 v1.8 stringenc: ISO-8859-14] +\ProvidesFile{se-iso-8859-14.def}[2011/12/02 v1.10 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 eaa0343da94..f04713e130c 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 @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: stringenc -%% Version: 2010/03/01 v1.8 +%% Version: 2011/12/02 v1.10 %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -48,7 +48,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}[2010/03/01 v1.8 stringenc: ISO-8859-15] +\ProvidesFile{se-iso-8859-15.def}[2011/12/02 v1.10 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 346591f44d5..b8c64fc2f02 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 @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: stringenc -%% Version: 2010/03/01 v1.8 +%% Version: 2011/12/02 v1.10 %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -48,7 +48,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}[2010/03/01 v1.8 stringenc: ISO-8859-16] +\ProvidesFile{se-iso-8859-16.def}[2011/12/02 v1.10 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 b73ad4d3bb5..abcd1734c17 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 @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: stringenc -%% Version: 2010/03/01 v1.8 +%% Version: 2011/12/02 v1.10 %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -48,7 +48,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}[2010/03/01 v1.8 stringenc: ISO-8859-2] +\ProvidesFile{se-iso-8859-2.def}[2011/12/02 v1.10 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 ad2dc29af8b..3b83f5e287c 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 @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: stringenc -%% Version: 2010/03/01 v1.8 +%% Version: 2011/12/02 v1.10 %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -48,7 +48,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}[2010/03/01 v1.8 stringenc: ISO-8859-3] +\ProvidesFile{se-iso-8859-3.def}[2011/12/02 v1.10 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 c127d488834..813b60bebf4 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 @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: stringenc -%% Version: 2010/03/01 v1.8 +%% Version: 2011/12/02 v1.10 %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -48,7 +48,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}[2010/03/01 v1.8 stringenc: ISO-8859-4] +\ProvidesFile{se-iso-8859-4.def}[2011/12/02 v1.10 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 a86ad29a9bb..9de9e397062 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 @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: stringenc -%% Version: 2010/03/01 v1.8 +%% Version: 2011/12/02 v1.10 %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -48,7 +48,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}[2010/03/01 v1.8 stringenc: ISO-8859-5] +\ProvidesFile{se-iso-8859-5.def}[2011/12/02 v1.10 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 e5edcb7dcba..a904c93ffc5 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 @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: stringenc -%% Version: 2010/03/01 v1.8 +%% Version: 2011/12/02 v1.10 %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -48,7 +48,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}[2010/03/01 v1.8 stringenc: ISO-8859-6] +\ProvidesFile{se-iso-8859-6.def}[2011/12/02 v1.10 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 be15feb0444..9b5c5f8f400 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 @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: stringenc -%% Version: 2010/03/01 v1.8 +%% Version: 2011/12/02 v1.10 %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -48,7 +48,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}[2010/03/01 v1.8 stringenc: ISO-8859-7] +\ProvidesFile{se-iso-8859-7.def}[2011/12/02 v1.10 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 9e70914f71a..e89106e0ce4 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 @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: stringenc -%% Version: 2010/03/01 v1.8 +%% Version: 2011/12/02 v1.10 %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -48,7 +48,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}[2010/03/01 v1.8 stringenc: ISO-8859-8] +\ProvidesFile{se-iso-8859-8.def}[2011/12/02 v1.10 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 0578137af72..9e965f2e74d 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 @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: stringenc -%% Version: 2010/03/01 v1.8 +%% Version: 2011/12/02 v1.10 %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -48,7 +48,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}[2010/03/01 v1.8 stringenc: ISO-8859-9] +\ProvidesFile{se-iso-8859-9.def}[2011/12/02 v1.10 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 c7b962f9cf9..3c341ad61fa 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-koi8-r.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-koi8-r.def @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: stringenc -%% Version: 2010/03/01 v1.8 +%% Version: 2011/12/02 v1.10 %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -48,7 +48,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}[2010/03/01 v1.8 stringenc: KOI8-R] +\ProvidesFile{se-koi8-r.def}[2011/12/02 v1.10 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 1456eee4c01..08e85efd4b1 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-mac-centeuro.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-mac-centeuro.def @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: stringenc -%% Version: 2010/03/01 v1.8 +%% Version: 2011/12/02 v1.10 %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -48,7 +48,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}[2010/03/01 v1.8 stringenc: Mac OS Central European] +\ProvidesFile{se-mac-centeuro.def}[2011/12/02 v1.10 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 49aa6899da9..fcff5a1b49e 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-mac-cyrillic.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-mac-cyrillic.def @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: stringenc -%% Version: 2010/03/01 v1.8 +%% Version: 2011/12/02 v1.10 %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -48,7 +48,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}[2010/03/01 v1.8 stringenc: Mac OS Cyrillic] +\ProvidesFile{se-mac-cyrillic.def}[2011/12/02 v1.10 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 2cba6dc34a1..005820c9894 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-mac-roman.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-mac-roman.def @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: stringenc -%% Version: 2010/03/01 v1.8 +%% Version: 2011/12/02 v1.10 %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -48,7 +48,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}[2010/03/01 v1.8 stringenc: Mac OS Roman] +\ProvidesFile{se-mac-roman.def}[2011/12/02 v1.10 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 cb4f9afd7ed..9f952f13954 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-nextstep.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-nextstep.def @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: stringenc -%% Version: 2010/03/01 v1.8 +%% Version: 2011/12/02 v1.10 %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -48,7 +48,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}[2010/03/01 v1.8 stringenc: NextStep] +\ProvidesFile{se-nextstep.def}[2011/12/02 v1.10 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 213c8a2836c..c17f4878773 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-pdfdoc.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-pdfdoc.def @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: stringenc -%% Version: 2010/03/01 v1.8 +%% Version: 2011/12/02 v1.10 %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -48,7 +48,7 @@ %% 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}[2010/03/01 v1.8 stringenc: PDFDocEncoding] +\ProvidesFile{se-pdfdoc.def}[2011/12/02 v1.10 stringenc: PDFDocEncoding] \expandafter\gdef\csname\SE@PrefixTo pdfdoc\endcsname#1#2#3#4{% \ifcase\ifnum"#1#2#3#4<256 % \ifnum"#1#2#3#4>160 % diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-utf16le.def b/Master/texmf-dist/tex/generic/oberdiek/se-utf16le.def index db3821c1f39..8d924108bc1 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-utf16le.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-utf16le.def @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: stringenc -%% Version: 2010/03/01 v1.8 +%% Version: 2011/12/02 v1.10 %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -48,7 +48,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}[2010/03/01 v1.8 stringenc: UTF-16LE] +\ProvidesFile{se-utf16le.def}[2011/12/02 v1.10 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 e9e79b91f5a..fb381caf1fe 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-utf32be.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-utf32be.def @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: stringenc -%% Version: 2010/03/01 v1.8 +%% Version: 2011/12/02 v1.10 %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -48,7 +48,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}[2010/03/01 v1.8 stringenc: UTF-32BE] +\ProvidesFile{se-utf32be.def}[2011/12/02 v1.10 stringenc: UTF-32BE] \expandafter\gdef\csname\SE@PrefixTo utf32be\endcsname#1#2#3#4{% \SE@ResultAdd{0000#1#2#3#4}% } diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-utf32le.def b/Master/texmf-dist/tex/generic/oberdiek/se-utf32le.def index ec030e42c4c..c69abce131d 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-utf32le.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-utf32le.def @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: stringenc -%% Version: 2010/03/01 v1.8 +%% Version: 2011/12/02 v1.10 %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -48,7 +48,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}[2010/03/01 v1.8 stringenc: UTF-32LE] +\ProvidesFile{se-utf32le.def}[2011/12/02 v1.10 stringenc: UTF-32LE] \expandafter\gdef\csname\SE@PrefixTo utf32le\endcsname#1#2#3#4{% \SE@ResultAdd{#3#4#1#20000}% } diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-utf8.def b/Master/texmf-dist/tex/generic/oberdiek/se-utf8.def index 1b962f87713..4cdac20ee7b 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-utf8.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-utf8.def @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: stringenc -%% Version: 2010/03/01 v1.8 +%% Version: 2011/12/02 v1.10 %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -48,7 +48,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}[2010/03/01 v1.8 stringenc: UTF-8] +\ProvidesFile{se-utf8.def}[2011/12/02 v1.10 stringenc: UTF-8] \expandafter\gdef\csname\SE@PrefixTo utf8\endcsname#1#2#3#4{% \ifnum"#1#2#3#4<"80 % \SE@ResultAdd{#3#4}% diff --git a/Master/texmf-dist/tex/generic/oberdiek/setouterhbox.sty b/Master/texmf-dist/tex/generic/oberdiek/setouterhbox.sty index 99f1ba698e1..d10da9236f5 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/setouterhbox.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/setouterhbox.sty @@ -11,7 +11,7 @@ %% Project: setouterhbox %% Version: 2007/09/09 v1.7 %% -%% Copyright (C) 2005, 2006, 2007 by +%% Copyright (C) 2005-2007 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the diff --git a/Master/texmf-dist/tex/generic/oberdiek/soulutf8.sty b/Master/texmf-dist/tex/generic/oberdiek/soulutf8.sty index 9d9c5baf99e..e3c48e5eea7 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/soulutf8.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/soulutf8.sty @@ -103,7 +103,7 @@ \fi \expandafter\x\csname ver@soulutf8.sty\endcsname \ProvidesPackage{soulutf8}% - [2007/09/09 v1.0 Adding support for UTF-8 to soul (HO)]% + [2007/09/09 v1.0 Permit use of UTF-8 characters in soul (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % diff --git a/Master/texmf-dist/tex/generic/oberdiek/stringenc.sty b/Master/texmf-dist/tex/generic/oberdiek/stringenc.sty index dd2482d131b..cebf32de302 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/stringenc.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/stringenc.sty @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: stringenc -%% Version: 2010/03/01 v1.8 +%% Version: 2011/12/02 v1.10 %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -114,7 +114,7 @@ \fi \expandafter\x\csname ver@stringenc.sty\endcsname \ProvidesPackage{stringenc}% - [2010/03/01 v1.8 Converts strings between encodings (HO)]% + [2011/12/02 v1.10 Convert strings between diff. encodings (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -423,14 +423,13 @@ \fi \def\SE@Nibble@NumToHex#1{% $ \ifcase\numexpr#1\relax -& \expandafter\ifcase\expandafter\ltx@firstofone\expandafter{\number#1} % +& \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 } \def\SE@Nibble@NumToBin#1{% $ \ifcase\numexpr#1\relax -& \expandafter & \ifcase\expandafter\ltx@firstofone\expandafter{\number#1} % 0000\or 0001\or diff --git a/Master/texmf-dist/tex/generic/oberdiek/telprint.sty b/Master/texmf-dist/tex/generic/oberdiek/telprint.sty index e64b9310a29..e329a236286 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/telprint.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/telprint.sty @@ -102,7 +102,7 @@ \fi \expandafter\x\csname ver@telprint.sty\endcsname \ProvidesPackage{telprint}% - [2008/08/11 v1.10 Formatting of German phone numbers (HO)]% + [2008/08/11 v1.10 Format German phone numbers (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % diff --git a/Master/texmf-dist/tex/generic/oberdiek/thepdfnumber.sty b/Master/texmf-dist/tex/generic/oberdiek/thepdfnumber.sty new file mode 100644 index 00000000000..dcb7eaf0f98 --- /dev/null +++ b/Master/texmf-dist/tex/generic/oberdiek/thepdfnumber.sty @@ -0,0 +1,601 @@ +%% +%% This is file `thepdfnumber.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% thepdfnumber.dtx (with options: `package') +%% +%% This is a generated file. +%% +%% Project: thepdfnumber +%% Version: 2011/11/24 v1.0 +%% +%% Copyright (C) 2011 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 thepdfnumber.dtx +%% and the derived files +%% thepdfnumber.sty, thepdfnumber.pdf, thepdfnumber.ins, thepdfnumber.drv, +%% thepdfnumber-test1.tex, thepdfnumber-test2.tex, +%% thepdfnumber-test3.tex. +%% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } + \expandafter\let\expandafter\x\csname ver@thepdfnumber.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 + \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{thepdfnumber}{The package is already loaded}% + \aftergroup\endinput + \fi + \fi +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \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@thepdfnumber.sty\endcsname +\ProvidesPackage{thepdfnumber}% + [2011/11/24 v1.0 Print PDF numbers with minimal digits (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ + \def\x{\endgroup + \expandafter\edef\csname ThPdNu@AtEnd\endcsname{% + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax + }% + }% +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } +\def\TMP@EnsureCode#1#2{% + \edef\ThPdNu@AtEnd{% + \ThPdNu@AtEnd + \catcode#1=\the\catcode#1\relax + }% + \catcode#1=#2\relax +} +\TMP@EnsureCode{33}{12}% ! +\TMP@EnsureCode{36}{3}% $ +\TMP@EnsureCode{38}{4}% & +\TMP@EnsureCode{42}{12}% * +\TMP@EnsureCode{43}{12}% + +\TMP@EnsureCode{45}{12}% - +\TMP@EnsureCode{46}{12}% . +\TMP@EnsureCode{60}{12}% < +\TMP@EnsureCode{62}{12}% > +\TMP@EnsureCode{96}{12}% ` +\edef\ThPdNu@AtEnd{\ThPdNu@AtEnd\noexpand\endinput} +\def\ThPdNu@FIN{\thepdfnumber@ErrorEndMarker} +\def\ThPdNu@space{ } +\chardef\ThPdNu@zero=0 % +\chardef\ThPdNu@one=1 % +\long\def\ThPdNu@firstoftwo#1#2{#1} +\long\def\ThPdNu@secondoftwo#1#2{#2} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname detokenize\endcsname\relax + \catcode`\&=14 % + \catcode`\$=9 % +\else + \catcode`\&=9 % + \catcode`\$=14 % +\fi +\def\thepdfnumber#1{% + \romannumeral +& \iftrue\expandafter\ThPdNu@State@Plus\expandafter\fi +& \detokenize\expandafter{#1}% +& \ThPdNu@FIN +$ \ifx\ThPdNu@FIN#1\ThPdNu@FIN +$ \expandafter\ThPdNu@firstoftwo +$ \else +$ \expandafter\ThPdNu@secondoftwo +$ \fi +$ {% +$ \ThPdNu@zero +$ 0\thepdfnumber@ErrorUnexpectedEnd +$ }{% +$ \iftrue\expandafter\ThPdNu@State@Plus\expandafter\fi#1\ThPdNu@FIN +$ }% +} +\def\ThPdNu@State@Plus#1\fi#2{% + \fi + \ifcase\ifx\ThPdNu@FIN#2% + 0% +& \else\ifx-#2% +$ \else\ifnum`#2=45 % - + 1% + \else\ifx0#2% + 2% + \else\ifnum`#2>48 % + \ifnum`#2<58 % + 3% + \else + 9% + \fi +& \else\ifx.#2% +$ \else\ifnum`#2=46 % . + 4% +& \else\ifx+#2% +$ \else\ifnum`#2=43 % + + 5% + \else + 9% + \fi\fi\fi\fi\fi\fi\ThPdNu@space + \expandafter\ThPdNu@zero + \expandafter0% + \expandafter\thepdfnumber@ErrorUnexpectedEnd + \or + \ThPdNu@State@Minus + \or + \ThPdNu@State@SkipZeros!% + \or + \ThPdNu@State@Int!#2!% + \or + \ThPdNu@State@Dot!\ThPdNu@zero*\ThPdNu@zero!!% + \or + \ThPdNu@State@Plus + \else + \ThPdNu@ReturnError{0}% + \fi +} +\def\ThPdNu@State@Minus#1\fi#2{% + \fi + \ifcase\ifx\ThPdNu@FIN#2% + 0% + \else\ifx0#2% + 1% + \else\ifnum`#2>48 % + \ifnum`#2<58 % + 2% + \else + 9% + \fi +& \else\ifx.#2% +$ \else\ifnum`#2=46 % . + 3% +& \else\ifx-#2% +$ \else\ifnum`#2=45 % - + 4% +& \else\ifx+#2% +$ \else\ifnum`#2=43 % + + 5% + \else + 9% + \fi\fi\fi\fi\fi\fi\ThPdNu@space + \expandafter\ThPdNu@zero + \expandafter0% + \expandafter\thepdfnumber@ErrorUnexpectedEnd + \or + \ThPdNu@State@SkipZeros-!% + \or + \ThPdNu@State@Int-!#2!% + \or + \ThPdNu@State@Dot-!\ThPdNu@zero*\ThPdNu@zero!!% + \or + \ThPdNu@State@Plus + \or + \ThPdNu@State@Minus + \else + \ThPdNu@ReturnError{0}% + \fi +} +\def\ThPdNu@ReturnError#1#2\fi#3\ThPdNu@FIN{% + \fi + \ThPdNu@zero + #1% + \thepdfnumber@ErrorInvalidToken +} +\def\ThPdNu@State@SkipZeros#1!#2\fi#3{% + \fi + \ifcase\ifx\ThPdNu@FIN#3% + 0% + \else\ifx0#3% + 1% + \else\ifnum`#3>48 % + \ifnum`#3<58 % + 2% + \else + 9% + \fi +& \else\ifx.#3% +$ \else\ifnum`#3=46 % . + 3% + \else + 9% + \fi\fi\fi\fi\ThPdNu@space + \expandafter\ThPdNu@zero + \expandafter0% + \or + \ThPdNu@State@SkipZeros#1!% + \or + \ThPdNu@State@Int#1!#3!% + \or + \ThPdNu@State@Dot#1!\ThPdNu@zero*\ThPdNu@zero!!% + \else + \ThPdNu@ReturnError{0}% + \fi +} +\def\ThPdNu@State@Int#1!#2!#3\fi#4{% + \fi + \ifcase\ifx\ThPdNu@FIN#4% + 0% + \else\ifnum`#4>47 % + \ifnum`#4<58 % + 1% + \else + 9% + \fi +& \else\ifx.#4% +$ \else\ifnum`#4=46 % . + 2% + \else + 9% + \fi\fi\fi\ThPdNu@space + \ThPdNu@ReturnInt{#1#2}% + \or + \ThPdNu@State@Int#1!#2#4!% + \or + \ThPdNu@State@Dot#1!\ThPdNu@one#2*\ThPdNu@zero!!% + \else + \ThPdNu@ReturnError{#1#2}% + \fi +} +\def\ThPdNu@ReturnInt#1#2\fi{% + \fi + \ThPdNu@zero + #1% +} +\def\ThPdNu@State@Dot#1*#2#3!#4!#5\fi#6{% + \fi + \ifcase\ifx\ThPdNu@FIN#6% + 0% + \else\ifnum`#6>48 % + \ifnum`#6<58 % + 1% + \else + 9% + \fi + \else\ifx0#6% + 2% + \else + 9% + \fi\fi\fi\ThPdNu@space + \ThPdNu@ReturnNumber#1*#2#3!% + \or + \ThPdNu@State@Dot#1*\ThPdNu@one#3#4#6!!% + \or + \ThPdNu@State@DotZero#1*#2#3!#4#6!% + \else + \ThPdNu@ReturnNumberInvalid#1*#2#3!% + \fi +} +\def\ThPdNu@State@DotZero#1*#2#3!#4!#5\fi#6{% + \fi + \ifcase\ifx\ThPdNu@FIN#6% + 0% + \else\ifnum`#6>48 % + \ifnum`#6<58 % + 1% + \else + 9% + \fi + \else\ifx0#6% + 2% + \else + 9% + \fi\fi\fi\ThPdNu@space + \ThPdNu@ReturnNumber#1*#2#3!% + \or + \ThPdNu@State@Dot#1*\ThPdNu@one#3#4#6!!% + \or + \ThPdNu@State@DotZero#1*#2#3!#4#6!% + \else + \ThPdNu@ReturnNumber#1*#2#3!% + \fi +} +\def\ThPdNu@ReturnNumber#1!#2#3*#4#5!#6\fi{% + \fi + \ifcase#2% + \expandafter\ThPdNu@firstoftwo + \else + \expandafter\ThPdNu@secondoftwo + \fi + {% + \ifcase#4% + \expandafter\ThPdNu@firstoftwo + \else + \expandafter\ThPdNu@secondoftwo + \fi + {\ThPdNu@zero 0}% + {\ThPdNu@zero #1.#5}% + }{% + \ifcase#4% + \expandafter\ThPdNu@firstoftwo + \else + \expandafter\ThPdNu@secondoftwo + \fi + {\ThPdNu@zero #1#3}% + {\ThPdNu@zero #1#3.#5}% + }% +} +\def\ThPdNu@ReturnNumberInvalid#1*#2!#3\fi#4\ThPdNu@FIN{% + \fi + \iftrue\ThPdNu@ReturnNumber#1*#2!\fi + \thepdfnumber@ErrorInvalidToken +} +\def\thepdfnumberNormZeroOne#1{% + \romannumeral +& \iftrue\expandafter\ThPbNu@StateN@Plus\expandafter\fi +& \detokenize\expandafter{#1}% +& \ThPdNu@FIN +$ \ifx\ThPdNu@FIN#1\ThPdNu@FIN +$ \expandafter\ThPdNu@firstoftwo +$ \else +$ \expandafter\ThPdNu@secondoftwo +$ \fi +$ {% +$ \ThPdNu@zero +$ 0\thepdfnumber@ErrorUnexpectedEnd +$ }{% +$ \iftrue\expandafter\ThPbNu@StateN@Plus\expandafter\fi#1\ThPdNu@FIN +$ }% +} +\def\ThPbNu@StateN@Plus#1\fi#2{% + \fi + \ifcase\ifx\ThPdNu@FIN#2% + 0% +& \else\ifx-#2% +$ \else\ifnum`#2=45 % - + 1% + \else\ifx0#2% + 2% + \else\ifnum`#2>48 % + \ifnum`#2<58 % + 3% + \else + 9% + \fi +& \else\ifx.#2% +$ \else\ifnum`#2=46 % . + 4% +& \else\ifx+#2% +$ \else\ifnum`#2=43 % + + 5% + \else + 9% + \fi\fi\fi\fi\fi\fi\ThPdNu@space + \expandafter\ThPdNu@zero + \expandafter0% + \expandafter\thepdfnumber@ErrorUnexpectedEnd + \or + \ThPbNu@StateN@Minus + \or + \ThPbNu@StateN@SkipZeros + \or + \ThPdNu@ReturnAndSkip{1}% + \or + \ThPbNu@StateN@Dot\ThPdNu@zero!!% + \or + \ThPbNu@StateN@Plus + \else + \ThPdNu@ReturnError{0}% + \fi +} +\def\ThPbNu@StateN@Minus#1\fi#2{% + \fi + \ifcase\ifx\ThPdNu@FIN#2% + 0% + \else\ifnum`#2>47 % + \ifnum`#2<58 % + 1% + \else + 9% + \fi +& \else\ifx.#2% +$ \else\ifnum`#2=46 % . + 1% +& \else\ifx-#2% +$ \else\ifnum`#2=45 % - + 2% +& \else\ifx+#2% +$ \else\ifnum`#2=43 % + + 3% + \else + 9% + \fi\fi\fi\fi\fi\ThPdNu@space + \expandafter\ThPdNu@zero + \expandafter0% + \expandafter\thepdfnumber@ErrorUnexpectedEnd + \or + \ThPdNu@ReturnAndSkip{0}% + \or + \ThPbNu@StateN@Plus + \or + \ThPbNu@StateN@Minus + \else + \ThPdNu@ReturnError{0}% + \fi +} +\def\ThPdNu@ReturnAndSkip#1#2\fi#3\ThPdNu@FIN{% + \fi + \ThPdNu@zero + #1% +} +\def\ThPbNu@StateN@SkipZeros#1\fi#2{% + \fi + \ifcase\ifx\ThPdNu@FIN#2% + 0% + \else\ifx0#2% + 1% + \else\ifnum`#2>48 % + \ifnum`#2<58 % + 2% + \else + 9% + \fi +& \else\ifx.#2% +$ \else\ifnum`#2=46 % . + 3% + \else + 9% + \fi\fi\fi\fi\ThPdNu@space + \expandafter\ThPdNu@zero + \expandafter0% + \or + \ThPbNu@StateN@SkipZeros% + \or + \ThPdNu@ReturnAndSkip{1}% + \or + \ThPbNu@StateN@Dot\ThPdNu@zero!!% + \else + \ThPdNu@ReturnError{0}% + \fi +} +\def\ThPbNu@StateN@Dot#1#2!#3!#4\fi#5{% + \fi + \ifcase\ifx\ThPdNu@FIN#5% + 0% + \else\ifnum`#5>48 % + \ifnum`#5<58 % + 1% + \else + 9% + \fi + \else\ifx0#5% + 2% + \else + 9% + \fi\fi\fi\ThPdNu@space + \ThPdNu@ReturnFracNumber#1#2!% + \or + \ThPbNu@StateN@Dot\ThPdNu@one#2#3#5!!% + \or + \ThPbNu@StateN@DotZero#1#2!#3#5!% + \else + \ThPdNu@ReturnFracNumberInvalid#1#2!% + \fi +} +\def\ThPbNu@StateN@DotZero#1#2!#3!#4\fi#5{% + \fi + \ifcase\ifx\ThPdNu@FIN#5% + 0% + \else\ifnum`#5>48 % + \ifnum`#5<58 % + 1% + \else + 9% + \fi + \else\ifx0#5% + 2% + \else + 9% + \fi\fi\fi\ThPdNu@space + \ThPdNu@ReturnFracNumber#1#2!% + \or + \ThPbNu@StateN@Dot\ThPdNu@one#2#3#5!!% + \or + \ThPbNu@StateN@DotZero#1#2!#3#5!% + \else + \ThPdNu@ReturnFracNumberInvalid#1#2!% + \fi +} +\def\ThPdNu@ReturnFracNumber#1#2!#3\fi{% + \fi + \ifcase#1% + \expandafter\ThPdNu@firstoftwo + \else + \expandafter\ThPdNu@secondoftwo + \fi + {\ThPdNu@zero 0}% + {\ThPdNu@zero .#2}% +} +\def\ThPdNu@ReturnFracNumberInvalid#1!#2\fi#3\ThPdNu@FIN{% + \fi + \iftrue\ThPdNu@ReturnFracNumber#1!\fi + \thepdfnumber@ErrorInvalidToken +} +\ThPdNu@AtEnd% +\endinput +%% +%% End of file `thepdfnumber.sty'. diff --git a/Master/texmf-dist/tex/generic/oberdiek/uniquecounter.sty b/Master/texmf-dist/tex/generic/oberdiek/uniquecounter.sty index ac4769a193c..ff0ee2f47b0 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/uniquecounter.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/uniquecounter.sty @@ -104,7 +104,7 @@ \fi \expandafter\x\csname ver@uniquecounter.sty\endcsname \ProvidesPackage{uniquecounter}% - [2011/01/30 v1.2 Provides unlimited unique counter (HO)]% + [2011/01/30 v1.2 Provide unlimited unique counter (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % diff --git a/Master/texmf-dist/tex/latex/oberdiek/aliascnt.sty b/Master/texmf-dist/tex/latex/oberdiek/aliascnt.sty index 8b4e866813f..eb73f36ec52 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/aliascnt.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/aliascnt.sty @@ -34,7 +34,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{aliascnt}% - [2009/09/08 v1.3 Alias counter (HO)]% + [2009/09/08 v1.3 Alias counters (HO)]% \newcommand*{\newaliascnt}[2]{% \begingroup \def\AC@glet##1{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/askinclude.sty b/Master/texmf-dist/tex/latex/oberdiek/askinclude.sty index 477744e09a9..2a709a9edb5 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/askinclude.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/askinclude.sty @@ -9,10 +9,10 @@ %% This is a generated file. %% %% Project: askinclude -%% Version: 2008/08/11 v2.1 +%% Version: 2011/12/02 v2.2 %% %% Copyright (C) 1991-1994 by Pablo A. Straub -%% Copyright (C) 2007, 2008 by +%% Copyright (C) 2007, 2008, 2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -32,19 +32,20 @@ %% This work consists of the main source file askinclude.dtx %% and the derived files %% askinclude.sty, askinclude.pdf, askinclude.ins, askinclude.drv, -%% askinclude-a.tex, askinclude-b.tex, askinclude-c.tex, -%% askinclude-test1.tex, askinclude-test2.tex, -%% askinclude-test3.tex, askinclude-test4.tex, -%% askinclude-test5.tex, askinclude-test6.tex, -%% askinclude-test7.tex, askinclude-test8.tex, -%% askinclude-test9.tex, askinclude-test10.tex, -%% askinclude-test11.tex, askinclude-test12.tex, -%% askinclude-test13.tex, askinclude-test14.tex, -%% askinclude-test15.tex, askinclude-test16.tex, -%% askinclude-test17.tex, askinclude-test18.tex, -%% askinclude-test19.tex, askinclude-test20.tex, -%% askinclude-test21.tex, askinclude-test22.tex, -%% askinclude-test23.tex, askinclude-test24.tex. +%% askinclude.bib, askinclude-a.tex, askinclude-b.tex, +%% askinclude-c.tex, askinclude-test1.tex, +%% askinclude-test2.tex, askinclude-test3.tex, +%% askinclude-test4.tex, askinclude-test5.tex, +%% askinclude-test6.tex, askinclude-test7.tex, +%% askinclude-test8.tex, askinclude-test9.tex, +%% askinclude-test10.tex, askinclude-test11.tex, +%% askinclude-test12.tex, askinclude-test13.tex, +%% askinclude-test14.tex, askinclude-test15.tex, +%% askinclude-test16.tex, askinclude-test17.tex, +%% askinclude-test18.tex, askinclude-test19.tex, +%% askinclude-test20.tex, askinclude-test21.tex, +%% askinclude-test22.tex, askinclude-test23.tex, +%% askinclude-test24.tex. %% \NeedsTeXFormat{LaTeX2e} \begingroup\catcode61\catcode48\catcode32=10\relax% @@ -97,7 +98,7 @@ \TMP@EnsureCode{96}{12}% ` \edef\AskInc@AtEnd{\AskInc@AtEnd\noexpand\endinput} \ProvidesPackage{askinclude}% - [2008/08/11 v2.1 Interactive asking of included files]% + [2011/12/02 v2.2 Interactive asking of included files]% \AtBeginDocument{% \let\AskInc@AtBeginDocument\@firstofone } diff --git a/Master/texmf-dist/tex/latex/oberdiek/atfi-dvipdfmx.def b/Master/texmf-dist/tex/latex/oberdiek/atfi-dvipdfmx.def index 784ee56a879..dea3529fa36 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/atfi-dvipdfmx.def +++ b/Master/texmf-dist/tex/latex/oberdiek/atfi-dvipdfmx.def @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: attachfile2 -%% Version: 2010/09/27 v2.6 +%% Version: 2012/04/18 v2.7 %% -%% Copyright (C) 2005-2010 by +%% Copyright (C) 2005-2010, 2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -36,7 +36,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{atfi-dvipdfmx.def}% - [2010/09/27 v2.6 attachfile2 driver for dvipdfmx/XeTeX (HO)]% + [2012/04/18 v2.7 attachfile2 driver for dvipdfmx/XeTeX (HO)]% \def\atfi@special#1{% \special{pdf:#1}% } @@ -209,7 +209,6 @@ \rule[-\atfi@appearancedepth]{0pt}{\atfi@appearancedepth}% \rule{\atfi@appearancewidth}{0pt}% } - \endinput %% %% End of file `atfi-dvipdfmx.def'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/atfi-dvips.def b/Master/texmf-dist/tex/latex/oberdiek/atfi-dvips.def index 4ad5e60161c..027ff47c978 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/atfi-dvips.def +++ b/Master/texmf-dist/tex/latex/oberdiek/atfi-dvips.def @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: attachfile2 -%% Version: 2010/09/27 v2.6 +%% Version: 2012/04/18 v2.7 %% -%% Copyright (C) 2005-2010 by +%% Copyright (C) 2005-2010, 2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -36,7 +36,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{atfi-dvips.def}% - [2010/09/27 v2.6 attachfile2 driver for dvips (HO)]% + [2012/04/18 v2.7 attachfile2 driver for dvips (HO)]% \def\atfi@literal#1{% \special{ps:atfi_dict begin{#1}atfi_?pdfmark end}% } @@ -495,7 +495,6 @@ \rule[-\atfi@appearancedepth]{0pt}{\atfi@appearancedepth}% \rule{\atfi@appearancewidth}{0pt}% } - \endinput %% %% End of file `atfi-dvips.def'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/atfi-pdftex.def b/Master/texmf-dist/tex/latex/oberdiek/atfi-pdftex.def index 7725ff5eb15..2660c857e3d 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/atfi-pdftex.def +++ b/Master/texmf-dist/tex/latex/oberdiek/atfi-pdftex.def @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: attachfile2 -%% Version: 2010/09/27 v2.6 +%% Version: 2012/04/18 v2.7 %% -%% Copyright (C) 2005-2010 by +%% Copyright (C) 2005-2010, 2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -36,7 +36,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{atfi-pdftex.def}% - [2010/09/27 v2.6 attachfile2 driver for pdfTeX (HO)]% + [2012/04/18 v2.7 attachfile2 driver for pdfTeX (HO)]% \ifluatex \ifnum\luatexversion<39 % \else @@ -193,7 +193,6 @@ \rule[-\atfi@appearancedepth]{0pt}{\atfi@appearancedepth}% \rule{\atfi@appearancewidth}{0pt}% } - \endinput %% %% End of file `atfi-pdftex.def'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/attachfile2.sty b/Master/texmf-dist/tex/latex/oberdiek/attachfile2.sty index 2228d9b3582..f2abd72849c 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/attachfile2.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/attachfile2.sty @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: attachfile2 -%% Version: 2010/09/27 v2.6 +%% Version: 2012/04/18 v2.7 %% -%% Copyright (C) 2005-2010 by +%% Copyright (C) 2005-2010, 2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -36,7 +36,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{attachfile2}% - [2010/09/27 v2.6 attach files into PDF (HO)]% + [2012/04/18 v2.7 Attach files into PDF (HO)]% \RequirePackage{ifpdf}[2009/04/10] \RequirePackage{ifxetex} \RequirePackage{ifluatex}[2009/04/10] @@ -804,7 +804,6 @@ \fi \endgroup } - \endinput %% %% End of file `attachfile2.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/atveryend.sty b/Master/texmf-dist/tex/latex/oberdiek/atveryend.sty index 327a476862d..ad34a38a71e 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/atveryend.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/atveryend.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: atveryend -%% Version: 2011/04/23 v1.7 +%% Version: 2011/06/30 v1.8 %% %% Copyright (C) 2009-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -80,7 +80,7 @@ \edef\AtVeryEnd@AtEnd{\AtVeryEnd@AtEnd\noexpand\endinput} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{atveryend}% - [2011/04/23 v1.7 Hooks at very end of document (HO)] + [2011/06/30 v1.8 Hooks at the very end of document (HO)] \def\AtVeryEnd@ifundefined#1{% \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname #1\endcsname\relax @@ -241,6 +241,81 @@ \Call@AtVeryVeryEnd \@@end } +\expandafter\def\csname AtVeryEnd@test@standard20110627\endcsname{% + \let\AtEndDocument\@firstofone + \@enddocumenthook + \@checkend{document}% + \clearpage + \begingroup + \if@filesw + \immediate\closeout\@mainaux + \let\@setckpt\@gobbletwo + \let\@newl@bel\@testdef + \@tempswafalse + \makeatletter + \@@input\jobname.aux % + \fi + \@dofilelist + \ifdim \font@submax >\fontsubfuzz\relax + \@font@warning{Size substitutions with differences\MessageBreak + up to \font@submax\space have occurred.\@gobbletwo}% + \fi + \@defaultsubs + \@refundefined + \if@filesw + \ifx \@multiplelabels \relax + \if@tempswa + \@latex@warning@no@line{Label(s) may have changed. % + Rerun to get cross-references right}% + \fi + \else + \@multiplelabels + \fi + \fi + \endgroup + \deadcycles\z@ + \@@end +} +\expandafter\def\csname AtVeryEnd@enddocument@standard20110627\endcsname{% + \let\AtEndDocument\@firstofone + \@enddocumenthook + \@checkend{document}% + \Call@BeforeClearDocument + \clearpage + \Call@AfterLastShipout + \begingroup + \if@filesw + \immediate\closeout\@mainaux + \let\@setckpt\@gobbletwo + \let\@newl@bel\@testdef + \@tempswafalse + \makeatletter + \@@input\jobname.aux % + \fi + \Call@AtVeryEndDocument + \@dofilelist + \Call@AtEndAfterFileList + \ifdim \font@submax >\fontsubfuzz\relax + \@font@warning{Size substitutions with differences\MessageBreak + up to \font@submax\space have occurred.\@gobbletwo}% + \fi + \@defaultsubs + \@refundefined + \if@filesw + \ifx \@multiplelabels \relax + \if@tempswa + \@latex@warning@no@line{Label(s) may have changed. % + Rerun to get cross-references right}% + \fi + \else + \@multiplelabels + \fi + \fi + \endgroup + \deadcycles\z@ + \Call@AtVeryVeryEnd + \@@end +} \expandafter\def\expandafter\AtVeryEnd@test@booklet\expandafter{% \expandafter\twoupclearpage \AtVeryEnd@test@standard @@ -453,6 +528,7 @@ \def\AtVeryEnd@RedefEndDocument#1{% \ifx#1\@undefined \else + \AtVeryEnd@Test#1{standard20110627}% \AtVeryEnd@Test#1{standard}% \AtVeryEnd@Test#1{booklet}% \AtVeryEnd@Test#1{dinbrief}% diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipdfm.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipdfm.def index 8372861da61..6c0bb4d0c90 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipdfm.def +++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipdfm.def @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: bookmark -%% Version: 2011/04/21 v1.21 +%% Version: 2011/12/02 v1.24 %% %% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -37,7 +37,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-dvipdfm.def}% - [2011/04/21 v1.21 bookmark driver for dvipdfm (HO)]% + [2011/12/02 v1.24 bookmark driver for dvipdfm (HO)]% \newcount\BKM@id \BKM@id=\z@ \@namedef{BKM@0}{000} diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def index e68d7ef7e2f..d5d53bf0985 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def +++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: bookmark -%% Version: 2011/04/21 v1.21 +%% Version: 2011/12/02 v1.24 %% %% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -54,7 +54,7 @@ } \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-dvips.def}% - [2011/04/21 v1.21 bookmark driver for dvips (HO)]% + [2011/12/02 v1.24 bookmark driver for dvips (HO)]% \def\BKM@PSHeaderFile#1{% \special{header=#1}% } diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipsone.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipsone.def index 051ba32822d..eb9ac34142b 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipsone.def +++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipsone.def @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: bookmark -%% Version: 2011/04/21 v1.21 +%% Version: 2011/12/02 v1.24 %% %% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -54,7 +54,7 @@ } \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-dvipsone.def}% - [2011/04/21 v1.21 bookmark driver for dvipsone (HO)]% + [2011/12/02 v1.24 bookmark driver for dvipsone (HO)]% \def\BKM@PSHeaderFile#1{% \special{header=#1}% } diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-pdftex.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-pdftex.def index b410a35f099..5cc1e8738a4 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bkm-pdftex.def +++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-pdftex.def @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: bookmark -%% Version: 2011/04/21 v1.21 +%% Version: 2011/12/02 v1.24 %% %% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -37,7 +37,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-pdftex.def}% - [2011/04/21 v1.21 bookmark driver for pdfTeX (HO)]% + [2011/12/02 v1.24 bookmark driver for pdfTeX (HO)]% \def\BKM@DO@entry#1#2{% \begingroup \kvsetkeys{BKM@DO}{#1}% diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-textures.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-textures.def index 8638f461210..f847da35600 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bkm-textures.def +++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-textures.def @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: bookmark -%% Version: 2011/04/21 v1.21 +%% Version: 2011/12/02 v1.24 %% %% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -54,7 +54,7 @@ } \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-textures.def}% - [2011/04/21 v1.21 bookmark driver for textures (HO)]% + [2011/12/02 v1.24 bookmark driver for textures (HO)]% \def\BKM@PSHeaderFile#1{% \special{prePostScriptfile #1}% } diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-vtex.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-vtex.def index 4b909a50fac..388f5feaea9 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bkm-vtex.def +++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-vtex.def @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: bookmark -%% Version: 2011/04/21 v1.21 +%% Version: 2011/12/02 v1.24 %% %% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -37,7 +37,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-vtex.def}% - [2011/04/21 v1.21 bookmark driver for VTeX (HO)]% + [2011/12/02 v1.24 bookmark driver for VTeX (HO)]% \ifvtexpdf \else \PackageWarningNoLine{bookmark}{% @@ -208,7 +208,7 @@ \fi } \def\BKM@toHexDigit#1{% - \expandafter\ifcase\expandafter\@firstofone\expandafter{\number#1} % + \ifcase\expandafter\@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 diff --git a/Master/texmf-dist/tex/latex/oberdiek/bmpsize.sty b/Master/texmf-dist/tex/latex/oberdiek/bmpsize.sty index 681fa34aa3a..b36c6955322 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bmpsize.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/bmpsize.sty @@ -35,7 +35,7 @@ %% bmpsize-dvipdfm.def, bmpsize-dvipdfmx.def. %% \ProvidesPackage{bmpsize}% - [2009/09/04 v1.6 Extract size and resolution data from bitmap files (HO)]% + [2009/09/04 v1.6 Extract size/resolution from bitmap files (HO)]% \RequirePackage{ifpdf} \ifpdf \PackageInfo{bmpsize}{Superseded by pdfTeX in PDF mode}% diff --git a/Master/texmf-dist/tex/latex/oberdiek/bookmark.sty b/Master/texmf-dist/tex/latex/oberdiek/bookmark.sty index 0901af76fe9..cc4288b6aef 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bookmark.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/bookmark.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: bookmark -%% Version: 2011/04/21 v1.21 +%% Version: 2011/12/02 v1.24 %% %% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -37,7 +37,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{bookmark}% - [2011/04/21 v1.21 PDF bookmarks (HO)]% + [2011/12/02 v1.24 PDF bookmarks (HO)]% \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname numexpr\endcsname\relax \def\BKM@CalcExpr#1#2#3#4{% @@ -139,7 +139,6 @@ \BKM@HookNextClear \DeclareBoolOption{draft} \DeclareComplementaryOption{final}{draft} -\pdf@ifdraftmode\BKM@drafttrue{} \def\BKM@DisableOptions{% \DisableKeyvalOption[action=warning,package=bookmark]% {BKM}{draft}% @@ -620,7 +619,8 @@ \let\BookmarkAtEnd\ltx@gobble \let\bookmarkdefinestyle\ltx@gobbletwo \let\bookmarkget\ltx@gobble - \renewcommand*{\pdfbookmark}[3][]{}% + \let\pdfbookmark\ltx@undefined + \newcommand*{\pdfbookmark}[3][]{}% \let\currentpdfbookmark\ltx@gobbletwo \let\subpdfbookmark\ltx@gobbletwo \let\belowpdfbookmark\ltx@gobbletwo @@ -704,23 +704,24 @@ }\@ehc \endinput } -\renewcommand*{\pdfbookmark}[3][0]{% +\let\pdfbookmark\ltx@undefined +\newcommand*{\pdfbookmark}[3][0]{% \bookmark[level=#1,dest={#3.#1}]{#2}% \hyper@anchorstart{#3.#1}\hyper@anchorend } -\renewcommand*{\currentpdfbookmark}{% +\def\currentpdfbookmark{% \pdfbookmark[\BKM@currentlevel]% } -\renewcommand*{\subpdfbookmark}{% +\def\subpdfbookmark{% \BKM@CalcExpr\BKM@CalcResult\BKM@currentlevel+1% \expandafter\pdfbookmark\expandafter[\BKM@CalcResult]% } -\renewcommand*{\belowpdfbookmark}[2]{% +\def\belowpdfbookmark#1#2{% \xdef\BKM@gtemp{\number\BKM@currentlevel}% \subpdfbookmark{#1}{#2}% \global\let\BKM@currentlevel\BKM@gtemp } -\renewcommand*{\Hy@writebookmark}[5]{% +\def\Hy@writebookmark#1#2#3#4#5{% \ifnum#4>\BKM@depth\relax \else \def\BKM@type{#5}% diff --git a/Master/texmf-dist/tex/latex/oberdiek/centernot.sty b/Master/texmf-dist/tex/latex/oberdiek/centernot.sty index fcdfe2d5fad..57a11cb31d5 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/centernot.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/centernot.sty @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: centernot -%% Version: 2010/03/29 v1.2 +%% Version: 2011/07/11 v1.3 %% -%% Copyright (C) 2006, 2007, 2010 by +%% Copyright (C) 2006, 2007, 2010, 2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -34,7 +34,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{centernot} - [2010/03/29 v1.2 Centers the not symbol horizontally (HO)]% + [2011/07/11 v1.3 Centers the not symbol horizontally (HO)]% \newcommand*{\centernot}{% \mathpalette\@centernot } @@ -50,7 +50,6 @@ {#2}% }% } -\makeatother \endinput %% %% End of file `centernot.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/chemarr.sty b/Master/texmf-dist/tex/latex/oberdiek/chemarr.sty index 95fdfed7d35..e99bd4d6dd1 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/chemarr.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/chemarr.sty @@ -35,7 +35,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{chemarr}% - [2006/02/20 v1.2 Chemical reaction arrows (HO)] + [2006/02/20 v1.2 Arrows for chemical reactions (HO)] \RequirePackage{amsmath} \newcommand{\xrightleftharpoons}[2][]{% \ensuremath{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/classlist.sty b/Master/texmf-dist/tex/latex/oberdiek/classlist.sty index c4e52408d09..f9486f9d37c 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/classlist.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/classlist.sty @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: classlist -%% Version: 2008/08/11 v1.3 +%% Version: 2011/10/17 v1.4 %% -%% Copyright (C) 2005, 2006, 2008 by +%% Copyright (C) 2005, 2006, 2008, 2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -34,7 +34,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{classlist}% - [2008/08/11 v1.3 Record loaded classes (HO)] + [2011/10/17 v1.4 Record classes used in a document (HO)] \let\ClassList\@empty \let\MainClassName\relax \ifx\@classoptionslist\relax diff --git a/Master/texmf-dist/tex/latex/oberdiek/dvipscol.sty b/Master/texmf-dist/tex/latex/oberdiek/dvipscol.sty index f0c6645b023..2128d6dd139 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/dvipscol.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/dvipscol.sty @@ -34,7 +34,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{dvipscol}% - [2008/08/11 v1.2 Fix for dvips.def (HO)] + [2008/08/11 v1.2 Alter the usage of the dvips color stack (HO)] \@ifundefined{ver@dvips.def}{% \PackageWarningNoLine{dvipscol}{% Nothing to fix, because \string`dvips.def\string' not loaded% diff --git a/Master/texmf-dist/tex/latex/oberdiek/enparen.sty b/Master/texmf-dist/tex/latex/oberdiek/enparen.sty new file mode 100644 index 00000000000..e8230f81c98 --- /dev/null +++ b/Master/texmf-dist/tex/latex/oberdiek/enparen.sty @@ -0,0 +1,283 @@ +%% +%% This is file `enparen.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% enparen.dtx (with options: `package') +%% +%% This is a generated file. +%% +%% Project: enparen +%% Version: 2012/01/07 v1.0 +%% +%% Copyright (C) 2012 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. +%% +%% This work consists of the main source file enparen.dtx +%% and the derived files +%% enparen.sty, enparen.pdf, enparen.ins, enparen.drv. +%% +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{enparen} + [2012/01/07 v1.0 Parentheses nesting (HO)]% +\RequirePackage{ltxcmds}[2011/11/09] +\ltx@IfUndefined{numexpr}{% + \PackageError{enparen}{% + Missing e-TeX's \ltx@backslashchar numexpr.\MessageBreak + The package will continue with emergency definitions% + }\@ehc + \def\enparenLeft{(}% + \def\enparenRight{)}% + \long\def\enparen#1{\enparenLeft#1\enparenRight}% + \let\enparenSetup\ltx@gobble + \let\enparenSetSymbols\ltx@gobblethree + \let\enparenUnsetSymbols\ltx@gobble + \endinput +}{} +\RequirePackage{protecteddef}[2011/01/31] +\RequirePackage{atveryend}[2011/06/30] +\RequirePackage{uniquecounter}[2011/01/30] +\RequirePackage{zref-base}[2011/03/18] +\RequirePackage{kvoptions}[2011/06/30] +\RequirePackage{kvsetkeys}[2011/10/18] +\providecommand{\zref@wrapper@mainaux}[1]{% + \ifx\@auxout\@mainaux + #1% + \else + \begingroup + \let\@auxout\@mainaux + #1% + \endgroup + \fi +} +\UniqueCounterNew{enparen} +\zref@newprop{enparen}[0]{} +\def\enparenContextDefault{main} +\let\enparen@ctx\ltx@empty +\let\enparen@stack\ltx@empty +\global\let\enparen@CtxStack\ltx@empty +\def\enparen@CtxStackPush#1{% + \xdef\enparen@CtxStack{% + {\enparen@ctx}{\enparen@stack}% + \enparen@CtxStack + }% + \xdef\enparen@ctx{#1}% + \global\let\enparen@stack\ltx@empty +} +\def\enparen@CtxStackPop{% + \ifx\enparen@CtxStack\ltx@empty + \PackageWarning{enparen}{% + Pop request for empty context stack% + }% + \global\let\enparen@ctx\enparenContextDefault + \global\let\enparen@stack\ltx@empty + \else + \xdef\enparen@ctx{% + \expandafter\ltx@car\enparen@CtxStack\@nil + }% + \xdef\enparen@stack{% + \expandafter\ltx@carsecond\enparen@CtxStack\@nil + }% + \xdef\enparen@CtxStack{% + \expandafter\ltx@cdrtwo\enparen@CtxStack\@nil + }% + \fi +} +\ProtectedDef*{\enparenBeginContext}[1]{% + \enparen@CtxStackPush{#1}% +} +\ProtectedDef*{\enparenEndContext}[1]{% + \edef\enparen@temp{#1}% + \ifx\enparen@temp\enparen@ctx + \else + \PackageWarning{enparen}{% + Context mismatch in end request.\MessageBreak + `#1' should be ended, but current context\MessageBreak + is `\enparen@ctx'% + }% + \fi + \enparenCheckEmptyStack + \enparen@CtxStackPop +} +\ProtectedDef*{\enparenCheckEmptyStack}[0]{% + \ifx\enparen@stack\ltx@empty + \else + \PackageWarning{enparen}{% + Ending non-empty stack `\enparen@ctx':\MessageBreak + \enparen@PrintStack\MessageBreak + }% + \fi +} +\def\enparen@PrintStack{% + \expandafter\enparen@PrintStackAux + \enparen@stack\ltx@empty\ltx@empty +} +\def\enparen@PrintStackAux#1#2{% + \ifx\ltx@empty#1% + \else + {#1:#2}% + \expandafter\enparen@PrintStackAux + \fi +} +\ProtectedDef*{\enparenSetSymbols}[3]{% + \expandafter + \def\csname enparen@symbol\the\numexpr#1L\endcsname{#2}% + \expandafter + \def\csname enparen@symbol\the\numexpr#1R\endcsname{#3}% +} +\ProtectedDef*{\enparenUnsetSymbols}[1]{% + \expandafter + \let\csname enparen@symbol\the\numexpr#1L\endcsname\ltx@undefined + \expandafter + \let\csname enparen@symbol\the\numexpr#1R\endcsname\ltx@undefined +} +\enparenSetSymbols{0}{(}{)} +\enparenSetSymbols{1}{(}{)} +\enparenSetSymbols{2}{[}{]} +\enparenSetSymbols{3}{\{}{\}} +\enparenSetSymbols{4}{\ensuremath{\langle}}{\ensuremath{\rangle}} +\ProtectedDef{\enparen}[1]{% + \enparenLeft#1\enparenRight +} +\ProtectedDef*{\enparenLeft}[0]{% + \UniqueCounterCall{enparen}\enparen@Left +} +\def\enparen@Left#1{% + \xdef\enparen@stack{% + {#1}{1}% + \expandafter\enparen@Inc\expandafter2\expandafter!% + \enparen@stack\ltx@empty\ltx@empty + }% + \edef\enparen@tmp{\zref@extract{enparen#1}{enparen}}% + \ltx@IfUndefined{enparen@symbol\enparen@tmp L}{% + \PackageWarning{enparen}{% + Undefined symbols for level \enparen@tmp + }% + \csname enparen@symbol0L\endcsname + }{% + \csname enparen@symbol\enparen@tmp L\endcsname + }% +} +\def\enparen@Inc#1!#2#3{% + \ifx\ltx@empty#2% + \else + \ifnum#3<#1 % + {#2}{#1}% + \expandafter\enparen@Inc + \the\numexpr#1+1\expandafter\expandafter\expandafter!% + \else + {#2}{#3}% + \fi + \fi +} +\ProtectedDef*{\enparenRight}[0]{% + \ifx\enparen@stack\ltx@empty + \PackageWarning{enparen}{% + Missing left symbol for right symbol% + }% + \csname enparen@symbol0R\endcsname + \else + \expandafter\enparen@Right\enparen@stack\@nil + \fi +} +\def\enparen@Right#1#2#3\@nil{% + \ltx@IfUndefined{% + enparen@symbol% + \zref@extract{enparen#1}{enparen}% + R% + }{% + \csname enparen@symbol0R\endcsname + }{% + \csname + enparen@symbol% + \zref@extract{enparen#1}{enparen}% + R% + \endcsname + }% + \zref@wrapper@mainaux{% + \zref@setcurrent{enparen}{#2}% + \zref@labelbyprops{enparen#1}{enparen}% + }% + \xdef\enparen@stack{#3}% +} +\SetupKeyvalOptions{% + family=enparen,% + prefix=enparen@,% +} +\ProtectedDef*{\enparenSetup}[0]{% + \kvsetkeys{enparen}% +} +\DeclareBoolOption[true]{footnote} +\DeclareBoolOption[true]{caption} +\ProcessKeyvalOptions* +\def\enparen@AtBegin{% + \ifenparen@footnote + \let\enparen@org@makefntext\@makefntext + \long\def\@makefntext##1{% + \enparen@org@makefntext{% + \enparenBeginContext{footnote}% + ##1% + \enparenEndContext{footnote}% + }% + }% + \fi + \enparen@Disable{footnote}% + \ifenparen@caption + \let\enparen@org@makecaption\@makecaption + \long\def\@makecaption##1##2{% + \enparen@org@makecaption{##1}{% + \enparenBeginContext{caption}% + ##2% + \enparenEndContext{caption}% + }% + }% + \fi + \enparen@Disable{caption}% +} +\def\enparen@Disable#1{% + \DisableKeyvalOption[% + action=warning,% + package=enparen,% + ]{enparen}{#1}% +} +\AtBeginDocument{\enparen@AtBegin} +\def\enparen@AtEnd{% + \enparenCheckEmptyStack + \ifx\enparen@CtxStack\ltx@empty + \else + \PackageWarningNoLine{enparen}{% + Context stack is not empty at end of document.\MessageBreak + Current stack and contents of context stack:\MessageBreak + [\enparen@ctx]:[\enparen@PrintStack]% + \expandafter + \enparen@PrintContextStack\enparen@CtxStack\relax\relax + }% + \fi +} +\def\enparen@PrintContextStack#1#2{% + \ifx\relax#1\ltx@empty + \else + \MessageBreak + [#1]:[\enparen@PrintStackAux#2\ltx@empty\ltx@empty]% hash-ok + \expandafter\enparen@PrintContextStack + \fi +} +\AtVeryEndDocument{\enparen@AtEnd} +\endinput +%% +%% End of file `enparen.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/flags.sty b/Master/texmf-dist/tex/latex/oberdiek/flags.sty index c93ca57a6eb..2f470c01c83 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/flags.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/flags.sty @@ -34,7 +34,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{flags}% - [2007/09/30 v0.4 Flag setting in bit fields (HO)]% + [2007/09/30 v0.4 Setting/clearing of flags in bit fields (HO)]% \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname numexpr\endcsname\relax \PackageError{flags}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/grfext.sty b/Master/texmf-dist/tex/latex/oberdiek/grfext.sty index a09dbb44ba8..6793b504131 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/grfext.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/grfext.sty @@ -99,7 +99,7 @@ \fi \expandafter\x\csname ver@grfext.sty\endcsname \ProvidesPackage{grfext}% - [2010/08/19 v1.1 Managing graphics extensions (HO)]% + [2010/08/19 v1.1 Manage graphics extensions (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % diff --git a/Master/texmf-dist/tex/latex/oberdiek/grffile.sty b/Master/texmf-dist/tex/latex/oberdiek/grffile.sty index c08d08e5b70..2f8682a5ba9 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/grffile.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/grffile.sty @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: grffile -%% Version: 2010/12/09 v1.13 +%% Version: 2012/04/05 v1.16 %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -35,7 +35,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{grffile}% - [2010/12/09 v1.13 Extended file name support for graphics (HO)]% + [2012/04/05 v1.16 Extended file name support for graphics (HO)]% \edef\grffile@RestoreCatcodes{% \catcode`\noexpand\=\the\catcode`\=\relax \catcode`\noexpand\:\the\catcode`\:\relax @@ -171,9 +171,8 @@ \fi \fi \fi - \toks@\expandafter{\grffile@filename}% \edef\x{\endgroup - \noexpand\grffile@Ginclude@graphics{\the\toks@}% + \noexpand\grffile@Ginclude@graphics{\grffile@filename}% }% \x } @@ -229,7 +228,7 @@ \grffile@XeTeX@IfFileExists{\reserved@b#1}{% \edef\grffile@file@found{\reserved@b#1}% \let\reserved@a\@firstoftwo - \@break@tfor + \iftrue\@break@tfor\fi }{}% }% \fi @@ -268,6 +267,40 @@ }% \fi \fi + \let\grffile@org@Gread@eps\Gread@eps + \def\grffile@temp#1\immediate\openin#2 #3\grffile@nil#4\grffile@NIL{% + \begingroup + \toks@{#2}% + \edef\grffile@temp{\the\toks@}% + \def\grffile@test{\@inputcheck####1}% + \ifx\grffile@temp\grffile@test + \expandafter\@firstoftwo + \else + \expandafter\@secondoftwo + \fi + {% + \toks@{% + #1% + \immediate\openin\@inputcheck"##1"\relax + #3% + }% + \expandafter\endgroup + \expandafter\def\expandafter\Gread@eps + \expandafter##\expandafter1\expandafter{% + \the\toks@ + }% + \PackageInfo{grffile}{% + \string\Gread@eps\space patched% + }% + }{% + \PackageWarning{grffile}{% + Unsupported \string\Gread@eps\space not patched% + }% + \endgroup + }% + }% + \expandafter\grffile@temp\Gread@eps{#1}\grffile@nil + \immediate\openin{} \grffile@nil\grffile@NIL \else \begingroup \let\on@line\@empty diff --git a/Master/texmf-dist/tex/latex/oberdiek/holtxdoc.sty b/Master/texmf-dist/tex/latex/oberdiek/holtxdoc.sty index 6f43e9623b1..737c859b04a 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/holtxdoc.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/holtxdoc.sty @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: holtxdoc -%% Version: 2011/02/04 v0.21 +%% Version: 2012/03/21 v0.24 %% -%% Copyright (C) 1999-2011 by +%% Copyright (C) 1999-2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -34,13 +34,14 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{holtxdoc}% - [2011/02/04 v0.21 Private additional ltxdoc support (HO)] + [2012/03/21 v0.24 Private additional ltxdoc support (HO)] \PassOptionsToPackage{pdfencoding=auto}{hyperref} \RequirePackage[numbered]{hypdoc}[2010/03/26] \RequirePackage{hyperref}[2010/03/30] \RequirePackage{pdftexcmds}[2010/04/01] \RequirePackage{ltxcmds}[2010/03/09] -\RequirePackage{hologo}[2010/04/24] +\RequirePackage{hologo}[2011/11/22] +\RequirePackage{ifluatex}[2010/03/01] \RequirePackage{array} \def\hld@info#1{% \PackageInfo{holtxdoc}{#1\@gobble}% @@ -48,6 +49,11 @@ \def\hld@warn#1{% \PackageWarningNoLine{holtxdoc}{#1}% } +\ifluatex + \RequirePackage{fontspec}[2011/09/18]% + \RequirePackage{unicode-math}[2011/09/19]% + \setmathfont{lmmath-regular.otf}% +\fi \ltx@IfUndefined{pdf@filemoddate}{% }{% \edef\hld@temp{\pdf@filemoddate{\jobname.dtx}}% @@ -82,8 +88,9 @@ \hld@temp \fi } +\providecommand*{\historyname}{History} \newcommand*{\StartHistory}{% - \section{History}% + \section{\historyname}% } \@ifpackagelater{hyperref}{2009/11/27}{% \newcommand*{\HistVersion}[1]{% @@ -115,9 +122,13 @@ \StartHistory \def\Version##1{% \HistVersion{##1}% - \itemize + \@ifnextchar\end{% + \let\endVersion\relax + }{% + \let\endVersion\enditemize + \itemize + }% }% - \let\endVersion\enditemize \raggedright }{} \newcommand{\URL}[2]{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/hopatch.sty b/Master/texmf-dist/tex/latex/oberdiek/hopatch.sty index 3a39695a467..a5180680764 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/hopatch.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/hopatch.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: hopatch -%% Version: 2011/01/30 v1.0 +%% Version: 2011/06/24 v1.1 %% %% Copyright (C) 2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -75,7 +75,7 @@ \edef\HOpatch@AtEnd{\HOpatch@AtEnd\noexpand\endinput} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{hopatch}% - [2011/01/30 v1.0 Wrapper for package hooks (HO)] + [2011/06/24 v1.1 Wrapper for package hooks (HO)] \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname RequirePackage\endcsname\relax \def\TMP@RequirePackage#1[#2]{% @@ -147,23 +147,27 @@ } \AtBeginDocument{\HOpatch@list} \ltx@ifundefined{AtEndPreamble}{}{% - \AtEndPreamble{\HOpatch@list}% + \ltx@ifundefined{@endpreamblehook}{}{% + \AtEndPreamble{\HOpatch@list}% + }% } \ltx@ifundefined{AfterEndPreamble}{}{% - \AfterEndPreamble{% - \let\HOpatch@OrgIfPackageLoaded\@ifpackageloaded - \let\HOpatch@OrgIfPackageLater\@ifpackagelater - \let\HOpatch@OrgIfClassLoaded\@ifclassloaded - \let\HOpatch@OrgIfClassLater\@ifclasslater - \let\@ifpackageloaded\ltx@ifpackageloaded - \let\@ifpackagelater\ltx@ifpackagelater - \let\@ifclassloaded\ltx@ifclassloaded - \let\@ifclasslater\ltx@ifclasslater - \HOpatch@list - \let\@ifpackageloaded\HOpatch@OrgIfPackageLoaded - \let\@ifpackagelater\HOpatch@OrgIfPackageLater - \let\@ifclassloaded\HOpatch@OrgIfClassLoaded - \let\@ifclasslater\HOpatch@OrgIfClassLater + \ltx@ifundefined{@afterendpreamblehook}{}{% + \AfterEndPreamble{% + \let\HOpatch@OrgIfPackageLoaded\@ifpackageloaded + \let\HOpatch@OrgIfPackageLater\@ifpackagelater + \let\HOpatch@OrgIfClassLoaded\@ifclassloaded + \let\HOpatch@OrgIfClassLater\@ifclasslater + \let\@ifpackageloaded\ltx@ifpackageloaded + \let\@ifpackagelater\ltx@ifpackagelater + \let\@ifclassloaded\ltx@ifclassloaded + \let\@ifclasslater\ltx@ifclasslater + \HOpatch@list + \let\@ifpackageloaded\HOpatch@OrgIfPackageLoaded + \let\@ifpackagelater\HOpatch@OrgIfPackageLater + \let\@ifclassloaded\HOpatch@OrgIfClassLoaded + \let\@ifclasslater\HOpatch@OrgIfClassLater + }% }% } \HOpatch@AtEnd% diff --git a/Master/texmf-dist/tex/latex/oberdiek/hycolor.sty b/Master/texmf-dist/tex/latex/oberdiek/hycolor.sty index e8637ae4d18..d2efcb5b356 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/hycolor.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/hycolor.sty @@ -38,7 +38,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{hycolor}% - [2011/01/30 v1.7 Color options of hyperref/bookmark (HO)]% + [2011/01/30 v1.7 Color options for hyperref/bookmark (HO)]% \RequirePackage{xcolor-patch}[2011/01/30] \begingroup \catcode`\!=13 % diff --git a/Master/texmf-dist/tex/latex/oberdiek/hypcap.sty b/Master/texmf-dist/tex/latex/oberdiek/hypcap.sty index 820b2e119a2..f1888c0b5bf 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/hypcap.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/hypcap.sty @@ -34,7 +34,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{hypcap}% - [2011/02/16 v1.11 Adjusting anchors of captions (HO)] + [2011/02/16 v1.11 Adjusting the anchors of captions (HO)] \@ifundefined{hyper@@anchor}{% \PackageError{hypcap}{You have to load 'hyperref' first}\@ehc \endinput diff --git a/Master/texmf-dist/tex/latex/oberdiek/hypdestopt.sty b/Master/texmf-dist/tex/latex/oberdiek/hypdestopt.sty index eb3583c207f..c08f1a47822 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/hypdestopt.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/hypdestopt.sty @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: hypdestopt -%% Version: 2008/08/08 v2.2 +%% Version: 2011/05/13 v2.3 %% -%% Copyright (C) 2006, 2007, 2008 by +%% Copyright (C) 2006-2008, 2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -34,7 +34,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{hypdestopt}% - [2008/08/08 v2.2 Hyperref destination optimizer (HO)]% + [2011/05/13 v2.3 Hyperref destination optimizer (HO)]% \newif\ifHypDest@Verbose \DeclareOption{verbose}{\HypDest@Verbosetrue} \def\HypDest@VerboseInfo#1{% @@ -72,7 +72,8 @@ \ifHypDest@name \RequirePackage{alphalph}[2006/05/30]% \fi -\RequirePackage{auxhook} +\RequirePackage{auxhook}[2009/12/14] +\RequirePackage{pdfescape}[2007/04/21] \long\def\HypDest@PrependDocument#1{% \begingroup \toks\z@{#1}% @@ -176,29 +177,36 @@ \ifHypDest@name \let\HypDest@Org@DestName\Hy@DestName \renewcommand*{\Hy@DestName}[2]{% - \@ifundefined{\HypDest@Prefix#1}{% + \EdefUnescapeString\HypDest@temp{#1}% + \@ifundefined{\HypDest@Prefix\HypDest@temp}{% \HypDest@VerboseInfo{% - DestName: (#1) unused% + DestName: (\HypDest@temp) unused% }% }{% - \HypDest@Org@DestName{\csname\HypDest@Prefix#1\endcsname}{#2}% + \HypDest@Org@DestName{% + \csname\HypDest@Prefix\HypDest@temp\endcsname + }{#2}% \HypDest@VerboseInfo{% - DestName: (#1) % - 0x\pdf@escapehex{\csname\HypDest@Prefix#1\endcsname}% + DestName: (\HypDest@temp) % + 0x\pdf@escapehex{% + \csname\HypDest@Prefix\HypDest@temp\endcsname + }% }% }% }% \else \renewcommand*{\Hy@DestName}[2]{% - \@ifundefined{\HypDest@Prefix#1}{% + \EdefUnescapeString\HypDest@temp{#1}% + \@ifundefined{\HypDest@Prefix\HypDest@temp}{% \HypDest@VerboseInfo{% - DestName: (#1) unused% + DestName: (\HypDest@temp) unused% }% }{% - \pdfdest num\csname\HypDest@Prefix#1\endcsname#2\relax + \pdfdest num% + \csname\HypDest@Prefix\HypDest@temp\endcsname#2\relax \HypDest@VerboseInfo{% - DestName: (#1) % - num \csname\HypDest@Prefix#1\endcsname + DestName: (\HypDest@temp) % + num \csname\HypDest@Prefix\HypDest@temp\endcsname }% }% }% @@ -264,7 +272,11 @@ \@ifundefined{\HypDest@Prefix#2}{% \edef#1{goto name{hypdestopt\string :unknown}}% }{% - \edef#1{goto num\csname\HypDest@Prefix#2\endcsname}% + \ifHypDest@name + \edef#1{goto name{\csname\HypDest@Prefix#2\endcsname}}% + \else + \edef#1{goto num\csname\HypDest@Prefix#2\endcsname}% + \fi }% }% \def\BKM@HypDestOptHook{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/hypdoc.sty b/Master/texmf-dist/tex/latex/oberdiek/hypdoc.sty index 9a393d52d82..dbf01bf3137 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/hypdoc.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/hypdoc.sty @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: hypdoc -%% Version: 2010/03/26 v1.9 +%% Version: 2011/08/19 v1.11 %% -%% Copyright (C) 2002, 2006, 2007, 2009, 2010 by +%% Copyright (C) 2002, 2006, 2007, 2009-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -34,7 +34,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{hypdoc}% - [2010/03/26 v1.9 Hyper extensions for doc.sty (HO)]% + [2011/08/19 v1.11 Hyper extensions for doc.sty (HO)]% \newif\ifHD@numbered \DeclareOption{numbered}{\HD@numberedtrue} \ProcessOptions*\relax @@ -47,7 +47,7 @@ hyperindex=false,% pdfusetitle,% colorlinks,% - pdfpagelabels,% + pdfpagelabels% ]{hyperref}[2002/05/09]% \hypersetup{% plainpages=false,% @@ -296,7 +296,7 @@ \ifhmode \settoheight{\HD@helplength}{[H]}% \addtolength{\HD@helplength}{0.4ex}% - \raisebox{\HD@helplength}{% + \raisebox{\HD@helplength}[0pt][0pt]{% \HD@maketarget }% \else diff --git a/Master/texmf-dist/tex/latex/oberdiek/hypgotoe.sty b/Master/texmf-dist/tex/latex/oberdiek/hypgotoe.sty index 5aace7b44ae..0ed45da0a72 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/hypgotoe.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/hypgotoe.sty @@ -35,7 +35,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{hypgotoe}% - [2007/10/30 v0.1 Experimental links to embedded files (HO)]% + [2007/10/30 v0.1 Links to embedded files (HO)]% \RequirePackage{ifpdf}[2007/09/09] \ifpdf \else diff --git a/Master/texmf-dist/tex/latex/oberdiek/ifdraft.sty b/Master/texmf-dist/tex/latex/oberdiek/ifdraft.sty index e27c6187a59..6ebb25bd76a 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/ifdraft.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/ifdraft.sty @@ -34,7 +34,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{ifdraft}% - [2008/08/11 v1.3 Switch for option draft (HO)] + [2008/08/11 v1.3 Detect class options draft and final (HO)] \newif\if@draft \newif\if@option@draft \newif\if@option@final diff --git a/Master/texmf-dist/tex/latex/oberdiek/inputenx.sty b/Master/texmf-dist/tex/latex/oberdiek/inputenx.sty index 7e3c8ec26e6..c65d398c384 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/inputenx.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/inputenx.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: inputenx -%% Version: 2011/04/10 v1.8 +%% Version: 2011/05/27 v1.10 %% %% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -39,14 +39,14 @@ %% x-iso-8859-14.def, x-iso-8859-15.def, x-iso-8859-16.def, %% x-cp437.def, x-cp850.def, x-cp852.def, x-cp855.def, %% x-cp858.def, x-cp865.def, x-cp866.def, x-cp1250.def, -%% x-cp1251.def, x-cp1252.def, x-cp1257.def, x-dec-mcs.def, -%% x-koi8-r.def, x-mac-centeuro.def, x-mac-cyrillic.def, -%% x-mac-roman.def, x-nextstep.def, inputenx-licrcmds.txt, -%% inputenx-utf8enc.txt. +%% x-cp1251.def, x-cp1252.def, x-cp1255.def, x-cp1257.def, +%% x-dec-mcs.def, x-koi8-r.def, x-mac-centeuro.def, +%% x-mac-cyrillic.def, x-mac-roman.def, x-nextstep.def, +%% inputenx-licrcmds.txt, inputenx-utf8enc.txt. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{inputenx}% - [2011/04/10 v1.8 Enhanced input encoding handling (HO)]% + [2011/05/27 v1.10 Enhanced input encoding handling (HO)]% \providecommand*{\CurrentInputEncodingName}{} \providecommand*{\CurrentInputEncodingOption}{} \def\IEX@SetFileCatcodes{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/ix-alias.def b/Master/texmf-dist/tex/latex/oberdiek/ix-alias.def index 77612750873..ce7779db7a6 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/ix-alias.def +++ b/Master/texmf-dist/tex/latex/oberdiek/ix-alias.def @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: inputenx -%% Version: 2011/04/10 v1.8 +%% Version: 2011/05/27 v1.10 %% %% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -39,12 +39,12 @@ %% x-iso-8859-14.def, x-iso-8859-15.def, x-iso-8859-16.def, %% x-cp437.def, x-cp850.def, x-cp852.def, x-cp855.def, %% x-cp858.def, x-cp865.def, x-cp866.def, x-cp1250.def, -%% x-cp1251.def, x-cp1252.def, x-cp1257.def, x-dec-mcs.def, -%% x-koi8-r.def, x-mac-centeuro.def, x-mac-cyrillic.def, -%% x-mac-roman.def, x-nextstep.def, inputenx-licrcmds.txt, -%% inputenx-utf8enc.txt. +%% x-cp1251.def, x-cp1252.def, x-cp1255.def, x-cp1257.def, +%% x-dec-mcs.def, x-koi8-r.def, x-mac-centeuro.def, +%% x-mac-cyrillic.def, x-mac-roman.def, x-nextstep.def, +%% inputenx-licrcmds.txt, inputenx-utf8enc.txt. %% -\ProvidesFile{ix-alias.def}[2011/04/10 v1.8 Alias list (inputenx)] +\ProvidesFile{ix-alias.def}[2011/05/27 v1.10 Alias list (inputenx)] \InputenxAlias{ascii}{x-ascii} \InputenxAlias{atarist}{x-atarist} \InputenxAlias{iso-8859-1}{x-iso-8859-1} @@ -69,6 +69,7 @@ \InputenxAlias{cp1250}{x-cp1250} \InputenxAlias{cp1251}{x-cp1251} \InputenxAlias{cp1252}{x-cp1252} +\InputenxAlias{cp1255}{x-cp1255} \InputenxAlias{cp1257}{x-cp1257} \InputenxAlias{dec-mcs}{x-dec-mcs} \InputenxAlias{koi8-r}{x-koi8-r} diff --git a/Master/texmf-dist/tex/latex/oberdiek/ix-math.def b/Master/texmf-dist/tex/latex/oberdiek/ix-math.def index a18bc719d0a..038cfe800bb 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/ix-math.def +++ b/Master/texmf-dist/tex/latex/oberdiek/ix-math.def @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: inputenx -%% Version: 2011/04/10 v1.8 +%% Version: 2011/05/27 v1.10 %% %% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -39,13 +39,13 @@ %% x-iso-8859-14.def, x-iso-8859-15.def, x-iso-8859-16.def, %% x-cp437.def, x-cp850.def, x-cp852.def, x-cp855.def, %% x-cp858.def, x-cp865.def, x-cp866.def, x-cp1250.def, -%% x-cp1251.def, x-cp1252.def, x-cp1257.def, x-dec-mcs.def, -%% x-koi8-r.def, x-mac-centeuro.def, x-mac-cyrillic.def, -%% x-mac-roman.def, x-nextstep.def, inputenx-licrcmds.txt, -%% inputenx-utf8enc.txt. +%% x-cp1251.def, x-cp1252.def, x-cp1255.def, x-cp1257.def, +%% x-dec-mcs.def, x-koi8-r.def, x-mac-centeuro.def, +%% x-mac-cyrillic.def, x-mac-roman.def, x-nextstep.def, +%% inputenx-licrcmds.txt, inputenx-utf8enc.txt. %% \ProvidesFile{ix-math.def}% - [2011/04/10 v1.8 Math list (inputenx)]% + [2011/05/27 v1.10 Math list (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \DeclareMathMeaning{\ss}{\beta} diff --git a/Master/texmf-dist/tex/latex/oberdiek/ix-name.def b/Master/texmf-dist/tex/latex/oberdiek/ix-name.def index 66499e77409..5731f649a30 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/ix-name.def +++ b/Master/texmf-dist/tex/latex/oberdiek/ix-name.def @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: inputenx -%% Version: 2011/04/10 v1.8 +%% Version: 2011/05/27 v1.10 %% %% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -39,13 +39,13 @@ %% x-iso-8859-14.def, x-iso-8859-15.def, x-iso-8859-16.def, %% x-cp437.def, x-cp850.def, x-cp852.def, x-cp855.def, %% x-cp858.def, x-cp865.def, x-cp866.def, x-cp1250.def, -%% x-cp1251.def, x-cp1252.def, x-cp1257.def, x-dec-mcs.def, -%% x-koi8-r.def, x-mac-centeuro.def, x-mac-cyrillic.def, -%% x-mac-roman.def, x-nextstep.def, inputenx-licrcmds.txt, -%% inputenx-utf8enc.txt. +%% x-cp1251.def, x-cp1252.def, x-cp1255.def, x-cp1257.def, +%% x-dec-mcs.def, x-koi8-r.def, x-mac-centeuro.def, +%% x-mac-cyrillic.def, x-mac-roman.def, x-nextstep.def, +%% inputenx-licrcmds.txt, inputenx-utf8enc.txt. %% \ProvidesFile{ix-name.def}% - [2011/04/10 v1.8 Name list (inputenx)]% + [2011/05/27 v1.10 Name list (inputenx)]% \InputenxName{AE}{00C6}% LATIN CAPITAL LETTER AE \InputenxName{Aacute}{00C1}% LATIN CAPITAL LETTER A WITH ACUTE \InputenxName{Abreve}{0102}% LATIN CAPITAL LETTER A WITH BREVE diff --git a/Master/texmf-dist/tex/latex/oberdiek/ix-slot.def b/Master/texmf-dist/tex/latex/oberdiek/ix-slot.def index ad67569b5df..49318dc2946 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/ix-slot.def +++ b/Master/texmf-dist/tex/latex/oberdiek/ix-slot.def @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: inputenx -%% Version: 2011/04/10 v1.8 +%% Version: 2011/05/27 v1.10 %% %% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -39,13 +39,13 @@ %% x-iso-8859-14.def, x-iso-8859-15.def, x-iso-8859-16.def, %% x-cp437.def, x-cp850.def, x-cp852.def, x-cp855.def, %% x-cp858.def, x-cp865.def, x-cp866.def, x-cp1250.def, -%% x-cp1251.def, x-cp1252.def, x-cp1257.def, x-dec-mcs.def, -%% x-koi8-r.def, x-mac-centeuro.def, x-mac-cyrillic.def, -%% x-mac-roman.def, x-nextstep.def, inputenx-licrcmds.txt, -%% inputenx-utf8enc.txt. +%% x-cp1251.def, x-cp1252.def, x-cp1255.def, x-cp1257.def, +%% x-dec-mcs.def, x-koi8-r.def, x-mac-centeuro.def, +%% x-mac-cyrillic.def, x-mac-roman.def, x-nextstep.def, +%% inputenx-licrcmds.txt, inputenx-utf8enc.txt. %% \ProvidesFile{ix-slot.def}% - [2011/04/10 v1.8 SLOT and UC to Encodings (inputenx)]% + [2011/05/27 v1.10 SLOT and UC to Encodings (inputenx)]% \InputenxSlot{128}{00A0}{\do{nextstep}} \InputenxSlot{128}{00C4}{\do{mac-centeuro}\do{mac-roman}} \InputenxSlot{128}{00C7}{% @@ -54,7 +54,9 @@ \InputenxSlot{128}{0402}{\do{cp1251}} \InputenxSlot{128}{0410}{\do{cp866}\do{mac-cyrillic}} \InputenxSlot{128}{0452}{\do{cp855}} -\InputenxSlot{128}{20AC}{\do{cp1250}\do{cp1252}\do{cp1257}} +\InputenxSlot{128}{20AC}{% + \do{cp1250}\do{cp1252}\do{cp1255}\do{cp1257}% +} \InputenxSlot{128}{2500}{\do{koi8-r}} \InputenxSlot{129}{00C0}{\do{nextstep}} \InputenxSlot{129}{00C5}{\do{mac-roman}} @@ -75,7 +77,7 @@ \InputenxSlot{130}{0412}{\do{cp866}\do{mac-cyrillic}} \InputenxSlot{130}{0453}{\do{cp855}} \InputenxSlot{130}{201A}{% - \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}% + \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1255}\do{cp1257}% } \InputenxSlot{130}{250C}{\do{koi8-r}} \InputenxSlot{131}{00C2}{\do{nextstep}} @@ -83,7 +85,7 @@ \InputenxSlot{131}{00E2}{% \do{atarist}\do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}% } -\InputenxSlot{131}{0192}{\do{cp1252}} +\InputenxSlot{131}{0192}{\do{cp1252}\do{cp1255}} \InputenxSlot{131}{0403}{\do{cp855}} \InputenxSlot{131}{0413}{\do{cp866}\do{mac-cyrillic}} \InputenxSlot{131}{0453}{\do{cp1251}} @@ -97,7 +99,7 @@ \InputenxSlot{132}{0414}{\do{cp866}\do{mac-cyrillic}} \InputenxSlot{132}{0451}{\do{cp855}} \InputenxSlot{132}{201E}{% - \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}% + \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1255}\do{cp1257}% } \InputenxSlot{132}{2514}{\do{koi8-r}} \InputenxSlot{133}{00C4}{\do{nextstep}} @@ -109,7 +111,7 @@ \InputenxSlot{133}{0401}{\do{cp855}} \InputenxSlot{133}{0415}{\do{cp866}\do{mac-cyrillic}} \InputenxSlot{133}{2026}{% - \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}% + \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1255}\do{cp1257}% } \InputenxSlot{133}{2518}{\do{koi8-r}} \InputenxSlot{134}{00C5}{\do{nextstep}} @@ -121,7 +123,7 @@ \InputenxSlot{134}{0416}{\do{cp866}\do{mac-cyrillic}} \InputenxSlot{134}{0454}{\do{cp855}} \InputenxSlot{134}{2020}{% - \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}% + \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1255}\do{cp1257}% } \InputenxSlot{134}{251C}{\do{koi8-r}} \InputenxSlot{135}{00C7}{\do{nextstep}} @@ -132,7 +134,7 @@ \InputenxSlot{135}{0404}{\do{cp855}} \InputenxSlot{135}{0417}{\do{cp866}\do{mac-cyrillic}} \InputenxSlot{135}{2021}{% - \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}% + \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1255}\do{cp1257}% } \InputenxSlot{135}{2524}{\do{koi8-r}} \InputenxSlot{136}{00C8}{\do{nextstep}} @@ -142,7 +144,7 @@ } \InputenxSlot{136}{0105}{\do{mac-centeuro}} \InputenxSlot{136}{0142}{\do{cp852}} -\InputenxSlot{136}{02C6}{\do{cp1252}} +\InputenxSlot{136}{02C6}{\do{cp1252}\do{cp1255}} \InputenxSlot{136}{0418}{\do{cp866}\do{mac-cyrillic}} \InputenxSlot{136}{0455}{\do{cp855}} \InputenxSlot{136}{20AC}{\do{cp1251}} @@ -156,7 +158,7 @@ \InputenxSlot{137}{0405}{\do{cp855}} \InputenxSlot{137}{0419}{\do{cp866}\do{mac-cyrillic}} \InputenxSlot{137}{2030}{% - \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}% + \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1255}\do{cp1257}% } \InputenxSlot{137}{2534}{\do{koi8-r}} \InputenxSlot{138}{00CA}{\do{nextstep}} @@ -180,7 +182,7 @@ \InputenxSlot{139}{0406}{\do{cp855}} \InputenxSlot{139}{041B}{\do{cp866}\do{mac-cyrillic}} \InputenxSlot{139}{2039}{% - \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}% + \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1255}\do{cp1257}% } \InputenxSlot{139}{2580}{\do{koi8-r}} \InputenxSlot{140}{00CC}{\do{nextstep}} @@ -251,7 +253,7 @@ \InputenxSlot{145}{0409}{\do{cp855}} \InputenxSlot{145}{0421}{\do{cp866}\do{mac-cyrillic}} \InputenxSlot{145}{2018}{% - \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}% + \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1255}\do{cp1257}% } \InputenxSlot{145}{2592}{\do{koi8-r}} \InputenxSlot{146}{00C6}{% @@ -263,7 +265,7 @@ \InputenxSlot{146}{0422}{\do{cp866}\do{mac-cyrillic}} \InputenxSlot{146}{045A}{\do{cp855}} \InputenxSlot{146}{2019}{% - \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}% + \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1255}\do{cp1257}% } \InputenxSlot{146}{2593}{\do{koi8-r}} \InputenxSlot{147}{00D3}{\do{nextstep}} @@ -275,7 +277,7 @@ \InputenxSlot{147}{040A}{\do{cp855}} \InputenxSlot{147}{0423}{\do{cp866}\do{mac-cyrillic}} \InputenxSlot{147}{201C}{% - \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}% + \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1255}\do{cp1257}% } \InputenxSlot{148}{00D4}{\do{nextstep}} \InputenxSlot{148}{00EE}{\do{mac-roman}} @@ -286,7 +288,7 @@ \InputenxSlot{148}{0424}{\do{cp866}\do{mac-cyrillic}} \InputenxSlot{148}{045B}{\do{cp855}} \InputenxSlot{148}{201D}{% - \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}% + \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1255}\do{cp1257}% } \InputenxSlot{148}{25A0}{\do{koi8-r}} \InputenxSlot{149}{00D5}{\do{nextstep}} @@ -299,7 +301,7 @@ \InputenxSlot{149}{040B}{\do{cp855}} \InputenxSlot{149}{0425}{\do{cp866}\do{mac-cyrillic}} \InputenxSlot{149}{2022}{% - \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}% + \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1255}\do{cp1257}% } \InputenxSlot{149}{2219}{\do{koi8-r}} \InputenxSlot{150}{00D6}{\do{nextstep}} @@ -312,7 +314,7 @@ \InputenxSlot{150}{0426}{\do{cp866}\do{mac-cyrillic}} \InputenxSlot{150}{045C}{\do{cp855}} \InputenxSlot{150}{2013}{% - \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}% + \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1255}\do{cp1257}% } \InputenxSlot{150}{221A}{\do{koi8-r}} \InputenxSlot{151}{00D9}{\do{nextstep}} @@ -324,7 +326,7 @@ \InputenxSlot{151}{040C}{\do{cp855}} \InputenxSlot{151}{0427}{\do{cp866}\do{mac-cyrillic}} \InputenxSlot{151}{2014}{% - \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}% + \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1255}\do{cp1257}% } \InputenxSlot{151}{2248}{\do{koi8-r}} \InputenxSlot{152}{00DA}{\do{nextstep}} @@ -334,7 +336,7 @@ } \InputenxSlot{152}{0117}{\do{mac-centeuro}} \InputenxSlot{152}{015B}{\do{cp852}} -\InputenxSlot{152}{02DC}{\do{cp1252}} +\InputenxSlot{152}{02DC}{\do{cp1252}\do{cp1255}} \InputenxSlot{152}{0428}{\do{cp866}\do{mac-cyrillic}} \InputenxSlot{152}{045E}{\do{cp855}} \InputenxSlot{152}{2264}{\do{koi8-r}} @@ -346,7 +348,7 @@ \InputenxSlot{153}{040E}{\do{cp855}} \InputenxSlot{153}{0429}{\do{cp866}\do{mac-cyrillic}} \InputenxSlot{153}{2122}{% - \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}% + \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1255}\do{cp1257}% } \InputenxSlot{153}{2265}{\do{koi8-r}} \InputenxSlot{154}{00A0}{\do{koi8-r}} @@ -367,7 +369,7 @@ \InputenxSlot{155}{040F}{\do{cp855}} \InputenxSlot{155}{042B}{\do{cp866}\do{mac-cyrillic}} \InputenxSlot{155}{203A}{% - \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}% + \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1255}\do{cp1257}% } \InputenxSlot{156}{00A3}{% \do{atarist}\do{cp437}\do{cp850}\do{cp858}\do{cp865}% @@ -421,7 +423,7 @@ \do{iso-8859-1}\do{iso-8859-2}\do{iso-8859-3}\do{iso-8859-4}% \do{iso-8859-5}\do{iso-8859-8}\do{iso-8859-9}\do{iso-8859-10}% \do{iso-8859-13}\do{iso-8859-14}\do{iso-8859-15}\do{iso-8859-16}% - \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}% + \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1255}\do{cp1257}% } \InputenxSlot{160}{00A9}{\do{nextstep}} \InputenxSlot{160}{00E1}{% @@ -432,7 +434,7 @@ \InputenxSlot{160}{2550}{\do{koi8-r}} \InputenxSlot{161}{00A1}{% \do{iso-8859-1}\do{iso-8859-9}\do{iso-8859-15}\do{cp1252}% - \do{dec-mcs}\do{nextstep}% + \do{cp1255}\do{dec-mcs}\do{nextstep}% } \InputenxSlot{161}{00B0}{\do{mac-centeuro}\do{mac-cyrillic}\do{mac-roman}} \InputenxSlot{161}{00ED}{% @@ -452,8 +454,8 @@ \InputenxSlot{161}{2551}{\do{koi8-r}} \InputenxSlot{162}{00A2}{% \do{iso-8859-1}\do{iso-8859-8}\do{iso-8859-9}\do{iso-8859-13}% - \do{iso-8859-15}\do{cp1252}\do{cp1257}\do{dec-mcs}\do{mac-roman}% - \do{nextstep}% + \do{iso-8859-15}\do{cp1252}\do{cp1255}\do{cp1257}\do{dec-mcs}% + \do{mac-roman}\do{nextstep}% } \InputenxSlot{162}{00F3}{% \do{atarist}\do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}% @@ -473,8 +475,8 @@ \InputenxSlot{163}{00A3}{% \do{iso-8859-1}\do{iso-8859-3}\do{iso-8859-8}\do{iso-8859-9}% \do{iso-8859-13}\do{iso-8859-14}\do{iso-8859-15}\do{cp1252}% - \do{cp1257}\do{dec-mcs}\do{mac-centeuro}\do{mac-cyrillic}% - \do{mac-roman}\do{nextstep}% + \do{cp1255}\do{cp1257}\do{dec-mcs}\do{mac-centeuro}% + \do{mac-cyrillic}\do{mac-roman}\do{nextstep}% } \InputenxSlot{163}{00FA}{% \do{atarist}\do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}% @@ -507,7 +509,7 @@ \InputenxSlot{164}{2553}{\do{koi8-r}} \InputenxSlot{165}{00A5}{% \do{iso-8859-1}\do{iso-8859-8}\do{iso-8859-9}\do{iso-8859-15}% - \do{cp1252}\do{dec-mcs}\do{nextstep}% + \do{cp1252}\do{cp1255}\do{dec-mcs}\do{nextstep}% } \InputenxSlot{165}{00D1}{% \do{atarist}\do{cp437}\do{cp850}\do{cp858}\do{cp865}% @@ -526,7 +528,7 @@ \InputenxSlot{165}{2554}{\do{koi8-r}} \InputenxSlot{166}{00A6}{% \do{iso-8859-1}\do{iso-8859-8}\do{iso-8859-9}\do{iso-8859-13}% - \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}% + \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1255}\do{cp1257}% } \InputenxSlot{166}{00AA}{% \do{atarist}\do{cp437}\do{cp850}\do{cp858}\do{cp865}% @@ -548,7 +550,8 @@ \do{iso-8859-1}\do{iso-8859-2}\do{iso-8859-3}\do{iso-8859-4}% \do{iso-8859-8}\do{iso-8859-9}\do{iso-8859-10}\do{iso-8859-13}% \do{iso-8859-14}\do{iso-8859-15}\do{iso-8859-16}\do{cp1250}% - \do{cp1251}\do{cp1252}\do{cp1257}\do{dec-mcs}\do{nextstep}% + \do{cp1251}\do{cp1252}\do{cp1255}\do{cp1257}\do{dec-mcs}% + \do{nextstep}% } \InputenxSlot{167}{00BA}{% \do{atarist}\do{cp437}\do{cp850}\do{cp858}\do{cp865}% @@ -563,7 +566,7 @@ \InputenxSlot{168}{00A4}{\do{dec-mcs}\do{nextstep}} \InputenxSlot{168}{00A8}{% \do{iso-8859-1}\do{iso-8859-2}\do{iso-8859-3}\do{iso-8859-4}% - \do{iso-8859-8}\do{iso-8859-9}\do{cp1250}\do{cp1252}% + \do{iso-8859-8}\do{iso-8859-9}\do{cp1250}\do{cp1252}\do{cp1255}% } \InputenxSlot{168}{00AE}{\do{mac-centeuro}\do{mac-cyrillic}\do{mac-roman}} \InputenxSlot{168}{00BF}{% @@ -582,8 +585,8 @@ \InputenxSlot{169}{00A9}{% \do{iso-8859-1}\do{iso-8859-8}\do{iso-8859-9}\do{iso-8859-13}% \do{iso-8859-14}\do{iso-8859-15}\do{iso-8859-16}\do{cp1250}% - \do{cp1251}\do{cp1252}\do{cp1257}\do{dec-mcs}\do{mac-centeuro}% - \do{mac-cyrillic}\do{mac-roman}% + \do{cp1251}\do{cp1252}\do{cp1255}\do{cp1257}\do{dec-mcs}% + \do{mac-centeuro}\do{mac-cyrillic}\do{mac-roman}% } \InputenxSlot{169}{00AE}{\do{cp850}\do{cp858}} \InputenxSlot{169}{0110}{\do{iso-8859-10}} @@ -603,7 +606,7 @@ \InputenxSlot{170}{00AC}{% \do{atarist}\do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}% } -\InputenxSlot{170}{00D7}{\do{iso-8859-8}} +\InputenxSlot{170}{00D7}{\do{iso-8859-8}\do{cp1255}} \InputenxSlot{170}{0112}{\do{iso-8859-4}} \InputenxSlot{170}{0156}{\do{iso-8859-13}\do{cp1257}} \InputenxSlot{170}{015E}{\do{iso-8859-2}\do{iso-8859-3}\do{cp1250}} @@ -620,7 +623,7 @@ \InputenxSlot{171}{00AB}{% \do{iso-8859-1}\do{iso-8859-8}\do{iso-8859-9}\do{iso-8859-13}% \do{iso-8859-15}\do{iso-8859-16}\do{cp1250}\do{cp1251}\do{cp1252}% - \do{cp1257}\do{dec-mcs}\do{nextstep}% + \do{cp1255}\do{cp1257}\do{dec-mcs}\do{nextstep}% } \InputenxSlot{171}{00B4}{\do{mac-roman}} \InputenxSlot{171}{00BD}{% @@ -641,7 +644,8 @@ \InputenxSlot{172}{00A8}{\do{mac-centeuro}\do{mac-roman}} \InputenxSlot{172}{00AC}{% \do{iso-8859-1}\do{iso-8859-8}\do{iso-8859-9}\do{iso-8859-13}% - \do{iso-8859-15}\do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}% + \do{iso-8859-15}\do{cp1250}\do{cp1251}\do{cp1252}\do{cp1255}% + \do{cp1257}% } \InputenxSlot{172}{00BC}{% \do{atarist}\do{cp437}\do{cp850}\do{cp858}\do{cp865}% @@ -665,7 +669,7 @@ \do{iso-8859-1}\do{iso-8859-2}\do{iso-8859-3}\do{iso-8859-4}% \do{iso-8859-5}\do{iso-8859-8}\do{iso-8859-9}\do{iso-8859-10}% \do{iso-8859-13}\do{iso-8859-14}\do{iso-8859-15}\do{iso-8859-16}% - \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}% + \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1255}\do{cp1257}% } \InputenxSlot{173}{015F}{\do{cp852}} \InputenxSlot{173}{0413}{\do{cp855}} @@ -680,7 +684,7 @@ \InputenxSlot{174}{00AE}{% \do{iso-8859-1}\do{iso-8859-8}\do{iso-8859-9}\do{iso-8859-13}% \do{iso-8859-14}\do{iso-8859-15}\do{cp1250}\do{cp1251}\do{cp1252}% - \do{cp1257}% + \do{cp1255}\do{cp1257}% } \InputenxSlot{174}{00C6}{\do{mac-roman}} \InputenxSlot{174}{0123}{\do{mac-centeuro}} @@ -695,7 +699,7 @@ \InputenxSlot{175}{00A4}{\do{cp865}} \InputenxSlot{175}{00AF}{% \do{iso-8859-1}\do{iso-8859-4}\do{iso-8859-8}\do{iso-8859-9}% - \do{iso-8859-15}\do{cp1252}% + \do{iso-8859-15}\do{cp1252}\do{cp1255}% } \InputenxSlot{175}{00BB}{% \do{atarist}\do{cp437}\do{cp850}\do{cp852}\do{cp855}\do{cp858}% @@ -719,7 +723,7 @@ \do{iso-8859-1}\do{iso-8859-2}\do{iso-8859-3}\do{iso-8859-4}% \do{iso-8859-8}\do{iso-8859-9}\do{iso-8859-10}\do{iso-8859-13}% \do{iso-8859-15}\do{iso-8859-16}\do{cp1250}\do{cp1251}\do{cp1252}% - \do{cp1257}\do{dec-mcs}% + \do{cp1255}\do{cp1257}\do{dec-mcs}% } \InputenxSlot{176}{00E3}{\do{atarist}} \InputenxSlot{176}{012F}{\do{mac-centeuro}} @@ -734,7 +738,7 @@ \InputenxSlot{177}{00B1}{% \do{iso-8859-1}\do{iso-8859-8}\do{iso-8859-9}\do{iso-8859-13}% \do{iso-8859-15}\do{iso-8859-16}\do{cp1250}\do{cp1251}\do{cp1252}% - \do{cp1257}\do{dec-mcs}\do{mac-cyrillic}\do{mac-roman}% + \do{cp1255}\do{cp1257}\do{dec-mcs}\do{mac-cyrillic}\do{mac-roman}% } \InputenxSlot{177}{00F5}{\do{atarist}} \InputenxSlot{177}{0105}{\do{iso-8859-2}\do{iso-8859-4}\do{iso-8859-10}} @@ -750,7 +754,8 @@ } \InputenxSlot{178}{00B2}{% \do{iso-8859-1}\do{iso-8859-3}\do{iso-8859-8}\do{iso-8859-9}% - \do{iso-8859-13}\do{iso-8859-15}\do{cp1252}\do{cp1257}\do{dec-mcs}% + \do{iso-8859-13}\do{iso-8859-15}\do{cp1252}\do{cp1255}\do{cp1257}% + \do{dec-mcs}% } \InputenxSlot{178}{00D8}{\do{atarist}} \InputenxSlot{178}{010C}{\do{iso-8859-16}} @@ -768,7 +773,8 @@ } \InputenxSlot{179}{00B3}{% \do{iso-8859-1}\do{iso-8859-3}\do{iso-8859-8}\do{iso-8859-9}% - \do{iso-8859-13}\do{iso-8859-15}\do{cp1252}\do{cp1257}\do{dec-mcs}% + \do{iso-8859-13}\do{iso-8859-15}\do{cp1252}\do{cp1255}\do{cp1257}% + \do{dec-mcs}% } \InputenxSlot{179}{00F8}{\do{atarist}} \InputenxSlot{179}{0121}{\do{iso-8859-14}} @@ -787,7 +793,8 @@ \InputenxSlot{180}{00A5}{\do{mac-roman}} \InputenxSlot{180}{00B4}{% \do{iso-8859-1}\do{iso-8859-2}\do{iso-8859-3}\do{iso-8859-4}% - \do{iso-8859-8}\do{iso-8859-9}\do{cp1250}\do{cp1252}\do{cp1257}% + \do{iso-8859-8}\do{iso-8859-9}\do{cp1250}\do{cp1252}\do{cp1255}% + \do{cp1257}% } \InputenxSlot{180}{00B7}{\do{nextstep}} \InputenxSlot{180}{012B}{\do{iso-8859-10}\do{mac-centeuro}} @@ -807,7 +814,7 @@ \InputenxSlot{181}{00B5}{% \do{iso-8859-1}\do{iso-8859-3}\do{iso-8859-8}\do{iso-8859-9}% \do{iso-8859-13}\do{iso-8859-15}\do{cp1250}\do{cp1251}\do{cp1252}% - \do{cp1257}\do{dec-mcs}\do{mac-cyrillic}\do{mac-roman}% + \do{cp1255}\do{cp1257}\do{dec-mcs}\do{mac-cyrillic}\do{mac-roman}% } \InputenxSlot{181}{00C1}{\do{cp850}\do{cp852}\do{cp858}} \InputenxSlot{181}{0129}{\do{iso-8859-4}\do{iso-8859-10}} @@ -823,7 +830,8 @@ \InputenxSlot{182}{00B6}{% \do{iso-8859-1}\do{iso-8859-8}\do{iso-8859-9}\do{iso-8859-13}% \do{iso-8859-14}\do{iso-8859-15}\do{iso-8859-16}\do{cp1250}% - \do{cp1251}\do{cp1252}\do{cp1257}\do{dec-mcs}\do{nextstep}% + \do{cp1251}\do{cp1252}\do{cp1255}\do{cp1257}\do{dec-mcs}% + \do{nextstep}% } \InputenxSlot{182}{00C0}{\do{atarist}} \InputenxSlot{182}{00C2}{\do{cp850}\do{cp852}\do{cp858}} @@ -840,7 +848,7 @@ \InputenxSlot{183}{00B7}{% \do{iso-8859-1}\do{iso-8859-3}\do{iso-8859-8}\do{iso-8859-9}% \do{iso-8859-10}\do{iso-8859-13}\do{iso-8859-15}\do{iso-8859-16}% - \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}\do{dec-mcs}% + \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1255}\do{cp1257}\do{dec-mcs}% } \InputenxSlot{183}{00C0}{\do{cp850}\do{cp858}} \InputenxSlot{183}{00C3}{\do{atarist}} @@ -857,7 +865,7 @@ \InputenxSlot{184}{00A9}{\do{cp850}\do{cp858}} \InputenxSlot{184}{00B8}{% \do{iso-8859-1}\do{iso-8859-2}\do{iso-8859-3}\do{iso-8859-4}% - \do{iso-8859-8}\do{iso-8859-9}\do{cp1250}\do{cp1252}% + \do{iso-8859-8}\do{iso-8859-9}\do{cp1250}\do{cp1252}\do{cp1255}% } \InputenxSlot{184}{00D5}{\do{atarist}} \InputenxSlot{184}{00F8}{\do{iso-8859-13}\do{cp1257}} @@ -876,7 +884,7 @@ \InputenxSlot{185}{00A8}{\do{atarist}} \InputenxSlot{185}{00B9}{% \do{iso-8859-1}\do{iso-8859-8}\do{iso-8859-9}\do{iso-8859-13}% - \do{iso-8859-15}\do{cp1252}\do{cp1257}\do{dec-mcs}% + \do{iso-8859-15}\do{cp1252}\do{cp1255}\do{cp1257}\do{dec-mcs}% } \InputenxSlot{185}{0105}{\do{cp1250}} \InputenxSlot{185}{010D}{\do{iso-8859-16}} @@ -900,7 +908,7 @@ \do{iso-8859-1}\do{iso-8859-9}\do{iso-8859-15}\do{cp1252}% \do{dec-mcs}% } -\InputenxSlot{186}{00F7}{\do{iso-8859-8}} +\InputenxSlot{186}{00F7}{\do{iso-8859-8}\do{cp1255}} \InputenxSlot{186}{0113}{\do{iso-8859-4}} \InputenxSlot{186}{013C}{\do{mac-centeuro}} \InputenxSlot{186}{0157}{\do{iso-8859-13}\do{cp1257}} @@ -922,7 +930,7 @@ \InputenxSlot{187}{00BB}{% \do{iso-8859-1}\do{iso-8859-8}\do{iso-8859-9}\do{iso-8859-13}% \do{iso-8859-15}\do{iso-8859-16}\do{cp1250}\do{cp1251}\do{cp1252}% - \do{cp1257}\do{dec-mcs}\do{nextstep}% + \do{cp1255}\do{cp1257}\do{dec-mcs}\do{nextstep}% } \InputenxSlot{187}{011F}{\do{iso-8859-3}} \InputenxSlot{187}{0123}{\do{iso-8859-4}} @@ -942,7 +950,7 @@ \InputenxSlot{188}{00BA}{\do{mac-roman}} \InputenxSlot{188}{00BC}{% \do{iso-8859-1}\do{iso-8859-8}\do{iso-8859-9}\do{iso-8859-13}% - \do{cp1252}\do{cp1257}\do{dec-mcs}% + \do{cp1252}\do{cp1255}\do{cp1257}\do{dec-mcs}% } \InputenxSlot{188}{0135}{\do{iso-8859-3}} \InputenxSlot{188}{013D}{\do{cp1250}} @@ -965,7 +973,7 @@ \InputenxSlot{189}{00A9}{\do{atarist}} \InputenxSlot{189}{00BD}{% \do{iso-8859-1}\do{iso-8859-3}\do{iso-8859-8}\do{iso-8859-9}% - \do{iso-8859-13}\do{cp1252}\do{cp1257}\do{dec-mcs}% + \do{iso-8859-13}\do{cp1252}\do{cp1255}\do{cp1257}\do{dec-mcs}% } \InputenxSlot{189}{0139}{\do{mac-centeuro}} \InputenxSlot{189}{014A}{\do{iso-8859-4}} @@ -987,7 +995,7 @@ \InputenxSlot{190}{00AE}{\do{atarist}} \InputenxSlot{190}{00BE}{% \do{iso-8859-1}\do{iso-8859-8}\do{iso-8859-9}\do{iso-8859-13}% - \do{cp1252}\do{cp1257}% + \do{cp1252}\do{cp1255}\do{cp1257}% } \InputenxSlot{190}{00E6}{\do{mac-roman}} \InputenxSlot{190}{013A}{\do{mac-centeuro}} @@ -1006,7 +1014,7 @@ \InputenxSlot{191}{00A9}{\do{koi8-r}} \InputenxSlot{191}{00BF}{% \do{iso-8859-1}\do{iso-8859-9}\do{iso-8859-15}\do{cp1252}% - \do{dec-mcs}\do{nextstep}% + \do{cp1255}\do{dec-mcs}\do{nextstep}% } \InputenxSlot{191}{00E6}{\do{iso-8859-13}\do{cp1257}} \InputenxSlot{191}{00F8}{\do{mac-roman}} @@ -1615,7 +1623,7 @@ \InputenxSlot{224}{042F}{\do{cp855}} \InputenxSlot{224}{0430}{\do{cp1251}\do{mac-cyrillic}} \InputenxSlot{224}{0440}{\do{iso-8859-5}\do{cp866}} -\InputenxSlot{224}{05D0}{\do{iso-8859-8}} +\InputenxSlot{224}{05D0}{\do{iso-8859-8}\do{cp1255}} \InputenxSlot{224}{2021}{\do{mac-roman}} \InputenxSlot{225}{00B7}{\do{mac-roman}} \InputenxSlot{225}{00C6}{\do{nextstep}} @@ -1634,7 +1642,7 @@ \InputenxSlot{225}{0431}{\do{cp1251}\do{mac-cyrillic}} \InputenxSlot{225}{0440}{\do{cp855}} \InputenxSlot{225}{0441}{\do{iso-8859-5}\do{cp866}} -\InputenxSlot{225}{05D1}{\do{iso-8859-8}} +\InputenxSlot{225}{05D1}{\do{iso-8859-8}\do{cp1255}} \InputenxSlot{226}{00D4}{\do{cp850}\do{cp852}\do{cp858}} \InputenxSlot{226}{00E2}{% \do{iso-8859-1}\do{iso-8859-2}\do{iso-8859-3}\do{iso-8859-4}% @@ -1648,7 +1656,7 @@ \InputenxSlot{226}{0420}{\do{cp855}} \InputenxSlot{226}{0432}{\do{cp1251}\do{mac-cyrillic}} \InputenxSlot{226}{0442}{\do{iso-8859-5}\do{cp866}} -\InputenxSlot{226}{05D2}{\do{iso-8859-8}} +\InputenxSlot{226}{05D2}{\do{iso-8859-8}\do{cp1255}} \InputenxSlot{226}{201A}{\do{mac-centeuro}\do{mac-roman}} \InputenxSlot{227}{00AA}{\do{nextstep}} \InputenxSlot{227}{00D2}{\do{cp850}\do{cp858}} @@ -1664,7 +1672,7 @@ \InputenxSlot{227}{0433}{\do{cp1251}\do{mac-cyrillic}} \InputenxSlot{227}{0441}{\do{cp855}} \InputenxSlot{227}{0443}{\do{iso-8859-5}\do{cp866}} -\InputenxSlot{227}{05D3}{\do{iso-8859-8}} +\InputenxSlot{227}{05D3}{\do{iso-8859-8}\do{cp1255}} \InputenxSlot{227}{201E}{\do{mac-centeuro}\do{mac-roman}} \InputenxSlot{228}{00E4}{% \do{iso-8859-1}\do{iso-8859-2}\do{iso-8859-3}\do{iso-8859-4}% @@ -1681,7 +1689,7 @@ \InputenxSlot{228}{0421}{\do{cp855}} \InputenxSlot{228}{0434}{\do{cp1251}\do{mac-cyrillic}} \InputenxSlot{228}{0444}{\do{iso-8859-5}\do{cp866}} -\InputenxSlot{228}{05D4}{\do{iso-8859-8}} +\InputenxSlot{228}{05D4}{\do{iso-8859-8}\do{cp1255}} \InputenxSlot{228}{2030}{\do{mac-roman}} \InputenxSlot{229}{00C2}{\do{mac-roman}} \InputenxSlot{229}{00D5}{\do{cp850}\do{cp858}} @@ -1701,7 +1709,7 @@ \InputenxSlot{229}{0435}{\do{cp1251}\do{mac-cyrillic}} \InputenxSlot{229}{0442}{\do{cp855}} \InputenxSlot{229}{0445}{\do{iso-8859-5}\do{cp866}} -\InputenxSlot{229}{05D5}{\do{iso-8859-8}} +\InputenxSlot{229}{05D5}{\do{iso-8859-8}\do{cp1255}} \InputenxSlot{230}{00B5}{% \do{atarist}\do{cp437}\do{cp850}\do{cp858}\do{cp865}% } @@ -1721,7 +1729,7 @@ \InputenxSlot{230}{0424}{\do{koi8-r}} \InputenxSlot{230}{0436}{\do{cp1251}\do{mac-cyrillic}} \InputenxSlot{230}{0446}{\do{iso-8859-5}\do{cp866}} -\InputenxSlot{230}{05D6}{\do{iso-8859-8}} +\InputenxSlot{230}{05D6}{\do{iso-8859-8}\do{cp1255}} \InputenxSlot{231}{00C1}{\do{mac-centeuro}\do{mac-roman}} \InputenxSlot{231}{00E7}{% \do{iso-8859-1}\do{iso-8859-2}\do{iso-8859-3}\do{iso-8859-9}% @@ -1738,7 +1746,7 @@ \InputenxSlot{231}{0437}{\do{cp1251}\do{mac-cyrillic}} \InputenxSlot{231}{0443}{\do{cp855}} \InputenxSlot{231}{0447}{\do{iso-8859-5}\do{cp866}} -\InputenxSlot{231}{05D7}{\do{iso-8859-8}} +\InputenxSlot{231}{05D7}{\do{iso-8859-8}\do{cp1255}} \InputenxSlot{232}{00CB}{\do{mac-roman}} \InputenxSlot{232}{00DE}{\do{cp850}\do{cp858}} \InputenxSlot{232}{00E8}{% @@ -1757,7 +1765,7 @@ \InputenxSlot{232}{0425}{\do{koi8-r}} \InputenxSlot{232}{0438}{\do{cp1251}\do{mac-cyrillic}} \InputenxSlot{232}{0448}{\do{iso-8859-5}\do{cp866}} -\InputenxSlot{232}{05D8}{\do{iso-8859-8}} +\InputenxSlot{232}{05D8}{\do{iso-8859-8}\do{cp1255}} \InputenxSlot{233}{00C8}{\do{mac-roman}} \InputenxSlot{233}{00D8}{\do{nextstep}} \InputenxSlot{233}{00DA}{\do{cp850}\do{cp852}\do{cp858}} @@ -1773,7 +1781,7 @@ \InputenxSlot{233}{0436}{\do{cp855}} \InputenxSlot{233}{0439}{\do{cp1251}\do{mac-cyrillic}} \InputenxSlot{233}{0449}{\do{iso-8859-5}\do{cp866}} -\InputenxSlot{233}{05D9}{\do{iso-8859-8}} +\InputenxSlot{233}{05D9}{\do{iso-8859-8}\do{cp1255}} \InputenxSlot{234}{00CD}{\do{mac-centeuro}\do{mac-roman}} \InputenxSlot{234}{00DB}{\do{cp850}\do{cp858}} \InputenxSlot{234}{00EA}{% @@ -1791,7 +1799,7 @@ \InputenxSlot{234}{0419}{\do{koi8-r}} \InputenxSlot{234}{043A}{\do{cp1251}\do{mac-cyrillic}} \InputenxSlot{234}{044A}{\do{iso-8859-5}\do{cp866}} -\InputenxSlot{234}{05DA}{\do{iso-8859-8}} +\InputenxSlot{234}{05DA}{\do{iso-8859-8}\do{cp1255}} \InputenxSlot{235}{00BA}{\do{nextstep}} \InputenxSlot{235}{00CE}{\do{mac-roman}} \InputenxSlot{235}{00D9}{\do{cp850}\do{cp858}} @@ -1808,7 +1816,7 @@ \InputenxSlot{235}{0432}{\do{cp855}} \InputenxSlot{235}{043B}{\do{cp1251}\do{mac-cyrillic}} \InputenxSlot{235}{044B}{\do{iso-8859-5}\do{cp866}} -\InputenxSlot{235}{05DB}{\do{iso-8859-8}} +\InputenxSlot{235}{05DB}{\do{iso-8859-8}\do{cp1255}} \InputenxSlot{236}{00CF}{\do{mac-roman}} \InputenxSlot{236}{00EC}{% \do{iso-8859-1}\do{iso-8859-3}\do{iso-8859-9}\do{iso-8859-14}% @@ -1824,7 +1832,7 @@ \InputenxSlot{236}{041B}{\do{koi8-r}} \InputenxSlot{236}{043C}{\do{cp1251}\do{mac-cyrillic}} \InputenxSlot{236}{044C}{\do{iso-8859-5}\do{cp866}} -\InputenxSlot{236}{05DC}{\do{iso-8859-8}} +\InputenxSlot{236}{05DC}{\do{iso-8859-8}\do{cp1255}} \InputenxSlot{236}{221E}{\do{cp437}\do{cp865}} \InputenxSlot{236}{222E}{\do{atarist}} \InputenxSlot{237}{00CC}{\do{mac-roman}} @@ -1842,7 +1850,7 @@ \InputenxSlot{237}{043D}{\do{cp1251}\do{mac-cyrillic}} \InputenxSlot{237}{044C}{\do{cp855}} \InputenxSlot{237}{044D}{\do{iso-8859-5}\do{cp866}} -\InputenxSlot{237}{05DD}{\do{iso-8859-8}} +\InputenxSlot{237}{05DD}{\do{iso-8859-8}\do{cp1255}} \InputenxSlot{238}{00AF}{\do{cp850}\do{cp858}} \InputenxSlot{238}{00D3}{\do{mac-centeuro}\do{mac-roman}} \InputenxSlot{238}{00EE}{% @@ -1858,7 +1866,7 @@ \InputenxSlot{238}{042C}{\do{cp855}} \InputenxSlot{238}{043E}{\do{cp1251}\do{mac-cyrillic}} \InputenxSlot{238}{044E}{\do{iso-8859-5}\do{cp866}} -\InputenxSlot{238}{05DE}{\do{iso-8859-8}} +\InputenxSlot{238}{05DE}{\do{iso-8859-8}\do{cp1255}} \InputenxSlot{238}{2208}{\do{atarist}} \InputenxSlot{239}{00B4}{\do{cp850}\do{cp852}\do{cp858}} \InputenxSlot{239}{00D4}{\do{mac-centeuro}\do{mac-roman}} @@ -1874,7 +1882,7 @@ \InputenxSlot{239}{041E}{\do{koi8-r}} \InputenxSlot{239}{043F}{\do{cp1251}\do{mac-cyrillic}} \InputenxSlot{239}{044F}{\do{iso-8859-5}\do{cp866}} -\InputenxSlot{239}{05DF}{\do{iso-8859-8}} +\InputenxSlot{239}{05DF}{\do{iso-8859-8}\do{cp1255}} \InputenxSlot{239}{2116}{\do{cp855}} \InputenxSlot{239}{2229}{\do{atarist}\do{cp437}\do{cp865}} \InputenxSlot{240}{00AD}{% @@ -1894,7 +1902,7 @@ \InputenxSlot{240}{0401}{\do{cp866}} \InputenxSlot{240}{041F}{\do{koi8-r}} \InputenxSlot{240}{0440}{\do{cp1251}\do{mac-cyrillic}} -\InputenxSlot{240}{05E0}{\do{iso-8859-8}} +\InputenxSlot{240}{05E0}{\do{iso-8859-8}\do{cp1255}} \InputenxSlot{240}{2116}{\do{iso-8859-5}} \InputenxSlot{240}{2261}{\do{atarist}\do{cp437}\do{cp865}} \InputenxSlot{241}{00B1}{% @@ -1917,7 +1925,7 @@ \InputenxSlot{241}{0441}{\do{cp1251}\do{mac-cyrillic}} \InputenxSlot{241}{044B}{\do{cp855}} \InputenxSlot{241}{0451}{\do{iso-8859-5}\do{cp866}} -\InputenxSlot{241}{05E1}{\do{iso-8859-8}} +\InputenxSlot{241}{05E1}{\do{iso-8859-8}\do{cp1255}} \InputenxSlot{242}{00DA}{\do{mac-centeuro}\do{mac-roman}} \InputenxSlot{242}{00F2}{% \do{iso-8859-1}\do{iso-8859-3}\do{iso-8859-9}\do{iso-8859-14}% @@ -1933,7 +1941,7 @@ \InputenxSlot{242}{042B}{\do{cp855}} \InputenxSlot{242}{0442}{\do{cp1251}\do{mac-cyrillic}} \InputenxSlot{242}{0452}{\do{iso-8859-5}} -\InputenxSlot{242}{05E2}{\do{iso-8859-8}} +\InputenxSlot{242}{05E2}{\do{iso-8859-8}\do{cp1255}} \InputenxSlot{242}{2017}{\do{cp850}\do{cp858}} \InputenxSlot{242}{2265}{\do{atarist}\do{cp437}\do{cp865}} \InputenxSlot{243}{00BE}{\do{cp850}\do{cp858}} @@ -1952,7 +1960,7 @@ \InputenxSlot{243}{0443}{\do{cp1251}\do{mac-cyrillic}} \InputenxSlot{243}{0453}{\do{iso-8859-5}} \InputenxSlot{243}{0454}{\do{cp866}} -\InputenxSlot{243}{05E3}{\do{iso-8859-8}} +\InputenxSlot{243}{05E3}{\do{iso-8859-8}\do{cp1255}} \InputenxSlot{243}{2264}{\do{atarist}\do{cp437}\do{cp865}} \InputenxSlot{244}{00B6}{\do{cp850}\do{cp858}} \InputenxSlot{244}{00D9}{\do{mac-roman}} @@ -1970,7 +1978,7 @@ \InputenxSlot{244}{0422}{\do{koi8-r}} \InputenxSlot{244}{0444}{\do{cp1251}\do{mac-cyrillic}} \InputenxSlot{244}{0454}{\do{iso-8859-5}} -\InputenxSlot{244}{05E4}{\do{iso-8859-8}} +\InputenxSlot{244}{05E4}{\do{iso-8859-8}\do{cp1255}} \InputenxSlot{245}{00A7}{\do{cp850}\do{cp852}\do{cp858}} \InputenxSlot{245}{00F5}{% \do{iso-8859-1}\do{iso-8859-4}\do{iso-8859-9}\do{iso-8859-10}% @@ -1986,7 +1994,7 @@ \InputenxSlot{245}{0448}{\do{cp855}} \InputenxSlot{245}{0455}{\do{iso-8859-5}} \InputenxSlot{245}{0457}{\do{cp866}} -\InputenxSlot{245}{05E5}{\do{iso-8859-8}} +\InputenxSlot{245}{05E5}{\do{iso-8859-8}\do{cp1255}} \InputenxSlot{246}{00F6}{% \do{iso-8859-1}\do{iso-8859-2}\do{iso-8859-3}\do{iso-8859-4}% \do{iso-8859-9}\do{iso-8859-10}\do{iso-8859-13}\do{iso-8859-14}% @@ -2004,7 +2012,7 @@ \InputenxSlot{246}{0428}{\do{cp855}} \InputenxSlot{246}{0446}{\do{cp1251}\do{mac-cyrillic}} \InputenxSlot{246}{0456}{\do{iso-8859-5}} -\InputenxSlot{246}{05E6}{\do{iso-8859-8}} +\InputenxSlot{246}{05E6}{\do{iso-8859-8}\do{cp1255}} \InputenxSlot{247}{00B8}{\do{cp850}\do{cp852}\do{cp858}} \InputenxSlot{247}{00F7}{% \do{iso-8859-1}\do{iso-8859-2}\do{iso-8859-3}\do{iso-8859-4}% @@ -2022,7 +2030,7 @@ \InputenxSlot{247}{044D}{\do{cp855}} \InputenxSlot{247}{0457}{\do{iso-8859-5}} \InputenxSlot{247}{045E}{\do{cp866}} -\InputenxSlot{247}{05E7}{\do{iso-8859-8}} +\InputenxSlot{247}{05E7}{\do{iso-8859-8}\do{cp1255}} \InputenxSlot{247}{1E6B}{\do{iso-8859-14}} \InputenxSlot{247}{2248}{\do{atarist}\do{cp437}\do{cp865}} \InputenxSlot{248}{00AF}{\do{mac-roman}} @@ -2044,7 +2052,7 @@ \InputenxSlot{248}{042D}{\do{cp855}} \InputenxSlot{248}{0448}{\do{cp1251}\do{mac-cyrillic}} \InputenxSlot{248}{0458}{\do{iso-8859-5}} -\InputenxSlot{248}{05E8}{\do{iso-8859-8}} +\InputenxSlot{248}{05E8}{\do{iso-8859-8}\do{cp1255}} \InputenxSlot{249}{00A8}{\do{cp850}\do{cp852}\do{cp858}} \InputenxSlot{249}{00F8}{\do{nextstep}} \InputenxSlot{249}{00F9}{% @@ -2059,7 +2067,7 @@ \InputenxSlot{249}{042B}{\do{koi8-r}} \InputenxSlot{249}{0449}{\do{cp855}\do{cp1251}\do{mac-cyrillic}} \InputenxSlot{249}{0459}{\do{iso-8859-5}} -\InputenxSlot{249}{05E9}{\do{iso-8859-8}} +\InputenxSlot{249}{05E9}{\do{iso-8859-8}\do{cp1255}} \InputenxSlot{249}{2219}{% \do{atarist}\do{cp437}\do{cp865}\do{cp866}% } @@ -2079,7 +2087,7 @@ \InputenxSlot{250}{0429}{\do{cp855}} \InputenxSlot{250}{044A}{\do{cp1251}\do{mac-cyrillic}} \InputenxSlot{250}{045A}{\do{iso-8859-5}} -\InputenxSlot{250}{05EA}{\do{iso-8859-8}} +\InputenxSlot{250}{05EA}{\do{iso-8859-8}\do{cp1255}} \InputenxSlot{251}{00B9}{\do{cp850}\do{cp858}} \InputenxSlot{251}{00DF}{\do{nextstep}} \InputenxSlot{251}{00FB}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/ix-uc.def b/Master/texmf-dist/tex/latex/oberdiek/ix-uc.def index 348e06a2d60..680787e4cca 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/ix-uc.def +++ b/Master/texmf-dist/tex/latex/oberdiek/ix-uc.def @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: inputenx -%% Version: 2011/04/10 v1.8 +%% Version: 2011/05/27 v1.10 %% %% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -39,13 +39,13 @@ %% x-iso-8859-14.def, x-iso-8859-15.def, x-iso-8859-16.def, %% x-cp437.def, x-cp850.def, x-cp852.def, x-cp855.def, %% x-cp858.def, x-cp865.def, x-cp866.def, x-cp1250.def, -%% x-cp1251.def, x-cp1252.def, x-cp1257.def, x-dec-mcs.def, -%% x-koi8-r.def, x-mac-centeuro.def, x-mac-cyrillic.def, -%% x-mac-roman.def, x-nextstep.def, inputenx-licrcmds.txt, -%% inputenx-utf8enc.txt. +%% x-cp1251.def, x-cp1252.def, x-cp1255.def, x-cp1257.def, +%% x-dec-mcs.def, x-koi8-r.def, x-mac-centeuro.def, +%% x-mac-cyrillic.def, x-mac-roman.def, x-nextstep.def, +%% inputenx-licrcmds.txt, inputenx-utf8enc.txt. %% \ProvidesFile{ix-uc.def}% - [2011/04/10 v1.8 UC to LICR (inputenx)]% + [2011/05/27 v1.10 UC to LICR (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \InputenxUC{00A0}{\nobreakspace}{} diff --git a/Master/texmf-dist/tex/latex/oberdiek/ix-utf8enc.dfu b/Master/texmf-dist/tex/latex/oberdiek/ix-utf8enc.dfu index 6c6071b2627..62e817b2f0e 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/ix-utf8enc.dfu +++ b/Master/texmf-dist/tex/latex/oberdiek/ix-utf8enc.dfu @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: inputenx -%% Version: 2011/04/10 v1.8 +%% Version: 2011/05/27 v1.10 %% %% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -39,13 +39,13 @@ %% x-iso-8859-14.def, x-iso-8859-15.def, x-iso-8859-16.def, %% x-cp437.def, x-cp850.def, x-cp852.def, x-cp855.def, %% x-cp858.def, x-cp865.def, x-cp866.def, x-cp1250.def, -%% x-cp1251.def, x-cp1252.def, x-cp1257.def, x-dec-mcs.def, -%% x-koi8-r.def, x-mac-centeuro.def, x-mac-cyrillic.def, -%% x-mac-roman.def, x-nextstep.def, inputenx-licrcmds.txt, -%% inputenx-utf8enc.txt. +%% x-cp1251.def, x-cp1252.def, x-cp1255.def, x-cp1257.def, +%% x-dec-mcs.def, x-koi8-r.def, x-mac-centeuro.def, +%% x-mac-cyrillic.def, x-mac-roman.def, x-nextstep.def, +%% inputenx-licrcmds.txt, inputenx-utf8enc.txt. %% \ProvidesFile{ix-utf8enc.dfu}% - [2011/04/10 v1.8 Additions of inputenx for utf8enc.dfu]% + [2011/05/27 v1.10 Additions of inputenx for utf8enc.dfu]% \DeclareUnicodeCharacter{00A0}{\nobreakspace} \DeclareUnicodeCharacter{00AD}{\-} \DeclareUnicodeCharacter{0100}{\@tabacckludge=A} diff --git a/Master/texmf-dist/tex/latex/oberdiek/kvoptions-patch.sty b/Master/texmf-dist/tex/latex/oberdiek/kvoptions-patch.sty index d45321cfcdc..423385bb229 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/kvoptions-patch.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/kvoptions-patch.sty @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: kvoptions -%% Version: 2010/12/23 v3.10 +%% Version: 2011/06/30 v3.11 %% -%% Copyright (C) 2004, 2006, 2007, 2009, 2010 by +%% Copyright (C) 2004, 2006, 2007, 2009-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -39,6 +39,31 @@ %% No we don't need the option 'color'. %% With color support option 'emphcolor' will dynamically %% change the color of \emph statements. +\def\KVO@IfDefThen#1#2{% + \ifx#1\ltx@undefined + \else + \ifx#1\relax + \else + #2% + \fi + \fi +}% +\def\KVO@GetClassOptionsList{% + \let\KVO@classoptionslist\@classoptionslist + \KVO@IfDefThen\@classoptionslist{% + \KVO@IfDefThen\XKV@documentclass{% + \ifx\XKV@documentclass\ltx@empty + \else + \KVO@IfDefThen\XKV@classoptionslist{% + \ifx\XKV@classoptionslist\ltx@empty + \else + \let\KVO@classoptionslist\XKV@classoptionslist + \fi + }% + \fi + }% + }% +}% \NeedsTeXFormat{LaTeX2e} \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M @@ -89,7 +114,7 @@ \TMP@EnsureCode{124}{12}% | \edef\KVO@AtEnd{\KVO@AtEnd\noexpand\endinput} \ProvidesPackage{kvoptions-patch}% - [2010/12/23 v3.10 LaTeX patch for keyval options (HO)]% + [2011/06/30 v3.11 LaTeX patch for keyval options (HO)]% \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname eTeXversion\endcsname\relax \PackageWarningNoLine{kvoptions-patch}{% @@ -165,7 +190,8 @@ \ifx\@currext\@clsextension \toks@{}% \else - \toks@\expandafter{\@classoptionslist,}% + \KVO@GetClassOptionsList + \toks@\expandafter{\KVO@classoptionslist,}% \fi \toks\tw@\expandafter{\@curroptions}% \edef\x{\endgroup @@ -183,7 +209,8 @@ \def\KVO@xprocess@ptions{% \ifx\@currext\@clsextension \else - \@for\CurrentOption:=\@classoptionslist\do{% + \KVO@GetClassOptionsList + \@for\CurrentOption:=\KVO@classoptionslist\do{% \ifx\CurrentOption\@empty \else \KVO@in@\CurrentOption\@declaredoptions diff --git a/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty b/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty index f07c53f9347..e68e42b67e2 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: kvoptions -%% Version: 2010/12/23 v3.10 +%% Version: 2011/06/30 v3.11 %% -%% Copyright (C) 2004, 2006, 2007, 2009, 2010 by +%% Copyright (C) 2004, 2006, 2007, 2009-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -105,7 +105,7 @@ \fi \expandafter\x\csname ver@kvoptions.sty\endcsname \ProvidesPackage{kvoptions}% - [2010/12/23 v3.10 Keyval support for LaTeX options (HO)]% + [2011/06/30 v3.11 Key value format for package options (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -176,7 +176,7 @@ \DeclareOption{debugshow}{\catcode\@ne=9 } \DeclareOption{patch}{% \AtEndOfPackage{% - \RequirePackage{kvoptions-patch}[2010/12/23]% + \RequirePackage{kvoptions-patch}[2011/06/30]% }% } \ProcessOptions\relax @@ -586,6 +586,31 @@ }% \x } +\def\KVO@IfDefThen#1#2{% + \ifx#1\ltx@undefined + \else + \ifx#1\relax + \else + #2% + \fi + \fi +}% +\def\KVO@GetClassOptionsList{% + \let\KVO@classoptionslist\@classoptionslist + \KVO@IfDefThen\@classoptionslist{% + \KVO@IfDefThen\XKV@documentclass{% + \ifx\XKV@documentclass\ltx@empty + \else + \KVO@IfDefThen\XKV@classoptionslist{% + \ifx\XKV@classoptionslist\ltx@empty + \else + \let\KVO@classoptionslist\XKV@classoptionslist + \fi + }% + \fi + }% + }% +}% \newcommand*{\ProcessKeyvalOptions}{% \@ifstar{% \begingroup @@ -601,9 +626,10 @@ \let\KVO@temp\@empty \ifx\@currext\@clsextension \else - \ifx\@classoptionslist\relax + \KVO@GetClassOptionsList + \ifx\KVO@classoptionslist\relax \else - \@for\KVO@CurrentOption:=\@classoptionslist\do{% + \@for\KVO@CurrentOption:=\KVO@classoptionslist\do{% \@ifundefined{KV@#1@\expandafter\KVO@getkey \KVO@CurrentOption=\@nil}{% }{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/listingsutf8.sty b/Master/texmf-dist/tex/latex/oberdiek/listingsutf8.sty index 989e838ca91..4360b730972 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/listingsutf8.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/listingsutf8.sty @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: listingsutf8 -%% Version: 2007/11/11 v1.1 +%% Version: 2011/11/10 v1.2 %% -%% Copyright (C) 2007 by +%% Copyright (C) 2007, 2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -93,7 +93,7 @@ \edef\lstU@AtEnd{\lstU@AtEnd\noexpand\endinput} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{listingsutf8}% - [2007/11/11 v1.1 Adding support for UTF-8 to listings (HO)] + [2011/11/10 v1.2 Allow UTF-8 in listings input (HO)] \DeclareOption*{% \PassOptionsToPackage\CurrentOption{listings}% } @@ -104,7 +104,7 @@ \RequirePackage{inputenc}% }{}% } -\RequirePackage{pdftexcmds}[2007/11/11] +\RequirePackage{pdftexcmds}[2011/04/22] \def\lstU@temp#1#2{% \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname #1\endcsname\relax @@ -120,7 +120,7 @@ \lstU@temp{pdf@unescapehex}{It is provided by pdfTeX >= 1.30}% \lstU@temp{pdf@filedump}{It is provided by pdfTeX >= 1.30}% \lstU@temp{pdf@filesize}{It is provided by pdfTeX >= 1.30}% -\RequirePackage{stringenc}[2007/10/22] +\RequirePackage{stringenc}[2010/03/01] \newif\iflstU@utfviii \def\lstU@inputenc#1{% \expandafter\lstU@@inputenc#1utf8/utf8/\@nil @@ -144,6 +144,7 @@ \pdf@filedump{0}{\pdf@filesize{#1}}{#1}% }% }% + \lstU@CRLFtoLF\lstU@text \StringEncodingConvert\lstU@text\lstU@text{utf8}\lst@inputenc \def\lstU@temp{% \scantokens\expandafter{\lstU@text}% @@ -155,6 +156,24 @@ \fi \lstU@temp } +\begingroup + \endlinechar=-1 % + \@makeother\^^J % + \@makeother\^^M % + \gdef\lstU@CRLFtoLF#1{% + \edef#1{% + \expandafter\lstU@CRLFtoLF@aux#1^^M^^J\@nil + }% + }% + \gdef\lstU@CRLFtoLF@aux#1^^M^^J#2\@nil{% + #1% + \ifx\relax#2\relax + \@car + \fi + ^^J% + \lstU@CRLFtoLF@aux#2\@nil + }% +\endgroup % \def\lstU@temp#1\def\lst@next#2#3\@nil{% \def\lst@InputListing##1{% #1% diff --git a/Master/texmf-dist/tex/latex/oberdiek/luacolor.sty b/Master/texmf-dist/tex/latex/oberdiek/luacolor.sty index 77eb2d302d0..534bc5c159b 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/luacolor.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/luacolor.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: luacolor -%% Version: 2011/04/23 v1.6 +%% Version: 2011/11/01 v1.8 %% %% Copyright (C) 2007, 2009-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -87,7 +87,7 @@ \edef\LuaCol@AtEnd{\LuaCol@AtEnd\noexpand\endinput} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{luacolor}% - [2011/04/23 v1.6 Coloring based on LuaTeX's node attributes (HO)] + [2011/11/01 v1.8 Color support via LuaTeX's attributes (HO)] \RequirePackage{infwarerr}[2010/04/08]% \RequirePackage{ifluatex}[2010/03/01]% \RequirePackage{ifpdf}[2011/01/30]% @@ -124,7 +124,7 @@ require("oberdiek.luacolor\ifnum\luatexversion<65 -pre065\fi")% } \begingroup - \edef\x{\LuaCol@directlua{tex.write("2011/04/23 v1.6")}}% + \edef\x{\LuaCol@directlua{tex.write("2011/11/01 v1.8")}}% \edef\y{% \LuaCol@directlua{% if oberdiek.luacolor.getversion then % diff --git a/Master/texmf-dist/tex/latex/oberdiek/makerobust.sty b/Master/texmf-dist/tex/latex/oberdiek/makerobust.sty index cd2c9d0fa5b..796a0cf77f6 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/makerobust.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/makerobust.sty @@ -35,7 +35,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{makerobust}% - [2006/03/18 v1.0 Making a macro robust (HO)]% + [2006/03/18 v1.0 Make existing macro robust (HO)]% \def\MakeRobustCommand#1{% \begingroup \@ifundefined{\expandafter\@gobble\string#1}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/pagesel.sty b/Master/texmf-dist/tex/latex/oberdiek/pagesel.sty index 18155ada2c4..ec600d85630 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/pagesel.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/pagesel.sty @@ -34,7 +34,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{pagesel} - [2008/08/11 v1.8 Selecting shipout output pages (HO)]% + [2008/08/11 v1.8 Select pages of a document for output (HO)]% \@ifundefined{ps@makevoid}{}{% \PackageWarningNoLine{pagesel}{Package already loaded.}% \endinput diff --git a/Master/texmf-dist/tex/latex/oberdiek/pdfcolfoot.sty b/Master/texmf-dist/tex/latex/oberdiek/pdfcolfoot.sty index 1d036a614f8..50191e285d1 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/pdfcolfoot.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/pdfcolfoot.sty @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: pdfcolfoot -%% Version: 2007/09/09 v1.1 +%% Version: 2012/01/02 v1.2 %% -%% Copyright (C) 2007 by +%% Copyright (C) 2007, 2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -35,7 +35,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{pdfcolfoot}% - [2007/09/09 v1.1 pdfTeX's color stack for footnotes (HO)]% + [2012/01/02 v1.2 Color stack for footnotes with pdfTeX (HO)]% \RequirePackage{pdfcol}[2007/09/09] \ifpdfcolAvailable \else @@ -155,6 +155,7 @@ \pdfcolfoot@patch\@makecol@pptt \pdfcolfoot@patch\mem@makecol \pdfcolfoot@patch\mem@makecolbf + \pdfcolfoot@patch\m@mopfootnote \pdfcolfoot@patch\@combineinserts \pdfcolfoot@patch\ltx@makecol \pdfcolfoot@patch\dfn@latex@makecol diff --git a/Master/texmf-dist/tex/latex/oberdiek/pdfcolmk.sty b/Master/texmf-dist/tex/latex/oberdiek/pdfcolmk.sty index 6b2322fd62a..d025601cd66 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/pdfcolmk.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/pdfcolmk.sty @@ -34,7 +34,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{pdfcolmk}% - [2008/08/11 v1.2 PDFtex COLor MarK (HO)] + [2008/08/11 v1.2 Color support for pdfTeX via marks (HO)] \@ifundefined{ver@pdftex.def}{% \PackageWarningNoLine{pdfcolmk}{% Nothing to fix, because \string`pdftex.def\string' not loaded% diff --git a/Master/texmf-dist/tex/latex/oberdiek/pdfcolparallel.sty b/Master/texmf-dist/tex/latex/oberdiek/pdfcolparallel.sty index 4edaf9a7ee3..6aa4cb18f5b 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/pdfcolparallel.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/pdfcolparallel.sty @@ -35,7 +35,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{pdfcolparallel}% - [2010/01/11 v1.3 Fixed parallel with color stacks support (HO)]% + [2010/01/11 v1.3 Color stacks support for parallel (HO)]% \DeclareOption*{% \PassoptionsToPackage{\CurrentOption}{parallel}% } diff --git a/Master/texmf-dist/tex/latex/oberdiek/pdfcolparcolumns.sty b/Master/texmf-dist/tex/latex/oberdiek/pdfcolparcolumns.sty index 481dff7c6aa..39c9a0fc829 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/pdfcolparcolumns.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/pdfcolparcolumns.sty @@ -35,7 +35,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{pdfcolparcolumns}% - [2010/01/11 v1.3 Color stacks support for parcolumns (HO)]% + [2010/01/11 v1.3 Color stacks for parcolumns (HO)]% \DeclareOption*{% \PassoptionsToPackage{\CurrentOption}{parcolumns}% } diff --git a/Master/texmf-dist/tex/latex/oberdiek/pdflscape.sty b/Master/texmf-dist/tex/latex/oberdiek/pdflscape.sty index 67d70703282..411950e86d8 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/pdflscape.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/pdflscape.sty @@ -38,7 +38,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{pdflscape}% - [2008/08/11 v0.10 Landscape pages in PDF (HO)] + [2008/08/11 v0.10 Display of landscape pages in PDF (HO)] \let\PLS@option\@empty \let\PLS@driver\@empty \def\PLS@temp#1#2{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/refcount.sty b/Master/texmf-dist/tex/latex/oberdiek/refcount.sty index aa5de92420f..ddf89306d51 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/refcount.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/refcount.sty @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: refcount -%% Version: 2010/12/01 v3.2 +%% Version: 2011/10/16 v3.4 %% -%% Copyright (C) 1998, 2000, 2006, 2008, 2010 by +%% Copyright (C) 1998, 2000, 2006, 2008, 2010, 2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -32,7 +32,7 @@ %% and the derived files %% refcount.sty, refcount.pdf, refcount.ins, refcount.drv, %% refcount-test1.tex, refcount-test2.tex, refcount-test3.tex, -%% refcount-test4.tex. +%% refcount-test4.tex, refcount-test5.tex. %% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M @@ -100,7 +100,7 @@ \fi \expandafter\x\csname ver@refcount.sty\endcsname \ProvidesPackage{refcount}% - [2010/12/01 v3.2 Data extraction from references (HO)]% + [2011/10/16 v3.4 Data extraction from label references (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -148,7 +148,7 @@ \input ltxcmds.sty\relax \input infwarerr.sty\relax \else - \RequirePackage{ltxcmds}[2010/04/08]% + \RequirePackage{ltxcmds}[2011/11/09]% \RequirePackage{infwarerr}[2010/04/08]% \fi \ltx@IfUndefined{@ifdefinable}{% @@ -177,12 +177,22 @@ #1\def#3##1{#4}% }% }% + \def\rc@RobustDefZero#1#2{% + \rc@IfDefinable#1{% + \def#1{#2}% + }% + }% }{% \def\rc@RobustDefOne#1#2#3#4{% \rc@IfDefinable#3{% \DeclareRobustCommand#2#3[1]{#4}% }% }% + \def\rc@RobustDefZero#1#2{% + \rc@IfDefinable#1{% + \DeclareRobustCommand#1{#2}% + }% + }% }% }{% \def\rc@RobustDefOne#1#2#3#4{% @@ -190,6 +200,11 @@ \protected#1\def#3##1{#4}% }% }% + \def\rc@RobustDefZero#1#2{% + \rc@IfDefinable#1{% + \protected\def#1{#2}% + }% + }% } \ltx@IfUndefined{newcommand}{% \def\rc@newcommand*#1[#2]#3{% hash-ok @@ -253,7 +268,7 @@ \def\rc@set#1#2#3#4{% \begingroup \csname @safe@activestrue\endcsname - \rc@refused{#4}% + \refused{#4}% \expandafter\rc@@set\csname r@#4\endcsname{#1}{#2}{#3}% \endgroup } @@ -266,17 +281,17 @@ }% \fi } -\rc@newcommand*{\setcounterref}[0]{% +\rc@RobustDefZero\setcounterref{% \rc@set\setcounter\ltx@car } -\rc@newcommand*{\addtocounterref}[0]{% +\rc@RobustDefZero\addtocounterref{% \rc@set\addtocounter\ltx@car } -\rc@newcommand*{\setcounterpageref}[0]{% - \rc@set\setcounter\ltx@cartwo +\rc@RobustDefZero\setcounterpageref{% + \rc@set\setcounter\ltx@carsecond } -\rc@newcommand*{\addtocounterpageref}[0]{% - \rc@set\addtocounter\ltx@cartwo +\rc@RobustDefZero\addtocounterpageref{% + \rc@set\addtocounter\ltx@carsecond } \rc@newcommand*{\getrefnumber}[1]{% \romannumeral diff --git a/Master/texmf-dist/tex/latex/oberdiek/resizegather.sty b/Master/texmf-dist/tex/latex/oberdiek/resizegather.sty index bd8080fbe33..95adfcf60f6 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/resizegather.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/resizegather.sty @@ -99,7 +99,7 @@ \fi \expandafter\x\csname ver@resizegather.sty\endcsname \ProvidesPackage{resizegather}% - [2010/03/01 v1.2 Automatically resizing of too large equations (HO)]% + [2010/03/01 v1.2 Resize overly large equations (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % diff --git a/Master/texmf-dist/tex/latex/oberdiek/scrindex.sty b/Master/texmf-dist/tex/latex/oberdiek/scrindex.sty index 8b872272ece..fc273114a62 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/scrindex.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/scrindex.sty @@ -35,7 +35,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{scrindex} - [2008/08/11 v1.1 Package index with scr* classes (HO)]% + [2008/08/11 v1.1 Package index with KOMA-Script classes (HO)]% \RequirePackage{index}[2004/01/20]% \@ifclassloaded{scrartcl}{% \renewenvironment{theindex}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/selinput.sty b/Master/texmf-dist/tex/latex/oberdiek/selinput.sty index afe2e0ab31f..6baa1ed97af 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/selinput.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/selinput.sty @@ -36,7 +36,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{selinput} - [2007/09/09 v1.2 Select input encoding (HO)]% + [2007/09/09 v1.2 Semi-automatic input encoding detection (HO)]% \RequirePackage{inputenc} \RequirePackage{kvsetkeys}[2006/10/19] \RequirePackage{stringenc}[2007/06/16] diff --git a/Master/texmf-dist/tex/latex/oberdiek/settobox.sty b/Master/texmf-dist/tex/latex/oberdiek/settobox.sty index 93f64038217..19e5ea7f42b 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/settobox.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/settobox.sty @@ -35,7 +35,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{settobox}% - [2008/08/11 v1.4 Getting box sizes (HO)] + [2008/08/11 v1.4 Assign box dimensions to length registers (HO)] \newcommand*{\settoboxwidth}[2]{\setlength{#1}{\wd#2}} \newcommand*{\settoboxheight}[2]{\setlength{#1}{\ht#2}} \newcommand*{\settoboxdepth}[2]{\setlength{#1}{\dp#2}} diff --git a/Master/texmf-dist/tex/latex/oberdiek/stampinclude.sty b/Master/texmf-dist/tex/latex/oberdiek/stampinclude.sty index a6757480376..da872e64949 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/stampinclude.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/stampinclude.sty @@ -34,7 +34,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{stampinclude} - [2008/07/14 v1.0 Time stamp based including (HO)]% + [2008/07/14 v1.0 Include files based on time stamps (HO)]% \RequirePackage{pdftexcmds}[2007/12/12]% \begingroup \chardef\x=1 % diff --git a/Master/texmf-dist/tex/latex/oberdiek/tabularht.sty b/Master/texmf-dist/tex/latex/oberdiek/tabularht.sty index 7b3ac7679cb..57dfc08bec3 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/tabularht.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/tabularht.sty @@ -11,7 +11,7 @@ %% Project: tabularht %% Version: 2007/04/11 v2.5 %% -%% Copyright (C) 2005, 2006, 2007 by +%% Copyright (C) 2005-2007 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -35,7 +35,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{tabularht}% - [2007/04/11 v2.5 Tabular with height specification (HO)] + [2007/04/11 v2.5 Tabular with height specified (HO)] \let\@toarrayheight\@empty \let\tabH@array@init\@empty diff --git a/Master/texmf-dist/tex/latex/oberdiek/tabularkv.sty b/Master/texmf-dist/tex/latex/oberdiek/tabularkv.sty index f39a42812fe..630316dc82c 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/tabularkv.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/tabularkv.sty @@ -35,7 +35,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{tabularkv}% - [2006/02/20 v1.1 Key value interface for tabular parameters (HO)] + [2006/02/20 v1.1 Tabular with key value interface (HO)] \RequirePackage{keyval} \RequirePackage{tabularht} diff --git a/Master/texmf-dist/tex/latex/oberdiek/transparent.sty b/Master/texmf-dist/tex/latex/oberdiek/transparent.sty index 95968a33a0a..0860022cfa7 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/transparent.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/transparent.sty @@ -35,7 +35,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{transparent}% - [2007/01/08 v1.0 Using a pdfTeX's color stack for transparency (HO)]% + [2007/01/08 v1.0 Transparency via pdfTeX's color stack (HO)]% \RequirePackage{ifpdf} \ifpdf \else diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-ascii.def b/Master/texmf-dist/tex/latex/oberdiek/x-ascii.def index 2fbe962b591..d71fe282cc9 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-ascii.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-ascii.def @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: inputenx -%% Version: 2011/04/10 v1.8 +%% Version: 2011/05/27 v1.10 %% %% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -39,13 +39,13 @@ %% x-iso-8859-14.def, x-iso-8859-15.def, x-iso-8859-16.def, %% x-cp437.def, x-cp850.def, x-cp852.def, x-cp855.def, %% x-cp858.def, x-cp865.def, x-cp866.def, x-cp1250.def, -%% x-cp1251.def, x-cp1252.def, x-cp1257.def, x-dec-mcs.def, -%% x-koi8-r.def, x-mac-centeuro.def, x-mac-cyrillic.def, -%% x-mac-roman.def, x-nextstep.def, inputenx-licrcmds.txt, -%% inputenx-utf8enc.txt. +%% x-cp1251.def, x-cp1252.def, x-cp1255.def, x-cp1257.def, +%% x-dec-mcs.def, x-koi8-r.def, x-mac-centeuro.def, +%% x-mac-cyrillic.def, x-mac-roman.def, x-nextstep.def, +%% inputenx-licrcmds.txt, inputenx-utf8enc.txt. %% \ProvidesFile{x-ascii.def}% - [2011/04/10 v1.8 Input encoding ascii (inputenx)]% + [2011/05/27 v1.10 Input encoding ascii (inputenx)]% \csname @inpenc@test\endcsname \endinput %% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-atarist.def b/Master/texmf-dist/tex/latex/oberdiek/x-atarist.def index a7303445b5b..46eef77291c 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-atarist.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-atarist.def @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: inputenx -%% Version: 2011/04/10 v1.8 +%% Version: 2011/05/27 v1.10 %% %% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -39,13 +39,13 @@ %% x-iso-8859-14.def, x-iso-8859-15.def, x-iso-8859-16.def, %% x-cp437.def, x-cp850.def, x-cp852.def, x-cp855.def, %% x-cp858.def, x-cp865.def, x-cp866.def, x-cp1250.def, -%% x-cp1251.def, x-cp1252.def, x-cp1257.def, x-dec-mcs.def, -%% x-koi8-r.def, x-mac-centeuro.def, x-mac-cyrillic.def, -%% x-mac-roman.def, x-nextstep.def, inputenx-licrcmds.txt, -%% inputenx-utf8enc.txt. +%% x-cp1251.def, x-cp1252.def, x-cp1255.def, x-cp1257.def, +%% x-dec-mcs.def, x-koi8-r.def, x-mac-centeuro.def, +%% x-mac-cyrillic.def, x-mac-roman.def, x-nextstep.def, +%% inputenx-licrcmds.txt, inputenx-utf8enc.txt. %% \ProvidesFile{x-atarist.def}% - [2011/04/10 v1.8 Input encoding atarist (inputenx)]% + [2011/05/27 v1.10 Input encoding atarist (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textGamma}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-cp1250.def b/Master/texmf-dist/tex/latex/oberdiek/x-cp1250.def index 05a630cc78b..04ff4f78e31 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-cp1250.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-cp1250.def @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: inputenx -%% Version: 2011/04/10 v1.8 +%% Version: 2011/05/27 v1.10 %% %% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -39,13 +39,13 @@ %% x-iso-8859-14.def, x-iso-8859-15.def, x-iso-8859-16.def, %% x-cp437.def, x-cp850.def, x-cp852.def, x-cp855.def, %% x-cp858.def, x-cp865.def, x-cp866.def, x-cp1250.def, -%% x-cp1251.def, x-cp1252.def, x-cp1257.def, x-dec-mcs.def, -%% x-koi8-r.def, x-mac-centeuro.def, x-mac-cyrillic.def, -%% x-mac-roman.def, x-nextstep.def, inputenx-licrcmds.txt, -%% inputenx-utf8enc.txt. +%% x-cp1251.def, x-cp1252.def, x-cp1255.def, x-cp1257.def, +%% x-dec-mcs.def, x-koi8-r.def, x-mac-centeuro.def, +%% x-mac-cyrillic.def, x-mac-roman.def, x-nextstep.def, +%% inputenx-licrcmds.txt, inputenx-utf8enc.txt. %% \ProvidesFile{x-cp1250.def}% - [2011/04/10 v1.8 Input encoding cp1250 (inputenx)]% + [2011/05/27 v1.10 Input encoding cp1250 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textacutedbl}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-cp1251.def b/Master/texmf-dist/tex/latex/oberdiek/x-cp1251.def index a4a6a92ede2..c13cf90dc89 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-cp1251.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-cp1251.def @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: inputenx -%% Version: 2011/04/10 v1.8 +%% Version: 2011/05/27 v1.10 %% %% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -39,13 +39,13 @@ %% x-iso-8859-14.def, x-iso-8859-15.def, x-iso-8859-16.def, %% x-cp437.def, x-cp850.def, x-cp852.def, x-cp855.def, %% x-cp858.def, x-cp865.def, x-cp866.def, x-cp1250.def, -%% x-cp1251.def, x-cp1252.def, x-cp1257.def, x-dec-mcs.def, -%% x-koi8-r.def, x-mac-centeuro.def, x-mac-cyrillic.def, -%% x-mac-roman.def, x-nextstep.def, inputenx-licrcmds.txt, -%% inputenx-utf8enc.txt. +%% x-cp1251.def, x-cp1252.def, x-cp1255.def, x-cp1257.def, +%% x-dec-mcs.def, x-koi8-r.def, x-mac-centeuro.def, +%% x-mac-cyrillic.def, x-mac-roman.def, x-nextstep.def, +%% inputenx-licrcmds.txt, inputenx-utf8enc.txt. %% \ProvidesFile{x-cp1251.def}% - [2011/04/10 v1.8 Input encoding cp1251 (inputenx)]% + [2011/05/27 v1.10 Input encoding cp1251 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textbrokenbar}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-cp1252.def b/Master/texmf-dist/tex/latex/oberdiek/x-cp1252.def index 943aa99b08e..6f70505d235 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-cp1252.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-cp1252.def @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: inputenx -%% Version: 2011/04/10 v1.8 +%% Version: 2011/05/27 v1.10 %% %% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -39,13 +39,13 @@ %% x-iso-8859-14.def, x-iso-8859-15.def, x-iso-8859-16.def, %% x-cp437.def, x-cp850.def, x-cp852.def, x-cp855.def, %% x-cp858.def, x-cp865.def, x-cp866.def, x-cp1250.def, -%% x-cp1251.def, x-cp1252.def, x-cp1257.def, x-dec-mcs.def, -%% x-koi8-r.def, x-mac-centeuro.def, x-mac-cyrillic.def, -%% x-mac-roman.def, x-nextstep.def, inputenx-licrcmds.txt, -%% inputenx-utf8enc.txt. +%% x-cp1251.def, x-cp1252.def, x-cp1255.def, x-cp1257.def, +%% x-dec-mcs.def, x-koi8-r.def, x-mac-centeuro.def, +%% x-mac-cyrillic.def, x-mac-roman.def, x-nextstep.def, +%% inputenx-licrcmds.txt, inputenx-utf8enc.txt. %% \ProvidesFile{x-cp1252.def}% - [2011/04/10 v1.8 Input encoding cp1252 (inputenx)]% + [2011/05/27 v1.10 Input encoding cp1252 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textasciiacute}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-cp1255.def b/Master/texmf-dist/tex/latex/oberdiek/x-cp1255.def new file mode 100644 index 00000000000..6acf52ec09a --- /dev/null +++ b/Master/texmf-dist/tex/latex/oberdiek/x-cp1255.def @@ -0,0 +1,192 @@ +%% +%% This is file `x-cp1255.def', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% inputenx.dtx (with options: `cp1255') +%% +%% This is a generated file. +%% +%% Project: inputenx +%% Version: 2011/05/27 v1.10 +%% +%% Copyright (C) 2006-2011 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. +%% +%% This work consists of the main source file inputenx.dtx +%% and the derived files +%% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, +%% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, +%% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, +%% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, +%% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, +%% x-iso-8859-14.def, x-iso-8859-15.def, x-iso-8859-16.def, +%% x-cp437.def, x-cp850.def, x-cp852.def, x-cp855.def, +%% x-cp858.def, x-cp865.def, x-cp866.def, x-cp1250.def, +%% x-cp1251.def, x-cp1252.def, x-cp1255.def, x-cp1257.def, +%% x-dec-mcs.def, x-koi8-r.def, x-mac-centeuro.def, +%% x-mac-cyrillic.def, x-mac-roman.def, x-nextstep.def, +%% inputenx-licrcmds.txt, inputenx-utf8enc.txt. +%% +\ProvidesFile{x-cp1255.def}% + [2011/05/27 v1.10 Input encoding cp1255 (inputenx)]% +\edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} +\makeatletter +\ProvideTextCommandDefault{\textasciiacute}{% + \@tabacckludge'{}% +} +\ProvideTextCommandDefault{\textasciidieresis}{% + \"{}% +} +\ProvideTextCommandDefault{\textasciimacron}{% + \@tabacckludge={}% +} +\ProvideTextCommandDefault{\textbrokenbar}{% + \TextSymbolUnavailable\textbrokenbar +} +\ProvideTextCommandDefault{\textcent}{% + \TextSymbolUnavailable\textcent +} +\ProvideTextCommandDefault{\textdegree}{% + \ensuremath{{^\circ}}% +} +\ProvideTextCommandDefault{\textdiv}{% + \TextSymbolUnavailable\textdiv +} +\ProvideTextCommandDefault{\texteuro}{% + \TextSymbolUnavailable\texteuro +} +\ProvideTextCommandDefault{\textflorin}{% + \textit{f}% +} +\ProvideTextCommandDefault{\textlnot}{% + \ensuremath\lnot +} +\ProvideTextCommandDefault{\textmu}{% + \ensuremath\mu +} +\ProvideTextCommandDefault{\textonehalf}{% + \ensuremath{\frac12}% +} +\ProvideTextCommandDefault{\textonequarter}{% + \ensuremath{\frac14}% +} +\ProvideTextCommandDefault{\textonesuperior}{% + \ensuremath{{^1}}% +} +\ProvideTextCommandDefault{\textpm}{% + \ensuremath\pm +} +\ProvideTextCommandDefault{\textthreequarters}{% + \ensuremath{\frac34}% +} +\ProvideTextCommandDefault{\textthreesuperior}{% + \ensuremath{{^3}}% +} +\ProvideTextCommandDefault{\texttimes}{% + \ensuremath\times +} +\ProvideTextCommandDefault{\texttwosuperior}{% + \ensuremath{{^2}}% +} +\ProvideTextCommandDefault{\textyen}{% + \TextSymbolUnavailable\textyen +} +\DeclareInputText{128}{\texteuro} +\DeclareInputText{130}{\quotesinglbase} +\DeclareInputText{131}{\textflorin} +\DeclareInputText{132}{\quotedblbase} +\DeclareInputText{133}{\textellipsis} +\DeclareInputText{134}{\textdagger} +\DeclareInputText{135}{\textdaggerdbl} +\DeclareInputText{136}{\textasciicircum} +\DeclareInputText{137}{\textperthousand} +\DeclareInputText{139}{\guilsinglleft} +\DeclareInputText{145}{\textquoteleft} +\DeclareInputText{146}{\textquoteright} +\DeclareInputText{147}{\textquotedblleft} +\DeclareInputText{148}{\textquotedblright} +\DeclareInputText{149}{\textbullet} +\DeclareInputText{150}{\textendash} +\DeclareInputText{151}{\textemdash} +\DeclareInputText{152}{\textasciitilde} +\DeclareInputText{153}{\texttrademark} +\DeclareInputText{155}{\guilsinglright} +\DeclareInputText{160}{\nobreakspace} +\DeclareInputText{161}{\textexclamdown} +\DeclareInputText{162}{\textcent} +\DeclareInputText{163}{\textsterling} +\DeclareInputText{165}{\textyen} +\DeclareInputText{166}{\textbrokenbar} +\DeclareInputText{167}{\textsection} +\DeclareInputText{168}{\textasciidieresis} +\DeclareInputText{169}{\textcopyright} +\DeclareInputText{170}{\texttimes} +\DeclareInputText{171}{\guillemotleft} +\DeclareInputText{172}{\textlnot} +\DeclareInputText{173}{\-} +\DeclareInputText{174}{\textregistered} +\DeclareInputText{175}{\textasciimacron} +\DeclareInputText{176}{\textdegree} +\DeclareInputText{177}{\textpm} +\DeclareInputText{178}{\texttwosuperior} +\DeclareInputText{179}{\textthreesuperior} +\DeclareInputText{180}{\textasciiacute} +\DeclareInputText{181}{\textmu} +\DeclareInputText{182}{\textparagraph} +\DeclareInputText{183}{\textperiodcentered} +\DeclareInputText{184}{\c\ } +\DeclareInputText{185}{\textonesuperior} +\DeclareInputText{186}{\textdiv} +\DeclareInputText{187}{\guillemotright} +\DeclareInputText{188}{\textonequarter} +\DeclareInputText{189}{\textonehalf} +\DeclareInputText{190}{\textthreequarters} +\DeclareInputText{191}{\textquestiondown} +\DeclareInputText{224}{\hebalef} +\DeclareInputText{225}{\hebbet} +\DeclareInputText{226}{\hebgimel} +\DeclareInputText{227}{\hebdalet} +\DeclareInputText{228}{\hebhe} +\DeclareInputText{229}{\hebvav} +\DeclareInputText{230}{\hebzayin} +\DeclareInputText{231}{\hebhet} +\DeclareInputText{232}{\hebtet} +\DeclareInputText{233}{\hebyod} +\DeclareInputText{234}{\hebfinalkaf} +\DeclareInputText{235}{\hebkaf} +\DeclareInputText{236}{\heblamed} +\DeclareInputText{237}{\hebfinalmem} +\DeclareInputText{238}{\hebmem} +\DeclareInputText{239}{\hebfinalnun} +\DeclareInputText{240}{\hebnun} +\DeclareInputText{241}{\hebsamekh} +\DeclareInputText{242}{\hebayin} +\DeclareInputText{243}{\hebfinalpe} +\DeclareInputText{244}{\hebpe} +\DeclareInputText{245}{\hebfinaltsadi} +\DeclareInputText{246}{\hebtsadi} +\DeclareInputText{247}{\hebqof} +\DeclareInputText{248}{\hebresh} +\DeclareInputText{249}{\hebshin} +\DeclareInputText{250}{\hebtav} +\RestoreAtCatcode +\endinput +%% +%% End of file `x-cp1255.def'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-cp1257.def b/Master/texmf-dist/tex/latex/oberdiek/x-cp1257.def index 7f278f185d2..8c559f3e6ed 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-cp1257.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-cp1257.def @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: inputenx -%% Version: 2011/04/10 v1.8 +%% Version: 2011/05/27 v1.10 %% %% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -39,13 +39,13 @@ %% x-iso-8859-14.def, x-iso-8859-15.def, x-iso-8859-16.def, %% x-cp437.def, x-cp850.def, x-cp852.def, x-cp855.def, %% x-cp858.def, x-cp865.def, x-cp866.def, x-cp1250.def, -%% x-cp1251.def, x-cp1252.def, x-cp1257.def, x-dec-mcs.def, -%% x-koi8-r.def, x-mac-centeuro.def, x-mac-cyrillic.def, -%% x-mac-roman.def, x-nextstep.def, inputenx-licrcmds.txt, -%% inputenx-utf8enc.txt. +%% x-cp1251.def, x-cp1252.def, x-cp1255.def, x-cp1257.def, +%% x-dec-mcs.def, x-koi8-r.def, x-mac-centeuro.def, +%% x-mac-cyrillic.def, x-mac-roman.def, x-nextstep.def, +%% inputenx-licrcmds.txt, inputenx-utf8enc.txt. %% \ProvidesFile{x-cp1257.def}% - [2011/04/10 v1.8 Input encoding cp1257 (inputenx)]% + [2011/05/27 v1.10 Input encoding cp1257 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textasciiacute}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-cp437.def b/Master/texmf-dist/tex/latex/oberdiek/x-cp437.def index 4a29f973127..44f045dab7a 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-cp437.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-cp437.def @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: inputenx -%% Version: 2011/04/10 v1.8 +%% Version: 2011/05/27 v1.10 %% %% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -39,13 +39,13 @@ %% x-iso-8859-14.def, x-iso-8859-15.def, x-iso-8859-16.def, %% x-cp437.def, x-cp850.def, x-cp852.def, x-cp855.def, %% x-cp858.def, x-cp865.def, x-cp866.def, x-cp1250.def, -%% x-cp1251.def, x-cp1252.def, x-cp1257.def, x-dec-mcs.def, -%% x-koi8-r.def, x-mac-centeuro.def, x-mac-cyrillic.def, -%% x-mac-roman.def, x-nextstep.def, inputenx-licrcmds.txt, -%% inputenx-utf8enc.txt. +%% x-cp1251.def, x-cp1252.def, x-cp1255.def, x-cp1257.def, +%% x-dec-mcs.def, x-koi8-r.def, x-mac-centeuro.def, +%% x-mac-cyrillic.def, x-mac-roman.def, x-nextstep.def, +%% inputenx-licrcmds.txt, inputenx-utf8enc.txt. %% \ProvidesFile{x-cp437.def}% - [2011/04/10 v1.8 Input encoding cp437 (inputenx)]% + [2011/05/27 v1.10 Input encoding cp437 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textGamma}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-cp850.def b/Master/texmf-dist/tex/latex/oberdiek/x-cp850.def index eb8f0053e26..75ef55d49d2 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-cp850.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-cp850.def @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: inputenx -%% Version: 2011/04/10 v1.8 +%% Version: 2011/05/27 v1.10 %% %% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -39,13 +39,13 @@ %% x-iso-8859-14.def, x-iso-8859-15.def, x-iso-8859-16.def, %% x-cp437.def, x-cp850.def, x-cp852.def, x-cp855.def, %% x-cp858.def, x-cp865.def, x-cp866.def, x-cp1250.def, -%% x-cp1251.def, x-cp1252.def, x-cp1257.def, x-dec-mcs.def, -%% x-koi8-r.def, x-mac-centeuro.def, x-mac-cyrillic.def, -%% x-mac-roman.def, x-nextstep.def, inputenx-licrcmds.txt, -%% inputenx-utf8enc.txt. +%% x-cp1251.def, x-cp1252.def, x-cp1255.def, x-cp1257.def, +%% x-dec-mcs.def, x-koi8-r.def, x-mac-centeuro.def, +%% x-mac-cyrillic.def, x-mac-roman.def, x-nextstep.def, +%% inputenx-licrcmds.txt, inputenx-utf8enc.txt. %% \ProvidesFile{x-cp850.def}% - [2011/04/10 v1.8 Input encoding cp850 (inputenx)]% + [2011/05/27 v1.10 Input encoding cp850 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textasciiacute}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-cp852.def b/Master/texmf-dist/tex/latex/oberdiek/x-cp852.def index 93377598db3..e7b734aa3eb 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-cp852.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-cp852.def @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: inputenx -%% Version: 2011/04/10 v1.8 +%% Version: 2011/05/27 v1.10 %% %% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -39,13 +39,13 @@ %% x-iso-8859-14.def, x-iso-8859-15.def, x-iso-8859-16.def, %% x-cp437.def, x-cp850.def, x-cp852.def, x-cp855.def, %% x-cp858.def, x-cp865.def, x-cp866.def, x-cp1250.def, -%% x-cp1251.def, x-cp1252.def, x-cp1257.def, x-dec-mcs.def, -%% x-koi8-r.def, x-mac-centeuro.def, x-mac-cyrillic.def, -%% x-mac-roman.def, x-nextstep.def, inputenx-licrcmds.txt, -%% inputenx-utf8enc.txt. +%% x-cp1251.def, x-cp1252.def, x-cp1255.def, x-cp1257.def, +%% x-dec-mcs.def, x-koi8-r.def, x-mac-centeuro.def, +%% x-mac-cyrillic.def, x-mac-roman.def, x-nextstep.def, +%% inputenx-licrcmds.txt, inputenx-utf8enc.txt. %% \ProvidesFile{x-cp852.def}% - [2011/04/10 v1.8 Input encoding cp852 (inputenx)]% + [2011/05/27 v1.10 Input encoding cp852 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textacutedbl}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-cp855.def b/Master/texmf-dist/tex/latex/oberdiek/x-cp855.def index 15080acd45b..e06232e0a34 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-cp855.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-cp855.def @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: inputenx -%% Version: 2011/04/10 v1.8 +%% Version: 2011/05/27 v1.10 %% %% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -39,13 +39,13 @@ %% x-iso-8859-14.def, x-iso-8859-15.def, x-iso-8859-16.def, %% x-cp437.def, x-cp850.def, x-cp852.def, x-cp855.def, %% x-cp858.def, x-cp865.def, x-cp866.def, x-cp1250.def, -%% x-cp1251.def, x-cp1252.def, x-cp1257.def, x-dec-mcs.def, -%% x-koi8-r.def, x-mac-centeuro.def, x-mac-cyrillic.def, -%% x-mac-roman.def, x-nextstep.def, inputenx-licrcmds.txt, -%% inputenx-utf8enc.txt. +%% x-cp1251.def, x-cp1252.def, x-cp1255.def, x-cp1257.def, +%% x-dec-mcs.def, x-koi8-r.def, x-mac-centeuro.def, +%% x-mac-cyrillic.def, x-mac-roman.def, x-nextstep.def, +%% inputenx-licrcmds.txt, inputenx-utf8enc.txt. %% \ProvidesFile{x-cp855.def}% - [2011/04/10 v1.8 Input encoding cp855 (inputenx)]% + [2011/05/27 v1.10 Input encoding cp855 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textblacksquare}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-cp858.def b/Master/texmf-dist/tex/latex/oberdiek/x-cp858.def index be104cb4a4c..3995fbc3950 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-cp858.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-cp858.def @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: inputenx -%% Version: 2011/04/10 v1.8 +%% Version: 2011/05/27 v1.10 %% %% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -39,13 +39,13 @@ %% x-iso-8859-14.def, x-iso-8859-15.def, x-iso-8859-16.def, %% x-cp437.def, x-cp850.def, x-cp852.def, x-cp855.def, %% x-cp858.def, x-cp865.def, x-cp866.def, x-cp1250.def, -%% x-cp1251.def, x-cp1252.def, x-cp1257.def, x-dec-mcs.def, -%% x-koi8-r.def, x-mac-centeuro.def, x-mac-cyrillic.def, -%% x-mac-roman.def, x-nextstep.def, inputenx-licrcmds.txt, -%% inputenx-utf8enc.txt. +%% x-cp1251.def, x-cp1252.def, x-cp1255.def, x-cp1257.def, +%% x-dec-mcs.def, x-koi8-r.def, x-mac-centeuro.def, +%% x-mac-cyrillic.def, x-mac-roman.def, x-nextstep.def, +%% inputenx-licrcmds.txt, inputenx-utf8enc.txt. %% \ProvidesFile{x-cp858.def}% - [2011/04/10 v1.8 Input encoding cp858 (inputenx)]% + [2011/05/27 v1.10 Input encoding cp858 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textasciiacute}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-cp865.def b/Master/texmf-dist/tex/latex/oberdiek/x-cp865.def index 177d98cab58..cb55957540c 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-cp865.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-cp865.def @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: inputenx -%% Version: 2011/04/10 v1.8 +%% Version: 2011/05/27 v1.10 %% %% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -39,13 +39,13 @@ %% x-iso-8859-14.def, x-iso-8859-15.def, x-iso-8859-16.def, %% x-cp437.def, x-cp850.def, x-cp852.def, x-cp855.def, %% x-cp858.def, x-cp865.def, x-cp866.def, x-cp1250.def, -%% x-cp1251.def, x-cp1252.def, x-cp1257.def, x-dec-mcs.def, -%% x-koi8-r.def, x-mac-centeuro.def, x-mac-cyrillic.def, -%% x-mac-roman.def, x-nextstep.def, inputenx-licrcmds.txt, -%% inputenx-utf8enc.txt. +%% x-cp1251.def, x-cp1252.def, x-cp1255.def, x-cp1257.def, +%% x-dec-mcs.def, x-koi8-r.def, x-mac-centeuro.def, +%% x-mac-cyrillic.def, x-mac-roman.def, x-nextstep.def, +%% inputenx-licrcmds.txt, inputenx-utf8enc.txt. %% \ProvidesFile{x-cp865.def}% - [2011/04/10 v1.8 Input encoding cp865 (inputenx)]% + [2011/05/27 v1.10 Input encoding cp865 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textGamma}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-cp866.def b/Master/texmf-dist/tex/latex/oberdiek/x-cp866.def index cdf0b49582e..dafbb415ada 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-cp866.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-cp866.def @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: inputenx -%% Version: 2011/04/10 v1.8 +%% Version: 2011/05/27 v1.10 %% %% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -39,13 +39,13 @@ %% x-iso-8859-14.def, x-iso-8859-15.def, x-iso-8859-16.def, %% x-cp437.def, x-cp850.def, x-cp852.def, x-cp855.def, %% x-cp858.def, x-cp865.def, x-cp866.def, x-cp1250.def, -%% x-cp1251.def, x-cp1252.def, x-cp1257.def, x-dec-mcs.def, -%% x-koi8-r.def, x-mac-centeuro.def, x-mac-cyrillic.def, -%% x-mac-roman.def, x-nextstep.def, inputenx-licrcmds.txt, -%% inputenx-utf8enc.txt. +%% x-cp1251.def, x-cp1252.def, x-cp1255.def, x-cp1257.def, +%% x-dec-mcs.def, x-koi8-r.def, x-mac-centeuro.def, +%% x-mac-cyrillic.def, x-mac-roman.def, x-nextstep.def, +%% inputenx-licrcmds.txt, inputenx-utf8enc.txt. %% \ProvidesFile{x-cp866.def}% - [2011/04/10 v1.8 Input encoding cp866 (inputenx)]% + [2011/05/27 v1.10 Input encoding cp866 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textblacksquare}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-dec-mcs.def b/Master/texmf-dist/tex/latex/oberdiek/x-dec-mcs.def index 5b56103c9ed..493b902c452 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-dec-mcs.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-dec-mcs.def @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: inputenx -%% Version: 2011/04/10 v1.8 +%% Version: 2011/05/27 v1.10 %% %% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -39,13 +39,13 @@ %% x-iso-8859-14.def, x-iso-8859-15.def, x-iso-8859-16.def, %% x-cp437.def, x-cp850.def, x-cp852.def, x-cp855.def, %% x-cp858.def, x-cp865.def, x-cp866.def, x-cp1250.def, -%% x-cp1251.def, x-cp1252.def, x-cp1257.def, x-dec-mcs.def, -%% x-koi8-r.def, x-mac-centeuro.def, x-mac-cyrillic.def, -%% x-mac-roman.def, x-nextstep.def, inputenx-licrcmds.txt, -%% inputenx-utf8enc.txt. +%% x-cp1251.def, x-cp1252.def, x-cp1255.def, x-cp1257.def, +%% x-dec-mcs.def, x-koi8-r.def, x-mac-centeuro.def, +%% x-mac-cyrillic.def, x-mac-roman.def, x-nextstep.def, +%% inputenx-licrcmds.txt, inputenx-utf8enc.txt. %% \ProvidesFile{x-dec-mcs.def}% - [2011/04/10 v1.8 Input encoding dec-mcs (inputenx)]% + [2011/05/27 v1.10 Input encoding dec-mcs (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textcent}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-1.def b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-1.def index 7896b8a58e5..04f37977e54 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-1.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-1.def @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: inputenx -%% Version: 2011/04/10 v1.8 +%% Version: 2011/05/27 v1.10 %% %% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -39,13 +39,13 @@ %% x-iso-8859-14.def, x-iso-8859-15.def, x-iso-8859-16.def, %% x-cp437.def, x-cp850.def, x-cp852.def, x-cp855.def, %% x-cp858.def, x-cp865.def, x-cp866.def, x-cp1250.def, -%% x-cp1251.def, x-cp1252.def, x-cp1257.def, x-dec-mcs.def, -%% x-koi8-r.def, x-mac-centeuro.def, x-mac-cyrillic.def, -%% x-mac-roman.def, x-nextstep.def, inputenx-licrcmds.txt, -%% inputenx-utf8enc.txt. +%% x-cp1251.def, x-cp1252.def, x-cp1255.def, x-cp1257.def, +%% x-dec-mcs.def, x-koi8-r.def, x-mac-centeuro.def, +%% x-mac-cyrillic.def, x-mac-roman.def, x-nextstep.def, +%% inputenx-licrcmds.txt, inputenx-utf8enc.txt. %% \ProvidesFile{x-iso-8859-1.def}% - [2011/04/10 v1.8 Input encoding iso-8859-1 (inputenx)]% + [2011/05/27 v1.10 Input encoding iso-8859-1 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textasciiacute}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-10.def b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-10.def index 502fda2a1d7..35d1afc8de9 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-10.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-10.def @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: inputenx -%% Version: 2011/04/10 v1.8 +%% Version: 2011/05/27 v1.10 %% %% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -39,13 +39,13 @@ %% x-iso-8859-14.def, x-iso-8859-15.def, x-iso-8859-16.def, %% x-cp437.def, x-cp850.def, x-cp852.def, x-cp855.def, %% x-cp858.def, x-cp865.def, x-cp866.def, x-cp1250.def, -%% x-cp1251.def, x-cp1252.def, x-cp1257.def, x-dec-mcs.def, -%% x-koi8-r.def, x-mac-centeuro.def, x-mac-cyrillic.def, -%% x-mac-roman.def, x-nextstep.def, inputenx-licrcmds.txt, -%% inputenx-utf8enc.txt. +%% x-cp1251.def, x-cp1252.def, x-cp1255.def, x-cp1257.def, +%% x-dec-mcs.def, x-koi8-r.def, x-mac-centeuro.def, +%% x-mac-cyrillic.def, x-mac-roman.def, x-nextstep.def, +%% inputenx-licrcmds.txt, inputenx-utf8enc.txt. %% \ProvidesFile{x-iso-8859-10.def}% - [2011/04/10 v1.8 Input encoding iso-8859-10 (inputenx)]% + [2011/05/27 v1.10 Input encoding iso-8859-10 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textTstroke}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-13.def b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-13.def index e5bf0cca9d6..b10d51cc7bd 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-13.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-13.def @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: inputenx -%% Version: 2011/04/10 v1.8 +%% Version: 2011/05/27 v1.10 %% %% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -39,13 +39,13 @@ %% x-iso-8859-14.def, x-iso-8859-15.def, x-iso-8859-16.def, %% x-cp437.def, x-cp850.def, x-cp852.def, x-cp855.def, %% x-cp858.def, x-cp865.def, x-cp866.def, x-cp1250.def, -%% x-cp1251.def, x-cp1252.def, x-cp1257.def, x-dec-mcs.def, -%% x-koi8-r.def, x-mac-centeuro.def, x-mac-cyrillic.def, -%% x-mac-roman.def, x-nextstep.def, inputenx-licrcmds.txt, -%% inputenx-utf8enc.txt. +%% x-cp1251.def, x-cp1252.def, x-cp1255.def, x-cp1257.def, +%% x-dec-mcs.def, x-koi8-r.def, x-mac-centeuro.def, +%% x-mac-cyrillic.def, x-mac-roman.def, x-nextstep.def, +%% inputenx-licrcmds.txt, inputenx-utf8enc.txt. %% \ProvidesFile{x-iso-8859-13.def}% - [2011/04/10 v1.8 Input encoding iso-8859-13 (inputenx)]% + [2011/05/27 v1.10 Input encoding iso-8859-13 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textbrokenbar}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-14.def b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-14.def index 254ccebed90..b372c2259ce 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-14.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-14.def @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: inputenx -%% Version: 2011/04/10 v1.8 +%% Version: 2011/05/27 v1.10 %% %% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -39,13 +39,13 @@ %% x-iso-8859-14.def, x-iso-8859-15.def, x-iso-8859-16.def, %% x-cp437.def, x-cp850.def, x-cp852.def, x-cp855.def, %% x-cp858.def, x-cp865.def, x-cp866.def, x-cp1250.def, -%% x-cp1251.def, x-cp1252.def, x-cp1257.def, x-dec-mcs.def, -%% x-koi8-r.def, x-mac-centeuro.def, x-mac-cyrillic.def, -%% x-mac-roman.def, x-nextstep.def, inputenx-licrcmds.txt, -%% inputenx-utf8enc.txt. +%% x-cp1251.def, x-cp1252.def, x-cp1255.def, x-cp1257.def, +%% x-dec-mcs.def, x-koi8-r.def, x-mac-centeuro.def, +%% x-mac-cyrillic.def, x-mac-roman.def, x-nextstep.def, +%% inputenx-licrcmds.txt, inputenx-utf8enc.txt. %% \ProvidesFile{x-iso-8859-14.def}% - [2011/04/10 v1.8 Input encoding iso-8859-14 (inputenx)]% + [2011/05/27 v1.10 Input encoding iso-8859-14 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \DeclareInputText{160}{\nobreakspace} diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-15.def b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-15.def index 00d9f855291..37925e941c7 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-15.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-15.def @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: inputenx -%% Version: 2011/04/10 v1.8 +%% Version: 2011/05/27 v1.10 %% %% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -39,13 +39,13 @@ %% x-iso-8859-14.def, x-iso-8859-15.def, x-iso-8859-16.def, %% x-cp437.def, x-cp850.def, x-cp852.def, x-cp855.def, %% x-cp858.def, x-cp865.def, x-cp866.def, x-cp1250.def, -%% x-cp1251.def, x-cp1252.def, x-cp1257.def, x-dec-mcs.def, -%% x-koi8-r.def, x-mac-centeuro.def, x-mac-cyrillic.def, -%% x-mac-roman.def, x-nextstep.def, inputenx-licrcmds.txt, -%% inputenx-utf8enc.txt. +%% x-cp1251.def, x-cp1252.def, x-cp1255.def, x-cp1257.def, +%% x-dec-mcs.def, x-koi8-r.def, x-mac-centeuro.def, +%% x-mac-cyrillic.def, x-mac-roman.def, x-nextstep.def, +%% inputenx-licrcmds.txt, inputenx-utf8enc.txt. %% \ProvidesFile{x-iso-8859-15.def}% - [2011/04/10 v1.8 Input encoding iso-8859-15 (inputenx)]% + [2011/05/27 v1.10 Input encoding iso-8859-15 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textasciimacron}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-16.def b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-16.def index 27872c3f585..05ad6235e21 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-16.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-16.def @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: inputenx -%% Version: 2011/04/10 v1.8 +%% Version: 2011/05/27 v1.10 %% %% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -39,13 +39,13 @@ %% x-iso-8859-14.def, x-iso-8859-15.def, x-iso-8859-16.def, %% x-cp437.def, x-cp850.def, x-cp852.def, x-cp855.def, %% x-cp858.def, x-cp865.def, x-cp866.def, x-cp1250.def, -%% x-cp1251.def, x-cp1252.def, x-cp1257.def, x-dec-mcs.def, -%% x-koi8-r.def, x-mac-centeuro.def, x-mac-cyrillic.def, -%% x-mac-roman.def, x-nextstep.def, inputenx-licrcmds.txt, -%% inputenx-utf8enc.txt. +%% x-cp1251.def, x-cp1252.def, x-cp1255.def, x-cp1257.def, +%% x-dec-mcs.def, x-koi8-r.def, x-mac-centeuro.def, +%% x-mac-cyrillic.def, x-mac-roman.def, x-nextstep.def, +%% inputenx-licrcmds.txt, inputenx-utf8enc.txt. %% \ProvidesFile{x-iso-8859-16.def}% - [2011/04/10 v1.8 Input encoding iso-8859-16 (inputenx)]% + [2011/05/27 v1.10 Input encoding iso-8859-16 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textcommabelow}[1]{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-2.def b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-2.def index 29078bd5924..802ea8d0793 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-2.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-2.def @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: inputenx -%% Version: 2011/04/10 v1.8 +%% Version: 2011/05/27 v1.10 %% %% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -39,13 +39,13 @@ %% x-iso-8859-14.def, x-iso-8859-15.def, x-iso-8859-16.def, %% x-cp437.def, x-cp850.def, x-cp852.def, x-cp855.def, %% x-cp858.def, x-cp865.def, x-cp866.def, x-cp1250.def, -%% x-cp1251.def, x-cp1252.def, x-cp1257.def, x-dec-mcs.def, -%% x-koi8-r.def, x-mac-centeuro.def, x-mac-cyrillic.def, -%% x-mac-roman.def, x-nextstep.def, inputenx-licrcmds.txt, -%% inputenx-utf8enc.txt. +%% x-cp1251.def, x-cp1252.def, x-cp1255.def, x-cp1257.def, +%% x-dec-mcs.def, x-koi8-r.def, x-mac-centeuro.def, +%% x-mac-cyrillic.def, x-mac-roman.def, x-nextstep.def, +%% inputenx-licrcmds.txt, inputenx-utf8enc.txt. %% \ProvidesFile{x-iso-8859-2.def}% - [2011/04/10 v1.8 Input encoding iso-8859-2 (inputenx)]% + [2011/05/27 v1.10 Input encoding iso-8859-2 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textacutedbl}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-3.def b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-3.def index 4f9a81d774b..c671c9667a5 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-3.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-3.def @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: inputenx -%% Version: 2011/04/10 v1.8 +%% Version: 2011/05/27 v1.10 %% %% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -39,13 +39,13 @@ %% x-iso-8859-14.def, x-iso-8859-15.def, x-iso-8859-16.def, %% x-cp437.def, x-cp850.def, x-cp852.def, x-cp855.def, %% x-cp858.def, x-cp865.def, x-cp866.def, x-cp1250.def, -%% x-cp1251.def, x-cp1252.def, x-cp1257.def, x-dec-mcs.def, -%% x-koi8-r.def, x-mac-centeuro.def, x-mac-cyrillic.def, -%% x-mac-roman.def, x-nextstep.def, inputenx-licrcmds.txt, -%% inputenx-utf8enc.txt. +%% x-cp1251.def, x-cp1252.def, x-cp1255.def, x-cp1257.def, +%% x-dec-mcs.def, x-koi8-r.def, x-mac-centeuro.def, +%% x-mac-cyrillic.def, x-mac-roman.def, x-nextstep.def, +%% inputenx-licrcmds.txt, inputenx-utf8enc.txt. %% \ProvidesFile{x-iso-8859-3.def}% - [2011/04/10 v1.8 Input encoding iso-8859-3 (inputenx)]% + [2011/05/27 v1.10 Input encoding iso-8859-3 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textasciiacute}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-4.def b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-4.def index c8ca10add7d..47288718176 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-4.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-4.def @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: inputenx -%% Version: 2011/04/10 v1.8 +%% Version: 2011/05/27 v1.10 %% %% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -39,13 +39,13 @@ %% x-iso-8859-14.def, x-iso-8859-15.def, x-iso-8859-16.def, %% x-cp437.def, x-cp850.def, x-cp852.def, x-cp855.def, %% x-cp858.def, x-cp865.def, x-cp866.def, x-cp1250.def, -%% x-cp1251.def, x-cp1252.def, x-cp1257.def, x-dec-mcs.def, -%% x-koi8-r.def, x-mac-centeuro.def, x-mac-cyrillic.def, -%% x-mac-roman.def, x-nextstep.def, inputenx-licrcmds.txt, -%% inputenx-utf8enc.txt. +%% x-cp1251.def, x-cp1252.def, x-cp1255.def, x-cp1257.def, +%% x-dec-mcs.def, x-koi8-r.def, x-mac-centeuro.def, +%% x-mac-cyrillic.def, x-mac-roman.def, x-nextstep.def, +%% inputenx-licrcmds.txt, inputenx-utf8enc.txt. %% \ProvidesFile{x-iso-8859-4.def}% - [2011/04/10 v1.8 Input encoding iso-8859-4 (inputenx)]% + [2011/05/27 v1.10 Input encoding iso-8859-4 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textTstroke}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-5.def b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-5.def index d50010cdb09..b3e49862ad3 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-5.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-5.def @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: inputenx -%% Version: 2011/04/10 v1.8 +%% Version: 2011/05/27 v1.10 %% %% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -39,13 +39,13 @@ %% x-iso-8859-14.def, x-iso-8859-15.def, x-iso-8859-16.def, %% x-cp437.def, x-cp850.def, x-cp852.def, x-cp855.def, %% x-cp858.def, x-cp865.def, x-cp866.def, x-cp1250.def, -%% x-cp1251.def, x-cp1252.def, x-cp1257.def, x-dec-mcs.def, -%% x-koi8-r.def, x-mac-centeuro.def, x-mac-cyrillic.def, -%% x-mac-roman.def, x-nextstep.def, inputenx-licrcmds.txt, -%% inputenx-utf8enc.txt. +%% x-cp1251.def, x-cp1252.def, x-cp1255.def, x-cp1257.def, +%% x-dec-mcs.def, x-koi8-r.def, x-mac-centeuro.def, +%% x-mac-cyrillic.def, x-mac-roman.def, x-nextstep.def, +%% inputenx-licrcmds.txt, inputenx-utf8enc.txt. %% \ProvidesFile{x-iso-8859-5.def}% - [2011/04/10 v1.8 Input encoding iso-8859-5 (inputenx)]% + [2011/05/27 v1.10 Input encoding iso-8859-5 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textnumero}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-8.def b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-8.def index ba69b70b3c7..e39f7c09e72 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-8.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-8.def @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: inputenx -%% Version: 2011/04/10 v1.8 +%% Version: 2011/05/27 v1.10 %% %% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -39,13 +39,13 @@ %% x-iso-8859-14.def, x-iso-8859-15.def, x-iso-8859-16.def, %% x-cp437.def, x-cp850.def, x-cp852.def, x-cp855.def, %% x-cp858.def, x-cp865.def, x-cp866.def, x-cp1250.def, -%% x-cp1251.def, x-cp1252.def, x-cp1257.def, x-dec-mcs.def, -%% x-koi8-r.def, x-mac-centeuro.def, x-mac-cyrillic.def, -%% x-mac-roman.def, x-nextstep.def, inputenx-licrcmds.txt, -%% inputenx-utf8enc.txt. +%% x-cp1251.def, x-cp1252.def, x-cp1255.def, x-cp1257.def, +%% x-dec-mcs.def, x-koi8-r.def, x-mac-centeuro.def, +%% x-mac-cyrillic.def, x-mac-roman.def, x-nextstep.def, +%% inputenx-licrcmds.txt, inputenx-utf8enc.txt. %% \ProvidesFile{x-iso-8859-8.def}% - [2011/04/10 v1.8 Input encoding iso-8859-8 (inputenx)]% + [2011/05/27 v1.10 Input encoding iso-8859-8 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textasciiacute}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-9.def b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-9.def index e62607e32e2..3075c362ef6 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-9.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-9.def @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: inputenx -%% Version: 2011/04/10 v1.8 +%% Version: 2011/05/27 v1.10 %% %% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -39,13 +39,13 @@ %% x-iso-8859-14.def, x-iso-8859-15.def, x-iso-8859-16.def, %% x-cp437.def, x-cp850.def, x-cp852.def, x-cp855.def, %% x-cp858.def, x-cp865.def, x-cp866.def, x-cp1250.def, -%% x-cp1251.def, x-cp1252.def, x-cp1257.def, x-dec-mcs.def, -%% x-koi8-r.def, x-mac-centeuro.def, x-mac-cyrillic.def, -%% x-mac-roman.def, x-nextstep.def, inputenx-licrcmds.txt, -%% inputenx-utf8enc.txt. +%% x-cp1251.def, x-cp1252.def, x-cp1255.def, x-cp1257.def, +%% x-dec-mcs.def, x-koi8-r.def, x-mac-centeuro.def, +%% x-mac-cyrillic.def, x-mac-roman.def, x-nextstep.def, +%% inputenx-licrcmds.txt, inputenx-utf8enc.txt. %% \ProvidesFile{x-iso-8859-9.def}% - [2011/04/10 v1.8 Input encoding iso-8859-9 (inputenx)]% + [2011/05/27 v1.10 Input encoding iso-8859-9 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textasciiacute}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-koi8-r.def b/Master/texmf-dist/tex/latex/oberdiek/x-koi8-r.def index 1781578a9d5..d29cc574711 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-koi8-r.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-koi8-r.def @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: inputenx -%% Version: 2011/04/10 v1.8 +%% Version: 2011/05/27 v1.10 %% %% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -39,13 +39,13 @@ %% x-iso-8859-14.def, x-iso-8859-15.def, x-iso-8859-16.def, %% x-cp437.def, x-cp850.def, x-cp852.def, x-cp855.def, %% x-cp858.def, x-cp865.def, x-cp866.def, x-cp1250.def, -%% x-cp1251.def, x-cp1252.def, x-cp1257.def, x-dec-mcs.def, -%% x-koi8-r.def, x-mac-centeuro.def, x-mac-cyrillic.def, -%% x-mac-roman.def, x-nextstep.def, inputenx-licrcmds.txt, -%% inputenx-utf8enc.txt. +%% x-cp1251.def, x-cp1252.def, x-cp1255.def, x-cp1257.def, +%% x-dec-mcs.def, x-koi8-r.def, x-mac-centeuro.def, +%% x-mac-cyrillic.def, x-mac-roman.def, x-nextstep.def, +%% inputenx-licrcmds.txt, inputenx-utf8enc.txt. %% \ProvidesFile{x-koi8-r.def}% - [2011/04/10 v1.8 Input encoding koi8-r (inputenx)]% + [2011/05/27 v1.10 Input encoding koi8-r (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textapproxequal}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-mac-centeuro.def b/Master/texmf-dist/tex/latex/oberdiek/x-mac-centeuro.def index e7f3e0f0bff..65facaeb8fd 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-mac-centeuro.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-mac-centeuro.def @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: inputenx -%% Version: 2011/04/10 v1.8 +%% Version: 2011/05/27 v1.10 %% %% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -39,13 +39,13 @@ %% x-iso-8859-14.def, x-iso-8859-15.def, x-iso-8859-16.def, %% x-cp437.def, x-cp850.def, x-cp852.def, x-cp855.def, %% x-cp858.def, x-cp865.def, x-cp866.def, x-cp1250.def, -%% x-cp1251.def, x-cp1252.def, x-cp1257.def, x-dec-mcs.def, -%% x-koi8-r.def, x-mac-centeuro.def, x-mac-cyrillic.def, -%% x-mac-roman.def, x-nextstep.def, inputenx-licrcmds.txt, -%% inputenx-utf8enc.txt. +%% x-cp1251.def, x-cp1252.def, x-cp1255.def, x-cp1257.def, +%% x-dec-mcs.def, x-koi8-r.def, x-mac-centeuro.def, +%% x-mac-cyrillic.def, x-mac-roman.def, x-nextstep.def, +%% inputenx-licrcmds.txt, inputenx-utf8enc.txt. %% \ProvidesFile{x-mac-centeuro.def}% - [2011/04/10 v1.8 Input encoding mac-centeuro (inputenx)]% + [2011/05/27 v1.10 Input encoding mac-centeuro (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textasciicaron}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-mac-cyrillic.def b/Master/texmf-dist/tex/latex/oberdiek/x-mac-cyrillic.def index 1b655c9fbc3..ad73ce83e8b 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-mac-cyrillic.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-mac-cyrillic.def @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: inputenx -%% Version: 2011/04/10 v1.8 +%% Version: 2011/05/27 v1.10 %% %% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -39,13 +39,13 @@ %% x-iso-8859-14.def, x-iso-8859-15.def, x-iso-8859-16.def, %% x-cp437.def, x-cp850.def, x-cp852.def, x-cp855.def, %% x-cp858.def, x-cp865.def, x-cp866.def, x-cp1250.def, -%% x-cp1251.def, x-cp1252.def, x-cp1257.def, x-dec-mcs.def, -%% x-koi8-r.def, x-mac-centeuro.def, x-mac-cyrillic.def, -%% x-mac-roman.def, x-nextstep.def, inputenx-licrcmds.txt, -%% inputenx-utf8enc.txt. +%% x-cp1251.def, x-cp1252.def, x-cp1255.def, x-cp1257.def, +%% x-dec-mcs.def, x-koi8-r.def, x-mac-centeuro.def, +%% x-mac-cyrillic.def, x-mac-roman.def, x-nextstep.def, +%% inputenx-licrcmds.txt, inputenx-utf8enc.txt. %% \ProvidesFile{x-mac-cyrillic.def}% - [2011/04/10 v1.8 Input encoding mac-cyrillic (inputenx)]% + [2011/05/27 v1.10 Input encoding mac-cyrillic (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textapproxequal}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-mac-roman.def b/Master/texmf-dist/tex/latex/oberdiek/x-mac-roman.def index ec9cbfa9386..7640e59e1fe 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-mac-roman.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-mac-roman.def @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: inputenx -%% Version: 2011/04/10 v1.8 +%% Version: 2011/05/27 v1.10 %% %% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -39,13 +39,13 @@ %% x-iso-8859-14.def, x-iso-8859-15.def, x-iso-8859-16.def, %% x-cp437.def, x-cp850.def, x-cp852.def, x-cp855.def, %% x-cp858.def, x-cp865.def, x-cp866.def, x-cp1250.def, -%% x-cp1251.def, x-cp1252.def, x-cp1257.def, x-dec-mcs.def, -%% x-koi8-r.def, x-mac-centeuro.def, x-mac-cyrillic.def, -%% x-mac-roman.def, x-nextstep.def, inputenx-licrcmds.txt, -%% inputenx-utf8enc.txt. +%% x-cp1251.def, x-cp1252.def, x-cp1255.def, x-cp1257.def, +%% x-dec-mcs.def, x-koi8-r.def, x-mac-centeuro.def, +%% x-mac-cyrillic.def, x-mac-roman.def, x-nextstep.def, +%% inputenx-licrcmds.txt, inputenx-utf8enc.txt. %% \ProvidesFile{x-mac-roman.def}% - [2011/04/10 v1.8 Input encoding mac-roman (inputenx)]% + [2011/05/27 v1.10 Input encoding mac-roman (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textOmega}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-nextstep.def b/Master/texmf-dist/tex/latex/oberdiek/x-nextstep.def index c4523781351..5b50a14f9ab 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-nextstep.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-nextstep.def @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: inputenx -%% Version: 2011/04/10 v1.8 +%% Version: 2011/05/27 v1.10 %% %% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -39,13 +39,13 @@ %% x-iso-8859-14.def, x-iso-8859-15.def, x-iso-8859-16.def, %% x-cp437.def, x-cp850.def, x-cp852.def, x-cp855.def, %% x-cp858.def, x-cp865.def, x-cp866.def, x-cp1250.def, -%% x-cp1251.def, x-cp1252.def, x-cp1257.def, x-dec-mcs.def, -%% x-koi8-r.def, x-mac-centeuro.def, x-mac-cyrillic.def, -%% x-mac-roman.def, x-nextstep.def, inputenx-licrcmds.txt, -%% inputenx-utf8enc.txt. +%% x-cp1251.def, x-cp1252.def, x-cp1255.def, x-cp1257.def, +%% x-dec-mcs.def, x-koi8-r.def, x-mac-centeuro.def, +%% x-mac-cyrillic.def, x-mac-roman.def, x-nextstep.def, +%% inputenx-licrcmds.txt, inputenx-utf8enc.txt. %% \ProvidesFile{x-nextstep.def}% - [2011/04/10 v1.8 Input encoding nextstep (inputenx)]% + [2011/05/27 v1.10 Input encoding nextstep (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textacutedbl}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-verbatim.def b/Master/texmf-dist/tex/latex/oberdiek/x-verbatim.def index d9276aae23c..58d6fc01fc8 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-verbatim.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-verbatim.def @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: inputenx -%% Version: 2011/04/10 v1.8 +%% Version: 2011/05/27 v1.10 %% %% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -39,13 +39,13 @@ %% x-iso-8859-14.def, x-iso-8859-15.def, x-iso-8859-16.def, %% x-cp437.def, x-cp850.def, x-cp852.def, x-cp855.def, %% x-cp858.def, x-cp865.def, x-cp866.def, x-cp1250.def, -%% x-cp1251.def, x-cp1252.def, x-cp1257.def, x-dec-mcs.def, -%% x-koi8-r.def, x-mac-centeuro.def, x-mac-cyrillic.def, -%% x-mac-roman.def, x-nextstep.def, inputenx-licrcmds.txt, -%% inputenx-utf8enc.txt. +%% x-cp1251.def, x-cp1252.def, x-cp1255.def, x-cp1257.def, +%% x-dec-mcs.def, x-koi8-r.def, x-mac-centeuro.def, +%% x-mac-cyrillic.def, x-mac-roman.def, x-nextstep.def, +%% inputenx-licrcmds.txt, inputenx-utf8enc.txt. %% \ProvidesFile{x-verbatim.def}% - [2011/04/10 v1.8 Input encoding verbatim (inputenx)]% + [2011/05/27 v1.10 Input encoding verbatim (inputenx)]% \csname @inpenc@test\endcsname \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty index 177141f5d8a..a5f869568eb 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2011/03/18 v2.21 +%% Version: 2012/04/04 v2.24 %% -%% Copyright (C) 2006-2011 by +%% Copyright (C) 2006-2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -44,13 +44,13 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-abspage}% - [2011/03/18 v2.21 Module abspage for zref (HO)]% -\RequirePackage{zref-base}[2011/03/18] + [2012/04/04 v2.24 Module abspage for zref (HO)]% +\RequirePackage{zref-base}[2012/04/04] \ifx\ZREF@base@ok Y% \else \expandafter\endinput \fi -\RequirePackage{atbegshi}% +\RequirePackage{atbegshi}[2011/10/05]% \begingroup \let\@addtoreset\ltx@gobbletwo \newcounter{abspage}% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-abspos.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-abspos.sty index 44d9b048a0c..1df212b6a91 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-abspos.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-abspos.sty @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2011/03/18 v2.21 +%% Version: 2012/04/04 v2.24 %% -%% Copyright (C) 2006-2011 by +%% Copyright (C) 2006-2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -44,19 +44,317 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-abspos}% - [2011/03/18 v2.21 Module abspos for zref (HO)]% -\RequirePackage{zref-base}[2011/03/18] + [2012/04/04 v2.24 Module abspos for zref (HO)]% +\RequirePackage{zref-base}[2012/04/04] \ifx\ZREF@base@ok Y% \else \expandafter\endinput \fi -\RequirePackage{zref-savepos}[2011/03/18] +\RequirePackage{zref-savepos}[2012/04/04] \ifx\ZREF@savepos@ok Y% \else \expandafter\endinput \fi -\RequirePackage{zref-pagelayout}[2011/03/18] +\RequirePackage{zref-pagelayout}[2012/04/04] \zref@addprop{savepos}{abspage} +\RequirePackage{ifpdf}[2010/09/13] +\newcommand*{\zref@absposx}[3]{% + \number + \expandafter\zref@absposnumx\expandafter{% + \number\zref@extractdefault{#1}{abspage}{0}% + }{#2}{#3}% + \ltx@space +} +\newcommand*{\zref@absposy}[3]{% + \number + \expandafter\zref@absposnumy\expandafter{% + \number\zref@extractdefault{#1}{abspage}{0}% + }{#2}{#3}% + \ltx@space +} +\newcommand*{\zref@absposnumx}[3]{% + \number + \numexpr\ZREF@absposnum{thepage#1}{#2}{x}{#3}\relax +} +\newcommand*{\zref@absposnumy}[3]{% + \number + \numexpr\ZREF@absposnum{thepage#1}{#2}{y}{#3}\relax +} +\def\ZREF@absposnum#1#2#3#4{% + \ltx@ifundefined{ZREF@abspos@#2@#3@#4}{% + 0% + }{% + \csname ZREF@abspos@#2@#3@#4\endcsname{#1}% + }% +} +\ZREF@Robust\def\zref@def@absposx#1{% + \zref@wrapper@babel{\ZREF@def@abspos{#1}\zref@absposx}% +} +\ZREF@Robust\def\zref@def@absposy#1{% + \zref@wrapper@babel{\ZREF@def@abspos{#1}\zref@absposy}% +} +\ZREF@Robust\def\zref@def@absposnumx#1{% + \zref@wrapper@babel{\ZREF@def@abspos{#1}\zref@absposnumx}% +} +\ZREF@Robust\def\zref@def@absposnumy#1{% + \zref@wrapper@babel{\ZREF@def@abspos{#1}\zref@absposnumy}% +} +\def\ZREF@def@absposnumy#1#2#3#4#5{% + \edef#1{#2{#3}{#4}{#5}}% +} +\ZREF@Robust\def\zref@absposused{% + \zref@wrapper@babel\ZREF@abspos@used +} +\def\ZREF@abspos@used#1{% + \zref@refused{#1}% + \zref@ifrefundefined{#1}{% + }{% + \begingroup + \edef\ZREF@temp{% + \zref@extractdefault{#1}{abspage}{0}% + }% + \ifnum\ZREF@temp>\ltx@zero + \zref@refused{thepage\ZREF@temp}% + \else + \@PackageError{zref-abspos}{% + \string\zref@pos@label@used\ltx@space + needs property `abspage'\MessageBreak + in label `#1'% + }\@ehc + \fi + \endgroup + }% +} +\newcommand*{\zref@absposnumused}[1]{% + \ifnum#1>\ltx@zero + \zref@refused{thepage\number#1}% + \else + \@PackageError{zref-abspos}{% + Invalid absolute page number (#1)\MessageBreak + for \string\zref@pos@num@used.\MessageBreak + A positive integer is expected% + }\@ehc + \fi +} +\def\zref@ifabsposundefined#1{% + \zref@ifrefundefined{#1}\ltx@firsttwo{% + \expandafter\zref@ifabsposnumundefined\expandafter{% + \number\zref@extractdefault{#1}{abspage}{0}% + }% + }% +} +\def\zref@ifabsposnumundefined#1{% + \ifnum\ZREF@number{#1}>\ltx@zero + \zref@ifrefundefined{thepage#1}% + \ltx@firstoftwo\ltx@secondoftwo + \else + \expandafter\ltx@firstoftwo + \fi +} +\edef\ZREF@abspos@media@width{% + \ltx@ifundefined{pdfpagewidth}{% + \ltx@ifundefined{mediawidth}{% + \ltx@ifundefined{stockwidth}{% + paperwidth% + }{% + stockwidth% + }% + }{% + mediawidth% + }% + }{% + pdfpagewidth% + }% +} +\edef\ZREF@abspos@media@height{% + \ltx@ifundefined{pdfpageheight}{% + \ltx@ifundefined{mediaheight}{% + \ltx@ifundefined{stockheight}{% + paperheight% + }{% + stockheight% + }% + }{% + mediaheight% + }% + }{% + \noexpand\ifcase\pdfpageheight + \ltx@ifundefined{stockheight}{% + paperheight% + }{% + stockheight% + }% + \noexpand\else + pdfpageheight% + \noexpand\fi + }% +} +\def\ZREF@abspos@media@x@left#1{% + 0% +} +\def\ZREF@abspos@media@x@right#1{% + \zref@extract{#1}\ZREF@abspos@media@width +} +\def\ZREF@abspos@media@x@center#1{% + \ZREF@abspos@media@x@left{#1}% + +\zref@extract{#1}\ZREF@abspos@media@width/2% +} +\def\ZREF@abspos@media@y@top#1{% + \zref@extract{#1}\ZREF@abspos@media@height +} +\def\ZREF@abspos@media@y@bottom#1{% + 0% +} +\def\ZREF@abspos@media@y@center#1{% + \zref@extract{#1}\ZREF@abspos@media@height/2% +} +\def\ZREF@abspos@paper@x@left#1{% + 0% +} +\def\ZREF@abspos@paper@x@right#1{% + \zref@extract{#1}{paperwidth}% +} +\def\ZREF@abspos@paper@x@center#1{% + \zref@extract{#1}{paperwidth}/2% +} +\let\ZREF@abspos@paper@y@top\ZREF@abspos@media@y@top +\def\ZREF@abspos@paper@y@bottom#1{% + \ZREF@abspos@paper@y@top{#1}% + -\zref@extract{#1}{paperheight}% +} +\def\ZREF@abspos@paper@y@center#1{% + \ZREF@abspos@paper@y@top{#1}% + -\zref@extract{#1}{paperheight}/2% +} +\let\ZREF@temp\ltx@two +\ltx@IfUndefined{pdfhorigin}{}{% + \ifpdf + \let\ZREF@temp\ltx@zero + \fi +} +\ifx\ZREF@temp\ltx@two + \ifnum\mag=1000 % + \let\ZREF@temp\ltx@one + \fi +\fi +\ifcase\ZREF@temp + \def\ZREF@abspos@origin@x#1{% + \zref@extract{#1}{pdfhorigin}% + }% +\or + \def\ZREF@abspos@origin@x#1{% + 4736286% + }% +\or + \def\ZREF@abspos@origin@x#1{% + \numexpr\mag/1000*\dimexpr 1truein\relax\relax + }% +\fi +\let\ZREF@temp\ltx@two +\ltx@IfUndefined{pdfvorigin}{}{% + \ifpdf + \let\ZREF@temp\ltx@zero + \fi +} +\ifx\ZREF@temp\ltx@two + \ifnum\mag=1000 % + \let\ZREF@temp\ltx@one + \fi +\fi +\ifcase\ZREF@temp + \def\ZREF@abspos@origin@y#1{% + \zref@extract{#1}{pdfvorigin}% + }% +\or + \def\ZREF@abspos@origin@y#1{% + 4736286% + }% +\or + \def\ZREF@abspos@origin@y#1{% + \numexpr\mag/1000*\dimexpr 1truein\relax\relax + }% +\fi +\def\ZREF@abspos@head@x@left#1{% + \ZREF@abspos@paper@x@left{#1}% + +\ZREF@abspos@origin@x{#1}% + +\zref@extract{#1}{hoffset}% + +\ifodd\zref@extractdefault{#1}{pagevalue}{\number\c@page} % + \zref@extract{#1}{oddsidemargin}% + \else + \zref@extract{#1}{evensidemargin}% + \fi +} +\def\ZREF@abspos@head@x@right#1{% + \ZREF@abspos@head@x@left{#1}% + +\zref@extract{#1}{textwidth}% +} +\def\ZREF@abspos@head@x@center#1{% + \ZREF@abspos@head@x@left{#1}% + +\zref@extract{#1}{textwidth}/2% +} +\def\ZREF@abspos@head@y@top#1{% + \ZREF@abspos@paper@y@top{#1}% + -\ZREF@abspos@origin@y{#1}% + -\zref@extract{#1}{voffset}% + -\zref@extract{#1}{topmargin}% +} +\def\ZREF@abspos@head@y@bottom#1{% + \ZREF@abspos@head@y@top{#1}% + -\zref@extract{#1}{headheight}% +} +\def\ZREF@abspos@head@y@center#1{% + \ZREF@abspos@head@y@top{#1}% + -\zref@extract{#1}{headheight}/2% +} +\let\ZREF@abspos@body@x@left\ZREF@abspos@head@x@left +\let\ZREF@abspos@body@x@right\ZREF@abspos@head@x@right +\let\ZREF@abspos@body@x@center\ZREF@abspos@head@x@center +\def\ZREF@abspos@body@y@top#1{% + \ZREF@abspos@head@y@bottom{#1}% + -\zref@extract{#1}{headsep}% +} +\def\ZREF@abspos@body@y@bottom#1{% + \ZREF@abspos@body@y@top{#1}% + -\zref@extract{#1}{textheight}% +} +\def\ZREF@abspos@body@y@center#1{% + \ZREF@abspos@body@y@top{#1}% + -\zref@extract{#1}{textheight}/2% +} +\let\ZREF@abspos@foot@x@left\ZREF@abspos@head@x@left +\let\ZREF@abspos@foot@x@right\ZREF@abspos@head@x@right +\let\ZREF@abspos@foot@x@center\ZREF@abspos@head@x@center +\def\ZREF@abspos@foot@y@bottom#1{% + \ZREF@abspos@body@y@bottom{#1}% + -\zref@extract{#1}{footskip}% +} +\def\ZREF@abspos@marginpar@x@left#1{% + \ifodd\zref@extractdefault{#1}{pagevalue}{\number\c@page} % + \ZREF@abspos@body@x@right{#1}% + +\zref@extract{#1}{marginparsep}% + \else + \ZREF@abspos@body@x@left{#1}% + -\zref@extract{#1}{marginparsep}% + -\zref@extract{#1}{marginparwidth}% + \fi +} +\def\ZREF@abspos@marginpar@x@right#1{% + \ZREF@abspos@marginpar@x@left{#1}% + +\zref@extract{#1}{marginparwidth}% +} +\def\ZREF@abspos@marginpar@x@center#1{% + \ZREF@abspos@marginpar@x@left{#1}% + +\zref@extract{#1}{marginparwidth}/2% +} +\let\ZREF@abspos@marginpar@y@top\ZREF@abspos@body@y@top +\let\ZREF@abspos@marginpar@y@bottom\ZREF@abspos@body@y@bottom +\let\ZREF@abspos@marginpar@y@center\ZREF@abspos@body@y@center +\let\ZREF@abspos@stock@x@left\ZREF@abspos@paper@x@left +\let\ZREF@abspos@stock@x@right\ZREF@abspos@paper@x@right +\let\ZREF@abspos@stock@x@center\ZREF@abspos@paper@x@center +\let\ZREF@abspos@stock@y@top\ZREF@abspos@paper@y@top +\let\ZREF@abspos@stock@y@bottom\ZREF@abspos@paper@y@bottom +\let\ZREF@abspos@stock@y@center\ZREF@abspos@paper@y@center \endinput %% %% End of file `zref-abspos.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty index c1c24e4bdb9..2e6abc27895 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2011/03/18 v2.21 +%% Version: 2012/04/04 v2.24 %% -%% Copyright (C) 2006-2011 by +%% Copyright (C) 2006-2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -44,8 +44,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-base}% - [2011/03/18 v2.21 Module base for zref (HO)]% -\RequirePackage{ltxcmds}[2010/03/01] + [2012/04/04 v2.24 Module base for zref (HO)]% +\RequirePackage{ltxcmds}[2010/12/02] \RequirePackage{infwarerr}[2010/04/08] \RequirePackage{kvsetkeys}[2010/03/01] \RequirePackage{kvdefinekeys}[2010/03/01] @@ -368,6 +368,36 @@ \expandafter \gdef\csname Z@E@\ZREF@P\endcsname##1#1##2##3\ZREF@nil{##2}% } +\ZREF@Robust\def\zref@showprop#1{% + \zref@ifpropundefined{#1}{% + \@PackageInfoNoLine{\ZREF@name}{% + Show property `#1': <undefined>% + }% + }{% + \begingroup + \toks@\expandafter\expandafter\expandafter{% + \csname Z@C@#1\endcsname + }% + \edef\ZREF@value{\the\toks@}% + \ltx@onelevel@sanitize\ZREF@value + \toks@\expandafter\expandafter\expandafter{% + \csname Z@D@#1\endcsname + }% + \edef\ZREF@default{\the\toks@}% + \ltx@onelevel@sanitize\ZREF@default + \@PackageInfoNoLine{\ZREF@name}{% + Show property `#1':\MessageBreak + \expandafter\ifx\csname Z@X@#1\endcsname\ltx@empty + Immediate % + \else + Delayed % + \fi + value: [\ZREF@value]\MessageBreak + Default: [\ZREF@default]% + }% + \endgroup + }% +} \ZREF@Robust\def\zref@setcurrent#1#2{% \zref@propexists{#1}{% \expandafter\def\csname Z@C@#1\endcsname{#2}% @@ -636,6 +666,28 @@ }% } \let\zref@extractdefault\ZREF@extractdefault +\ZREF@Robust\def\zref@def@extract#1{% + \zref@wrapper@babel{\ZREF@def@extract{#1}}% +} +\def\ZREF@def@extract#1#2#3{% + \zref@refused{#2}% + \expandafter\expandafter\expandafter\def + \expandafter\expandafter\expandafter#1% + \expandafter\expandafter\expandafter{% + \zref@extract{#2}{#3}% + }% +} +\ZREF@Robust\def\zref@def@extractdefault#1{% + \zref@wrapper@babel{\ZREF@def@extractdefault{#1}}% +} +\def\ZREF@def@extractdefault#1#2#3#4{% + \zref@refused{#2}% + \expandafter\expandafter\expandafter\def + \expandafter\expandafter\expandafter#1% + \expandafter\expandafter\expandafter{% + \zref@extractdefault{#2}{#3}{#4}% + }% +} \ZREF@Robust{\long\def}\ZREF@wrapper@unexpanded#1{% \let\zref@wrapper@unexpanded\ltx@firstofone \let\zref@getcurrent\ZREF@wu@getcurrent @@ -690,9 +742,9 @@ }{}% } \ltx@IfUndefined{numexpr}{% - \let\ZREF@number\number + \def\ZREF@number#1{\number#1}% }{% - \def\ZREF@number#1{\the\numexpr#1}% + \def\ZREF@number#1{\the\numexpr(#1)\relax}% } \ZREF@Robust\def\zref@setdefault#1{% \def\zref@default{#1}% @@ -723,6 +775,10 @@ \zref@newprop{theotype}{}% \global\let\ZREF@NewPropTheotype\relax } +\def\ZREF@NewPropPageValue{% + \zref@newprop*{pagevalue}[0]{\number\c@page}% + \global\let\ZREF@NewPropPageValue\relax +} \let\ZREF@base@ok=Y \endinput %% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty index 0dbe07a6018..297bb245b9d 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2011/03/18 v2.21 +%% Version: 2012/04/04 v2.24 %% -%% Copyright (C) 2006-2011 by +%% Copyright (C) 2006-2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -44,8 +44,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-counter}% - [2011/03/18 v2.21 Module counter for zref (HO)]% -\RequirePackage{zref-base}[2011/03/18] + [2012/04/04 v2.24 Module counter for zref (HO)]% +\RequirePackage{zref-base}[2012/04/04] \ifx\ZREF@base@ok Y% \else \expandafter\endinput diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty index 13ea661bacd..be13c3d4eeb 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2011/03/18 v2.21 +%% Version: 2012/04/04 v2.24 %% -%% Copyright (C) 2006-2011 by +%% Copyright (C) 2006-2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -44,13 +44,13 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-dotfill}% - [2011/03/18 v2.21 Module dotfill for zref (HO)]% -\RequirePackage{zref-base}[2011/03/18] + [2012/04/04 v2.24 Module dotfill for zref (HO)]% +\RequirePackage{zref-base}[2012/04/04] \ifx\ZREF@base@ok Y% \else \expandafter\endinput \fi -\RequirePackage{zref-savepos}[2011/03/18] +\RequirePackage{zref-savepos}[2012/04/04] \zref@require@unique \RequirePackage{keyval} \define@key{ZREF@DF}{unit}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-env.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-env.sty index cb2de3fbaa2..7b0da4b8a59 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-env.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-env.sty @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2011/03/18 v2.21 +%% Version: 2012/04/04 v2.24 %% -%% Copyright (C) 2006-2011 by +%% Copyright (C) 2006-2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -44,8 +44,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-env}% - [2011/03/18 v2.21 Module env for zref (HO)]% -\RequirePackage{zref-base}[2011/03/18] + [2012/04/04 v2.24 Module env for zref (HO)]% +\RequirePackage{zref-base}[2012/04/04] \ifx\ZREF@base@ok Y% \else \expandafter\endinput diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty index 900c1ca21a0..caef3e33356 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2011/03/18 v2.21 +%% Version: 2012/04/04 v2.24 %% -%% Copyright (C) 2006-2011 by +%% Copyright (C) 2006-2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -44,8 +44,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-hyperref}% - [2011/03/18 v2.21 Module hyperref for zref (HO)]% -\RequirePackage{zref-base}[2011/03/18] + [2012/04/04 v2.24 Module hyperref for zref (HO)]% +\RequirePackage{zref-base}[2012/04/04] \ifx\ZREF@base@ok Y% \else \expandafter\endinput diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty index 346e6ae8728..2b08f3cbd62 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2011/03/18 v2.21 +%% Version: 2012/04/04 v2.24 %% -%% Copyright (C) 2006-2011 by +%% Copyright (C) 2006-2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -44,9 +44,9 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-lastpage}% - [2011/03/18 v2.21 Module lastpage for zref (HO)]% -\RequirePackage{zref-base}[2011/03/18] -\RequirePackage{zref-abspage}[2011/03/18] + [2012/04/04 v2.24 Module lastpage for zref (HO)]% +\RequirePackage{zref-base}[2012/04/04] +\RequirePackage{zref-abspage}[2012/04/04] \RequirePackage{atveryend}[2009/12/07] \ifx\ZREF@base@ok Y% \else diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-marks.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-marks.sty index 5ac07443ee4..0f4534e564b 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-marks.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-marks.sty @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2011/03/18 v2.21 +%% Version: 2012/04/04 v2.24 %% -%% Copyright (C) 2006-2011 by +%% Copyright (C) 2006-2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -44,15 +44,15 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-marks}% - [2011/03/18 v2.21 Module marks for zref (HO)]% -\RequirePackage{zref-base}[2011/03/18] + [2012/04/04 v2.24 Module marks for zref (HO)]% +\RequirePackage{zref-base}[2012/04/04] \ifx\ZREF@base@ok Y% \else \expandafter\endinput \fi \newcommand*{\zref@marks@register}[3][]{% \edef\ZREF@TempName{#1}% - \edef\ZREF@TempNum{\ZREF@number#2}% + \edef\ZREF@TempNum{\ZREF@number{#2}}% \ifnum\ZREF@TempNum<\ltx@zero % \PackageError\ZREF@name{% \string\zref@marks@register\ltx@space is called with invalid% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty index 923a55b8ac3..2d1b9e77188 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2011/03/18 v2.21 +%% Version: 2012/04/04 v2.24 %% -%% Copyright (C) 2006-2011 by +%% Copyright (C) 2006-2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -44,15 +44,15 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-nextpage}% - [2011/03/18 v2.21 Module nextpage for zref (HO)]% -\RequirePackage{zref-base}[2011/03/18] + [2012/04/04 v2.24 Module nextpage for zref (HO)]% +\RequirePackage{zref-base}[2012/04/04] \ifx\ZREF@base@ok Y% \else \expandafter\endinput \fi -\RequirePackage{zref-abspage}[2011/03/18] -\RequirePackage{zref-thepage}[2011/03/18] -\RequirePackage{zref-lastpage}[2011/03/18] +\RequirePackage{zref-abspage}[2012/04/04] +\RequirePackage{zref-thepage}[2012/04/04] +\RequirePackage{zref-lastpage}[2012/04/04] \RequirePackage{uniquecounter}[2009/12/18] \UniqueCounterNew{znextpage} diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-pageattr.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-pageattr.sty index 8f61be88d0f..99065282034 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-pageattr.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-pageattr.sty @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2011/03/18 v2.21 +%% Version: 2012/04/04 v2.24 %% -%% Copyright (C) 2006-2011 by +%% Copyright (C) 2006-2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -44,8 +44,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-pageattr}% - [2011/03/18 v2.21 Module pageattr for zref (HO)]% -\RequirePackage{zref-base}[2011/03/18] + [2012/04/04 v2.24 Module pageattr for zref (HO)]% +\RequirePackage{zref-base}[2012/04/04] \ifx\ZREF@base@ok Y% \else \expandafter\endinput @@ -86,7 +86,7 @@ \def\zref@pdfpageattr#1{}% \def\zref@pdfpageattr@used#1{}% }{% - \RequirePackage{zref-thepage}[2011/03/18]% + \RequirePackage{zref-thepage}[2012/04/04]% \zref@newprop*{pdfpageattr}[]{\zref@hex{\the\pdfpageattr}}% \zref@addprop{thepage}{pdfpageattr}% \let\ZREF@temp=Y% @@ -98,7 +98,7 @@ \def\zref@pdfpagesattr{}% \def\zref@pdfpagesattr@used{}% }{% - \RequirePackage{zref-lastpage}[2011/03/18]% + \RequirePackage{zref-lastpage}[2012/04/04]% \zref@newprop*{pdfpagesattr}[]{\zref@hex{\the\pdfpagesattr}}% \zref@addprop{LastPage}{pdfpagesattr}% \let\ZREF@temp=Y% @@ -106,7 +106,7 @@ \ifx\ZREF@temp N% \expandafter\endinput \fi -\RequirePackage{zref-abspage}[2011/03/18] +\RequirePackage{zref-abspage}[2012/04/04] \RequirePackage{atveryend}[2010/03/24] \RequirePackage{pdftexcmds}[2010/04/01] \let\ZREF@temp=Y% @@ -156,11 +156,11 @@ }% \def\zref@pageattr#1{% \zref@unhex{% - \zref@extract{thepage\ZREF@number#1}{pdfpageattr}% + \zref@extract{thepage\ZREF@number{#1}}{pdfpageattr}% }% } \ZREF@Robust\def\zref@pageattr@used#1{% - \zref@refused{thepage\ZREF@number#1}% + \zref@refused{thepage\ZREF@number{#1}}% } \def\ZREF@pa@ListPage{% \edef\x{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-pagelayout.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-pagelayout.sty index 9319bcd618f..d15fc7a8230 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-pagelayout.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-pagelayout.sty @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2011/03/18 v2.21 +%% Version: 2012/04/04 v2.24 %% -%% Copyright (C) 2006-2011 by +%% Copyright (C) 2006-2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -44,13 +44,13 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-pagelayout}% - [2011/03/18 v2.21 Module pagelayout for zref (HO)]% -\RequirePackage{zref-base}[2011/03/18] + [2012/04/04 v2.24 Module pagelayout for zref (HO)]% +\RequirePackage{zref-base}[2012/04/04] \ifx\ZREF@base@ok Y% \else \expandafter\endinput \fi -\RequirePackage{zref-thepage}[2011/03/18] +\RequirePackage{zref-thepage}[2012/04/04] \RequirePackage{ifluatex}[2010/03/01] \RequirePackage{atveryend}[2010/03/24] \ifluatex @@ -89,8 +89,8 @@ \edef\x{% \endgroup \noexpand\zref@newprop*{\string#1}% - [\number\noexpand#1]% hash-ok - {\number\noexpand#1}% + [\noexpand\number\noexpand#1]% hash-ok + {\noexpand\number\noexpand#1}% \noexpand\zref@addprop{thepage}{\string#1}% }% \x @@ -99,8 +99,10 @@ \ZREF@temp\mag \ZREF@temp\paperwidth \ZREF@temp\paperheight -\ZREF@temp\stockwidth -\ZREF@temp\stockheight +\ZREF@temp\stockwidth % memoir.cls, crop.sty +\ZREF@temp\stockheight % memoir.cls, crop.sty +\ZREF@temp\mediawidth % VTeX +\ZREF@temp\mediaheight % VTeX \ZREF@temp\pdfpagewidth \ZREF@temp\pdfpageheight \ZREF@temp\pdfhorigin @@ -119,6 +121,16 @@ \ZREF@temp\marginparsep \ZREF@temp\columnwidth \ZREF@temp\columnsep +\ZREF@temp\trimedge % memoir.cls +\ZREF@temp\spinemargin % memoir.cls +\ZREF@temp\foremargin % memoir.cls +\ZREF@temp\trimtop % memoir.cls +\ZREF@temp\uppermargin % memoir.cls +\ZREF@temp\headmargin % memoir.cls +\zref@newprop*{outputboxwd}[0pt]{\AtBeginShipoutBoxWidth} +\zref@newprop*{outputboxht}[0pt]{\AtBeginShipoutBoxHeight} +\zref@newprop*{outputboxdp}[0pt]{\AtBeginShipoutBoxDepth} +\zref@addprops{thepage}{outputboxwd,outputboxht,outputboxdp} \ltx@newif\ifZREF@pl@list \ZREF@IfDefinable\zlistpagelayout\def{% {\global\ZREF@pl@listtrue}% @@ -162,6 +174,8 @@ \ZREF@pl@ListEntry{paperheight}% \ZREF@pl@ListEntry{stockwidth}% \ZREF@pl@ListEntry{stockheight}% + \ZREF@pl@ListEntry{mediawidth}% + \ZREF@pl@ListEntry{mediaheight}% \ZREF@pl@ListEntry{pdfpagewidth}% \ZREF@pl@ListEntry{pdfpageheight}% \ZREF@pl@ListEntry{pdfhorigin}% @@ -180,6 +194,12 @@ \ZREF@pl@ListEntry{marginparsep}% \ZREF@pl@ListEntry{columnwidth}% \ZREF@pl@ListEntry{columnsep}% + \ZREF@pl@ListEntry{trimedge}% + \ZREF@pl@ListEntry{spinemargin}% + \ZREF@pl@ListEntry{foremargin}% + \ZREF@pl@ListEntry{trimtop}% + \ZREF@pl@ListEntry{uppermargin}% + \ZREF@pl@ListEntry{headmargin}% }% }% }\x diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty index df8134c39b0..02c6200e1a1 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2011/03/18 v2.21 +%% Version: 2012/04/04 v2.24 %% -%% Copyright (C) 2006-2011 by +%% Copyright (C) 2006-2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -44,14 +44,14 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-perpage}% - [2011/03/18 v2.21 Module perpage for zref (HO)]% -\RequirePackage{zref-base}[2011/03/18] + [2012/04/04 v2.24 Module perpage for zref (HO)]% +\RequirePackage{zref-base}[2012/04/04] \ifx\ZREF@base@ok Y% \else \expandafter\endinput \fi -\RequirePackage{zref-abspage}[2011/03/18] -\zref@newprop*{pagevalue}[0]{\number\c@page} +\RequirePackage{zref-abspage}[2012/04/04] +\ZREF@NewPropPageValue \zref@newlist{perpage} \zref@addprops{perpage}{abspage,page,pagevalue} \newcounter{zpage} diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty index bba741cde7d..215ec97b4b2 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2011/03/18 v2.21 +%% Version: 2012/04/04 v2.24 %% -%% Copyright (C) 2006-2011 by +%% Copyright (C) 2006-2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -44,7 +44,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-runs}% - [2011/03/18 v2.21 Module runs for zref (HO)]% + [2012/04/04 v2.24 Module runs for zref (HO)]% \providecommand*{\zruns}{0}% \AtBeginDocument{% \edef\zruns{\number\numexpr\zruns+1}% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty index e9ca2b5b160..b79c25008fa 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2011/03/18 v2.21 +%% Version: 2012/04/04 v2.24 %% -%% Copyright (C) 2006-2011 by +%% Copyright (C) 2006-2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -44,8 +44,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-savepos}% - [2011/03/18 v2.21 Module savepos for zref (HO)]% -\RequirePackage{zref-base}[2011/03/18] + [2012/04/04 v2.24 Module savepos for zref (HO)]% +\RequirePackage{zref-base}[2012/04/04] \ifx\ZREF@base@ok Y% \else \expandafter\endinput @@ -81,14 +81,34 @@ \pdfsavepos \fi } +\def\ZREF@zsavepos#1#2#3{% + \@bsphack + \if@filesw + \zref@savepos + #1{#3}{#2}% + \ltx@IfUndefined{TeXXeTstate}{% + }{% + \ifnum\TeXXeTstate=\ltx@zero + \else + \zref@savepos + \fi + }% + \fi + \@esphack +} \ZREF@IfDefinable\zsavepos\def{% - #1{% - \@bsphack - \if@filesw - \zref@savepos - \zref@labelbylist{#1}{savepos}% - \fi - \@esphack + {% + \ZREF@zsavepos\zref@labelbylist{savepos}% + }% +} +\ZREF@IfDefinable\zsaveposx\def{% + {% + \ZREF@zsavepos\zref@labelbyprops{posx}% + }% +} +\ZREF@IfDefinable\zsaveposy\def{% + {% + \ZREF@zsavepos\zref@labelbyprops{posy}% }% } \newcommand*{\zposx}[1]{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty index 314c63f9ca1..fe5a7569d83 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2011/03/18 v2.21 +%% Version: 2012/04/04 v2.24 %% -%% Copyright (C) 2006-2011 by +%% Copyright (C) 2006-2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -44,18 +44,22 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-thepage}% - [2011/03/18 v2.21 Module thepage for zref (HO)]% -\RequirePackage{zref-base}[2011/03/18] + [2012/04/04 v2.24 Module thepage for zref (HO)]% +\RequirePackage{zref-base}[2012/04/04] \ifx\ZREF@base@ok Y% \else \expandafter\endinput \fi -\RequirePackage{atbegshi} -\RequirePackage{zref-abspage}[2011/03/18] +\RequirePackage{atbegshi}[2011/10/05] +\RequirePackage{zref-abspage}[2012/04/04] \zref@newlist{thepage} \zref@addprop{thepage}{page} +\ZREF@NewPropPageValue +\let\zref@thepage@atbegshi@hook\ltx@empty +\zref@addprop{thepage}{pagevalue} \AtBeginShipout{% - \zref@wrapper@immediate{% + \AtBeginShipoutAddToBox{% + \zref@thepage@atbegshi@hook \zref@labelbylist{thepage\the\value{abspage}}{thepage}% }% } diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty index 8fceefd4928..63174af0519 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2011/03/18 v2.21 +%% Version: 2012/04/04 v2.24 %% -%% Copyright (C) 2006-2011 by +%% Copyright (C) 2006-2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -44,8 +44,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-titleref}% - [2011/03/18 v2.21 Module titleref for zref (HO)]% -\RequirePackage{zref-base}[2011/03/18] + [2012/04/04 v2.24 Module titleref for zref (HO)]% +\RequirePackage{zref-base}[2012/04/04] \ifx\ZREF@base@ok Y% \else \expandafter\endinput @@ -227,6 +227,17 @@ \ZREF@org@ttl@sect@i{#1}{#2}[{#3}]{#4}% }% }% + \ZREF@patch{ttl@straight@i}{% + \def\ttl@straight@i#1[#2]#3{% + \def\ZREF@temp{#2}% + \ifx\ZREF@temp\ltx@empty + \zref@titleref@setcurrent{#3}% + \else + \zref@titleref@setcurrent{#2}% + \fi + \ZREF@org@ttl@straight@i{#1}[{#2}]{#3}% + }% + }% }{}% \@ifpackageloaded{longtable}{% \ZREF@patch{LT@c@ption}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty index e328133f25d..45bc9c73fab 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2011/03/18 v2.21 +%% Version: 2012/04/04 v2.24 %% -%% Copyright (C) 2006-2011 by +%% Copyright (C) 2006-2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -44,14 +44,14 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-totpages}% - [2011/03/18 v2.21 Module totpages for zref (HO)]% -\RequirePackage{zref-base}[2011/03/18] + [2012/04/04 v2.24 Module totpages for zref (HO)]% +\RequirePackage{zref-base}[2012/04/04] \ifx\ZREF@base@ok Y% \else \expandafter\endinput \fi -\RequirePackage{zref-abspage}[2011/03/18] -\RequirePackage{zref-lastpage}[2011/03/18] +\RequirePackage{zref-abspage}[2012/04/04] +\RequirePackage{zref-lastpage}[2012/04/04] \newcommand*{\ztotpages}{% \zref@extractdefault{LastPage}{abspage}{0}% } diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty index 0d10143cdd7..047708a64b5 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2011/03/18 v2.21 +%% Version: 2012/04/04 v2.24 %% -%% Copyright (C) 2006-2011 by +%% Copyright (C) 2006-2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -44,8 +44,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-user}% - [2011/03/18 v2.21 Module user for zref (HO)]% -\RequirePackage{zref-base}[2011/03/18] + [2012/04/04 v2.24 Module user for zref (HO)]% +\RequirePackage{zref-base}[2012/04/04] \ifx\ZREF@base@ok Y% \else \expandafter\endinput diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty index fddd117768f..f8b9eef39ea 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2011/03/18 v2.21 +%% Version: 2012/04/04 v2.24 %% -%% Copyright (C) 2006-2011 by +%% Copyright (C) 2006-2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -44,8 +44,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-xr}% - [2011/03/18 v2.21 Module xr for zref (HO)]% -\RequirePackage{zref-base}[2011/03/18] + [2012/04/04 v2.24 Module xr for zref (HO)]% +\RequirePackage{zref-base}[2012/04/04] \ifx\ZREF@base@ok Y% \else \expandafter\endinput diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref.sty b/Master/texmf-dist/tex/latex/oberdiek/zref.sty index a80f0055d0a..a464d895898 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref.sty @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2011/03/18 v2.21 +%% Version: 2012/04/04 v2.24 %% -%% Copyright (C) 2006-2011 by +%% Copyright (C) 2006-2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -44,13 +44,13 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref} - [2011/03/18 v2.21 New reference scheme for LaTeX2e (HO)]% -\RequirePackage{zref-base}[2011/03/18] + [2012/04/04 v2.24 A new reference scheme for LaTeX (HO)]% +\RequirePackage{zref-base}[2012/04/04] \@ifundefined{ZREF@base@ok}{\endinput}{} \def\ZREF@temp#1{% \DeclareOption{#1}{% \AtEndOfPackage{% - \RequirePackage{zref-#1}[2011/03/18]% + \RequirePackage{zref-#1}[2012/04/04]% }% }% } |