diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/expl3.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/l3kernel/expl3.dtx | 54 |
1 files changed, 37 insertions, 17 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/expl3.dtx b/Master/texmf-dist/source/latex/l3kernel/expl3.dtx index a36906f5137..254a560cea4 100644 --- a/Master/texmf-dist/source/latex/l3kernel/expl3.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/expl3.dtx @@ -36,8 +36,8 @@ %<*driver|generic|package> \def\ExplFileName{expl3} \def\ExplFileDescription{L3 programming layer} -\def\ExplFileDate{2014/06/10} -\def\ExplFileVersion{5105} +\def\ExplFileDate{2014/07/20} +\def\ExplFileVersion{5241} %</driver|generic|package> %<*driver> \documentclass[full]{l3doc} @@ -1387,6 +1387,30 @@ % \end{variable} % \end{macro} % +% \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, @@ -1455,34 +1479,25 @@ } % \end{macrocode} % \end{macro} -% \begin{variable}[int]{\c__expl_def_ext_tl} % For native drivers, just load the appropriate file. As \cs{expl3} syntax % is already on and the full mechanism is only engaged at the end of the % loader, \cs{ProvidesExplFile} is temporarily redefined here. % \begin{macrocode} { - \cs_set_protected:Npn \ProvidesExplFile + \group_begin: + \cs_set_protected:Npn \ProvidesExplFile { - \group_begin: - \char_set_catcode_space:n { `\ } - \ProvidesExplFileAux + \char_set_catcode_space:n { `\ } + \ProvidesExplFileAux } \cs_set_protected:Npn \ProvidesExplFileAux #1#2#3#4 { \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 - \cs_set_protected:Npn \ProvidesExplFile #1#2#3#4 - { - \ProvidesFile {#1} [ #2~v#3~#4 ] - \ExplSyntaxOn - } - \cs_undefine:N \ProvidesExplFileAux } % \end{macrocode} -% \end{variable} % % \begin{macro}{\@pushfilename, \@popfilename} % \begin{macro}[aux]{\__expl_status_pop:w} @@ -1658,7 +1673,7 @@ % appropriate case! To allow this loading to take place a temporary % definition of \cs{ProvidesExplFile} is provided % \begin{macrocode} -\cs_set_protected:Npn \ProvidesExplFile +\cs_set_protected:Npn \ProvidesExplFile { \group_begin: \char_set_catcode_space:n { `\ } @@ -1667,7 +1682,7 @@ \cs_set_protected:Npn \ProvidesExplFileAux #1#2#3#4 { \group_end: - \iow_log:x { File:~#1~#2~v#3~#4 } + \iow_log:x { File:~#1~#2~v#3~#4 } } \tex_input:D l3 @@ -1683,6 +1698,11 @@ { 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} |