summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-02-24 01:06:11 +0000
committerKarl Berry <karl@freefriends.org>2010-02-24 01:06:11 +0000
commitda272fd2a178269b07d9b51671f44c4c24b00cc1 (patch)
tree2a43cd446a79df8a1744864bae9bd17f48fbe441 /Master/texmf-dist/source
parent3a3d6bd811106621bf927fcb58bb19937454c454 (diff)
oberdiek update (23feb10)
git-svn-id: svn://tug.org/texlive/trunk@17174 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/kvoptions.dtx63
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/oberdiek.ins2
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/oberdiek.tex6
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/rerunfilecheck.dtx25
4 files changed, 55 insertions, 41 deletions
diff --git a/Master/texmf-dist/source/latex/oberdiek/kvoptions.dtx b/Master/texmf-dist/source/latex/oberdiek/kvoptions.dtx
index 24c8eba0097..dec589957e7 100644
--- a/Master/texmf-dist/source/latex/oberdiek/kvoptions.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/kvoptions.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 2004, 2006, 2007, 2009 by
+% Copyright (C) 2004, 2006, 2007, 2009, 2010 by
% Heiko Oberdiek <oberdiek@uni-freiburg.de>
%
% This work may be distributed and/or modified under the
@@ -77,7 +77,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: kvoptions 2009/12/08 v3.6 Keyval support for LaTeX options (HO)}
+\Msg{* Package: kvoptions 2010/02/22 v3.7 Keyval support for LaTeX options (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -88,7 +88,7 @@
This is a generated file.
-Copyright (C) 2004, 2006, 2007, 2009 by
+Copyright (C) 2004, 2006, 2007, 2009, 2010 by
Heiko Oberdiek <oberdiek@uni-freiburg.de>
This work may be distributed and/or modified under the
@@ -156,7 +156,7 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{kvoptions.drv}%
- [2009/12/08 v3.6 Keyval support for LaTeX options (HO)]%
+ [2010/02/22 v3.7 Keyval support for LaTeX options (HO)]%
\documentclass{ltxdoc}
\usepackage{holtxdoc}[2008/08/11]
\begin{document}
@@ -186,7 +186,7 @@ and the derived files
% \GetFileInfo{kvoptions.drv}
%
% \title{The \xpackage{kvoptions} package}
-% \date{2009/12/08 v3.6}
+% \date{2010/02/22 v3.7}
% \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
%
% \maketitle
@@ -732,7 +732,7 @@ and the derived files
% Package identification
% -----------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{example-mycolorsetup}[2009/12/08 Managing my colors]
+\ProvidesPackage{example-mycolorsetup}[2010/02/22 Managing my colors]
\RequirePackage{ifpdf}
\RequirePackage{kvoptions}
@@ -1105,7 +1105,7 @@ and the derived files
\fi
\expandafter\x\csname ver@kvoptions.sty\endcsname
\ProvidesPackage{kvoptions}%
- [2009/12/08 v3.6 Keyval support for LaTeX options (HO)]
+ [2010/02/22 v3.7 Keyval support for LaTeX options (HO)]
% \end{macrocode}
%
% \paragraph{Catcodes}
@@ -1206,7 +1206,7 @@ and the derived files
% \begin{macrocode}
\DeclareOption{patch}{%
\AtEndOfPackage{%
- \RequirePackage{kvoptions-patch}[2009/12/08]%
+ \RequirePackage{kvoptions-patch}[2010/02/22]%
}%
}
% \end{macrocode}
@@ -1978,7 +1978,7 @@ and the derived files
\ifx\@currext\@pkgextension
\else
\PackageError{kvoptions}{%
- \string\ProcessLocalKeyvalOptions is intended for packages only%
+ \string\ProcessLocalKeyvalOptions\space is intended for packages only%
}\@ehc
\fi
% \end{macrocode}
@@ -1998,28 +1998,27 @@ and the derived files
% These are passed to \cs{setkeys}. For the others the default
% action is performed.
% \begin{macrocode}
- \@ifundefined{KVO@default@\@currname.\@currext}{%
- \toks@\expandafter\expandafter\expandafter{%
- \expandafter\KVO@temp\the\toks@
- }%
- }{%
- \edef\CurrentOption{\the\toks@}%
- \toks@\expandafter{\KVO@temp}%
- \@for\CurrentOption:=\CurrentOption\do{%
- \@ifundefined{%
- KV@#1@\expandafter\KVO@getkey\CurrentOption=\@nil
- }{%
- \toks\tw@\expandafter{%
- \the\toks\expandafter\tw@\expandafter,\CurrentOption
- }%
- }{%
- \toks@\expandafter{%
- \the\expandafter\toks@\expandafter,\CurrentOption
- }%
+ \@ifundefined{KVO@default@\@currname.\@currext}{%
+ \toks@\expandafter\expandafter\expandafter{%
+ \expandafter\KVO@temp\the\toks@
+ }%
+ }{%
+ \edef\CurrentOption{\the\toks@}%
+ \toks@\expandafter{\KVO@temp}%
+ \@for\CurrentOption:=\CurrentOption\do{%
+ \@ifundefined{%
+ KV@#1@\expandafter\KVO@getkey\CurrentOption=\@nil
+ }{%
+ \toks\tw@\expandafter{%
+ \the\toks\expandafter\tw@\expandafter,\CurrentOption
+ }%
+ }{%
+ \toks@\expandafter{%
+ \the\expandafter\toks@\expandafter,\CurrentOption
}%
}%
}%
- \fi
+ }%
}%
\edef\KVO@temp{\endgroup
\noexpand\KVO@calldefault{\the\toks\tw@}%
@@ -2154,7 +2153,7 @@ and the derived files
\noexpand\endinput
}
\ProvidesPackage{kvoptions-patch}%
- [2009/12/08 v3.6 LaTeX patch for keyval options (HO)]%
+ [2010/02/22 v3.7 LaTeX patch for keyval options (HO)]%
% \end{macrocode}
%
% Check for \eTeX.
@@ -2803,7 +2802,7 @@ and the derived files
%<*test3>
\NeedsTeXFormat{LaTeX2e}
\makeatletter
-\RequirePackage{kvoptions}[2009/12/08]
+\RequirePackage{kvoptions}[2010/02/22]
\def\msg#{\immediate\write16}
\define@key{testfamily}{testkey}{%
\msg{[testfamily/testkey/#1]}%
@@ -3171,6 +3170,10 @@ and the derived files
% Fix: If a default handler is configured, it is now also
% called for classes.
% \end{Version}
+% \begin{Version}{2010/02/22 v3.7}
+% \item
+% Missing space in error message added.
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins b/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins
index 9371537bc43..2de23d003ba 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/02/09
+% 2010/02/22
%
% Copyright (C) 1999, 2001, 2006 by
% Heiko Oberdiek <oberdiek@uni-freiburg.de>
diff --git a/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex b/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex
index ea3ac7e5840..f53219c2d94 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/02/09}
+\newcommand*{\Date}{2010/02/22}
% Copyright (C) 2006 by
% Heiko Oberdiek <oberdiek@uni-freiburg.de>
@@ -247,7 +247,7 @@
[\entrysep]
\entry{intcalc}{2007/09/27}{1.1}{Expandable integer calculations}%
[\entrysep]
-\entry{kvoptions}{2009/12/08}{3.6}{Keyval support for \LaTeX{} options}%
+\entry{kvoptions}{2010/02/22}{3.7}{Keyval support for \LaTeX{} options}%
[\entrysep]
\entry{kvsetkeys}{2010/01/28}{1.8}{Key value parser}%
[\entrysep]
@@ -295,7 +295,7 @@
[\entrysep]
\entry{refcount}{2008/08/11}{3.1}{Data extraction from references}%
[\entrysep]
-\entry{rerunfilecheck}{2010/01/25}{1.3}{Rerun checks for auxiliary files}%
+\entry{rerunfilecheck}{2010/02/22}{1.4}{Rerun checks for auxiliary files}%
[\entrysep]
\entry{resizegather}{2009/12/05}{1.1}{Automatically resizing of too large equations}%
[\entrysep]
diff --git a/Master/texmf-dist/source/latex/oberdiek/rerunfilecheck.dtx b/Master/texmf-dist/source/latex/oberdiek/rerunfilecheck.dtx
index 8064d1ed39f..09df9eab36b 100644
--- a/Master/texmf-dist/source/latex/oberdiek/rerunfilecheck.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/rerunfilecheck.dtx
@@ -72,7 +72,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: rerunfilecheck 2010/01/25 v1.3 Rerun checks for auxiliary files (HO)}
+\Msg{* Package: rerunfilecheck 2010/02/22 v1.4 Rerun checks for auxiliary files (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -148,7 +148,7 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{rerunfilecheck.drv}%
- [2010/01/25 v1.3 Rerun checks for auxiliary files (HO)]%
+ [2010/02/22 v1.4 Rerun checks for auxiliary files (HO)]%
\documentclass{ltxdoc}
\usepackage{holtxdoc}[2008/08/11]
\begin{document}
@@ -178,7 +178,7 @@ and the derived files
% \GetFileInfo{rerunfilecheck.drv}
%
% \title{The \xpackage{rerunfilecheck} package}
-% \date{2010/01/25 v1.3}
+% \date{2010/02/22 v1.4}
% \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
%
% \maketitle
@@ -244,6 +244,7 @@ and the derived files
% rerun checks.
% The options can be set in \cs{usepackage} or
% the configuration file \xfile{rerunfilecheck.cfg}.
+% Global options are ignored (since 1.4).
%
% \begin{declcs}{RerunFileCheckSetup} \M{key value list}
% \end{declcs}
@@ -255,7 +256,7 @@ and the derived files
% Example for the configuration file:
% \begin{macrocode}
%<*cfg>
-\ProvidesFile{rerunfilecheck.cfg}[2010/01/25 Default configuration]%
+\ProvidesFile{rerunfilecheck.cfg}[2010/02/22 Default configuration]%
\RerunFileCheckSetup{aux}
%</cfg>
% \end{macrocode}
@@ -348,13 +349,13 @@ and the derived files
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{rerunfilecheck}%
- [2010/01/25 v1.3 Rerun checks for auxiliary files (HO)]
+ [2010/02/22 v1.4 Rerun checks for auxiliary files (HO)]
% \end{macrocode}
%
% \subsection{Options}
%
% \begin{macrocode}
-\RequirePackage{kvoptions}[2009/07/17]
+\RequirePackage{kvoptions}[2010/02/22]
\SetupKeyvalOptions{%
family=rerunfilecheck,%
prefix=ReFiCh@%
@@ -385,7 +386,7 @@ and the derived files
% \end{macrocode}
% \begin{macrocode}
\InputIfFileExists{rerunfilecheck.cfg}{}{}
-\ProcessKeyvalOptions*
+\ProcessLocalKeyvalOptions*
% \end{macrocode}
%
% \begin{macro}{\ReFiCh@DisableOption}
@@ -692,6 +693,9 @@ and the derived files
%
% \section{Test}
%
+%<*test1>
+\def\LoadCommand{\RequirePackage{rerunfilecheck}[2010/02/22]}
+%</test1>
% \subsection{Catcode checks for loading}
%
% \begin{macrocode}
@@ -980,6 +984,13 @@ and the derived files
% \item
% Moved from \texttt{TDS:*/generic/*} to \texttt{TDS:*/latex/*}.
% \end{Version}
+% \begin{Version}{2010/02/22 v1.4}
+% \item
+% The options of this package are recognized only if they are
+% package options. Global options are ignored. This avoids
+% name clashes with class and other package options
+% (for example, class option `index=totoc').
+% \end{Version}
% \end{History}
%
% \PrintIndex