diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/expl3.dtx')
| -rw-r--r-- | Master/texmf-dist/source/latex/l3kernel/expl3.dtx | 82 |
1 files changed, 27 insertions, 55 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/expl3.dtx b/Master/texmf-dist/source/latex/l3kernel/expl3.dtx index dc8c1a1a777..616b5e07678 100644 --- a/Master/texmf-dist/source/latex/l3kernel/expl3.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/expl3.dtx @@ -34,10 +34,10 @@ %% ----------------------------------------------------------------------- % %<*driver|generic|package> -\def\ExplFileName{expl3} -\def\ExplFileDescription{L3 programming layer} -\def\ExplFileDate{2015/11/04} -\def\ExplFileVersion{6224} +\def\ExplFileName{expl3}% +\def\ExplFileDescription{L3 programming layer}% +\def\ExplFileDate{2015/12/20}% +\def\ExplFileVersion{6326}% %</driver|generic|package> %<*driver> \documentclass[full]{l3doc} @@ -1101,16 +1101,16 @@ % \begin{macrocode} %<*!loader> \begingroup - \def\next{\endgroup} + \def\next{\endgroup}% \expandafter\ifx\csname PackageError\endcsname\relax \begingroup - \def\next{\endgroup\endgroup} + \def\next{\endgroup\endgroup}% \def\PackageError#1#2#3% {% \endgroup \errhelp{#3}% - \errmessage{#1 Error: #2!} - } + \errmessage{#1 Error: #2!}% + }% \fi \expandafter\ifx\csname ExplLoaderFileVersion\endcsname\relax \def\next @@ -1119,7 +1119,7 @@ {% You have attempted to use the expl3 code directly rather than using the correct loader. Loading of expl3 will abort. - } + }% \endgroup \endinput } @@ -1136,7 +1136,7 @@ }% \endgroup \endinput - } + }% \fi \fi \next @@ -1152,7 +1152,7 @@ {% \ExplFileDate\space v\ExplFileVersion\space \ExplFileDescription\space - } + }% \else \expandafter\endinput \fi @@ -1170,8 +1170,8 @@ Package: \ExplFileName\space \ExplFileDate\space v\ExplFileVersion\space \ExplFileDescription\space - (code) - } + (code)% + }% %</!loader> % \end{macrocode} % @@ -1187,7 +1187,7 @@ [% \ExplFileDate\space v\ExplFileVersion\space \ExplFileDescription\space (loader) - ] + ]% % \end{macrocode} % % \begin{macro}[aux]{\expl@create@bool@option} @@ -1421,30 +1421,6 @@ % \end{variable} % \end{variable} % -% \begin{variable}[int]{\c__expl_def_ext_tl} -% Set up to load Unicode data for various string/text manipulations. -% As the full mechanisms are still be constructed, this requires some -% fiddling about with the \cs{ProvidesExplFile} command. A similar -% requirement applies a little later to loading the native drivers, but -% as that may not happen depending on options the same trick has to be -% repeated! -% \begin{macrocode} -\tl_const:Nn \c__expl_def_ext_tl { def } -\group_begin: -\cs_set_protected:Npn \ProvidesExplFile - { - \char_set_catcode_space:n { `\ } - \ProvidesExplFileAux - } -\cs_set_protected:Npn \ProvidesExplFileAux #1#2#3#4 - { - \group_end: - \ProvidesFile {#1} [ #2~v#3~#4 ] - } -\@onefilewithoptions { l3unicode-data } [ ] [ ] \c__expl_def_ext_tl -% \end{macrocode} -% \end{variable} -% % \begin{macro} % { % \box_rotate:Nn, @@ -1529,6 +1505,7 @@ \group_end: \ProvidesFile {#1} [ #2~v#3~#4 ] } + \tl_const:Nn \c__expl_def_ext_tl { def } \@onefilewithoptions { l3 \l__expl_driver_tl } [ ] [ ] \c__expl_def_ext_tl } % \end{macrocode} @@ -1597,12 +1574,12 @@ % not \LaTeXe{}! % \begin{macrocode} \begingroup - \def\tempa{LaTeX2e} - \def\next{} + \def\tempa{LaTeX2e}% + \def\next{}% \ifx\fmtname\tempa \def\next {% - \PackageInfo{expl3}{Switching from generic to LaTeX2e loader} + \PackageInfo{expl3}{Switching from generic to LaTeX2e loader}% % \end{macrocode} % The \cs{relax} stops \cs{RequirePackage} from scanning for a date % argument. Putting \tn{endinput} \emph{after} loading the package is @@ -1611,8 +1588,8 @@ % \file{expl3.sty} is open it is impossible to close the file % \file{expl3-generic.tex}. % \begin{macrocode} - \RequirePackage{expl3} \relax \endinput - } + \RequirePackage{expl3}\relax \endinput + }% \fi \expandafter\endgroup \next @@ -1626,7 +1603,7 @@ \else \immediate\write-1 {% - Package \ExplFileName\space Info: The package is already loaded. + Package \ExplFileName\space Info: The package is already loaded.% }% \expandafter\endinput \fi @@ -1634,10 +1611,10 @@ {% Package: \ExplFileName\space \ExplFileDate\space v\ExplFileVersion\space - \ExplFileDescription\space (loader) - } + \ExplFileDescription\space (loader)% + }% \expandafter\edef\csname ver@\ExplFileName -generic.tex\endcsname - {\ExplFileDate\space v\ExplFileVersion\space \ExplFileDescription} + {\ExplFileDate\space v\ExplFileVersion\space \ExplFileDescription}% % \end{macrocode} % % \begin{variable}[aux]{\l@expl@tidy@tl} @@ -1648,7 +1625,7 @@ \catcode64=\the\catcode64\relax \let\expandafter\noexpand\csname l@expl@tidy@tl\endcsname \noexpand\undefined - } + }% \catcode64=11 % % \end{macrocode} % \end{variable} @@ -1675,13 +1652,13 @@ % any existing definition is saved for restoration after the payload. % \begin{macrocode} \let\expl@AtBeginDocument\AtBeginDocument -\def\AtBeginDocument#1{} +\def\AtBeginDocument#1{}% \expandafter\def\expandafter\l@expl@tidy@tl\expandafter {% \l@expl@tidy@tl \let\AtBeginDocument\expl@AtBeginDocument \let\expl@AtBeginDocument\undefined - } + }% % \end{macrocode} % \end{macro} % \end{macro} @@ -1742,11 +1719,6 @@ { dvips } } .def \scan_stop: -% \end{macrocode} -% The same considerations apply to loading Unicode support data, so that too -% is done here. -% \begin{macrocode} -\tex_input:D l3unicode-data.def \scan_stop: \cs_undefine:N \ProvidesExplFile \cs_undefine:N \ProvidesExplFileAux % \end{macrocode} |