xpackages 1407 (9jun09)

git-svn-id: svn://tug.org/texlive/trunk@13685 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 26 insertions, 25 deletions

diff --git a/Master/texmf-dist/tex/latex/xpackages/ldcsetup.sty b/Master/texmf-dist/tex/latex/xpackages/ldcsetup.sty
index 57d5e448d17..7f26ce16cbb 100644
--- a/Master/texmf-dist/tex/latex/xpackages/ldcsetup.sty
+++ b/Master/texmf-dist/tex/latex/xpackages/ldcsetup.sty
@@ -20,7 +20,7 @@
 %% ======================================================================
 %% 
 %% File: ldcsetup.dtx (C) Copyright 1999 Frank Mittelbach, Chris Rowley, David Carlisle
-%%                    (C) Copyright 2004-2007 Frank Mittelbach, LaTeX3 Project
+%%                    (C) Copyright 2004-2009 Frank Mittelbach, LaTeX3 Project
 %%
 %% It may be distributed and/or modified under the conditions of the
 %% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -53,12 +53,13 @@
 %%
 %% -----------------------------------------------------------------------
 %%
-\RequirePackage{l3names}
-\GetIdInfo$Id: ldcsetup.dtx 636 2007-09-12 20:03:06Z mittelba $
+\RequirePackage{expl3}
+\GetIdInfo$Id: ldcsetup.dtx 1295 2009-05-06 08:32:25Z will $
        {coding conventions and stuff}
 \ProvidesExplPackage
   {\filename}{\filedate}{\fileversion}{\filedescription}
-\RequirePackage{keyval,l3calc}
+\RequirePackage{keyval}
+\RequirePackage{expl3}
 \ExplSyntaxOff
 %% Puts an ignored space at the end of the line, so `|\ |' does the right
 \def\IgnoreWhiteSpace{%
@@ -95,7 +96,7 @@
 %%% ????
   \ifx\InternalSyntaxOff\relax
     \expandafter\def\expandafter\InternalSyntaxOff\expandafter
-{\@tempa\let\InternalSyntaxOff\relax}%
+      {\@tempa\let\InternalSyntaxOff\relax}%
   \fi
   \ifx\@currname\@empty
     \expandafter\AtBeginDocument\expandafter{\@tempa}%
@@ -113,21 +114,21 @@
 }
 \let\InternalSyntaxOff\relax
 \ExplSyntaxOn
-\def\define@key#1#2{%
+\cs_set_nopar:Npn \define@key#1#2{%
   \@ifnextchar[
      {\KV@def{#1}{\string#2}}
      {\@namedef{KV@#1@\string#2}####1}}
-\def\setkeys#1#2{%
-  \def\KV@prefix{KV@#1@\expandafter\string}%
+\cs_set_nopar:Npn \setkeys#1#2{%
+  \cs_set_nopar:Npn \KV@prefix{KV@#1@\expandafter\string}%
   \KV@do#2,\relax,}
 \newtoks\KV@toks
-\def\KV@@sp@c#1\@nil#2\relax#3{\KV@toks{#1}\edef#3{\the\KV@toks}}
-\def\KV@equal{=}
-\def\KV@split#1=#2=#3\relax{%
+\cs_set_nopar:Npn \KV@@sp@c#1\@nil#2\relax#3{\KV@toks{#1}\cs_set_nopar:Npx #3{\the\KV@toks}}
+\cs_set_nopar:Npn \KV@equal{=}
+\cs_set_nopar:Npn \KV@split#1=#2=#3\relax{%
   \KV@@sp@def\@tempa{#1}%
-  \def\@tempd{#3}%
+  \cs_set_nopar:Npn \@tempd{#3}%
   \ifx\@tempa\@empty\else
-    \expandafter\let\expandafter\@tempc
+    \expandafter\cs_set_eq:NN \expandafter\@tempc
       \csname\KV@prefix\@tempa\endcsname
     \ifx\@tempc\relax
       \KV@error{\@tempa\space \expandafter\@gobbletwo\string\@undefined}\@eha
@@ -144,24 +145,24 @@
       \fi
     \fi
   \fi}
-\def\KV@erry{\expandafter\KV@errx\meaning\@tempd\relax ignored\MessageBreak
+\cs_set_nopar:Npn \KV@erry{\expandafter\KV@errx\meaning\@tempd\relax ignored\MessageBreak
              missing~comma~in~`\expandafter\strip@prefix\meaning\@tempb'~?}
-\def\KV@errx#1>#2==\relax{%
+\cs_set_nopar:Npn \KV@errx#1>#2==\relax{%
  `#2' }
-\def\KV@default{%
-  \expandafter\let\expandafter\@tempb
+\cs_set_nopar:Npn \KV@default{%
+  \expandafter\cs_set_eq:NN \expandafter\@tempb
     \csname\KV@prefix\@tempa @default\endcsname
   \ifx\@tempb\relax
     \KV@error{No value specified for \@tempa}\@eha
   \else
     \@tempb\relax
   \fi}
-\def\KV@error#1#2{\PackageError{keyval}{#1}{#2}}
-\def\KV@parse#1{
+\cs_set_nopar:Npn \KV@error#1#2{\PackageError{keyval}{#1}{#2}}
+\cs_set_nopar:Npn \KV@parse#1{
   \begingroup
-\def\KV@@sp@c##1\@nil##2\relax##3{\addto@hook##3{{##1}}}
-\def\KV@split##1=##2=##3\relax{%
-  \def\@tempd{##3}%
+\cs_set_nopar:Npn \KV@@sp@c##1\@nil##2\relax##3{\addto@hook##3{{##1}}}
+\cs_set_nopar:Npn \KV@split##1=##2=##3\relax{%
+  \cs_set_nopar:Npn \@tempd{##3}%
   \expandafter\ifx\expandafter=\@firstofone##1=\else
       \ifx\@tempd\@empty
         \addto@hook\KV@toks\KV@default@elt
@@ -181,9 +182,9 @@
   \expandafter
   \endgroup
   \the\KV@toks}
-\let:NN \SetInternalCounter \calc_int_set:Nn
-\let:NN \GSetInternalCounter\calc_int_gset:Nn
-\def\UndeclareRobustCommand#1{%
+\cs_set_eq:NN \SetInternalCounter \calc_int_set:Nn
+\cs_set_eq:NN \GSetInternalCounter\calc_int_gset:Nn
+\cs_set_nopar:Npn \UndeclareRobustCommand#1{%
   \cs_gundefine:N #1
   \exp_args:Nc \cs_gundefine:N {\cs_to_str:N #1~}
 }