summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty')
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty28
1 files changed, 19 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty b/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty
index 508bf4740a5..4b29380e6ac 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty
@@ -33,7 +33,7 @@
%% the color of \emph statements.
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{kvoptions}
- [2007/04/11 v2.5 Connects package keyval with LaTeX options (HO)]%
+ [2007/05/06 v2.6 Connects package keyval with LaTeX options (HO)]%
\RequirePackage{keyval}
\begingroup
\edef\x{\endgroup
@@ -413,11 +413,11 @@
\@ifundefined{KV@#1@\expandafter\KVO@getkey\KVO@CurrentOption=\@nil}{%
}{%
\edef\KVO@temp{%
-^^B \unexpanded\expandafter{%
+^^B \etex@unexpanded\expandafter{%
\KVO@temp
^^B }%
,%
-^^B \unexpanded\expandafter{%
+^^B \etex@unexpanded\expandafter{%
\KVO@CurrentOption
^^B }%
,%
@@ -532,6 +532,16 @@
}%
\expandafter\endinput
\fi
+\RequirePackage{etexcmds}
+\ifetex@unexpanded
+\else
+ \PackageError{kvoptions}{%
+ Could not find eTeX's \string\unexpanded.\MessageBreak
+ Try adding \string\RequirePackage\string{etexcmds\string} %
+ before \string\documentclass%
+ }\@ehd
+ \expandafter\endinput
+\fi
\@ifpackageloaded{xkvltxp}{%
\PackageWarningNoLine{kvoptions}{%
Option `patch' cannot be used together with\MessageBreak
@@ -852,14 +862,14 @@
\else
% append to list
\edef\KVO@result{%
- \unexpanded\expandafter{\KVO@result},\KVO@x
+ \etex@unexpanded\expandafter{\KVO@result},\KVO@x
}%
\fi
}{%
% #1: "key", #2: "value="
% add key part
\edef\KVO@result{%
- \unexpanded\expandafter{\KVO@result},%
+ \etex@unexpanded\expandafter{\KVO@result},%
\zap@space#1 \@empty
}%
\futurelet\@let@token\KVO@checkfirsttok#2 \@nil| = \@nil|\KVO@nil
@@ -888,13 +898,13 @@
\def\KVO@removelastspace#1 = \@nil|#2\KVO@nil{%
\KVO@ifempty{#2}{%
\edef\KVO@result{%
- \unexpanded\expandafter{\KVO@result}%
- \unexpanded\expandafter{\KVO@removegarbage#1\KVO@nil}%
+ \etex@unexpanded\expandafter{\KVO@result}%
+ \etex@unexpanded\expandafter{\KVO@removegarbage#1\KVO@nil}%
}%
}{%
\edef\KVO@result{%
- \unexpanded\expandafter{\KVO@result}%
- \unexpanded{#1}%
+ \etex@unexpanded\expandafter{\KVO@result}%
+ \etex@unexpanded{#1}%
}%
}%
}