From 81231e60a62c9f46b647f59881e9165f01e4c9e2 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 27 Jun 2014 00:38:59 +0000 Subject: xkeyval git-svn-id: svn://tug.org/texlive/trunk@34442 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/xkeyval/pst-xkey.sty | 8 ++++---- Master/texmf-dist/tex/latex/xkeyval/xkeyval.sty | 10 +++++----- Master/texmf-dist/tex/latex/xkeyval/xkveca.cls | 8 ++++---- Master/texmf-dist/tex/latex/xkeyval/xkvecb.cls | 8 ++++---- Master/texmf-dist/tex/latex/xkeyval/xkvesa.sty | 8 ++++---- Master/texmf-dist/tex/latex/xkeyval/xkvesb.sty | 8 ++++---- Master/texmf-dist/tex/latex/xkeyval/xkvesc.sty | 8 ++++---- Master/texmf-dist/tex/latex/xkeyval/xkvltxp.sty | 18 +++++++++--------- Master/texmf-dist/tex/latex/xkeyval/xkvview.sty | 8 ++++---- 9 files changed, 42 insertions(+), 42 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/xkeyval/pst-xkey.sty b/Master/texmf-dist/tex/latex/xkeyval/pst-xkey.sty index 4f0fb97c510..95e60c218c5 100644 --- a/Master/texmf-dist/tex/latex/xkeyval/pst-xkey.sty +++ b/Master/texmf-dist/tex/latex/xkeyval/pst-xkey.sty @@ -24,14 +24,14 @@ %% %% This work consists of the file xkeyval.dtx and derived files %% keyval.tex, xkvtxhdr.tex, xkeyval.sty, xkeyval.tex, xkvview.sty, -%% xkvltxp.sty, pst-xkey.tex, pst-xkey.sty, xkveca.cls, xkvecb.cls, -%% xkvesa.sty, xkvesb.sty, xkvesc.sty, xkvex1.tex, xkvex2.tex, -%% xkvex3.tex and xkvex4.tex. +%% xkvltxp.sty, xkvutils.tex, pst-xkey.tex, pst-xkey.sty, xkveca.cls, +%% xkvecb.cls, xkvesa.sty, xkvesb.sty, xkvesc.sty, xkvex1.tex, +%% xkvex2.tex, xkvex3.tex and xkvex4.tex. %% %% The following files constitute the xkeyval bundle and must be %% distributed as a whole: readme, xkeyval.pdf, keyval.tex, %% pst-xkey.sty, pst-xkey.tex, xkeyval.sty, xkeyval.tex, xkvview.sty, -%% xkvltxp.sty, xkvtxhdr.tex, pst-xkey.dtx and xkeyval.dtx. +%% xkvltxp.sty, xkvtxhdr.tex, xkvutils.tex, pst-xkey.dtx and xkeyval.dtx. %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{pst-xkey} diff --git a/Master/texmf-dist/tex/latex/xkeyval/xkeyval.sty b/Master/texmf-dist/tex/latex/xkeyval/xkeyval.sty index 727ed8802af..2a56d2b7b2a 100644 --- a/Master/texmf-dist/tex/latex/xkeyval/xkeyval.sty +++ b/Master/texmf-dist/tex/latex/xkeyval/xkeyval.sty @@ -24,18 +24,18 @@ %% %% This work consists of the file xkeyval.dtx and derived files %% keyval.tex, xkvtxhdr.tex, xkeyval.sty, xkeyval.tex, xkvview.sty, -%% xkvltxp.sty, pst-xkey.tex, pst-xkey.sty, xkveca.cls, xkvecb.cls, -%% xkvesa.sty, xkvesb.sty, xkvesc.sty, xkvex1.tex, xkvex2.tex, -%% xkvex3.tex and xkvex4.tex. +%% xkvltxp.sty, xkvutils.tex, pst-xkey.tex, pst-xkey.sty, xkveca.cls, +%% xkvecb.cls, xkvesa.sty, xkvesb.sty, xkvesc.sty, xkvex1.tex, +%% xkvex2.tex, xkvex3.tex and xkvex4.tex. %% %% The following files constitute the xkeyval bundle and must be %% distributed as a whole: readme, xkeyval.pdf, keyval.tex, %% pst-xkey.sty, pst-xkey.tex, xkeyval.sty, xkeyval.tex, xkvview.sty, -%% xkvltxp.sty, xkvtxhdr.tex, pst-xkey.dtx and xkeyval.dtx. +%% xkvltxp.sty, xkvtxhdr.tex, xkvutils.tex, pst-xkey.dtx and xkeyval.dtx. %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{xkeyval} - [2014/05/09 v2.6d package option processing (HA)] + [2014/05/25 v2.7 package option processing (HA)] \ifx\XKeyValLoaded\endinput\else\input xkeyval \fi \edef\XKVcatcodes{% \catcode`\noexpand\=\the\catcode`\=\relax diff --git a/Master/texmf-dist/tex/latex/xkeyval/xkveca.cls b/Master/texmf-dist/tex/latex/xkeyval/xkveca.cls index b4f1dc94405..0eb58fe1d79 100644 --- a/Master/texmf-dist/tex/latex/xkeyval/xkveca.cls +++ b/Master/texmf-dist/tex/latex/xkeyval/xkveca.cls @@ -24,14 +24,14 @@ %% %% This work consists of the file xkeyval.dtx and derived files %% keyval.tex, xkvtxhdr.tex, xkeyval.sty, xkeyval.tex, xkvview.sty, -%% xkvltxp.sty, pst-xkey.tex, pst-xkey.sty, xkveca.cls, xkvecb.cls, -%% xkvesa.sty, xkvesb.sty, xkvesc.sty, xkvex1.tex, xkvex2.tex, -%% xkvex3.tex and xkvex4.tex. +%% xkvltxp.sty, xkvutils.tex, pst-xkey.tex, pst-xkey.sty, xkveca.cls, +%% xkvecb.cls, xkvesa.sty, xkvesb.sty, xkvesc.sty, xkvex1.tex, +%% xkvex2.tex, xkvex3.tex and xkvex4.tex. %% %% The following files constitute the xkeyval bundle and must be %% distributed as a whole: readme, xkeyval.pdf, keyval.tex, %% pst-xkey.sty, pst-xkey.tex, xkeyval.sty, xkeyval.tex, xkvview.sty, -%% xkvltxp.sty, xkvtxhdr.tex, pst-xkey.dtx and xkeyval.dtx. +%% xkvltxp.sty, xkvtxhdr.tex, xkvutils.tex, pst-xkey.dtx and xkeyval.dtx. %% \ProvidesClass{xkveca} \usepackage{xkeyval} diff --git a/Master/texmf-dist/tex/latex/xkeyval/xkvecb.cls b/Master/texmf-dist/tex/latex/xkeyval/xkvecb.cls index 595a171ad77..8c7280b4e8a 100644 --- a/Master/texmf-dist/tex/latex/xkeyval/xkvecb.cls +++ b/Master/texmf-dist/tex/latex/xkeyval/xkvecb.cls @@ -24,14 +24,14 @@ %% %% This work consists of the file xkeyval.dtx and derived files %% keyval.tex, xkvtxhdr.tex, xkeyval.sty, xkeyval.tex, xkvview.sty, -%% xkvltxp.sty, pst-xkey.tex, pst-xkey.sty, xkveca.cls, xkvecb.cls, -%% xkvesa.sty, xkvesb.sty, xkvesc.sty, xkvex1.tex, xkvex2.tex, -%% xkvex3.tex and xkvex4.tex. +%% xkvltxp.sty, xkvutils.tex, pst-xkey.tex, pst-xkey.sty, xkveca.cls, +%% xkvecb.cls, xkvesa.sty, xkvesb.sty, xkvesc.sty, xkvex1.tex, +%% xkvex2.tex, xkvex3.tex and xkvex4.tex. %% %% The following files constitute the xkeyval bundle and must be %% distributed as a whole: readme, xkeyval.pdf, keyval.tex, %% pst-xkey.sty, pst-xkey.tex, xkeyval.sty, xkeyval.tex, xkvview.sty, -%% xkvltxp.sty, xkvtxhdr.tex, pst-xkey.dtx and xkeyval.dtx. +%% xkvltxp.sty, xkvtxhdr.tex, xkvutils.tex, pst-xkey.dtx and xkeyval.dtx. %% \ProvidesClass{xkvecb} %% pass any unknown option to article diff --git a/Master/texmf-dist/tex/latex/xkeyval/xkvesa.sty b/Master/texmf-dist/tex/latex/xkeyval/xkvesa.sty index a4545d865d8..5bdbd2f42b4 100644 --- a/Master/texmf-dist/tex/latex/xkeyval/xkvesa.sty +++ b/Master/texmf-dist/tex/latex/xkeyval/xkvesa.sty @@ -24,14 +24,14 @@ %% %% This work consists of the file xkeyval.dtx and derived files %% keyval.tex, xkvtxhdr.tex, xkeyval.sty, xkeyval.tex, xkvview.sty, -%% xkvltxp.sty, pst-xkey.tex, pst-xkey.sty, xkveca.cls, xkvecb.cls, -%% xkvesa.sty, xkvesb.sty, xkvesc.sty, xkvex1.tex, xkvex2.tex, -%% xkvex3.tex and xkvex4.tex. +%% xkvltxp.sty, xkvutils.tex, pst-xkey.tex, pst-xkey.sty, xkveca.cls, +%% xkvecb.cls, xkvesa.sty, xkvesb.sty, xkvesc.sty, xkvex1.tex, +%% xkvex2.tex, xkvex3.tex and xkvex4.tex. %% %% The following files constitute the xkeyval bundle and must be %% distributed as a whole: readme, xkeyval.pdf, keyval.tex, %% pst-xkey.sty, pst-xkey.tex, xkeyval.sty, xkeyval.tex, xkvview.sty, -%% xkvltxp.sty, xkvtxhdr.tex, pst-xkey.dtx and xkeyval.dtx. +%% xkvltxp.sty, xkvtxhdr.tex, xkvutils.tex, pst-xkey.dtx and xkeyval.dtx. %% \ProvidesPackage{xkvesa} \let\keyia\@empty diff --git a/Master/texmf-dist/tex/latex/xkeyval/xkvesb.sty b/Master/texmf-dist/tex/latex/xkeyval/xkvesb.sty index 305959bf4dc..1f9e3ab9916 100644 --- a/Master/texmf-dist/tex/latex/xkeyval/xkvesb.sty +++ b/Master/texmf-dist/tex/latex/xkeyval/xkvesb.sty @@ -24,14 +24,14 @@ %% %% This work consists of the file xkeyval.dtx and derived files %% keyval.tex, xkvtxhdr.tex, xkeyval.sty, xkeyval.tex, xkvview.sty, -%% xkvltxp.sty, pst-xkey.tex, pst-xkey.sty, xkveca.cls, xkvecb.cls, -%% xkvesa.sty, xkvesb.sty, xkvesc.sty, xkvex1.tex, xkvex2.tex, -%% xkvex3.tex and xkvex4.tex. +%% xkvltxp.sty, xkvutils.tex, pst-xkey.tex, pst-xkey.sty, xkveca.cls, +%% xkvecb.cls, xkvesa.sty, xkvesb.sty, xkvesc.sty, xkvex1.tex, +%% xkvex2.tex, xkvex3.tex and xkvex4.tex. %% %% The following files constitute the xkeyval bundle and must be %% distributed as a whole: readme, xkeyval.pdf, keyval.tex, %% pst-xkey.sty, pst-xkey.tex, xkeyval.sty, xkeyval.tex, xkvview.sty, -%% xkvltxp.sty, xkvtxhdr.tex, pst-xkey.dtx and xkeyval.dtx. +%% xkvltxp.sty, xkvtxhdr.tex, xkvutils.tex, pst-xkey.dtx and xkeyval.dtx. %% \ProvidesPackage{xkvesb} \let\keyiii\@empty diff --git a/Master/texmf-dist/tex/latex/xkeyval/xkvesc.sty b/Master/texmf-dist/tex/latex/xkeyval/xkvesc.sty index 0747aa82178..752ba227605 100644 --- a/Master/texmf-dist/tex/latex/xkeyval/xkvesc.sty +++ b/Master/texmf-dist/tex/latex/xkeyval/xkvesc.sty @@ -24,14 +24,14 @@ %% %% This work consists of the file xkeyval.dtx and derived files %% keyval.tex, xkvtxhdr.tex, xkeyval.sty, xkeyval.tex, xkvview.sty, -%% xkvltxp.sty, pst-xkey.tex, pst-xkey.sty, xkveca.cls, xkvecb.cls, -%% xkvesa.sty, xkvesb.sty, xkvesc.sty, xkvex1.tex, xkvex2.tex, -%% xkvex3.tex and xkvex4.tex. +%% xkvltxp.sty, xkvutils.tex, pst-xkey.tex, pst-xkey.sty, xkveca.cls, +%% xkvecb.cls, xkvesa.sty, xkvesb.sty, xkvesc.sty, xkvex1.tex, +%% xkvex2.tex, xkvex3.tex and xkvex4.tex. %% %% The following files constitute the xkeyval bundle and must be %% distributed as a whole: readme, xkeyval.pdf, keyval.tex, %% pst-xkey.sty, pst-xkey.tex, xkeyval.sty, xkeyval.tex, xkvview.sty, -%% xkvltxp.sty, xkvtxhdr.tex, pst-xkey.dtx and xkeyval.dtx. +%% xkvltxp.sty, xkvtxhdr.tex, xkvutils.tex, pst-xkey.dtx and xkeyval.dtx. %% \ProvidesPackage{xkvesc} %% redefine \keyvi when keyvi option is specified in \documentclass diff --git a/Master/texmf-dist/tex/latex/xkeyval/xkvltxp.sty b/Master/texmf-dist/tex/latex/xkeyval/xkvltxp.sty index 0480a11ce2b..e5be8cb052e 100644 --- a/Master/texmf-dist/tex/latex/xkeyval/xkvltxp.sty +++ b/Master/texmf-dist/tex/latex/xkeyval/xkvltxp.sty @@ -24,20 +24,21 @@ %% %% This work consists of the file xkeyval.dtx and derived files %% keyval.tex, xkvtxhdr.tex, xkeyval.sty, xkeyval.tex, xkvview.sty, -%% xkvltxp.sty, pst-xkey.tex, pst-xkey.sty, xkveca.cls, xkvecb.cls, -%% xkvesa.sty, xkvesb.sty, xkvesc.sty, xkvex1.tex, xkvex2.tex, -%% xkvex3.tex and xkvex4.tex. +%% xkvltxp.sty, xkvutils.tex, pst-xkey.tex, pst-xkey.sty, xkveca.cls, +%% xkvecb.cls, xkvesa.sty, xkvesb.sty, xkvesc.sty, xkvex1.tex, +%% xkvex2.tex, xkvex3.tex and xkvex4.tex. %% %% The following files constitute the xkeyval bundle and must be %% distributed as a whole: readme, xkeyval.pdf, keyval.tex, %% pst-xkey.sty, pst-xkey.tex, xkeyval.sty, xkeyval.tex, xkvview.sty, -%% xkvltxp.sty, xkvtxhdr.tex, pst-xkey.dtx and xkeyval.dtx. +%% xkvltxp.sty, xkvtxhdr.tex, xkvutils.tex, pst-xkey.dtx and xkeyval.dtx. %% %% %% Based on latex.ltx. %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] -\ProvidesPackage{xkvltxp}[2004/12/13 v1.2 LaTeX2e kernel patch (HA)] +\ProvidesPackage{xkvltxp}[2014/05/25 v1.3 LaTeX2e kernel patch (HA)] +\input xkvutils \def\@pass@ptions#1#2#3{% \def\reserved@a{#2}% \def\reserved@b{\CurrentOption}% @@ -74,10 +75,10 @@ \csname ds@\CurrentOption\endcsname } \def\@fileswith@pti@ns#1[#2]#3[#4]{% + \XKV@sp@deflist\XKV@resb{#2}% \ifx#1\@clsextension \ifx\@classoptionslist\relax - \@temptokena{#2}% - \xdef\@classoptionslist{\the\@temptokena}% + \let\@classoptionslist\XKV@resb \def\reserved@a{% \@onefilewithoptions#3[#2][#4]#1% \@documentclasshook}% @@ -86,12 +87,11 @@ \@onefilewithoptions#3[#2][#4]#1}% \fi \else - \@temptokena{#2}% \def\reserved@b##1,{% \ifx\@nil##1\relax\else \ifx\relax##1\relax\else \noexpand\@onefilewithoptions##1% - [\the\@temptokena][#4]\noexpand\@pkgextension + [\XKV@resb][#4]\noexpand\@pkgextension \fi \expandafter\reserved@b \fi}% diff --git a/Master/texmf-dist/tex/latex/xkeyval/xkvview.sty b/Master/texmf-dist/tex/latex/xkeyval/xkvview.sty index 379b48aa3bb..c2912f962f3 100644 --- a/Master/texmf-dist/tex/latex/xkeyval/xkvview.sty +++ b/Master/texmf-dist/tex/latex/xkeyval/xkvview.sty @@ -24,14 +24,14 @@ %% %% This work consists of the file xkeyval.dtx and derived files %% keyval.tex, xkvtxhdr.tex, xkeyval.sty, xkeyval.tex, xkvview.sty, -%% xkvltxp.sty, pst-xkey.tex, pst-xkey.sty, xkveca.cls, xkvecb.cls, -%% xkvesa.sty, xkvesb.sty, xkvesc.sty, xkvex1.tex, xkvex2.tex, -%% xkvex3.tex and xkvex4.tex. +%% xkvltxp.sty, xkvutils.tex, pst-xkey.tex, pst-xkey.sty, xkveca.cls, +%% xkvecb.cls, xkvesa.sty, xkvesb.sty, xkvesc.sty, xkvex1.tex, +%% xkvex2.tex, xkvex3.tex and xkvex4.tex. %% %% The following files constitute the xkeyval bundle and must be %% distributed as a whole: readme, xkeyval.pdf, keyval.tex, %% pst-xkey.sty, pst-xkey.tex, xkeyval.sty, xkeyval.tex, xkvview.sty, -%% xkvltxp.sty, xkvtxhdr.tex, pst-xkey.dtx and xkeyval.dtx. +%% xkvltxp.sty, xkvtxhdr.tex, xkvutils.tex, pst-xkey.dtx and xkeyval.dtx. %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{xkvview}% -- cgit v1.2.3