1 files changed, 20 insertions, 25 deletions
diff --git a/Master/texmf-dist/source/latex/xbase/ldcsetup.dtx b/Master/texmf-dist/source/latex/xbase/ldcsetup.dtx
index 7ebb1d59830..7d2d729d622 100644
--- a/Master/texmf-dist/source/latex/xbase/ldcsetup.dtx
+++ b/Master/texmf-dist/source/latex/xbase/ldcsetup.dtx
@@ -1,6 +1,6 @@
 % \iffalse
 %% File: ldcsetup.dtx (C) Copyright 1999 Frank Mittelbach, Chris Rowley, David Carlisle
-%%                    (C) Copyright 2004-2006 Frank Mittelbach, LaTeX3 Project
+%%                    (C) Copyright 2004-2007 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
@@ -33,22 +33,18 @@
 %%
 %% -----------------------------------------------------------------------
 %%
-%<package>\RequirePackage{l3names}
-%<*dtx>
+%<*driver|package>
+\RequirePackage{l3names}
+%</driver|package>
 %\fi
-\def\GetIdInfo$Id: #1.dtx #2 #3-#4-#5 #6 #7$#8{%
-  \def\fileversion{#2}%
-  \def\filedate{#3/#4/#5}%
-  \ProvidesFile{#1.dtx}[#3/#4/#5 v#2 #8]%
-}
-%\iffalse
-%</dtx>
-%\fi
-\GetIdInfo$Id: ldcsetup.dtx 574 2006-08-21 23:30:10Z morten $
+\GetIdInfo$Id: ldcsetup.dtx 636 2007-09-12 20:03:06Z mittelba $
        {coding conventions and stuff}
-%
-% \iffalse
+%\iffalse
 %<*driver>
+%\fi
+\ProvidesFile{\filename.\filenameext}
+  [\filedate\space v\fileversion\space\filedescription]
+%\iffalse
 \documentclass{ltxdoc}
 \begin{document}
 \DocInput{ldcsetup.dtx}
@@ -73,12 +69,12 @@
 %
 %    \begin{macrocode}
 %<*package>
+\ProvidesExplPackage
+  {\filename}{\filedate}{\fileversion}{\filedescription}
 %    \end{macrocode}
-% |\CodeStart| is in effect here so we better stop it again.
 %    \begin{macrocode}
-\CodeStop
-\RequirePackage{keyval,calc}
-\makeatletter
+\RequirePackage{keyval,l3calc}
+\ExplSyntaxOff
 %    \end{macrocode}
 %
 % \section{Ignoring White Space}
@@ -152,7 +148,8 @@
 %
 % Do it for this package.
 %    \begin{macrocode}
-\IgnoreWhiteSpace
+%\InternalSyntaxOn
+\ExplSyntaxOn
 %    \end{macrocode}
 %
 % \section{KV fixes}
@@ -301,9 +298,8 @@
 % Count Register assignments via calc. Here we also provide some
 % global versions since a normal global prefix won't have any effect.
 %    \begin{macrocode}
-\let\SetInternalCounter\calc@assign@count
-\def\GsetInternalCounter#1{\SetInternalCounter{\global#1}}
-\def\gsetlength#1{\setlength{\global#1}}
+\let:NN \SetInternalCounter \calc_int_set:Nn
+\let:NN \GSetInternalCounter\calc_int_gset:Nn
 %    \end{macrocode}
 %
 %
@@ -319,9 +315,8 @@
 %    the space gets reclaimed.
 %    \begin{macrocode}
 \def\UndeclareRobustCommand#1{%
-  \global\let#1\undefined
-  \global\expandafter
-     \let\csname\expandafter\@gobble\string#1~\endcsname\undefined
+  \cs_gundefine:N #1
+  \exp_args:Nc \cs_gundefine:N {\cs_to_str:N #1~}
 }
 %    \end{macrocode}
 % \end{macro}