diff options
author | Karl Berry <karl@freefriends.org> | 2012-05-02 21:50:45 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2012-05-02 21:50:45 +0000 |
commit | aa1776c78dfdb456e2228fbceaa886e64e36174c (patch) | |
tree | 7967af7f0f2079a632809a813221918af16ba8cc /Master/texmf-dist/tex/latex/oberdiek/kvoptions-patch.sty | |
parent | a86d14742b305868a1c2b1f33f1263a6b7d0e03d (diff) |
oberdiek (1may12)
git-svn-id: svn://tug.org/texlive/trunk@26177 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/oberdiek/kvoptions-patch.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/oberdiek/kvoptions-patch.sty | 37 |
1 files changed, 32 insertions, 5 deletions
diff --git a/Master/texmf-dist/tex/latex/oberdiek/kvoptions-patch.sty b/Master/texmf-dist/tex/latex/oberdiek/kvoptions-patch.sty index d45321cfcdc..423385bb229 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/kvoptions-patch.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/kvoptions-patch.sty @@ -9,9 +9,9 @@ %% This is a generated file. %% %% Project: kvoptions -%% Version: 2010/12/23 v3.10 +%% Version: 2011/06/30 v3.11 %% -%% Copyright (C) 2004, 2006, 2007, 2009, 2010 by +%% Copyright (C) 2004, 2006, 2007, 2009-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -39,6 +39,31 @@ %% No we don't need the option 'color'. %% With color support option 'emphcolor' will dynamically %% change the color of \emph statements. +\def\KVO@IfDefThen#1#2{% + \ifx#1\ltx@undefined + \else + \ifx#1\relax + \else + #2% + \fi + \fi +}% +\def\KVO@GetClassOptionsList{% + \let\KVO@classoptionslist\@classoptionslist + \KVO@IfDefThen\@classoptionslist{% + \KVO@IfDefThen\XKV@documentclass{% + \ifx\XKV@documentclass\ltx@empty + \else + \KVO@IfDefThen\XKV@classoptionslist{% + \ifx\XKV@classoptionslist\ltx@empty + \else + \let\KVO@classoptionslist\XKV@classoptionslist + \fi + }% + \fi + }% + }% +}% \NeedsTeXFormat{LaTeX2e} \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M @@ -89,7 +114,7 @@ \TMP@EnsureCode{124}{12}% | \edef\KVO@AtEnd{\KVO@AtEnd\noexpand\endinput} \ProvidesPackage{kvoptions-patch}% - [2010/12/23 v3.10 LaTeX patch for keyval options (HO)]% + [2011/06/30 v3.11 LaTeX patch for keyval options (HO)]% \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname eTeXversion\endcsname\relax \PackageWarningNoLine{kvoptions-patch}{% @@ -165,7 +190,8 @@ \ifx\@currext\@clsextension \toks@{}% \else - \toks@\expandafter{\@classoptionslist,}% + \KVO@GetClassOptionsList + \toks@\expandafter{\KVO@classoptionslist,}% \fi \toks\tw@\expandafter{\@curroptions}% \edef\x{\endgroup @@ -183,7 +209,8 @@ \def\KVO@xprocess@ptions{% \ifx\@currext\@clsextension \else - \@for\CurrentOption:=\@classoptionslist\do{% + \KVO@GetClassOptionsList + \@for\CurrentOption:=\KVO@classoptionslist\do{% \ifx\CurrentOption\@empty \else \KVO@in@\CurrentOption\@declaredoptions |