diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/oberdiek')
87 files changed, 1756 insertions, 612 deletions
diff --git a/Master/texmf-dist/source/latex/oberdiek/accsupp.dtx b/Master/texmf-dist/source/latex/oberdiek/accsupp.dtx index fcd850e2b36..1917be4d139 100644 --- a/Master/texmf-dist/source/latex/oberdiek/accsupp.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/accsupp.dtx @@ -67,6 +67,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -131,7 +133,8 @@ and the derived files \file{accsupp-test1.tex}{\from{accsupp.dtx}{test1}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/aliascnt.dtx b/Master/texmf-dist/source/latex/oberdiek/aliascnt.dtx index 45be2ba1387..6e3d24c4bc5 100644 --- a/Master/texmf-dist/source/latex/oberdiek/aliascnt.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/aliascnt.dtx @@ -58,6 +58,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -111,7 +113,8 @@ and the derived files \file{aliascnt.sty}{\from{aliascnt.dtx}{package}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/alphalph.dtx b/Master/texmf-dist/source/latex/oberdiek/alphalph.dtx index ff0813fb1a6..5d0b834da79 100644 --- a/Master/texmf-dist/source/latex/oberdiek/alphalph.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/alphalph.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright (C) 1999, 2006-2008 by +% Copyright (C) 1999, 2006-2008, 2010 by % Heiko Oberdiek <heiko.oberdiek at googlemail.com> % % This work may be distributed and/or modified under the @@ -65,6 +65,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -76,7 +78,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: alphalph 2008/08/11 v2.1 Converting numbers to letters (HO)} +\Msg{* Package: alphalph 2010/03/01 v2.2 Converting numbers to letters (HO)} \Msg{************************************************************************} \keepsilent @@ -87,7 +89,7 @@ This is a generated file. -Copyright (C) 1999, 2006-2008 by +Copyright (C) 1999, 2006-2008, 2010 by Heiko Oberdiek <heiko.oberdiek at googlemail.com> This work may be distributed and/or modified under the @@ -126,7 +128,8 @@ and the derived files \file{alphalph-test3.tex}{\from{alphalph.dtx}{test2,noetex}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} @@ -153,10 +156,10 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{alphalph.drv}% - [2008/08/11 v2.1 Converting numbers to letters (HO)]% + [2010/03/01 v2.2 Converting numbers to letters (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2008/08/11] -\usepackage{alphalph}[2008/08/11] +\usepackage{alphalph}[2010/03/01] \makeatletter \newalphalph{\fnsymbolwrap}[wrap]{\@fnsymbol}{} \newcommand*{\fnsymbolsingle}[1]{% @@ -188,7 +191,7 @@ and the derived files %</driver> % \fi % -% \CheckSum{1139} +% \CheckSum{1140} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -209,7 +212,7 @@ and the derived files % \GetFileInfo{alphalph.drv} % % \title{The \xpackage{alphalph} package} -% \date{2008/08/11 v2.1} +% \date{2010/03/01 v2.2} % \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}} % % \maketitle @@ -629,7 +632,7 @@ and the derived files \fi \expandafter\x\csname ver@alphalph.sty\endcsname \ProvidesPackage{alphalph}% - [2008/08/11 v2.1 Converting numbers to letters (HO)] + [2010/03/01 v2.2 Converting numbers to letters (HO)] % \end{macrocode} % % \subsection{Catcodes} @@ -868,7 +871,7 @@ and the derived files % \end{macro} % \begin{macro}{\ifAlPh@Unavailable} % \begin{macrocode} -\newif\ifAlPh@Unavailable +\let\ifAlPh@Unavailable\iffalse \def\AlPh@Unavailabletrue{% \global\let\ifAlPh@Unavailable\iftrue } @@ -1377,7 +1380,7 @@ and the derived files } \DisableNumexpr %</noetex> -\usepackage{alphalph}[2008/08/11] +\usepackage{alphalph}[2010/03/01] %<noetex>\RestoreNumexpr \usepackage{qstest} \IncludeTests{*} @@ -1848,6 +1851,10 @@ and the derived files % URLs updated from \texttt{www.dejanews.com} % to \texttt{groups.google.com}. % \end{Version} +% \begin{Version}{2010/03/01 v2.2} +% \item +% Compatibility with \iniTeX. +% \end{Version} % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/source/latex/oberdiek/askinclude.dtx b/Master/texmf-dist/source/latex/oberdiek/askinclude.dtx index c11edee0049..ce249ccbbb6 100644 --- a/Master/texmf-dist/source/latex/oberdiek/askinclude.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/askinclude.dtx @@ -99,6 +99,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -194,7 +196,8 @@ and the derived files \file{askinclude-test24.tex}{\from{askinclude.dtx}{test0,test24}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/atbegshi.dtx b/Master/texmf-dist/source/latex/oberdiek/atbegshi.dtx index 7658b9ca33a..4c28abb9929 100644 --- a/Master/texmf-dist/source/latex/oberdiek/atbegshi.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/atbegshi.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright (C) 2007, 2008, 2009 by +% Copyright (C) 2007-2010 by % Heiko Oberdiek <heiko.oberdiek at googlemail.com> % % This work may be distributed and/or modified under the @@ -68,6 +68,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -79,7 +81,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: atbegshi 2009/12/02 v1.10 At begin shipout hook (HO)} +\Msg{* Package: atbegshi 2010/03/01 v1.11 At begin shipout hook (HO)} \Msg{************************************************************************} \keepsilent @@ -90,7 +92,7 @@ This is a generated file. -Copyright (C) 2007, 2008, 2009 by +Copyright (C) 2007-2010 by Heiko Oberdiek <heiko.oberdiek at googlemail.com> This work may be distributed and/or modified under the @@ -133,7 +135,8 @@ and the derived files \file{atbegshi-test3.tex}{\from{atbegshi.dtx}{test3}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} @@ -160,7 +163,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{atbegshi.drv}% - [2009/12/02 v1.10 At begin shipout hook (HO)]% + [2010/03/01 v1.11 At begin shipout hook (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2008/08/11] \begin{document} @@ -169,7 +172,7 @@ and the derived files %</driver> % \fi % -% \CheckSum{1416} +% \CheckSum{1430} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -190,7 +193,7 @@ and the derived files % \GetFileInfo{atbegshi.drv} % % \title{The \xpackage{atbegshi} package} -% \date{2009/12/02 v1.10} +% \date{2010/03/01 v1.11} % \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}} % % \maketitle @@ -866,7 +869,7 @@ The last page. \fi \expandafter\x\csname ver@atbegshi.sty\endcsname \ProvidesPackage{atbegshi}% - [2009/12/02 v1.10 At begin shipout hook (HO)] + [2010/03/01 v1.11 At begin shipout hook (HO)] % \end{macrocode} % % \subsection{Catcodes} @@ -913,8 +916,10 @@ The last page. \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname RequirePackage\endcsname\relax \input infwarerr.sty\relax + \input ltxcmds.sty\relax \else \RequirePackage{infwarerr}[2007/09/09]% + \RequirePackage{ltxcmds}[2010/03/01]% \fi % \end{macrocode} % @@ -924,12 +929,12 @@ The last page. \expandafter\ifx\csname @ifdefinable\endcsname\relax \def\AtBegShi@CheckDefinable#1{% \ifcase\ifx#1\relax - \@ne + \ltx@one \else \ifx#1\@undefined - \@ne + \ltx@one \else - \z@ + \ltx@zero \fi \fi \errmessage{% @@ -948,13 +953,13 @@ The last page. % \end{macro} % % \begin{macrocode} -\newif\ifAtBegShi@Discarded +\ltx@newif\ifAtBegShi@Discarded % \end{macrocode} % \begin{macro}{\AtBeginShipoutDiscard} % \begin{macrocode} \AtBegShi@CheckDefinable\AtBeginShipoutDiscard \def\AtBeginShipoutDiscard{% - \deadcycles=\z@ + \deadcycles=\ltx@zero \global\AtBegShi@Discardedtrue } % \end{macrocode} @@ -988,7 +993,7 @@ X \global % \begin{macro}{\AtBegShi@Test} % \begin{macrocode} \def\AtBegShi@Test{% -X \ifdim\lastkern=\z@ +X \ifdim\lastkern=0pt % E \ifnum\AtBegShi@GroupLevel<\currentgrouplevel \expandafter\aftergroup \fi @@ -1040,19 +1045,19 @@ X \endgroup \def\@empty{}% \ifx\AtBegShi@HookFirst\@empty \else - \setbox\z@=\vbox{% + \setbox\ltx@zero=\vbox{% \begingroup \AtBegShi@HookFirst \endgroup }% - \wd\z@=\z@ - \ht\z@=\z@ - \dp\z@=\z@ + \wd\ltx@zero=0pt % + \ht\ltx@zero=0pt % + \dp\ltx@zero=0pt % \global\setbox\AtBeginShipoutBox=\vbox{% - \baselineskip\z@skip - \lineskip\z@skip - \lineskiplimit\z@ - \copy\z@ + \baselineskip 0pt\relax + \lineskip 0pt\relax + \lineskiplimit 0pt\relax + \copy\ltx@zero \copy\AtBeginShipoutBox }% \fi @@ -1119,8 +1124,8 @@ X \endgroup \expandafter\ifx\csname g@addto@macro\endcsname\relax \long\def\AtBegShi@AddTo#1#2{% \begingroup - \toks\z@\expandafter{#1#2}% - \xdef#1{\the\toks\z@}% + \toks\ltx@zero\expandafter{#1#2}% + \xdef#1{\the\toks\ltx@zero}% \endgroup }% \else @@ -1159,10 +1164,17 @@ X \endgroup % \begin{macrocode} \AtBegShi@CheckDefinable\AtBeginShipoutInit \def\AtBeginShipoutInit{% - \csname newbox\endcsname\AtBeginShipoutBox - \AtBegShi@CheckDefinable\AtBeginShipoutOriginalShipout - \global\let\AtBeginShipoutOriginalShipout\shipout - \global\let\shipout\AtBegShi@Shipout + \ltx@IfUndefined{newbox}{% + \@PackageError{atbegshi}{% + \string\AtBeginShipoutInit\space failed\MessageBreak + because of missing \expandafter\string\csname newbox\endcsname + }\@ehc + }{% + \csname newbox\endcsname\AtBeginShipoutBox + \AtBegShi@CheckDefinable\AtBeginShipoutOriginalShipout + \global\let\AtBeginShipoutOriginalShipout\shipout + \global\let\shipout\AtBegShi@Shipout + }% \gdef\AtBeginShipoutInit{}% } % \end{macrocode} @@ -1227,16 +1239,16 @@ X \endgroup \else \endgroup \def\AtBegShi@BeginPicture{% - \setbox0=\hbox\bgroup + \setbox\ltx@zero=\hbox\bgroup \begingroup \ignorespaces }% \def\AtBegShi@EndPicture{% \endgroup \egroup - \ht0=0pt\relax - \dp0=0pt\relax - \copy0 % + \ht\ltx@zero=0pt\relax + \dp\ltx@zero=0pt\relax + \copy\ltx@zero }% \fi % \end{macrocode} @@ -1362,9 +1374,9 @@ X \endgroup \CROP@@ship }% \def\CROP@shiplist{% - \lineskip\z@ - \lineskiplimit\z@ - \baselineskip\z@ + \lineskip 0pt\relax + \lineskiplimit 0pt\relax + \baselineskip 0pt\relax \CROP@kernel \box\AtBeginShipoutBox }% @@ -1452,7 +1464,7 @@ X \endgroup \def\AtBegShi@Everyshi@Output{% \ifvoid\AtBeginShipoutBox \else - \global\setbox\@cclv\box\AtBeginShipoutBox + \global\setbox\ltx@cclv\box\AtBeginShipoutBox \expandafter\@EveryShipout@Output \fi }% @@ -1504,12 +1516,12 @@ X \endgroup }% \ifx\AtBegShi@Memoir@shipi\mem@shipi \ifcase\ifx\AtBegShi@Memoir@shipiiA\mem@shipii - \z@ + \ltx@zero \else \ifx\AtBegShi@Memoir@shipiiB\mem@shipii - \z@ + \ltx@zero \else - \@ne + \ltx@one \fi \fi \let\AtBegShi@found\relax @@ -1670,7 +1682,7 @@ X \endgroup %<*test2> \input atbegshi.sty\relax \def\msg#{\immediate\write16} -\msg{File: atbegshi-test2.tex 2009/12/02 v1.10 Test file for plain-TeX} +\msg{File: atbegshi-test2.tex 2010/03/01 v1.11 Test file for plain-TeX} \def\testmsg#1#2{% \msg{}% \msg{*** Test with box (#1), expected page output [#2]}% hash-ok @@ -1767,7 +1779,7 @@ Hello World % \begin{macrocode} %<*test3> \NeedsTeXFormat{LaTeX2e} -\ProvidesFile{atbegshi-test3.tex}[2009/12/02 v1.10 Test file for LaTeX] +\ProvidesFile{atbegshi-test3.tex}[2010/03/01 v1.11 Test file for LaTeX] \RequirePackage{color} \pagecolor{yellow} \documentclass[a5paper,showtrims]{memoir} @@ -2068,6 +2080,10 @@ Hello World % \item % Test file fixed. % \end{Version} +% \begin{Version}{2010/03/01 v1.11} +% \item +% Compatibility with \iniTeX\ except for \cs{newbox}. +% \end{Version} % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/source/latex/oberdiek/atenddvi.dtx b/Master/texmf-dist/source/latex/oberdiek/atenddvi.dtx index 7fc798aafcd..51c38765b91 100644 --- a/Master/texmf-dist/source/latex/oberdiek/atenddvi.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/atenddvi.dtx @@ -58,6 +58,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -111,7 +113,8 @@ and the derived files \file{atenddvi.sty}{\from{atenddvi.dtx}{package}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/attachfile2.dtx b/Master/texmf-dist/source/latex/oberdiek/attachfile2.dtx index 7bfe771de16..82632957b4f 100644 --- a/Master/texmf-dist/source/latex/oberdiek/attachfile2.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/attachfile2.dtx @@ -62,6 +62,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -123,7 +125,8 @@ and the derived files \file{pdfatfi.pl}{\from{attachfile2.dtx}{pdfatfi}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/atveryend.dtx b/Master/texmf-dist/source/latex/oberdiek/atveryend.dtx index d6d0af8e1aa..e34b63c86a1 100644 --- a/Master/texmf-dist/source/latex/oberdiek/atveryend.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/atveryend.dtx @@ -60,6 +60,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -116,7 +118,8 @@ and the derived files \file{atveryend-test1.tex}{\from{atveryend.dtx}{test1}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/auxhook.dtx b/Master/texmf-dist/source/latex/oberdiek/auxhook.dtx index 4fd2c5b5c16..b5dadd8973d 100644 --- a/Master/texmf-dist/source/latex/oberdiek/auxhook.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/auxhook.dtx @@ -58,6 +58,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -111,7 +113,8 @@ and the derived files \file{auxhook.sty}{\from{auxhook.dtx}{package}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/bigintcalc.dtx b/Master/texmf-dist/source/latex/oberdiek/bigintcalc.dtx index cadb4e37e4f..c7b88da869b 100644 --- a/Master/texmf-dist/source/latex/oberdiek/bigintcalc.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/bigintcalc.dtx @@ -66,6 +66,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -128,7 +130,8 @@ and the derived files \file{bigintcalc-test3.tex}{\from{bigintcalc.dtx}{test2,noetex}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/bitset.dtx b/Master/texmf-dist/source/latex/oberdiek/bitset.dtx index 0d68ad7e8a2..4ff1f5e73f4 100644 --- a/Master/texmf-dist/source/latex/oberdiek/bitset.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/bitset.dtx @@ -65,6 +65,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -126,7 +128,8 @@ and the derived files \file{bitset-test3.tex}{\from{bitset.dtx}{test2,noetex}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/bmpsize.dtx b/Master/texmf-dist/source/latex/oberdiek/bmpsize.dtx index d48548a0d79..b01ba1d224b 100644 --- a/Master/texmf-dist/source/latex/oberdiek/bmpsize.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/bmpsize.dtx @@ -65,6 +65,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -125,7 +127,8 @@ and the derived files \file{bmpsize-dvipdfmx.def}{\from{bmpsize.dtx}{dvipdfmx}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/bookmark.dtx b/Master/texmf-dist/source/latex/oberdiek/bookmark.dtx index 587de51e37d..99b1ec81951 100644 --- a/Master/texmf-dist/source/latex/oberdiek/bookmark.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/bookmark.dtx @@ -68,6 +68,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -132,7 +134,8 @@ and the derived files \file{bookmark-example.tex}{\from{bookmark.dtx}{example}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/catchfile.dtx b/Master/texmf-dist/source/latex/oberdiek/catchfile.dtx index e40665308b6..226a9ffbafa 100644 --- a/Master/texmf-dist/source/latex/oberdiek/catchfile.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/catchfile.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright (C) 2007 by +% Copyright (C) 2007, 2010 by % Heiko Oberdiek <heiko.oberdiek at googlemail.com> % % This work may be distributed and/or modified under the @@ -66,6 +66,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -77,7 +79,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: catchfile 2007/11/11 v1.2 Catches the contents of a file (HO)} +\Msg{* Package: catchfile 2010/03/01 v1.3 Catches the contents of a file (HO)} \Msg{************************************************************************} \keepsilent @@ -88,7 +90,7 @@ This is a generated file. -Copyright (C) 2007 by +Copyright (C) 2007, 2010 by Heiko Oberdiek <heiko.oberdiek at googlemail.com> This work may be distributed and/or modified under the @@ -128,7 +130,8 @@ and the derived files \file{catchfile-test3.tex}{\from{catchfile.dtx}{test3}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} @@ -155,7 +158,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{catchfile.drv}% - [2007/11/11 v1.2 Catches the contents of a file (HO)]% + [2010/03/01 v1.3 Catches the contents of a file (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2008/08/11] \begin{document} @@ -185,7 +188,7 @@ and the derived files % \GetFileInfo{catchfile.drv} % % \title{The \xpackage{catchfile} package} -% \date{2007/11/11 v1.2} +% \date{2010/03/01 v1.3} % \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}} % % \maketitle @@ -288,7 +291,7 @@ and the derived files \fi \expandafter\x\csname ver@catchfile.sty\endcsname \ProvidesPackage{catchfile}% - [2007/11/11 v1.2 Catches the contents of a file (HO)] + [2010/03/01 v1.3 Catches the contents of a file (HO)] % \end{macrocode} % % \subsection{Catcodes} @@ -345,7 +348,7 @@ and the derived files \edef\TestMeaning{\meaning\everyeof}% \ifx\TestString\TestMeaning \else - \@PackageErrorNoLine{catchfile}{% + \@PackageError{catchfile}{% Cannot find e-TeX's \string\everyeof,\MessageBreak package loading is aborted% }\@ehd @@ -384,7 +387,7 @@ and the derived files \Check\input\input{}% \Check\input\@@input{}% \Check\pdfprimitive\pdfprimitive\input - \@PackageErrorNoLine{% + \@PackageError{% Cannot find primitive \string\input,\MessageBreak package loading is aborted% }\@ehd @@ -621,7 +624,7 @@ and the derived files \nofiles \listfiles \documentclass{minimal} -\usepackage{catchfile}[2007/11/11] +\usepackage{catchfile}[2010/03/01] \makeatletter \def\mysetup{% \let\do\@makeother @@ -870,6 +873,10 @@ and the derived files % \item % Use of package \xpackage{pdftexcmds} for \LuaTeX\ support. % \end{Version} +% \begin{Version}{2010/03/01 v1.3} +% \item +% Fix for unknown \cs{@PackageErrorNoLine}. +% \end{Version} % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/source/latex/oberdiek/centernot.dtx b/Master/texmf-dist/source/latex/oberdiek/centernot.dtx index 5abb5e3c39e..d6f4c9a22d5 100644 --- a/Master/texmf-dist/source/latex/oberdiek/centernot.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/centernot.dtx @@ -58,6 +58,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -111,7 +113,8 @@ and the derived files \file{centernot.sty}{\from{centernot.dtx}{package}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/chemarr.dtx b/Master/texmf-dist/source/latex/oberdiek/chemarr.dtx index cda5dce30bc..7dd8d3cb433 100644 --- a/Master/texmf-dist/source/latex/oberdiek/chemarr.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/chemarr.dtx @@ -60,6 +60,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -116,7 +118,8 @@ and the derived files \file{chemarr-example.tex}{\from{chemarr.dtx}{example}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/classlist.dtx b/Master/texmf-dist/source/latex/oberdiek/classlist.dtx index 079f9b67a2f..77739236664 100644 --- a/Master/texmf-dist/source/latex/oberdiek/classlist.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/classlist.dtx @@ -58,6 +58,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -111,7 +113,8 @@ and the derived files \file{classlist.sty}{\from{classlist.dtx}{package}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/colonequals.dtx b/Master/texmf-dist/source/latex/oberdiek/colonequals.dtx index 7289e32b759..0f10b2d7460 100644 --- a/Master/texmf-dist/source/latex/oberdiek/colonequals.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/colonequals.dtx @@ -58,6 +58,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -111,7 +113,8 @@ and the derived files \file{colonequals.sty}{\from{colonequals.dtx}{package}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/dvipscol.dtx b/Master/texmf-dist/source/latex/oberdiek/dvipscol.dtx index 4b06c37944f..d55292fce73 100644 --- a/Master/texmf-dist/source/latex/oberdiek/dvipscol.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/dvipscol.dtx @@ -58,6 +58,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -111,7 +113,8 @@ and the derived files \file{dvipscol.sty}{\from{dvipscol.dtx}{package}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/embedfile.dtx b/Master/texmf-dist/source/latex/oberdiek/embedfile.dtx index cc6abf32fc3..ad862f3df98 100644 --- a/Master/texmf-dist/source/latex/oberdiek/embedfile.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/embedfile.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright (C) 2006-2009 by +% Copyright (C) 2006-2010 by % Heiko Oberdiek <heiko.oberdiek at googlemail.com> % % This work may be distributed and/or modified under the @@ -17,12 +17,17 @@ % % This Current Maintainer of this work is Heiko Oberdiek. % +% The Base Interpreter refers to any `TeX-Format', +% because some files are installed in TDS:tex/generic//. +% % This work consists of the main source file embedfile.dtx % and the derived files % embedfile.sty, embedfile.pdf, embedfile.ins, embedfile.drv, -% dtx-attach.sty, embedfile-example-plain.tex, +% \usedir{tex/latex/oberdiek}, dtx-attach.sty, +% embedfile-example-plain.tex, % embedfile-example-collection.tex, embedfile-test1.tex, -% embedfile-test2.tex, embedfile-test3.tex. +% embedfile-test2.tex, embedfile-test3.tex, +% embedfile-test4.tex. % % Distribution: % CTAN:macros/latex/contrib/oberdiek/embedfile.dtx @@ -55,18 +60,21 @@ % pdflatex embedfile.dtx % % Installation: -% TDS:tex/latex/oberdiek/embedfile.sty -% TDS:tex/latex/oberdiek/dtx-attach.sty +% TDS:tex/generic/oberdiek/embedfile.sty +% TDS:tex/generic/oberdiek/dtx-attach.sty % TDS:doc/latex/oberdiek/embedfile.pdf % TDS:doc/latex/oberdiek/embedfile-example-plain.tex % TDS:doc/latex/oberdiek/embedfile-example-collection.tex % TDS:doc/latex/oberdiek/test/embedfile-test1.tex % TDS:doc/latex/oberdiek/test/embedfile-test2.tex % TDS:doc/latex/oberdiek/test/embedfile-test3.tex +% TDS:doc/latex/oberdiek/test/embedfile-test4.tex % TDS:source/latex/oberdiek/embedfile.dtx % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -78,7 +86,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: embedfile 2009/09/25 v2.4 embed files into PDF (HO)} +\Msg{* Package: embedfile 2010/03/01 v2.5 embed files into PDF (HO)} \Msg{************************************************************************} \keepsilent @@ -89,7 +97,7 @@ This is a generated file. -Copyright (C) 2006-2009 by +Copyright (C) 2006-2010 by Heiko Oberdiek <heiko.oberdiek at googlemail.com> This work may be distributed and/or modified under the @@ -106,12 +114,17 @@ 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 embedfile.dtx and the derived files embedfile.sty, embedfile.pdf, embedfile.ins, embedfile.drv, - dtx-attach.sty, embedfile-example-plain.tex, + \usedir{tex/latex/oberdiek}, dtx-attach.sty, + embedfile-example-plain.tex, embedfile-example-collection.tex, embedfile-test1.tex, - embedfile-test2.tex, embedfile-test3.tex. + embedfile-test2.tex, embedfile-test3.tex, + embedfile-test4.tex. \endpreamble \let\MetaPrefix\DoubleperCent @@ -119,8 +132,9 @@ and the derived files \generate{% \file{embedfile.ins}{\from{embedfile.dtx}{install}}% \file{embedfile.drv}{\from{embedfile.dtx}{driver}}% - \usedir{tex/latex/oberdiek}% + \usedir{tex/generic/oberdiek}% \file{embedfile.sty}{\from{embedfile.dtx}{package}}% + \usedir{tex/latex/oberdiek}% \file{dtx-attach.sty}{\from{embedfile.dtx}{dtxattach}}% \usedir{doc/latex/oberdiek}% \file{embedfile-example-plain.tex}{\from{embedfile.dtx}{exampleplain}}% @@ -129,9 +143,11 @@ and the derived files \file{embedfile-test1.tex}{\from{embedfile.dtx}{test1}}% \file{embedfile-test2.tex}{\from{embedfile.dtx}{test2}}% \file{embedfile-test3.tex}{\from{embedfile.dtx}{test3}}% + \file{embedfile-test4.tex}{\from{embedfile.dtx}{test4}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} @@ -158,7 +174,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{embedfile.drv}% - [2009/09/25 v2.4 embed files into PDF (HO)]% + [2010/03/01 v2.5 embed files into PDF (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2008/08/11] \begin{document} @@ -167,7 +183,7 @@ and the derived files %</driver> % \fi % -% \CheckSum{1418} +% \CheckSum{1292} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -188,7 +204,7 @@ and the derived files % \GetFileInfo{embedfile.drv} % % \title{The \xpackage{embedfile} package} -% \date{2009/09/25 v2.4} +% \date{2010/03/01 v2.5} % \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}} % % \maketitle @@ -542,7 +558,7 @@ This example document contains three embedded files. \usepackage[bookmarks=false]{hyperref} % provides \pdfstringdef that is then used by `title' and % other keys. -\usepackage{embedfile}[2009/09/25] +\usepackage{embedfile}[2010/03/01] \embedfilesetup{ view=details, initialfile=embedfile.pdf @@ -610,8 +626,8 @@ You need Acrobat Reader 8 or higher. %<*dtxattach> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{dtx-attach} - [2009/09/25 v2.4 Embed \string\jobname.dtx (HO)]% -\RequirePackage{embedfile}[2009/09/25] + [2010/03/01 v2.5 Embed \string\jobname.dtx (HO)]% +\RequirePackage{embedfile}[2010/03/01] \embedfile[% stringmethod=escape,% mimetype=plain/text,% @@ -695,7 +711,7 @@ You need Acrobat Reader 8 or higher. \fi \expandafter\x\csname ver@embedfile.sty\endcsname \ProvidesPackage{embedfile}% - [2009/09/25 v2.4 embed files into PDF (HO)] + [2010/03/01 v2.5 embed files into PDF (HO)] % \end{macrocode} % % \subsection{Catcodes} @@ -782,7 +798,9 @@ You need Acrobat Reader 8 or higher. % \end{macrocode} % \begin{macrocode} \EmFi@RequirePackage{pdftexcmds}[2007/11/11] -\EmFi@RequirePackage{ltxcmds}[2009/08/05] +\EmFi@RequirePackage{ltxcmds}[2010/03/01] +\EmFi@RequirePackage{kvsetkeys}[2010/03/01] +\EmFi@RequirePackage{kvdefinekeys}[2010/03/01] % \end{macrocode} % Check version. % \begin{macrocode} @@ -891,139 +909,42 @@ You need Acrobat Reader 8 or higher. % % \begin{macro}{\ifEmFi@collection} % \begin{macrocode} -\newif\ifEmFi@collection +\ltx@newif\ifEmFi@collection % \end{macrocode} % \end{macro} % \begin{macro}{\ifEmFi@sort} % \begin{macrocode} -\newif\ifEmFi@sort +\ltx@newif\ifEmFi@sort % \end{macrocode} % \end{macro} % \begin{macro}{\ifEmFi@visible} % \begin{macrocode} -\newif\ifEmFi@visible +\ltx@newif\ifEmFi@visible % \end{macrocode} % \end{macro} % \begin{macro}{\ifEmFi@edit} % \begin{macrocode} -\newif\ifEmFi@edit +\ltx@newif\ifEmFi@edit % \end{macrocode} % \end{macro} % \begin{macro}{\ifEmFi@item} % \begin{macrocode} -\newif\ifEmFi@item +\ltx@newif\ifEmFi@item % \end{macrocode} % \end{macro} % \begin{macro}{\ifEmFi@finished} % \begin{macrocode} -\newif\ifEmFi@finished +\ltx@newif\ifEmFi@finished % \end{macrocode} % \end{macro} % \begin{macro}{\ifEmFi@id} % \begin{macrocode} -\newif\ifEmFi@id +\ltx@newif\ifEmFi@id % \end{macrocode} % \end{macro} % % \subsection{Key value definitions} % -% \begin{macrocode} -\expandafter\ifx\csname define@key\endcsname\relax - \chardef\EmFi@plain=\z@ - \def\EmFi@temp#1{% - \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname#1\endcsname\relax - \chardef\EmFi@plain=\@ne - \fi - }% - \EmFi@temp{NeedsTeXFormat}% - \EmFi@temp{ProvidesPackage}% - \EmFi@temp{DeclareOption}% - \EmFi@temp{ExecuteOptions}% - \EmFi@temp{ProcessOptions}% - \ifnum\EmFi@plain=\@ne - \def\EmFi@temp#1{% - \expandafter\let\csname EmFi@Org#1\expandafter\endcsname - \csname#1\endcsname - \expandafter\def\csname#1\endcsname - }% - \EmFi@temp{NeedsTeXFormat}#1{}% - \EmFi@temp{ProvidesPackage}#1[#2]{}% hash-ok - \EmFi@temp{DeclareOption}#1{}% - \EmFi@temp{ExecuteOptions}#1{}% - \EmFi@temp{ProcessOptions}{}% -% \end{macrocode} -% \begin{macro}{\KV@errx} -% \LaTeX's option processing is not available with -% \plainTeX. Thus we define the default error -% command \cs{KV@errx} here, also using package -% \xpackage{infwarerr}'s \cs{@PackageError}. -% \begin{macrocode} - \def\KV@errx#1{% - \@PackageError{keyval}{#1}\@ehc - }% -% \end{macrocode} -% \end{macro} -% Other macros from \LaTeX's kernel that are used by -% package \xpackage{keyval}. -% \begin{macro}{\@ifnextchar} -% \begin{macrocode} - \expandafter\ifx\csname @ifnextchar\endcsname\relax - \def\@ifnextchar#1#2#3{% - \let\reserved@d=#1% - \def\reserved@a{#2}% - \def\reserved@b{#3}% - \futurelet\@let@token\@ifnch - }% - \def\@ifnch{% - \ifx\@let@token\@sptoken - \let\reserved@c\@xifnch - \else - \ifx\@let@token\reserved@d - \let\reserved@c\reserved@a - \else - \let\reserved@c\reserved@b - \fi - \fi - \reserved@c - }% - \begingroup - \def\:{\global\let\@sptoken= }% - \: % this makes \@sptoken a space token - \def\:{\@xifnch}% - \expandafter\gdef\: {% - \futurelet\@let@token\@ifnch - }% - \endgroup - \fi -% \end{macrocode} -% \end{macro} -% \begin{macro}{\@namedef} -% \begin{macrocode} - \expandafter\ifx\csname @namedef\endcsname\relax - \def\@namedef#1{% - \expandafter\def\csname#1\endcsname - }% - \fi -% \end{macrocode} -% \end{macro} -% \begin{macrocode} - \fi - \EmFi@RequirePackage{keyval}[1999/03/16]% - \ifnum\EmFi@plain=\@ne - \def\EmFi@temp#1{% - \expandafter\let\csname#1\expandafter\endcsname - \csname EmFi@Org#1\endcsname - }% - \EmFi@temp{NeedsTeXFormat}% - \EmFi@temp{ProvidesPackage}% - \EmFi@temp{DeclareOption}% - \EmFi@temp{ExecuteOptions}% - \EmFi@temp{ProcessOptions}% - \fi -\fi -% \end{macrocode} -% % \begin{macro}{\EmFi@GlobalKey} % \begin{macrocode} \def\EmFi@GlobalKey#1#2{% @@ -1046,7 +967,7 @@ You need Acrobat Reader 8 or higher. % \begin{macro}{\EmFi@DefineKey} % \begin{macrocode} \def\EmFi@DefineKey#1#2{% - \define@key{EmFi}{#1}{% + \kv@define@key{EmFi}{#1}{% \expandafter\def\csname EmFi@#1\endcsname{##1}% }% \expandafter\def\csname EmFi@#1\endcsname{#2}% @@ -1090,7 +1011,7 @@ You need Acrobat Reader 8 or higher. % % Option \xoption{id} as key for object numbers. % \begin{macrocode} -\define@key{EmFi}{id}{% +\kv@define@key{EmFi}{id}{% \def\EmFi@id{#1}% \EmFi@idtrue } @@ -1100,7 +1021,7 @@ You need Acrobat Reader 8 or higher. \def\EmFi@defobj#1{% \ifEmFi@id \expandafter\xdef\csname EmFi@#1@\EmFi@id\endcsname{% - \the\pdflastobj\space 0 R% + \the\pdflastobj\ltx@space 0 R% }% \fi } @@ -1131,7 +1052,7 @@ You need Acrobat Reader 8 or higher. % % Initial view of the collection. % \begin{macrocode} -\define@key{EmFi}{view}[]{% +\kv@define@key{EmFi}{view}[]{% \EdefSanitize\EmFi@temp{#1}% \def\EmFi@next{% \global\EmFi@collectiontrue @@ -1164,13 +1085,13 @@ You need Acrobat Reader 8 or higher. \ifEmFi@finished \def\EmFi@next##1{}% \EmFi@Error{% - \string\embedfilefield\space after \string\embedfilefinish + \string\embedfilefield\ltx@space after \string\embedfilefinish }{% The list of embedded files is already written.% }% \else \def\EmFi@next{% - \setkeys{EmFi}% + \kvsetkeys{EmFi}% }% \fi \EmFi@next @@ -1208,7 +1129,7 @@ You need Acrobat Reader 8 or higher. \def\embedfilefield#1#2{% \ifEmFi@finished \EmFi@Error{% - \string\embedfilefield\space after \string\embedfilefinish + \string\embedfilefield\ltx@space after \string\embedfilefinish }{% The list of embedded files is already written.% }% @@ -1224,7 +1145,7 @@ You need Acrobat Reader 8 or higher. \let\EmFi@type\EmFi@S@text \EmFi@visibletrue \EmFi@editfalse - \setkeys{EmFiFi}{#2}% + \kvsetkeys{EmFiFi}{#2}% \EmFi@convert\EmFi@title\EmFi@title \xdef\EmFi@schema{% \EmFi@schema @@ -1256,7 +1177,7 @@ You need Acrobat Reader 8 or higher. \do{\EmFi@key}% }% \ifx\EmFi@type\EmFi@S@text - \define@key{EmFi}{\EmFi@key.value}{% + \kv@define@key{EmFi}{\EmFi@key.value}{% \EmFi@itemtrue \def\EmFi@temp{##1}% \EmFi@convert\EmFi@temp\EmFi@temp @@ -1267,7 +1188,7 @@ You need Acrobat Reader 8 or higher. }% \EmFi@GlobalKey{EmFi}{\EmFi@key.value}% \else\ifx\EmFi@type\EmFi@S@date - \define@key{EmFi}{\EmFi@key.value}{% + \kv@define@key{EmFi}{\EmFi@key.value}{% \EmFi@itemtrue \def\EmFi@temp{##1}% \EmFi@convert\EmFi@temp\EmFi@temp @@ -1278,18 +1199,18 @@ You need Acrobat Reader 8 or higher. }% \EmFi@GlobalKey{EmFi}{\EmFi@key.value}% \else\ifx\EmFi@type\EmFi@S@number - \define@key{EmFi}{\EmFi@key.value}{% + \kv@define@key{EmFi}{\EmFi@key.value}{% \EmFi@itemtrue \expandafter\EdefSanitize\csname EmFi@V@#1\endcsname{ ##1}% }% \EmFi@GlobalKey{EmFi}{\EmFi@key.value}% \fi\fi\fi - \define@key{EmFi}{\EmFi@key.prefix}{% + \kv@define@key{EmFi}{\EmFi@key.prefix}{% \EmFi@itemtrue \expandafter\def\csname EmFi@P@#1\endcsname{##1}% }% \EmFi@GlobalKey{EmFi}{\EmFi@key.prefix}% - \define@key{EmFiSo}{\EmFi@key}[ascending]{% + \kv@define@key{EmFiSo}{\EmFi@key}[ascending]{% \EdefSanitize\EmFi@temp{##1}% \ifx\EmFi@temp\EmFi@S@ascending \def\EmFi@temp{true}% @@ -1315,7 +1236,7 @@ You need Acrobat Reader 8 or higher. \else \xdef\EmFi@sortorders{% \EmFi@sortorders - \space + \ltx@space \EmFi@temp }% \xdef\EmFi@sortcase{2}% @@ -1334,7 +1255,7 @@ You need Acrobat Reader 8 or higher. % \end{macrocode} % \end{macro} % \begin{macrocode} -\define@key{EmFiFi}{type}{% +\kv@define@key{EmFiFi}{type}{% \EdefSanitize\EmFi@temp{#1}% \ifx\EmFi@temp\EmFi@S@text \let\EmFi@type\EmFi@temp @@ -1362,7 +1283,7 @@ You need Acrobat Reader 8 or higher. } % \end{macrocode} % \begin{macrocode} -\define@key{EmFiFi}{title}{% +\kv@define@key{EmFiFi}{title}{% \def\EmFi@title{#1}% } % \end{macrocode} @@ -1386,12 +1307,12 @@ You need Acrobat Reader 8 or higher. % \end{macrocode} % \end{macro} % \begin{macrocode} -\define@key{EmFiFi}{visible}[true]{% +\kv@define@key{EmFiFi}{visible}[true]{% \EmFi@setboolean{visible}{#1}% } % \end{macrocode} % \begin{macrocode} -\define@key{EmFiFi}{edit}[true]{% +\kv@define@key{EmFiFi}{edit}[true]{% \EmFi@setboolean{edit}{#1}% } % \end{macrocode} @@ -1409,7 +1330,7 @@ You need Acrobat Reader 8 or higher. % \begin{macro}{\embedfilesort} % \begin{macrocode} \def\embedfilesort{% - \setkeys{EmFiSo}% + \kvsetkeys{EmFiSo}% } % \end{macrocode} % \end{macro} @@ -1419,7 +1340,7 @@ You need Acrobat Reader 8 or higher. % \begin{macro}{\embedfile} % \begin{macrocode} \def\embedfile{% - \@ifnextchar[\EmFi@embedfile{\EmFi@embedfile[]}% + \ltx@ifnextchar[\EmFi@embedfile{\EmFi@embedfile[]}% } % \end{macrocode} % \end{macro} @@ -1428,14 +1349,14 @@ You need Acrobat Reader 8 or higher. \def\EmFi@embedfile[#1]#2{% \ifEmFi@finished \EmFi@Error{% - \string\embedfile\space after \string\embedfilefinish + \string\embedfile\ltx@space after \string\embedfilefinish }{% The list of embedded files is already written.% }% \else \begingroup \def\EmFi@file{#2}% - \setkeys{EmFi}{#1}% + \kvsetkeys{EmFi}{#1}% \expandafter\expandafter\expandafter \ifx\expandafter\expandafter\expandafter \\\pdf@filesize{\EmFi@file}\\% @@ -1497,17 +1418,17 @@ You need Acrobat Reader 8 or higher. /Desc(\EmFi@@desc)% \fi /EF<<% - /F \the\pdflastobj\space 0 R% + /F \the\pdflastobj\ltx@space 0 R% >>% \ifEmFi@item - /CI \EmFi@ci\space 0 R% + /CI \EmFi@ci\ltx@space 0 R% \fi >>% }% \EmFi@defobj{Filespec}% \EmFi@add{% \EmFi@@filespec - }{\the\pdflastobj\space 0 R}% + }{\the\pdflastobj\ltx@space 0 R}% \fi \endgroup \fi @@ -1617,7 +1538,7 @@ You need Acrobat Reader 8 or higher. >>% }% \pdfnames{% - /EmbeddedFiles \the\pdflastobj\space 0 R% + /EmbeddedFiles \the\pdflastobj\ltx@space 0 R% }% \endgroup % \end{macrocode} @@ -1699,7 +1620,7 @@ You need Acrobat Reader 8 or higher. >>% }% \pdfcatalog{% - /Collection \the\pdflastobj\space0 R% + /Collection \the\pdflastobj\ltx@space0 R% }% \fi \fi @@ -1843,7 +1764,7 @@ Test (plain-\TeX): {\tt embedfile.dtx} should be embedded.% \NeedsTeXFormat{LaTeX2e} \let\SavedJobname\jobname \def\jobname{embedfile} -\RequirePackage{dtx-attach}[2009/09/25] +\RequirePackage{dtx-attach}[2010/03/01] \let\jobname\SavedJobname \documentclass{minimal} \begin{document} @@ -1852,6 +1773,36 @@ Test (plain-\TeX): {\tt embedfile.dtx} should be embedded.% %</test3> % \end{macrocode} % +% \subsection{Test for \iniTeX} +% +% \begin{macrocode} +%<*test4> +\catcode`\{=1 % +\catcode`\}=2 % +\input ifluatex.sty % +\ifluatex + \directlua{% + tex.enableprimitives('', {% + 'pdflastobj',% + 'pdfnames',% + 'pdfobj',% + 'pdfoutput'% + })% + }% +\fi +\pdfoutput=1 % +\input embedfile.sty % +\shipout\hbox{} +\embedfile[% + stringmethod=escape,% + mimetype=plain/text,% + desc={iniTeX source},% +]{\jobname.tex} +\embedfilefinish +\end +%</test4> +% \end{macrocode} +% % \section{Installation} % % \subsection{Download} @@ -1911,14 +1862,15 @@ Test (plain-\TeX): {\tt embedfile.dtx} should be embedded.% % \begin{quote} % \def\t{^^A % \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}} -% embedfile.sty & tex/latex/oberdiek/embedfile.sty\\ -% dtx-attach.sty & tex/latex/oberdiek/dtx-attach.sty\\ +% embedfile.sty & tex/generic/oberdiek/embedfile.sty\\ +% dtx-attach.sty & tex/generic/oberdiek/dtx-attach.sty\\ % embedfile.pdf & doc/latex/oberdiek/embedfile.pdf\\ % embedfile-example-plain.tex & doc/latex/oberdiek/embedfile-example-plain.tex\\ % embedfile-example-collection.tex & doc/latex/oberdiek/embedfile-example-collection.tex\\ % test/embedfile-test1.tex & doc/latex/oberdiek/test/embedfile-test1.tex\\ % test/embedfile-test2.tex & doc/latex/oberdiek/test/embedfile-test2.tex\\ % test/embedfile-test3.tex & doc/latex/oberdiek/test/embedfile-test3.tex\\ +% test/embedfile-test4.tex & doc/latex/oberdiek/test/embedfile-test4.tex\\ % embedfile.dtx & source/latex/oberdiek/embedfile.dtx\\ % \end{tabular}^^A % }^^A @@ -2114,6 +2066,16 @@ Test (plain-\TeX): {\tt embedfile.dtx} should be embedded.% % New option \xoption{ucfilespec} for file name support in Unicode % (since PDF 1.7). % \end{Version} +% \begin{Version}{2010/03/01 v2.5} +% \item +% Compatibility for \iniTeX. +% \item +% Package \xpackage{keyval} replaced by packages \xpackage{kvsetkeys} +% and \xpackage{kvdefinekeys} because of compatibility for \iniTeX. +% \item +% TDS location moved from TDS:tex/latex/oberdiek/embedfile.sty to +% TDS:tex/generic/oberdiek/embedfile.sty. +% \end{Version} % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/source/latex/oberdiek/engord.dtx b/Master/texmf-dist/source/latex/oberdiek/engord.dtx index 130b9123912..9ebf0a02541 100644 --- a/Master/texmf-dist/source/latex/oberdiek/engord.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/engord.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright (C) 2000, 2003, 2006-2008 by +% Copyright (C) 2000, 2003, 2006-2008, 2010 by % Heiko Oberdiek <heiko.oberdiek at googlemail.com> % % This work may be distributed and/or modified under the @@ -62,6 +62,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -73,7 +75,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: engord 2008/08/11 v1.7 Provides English ordinal numbers (HO)} +\Msg{* Package: engord 2010/03/01 v1.8 Provides English ordinal numbers (HO)} \Msg{************************************************************************} \keepsilent @@ -84,7 +86,7 @@ This is a generated file. -Copyright (C) 2000, 2003, 2006-2008 by +Copyright (C) 2000, 2003, 2006-2008, 2010 by Heiko Oberdiek <heiko.oberdiek at googlemail.com> This work may be distributed and/or modified under the @@ -120,7 +122,8 @@ and the derived files \file{engord-test1.tex}{\from{engord.dtx}{test1}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} @@ -147,7 +150,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{engord.drv}% - [2008/08/11 v1.7 Provides English ordinal numbers (HO)]% + [2010/03/01 v1.8 Provides English ordinal numbers (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2008/08/11] \begin{document} @@ -156,7 +159,7 @@ and the derived files %</driver> % \fi % -% \CheckSum{473} +% \CheckSum{476} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -177,7 +180,7 @@ and the derived files % \GetFileInfo{engord.drv} % % \title{The \xpackage{engord} package} -% \date{2008/08/11 v1.7} +% \date{2010/03/01 v1.8} % \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}} % % \maketitle @@ -345,7 +348,7 @@ and the derived files \fi \expandafter\x\csname ver@engord.sty\endcsname \ProvidesPackage{engord}% - [2008/08/11 v1.7 Provides English ordinal numbers (HO)] + [2010/03/01 v1.8 Provides English ordinal numbers (HO)] % \end{macrocode} % % \subsection{Help commands for plain compatibility} @@ -403,8 +406,10 @@ and the derived files \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname RequirePackage\endcsname\relax \input infwarerr.sty\relax + \input ltxcmds.sty\relax \else \RequirePackage{infwarerr}[2007/09/09]% + \RequirePackage{ltxcmds}[2010/03/01]% \fi % \end{macrocode} % @@ -414,7 +419,7 @@ and the derived files % The switch \cs{ifengordraise}, whether the ordinal letters % are raised or not. Default is raised because of compatibility. % \begin{macrocode} -\newif\ifengordraise +\ltx@newif\ifengordraise \engordraisetrue % \end{macrocode} % \end{macro} @@ -934,6 +939,10 @@ and the derived files % \item % URLs updated. % \end{Version} +% \begin{Version}{2010/03/01 v1.8} +% \item +% Compatibility with \iniTeX. +% \end{Version} % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/source/latex/oberdiek/epstopdf.dtx b/Master/texmf-dist/source/latex/oberdiek/epstopdf.dtx index 8de3fb1436d..e2910d06b24 100644 --- a/Master/texmf-dist/source/latex/oberdiek/epstopdf.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/epstopdf.dtx @@ -61,6 +61,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -118,7 +120,8 @@ and the derived files \file{epstopdf-test1.tex}{\from{epstopdf.dtx}{test1}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/etexcmds.dtx b/Master/texmf-dist/source/latex/oberdiek/etexcmds.dtx index 19f342c048f..b00250ce8fe 100644 --- a/Master/texmf-dist/source/latex/oberdiek/etexcmds.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/etexcmds.dtx @@ -67,6 +67,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -130,7 +132,8 @@ and the derived files \file{etexcmds-test4.tex}{\from{etexcmds.dtx}{test4}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/flags.dtx b/Master/texmf-dist/source/latex/oberdiek/flags.dtx index 302fbbc7213..4771afc70cb 100644 --- a/Master/texmf-dist/source/latex/oberdiek/flags.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/flags.dtx @@ -58,6 +58,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -111,7 +113,8 @@ and the derived files \file{flags.sty}{\from{flags.dtx}{package}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/gettitlestring.dtx b/Master/texmf-dist/source/latex/oberdiek/gettitlestring.dtx index f52e31b67c3..ad7db0155bc 100644 --- a/Master/texmf-dist/source/latex/oberdiek/gettitlestring.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/gettitlestring.dtx @@ -65,6 +65,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -126,7 +128,8 @@ and the derived files \file{gettitlestring-test2.tex}{\from{gettitlestring.dtx}{test2}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/grfext.dtx b/Master/texmf-dist/source/latex/oberdiek/grfext.dtx index 397d5765efc..570efab6c2b 100644 --- a/Master/texmf-dist/source/latex/oberdiek/grfext.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/grfext.dtx @@ -61,6 +61,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -118,7 +120,8 @@ and the derived files \file{grfext-test2.tex}{\from{grfext.dtx}{test2}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/grffile.dtx b/Master/texmf-dist/source/latex/oberdiek/grffile.dtx index bb37edeafcd..5bd691494db 100644 --- a/Master/texmf-dist/source/latex/oberdiek/grffile.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/grffile.dtx @@ -60,6 +60,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -116,7 +118,8 @@ and the derived files \file{grffile-test1.tex}{\from{grffile.dtx}{test1}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/holtxdoc.dtx b/Master/texmf-dist/source/latex/oberdiek/holtxdoc.dtx index 4002528360c..829b742db13 100644 --- a/Master/texmf-dist/source/latex/oberdiek/holtxdoc.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/holtxdoc.dtx @@ -58,6 +58,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -111,7 +113,8 @@ and the derived files \file{holtxdoc.sty}{\from{holtxdoc.dtx}{package}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/hycolor.dtx b/Master/texmf-dist/source/latex/oberdiek/hycolor.dtx index fbdb23a4496..122e2ca7ecb 100644 --- a/Master/texmf-dist/source/latex/oberdiek/hycolor.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/hycolor.dtx @@ -70,6 +70,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -136,7 +138,8 @@ and the derived files \file{hycolor-test-xcol4.tex}{\from{hycolor.dtx}{test-xcolor-fbox}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/hypbmsec.dtx b/Master/texmf-dist/source/latex/oberdiek/hypbmsec.dtx index 39165777f1a..469a61961b2 100644 --- a/Master/texmf-dist/source/latex/oberdiek/hypbmsec.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/hypbmsec.dtx @@ -58,6 +58,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -111,7 +113,8 @@ and the derived files \file{hypbmsec.sty}{\from{hypbmsec.dtx}{package}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/hypcap.dtx b/Master/texmf-dist/source/latex/oberdiek/hypcap.dtx index 885330c9aba..48c7ad10514 100644 --- a/Master/texmf-dist/source/latex/oberdiek/hypcap.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/hypcap.dtx @@ -58,6 +58,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -111,7 +113,8 @@ and the derived files \file{hypcap.sty}{\from{hypcap.dtx}{package}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/hypdestopt.dtx b/Master/texmf-dist/source/latex/oberdiek/hypdestopt.dtx index 287ded6ede9..78c0430575a 100644 --- a/Master/texmf-dist/source/latex/oberdiek/hypdestopt.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/hypdestopt.dtx @@ -58,6 +58,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -111,7 +113,8 @@ and the derived files \file{hypdestopt.sty}{\from{hypdestopt.dtx}{package}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/hypdoc.dtx b/Master/texmf-dist/source/latex/oberdiek/hypdoc.dtx index 0a3a9e8d5d4..a4167e7ef3a 100644 --- a/Master/texmf-dist/source/latex/oberdiek/hypdoc.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/hypdoc.dtx @@ -58,6 +58,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -111,7 +113,8 @@ and the derived files \file{hypdoc.sty}{\from{hypdoc.dtx}{package}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/hypgotoe.dtx b/Master/texmf-dist/source/latex/oberdiek/hypgotoe.dtx index 35776f34228..9fcc15d45ec 100644 --- a/Master/texmf-dist/source/latex/oberdiek/hypgotoe.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/hypgotoe.dtx @@ -60,6 +60,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -116,7 +118,8 @@ and the derived files \file{hypgotoe-example.tex}{\from{hypgotoe.dtx}{example}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/hyphsubst.dtx b/Master/texmf-dist/source/latex/oberdiek/hyphsubst.dtx index 5360e26f012..55c52adf926 100644 --- a/Master/texmf-dist/source/latex/oberdiek/hyphsubst.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/hyphsubst.dtx @@ -64,6 +64,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -124,7 +126,8 @@ and the derived files \file{hyphsubst-test2.tex}{\from{hyphsubst.dtx}{test2}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/ifdraft.dtx b/Master/texmf-dist/source/latex/oberdiek/ifdraft.dtx index fd7c5729a00..3402384a3bc 100644 --- a/Master/texmf-dist/source/latex/oberdiek/ifdraft.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/ifdraft.dtx @@ -58,6 +58,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -111,7 +113,8 @@ and the derived files \file{ifdraft.sty}{\from{ifdraft.dtx}{package}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/iflang.dtx b/Master/texmf-dist/source/latex/oberdiek/iflang.dtx index 7c415ed2394..004e1d6adc1 100644 --- a/Master/texmf-dist/source/latex/oberdiek/iflang.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/iflang.dtx @@ -68,6 +68,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -132,7 +134,8 @@ and the derived files \file{iflang-test5.tex}{\from{iflang.dtx}{test5}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/ifluatex.dtx b/Master/texmf-dist/source/latex/oberdiek/ifluatex.dtx index 5bedd5f7538..de8fdc78657 100644 --- a/Master/texmf-dist/source/latex/oberdiek/ifluatex.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/ifluatex.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright (C) 2007, 2009 by +% Copyright (C) 2007, 2009, 2010 by % Heiko Oberdiek <heiko.oberdiek at googlemail.com> % % This work may be distributed and/or modified under the @@ -65,6 +65,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -76,7 +78,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: ifluatex 2009/04/17 v1.2 Provides the ifluatex switch (HO)} +\Msg{* Package: ifluatex 2010/03/01 v1.3 Provides the ifluatex switch (HO)} \Msg{************************************************************************} \keepsilent @@ -87,7 +89,7 @@ This is a generated file. -Copyright (C) 2007, 2009 by +Copyright (C) 2007, 2009, 2010 by Heiko Oberdiek <heiko.oberdiek at googlemail.com> This work may be distributed and/or modified under the @@ -126,7 +128,8 @@ and the derived files \file{ifluatex-test3.tex}{\from{ifluatex.dtx}{test-reload2}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} @@ -153,7 +156,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ifluatex.drv}% - [2009/04/17 v1.2 Provides the ifluatex switch (HO)]% + [2010/03/01 v1.3 Provides the ifluatex switch (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2008/08/11] \begin{document} @@ -183,7 +186,7 @@ and the derived files % \GetFileInfo{ifluatex.drv} % % \title{The \xpackage{ifluatex} package} -% \date{2009/04/17 v1.2} +% \date{2010/03/01 v1.3} % \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}} % % \maketitle @@ -300,7 +303,7 @@ and the derived files \fi \expandafter\x\csname ver@ifluatex.sty\endcsname \ProvidesPackage{ifluatex}% - [2009/04/17 v1.2 Provides the ifluatex switch (HO)] + [2010/03/01 v1.3 Provides the ifluatex switch (HO)] % \end{macrocode} % % \subsection{Catcodes} @@ -427,7 +430,7 @@ and the derived files \csname iftrue\endcsname \begingroup \newlinechar=10 % - \endlinechar=\newlinechar % + \endlinechar=\newlinechar% \ifnum0% \directlua{% if tex.enableprimitives then @@ -437,15 +440,15 @@ and the derived files }% \ifx\ifluatexluatexversion\@undefined\else 1\fi % =11 % - \global\let\luatexversion\ifluatexluatexversion % - \else % + \global\let\luatexversion\ifluatexluatexversion% + \else% \ifluatex@Error{% Missing \string\luatexversion% }{% Update LuaTeX.% }% - \fi % - \endgroup % + \fi% + \endgroup% \fi \fi % \end{macrocode} @@ -460,7 +463,7 @@ and the derived files \let\luatexrevision\@undefined \fi \newlinechar=10 % - \endlinechar=\newlinechar % + \endlinechar=\newlinechar% \ifcase0% \directlua{% if tex.enableprimitives then @@ -469,11 +472,11 @@ and the derived files tex.print('1') end }% - \ifx\ifluatexluatexrevision\@undefined 1\fi % - \relax % - \global\let\luatexrevision\ifluatexluatexrevision - \fi - \endgroup + \ifx\ifluatexluatexrevision\@undefined 1\fi% + \relax% + \global\let\luatexrevision\ifluatexluatexrevision% + \fi% + \endgroup% \fi \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname luatexrevision\endcsname\relax @@ -821,6 +824,10 @@ and the derived files % \item % Makes \cs{luatexrevision} available, too. % \end{Version} +% \begin{Version}{2010/03/01 v1.3} +% \item +% Line ends fixed in case \cs{endlinechar} = \cs{newlinechar}. +% \end{Version} % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/source/latex/oberdiek/ifpdf.dtx b/Master/texmf-dist/source/latex/oberdiek/ifpdf.dtx index ff71b0b6c51..ae250c534ab 100644 --- a/Master/texmf-dist/source/latex/oberdiek/ifpdf.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/ifpdf.dtx @@ -62,6 +62,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -120,7 +122,8 @@ and the derived files \file{ifpdf-test1.tex}{\from{ifpdf.dtx}{test1}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/ifvtex.dtx b/Master/texmf-dist/source/latex/oberdiek/ifvtex.dtx index 5d60e4d0cd0..a0b63af589b 100644 --- a/Master/texmf-dist/source/latex/oberdiek/ifvtex.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/ifvtex.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright (C) 2001, 2006-2008 by +% Copyright (C) 2001, 2006-2008, 2010 by % Heiko Oberdiek <heiko.oberdiek at googlemail.com> % % This work may be distributed and/or modified under the @@ -62,6 +62,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -73,7 +75,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: ifvtex 2008/11/04 v1.4 Switches for detecting VTeX and its modes (HO)} +\Msg{* Package: ifvtex 2010/03/01 v1.5 Switches for detecting VTeX and its modes (HO)} \Msg{************************************************************************} \keepsilent @@ -84,7 +86,7 @@ This is a generated file. -Copyright (C) 2001, 2006-2008 by +Copyright (C) 2001, 2006-2008, 2010 by Heiko Oberdiek <heiko.oberdiek at googlemail.com> This work may be distributed and/or modified under the @@ -120,7 +122,8 @@ and the derived files \file{ifvtex-test1.tex}{\from{ifvtex.dtx}{test1}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} @@ -147,7 +150,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ifvtex.drv}% - [2008/11/04 v1.4 Switches for detecting VTeX and its modes (HO)]% + [2010/03/01 v1.5 Switches for detecting VTeX and its modes (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2008/08/11] \begin{document} @@ -156,7 +159,7 @@ and the derived files %</driver> % \fi % -% \CheckSum{444} +% \CheckSum{503} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -177,7 +180,7 @@ and the derived files % \GetFileInfo{ifvtex.drv} % % \title{The \xpackage{ifvtex} package} -% \date{2008/11/04 v1.4} +% \date{2010/03/01 v1.5} % \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}} % % \maketitle @@ -304,7 +307,7 @@ and the derived files \fi \expandafter\x\csname ver@ifvtex.sty\endcsname \ProvidesPackage{ifvtex}% - [2008/11/04 v1.4 Switches for detecting VTeX and its modes (HO)] + [2010/03/01 v1.5 Switches for detecting VTeX and its modes (HO)] % \end{macrocode} % % \subsection{Catcodes} @@ -379,13 +382,56 @@ and the derived files \endgroup % \end{macrocode} % +% \subsection{Provide \cs{newif}} +% +% \begin{macrocode} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname newif\endcsname\relax +% \end{macrocode} +% \begin{macro}{\ifvtex@newif} +% \begin{macrocode} + \def\ifvtex@newif#1{% + \begingroup + \escapechar=-1 % + \expandafter\endgroup + \expandafter\ifvtex@@newif\string#1\@nil + }% +% \end{macrocode} +% \end{macro} +% \begin{macro}{\ifvtex@@newif} +% \begin{macrocode} + \def\ifvtex@@newif#1#2#3\@nil{% + \expandafter\edef\csname#3true\endcsname{% + \let + \expandafter\noexpand\csname if#3\endcsname + \expandafter\noexpand\csname iftrue\endcsname + }% + \expandafter\edef\csname#3false\endcsname{% + \let + \expandafter\noexpand\csname if#3\endcsname + \expandafter\noexpand\csname iffalse\endcsname + }% + \csname#3false\endcsname + }% +% \end{macrocode} +% \end{macro} +% \begin{macrocode} +\else +% \end{macrocode} +% \begin{macro}{\ifvtex@newif} +% \begin{macrocode} + \expandafter\let\expandafter\ifvtex@newif\csname newif\endcsname +\fi +% \end{macrocode} +% \end{macro} +% % \subsection{\cs{ifvtex}} % % \begin{macro}{\ifvtex} % Create and set the switch. \cs{newif} initializes the % switch with \cs{iffalse}. % \begin{macrocode} -\newif\ifvtex +\ifvtex@newif\ifvtex % \end{macrocode} % \begin{macrocode} \begingroup\expandafter\expandafter\expandafter\endgroup @@ -403,11 +449,11 @@ and the derived files % \subsection{Mode and GeX switches} % % \begin{macrocode} -\newif\ifvtexdvi -\newif\ifvtexpdf -\newif\ifvtexps -\newif\ifvtexhtml -\newif\ifvtexgex +\ifvtex@newif\ifvtexdvi +\ifvtex@newif\ifvtexpdf +\ifvtex@newif\ifvtexps +\ifvtex@newif\ifvtexhtml +\ifvtex@newif\ifvtexgex \ifvtex \ifcase\OpMode\relax \vtexdvitrue @@ -759,6 +805,10 @@ and the derived files % \item % Bug fix: Mispelled \cs{OpMode} (found by Hideo Umeki). % \end{Version} +% \begin{Version}{2010/03/01 v1.5} +% \item +% Compatibility with ini\TeX. +% \end{Version} % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/source/latex/oberdiek/infwarerr.dtx b/Master/texmf-dist/source/latex/oberdiek/infwarerr.dtx index cf72c824bbd..ec433bdbfe9 100644 --- a/Master/texmf-dist/source/latex/oberdiek/infwarerr.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/infwarerr.dtx @@ -66,6 +66,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -128,7 +130,8 @@ and the derived files \file{infwarerr-test3.tex}{\from{infwarerr.dtx}{test3}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/inputenx.dtx b/Master/texmf-dist/source/latex/oberdiek/inputenx.dtx index 2b3f918bf9e..43ca46e8573 100644 --- a/Master/texmf-dist/source/latex/oberdiek/inputenx.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/inputenx.dtx @@ -109,6 +109,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -214,7 +216,8 @@ and the derived files \file{inputenx-utf8enc.txt}{\from{inputenx.dtx}{dfudoc}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/intcalc.dtx b/Master/texmf-dist/source/latex/oberdiek/intcalc.dtx index 6cc6306c9b4..071df9f5e01 100644 --- a/Master/texmf-dist/source/latex/oberdiek/intcalc.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/intcalc.dtx @@ -67,6 +67,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -130,7 +132,8 @@ and the derived files \file{intcalc-test4.tex}{\from{intcalc.dtx}{test4,etex}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/kvdefinekeys.dtx b/Master/texmf-dist/source/latex/oberdiek/kvdefinekeys.dtx new file mode 100644 index 00000000000..c63ca028a9d --- /dev/null +++ b/Master/texmf-dist/source/latex/oberdiek/kvdefinekeys.dtx @@ -0,0 +1,652 @@ +% \iffalse meta-comment +% +% Copyright (C) 2010 by +% Heiko Oberdiek <heiko.oberdiek at googlemail.com> +% +% This work may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either +% version 1.3c of this license or (at your option) any later +% version. This version of this license is in +% http://www.latex-project.org/lppl/lppl-1-3c.txt +% and the latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3 or later is part of all distributions of +% LaTeX version 2005/12/01 or later. +% +% This work has the LPPL maintenance status "maintained". +% +% This Current Maintainer of this work is Heiko Oberdiek. +% +% The Base Interpreter refers to any `TeX-Format', +% because some files are installed in TDS:tex/generic//. +% +% This work consists of the main source file kvdefinekeys.dtx +% and the derived files +% kvdefinekeys.sty, kvdefinekeys.pdf, kvdefinekeys.ins, kvdefinekeys.drv, +% kvdefinekeys-test1.tex. +% +% Distribution: +% CTAN:macros/latex/contrib/oberdiek/kvdefinekeys.dtx +% CTAN:macros/latex/contrib/oberdiek/kvdefinekeys.pdf +% +% Unpacking: +% (a) If kvdefinekeys.ins is present: +% tex kvdefinekeys.ins +% (b) Without kvdefinekeys.ins: +% tex kvdefinekeys.dtx +% (c) If you insist on using LaTeX +% latex \let\install=y\input{kvdefinekeys.dtx} +% (quote the arguments according to the demands of your shell) +% +% Documentation: +% (a) If kvdefinekeys.drv is present: +% latex kvdefinekeys.drv +% (b) Without kvdefinekeys.drv: +% latex kvdefinekeys.dtx; ... +% The class ltxdoc loads the configuration file ltxdoc.cfg +% if available. Here you can specify further options, e.g. +% use A4 as paper format: +% \PassOptionsToClass{a4paper}{article} +% +% Programm calls to get the documentation (example): +% pdflatex kvdefinekeys.dtx +% makeindex -s gind.ist kvdefinekeys.idx +% pdflatex kvdefinekeys.dtx +% makeindex -s gind.ist kvdefinekeys.idx +% pdflatex kvdefinekeys.dtx +% +% Installation: +% TDS:tex/generic/oberdiek/kvdefinekeys.sty +% TDS:doc/latex/oberdiek/kvdefinekeys.pdf +% TDS:doc/latex/oberdiek/test/kvdefinekeys-test1.tex +% TDS:source/latex/oberdiek/kvdefinekeys.dtx +% +%<*ignore> +\begingroup + \catcode123=1 % + \catcode125=2 % + \def\x{LaTeX2e}% +\expandafter\endgroup +\ifcase 0\ifx\install y1\fi\expandafter + \ifx\csname processbatchFile\endcsname\relax\else1\fi + \ifx\fmtname\x\else 1\fi\relax +\else\csname fi\endcsname +%</ignore> +%<*install> +\input docstrip.tex +\Msg{************************************************************************} +\Msg{* Installation} +\Msg{* Package: kvdefinekeys 2010/03/01 v1.0 Defining keys (HO)} +\Msg{************************************************************************} + +\keepsilent +\askforoverwritefalse + +\let\MetaPrefix\relax +\preamble + +This is a generated file. + +Copyright (C) 2010 by + Heiko Oberdiek <heiko.oberdiek at googlemail.com> + +This work may be distributed and/or modified under the +conditions of the LaTeX Project Public License, either +version 1.3c of this license or (at your option) any later +version. This version of this license is in + http://www.latex-project.org/lppl/lppl-1-3c.txt +and the latest version of this license is in + http://www.latex-project.org/lppl.txt +and version 1.3 or later is part of all distributions of +LaTeX version 2005/12/01 or later. + +This work has the LPPL maintenance status "maintained". + +This Current Maintainer of this work is Heiko Oberdiek. + +The Base Interpreter refers to any `TeX-Format', +because some files are installed in TDS:tex/generic//. + +This work consists of the main source file kvdefinekeys.dtx +and the derived files + kvdefinekeys.sty, kvdefinekeys.pdf, kvdefinekeys.ins, kvdefinekeys.drv, + kvdefinekeys-test1.tex. + +\endpreamble +\let\MetaPrefix\DoubleperCent + +\generate{% + \file{kvdefinekeys.ins}{\from{kvdefinekeys.dtx}{install}}% + \file{kvdefinekeys.drv}{\from{kvdefinekeys.dtx}{driver}}% + \usedir{tex/generic/oberdiek}% + \file{kvdefinekeys.sty}{\from{kvdefinekeys.dtx}{package}}% + \usedir{doc/latex/oberdiek/test}% + \file{kvdefinekeys-test1.tex}{\from{kvdefinekeys.dtx}{test1}}% +} + +\catcode32=13\relax% active space +\let =\space% +\Msg{************************************************************************} +\Msg{*} +\Msg{* To finish the installation you have to move the following} +\Msg{* file into a directory searched by TeX:} +\Msg{*} +\Msg{* kvdefinekeys.sty} +\Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} +\Msg{* To produce the documentation run the file `kvdefinekeys.drv'} +\Msg{* through LaTeX.} +\Msg{*} +\Msg{* Happy TeXing!} +\Msg{*} +\Msg{************************************************************************} + +\endbatchfile +%</install> +%<*ignore> +\fi +%</ignore> +%<*driver> +\NeedsTeXFormat{LaTeX2e} +\ProvidesFile{kvdefinekeys.drv}% + [2010/03/01 v1.0 Defining keys (HO)]% +\documentclass{ltxdoc} +\usepackage{holtxdoc}[2008/08/11] +\begin{document} + \DocInput{kvdefinekeys.dtx}% +\end{document} +%</driver> +% \fi +% +% \CheckSum{314} +% +% \CharacterTable +% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +% Digits \0\1\2\3\4\5\6\7\8\9 +% Exclamation \! Double quote \" Hash (number) \# +% Dollar \$ Percent \% Ampersand \& +% Acute accent \' Left paren \( Right paren \) +% Asterisk \* Plus \+ Comma \, +% Minus \- Point \. Solidus \/ +% Colon \: Semicolon \; Less than \< +% Equals \= Greater than \> Question mark \? +% Commercial at \@ Left bracket \[ Backslash \\ +% Right bracket \] Circumflex \^ Underscore \_ +% Grave accent \` Left brace \{ Vertical bar \| +% Right brace \} Tilde \~} +% +% \GetFileInfo{kvdefinekeys.drv} +% +% \title{The \xpackage{kvdefinekeys} package} +% \date{2010/03/01 v1.0} +% \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}} +% +% \maketitle +% +% \begin{abstract} +% Package \xpackage{kvdefinekeys} provides \cs{kv@define@key} to define +% keys the same way as \xpackage{keyval}'s \cs{define@key}. However, it +% works also using \iniTeX. +% \end{abstract} +% +% \tableofcontents +% +% \def\M#1{\texttt{\{}\meta{#1}\texttt{\}}} +% +% \section{Documentation} +% +% \subsection{Motivation} +% +% \cs{kvsetkeys} serves as replacement for \xpackage{keyval}'s +% \cs{setkeys}. This package adds macros to define keys, closing +% the gap \cs{kvsetkeys} leaves. +% +% \begin{declcs}{kv@define@key}\,\M{family}\,\M{key},[\meta{default}] +% \end{declcs} +% Macro \cs{kv@define@key} reimplements \xpackage{keyval}'s +% \cs{define@key}. As difference to the original the defined keys +% also allow \cs{par} inside values. +% +% \StopEventually{ +% } +% +% \section{Implementation} +% +% \subsection{Identification} +% +% \begin{macrocode} +%<*package> +% \end{macrocode} +% Reload check, especially if the package is not used with \LaTeX. +% \begin{macrocode} +\begingroup + \catcode44 12 % , + \catcode45 12 % - + \catcode46 12 % . + \catcode58 12 % : + \catcode64 11 % @ + \catcode123 1 % { + \catcode125 2 % } + \expandafter\let\expandafter\x\csname ver@kvdefinekeys.sty\endcsname + \ifx\x\relax % plain-TeX, first loading + \else + \def\empty{}% + \ifx\x\empty % LaTeX, first loading, + % variable is initialized, but \ProvidesPackage not yet seen + \else + \catcode35 6 % # + \expandafter\ifx\csname PackageInfo\endcsname\relax + \def\x#1#2{% + \immediate\write-1{Package #1 Info: #2.}% + }% + \else + \def\x#1#2{\PackageInfo{#1}{#2, stopped}}% + \fi + \x{kvdefinekeys}{The package is already loaded}% + \aftergroup\endinput + \fi + \fi +\endgroup +% \end{macrocode} +% Package identification: +% \begin{macrocode} +\begingroup + \catcode35 6 % # + \catcode40 12 % ( + \catcode41 12 % ) + \catcode44 12 % , + \catcode45 12 % - + \catcode46 12 % . + \catcode47 12 % / + \catcode58 12 % : + \catcode64 11 % @ + \catcode91 12 % [ + \catcode93 12 % ] + \catcode123 1 % { + \catcode125 2 % } + \expandafter\ifx\csname ProvidesPackage\endcsname\relax + \def\x#1#2#3[#4]{\endgroup + \immediate\write-1{Package: #3 #4}% + \xdef#1{#4}% + }% + \else + \def\x#1#2[#3]{\endgroup + #2[{#3}]% + \ifx#1\@undefined + \xdef#1{#3}% + \fi + \ifx#1\relax + \xdef#1{#3}% + \fi + }% + \fi +\expandafter\x\csname ver@kvdefinekeys.sty\endcsname +\ProvidesPackage{kvdefinekeys}% + [2010/03/01 v1.0 Defining keys (HO)] +% \end{macrocode} +% +% \begin{macrocode} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname KVD@AtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # +\catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } +\def\TMP@EnsureCode#1#2{% + \edef\KVD@AtEnd{% + \KVD@AtEnd + \catcode#1 \the\catcode#1\relax + }% + \catcode#1 #2\relax +} +\TMP@EnsureCode{46}{12}% . +\TMP@EnsureCode{47}{12}% / +% \end{macrocode} +% +% \subsection{Package loading} +% +% \begin{macrocode} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname RequirePackage\endcsname\relax + \input ltxcmds.sty\relax +\else + \RequirePackage{ltxcmds}[2010/03/01]% +\fi +% \end{macrocode} +% +% +% \subsection{Provide key defining macro} +% +% \begin{macro}{\kv@define@key} +% \begin{macrocode} +\def\kv@define@key#1#2{% + \ltx@ifnextchar[{% + \KVD@DefineKeyWithDefault{#1}{#2}% + }{% + \long\expandafter\def\csname KV@#1@#2\endcsname##1% + }% +} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\KVD@DefineKeyWithDefault} +% \begin{macrocode} +\long\def\KVD@DefineKeyWithDefault#1#2[#3]{% + \expandafter\def\csname KV@#1@#2@default\expandafter\endcsname + \expandafter{% + \csname KV@#1@#2\endcsname{#3}% + }% + \long\expandafter\def\csname KV@#1@#2\endcsname##1% +} +% \end{macrocode} +% \end{macro} +% +% \begin{macrocode} +\KVD@AtEnd +%</package> +% \end{macrocode} +% +% \section{Test} +% +% \subsection{Catcode checks for loading} +% +% \begin{macrocode} +%<*test1> +% \end{macrocode} +% \begin{macrocode} +\catcode`\{=1 % +\catcode`\}=2 % +\catcode`\#=6 % +\catcode`\@=11 % +\expandafter\ifx\csname count@\endcsname\relax + \countdef\count@=255 % +\fi +\expandafter\ifx\csname @gobble\endcsname\relax + \long\def\@gobble#1{}% +\fi +\expandafter\ifx\csname @firstofone\endcsname\relax + \long\def\@firstofone#1{#1}% +\fi +\expandafter\ifx\csname loop\endcsname\relax + \expandafter\@firstofone +\else + \expandafter\@gobble +\fi +{% + \def\loop#1\repeat{% + \def\body{#1}% + \iterate + }% + \def\iterate{% + \body + \let\next\iterate + \else + \let\next\relax + \fi + \next + }% + \let\repeat=\fi +}% +\def\RestoreCatcodes{} +\count@=0 % +\loop + \edef\RestoreCatcodes{% + \RestoreCatcodes + \catcode\the\count@=\the\catcode\count@\relax + }% +\ifnum\count@<255 % + \advance\count@ 1 % +\repeat + +\def\RangeCatcodeInvalid#1#2{% + \count@=#1\relax + \loop + \catcode\count@=15 % + \ifnum\count@<#2\relax + \advance\count@ 1 % + \repeat +} +\expandafter\ifx\csname LoadCommand\endcsname\relax + \def\LoadCommand{\input kvdefinekeys.sty\relax}% +\fi +\def\Test{% + \RangeCatcodeInvalid{0}{47}% + \RangeCatcodeInvalid{58}{64}% + \RangeCatcodeInvalid{91}{96}% + \RangeCatcodeInvalid{123}{255}% + \catcode`\@=12 % + \catcode`\\=0 % + \catcode`\{=1 % + \catcode`\}=2 % + \catcode`\#=6 % + \catcode`\[=12 % + \catcode`\]=12 % + \catcode`\%=14 % + \catcode`\ =10 % + \catcode13=5 % + \LoadCommand + \RestoreCatcodes +} +\Test +\csname @@end\endcsname +\end +% \end{macrocode} +% \begin{macrocode} +%</test1> +% \end{macrocode} +% +% \section{Installation} +% +% \subsection{Download} +% +% \paragraph{Package.} This package is available on +% CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}: +% \begin{description} +% \item[\CTAN{macros/latex/contrib/oberdiek/kvdefinekeys.dtx}] The source file. +% \item[\CTAN{macros/latex/contrib/oberdiek/kvdefinekeys.pdf}] Documentation. +% \end{description} +% +% +% \paragraph{Bundle.} All the packages of the bundle `oberdiek' +% are also available in a TDS compliant ZIP archive. There +% the packages are already unpacked and the documentation files +% are generated. The files and directories obey the TDS standard. +% \begin{description} +% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}] +% \end{description} +% \emph{TDS} refers to the standard ``A Directory Structure +% for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories +% with \xfile{texmf} in their name are usually organized this way. +% +% \subsection{Bundle installation} +% +% \paragraph{Unpacking.} Unpack the \xfile{oberdiek.tds.zip} in the +% TDS tree (also known as \xfile{texmf} tree) of your choice. +% Example (linux): +% \begin{quote} +% |unzip oberdiek.tds.zip -d ~/texmf| +% \end{quote} +% +% \paragraph{Script installation.} +% Check the directory \xfile{TDS:scripts/oberdiek/} for +% scripts that need further installation steps. +% Package \xpackage{attachfile2} comes with the Perl script +% \xfile{pdfatfi.pl} that should be installed in such a way +% that it can be called as \texttt{pdfatfi}. +% Example (linux): +% \begin{quote} +% |chmod +x scripts/oberdiek/pdfatfi.pl|\\ +% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/| +% \end{quote} +% +% \subsection{Package installation} +% +% \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting +% \docstrip\ archive. The files are extracted by running the +% \xfile{.dtx} through \plainTeX: +% \begin{quote} +% \verb|tex kvdefinekeys.dtx| +% \end{quote} +% +% \paragraph{TDS.} Now the different files must be moved into +% the different directories in your installation TDS tree +% (also known as \xfile{texmf} tree): +% \begin{quote} +% \def\t{^^A +% \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}} +% kvdefinekeys.sty & tex/generic/oberdiek/kvdefinekeys.sty\\ +% kvdefinekeys.pdf & doc/latex/oberdiek/kvdefinekeys.pdf\\ +% test/kvdefinekeys-test1.tex & doc/latex/oberdiek/test/kvdefinekeys-test1.tex\\ +% kvdefinekeys.dtx & source/latex/oberdiek/kvdefinekeys.dtx\\ +% \end{tabular}^^A +% }^^A +% \sbox0{\t}^^A +% \ifdim\wd0>\linewidth +% \begingroup +% \advance\linewidth by\leftmargin +% \advance\linewidth by\rightmargin +% \edef\x{\endgroup +% \def\noexpand\lw{\the\linewidth}^^A +% }\x +% \def\lwbox{^^A +% \leavevmode +% \hbox to \linewidth{^^A +% \kern-\leftmargin\relax +% \hss +% \usebox0 +% \hss +% \kern-\rightmargin\relax +% }^^A +% }^^A +% \ifdim\wd0>\lw +% \sbox0{\small\t}^^A +% \ifdim\wd0>\linewidth +% \ifdim\wd0>\lw +% \sbox0{\footnotesize\t}^^A +% \ifdim\wd0>\linewidth +% \ifdim\wd0>\lw +% \sbox0{\scriptsize\t}^^A +% \ifdim\wd0>\linewidth +% \ifdim\wd0>\lw +% \sbox0{\tiny\t}^^A +% \ifdim\wd0>\linewidth +% \lwbox +% \else +% \usebox0 +% \fi +% \else +% \lwbox +% \fi +% \else +% \usebox0 +% \fi +% \else +% \lwbox +% \fi +% \else +% \usebox0 +% \fi +% \else +% \lwbox +% \fi +% \else +% \usebox0 +% \fi +% \else +% \lwbox +% \fi +% \else +% \usebox0 +% \fi +% \end{quote} +% If you have a \xfile{docstrip.cfg} that configures and enables \docstrip's +% TDS installing feature, then some files can already be in the right +% place, see the documentation of \docstrip. +% +% \subsection{Refresh file name databases} +% +% If your \TeX~distribution +% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh +% these. For example, \teTeX\ users run \verb|texhash| or +% \verb|mktexlsr|. +% +% \subsection{Some details for the interested} +% +% \paragraph{Attached source.} +% +% The PDF documentation on CTAN also includes the +% \xfile{.dtx} source file. It can be extracted by +% AcrobatReader 6 or higher. Another option is \textsf{pdftk}, +% e.g. unpack the file into the current directory: +% \begin{quote} +% \verb|pdftk kvdefinekeys.pdf unpack_files output .| +% \end{quote} +% +% \paragraph{Unpacking with \LaTeX.} +% The \xfile{.dtx} chooses its action depending on the format: +% \begin{description} +% \item[\plainTeX:] Run \docstrip\ and extract the files. +% \item[\LaTeX:] Generate the documentation. +% \end{description} +% If you insist on using \LaTeX\ for \docstrip\ (really, +% \docstrip\ does not need \LaTeX), then inform the autodetect routine +% about your intention: +% \begin{quote} +% \verb|latex \let\install=y\input{kvdefinekeys.dtx}| +% \end{quote} +% Do not forget to quote the argument according to the demands +% of your shell. +% +% \paragraph{Generating the documentation.} +% You can use both the \xfile{.dtx} or the \xfile{.drv} to generate +% the documentation. The process can be configured by the +% configuration file \xfile{ltxdoc.cfg}. For instance, put this +% line into this file, if you want to have A4 as paper format: +% \begin{quote} +% \verb|\PassOptionsToClass{a4paper}{article}| +% \end{quote} +% An example follows how to generate the +% documentation with pdf\LaTeX: +% \begin{quote} +%\begin{verbatim} +%pdflatex kvdefinekeys.dtx +%makeindex -s gind.ist kvdefinekeys.idx +%pdflatex kvdefinekeys.dtx +%makeindex -s gind.ist kvdefinekeys.idx +%pdflatex kvdefinekeys.dtx +%\end{verbatim} +% \end{quote} +% +% \begin{thebibliography}{9} +% \bibitem{keyval} +% David Carlisle: +% \textit{The \xpackage{keyval} package}; +% 1999/03/16 v1.13; +% \CTAN{macros/latex/required/graphics/keyval.dtx}. +% +% \end{thebibliography} +% +% \begin{History} +% \begin{Version}{2010/03/01 v1.0} +% \item +% First version. +% \end{Version} +% \end{History} +% +% \PrintIndex +% +% \Finale +\endinput diff --git a/Master/texmf-dist/source/latex/oberdiek/kvoptions.dtx b/Master/texmf-dist/source/latex/oberdiek/kvoptions.dtx index fff5f8bc130..2db04c9b7b1 100644 --- a/Master/texmf-dist/source/latex/oberdiek/kvoptions.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/kvoptions.dtx @@ -66,6 +66,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -129,7 +131,8 @@ and the derived files \file{kvoptions-test3.tex}{\from{kvoptions.dtx}{test3}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/kvsetkeys.dtx b/Master/texmf-dist/source/latex/oberdiek/kvsetkeys.dtx index 0698395c84f..24852f67ff1 100644 --- a/Master/texmf-dist/source/latex/oberdiek/kvsetkeys.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/kvsetkeys.dtx @@ -67,6 +67,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -78,7 +80,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: kvsetkeys 2010/01/28 v1.8 Key value parser (HO)} +\Msg{* Package: kvsetkeys 2010/03/01 v1.9 Key value parser (HO)} \Msg{************************************************************************} \keepsilent @@ -131,7 +133,8 @@ and the derived files \file{kvsetkeys-test3.tex}{\from{kvsetkeys.dtx}{test2,noetex}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} @@ -158,7 +161,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{kvsetkeys.drv}% - [2010/01/28 v1.8 Key value parser (HO)]% + [2010/03/01 v1.9 Key value parser (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2008/08/11] \begin{document} @@ -167,7 +170,7 @@ and the derived files %</driver> % \fi % -% \CheckSum{1109} +% \CheckSum{1135} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -188,7 +191,7 @@ and the derived files % \GetFileInfo{kvsetkeys.drv} % % \title{The \xpackage{kvsetkeys} package} -% \date{2010/01/28 v1.8} +% \date{2010/03/01 v1.9} % \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}} % % \maketitle @@ -546,7 +549,7 @@ and the derived files \fi \expandafter\x\csname ver@kvsetkeys.sty\endcsname \ProvidesPackage{kvsetkeys}% - [2010/01/28 v1.8 Key value parser (HO)] + [2010/03/01 v1.9 Key value parser (HO)] % \end{macrocode} % % \begin{macrocode} @@ -646,7 +649,7 @@ and the derived files % % \begin{macro}{\KVS@IfEmpty} % \begin{macrocode} -\def\KVS@IfEmpty#1{% +\long\def\KVS@IfEmpty#1{% & \edef\KVS@Temp{\etex@unexpanded{#1}}% $ \begingroup $ \toks@{#1}% @@ -665,7 +668,7 @@ $ \expandafter\endgroup % % \begin{macro}{\kv@normalize} % \begin{macrocode} -\def\kv@normalize#1{% +\long\def\kv@normalize#1{% \begingroup \toks@{,#1,}% \KVS@Comma @@ -709,7 +712,7 @@ $ \expandafter\endgroup \toks@\expandafter{\expandafter}\expandafter \KVS@@Comma\the\toks@~\KVS@Nil }% - \def\KVS@@Comma#1~#2\KVS@Nil{% + \long\def\KVS@@Comma#1~#2\KVS@Nil{% \toks@\expandafter{\the\toks@#1}% \KVS@IfEmpty{#2}{% }{% @@ -722,14 +725,14 @@ $ \expandafter\endgroup % \begin{macro}{\KVS@SpaceComma} % Removes spaces before the comma, may add commas at the end. % \begin{macrocode} -\def\KVS@SpaceComma#1{% +\long\def\KVS@SpaceComma#1{% \expandafter\KVS@@SpaceComma\the\toks@#1,\KVS@Nil } % \end{macrocode} % \end{macro} % \begin{macro}{\KVS@@SpaceComma} % \begin{macrocode} -\def\KVS@@SpaceComma#1 ,#2\KVS@Nil{% +\long\def\KVS@@SpaceComma#1 ,#2\KVS@Nil{% \KVS@IfEmpty{#2}{% \toks@{#1}% }{% @@ -749,7 +752,7 @@ $ \expandafter\endgroup % \end{macro} % \begin{macro}{\KVS@@CommaSpace} % \begin{macrocode} -\def\KVS@@CommaSpace#1, #2\KVS@Nil{% +\long\def\KVS@@CommaSpace#1, #2\KVS@Nil{% \KVS@IfEmpty{#2}{% \toks@{#1}% }{% @@ -769,7 +772,7 @@ $ \expandafter\endgroup % \end{macro} % \begin{macro}{\KVS@@CommaComma} % \begin{macrocode} -\def\KVS@@CommaComma#1,,#2\KVS@Nil{% +\long\def\KVS@@CommaComma#1,,#2\KVS@Nil{% \toks@{#1,#2}% \KVS@IfEmpty{#2}{% }{% @@ -790,7 +793,7 @@ $ \expandafter\endgroup \toks@\expandafter{\expandafter}\expandafter \KVS@@Equals\the\toks@~\KVS@Nil }% - \def\KVS@@Equals#1~#2\KVS@Nil{% + \long\def\KVS@@Equals#1~#2\KVS@Nil{% \edef\KVS@Temp{\the\toks@}% \ifx\KVS@Temp\KVS@Empty \expandafter\KVS@FirstOfTwo @@ -813,14 +816,14 @@ $ \expandafter\endgroup % \begin{macro}{\KVS@SpaceEquals} % Removes spaces before the equals sign. % \begin{macrocode} -\def\KVS@SpaceEquals#1{% +\long\def\KVS@SpaceEquals#1{% \expandafter\KVS@@SpaceEquals\the\toks@#1=\KVS@Nil } % \end{macrocode} % \end{macro} % \begin{macro}{\KVS@@SpaceEquals} % \begin{macrocode} -\def\KVS@@SpaceEquals#1 =#2\KVS@Nil{% +\long\def\KVS@@SpaceEquals#1 =#2\KVS@Nil{% \KVS@IfEmpty{#2}{% \toks@{#1}% }{% @@ -840,7 +843,7 @@ $ \expandafter\endgroup % \end{macro} % \begin{macro}{\KVS@@EqualsSpace} % \begin{macrocode} -\def\KVS@@EqualsSpace#1= #2\KVS@Nil{% +\long\def\KVS@@EqualsSpace#1= #2\KVS@Nil{% \KVS@IfEmpty{#2}{% \toks@{#1}% }{% @@ -856,7 +859,7 @@ $ \expandafter\endgroup % \begin{macro}{\kv@parse} % Normalizes and parses the key value list. Also sets \cs{kv@list}. % \begin{macrocode} -\def\kv@parse#1{% +\long\def\kv@parse#1{% \kv@normalize{#1}% \expandafter\kv@parse@normalized\expandafter{\kv@list}% } @@ -866,7 +869,7 @@ $ \expandafter\endgroup % |#1|: key value list\\ % |#2|: processor % \begin{macrocode} -\def\kv@parse@normalized#1#2{% +\long\def\kv@parse@normalized#1#2{% \KVS@Parse#1,\KVS@Nil{#2}% } % \end{macrocode} @@ -875,7 +878,7 @@ $ \expandafter\endgroup % |#1,#2|: key value list\\ % |#3|: processor % \begin{macrocode} -\def\KVS@Parse#1,#2\KVS@Nil#3{% +\long\def\KVS@Parse#1,#2\KVS@Nil#3{% \KVS@IfEmpty{#1}{% }{% \KVS@Process#1=\KVS@Nil{#3}% @@ -892,7 +895,7 @@ $ \expandafter\endgroup % |#2|: value, |=|\\ % |#3|: processor % \begin{macrocode} -\def\KVS@Process#1=#2\KVS@Nil#3{% +\long\def\KVS@Process#1=#2\KVS@Nil#3{% \def\kv@key{#1}% \KVS@IfEmpty{#2}{% \let\kv@value\relax @@ -908,7 +911,7 @@ $ \expandafter\endgroup % |#2|: value\\ % |#3|: processor % \begin{macrocode} -\def\KVS@@Process#1#2=\KVS@Nil#3{% +\long\def\KVS@@Process#1#2=\KVS@Nil#3{% & \edef\kv@value{\etex@unexpanded{#2}}% $ \begingroup $ \toks@{#2}% @@ -963,7 +966,7 @@ $ \let\kv@value\KVS@Global % % \begin{macro}{\kv@processor@default} % \begin{macrocode} -\def\kv@processor@default#1#2#3{% +\long\def\kv@processor@default#1#2#3{% & \unless\ifcsname KV@#1@#2\endcsname $ \begingroup\expandafter\expandafter\expandafter\endgroup $ \expandafter\ifx\csname KV@#1@#2\endcsname\relax @@ -1042,7 +1045,7 @@ $ \expandafter\ifx\csname KV@#1@#2@default\endcsname\relax % % \begin{macro}{\kvsetkeys} % \begin{macrocode} -\def\kvsetkeys#1#2{% +\long\def\kvsetkeys#1#2{% \kv@parse{#2}{\kv@processor@default{#1}}% } % \end{macrocode} @@ -1156,7 +1159,7 @@ $ \expandafter\ifx\csname KV@#1@#2@default\endcsname\relax \makeatletter \chardef\KVS@TestMode=1 % \makeatother -\usepackage{kvsetkeys}[2010/01/28] +\usepackage{kvsetkeys}[2010/03/01] %<noetex>\let\unexpanded\SavedUnexpanded \usepackage{qstest} \IncludeTests{*} @@ -1220,7 +1223,7 @@ $ \expandafter\ifx\csname KV@#1@#2@default\endcsname\relax \@makeother\= \begin{qstest}{normalize}{normalize,active-chars,space-removal}% - \def\Test#1#2{% + \long\def\Test#1#2{% \@makeother\,% \@makeother\=% \scantokens{\toks@={#2}}% @@ -1236,7 +1239,7 @@ $ \expandafter\ifx\csname KV@#1@#2@default\endcsname\relax \@Test{#1}% \@makeother\=% }% - \def\@Test#1{% + \long\def\@Test#1{% \scantokens{\kv@normalize{#1}}% \expandafter\expandafter\expandafter\Expect \expandafter\expandafter\expandafter @@ -1257,6 +1260,8 @@ $ \expandafter\ifx\csname KV@#1@#2@default\endcsname\relax \Test{{},{},{}}{,{},{},{},}% \Test{=}{,=,}% \Test{=,=,=}{,=,=,=,}% + \Test{a=\par}{,a=\par,}% + \Test{\par}{,\par,}% \def\TestSet#1{% \Test{#1#1}{,}% \Test{#1#1,#1#1}{,}% @@ -1650,6 +1655,10 @@ $ \expandafter\ifx\csname KV@#1@#2@default\endcsname\relax % \item % Compatibility to ini\TeX\ added. % \end{Version} +% \begin{Version}{2010/03/01 v1.9} +% \item +% Support of \cs{par} inside values. +% \end{Version} % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/source/latex/oberdiek/letltxmacro.dtx b/Master/texmf-dist/source/latex/oberdiek/letltxmacro.dtx index c36fe338e4d..794a76990ec 100644 --- a/Master/texmf-dist/source/latex/oberdiek/letltxmacro.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/letltxmacro.dtx @@ -63,6 +63,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -123,7 +125,8 @@ and the derived files \file{letltxmacro-test2.tex}{\from{letltxmacro.dtx}{test2}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} @@ -159,7 +162,7 @@ and the derived files %</driver> % \fi % -% \CheckSum{0} +% \CheckSum{844} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z diff --git a/Master/texmf-dist/source/latex/oberdiek/listingsutf8.dtx b/Master/texmf-dist/source/latex/oberdiek/listingsutf8.dtx index 6136613f23b..1a0b0c944f1 100644 --- a/Master/texmf-dist/source/latex/oberdiek/listingsutf8.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/listingsutf8.dtx @@ -66,6 +66,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -128,7 +130,8 @@ and the derived files \file{listingsutf8-test5.tex}{\from{listingsutf8.dtx}{test5,utf8x,noetex}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/ltxcmds.dtx b/Master/texmf-dist/source/latex/oberdiek/ltxcmds.dtx index ebd57fb77bb..12ce3596c6e 100644 --- a/Master/texmf-dist/source/latex/oberdiek/ltxcmds.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/ltxcmds.dtx @@ -63,6 +63,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -74,7 +76,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: ltxcmds 2010/01/28 v1.2 LaTeX kernel commands for general use (HO)} +\Msg{* Package: ltxcmds 2010/03/01 v1.3 LaTeX kernel commands for general use (HO)} \Msg{************************************************************************} \keepsilent @@ -122,7 +124,8 @@ and the derived files \file{ltxcmds-test1.tex}{\from{ltxcmds.dtx}{test1}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} @@ -149,7 +152,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltxcmds.drv}% - [2010/01/28 v1.2 LaTeX kernel commands for general use (HO)]% + [2010/03/01 v1.3 LaTeX kernel commands for general use (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2008/08/11] \usepackage{zref-savepos} @@ -159,7 +162,7 @@ and the derived files %</driver> % \fi % -% \CheckSum{569} +% \CheckSum{683} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -180,7 +183,7 @@ and the derived files % \GetFileInfo{ltxcmds.drv} % % \title{The \xpackage{ltxcmds} package} -% \date{2010/01/28 v1.2} +% \date{2010/03/01 v1.3} % \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}} % % \maketitle @@ -225,6 +228,16 @@ and the derived files % redefinitions. I remember an example where a package redefined % \cs{@firstoftwo} with forgetting \cs{long}. % +% \subsection{Numbers} +% +% \begin{declcs}{ltx@zero}\\ +% \cs{ltx@one}\\ +% \cs{ltx@two}\\ +% \cs{ltx@cclv} +% \end{declcs} +% These commands are numbers 0, 1, 2 and 255. They are not digits +% and a space is not gobbled afterwards. +% % \subsection{Argument killers} % % \begin{declcs}{ltx@gobble} \M{1} \TO\\ @@ -265,6 +278,14 @@ and the derived files % \cs{ltx@backslashchar} % \end{declcs} % +% \subsection{Boolean switch} +% +% \begin{declcs}{ltx@newif} \M{cmd} +% \end{declcs} +% \cs{ltx@newif} defines a new boolean switch \meta{cmd} like \cs{newif}. +% Unlike \plainTeX's \cs{newif}, \cs{ltx@newif} is not \cs{outer}. +% The command \meta{cmd} must start with the two characters |if|. +% % \subsection{Command definitions} % % \begin{declcs}{ltx@ifundefined} \M{cmd} \M{yes} \M{no} @@ -375,6 +396,13 @@ and the derived files % If \meta{cmd} is undefined or has the meaning \cs{relax}, then % it will be initialized as empty macro before. % +% \subsection{Macro \cs{ltx@ifnextchar}} +% +% \begin{declcs}{ltx@ifnextchar} \M{char} \M{yes} \M{no} +% \end{declcs} +% If next character is \meta{char} then \meta{yes} is called, +% otherwise \meta{no}. The character is not removed. +% % \StopEventually{ % } % @@ -450,7 +478,7 @@ and the derived files \fi \expandafter\x\csname ver@ltxcmds.sty\endcsname \ProvidesPackage{ltxcmds}% - [2010/01/28 v1.2 LaTeX kernel commands for general use (HO)] + [2010/03/01 v1.3 LaTeX kernel commands for general use (HO)] % \end{macrocode} % % \begin{macrocode} @@ -492,6 +520,29 @@ and the derived files \TMP@EnsureCode{124}{12}% | % \end{macrocode} % +% \subsection{Numbers} +% +% \begin{macro}{\ltx@zero} +% \begin{macrocode} +\chardef\ltx@zero=0 % +% \end{macrocode} +% \end{macro} +% \begin{macro}{\ltx@one} +% \begin{macrocode} +\chardef\ltx@one=1 % +% \end{macrocode} +% \end{macro} +% \begin{macro}{\ltx@two} +% \begin{macrocode} +\chardef\ltx@two=2 % +% \end{macrocode} +% \end{macro} +% \begin{macro}{\ltx@cclv} +% \begin{macrocode} +\chardef\ltx@cclv=255 % +% \end{macrocode} +% \end{macro} +% % \subsection{Argument killers} % % \begin{macro}{\ltx@gobble} @@ -593,6 +644,39 @@ and the derived files % \end{macrocode} % \end{macro} % +% \subsection{Boolean switch} +% +% \begin{macro}{\ltx@newif} +% \begin{macrocode} +\def\ltx@newif#1{% + \begingroup + \escapechar=-1 % + \expandafter\endgroup + \expandafter\LTXcmds@newif\string#1\@nil +} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\LTXcmds@newif} +% \begin{macrocode} +\begingroup + \escapechar=-1 % +\expandafter\endgroup +\expandafter\def\expandafter\LTXcmds@newif\string\if#1\@nil{% + \expandafter\edef\csname#1true\endcsname{% + \let + \expandafter\noexpand\csname if#1\endcsname + \noexpand\iftrue + }% + \expandafter\edef\csname#1false\endcsname{% + \let + \expandafter\noexpand\csname if#1\endcsname + \noexpand\iffalse + }% + \csname#1false\endcsname +} +% \end{macrocode} +% \end{macro} +% % \subsection{Command definitions} % % \begin{macro}{\ltx@LocalExpandAfter} @@ -859,6 +943,56 @@ and the derived files % \end{macrocode} % \end{macro} % +% \subsection{Macro \cs{ltx@ifnextchar}} +% +% \begin{macro}{\ltx@ifnextchar} +% \begin{macrocode} +\long\def\ltx@ifnextchar#1#2#3{% + \begingroup + \let\LTXcmds@CharToken= #1\relax + \toks\ltx@zero{#2}% + \toks\ltx@two{#3}% + \futurelet\LTXcmds@LetToken\LTXcmds@ifnextchar +} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\LTXcmds@ifnextchar} +% \begin{macrocode} +\def\LTXcmds@ifnextchar{% + \ifx\LTXcmds@LetToken\LTXcmds@CharToken + \expandafter\endgroup\the\toks\expandafter\ltx@zero + \else + \ifx\LTXcmds@LetToken\LTXcmds@SpaceToken + \expandafter\expandafter\expandafter\LTXcmds@@ifnextchar + \else + \expandafter\endgroup\the\toks + \expandafter\expandafter\expandafter\ltx@two + \fi + \fi +} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\LTXcmds@@ifnextchar} +% \begin{macrocode} +\begingroup + \def\x#1{\endgroup + \def\LTXcmds@@ifnextchar#1{% + \futurelet\LTXcmds@LetToken\LTXcmds@ifnextchar + }% + }% +\x{ } +% \end{macrocode} +% \end{macro} +% \begin{macro}{\LTXcmds@SpaceToken} +% \begin{macrocode} +\begingroup + \def\x#1{\endgroup + \let\LTXcmds@SpaceToken= #1% + }% +\x{ } +% \end{macrocode} +% \end{macro} +% % \begin{macrocode} \LTXcmds@AtEnd %</package> @@ -1159,6 +1293,14 @@ and the derived files % \item % \cs{ltx@GlobalAppendMacro}, \cs{ltx@LocalAppendMacro} added. % \end{Version} +% \begin{Version}{2010/03/01 v1.3} +% \item +% \cs{ltx@newif} added. +% \item +% \cs{ltx@ifnextchar} added. +% \item +% Numbers \cs{ltx@zero}, \cs{ltx@one}, \cs{ltx@two}, \cs{ltx@cclv} added. +% \end{Version} % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/source/latex/oberdiek/luacolor.dtx b/Master/texmf-dist/source/latex/oberdiek/luacolor.dtx index cae8744fbfa..98f28b623dd 100644 --- a/Master/texmf-dist/source/latex/oberdiek/luacolor.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/luacolor.dtx @@ -65,6 +65,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -135,7 +137,8 @@ and the derived files \file{luacolor.lua}{\from{luacolor.dtx}{lua}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/luatex.dtx b/Master/texmf-dist/source/latex/oberdiek/luatex.dtx index 2e3a98fb205..17346c9efbe 100644 --- a/Master/texmf-dist/source/latex/oberdiek/luatex.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/luatex.dtx @@ -70,6 +70,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -145,7 +147,8 @@ and the derived files \file{oberdiek.luatex.lua}{\from{luatex.dtx}{lua}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/magicnum.dtx b/Master/texmf-dist/source/latex/oberdiek/magicnum.dtx index 9040d9e04b9..e05179924f0 100644 --- a/Master/texmf-dist/source/latex/oberdiek/magicnum.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/magicnum.dtx @@ -69,6 +69,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -146,7 +148,8 @@ and the derived files \file{oberdiek.magicnum.lua}{\from{magicnum.dtx}{lua}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/makerobust.dtx b/Master/texmf-dist/source/latex/oberdiek/makerobust.dtx index 6322af99516..5b136489c0a 100644 --- a/Master/texmf-dist/source/latex/oberdiek/makerobust.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/makerobust.dtx @@ -60,6 +60,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -116,7 +118,8 @@ and the derived files \file{makerobust-example.tex}{\from{makerobust.dtx}{example}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins b/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins index e8b257b04c7..37afbf71537 100644 --- a/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins +++ b/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins @@ -1,5 +1,5 @@ % oberdiek.ins -% 2010/03/01 +% 2010/03/02 % % Copyright (C) 1999, 2001, 2006 by % Heiko Oberdiek <oberdiek@uni-freiburg.de> @@ -65,6 +65,7 @@ \batchinput{infwarerr.dtx} \batchinput{inputenx.dtx} \batchinput{intcalc.dtx} +\batchinput{kvdefinekeys.dtx} \batchinput{kvoptions.dtx} \batchinput{kvsetkeys.dtx} \batchinput{letltxmacro.dtx} diff --git a/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex b/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex index 536c75fd4f6..6bafab2b0ef 100644 --- a/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex +++ b/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex @@ -6,7 +6,7 @@ \newcommand*{\Subject}{CTAN:\CTANdir} \newcommand*{\Author}{Heiko Oberdiek} \newcommand*{\Email}{oberdiek@uni-freiburg.de} -\newcommand*{\Date}{2010/03/01} +\newcommand*{\Date}{2010/03/02} % Copyright (C) 2006 by % Heiko Oberdiek <oberdiek@uni-freiburg.de> @@ -75,7 +75,8 @@ \date{\Date} \providecommand*{\pdfTeX}{pdf\TeX} -\providecommand*{\plainTeX}{plain-\TeX} +\providecommand*{\plainTeX}{\mbox{plain-\TeX}} +\providecommand*{\iniTeX}{\mbox{ini-\TeX}} \providecommand*{\VTeX}{V\TeX} \providecommand*{\eTeX}{$\csname m@th\endcsname\varepsilon$-\TeX} \providecommand*{\LuaTeX}{% @@ -165,11 +166,11 @@ [\entrysep] \entry{aliascnt}{2009/09/08}{1.3}{Alias counter}% [\entrysep] -\entry{alphalph}{2008/08/11}{2.1}{Converting numbers to letters}% +\entry{alphalph}{2010/03/01}{2.2}{Converting numbers to letters}% [\entrysep] \entry{askinclude}{2008/08/11}{2.1}{Interactive asking of included files}% [\entrysep] -\entry{atbegshi}{2009/12/02}{1.10}{At begin shipout hook}% +\entry{atbegshi}{2010/03/01}{1.11}{At begin shipout hook}% [\entrysep] \entry{atenddvi}{2007/04/17}{1.1}{At end DVI hook}% [\entrysep] @@ -187,7 +188,7 @@ [\entrysep] \entry{bookmark}{2009/12/17}{1.8}{PDF bookmarks}% [\entrysep] -\entry{catchfile}{2007/11/11}{1.2}{Catches the contents of a file}% +\entry{catchfile}{2010/03/01}{1.3}{Catches the contents of a file}% [\entrysep] \entry{centernot}{2007/05/31}{1.1}{Centers the not symbol horizontally}% [\entrysep] @@ -199,9 +200,9 @@ [\entrysep] \entry{dvipscol}{2008/08/11}{1.2}{Fix for dvips.def}% [\entrysep] -\entry{embedfile}{2009/09/25}{2.4}{embed files into PDF}% +\entry{embedfile}{2010/03/01}{2.5}{embed files into PDF}% [\entrysep] -\entry{engord}{2008/08/11}{1.7}{Provides English ordinal numbers}% +\entry{engord}{2010/03/01}{1.8}{Provides English ordinal numbers}% [\entrysep] \entry{epstopdf}{2010/02/09}{2.5}{Conversion with epstopdf on the fly}% [\entrysep] @@ -235,11 +236,11 @@ [\entrysep] \entry{iflang}{2007/11/11}{1.5}{Language checks}% [\entrysep] -\entry{ifluatex}{2009/04/17}{1.2}{Provides the ifluatex switch}% +\entry{ifluatex}{2010/03/01}{1.3}{Provides the ifluatex switch}% [\entrysep] \entry{ifpdf}{2010/01/28}{2.1}{Provides the ifpdf switch}% [\entrysep] -\entry{ifvtex}{2008/11/04}{1.4}{Switches for detecting VTeX and its modes}% +\entry{ifvtex}{2010/03/01}{1.5}{Switches for detecting VTeX and its modes}% [\entrysep] \entry{infwarerr}{2007/09/09}{1.2}{Providing info/warning/message}% [\entrysep] @@ -247,15 +248,17 @@ [\entrysep] \entry{intcalc}{2007/09/27}{1.1}{Expandable integer calculations}% [\entrysep] +\entry{kvdefinekeys}{2010/03/01}{1.0}{Defining keys}% +[\entrysep] \entry{kvoptions}{2010/02/22}{3.7}{Keyval support for \LaTeX{} options}% [\entrysep] -\entry{kvsetkeys}{2010/01/28}{1.8}{Key value parser}% +\entry{kvsetkeys}{2010/03/01}{1.9}{Key value parser}% [\entrysep] \entry{letltxmacro}{2008/06/24}{1.3}{Let assignment for \LaTeX{} macros}% [\entrysep] \entry{listingsutf8}{2007/11/11}{1.1}{Adding support for UTF-8 to listings}% [\entrysep] -\entry{ltxcmds}{2010/01/28}{1.2}{\LaTeX{} kernel commands for general use}% +\entry{ltxcmds}{2010/03/01}{1.3}{\LaTeX{} kernel commands for general use}% [\entrysep] \entry{luacolor}{2009/04/10}{1.1}{Coloring based on LuaTeX's node attributes}% [\entrysep] @@ -281,13 +284,13 @@ [\entrysep] \entry{pdfcrypt}{2007/04/26}{1.0}{Setting pdf encryption}% [\entrysep] -\entry{pdfescape}{2007/11/11}{1.8}{Provides hex, PDF name and string conversions}% +\entry{pdfescape}{2010/03/01}{1.9}{Provides hex, PDF name and string conversions}% [\entrysep] \entry{pdflscape}{2008/08/11}{0.10}{Landscape pages in PDF}% [\entrysep] \entry{pdfrender}{2010/01/28}{1.2}{Access to some PDF graphics parameters}% [\entrysep] -\entry{pdftexcmds}{2009/12/12}{0.7}{Utility functions of pdfTeX for LuaTeX}% +\entry{pdftexcmds}{2010/03/01}{0.8}{Utility functions of pdfTeX for LuaTeX}% [\entrysep] \entry{picture}{2009/10/11}{1.3}{Dimens for picture macros}% [\entrysep] @@ -313,7 +316,7 @@ [\entrysep] \entry{stampinclude}{2008/07/14}{1.0}{Time stamp based including}% [\entrysep] -\entry{stringenc}{2009/12/15}{1.7}{Converts strings between encodings}% +\entry{stringenc}{2010/03/01}{1.8}{Converts strings between encodings}% [\entrysep] \entry{tabularht}{2007/04/11}{2.5}{Tabular with height specification}% [\entrysep] @@ -783,6 +786,16 @@ with integers. \tocinclude{intcalc} \newpage +\subsection{\pkgsectformat{kvdefinekeys}} +\label{kvdefinekeys} +\begin{abstract} +Package \xpackage{kvdefinekeys} provides \cs{kv@define@key} to define +keys the same way as \xpackage{keyval}'s \cs{define@key}. However, it +works also using \iniTeX. +\end{abstract} +\tocinclude{kvdefinekeys} + +\newpage \subsection{\pkgsectformat{kvoptions}} \label{kvoptions} \begin{abstract} diff --git a/Master/texmf-dist/source/latex/oberdiek/pagegrid.dtx b/Master/texmf-dist/source/latex/oberdiek/pagegrid.dtx index c95e28851e3..ed0dde94e49 100644 --- a/Master/texmf-dist/source/latex/oberdiek/pagegrid.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/pagegrid.dtx @@ -63,6 +63,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -122,7 +124,8 @@ and the derived files \file{pagegrid-test1.tex}{\from{pagegrid.dtx}{test1}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/pagesel.dtx b/Master/texmf-dist/source/latex/oberdiek/pagesel.dtx index bbae144b5ee..d14f31bd4e5 100644 --- a/Master/texmf-dist/source/latex/oberdiek/pagesel.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/pagesel.dtx @@ -58,6 +58,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -111,7 +113,8 @@ and the derived files \file{pagesel.sty}{\from{pagesel.dtx}{package}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/pdfcol.dtx b/Master/texmf-dist/source/latex/oberdiek/pdfcol.dtx index bd0b2828e51..d1598de562a 100644 --- a/Master/texmf-dist/source/latex/oberdiek/pdfcol.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/pdfcol.dtx @@ -66,6 +66,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -128,7 +130,8 @@ and the derived files \file{pdfcol-test4.tex}{\from{pdfcol.dtx}{test4}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} @@ -164,7 +167,7 @@ and the derived files %</driver> % \fi % -% \CheckSum{645} +% \CheckSum{646} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -402,13 +405,6 @@ and the derived files % % \subsection{Check requirements} % -% \begin{macro}{ifpdfcolAvailable} -% \begin{macrocode} -\newif\ifpdfcolAvailable -\pdfcolAvailabletrue -% \end{macrocode} -% \end{macro} -% % \begin{macro}{\PDFCOL@RequirePackage} % \begin{macrocode} \begingroup\expandafter\expandafter\expandafter\endgroup @@ -422,10 +418,21 @@ and the derived files % \end{macrocode} % \end{macro} % +% \begin{macrocode} +\PDFCOL@RequirePackage{ltxcmds}[2010/03/01] +% \end{macrocode} +% +% \begin{macro}{ifpdfcolAvailable} +% \begin{macrocode} +\ltx@newif\ifpdfcolAvailable +\pdfcolAvailabletrue +% \end{macrocode} +% \end{macro} +% % \subsubsection{Check package \xpackage{luacolor}} % % \begin{macrocode} -\newif\ifPDFCOL@luacolor +\ltx@newif\ifPDFCOL@luacolor \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname ver@luacolor.sty\endcsname\relax \PDFCOL@luacolorfalse diff --git a/Master/texmf-dist/source/latex/oberdiek/pdfcolfoot.dtx b/Master/texmf-dist/source/latex/oberdiek/pdfcolfoot.dtx index 1a6c860e5be..9874b102c48 100644 --- a/Master/texmf-dist/source/latex/oberdiek/pdfcolfoot.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/pdfcolfoot.dtx @@ -60,6 +60,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -116,7 +118,8 @@ and the derived files \file{pdfcolfoot-test1.tex}{\from{pdfcolfoot.dtx}{test1}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/pdfcolmk.dtx b/Master/texmf-dist/source/latex/oberdiek/pdfcolmk.dtx index dafdb3729a8..30b4330a280 100644 --- a/Master/texmf-dist/source/latex/oberdiek/pdfcolmk.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/pdfcolmk.dtx @@ -58,6 +58,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -111,7 +113,8 @@ and the derived files \file{pdfcolmk.sty}{\from{pdfcolmk.dtx}{package}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/pdfcolparallel.dtx b/Master/texmf-dist/source/latex/oberdiek/pdfcolparallel.dtx index 9dc34696b48..fdd7626ff71 100644 --- a/Master/texmf-dist/source/latex/oberdiek/pdfcolparallel.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/pdfcolparallel.dtx @@ -60,6 +60,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -116,7 +118,8 @@ and the derived files \file{pdfcolparallel-test1.tex}{\from{pdfcolparallel.dtx}{test1}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/pdfcolparcolumns.dtx b/Master/texmf-dist/source/latex/oberdiek/pdfcolparcolumns.dtx index 0689db0572e..96eea26420d 100644 --- a/Master/texmf-dist/source/latex/oberdiek/pdfcolparcolumns.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/pdfcolparcolumns.dtx @@ -60,6 +60,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -116,7 +118,8 @@ and the derived files \file{pdfcolparcolumns-test1.tex}{\from{pdfcolparcolumns.dtx}{test1}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/pdfcrypt.dtx b/Master/texmf-dist/source/latex/oberdiek/pdfcrypt.dtx index 6983870cdcc..96bfa71540f 100644 --- a/Master/texmf-dist/source/latex/oberdiek/pdfcrypt.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/pdfcrypt.dtx @@ -61,6 +61,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -117,7 +119,8 @@ and the derived files \file{pdfcrypt.sty}{\from{pdfcrypt.dtx}{package}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/pdfescape.dtx b/Master/texmf-dist/source/latex/oberdiek/pdfescape.dtx index 5171ac2a17e..b57088ea189 100644 --- a/Master/texmf-dist/source/latex/oberdiek/pdfescape.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/pdfescape.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright (C) 2007 by +% Copyright (C) 2007, 2010 by % Heiko Oberdiek <heiko.oberdiek at googlemail.com> % % This work may be distributed and/or modified under the @@ -69,6 +69,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -80,7 +82,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: pdfescape 2007/11/11 v1.8 Provides hex, PDF name and string conversions (HO)} +\Msg{* Package: pdfescape 2010/03/01 v1.9 Provides hex, PDF name and string conversions (HO)} \Msg{************************************************************************} \keepsilent @@ -91,7 +93,7 @@ This is a generated file. -Copyright (C) 2007 by +Copyright (C) 2007, 2010 by Heiko Oberdiek <heiko.oberdiek at googlemail.com> This work may be distributed and/or modified under the @@ -134,7 +136,8 @@ and the derived files \file{pdfescape-test5.tex}{\from{pdfescape.dtx}{test5}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} @@ -161,7 +164,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{pdfescape.drv}% - [2007/11/11 v1.8 Provides hex, PDF name and string conversions (HO)]% + [2010/03/01 v1.9 Provides hex, PDF name and string conversions (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2008/08/11] \begin{document} @@ -170,7 +173,7 @@ and the derived files %</driver> % \fi % -% \CheckSum{1993} +% \CheckSum{2015} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -191,7 +194,7 @@ and the derived files % \GetFileInfo{pdfescape.drv} % % \title{The \xpackage{pdfescape} package} -% \date{2007/11/11 v1.8} +% \date{2010/03/01 v1.9} % \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}} % % \maketitle @@ -336,16 +339,28 @@ and the derived files \fi \expandafter\x\csname ver@pdfescape.sty\endcsname \ProvidesPackage{pdfescape}% - [2007/11/11 v1.8 Provides hex, PDF name and string conversions (HO)] + [2010/03/01 v1.9 Provides hex, PDF name and string conversions (HO)] % \end{macrocode} % % \subsection{Catcodes} % % \begin{macrocode} -\expandafter\edef\csname PE@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname PE@AtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # \catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } \def\TMP@EnsureCode#1#2#3{% \edef\PE@AtEnd{% \PE@AtEnd @@ -1317,7 +1332,7 @@ and the derived files % \begin{macrocode} %<*test2> \ProvidesFile{pdfescape-test2.tex}% - [2007/11/11 v1.8 Test with \string\pdfescape... commands]% + [2010/03/01 v1.9 Test with \string\pdfescape... commands]% %</test2> % \end{macrocode} % @@ -1326,7 +1341,7 @@ and the derived files % \begin{macrocode} %<*test3> \ProvidesFile{pdfescape-test3.tex}% - [2007/11/11 v1.8 Test without \string\pdfescape..., with e-TeX]% + [2010/03/01 v1.9 Test without \string\pdfescape..., with e-TeX]% %</test3> % \end{macrocode} % @@ -1335,7 +1350,7 @@ and the derived files % \begin{macrocode} %<*test4> \ProvidesFile{pdfescape-test4.tex}% - [2007/11/11 v1.8 Test without \string\pdfescape... and e-TeX]% + [2010/03/01 v1.9 Test without \string\pdfescape... and e-TeX]% %</test4> % \end{macrocode} % @@ -1344,7 +1359,7 @@ and the derived files % \begin{macrocode} %<*test5> \ProvidesFile{pdfescape-test5.tex}% - [2007/11/11 v1.8 Test with LuaTeX]% + [2010/03/01 v1.9 Test with LuaTeX]% %</test5> % \end{macrocode} % @@ -2003,6 +2018,10 @@ and the derived files % \item % Use of package \xpackage{pdftexcmds} for \LuaTeX\ support. % \end{Version} +% \begin{Version}{2010/03/01 v1.9} +% \item +% Compatibility with \iniTeX. +% \end{Version} % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/source/latex/oberdiek/pdflscape.dtx b/Master/texmf-dist/source/latex/oberdiek/pdflscape.dtx index b82b89e7fb0..141b5ab3105 100644 --- a/Master/texmf-dist/source/latex/oberdiek/pdflscape.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/pdflscape.dtx @@ -70,6 +70,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -138,7 +140,8 @@ and the derived files \file{ExtractRotate.java}{\from{pdflscape.dtx}{ExtractRotate}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/pdfrender.dtx b/Master/texmf-dist/source/latex/oberdiek/pdfrender.dtx index b5189b9e546..12eb5314adb 100644 --- a/Master/texmf-dist/source/latex/oberdiek/pdfrender.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/pdfrender.dtx @@ -69,6 +69,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -134,7 +136,8 @@ and the derived files \file{pdfrender-test5.tex}{\from{pdfrender.dtx}{test5}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/pdftexcmds.dtx b/Master/texmf-dist/source/latex/oberdiek/pdftexcmds.dtx index e983797dd41..e0b98b675c4 100644 --- a/Master/texmf-dist/source/latex/oberdiek/pdftexcmds.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/pdftexcmds.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright (C) 2007 by +% Copyright (C) 2007, 2009, 2010 by % Heiko Oberdiek <heiko.oberdiek at googlemail.com> % % This work may be distributed and/or modified under the @@ -67,6 +67,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -78,7 +80,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: pdftexcmds 2009/12/12 v0.7 Utility functions of pdfTeX for LuaTeX (HO)} +\Msg{* Package: pdftexcmds 2010/03/01 v0.8 Utility functions of pdfTeX for LuaTeX (HO)} \Msg{************************************************************************} \keepsilent @@ -89,7 +91,7 @@ This is a generated file. -Copyright (C) 2007 by +Copyright (C) 2007, 2009, 2010 by Heiko Oberdiek <heiko.oberdiek at googlemail.com> This work may be distributed and/or modified under the @@ -139,7 +141,8 @@ and the derived files \file{pdftexcmds.lua}{\from{pdftexcmds.dtx}{lua}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} @@ -166,7 +169,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{pdftexcmds.drv}% - [2009/12/12 v0.7 Utility functions of pdfTeX for LuaTeX (HO)]% + [2010/03/01 v0.8 Utility functions of pdfTeX for LuaTeX (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2008/08/11] \usepackage{paralist} @@ -197,7 +200,7 @@ and the derived files % \GetFileInfo{pdftexcmds.drv} % % \title{The \xpackage{pdftexcmds} package} -% \date{2009/12/12 v0.7} +% \date{2010/03/01 v0.8} % \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}} % % \maketitle @@ -476,7 +479,7 @@ and the derived files \fi \expandafter\x\csname ver@pdftexcmds.sty\endcsname \ProvidesPackage{pdftexcmds}% - [2009/12/12 v0.7 Utility functions of pdfTeX for LuaTeX (HO)] + [2010/03/01 v0.8 Utility functions of pdfTeX for LuaTeX (HO)] % \end{macrocode} % % \subsection{Catcodes} @@ -542,7 +545,7 @@ and the derived files \input ltxcmds.sty\relax \else \RequirePackage{infwarerr}[2007/09/09]% - \RequirePackage{ifluatex}[2009/04/10]% + \RequirePackage{ifluatex}[2010/03/01]% \RequirePackage{ltxcmds}% \fi % \end{macrocode} @@ -1724,6 +1727,10 @@ end % \item % Short info shortened. % \end{Version} +% \begin{Version}{2010/03/01 v0.8} +% \item +% Required date for package \xpackage{ifluatex} updated. +% \end{Version} % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/source/latex/oberdiek/picture.dtx b/Master/texmf-dist/source/latex/oberdiek/picture.dtx index 158cd08d08e..386b90f4a79 100644 --- a/Master/texmf-dist/source/latex/oberdiek/picture.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/picture.dtx @@ -60,6 +60,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -116,7 +118,8 @@ and the derived files \file{picture-example.tex}{\from{picture.dtx}{example}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/pmboxdraw.dtx b/Master/texmf-dist/source/latex/oberdiek/pmboxdraw.dtx index d677a21ed67..b2f0b254102 100644 --- a/Master/texmf-dist/source/latex/oberdiek/pmboxdraw.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/pmboxdraw.dtx @@ -60,6 +60,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -115,7 +117,8 @@ and the derived files \file{pmboxdrawenc.dfu}{\from{pmboxdraw.dtx}{utf8}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/refcount.dtx b/Master/texmf-dist/source/latex/oberdiek/refcount.dtx index b30f23abddf..2240771f766 100644 --- a/Master/texmf-dist/source/latex/oberdiek/refcount.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/refcount.dtx @@ -58,6 +58,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -111,7 +113,8 @@ and the derived files \file{refcount.sty}{\from{refcount.dtx}{package}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/rerunfilecheck.dtx b/Master/texmf-dist/source/latex/oberdiek/rerunfilecheck.dtx index 20cc7c870bd..dd2220bcca5 100644 --- a/Master/texmf-dist/source/latex/oberdiek/rerunfilecheck.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/rerunfilecheck.dtx @@ -62,6 +62,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -123,7 +125,8 @@ and the derived files \file{rerunfilecheck-example.cfg}{\from{rerunfilecheck.dtx}{cfg}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/resizegather.dtx b/Master/texmf-dist/source/latex/oberdiek/resizegather.dtx index 07f5b29d344..2f02f18109c 100644 --- a/Master/texmf-dist/source/latex/oberdiek/resizegather.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/resizegather.dtx @@ -60,6 +60,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -116,7 +118,8 @@ and the derived files \file{resizegather-test1.tex}{\from{resizegather.dtx}{test1}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/scrindex.dtx b/Master/texmf-dist/source/latex/oberdiek/scrindex.dtx index 607773ae1b3..1fff9383356 100644 --- a/Master/texmf-dist/source/latex/oberdiek/scrindex.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/scrindex.dtx @@ -61,6 +61,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -118,7 +120,8 @@ and the derived files \file{scrindex-example2.tex}{\from{scrindex.dtx}{example2}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/selinput.dtx b/Master/texmf-dist/source/latex/oberdiek/selinput.dtx index 416e513f721..d582a242ea2 100644 --- a/Master/texmf-dist/source/latex/oberdiek/selinput.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/selinput.dtx @@ -65,6 +65,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -126,7 +128,8 @@ and the derived files \file{selinput-test5.tex}{\from{selinput.dtx}{test,test5}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/setouterhbox.dtx b/Master/texmf-dist/source/latex/oberdiek/setouterhbox.dtx index 12d818fb95f..d0052cf143c 100644 --- a/Master/texmf-dist/source/latex/oberdiek/setouterhbox.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/setouterhbox.dtx @@ -66,6 +66,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -129,7 +131,8 @@ and the derived files \file{setouterhbox-test2.tex}{\from{setouterhbox.dtx}{test2}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/settobox.dtx b/Master/texmf-dist/source/latex/oberdiek/settobox.dtx index e4a937a7c29..e922552b34b 100644 --- a/Master/texmf-dist/source/latex/oberdiek/settobox.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/settobox.dtx @@ -60,6 +60,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -116,7 +118,8 @@ and the derived files \file{settobox-example.tex}{\from{settobox.dtx}{example}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/soulutf8.dtx b/Master/texmf-dist/source/latex/oberdiek/soulutf8.dtx index 952df29f8a0..349cd5ba858 100644 --- a/Master/texmf-dist/source/latex/oberdiek/soulutf8.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/soulutf8.dtx @@ -68,6 +68,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -132,7 +134,8 @@ and the derived files \file{soulutf8-test5.tex}{\from{soulutf8.dtx}{test5,utf8x,noetex}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/stackrel.dtx b/Master/texmf-dist/source/latex/oberdiek/stackrel.dtx index f4491c872c5..3491ea954c0 100644 --- a/Master/texmf-dist/source/latex/oberdiek/stackrel.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/stackrel.dtx @@ -58,6 +58,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -111,7 +113,8 @@ and the derived files \file{stackrel.sty}{\from{stackrel.dtx}{package}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/stampinclude.dtx b/Master/texmf-dist/source/latex/oberdiek/stampinclude.dtx index de68d6df775..417fb2d0e5a 100644 --- a/Master/texmf-dist/source/latex/oberdiek/stampinclude.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/stampinclude.dtx @@ -58,6 +58,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -111,7 +113,8 @@ and the derived files \file{stampinclude.sty}{\from{stampinclude.dtx}{package}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/stringenc.dtx b/Master/texmf-dist/source/latex/oberdiek/stringenc.dtx index 3d949ea52bc..9547b19af23 100644 --- a/Master/texmf-dist/source/latex/oberdiek/stringenc.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/stringenc.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright (C) 2007-2009 by +% Copyright (C) 2007-2010 by % Heiko Oberdiek <heiko.oberdiek at googlemail.com> % % This work may be distributed and/or modified under the @@ -116,6 +116,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -127,7 +129,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: stringenc 2009/12/15 v1.7 Converts strings between encodings (HO)} +\Msg{* Package: stringenc 2010/03/01 v1.8 Converts strings between encodings (HO)} \Msg{************************************************************************} \keepsilent @@ -138,7 +140,7 @@ This is a generated file. -Copyright (C) 2007-2009 by +Copyright (C) 2007-2010 by Heiko Oberdiek <heiko.oberdiek at googlemail.com> This work may be distributed and/or modified under the @@ -228,7 +230,8 @@ and the derived files \file{stringenc-test2.tex}{\from{stringenc.dtx}{test2}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} @@ -267,7 +270,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{stringenc.drv}% - [2009/12/15 v1.7 Converts strings between encodings (HO)]% + [2010/03/01 v1.8 Converts strings between encodings (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2008/08/11] \usepackage{longtable} @@ -277,7 +280,7 @@ and the derived files %</driver> % \fi % -% \CheckSum{6070} +% \CheckSum{6133} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -298,7 +301,7 @@ and the derived files % \GetFileInfo{stringenc.drv} % % \title{The \xpackage{stringenc} package} -% \date{2009/12/15 v1.7} +% \date{2010/03/01 v1.8} % \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}} % % \maketitle @@ -508,16 +511,28 @@ and the derived files \fi \expandafter\x\csname ver@stringenc.sty\endcsname \ProvidesPackage{stringenc}% - [2009/12/15 v1.7 Converts strings between encodings (HO)] + [2010/03/01 v1.8 Converts strings between encodings (HO)] % \end{macrocode} % % \subsection{Catcodes} % % \begin{macrocode} -\expandafter\edef\csname SE@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname SE@AtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # \catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } \def\TMP@EnsureCode#1#2#3{% \edef\SE@AtEnd{% \SE@AtEnd @@ -556,43 +571,15 @@ and the derived files \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname RequirePackage\endcsname\relax \input infwarerr.sty\relax + \input ltxcmds.sty\relax \input pdfescape.sty\relax \else \RequirePackage{infwarerr}[2007/09/09]% - \RequirePackage{pdfescape}[2007/09/09]% + \RequirePackage{ltxcmds}[2010/03/01]% + \RequirePackage{pdfescape}[2010/03/01]% \fi % \end{macrocode} % -% \begin{macro}{\SE@Empty} -% \begin{macrocode} -\def\SE@Empty{} -% \end{macrocode} -% \end{macro} -% \begin{macro}{\SE@FirstOfOne} -% \begin{macrocode} -\long\def\SE@FirstOfOne#1{#1} -% \end{macrocode} -% \end{macro} -% \begin{macro}{\SE@FirstOfTwo} -% \begin{macrocode} -\long\def\SE@FirstOfTwo#1#2{#1} -% \end{macrocode} -% \end{macro} -% \begin{macro}{\SE@SecondOfTwo} -% \begin{macrocode} -\long\def\SE@SecondOfTwo#1#2{#2} -% \end{macrocode} -% \end{macro} -% \begin{macro}{\SE@GobbleTwo} -% \begin{macrocode} -\long\def\SE@GobbleTwo#1#2{} -% \end{macrocode} -% \end{macro} -% \begin{macro}{\SE@GobbleFour} -% \begin{macrocode} -\long\def\SE@GobbleFour#1#2#3#4{} -% \end{macrocode} -% \end{macro} % \begin{macro}{\SE@GobbleEight} % \begin{macrocode} \long\def\SE@GobbleEight#1#2#3#4#5#6#7#8{} @@ -625,27 +612,57 @@ and the derived files % \end{macrocode} % \end{macro} % -% \begin{macro}{\SE@zero} +% \begin{macro}{\SE@ResultAdd} % \begin{macrocode} -\chardef\SE@zero=0 % +\def\SE@ResultAdd#1{% + \edef\SE@result{\SE@result#1}% +} % \end{macrocode} % \end{macro} -% \begin{macro}{\SE@one} +% % \begin{macrocode} -\chardef\SE@one=1 % +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname newif\endcsname\relax +% \end{macrocode} +% \begin{macro}{\SE@newif} +% \begin{macrocode} + \def\SE@newif#1{% + \begingroup + \escapechar=-1 % + \expandafter\endgroup + \expandafter\SE@@newif\string#1\@nil + }% % \end{macrocode} % \end{macro} -% -% \begin{macro}{\SE@ResultAdd} +% \begin{macro}{\SE@@newif} % \begin{macrocode} -\def\SE@ResultAdd#1{% - \edef\SE@result{\SE@result#1}% -} + \def\SE@@newif#1#2#3\@nil{% + \expandafter\edef\csname#3true\endcsname{% + \let + \expandafter\noexpand\csname if#3\endcsname + \expandafter\noexpand\csname iftrue\endcsname + }% + \expandafter\edef\csname#3false\endcsname{% + \let + \expandafter\noexpand\csname if#3\endcsname + \expandafter\noexpand\csname iffalse\endcsname + }% + \csname#3false\endcsname + }% +% \end{macrocode} +% \end{macro} +% \begin{macrocode} +\else +% \end{macrocode} +% \begin{macro}{\SE@newif} +% \begin{macrocode} + \expandafter\let\expandafter\SE@newif\csname newif\endcsname +\fi % \end{macrocode} % \end{macro} % % \begin{macrocode} -\newif\ifSE@invalid +\SE@newif\ifSE@invalid % \end{macrocode} % % \begin{macro}{\SE@InvalidCharacter} @@ -662,7 +679,7 @@ and the derived files % the result is stored in macro |#1|. % \begin{macrocode} \def\SE@ConvertTo#1#2#3{% - \let\SE@result\SE@Empty + \let\SE@result\ltx@empty \EdefSanitize\SE@encoding{#3}% \expandafter\ifx\csname\SE@PrefixTo\SE@encoding\endcsname\relax \StringEncodingLoad\SE@encoding @@ -733,12 +750,12 @@ and the derived files \let\SE@next\relax \else \ifcase\ifnum"#1#2#3#4<"DC00 % - \SE@zero + \ltx@zero \else \ifnum"#1#2#3#4>"DFFF % - \SE@zero + \ltx@zero \else - \SE@one + \ltx@one \fi \fi \SE@InvalidCharacter @@ -771,7 +788,7 @@ and the derived files % the result is stored in macro |#1|. % \begin{macrocode} \def\SE@ConvertFrom#1#2#3{% - \let\SE@result\SE@Empty + \let\SE@result\ltx@empty \EdefSanitize\SE@encoding{#3}% \expandafter\ifx\csname\SE@PrefixFrom\SE@encoding\endcsname\relax \StringEncodingLoad\SE@encoding @@ -910,7 +927,7 @@ and the derived files % % \begin{macro}{\ifSE@numexpr} % \begin{macrocode} -\newif\ifSE@numexpr +\SE@newif\ifSE@numexpr \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname numexpr\endcsname\relax \else @@ -933,7 +950,7 @@ and the derived files % \begin{macrocode} \def\SE@Nibble@NumToHex#1{% $ \ifcase\numexpr#1\relax -& \expandafter\ifcase\expandafter\SE@FirstOfOne\expandafter{\number#1} % +& \expandafter\ifcase\expandafter\ltx@firstofone\expandafter{\number#1} % 0\or 1\or 2\or 3\or 4\or 5\or 6\or 7\or 8\or 9\or A\or B\or C\or D\or E\or F% \fi @@ -945,7 +962,7 @@ $ \ifcase\numexpr#1\relax \def\SE@Nibble@NumToBin#1{% $ \ifcase\numexpr#1\relax & \expandafter -& \ifcase\expandafter\SE@FirstOfOne\expandafter{\number#1} % +& \ifcase\expandafter\ltx@firstofone\expandafter{\number#1} % 0000\or 0001\or 0010\or @@ -970,39 +987,39 @@ $ \ifcase\numexpr#1\relax % \begin{macro}{\SE@Nibbles@BinToHex} % \begin{macrocode} \def\SE@Nibbles@BinToHex#1{% - \expandafter\SE@@Nibbles@BinToHex#1\SE@Empty\SE@Empty - \SE@Empty\SE@Empty + \expandafter\SE@@Nibbles@BinToHex#1\ltx@empty\ltx@empty + \ltx@empty\ltx@empty } \def\SE@@Nibbles@BinToHex#1#2#3#4{% - \ifx#1\SE@Empty + \ifx#1\ltx@empty \else $ \SE@Nibble@NumToHex{% $ \numexpr#4+2*(#3+2*(#2+2*#1))\relax $ }% -& \ifnum#1>\SE@zero -& \ifnum#2>\SE@zero -& \ifnum#3>\SE@zero -& \ifnum#4>\SE@zero +& \ifnum#1>\ltx@zero +& \ifnum#2>\ltx@zero +& \ifnum#3>\ltx@zero +& \ifnum#4>\ltx@zero & F% & \else & E% & \fi & \else -& \ifnum#4>\SE@zero +& \ifnum#4>\ltx@zero & D% & \else & C% & \fi & \fi & \else -& \ifnum#3>\SE@zero -& \ifnum#4>\SE@zero +& \ifnum#3>\ltx@zero +& \ifnum#4>\ltx@zero & B% & \else & A% & \fi & \else -& \ifnum#4>\SE@zero +& \ifnum#4>\ltx@zero & 9% & \else & 8% @@ -1010,29 +1027,29 @@ $ }% & \fi & \fi & \else -& \ifnum#2>\SE@zero -& \ifnum#3>\SE@zero -& \ifnum#4>\SE@zero +& \ifnum#2>\ltx@zero +& \ifnum#3>\ltx@zero +& \ifnum#4>\ltx@zero & 7% & \else & 6% & \fi & \else -& \ifnum#4>\SE@zero +& \ifnum#4>\ltx@zero & 5% & \else & 4% & \fi & \fi & \else -& \ifnum#3>\SE@zero -& \ifnum#4>\SE@zero +& \ifnum#3>\ltx@zero +& \ifnum#4>\ltx@zero & 3% & \else & 2% & \fi & \else -& \ifnum#4>\SE@zero +& \ifnum#4>\ltx@zero & 1% & \else & 0% @@ -1051,10 +1068,10 @@ $ }% \def\SE@Add#1#2#3{% $ \edef#1{\the\numexpr(#2)+(#3)\relax}% & \begingroup -& \count\SE@zero=#2\relax -& \advance\count\SE@zero by#3\relax +& \count\ltx@zero=#2\relax +& \advance\count\ltx@zero by#3\relax & \edef\x{\endgroup -& \def\noexpand#1{\the\count\SE@zero}% +& \def\noexpand#1{\the\count\ltx@zero}% & }% & \x } @@ -1190,9 +1207,9 @@ $ \fi % \begin{macrocode} \def\StringEncodingSuccessFailure{% \ifSE@invalid - \expandafter\SE@SecondOfTwo + \expandafter\ltx@secondoftwo \else - \expandafter\SE@FirstOfTwo + \expandafter\ltx@firstoftwo \fi } % \end{macrocode} @@ -1205,7 +1222,7 @@ $ \fi \SE@TestModefalse \StringEncodingSuccessFailure } -\newif\ifSE@TestMode +\SE@newif\ifSE@TestMode % \end{macrocode} % \end{macro} % \begin{macro}{\SE@utfxvi} @@ -1252,11 +1269,11 @@ $ \fi \def\SE@@CheckByteOrderTwo#1#2#3#4#5\@nil{% \ifnum"#1#2#3#4="FEFF % \let\SE@from\SE@utfxvibe - \edef\SE@result{\expandafter\SE@GobbleFour\SE@result}% + \edef\SE@result{\expandafter\ltx@gobblefour\SE@result}% \else \ifnum"#3#4#1#2="FEFF % \let\SE@from\SE@utfxvile - \edef\SE@result{\expandafter\SE@GobbleFour\SE@result}% + \edef\SE@result{\expandafter\ltx@gobblefour\SE@result}% \else \let\SE@from\SE@utfxvibe \fi @@ -1277,12 +1294,12 @@ $ \fi } \def\SE@@CheckByteOrderFour#1#2#3#4#5#6#7#8#9\@nil{% \let\SE@from\SE@utfxxxiibe - \ifnum"#1#2#3#4=\SE@zero + \ifnum"#1#2#3#4=\ltx@zero \ifnum"#5#6#7#8="FEFF % \edef\SE@result{\expandafter\SE@GobbleEight\SE@result}% \fi \else - \ifnum"#7#8#5#6=\SE@zero + \ifnum"#7#8#5#6=\ltx@zero \ifnum"#3#4#1#2="FEFF % \let\SE@from\SE@utfxxxiile \edef\SE@result{\expandafter\SE@GobbleEight\SE@result}% @@ -1297,7 +1314,7 @@ $ \fi % \begin{macrocode} \def\SE@RemoveByteOrderTwo{% \expandafter\SE@@RemoveByteOrderTwo\SE@result - \SE@Empty\SE@Empty\SE@Empty\SE@Empty\@nil + \ltx@empty\ltx@empty\ltx@empty\ltx@empty\@nil } \def\SE@@RemoveByteOrderTwo#1#2#3#4#5\@nil#6{% \ifnum"0#1#2#3#4="#6 % @@ -1312,8 +1329,8 @@ $ \fi \def\SE@a{"#1 }% \def\SE@b{"#2 }% \expandafter\SE@@RemoveByteOrderFour\SE@result - \SE@Empty\SE@Empty\SE@Empty\SE@Empty - \SE@Empty\SE@Empty\SE@Empty\SE@Empty + \ltx@empty\ltx@empty\ltx@empty\ltx@empty + \ltx@empty\ltx@empty\ltx@empty\ltx@empty \@nil } \def\SE@@RemoveByteOrderFour#1#2#3#4#5#6#7#8#9\@nil{% @@ -1466,8 +1483,8 @@ $ \fi % % \begin{macrocode} %<*utf32> -%<utf32be>\ProvidesFile{se-utf32be.def}[2009/12/15 v1.7 stringenc: UTF-32BE] -%<utf32le>\ProvidesFile{se-utf32le.def}[2009/12/15 v1.7 stringenc: UTF-32LE] +%<utf32be>\ProvidesFile{se-utf32be.def}[2010/03/01 v1.8 stringenc: UTF-32BE] +%<utf32le>\ProvidesFile{se-utf32le.def}[2010/03/01 v1.8 stringenc: UTF-32LE] % \end{macrocode} % % \begin{macrocode} @@ -1490,17 +1507,17 @@ $ \fi \edef\SE@a{\SE@Nibble@NumToBin{"#3}}% \edef\SE@c{\SE@Nibble@NumToBin{"#6}}% \edef\SE@w{% - \expandafter\SE@GobbleTwo\SE@w + \expandafter\ltx@gobbletwo\SE@w \expandafter\SE@CarTwo\SE@a\@nil }% \edef\SE@w{% \SE@Nibbles@BinToHex\SE@w }% - \SE@Add\SE@w{\expandafter"\SE@w}\SE@one + \SE@Add\SE@w{\expandafter"\SE@w}\ltx@one \edef\SE@a{% - \expandafter\SE@GobbleTwo\SE@a + \expandafter\ltx@gobbletwo\SE@a \SE@Nibble@NumToBin{"#4}% - \expandafter\SE@GobbleTwo\SE@c + \expandafter\ltx@gobbletwo\SE@c }% %<utf32be> \SE@ResultAdd{% %<utf32le> \SE@utfxxxii@le@add{% @@ -1572,19 +1589,19 @@ $ \fi % \end{macrocode} % \begin{macrocode} \gdef\SE@utfxxxii@from#1#2#3#4#5#6#7#8{% - \ifcase\ifnum"#1#2>\z@ - \SE@zero + \ifcase\ifnum"#1#2>\ltx@zero + \ltx@zero \else \ifnum"#3#4#5#6#7#8>"10FFFF % - \SE@zero + \ltx@zero \else \ifnum"#3#4#5#6#7#8<"D800 % - \SE@one + \ltx@one \else \ifnum"#3#4#5#6#7#8>"DFFF % - \SE@one + \ltx@one \else - \SE@zero + \ltx@zero \fi \fi \fi @@ -1605,7 +1622,7 @@ $ \fi \expandafter\SE@CarTwo\SE@low\@nil }% \edef\SE@low{% - 11\expandafter\SE@GobbleTwo\SE@low + 11\expandafter\ltx@gobbletwo\SE@low }% \SE@ResultAdd{% D\SE@Nibbles@BinToHex\SE@high @@ -1625,7 +1642,7 @@ $ \fi % % \begin{macrocode} %<*utf8> -\ProvidesFile{se-utf8.def}[2009/12/15 v1.7 stringenc: UTF-8] +\ProvidesFile{se-utf8.def}[2010/03/01 v1.8 stringenc: UTF-8] % \end{macrocode} % % \noindent @@ -1646,7 +1663,7 @@ $ \fi \SE@Nibble@NumToBin{"#2}% \expandafter\SE@CarTwo\SE@temp\@nil 10% - \expandafter\SE@GobbleTwo\SE@temp + \expandafter\ltx@gobbletwo\SE@temp }% \SE@ResultAdd{% \SE@Nibbles@BinToHex\SE@temp @@ -1661,7 +1678,7 @@ $ \fi \SE@Nibble@NumToBin{"#2}% \expandafter\SE@CarTwo\SE@temp\@nil 10% - \expandafter\SE@GobbleTwo\SE@temp + \expandafter\ltx@gobbletwo\SE@temp }% \SE@ResultAdd{% E#1% @@ -1687,13 +1704,13 @@ $ \fi \edef\SE@c{\SE@Nibble@NumToBin{"#6}}% \edef\SE@d{\SE@Nibble@NumToBin{"#7}}% \edef\SE@w{% - \expandafter\SE@GobbleTwo\SE@w + \expandafter\ltx@gobbletwo\SE@w \expandafter\SE@CarTwo\SE@a\@nil }% \edef\SE@w{% \SE@Nibbles@BinToHex\SE@w }% - \SE@Add\SE@w{\expandafter"\SE@w}\SE@one + \SE@Add\SE@w{\expandafter"\SE@w}\ltx@one \ifnum\SE@w>15 % \def\SE@char{1}% \SE@Add\SE@w\SE@w{-16}% @@ -1705,15 +1722,15 @@ $ \fi 0\SE@char \expandafter\SE@CarTwo\SE@w\@nil 10% - \expandafter\SE@GobbleTwo\SE@w - \expandafter\SE@GobbleTwo\SE@a + \expandafter\ltx@gobbletwo\SE@w + \expandafter\ltx@gobbletwo\SE@a \expandafter\SE@CarTwo\SE@b\@nil 10% - \expandafter\SE@GobbleTwo\SE@b - \expandafter\SE@GobbleTwo\SE@c + \expandafter\ltx@gobbletwo\SE@b + \expandafter\ltx@gobbletwo\SE@c \expandafter\SE@CarTwo\SE@d\@nil 10% - \expandafter\SE@GobbleTwo\SE@d + \expandafter\ltx@gobbletwo\SE@d }% \SE@ResultAdd{% F% @@ -1725,17 +1742,17 @@ $ \fi % % \begin{macrocode} \expandafter\gdef\csname\SE@PrefixFrom utf8\endcsname#1{% - \let\SE@temp\SE@Empty + \let\SE@temp\ltx@empty \let\SE@next\SE@utfviii@filter \expandafter\SE@utfviii@filter#1\relax\relax \ifcase\ifSE@TestMode \ifSE@invalid - \SE@one + \ltx@one \else - \SE@zero + \ltx@zero \fi \else - \SE@zero + \ltx@zero \fi \expandafter\SE@utfviii@from\SE@temp\relax\relax\relax\relax \relax\relax\relax\relax @@ -1749,15 +1766,15 @@ $ \fi \let\SE@next\relax \else \ifcase\ifnum"#1#2>"F4 % - \SE@zero + \ltx@zero \else \ifnum"#1#2="C0 % - \SE@zero + \ltx@zero \else \ifnum"#1#2="C1 % - \SE@zero + \ltx@zero \else - \SE@one + \ltx@one \fi \fi \fi @@ -1807,7 +1824,7 @@ $ \fi \edef\SE@temp{% 0\ifodd"#1 1\else 0\fi \SE@Nibble@NumToBin{"#2}% - \expandafter\SE@GobbleTwo\SE@temp + \expandafter\ltx@gobbletwo\SE@temp }% \SE@ResultAdd{% 0% @@ -1832,19 +1849,19 @@ $ \fi % zzzz yyyy yyxx xxxx \ifcase\ifnum"#2="D % \ifnum"#3#4>"9F % - \SE@zero + \ltx@zero \else - \SE@one + \ltx@one \fi \else - \ifnum"#2=\SE@zero + \ifnum"#2=\ltx@zero \ifnum"#3<"A % - \SE@zero + \ltx@zero \else - \SE@one + \ltx@one \fi \else - \SE@one + \ltx@one \fi \fi \SE@InvalidCharacter @@ -1857,9 +1874,9 @@ $ \fi \edef\SE@a{\SE@Nibble@NumToBin{"#3}}% \edef\SE@b{\SE@Nibble@NumToBin{"#5}}% \edef\SE@temp{% - \expandafter\SE@GobbleTwo\SE@a + \expandafter\ltx@gobbletwo\SE@a \SE@Nibble@NumToBin{"#4}% - \expandafter\SE@GobbleTwo\SE@b + \expandafter\ltx@gobbletwo\SE@b }% \SE@ResultAdd{% #2% @@ -1888,7 +1905,7 @@ $ \fi \edef\SE@w{% 00% \SE@Nibble@NumToBin{"#2}% - \expandafter\SE@GobbleTwo\SE@w + \expandafter\ltx@gobbletwo\SE@w }% \edef\SE@w{\SE@Nibbles@BinToHex\SE@w}% \SE@Add\SE@w{\expandafter"\SE@w}{-1}% @@ -1898,7 +1915,7 @@ $ \fi \let\SE@next\SE@SkipRemaining \fi \else - \ifnum\SE@w<\SE@zero + \ifnum\SE@w<\ltx@zero \SE@InvalidCharacter \ifSE@TestMode \let\SE@next\SE@SkipRemaining @@ -1910,11 +1927,11 @@ $ \fi 10% \SE@Nibble@NumToBin\SE@w \SE@Nibble@NumToBin{"#4}% - \expandafter\SE@GobbleTwo\SE@a + \expandafter\ltx@gobbletwo\SE@a 1101% 11% \SE@Nibble@NumToBin{"#6}% - \expandafter\SE@GobbleTwo\SE@b + \expandafter\ltx@gobbletwo\SE@b }% \SE@ResultAdd{% D% @@ -1946,12 +1963,12 @@ $ \fi % \begin{macrocode} \gdef\SE@utfviii@CheckCont#1{% \ifnum"#1<8 % - \SE@zero + \ltx@zero \else \ifnum"#1<12 % - \SE@one + \ltx@one \else - \SE@zero + \ltx@zero \fi \fi } @@ -1965,7 +1982,7 @@ $ \fi % % \begin{macrocode} %<*utf16le> -\ProvidesFile{se-utf16le.def}[2009/12/15 v1.7 stringenc: UTF-16LE] +\ProvidesFile{se-utf16le.def}[2010/03/01 v1.8 stringenc: UTF-16LE] % \end{macrocode} % % \begin{macrocode} @@ -2005,7 +2022,7 @@ $ \fi % % \begin{macrocode} %<*pdfdoc> -\ProvidesFile{se-pdfdoc.def}[2009/12/15 v1.7 stringenc: PDFDocEncoding] +\ProvidesFile{se-pdfdoc.def}[2010/03/01 v1.8 stringenc: PDFDocEncoding] % \end{macrocode} % % Pass ranges 32..126 and 160..255 through and use @@ -2014,20 +2031,20 @@ $ \fi \expandafter\gdef\csname\SE@PrefixTo pdfdoc\endcsname#1#2#3#4{% \ifcase\ifnum"#1#2#3#4<256 % \ifnum"#1#2#3#4>160 % - \SE@zero + \ltx@zero \else \ifnum"#1#2#3#4<127 % \ifnum"#1#2#3#4>31 % - \SE@zero + \ltx@zero \else - \SE@one + \ltx@one \fi \else - \SE@one + \ltx@one \fi \fi \else - \SE@one + \ltx@one \fi \SE@ResultAdd{#3#4}% \else @@ -2055,17 +2072,17 @@ $ \fi \ifnum"#1#2="AD % 2 % \else - \SE@zero + \ltx@zero \fi \else \ifnum"#1#2<127 % \ifnum"#1#2>31 % - \SE@zero + \ltx@zero \else - \SE@one + \ltx@one \fi \else - \SE@one + \ltx@one \fi \fi \SE@ResultAdd{00#1#2}% @@ -2136,24 +2153,24 @@ $ \fi % % \begin{macrocode} %<*iso-8859-1> -\ProvidesFile{se-iso-8859-1.def}[2009/12/15 v1.7 stringenc: ISO-8859-1] +\ProvidesFile{se-iso-8859-1.def}[2010/03/01 v1.8 stringenc: ISO-8859-1] % \end{macrocode} % % Excluded area: 0x80..0x9F % \begin{macrocode} \expandafter\gdef\csname\SE@PrefixTo iso-8859-1\endcsname#1#2#3#4{% - \ifcase\ifnum"#1#2=\SE@zero + \ifcase\ifnum"#1#2=\ltx@zero \ifnum"#3#4<"80 % - \SE@one + \ltx@one \else \ifnum"#3#4>"9F % - \SE@one + \ltx@one \else - \SE@zero + \ltx@zero \fi \fi \else - \SE@zero + \ltx@zero \fi \SE@InvalidCharacter \else @@ -2178,12 +2195,12 @@ $ \fi \let\SE@next\relax \else \ifcase\ifnum"#1#2<"80 % - \SE@one + \ltx@one \else \ifnum"#1#2>"9F % - \SE@one + \ltx@one \else - \SE@zero + \ltx@zero \fi \fi \SE@InvalidCharacter @@ -2206,23 +2223,23 @@ $ \fi % % \begin{macrocode} %<*cp1252> -\ProvidesFile{se-cp1252.def}[2009/12/15 v1.7 stringenc: cp1252] +\ProvidesFile{se-cp1252.def}[2010/03/01 v1.8 stringenc: cp1252] % \end{macrocode} % % \begin{macrocode} \expandafter\gdef\csname\SE@PrefixTo cp1252\endcsname#1#2#3#4{% - \ifcase\ifnum"#1#2=\SE@zero + \ifcase\ifnum"#1#2=\ltx@zero \ifnum"#3#4<"80 % - \SE@one + \ltx@one \else \ifnum"#3#4>"9F % - \SE@one + \ltx@one \else - \SE@zero + \ltx@zero \fi \fi \else - \SE@zero + \ltx@zero \fi \SE@MapConvertTo{cp1252}{#1#2#3#4}% \else @@ -2247,12 +2264,12 @@ $ \fi \let\SE@next\relax \else \ifcase\ifnum"#1#2<"80 % - \SE@one + \ltx@one \else \ifnum"#1#2>"9F % - \SE@one + \ltx@one \else - \SE@zero + \ltx@zero \fi \fi \SE@MapConvertFrom{cp1252}{#1#2}% @@ -2307,7 +2324,7 @@ $ \fi % % \begin{macrocode} %<*ascii> -\ProvidesFile{se-ascii.def}[2009/12/15 v1.7 stringenc: US-ASCII] +\ProvidesFile{se-ascii.def}[2010/03/01 v1.8 stringenc: US-ASCII] % \end{macrocode} % % \begin{macrocode} @@ -2356,12 +2373,12 @@ $ \fi % \begin{macrocode} %<*ascii-print> \ProvidesFile{se-ascii-print.def}% - [2009/12/15 v1.7 stringenc: Printable ASCII characters]% + [2010/03/01 v1.8 stringenc: Printable ASCII characters]% % \end{macrocode} % % \begin{macrocode} \expandafter\gdef\csname\SE@PrefixTo ascii-print\endcsname#1#2#3#4{% - \ifnum"#1#2=\z@ % + \ifnum"#1#2=\ltx@zero \ifnum"#3#4<127 % \ifnum"#3#4>31 % \SE@ResultAdd{#3#4}% @@ -2419,7 +2436,7 @@ $ \fi % % \begin{macrocode} %<*clean7bit> -\ProvidesFile{se-clean7bit.def}[2009/12/15 v1.7 stringenc: Clean7Bit] +\ProvidesFile{se-clean7bit.def}[2010/03/01 v1.8 stringenc: Clean7Bit] % \end{macrocode} % % \begin{macrocode} @@ -2505,123 +2522,123 @@ $ \fi % % \begin{macrocode} %<*iso-8859-2> -\ProvidesFile{se-iso-8859-2.def}[2009/12/15 v1.7 stringenc: ISO-8859-2] +\ProvidesFile{se-iso-8859-2.def}[2010/03/01 v1.8 stringenc: ISO-8859-2] \def\SE@this{iso-8859-2} %</iso-8859-2> %<*iso-8859-3> -\ProvidesFile{se-iso-8859-3.def}[2009/12/15 v1.7 stringenc: ISO-8859-3] +\ProvidesFile{se-iso-8859-3.def}[2010/03/01 v1.8 stringenc: ISO-8859-3] \def\SE@this{iso-8859-3} %</iso-8859-3> %<*iso-8859-4> -\ProvidesFile{se-iso-8859-4.def}[2009/12/15 v1.7 stringenc: ISO-8859-4] +\ProvidesFile{se-iso-8859-4.def}[2010/03/01 v1.8 stringenc: ISO-8859-4] \def\SE@this{iso-8859-4} %</iso-8859-4> %<*iso-8859-5> -\ProvidesFile{se-iso-8859-5.def}[2009/12/15 v1.7 stringenc: ISO-8859-5] +\ProvidesFile{se-iso-8859-5.def}[2010/03/01 v1.8 stringenc: ISO-8859-5] \def\SE@this{iso-8859-5} %</iso-8859-5> %<*iso-8859-6> -\ProvidesFile{se-iso-8859-6.def}[2009/12/15 v1.7 stringenc: ISO-8859-6] +\ProvidesFile{se-iso-8859-6.def}[2010/03/01 v1.8 stringenc: ISO-8859-6] \def\SE@this{iso-8859-6} %</iso-8859-6> %<*iso-8859-7> -\ProvidesFile{se-iso-8859-7.def}[2009/12/15 v1.7 stringenc: ISO-8859-7] +\ProvidesFile{se-iso-8859-7.def}[2010/03/01 v1.8 stringenc: ISO-8859-7] \def\SE@this{iso-8859-7} %</iso-8859-7> %<*iso-8859-8> -\ProvidesFile{se-iso-8859-8.def}[2009/12/15 v1.7 stringenc: ISO-8859-8] +\ProvidesFile{se-iso-8859-8.def}[2010/03/01 v1.8 stringenc: ISO-8859-8] \def\SE@this{iso-8859-8} %</iso-8859-8> %<*iso-8859-9> -\ProvidesFile{se-iso-8859-9.def}[2009/12/15 v1.7 stringenc: ISO-8859-9] +\ProvidesFile{se-iso-8859-9.def}[2010/03/01 v1.8 stringenc: ISO-8859-9] \def\SE@this{iso-8859-9} %</iso-8859-9> %<*iso-8859-10> -\ProvidesFile{se-iso-8859-10.def}[2009/12/15 v1.7 stringenc: ISO-8859-10] +\ProvidesFile{se-iso-8859-10.def}[2010/03/01 v1.8 stringenc: ISO-8859-10] \def\SE@this{iso-8859-10} %</iso-8859-10> %<*iso-8859-11> -\ProvidesFile{se-iso-8859-11.def}[2009/12/15 v1.7 stringenc: ISO-8859-11] +\ProvidesFile{se-iso-8859-11.def}[2010/03/01 v1.8 stringenc: ISO-8859-11] \def\SE@this{iso-8859-11} %</iso-8859-11> %<*iso-8859-13> -\ProvidesFile{se-iso-8859-13.def}[2009/12/15 v1.7 stringenc: ISO-8859-13] +\ProvidesFile{se-iso-8859-13.def}[2010/03/01 v1.8 stringenc: ISO-8859-13] \def\SE@this{iso-8859-13} %</iso-8859-13> %<*iso-8859-14> -\ProvidesFile{se-iso-8859-14.def}[2009/12/15 v1.7 stringenc: ISO-8859-14] +\ProvidesFile{se-iso-8859-14.def}[2010/03/01 v1.8 stringenc: ISO-8859-14] \def\SE@this{iso-8859-14} %</iso-8859-14> %<*iso-8859-15> -\ProvidesFile{se-iso-8859-15.def}[2009/12/15 v1.7 stringenc: ISO-8859-15] +\ProvidesFile{se-iso-8859-15.def}[2010/03/01 v1.8 stringenc: ISO-8859-15] \def\SE@this{iso-8859-15} %</iso-8859-15> %<*iso-8859-16> -\ProvidesFile{se-iso-8859-16.def}[2009/12/15 v1.7 stringenc: ISO-8859-16] +\ProvidesFile{se-iso-8859-16.def}[2010/03/01 v1.8 stringenc: ISO-8859-16] \def\SE@this{iso-8859-16} %</iso-8859-16> %<*koi8-r> -\ProvidesFile{se-koi8-r.def}[2009/12/15 v1.7 stringenc: KOI8-R] +\ProvidesFile{se-koi8-r.def}[2010/03/01 v1.8 stringenc: KOI8-R] \def\SE@this{koi8-r} %</koi8-r> %<*nextstep> -\ProvidesFile{se-nextstep.def}[2009/12/15 v1.7 stringenc: NextStep] +\ProvidesFile{se-nextstep.def}[2010/03/01 v1.8 stringenc: NextStep] \def\SE@this{nextstep} %</nextstep> %<*mac-centeuro> -\ProvidesFile{se-mac-centeuro.def}[2009/12/15 v1.7 stringenc: Mac OS Central European] +\ProvidesFile{se-mac-centeuro.def}[2010/03/01 v1.8 stringenc: Mac OS Central European] \def\SE@this{mac-centeuro} %</mac-centeuro> %<*mac-cyrillic> -\ProvidesFile{se-mac-cyrillic.def}[2009/12/15 v1.7 stringenc: Mac OS Cyrillic] +\ProvidesFile{se-mac-cyrillic.def}[2010/03/01 v1.8 stringenc: Mac OS Cyrillic] \def\SE@this{mac-cyrillic} %</mac-cyrillic> %<*mac-roman> -\ProvidesFile{se-mac-roman.def}[2009/12/15 v1.7 stringenc: Mac OS Roman] +\ProvidesFile{se-mac-roman.def}[2010/03/01 v1.8 stringenc: Mac OS Roman] \def\SE@this{mac-roman} %</mac-roman> %<*dec-mcs> -\ProvidesFile{se-dec-mcs.def}[2009/12/15 v1.7 stringenc: DEC-MCS] +\ProvidesFile{se-dec-mcs.def}[2010/03/01 v1.8 stringenc: DEC-MCS] \def\SE@this{dec-mcs} %</dec-mcs> %<*cp437> -\ProvidesFile{se-cp437.def}[2009/12/15 v1.7 stringenc: cp437] +\ProvidesFile{se-cp437.def}[2010/03/01 v1.8 stringenc: cp437] \def\SE@this{cp437} %</cp437> %<*cp850> -\ProvidesFile{se-cp850.def}[2009/12/15 v1.7 stringenc: cp850] +\ProvidesFile{se-cp850.def}[2010/03/01 v1.8 stringenc: cp850] \def\SE@this{cp850} %</cp850> %<*cp852> -\ProvidesFile{se-cp852.def}[2009/12/15 v1.7 stringenc: cp852] +\ProvidesFile{se-cp852.def}[2010/03/01 v1.8 stringenc: cp852] \def\SE@this{cp852} %</cp852> %<*cp855> -\ProvidesFile{se-cp855.def}[2009/12/15 v1.7 stringenc: cp855] +\ProvidesFile{se-cp855.def}[2010/03/01 v1.8 stringenc: cp855] \def\SE@this{cp855} %</cp855> %<*cp858> -\ProvidesFile{se-cp858.def}[2009/12/15 v1.7 stringenc: cp858] +\ProvidesFile{se-cp858.def}[2010/03/01 v1.8 stringenc: cp858] \def\SE@this{cp858} %</cp858> %<*cp865> -\ProvidesFile{se-cp865.def}[2009/12/15 v1.7 stringenc: cp865] +\ProvidesFile{se-cp865.def}[2010/03/01 v1.8 stringenc: cp865] \def\SE@this{cp865} %</cp865> %<*cp866> -\ProvidesFile{se-cp866.def}[2009/12/15 v1.7 stringenc: cp866] +\ProvidesFile{se-cp866.def}[2010/03/01 v1.8 stringenc: cp866] \def\SE@this{cp866} %</cp866> %<*cp1250> -\ProvidesFile{se-cp1250.def}[2009/12/15 v1.7 stringenc: cp1250] +\ProvidesFile{se-cp1250.def}[2010/03/01 v1.8 stringenc: cp1250] \def\SE@this{cp1250} %</cp1250> %<*cp1251> -\ProvidesFile{se-cp1251.def}[2009/12/15 v1.7 stringenc: cp1251] +\ProvidesFile{se-cp1251.def}[2010/03/01 v1.8 stringenc: cp1251] \def\SE@this{cp1251} %</cp1251> %<*cp1257> -\ProvidesFile{se-cp1257.def}[2009/12/15 v1.7 stringenc: cp1257] +\ProvidesFile{se-cp1257.def}[2010/03/01 v1.8 stringenc: cp1257] \def\SE@this{cp1257} %</cp1257> % \end{macrocode} @@ -6109,7 +6126,7 @@ $ \fi \catcode`\%=14 % \catcode`\ =10 % \catcode13=5 % - \usepackage{stringenc}[2009/12/15]% + \usepackage{stringenc}[2010/03/01]% \RestoreCatcodes } \Test @@ -6160,7 +6177,7 @@ $ \fi \let\SavedNumexpr\numexpr \let\numexpr\relax \fi -\usepackage{stringenc}[2009/12/15] +\usepackage{stringenc}[2010/03/01] \ifx\plainmode Y \let\numexpr\SavedNumexpr \fi @@ -6786,6 +6803,12 @@ $ \fi % \item % Encoding \xoption{ascii-print} added. % \end{Version} +% \begin{Version}{2010/03/01 v1.8} +% \item +% Compatibility with \iniTeX. +% \item +% Use of package \xpackage{ltxcmds}. +% \end{Version} % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/source/latex/oberdiek/tabularht.dtx b/Master/texmf-dist/source/latex/oberdiek/tabularht.dtx index f943b49ef24..c7b71b1c227 100644 --- a/Master/texmf-dist/source/latex/oberdiek/tabularht.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/tabularht.dtx @@ -61,6 +61,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -118,7 +120,8 @@ and the derived files \file{tabularht-example2.tex}{\from{tabularht.dtx}{example2}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/tabularkv.dtx b/Master/texmf-dist/source/latex/oberdiek/tabularkv.dtx index 28ce0242fbe..143454c2085 100644 --- a/Master/texmf-dist/source/latex/oberdiek/tabularkv.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/tabularkv.dtx @@ -60,6 +60,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -116,7 +118,8 @@ and the derived files \file{tabularkv-example.tex}{\from{tabularkv.dtx}{example}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/telprint.dtx b/Master/texmf-dist/source/latex/oberdiek/telprint.dtx index 6ccfb6140f1..1c3b5d25548 100644 --- a/Master/texmf-dist/source/latex/oberdiek/telprint.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/telprint.dtx @@ -63,6 +63,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -122,7 +124,8 @@ and the derived files \file{telprint-test1.tex}{\from{telprint.dtx}{test1}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/transparent.dtx b/Master/texmf-dist/source/latex/oberdiek/transparent.dtx index 765cb23858f..d279a6c4e49 100644 --- a/Master/texmf-dist/source/latex/oberdiek/transparent.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/transparent.dtx @@ -60,6 +60,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -116,7 +118,8 @@ and the derived files \file{transparent-example.tex}{\from{transparent.dtx}{example}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/twoopt.dtx b/Master/texmf-dist/source/latex/oberdiek/twoopt.dtx index def2361617e..105fac939f1 100644 --- a/Master/texmf-dist/source/latex/oberdiek/twoopt.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/twoopt.dtx @@ -58,6 +58,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -111,7 +113,8 @@ and the derived files \file{twoopt.sty}{\from{twoopt.dtx}{package}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/uniquecounter.dtx b/Master/texmf-dist/source/latex/oberdiek/uniquecounter.dtx index 3e6a14fcaa8..c84b4bc4646 100644 --- a/Master/texmf-dist/source/latex/oberdiek/uniquecounter.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/uniquecounter.dtx @@ -68,6 +68,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -133,7 +135,8 @@ and the derived files \file{uniquecounter-test3.tex}{\from{uniquecounter.dtx}{test3}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} diff --git a/Master/texmf-dist/source/latex/oberdiek/zref.dtx b/Master/texmf-dist/source/latex/oberdiek/zref.dtx index 60ee9d59936..926878f4341 100644 --- a/Master/texmf-dist/source/latex/oberdiek/zref.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/zref.dtx @@ -81,6 +81,8 @@ % %<*ignore> \begingroup + \catcode123=1 % + \catcode125=2 % \def\x{LaTeX2e}% \expandafter\endgroup \ifcase 0\ifx\install y1\fi\expandafter @@ -159,7 +161,8 @@ and the derived files \file{zref-test-runs.tex}{\from{zref.dtx}{test-runs}}% } -\obeyspaces +\catcode32=13\relax% active space +\let =\space% \Msg{************************************************************************} \Msg{*} \Msg{* To finish the installation you have to move the following} |