diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/expl3.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/l3kernel/expl3.dtx | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/expl3.dtx b/Master/texmf-dist/source/latex/l3kernel/expl3.dtx index 0b1c0fbef94..8ea41c4eb2d 100644 --- a/Master/texmf-dist/source/latex/l3kernel/expl3.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/expl3.dtx @@ -33,8 +33,8 @@ %% %% ----------------------------------------------------------------------- % -%<package>\RequirePackage{l3names}[2012/07/15] -%<package>\@ifpackagelater{l3names}{2012/07/15} +%<package>\RequirePackage{l3names}[2012/12/07] +%<package>\@ifpackagelater{l3names}{2012/12/07} %<package> {} %<package> {% %<package> \PackageError{expl3}{Mismatched LaTeX3 packages detected.} @@ -49,8 +49,8 @@ %<*driver|package> \def\ExplFileName{expl3} \def\ExplFileDescription{L3 Experimental code bundle wrapper} -\def\ExplFileDate{2012/11/21} -\def\ExplFileVersion{4332} +\def\ExplFileDate{2012/12/21} +\def\ExplFileVersion{4390} %</driver|package> %<*driver> \documentclass[full]{l3doc} @@ -630,11 +630,15 @@ % This means that the contents of the register in question is used as the % argument, be it an integer, a length-type register, a token list variable % or similar. The value is passed to the function as a braced token list. +% Can be applied to variables which have a \cs{\meta{var}_use:N} function, +% and which therefore deliver a single \enquote{value}. % \item[v] Value of a register, constructed from a character string % used as a command name.\\ % This is a combination of |c| and |V| which first constructs a % control sequence from the argument and then passes the value of the % resulting register to the function. +% Can be applied to variables which have a \cs{\meta{var}_use:N} function, +% and which therefore deliver a single \enquote{value}. % \item[x] Fully-expanded token or braced token list.\\ % This means that the argument is expanded as in the replacement % text of an~\tn{edef}, and the expansion is passed to the function as @@ -913,8 +917,8 @@ % \cs_new:Npn \foo_bar:Nn #1#2 % { % \cs_if_exist:NTF #1 -% { \__foo_bar_aux_i:n {#2} } -% { \__foo_bar_aux_ii:nn {#2} { literal } } +% { \__foo_bar:n {#2} } +% { \__foo_bar:nn {#2} { literal } } % } % \end{verbatim} % where spaces are used around |{| and |}| except for isolated @@ -1029,9 +1033,14 @@ % % Load \pkg{etex} as otherwise we are likely to get into trouble % with registers. Some inserts are reserved also as these have to -% be from the standard pool. +% be from the standard pool. The \cs{relax} is here as +% \cs{reserveinserts} is outer. Most of the time this is fine, but +% some packages (for example \pkg{catoptions}) redefine \cs{RequirePackage} +% such that the trailing optional argument is tested for as a macro argument, +% which will then lead to an error! % \begin{macrocode} \RequirePackage{etex} +\relax \reserveinserts{32} % \end{macrocode} % |