1 files changed, 18 insertions, 19 deletions
diff --git a/Master/texmf-dist/source/latex/expl3/l3xref.dtx b/Master/texmf-dist/source/latex/expl3/l3xref.dtx
index 2f03bf8b387..742def4b143 100644
--- a/Master/texmf-dist/source/latex/expl3/l3xref.dtx
+++ b/Master/texmf-dist/source/latex/expl3/l3xref.dtx
@@ -32,33 +32,30 @@
 %%
 %% -----------------------------------------------------------------------
 %
-%<package>\RequirePackage{l3names}
-%<*dtx|testfile>
+%<*driver|package|testfile>
+\RequirePackage{l3names}
+%</driver|package|testfile>
 %\fi
-\def\GetIdInfo$Id: #1.dtx #2 #3-#4-#5 #6 #7$#8{%
-  \def\fileversion{#2}%
-  \def\filedate{#3/#4/#5}%
+\GetIdInfo$Id: l3xref.dtx 621 2007-09-01 20:14:19Z morten $
+       {L3 Experimental cross referencing}
 %\iffalse
-%<dtx>  \ProvidesFile{#1.dtx}[#3/#4/#5 v#2 #8]%
-%<-dtx>  \ProvidesFile{\jobname.tex}[#3/#4/#5 v#2 #8]%
+%<*testfile>
+\ProvidesFile{\jobname.tex}
+  [\filedate\space v\fileversion\space\filedescription]
+%</testfile>
+%<*driver>
 %\fi
-}
+\ProvidesFile{\filename.\filenameext}
+  [\filedate\space v\fileversion\space\filedescription]
 %\iffalse
-%</dtx|testfile>
-%\fi
-\GetIdInfo$Id: l3xref.dtx 579 2006-11-25 23:38:03Z morten $
-       {L3 Experimental cross referencing}
-%
-% \iffalse
-%<*driver>
 \documentclass{l3doc}
-
 \begin{document}
-\DocInput{l3xref.dtx}
+\DocInput{\filename.\filenameext}
 \end{document}
 %</driver>
 % \fi
 %
+%
 % \title{The \textsf{l3xref} package\thanks{This file
 %         has version number \fileversion, last
 %         revised \filedate.}\\
@@ -117,6 +114,8 @@
 %    We start by ensuring that the required packages are loaded.
 %    \begin{macrocode}
 %<*package>
+\ProvidesExplPackage
+  {\filename}{\filedate}{\fileversion}{\filedescription}
 \RequirePackage{l3quark}
 \RequirePackage{l3toks}
 \RequirePackage{l3io}
@@ -310,7 +309,7 @@
 %<*testfile>
 \documentclass{article}
 \usepackage{l3xref}
-\CodeStart
+\ExplSyntaxOn
 \def:Npn \startrecording {\iow_open:Nn \xref_write {\jobname.xref}}
 \def:Npn \DefineCrossReferences {
   \group_begin:
@@ -332,7 +331,7 @@
 
 \let:NN \setlabel \xref_set_label:n
 
-\CodeStop
+\ExplSyntaxOff
 \begin{document}
 \pagenumbering{roman}