summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/l3packages
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-05-05 22:01:18 +0000
committerKarl Berry <karl@freefriends.org>2014-05-05 22:01:18 +0000
commitd78a5a4de1e73a2151e8ed2635a199d928ccb559 (patch)
treeca490a3efa7d3614793427f850ec1aeb6bf971f1 /Master/texmf-dist/source/latex/l3packages
parentb41cac6cebc8095cf8eaf7e84f8a2d5f63b7be38 (diff)
latex3 (5may14)
git-svn-id: svn://tug.org/texlive/trunk@33859 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/l3packages')
-rw-r--r--Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx39
-rw-r--r--Master/texmf-dist/source/latex/l3packages/xfrac/xfrac.dtx6
-rw-r--r--Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx63
-rw-r--r--Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx16
4 files changed, 77 insertions, 47 deletions
diff --git a/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx b/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx
index f66febfeaeb..6158b9c21a9 100644
--- a/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx
+++ b/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-%% File: l3keys2e.dtx (C) Copyright 2009,2011-2013 The LaTeX3 Project
+%% File: l3keys2e.dtx (C) Copyright 2009,2011-2014 The 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
@@ -37,8 +37,8 @@
%<*driver|package>
% The version of expl3 required is tested as early as possible, as
% some really old versions do not define \ProvidesExplPackage.
-\RequirePackage{expl3}[2013/12/31]
-%<package>\@ifpackagelater{expl3}{2013/12/31}
+\RequirePackage{expl3}[2014/05/05]
+%<package>\@ifpackagelater{expl3}{2014/05/05}
%<package> {}
%<package> {%
%<package> \PackageError{l3keys2e}{Support package l3kernel too old}
@@ -50,7 +50,7 @@
%<package> }%
%<package> \endinput
%<package> }
-\GetIdInfo$Id: l3keys2e.dtx 4634 2013-12-31 17:32:19Z joseph $
+\GetIdInfo$Id: l3keys2e.dtx 4740 2014-05-05 14:04:24Z joseph $
{LaTeX2e option processing using LaTeX3 keys}
%</driver|package>
%<*driver>
@@ -143,7 +143,7 @@
% \begin{macrocode}
%<*package>
% \end{macrocode}
-%
+%
% \begin{macrocode}
%<@@=keys>
% \end{macrocode}
@@ -153,6 +153,11 @@
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
% \end{macrocode}
%
+% One non-standard variant needed.
+% \begin{macrocode}
+\cs_generate_variant:Nn \clist_put_right:Nn { Nv }
+% \end{macrocode}
+%
% \begin{macro}{\l_@@_latexe_options_clist}
% A single list is used for all options, into which they are collected
% before processing.
@@ -193,7 +198,11 @@
}
}
}
- \keys_set:nV {#1} \l_@@_latexe_options_clist
+ \clist_map_inline:Nn \l_@@_latexe_options_clist
+ {
+ \tl_set:Nn \CurrentOption {##1}
+ \keys_set:nn {#1} {##1}
+ }
\AtEndOfPackage { \cs_set_eq:NN \@unprocessedoptions \scan_stop: }
}
% \end{macrocode}
@@ -230,14 +239,20 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_latexe_options_class:n #1
{
- \keys_if_exist:nnTF {#1} { unknown }
- { \clist_put_right:No \l_@@_latexe_options_clist \@classoptionslist }
+ \cs_if_free:cF { opt@ \@currname . \@currext }
{
- \clist_map_inline:Nn \@classoptionslist
+ \keys_if_exist:nnTF {#1} { unknown }
{
- \keys_if_exist:nnTF {#1} { \@@_latexe_remove_equals:n {##1} }
- { \clist_put_right:Nn \l_@@_latexe_options_clist {##1} }
- { \clist_put_right:Nn \@unusedoptionlist {##1} }
+ \clist_put_right:Nv \l_@@_latexe_options_clist
+ { opt@ \@currname . \@currext }
+ }
+ {
+ \clist_map_inline:cn { opt@ \@currname . \@currext }
+ {
+ \keys_if_exist:nnTF {#1} { \@@_latexe_remove_equals:n {##1} }
+ { \clist_put_right:Nn \l_@@_latexe_options_clist {##1} }
+ { \clist_put_right:Nn \@unusedoptionlist {##1} }
+ }
}
}
}
diff --git a/Master/texmf-dist/source/latex/l3packages/xfrac/xfrac.dtx b/Master/texmf-dist/source/latex/l3packages/xfrac/xfrac.dtx
index 0d3243c8dd8..7a1f982e844 100644
--- a/Master/texmf-dist/source/latex/l3packages/xfrac/xfrac.dtx
+++ b/Master/texmf-dist/source/latex/l3packages/xfrac/xfrac.dtx
@@ -1,7 +1,7 @@
% \iffalse meta-comment
%
%% File: xfrac.dtx Copyright (C) 2004, 2008-2010 Morten Hoegholm
-%% (C) 2011,2012 The LaTeX3 Project
+%% (C) 2011,2012,2014 The 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
@@ -37,7 +37,7 @@
%
%<*driver|package>
\RequirePackage{amstext,graphicx,l3keys2e,textcomp,xparse,xtemplate}
-\GetIdInfo$Id: xfrac.dtx 4299 2012-11-09 18:48:51Z joseph $
+\GetIdInfo$Id: xfrac.dtx 4728 2014-05-04 13:25:37Z joseph $
{L3 Experimental split-level fractions}
%</driver|package>
%<*driver>
@@ -530,7 +530,7 @@
% \begin{macrocode}
%<*package>
% \end{macrocode}
-%
+%
% \begin{macrocode}
%<@@=xfrac>
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx b/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx
index 5c8c0ddaa43..cda5afc4764 100644
--- a/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx
+++ b/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx
@@ -4,7 +4,7 @@
%% David Carlisle
%% (C) Copyright 2004-2008 Frank Mittelbach,
%% The LaTeX3 Project
-%% (C) Copyright 2009-2013 The LaTeX3 Project
+%% (C) Copyright 2009-2014 The 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
@@ -41,8 +41,8 @@
%<*driver|package>
% The version of expl3 required is tested as early as possible, as
% some really old versions do not define \ProvidesExplPackage.
-\RequirePackage{expl3}[2013/12/31]
-%<package>\@ifpackagelater{expl3}{2013/12/31}
+\RequirePackage{expl3}[2014/05/05]
+%<package>\@ifpackagelater{expl3}{2014/05/05}
%<package> {}
%<package> {%
%<package> \PackageError{xparse}{Support package l3kernel too old}
@@ -54,7 +54,7 @@
%<package> }%
%<package> \endinput
%<package> }
-\GetIdInfo$Id: xparse.dtx 4634 2013-12-31 17:32:19Z joseph $
+\GetIdInfo$Id: xparse.dtx 4740 2014-05-05 14:04:24Z joseph $
{L3 Experimental document command parser}
%</driver|package>
%<*driver>
@@ -213,7 +213,7 @@
% \item |#4| = ||
% \item |#5| = |Three|
% \end{itemize}
-%
+%
% Delimited argument types (\texttt{d}, \texttt{o} and \texttt{r}) are
% defined such that they require matched pairs of delimiters when collecting
% an argument. For example
@@ -225,7 +225,7 @@
% Also note that |{| and |}| cannot be used as delimiters as they are used
% by \TeX{} as grouping tokens. Arguments to be grabbed inside these tokens
% must be created as either \texttt{m}- or \texttt{g}-type arguments.
-%
+%
% Within delimited arguments, non-balanced or otherwise awkward tokens may
% be included by protecting the entire argument with a brace pair
% \begin{verbatim}
@@ -280,6 +280,8 @@
% \verb*|\foo{arg1} [arg2]| will not. This is so that trailing optional
% arguments are not picked up \enquote{by accident} in input.
%
+% There is one major exception to the rules listed above: when \pkg{xparse} is used to define what \TeX\ defines as \enquote{control symbols} in which the function name is made up of a single character, such as \enquote{\cmd{\\}}, spaces are \emph{not} ignored directly after them even for mandatory arguments.
+%
% \subsection{Required delimited arguments}
%
% The contrast between a delimited (\texttt{D}-type) and \enquote{required
@@ -339,6 +341,7 @@
% \meta{function}. The argument specification for the function is
% given by \meta{arg spec}, and expanding
% to be replaced by the \meta{code}.
+% \end{function}
%
% As an example:
% \begin{verbatim}
@@ -372,10 +375,9 @@
%
% \begin{texnote}
% Unlike \LaTeXe{}'s \cs{newcommand} and relatives, the
-% \cs{DeclareDocumentCommand} function do not prevent creation of
+% \cs{DeclareDocumentCommand} family of functions do not prevent creation of
% functions with names starting \cs{end\ldots}.
% \end{texnote}
-% \end{function}
%
% \begin{function}
% {
@@ -404,8 +406,10 @@
% \begin{function}[EXP,TF]{\IfNoValue}
% \begin{syntax}
% \cs{IfNoValueTF} \Arg{argument} \Arg{true code} \Arg{false code}
+% \cs{IfNoValueT} \Arg{argument} \Arg{true code}
+% \cs{IfNoValueF} \Arg{argument} \Arg{false code}
% \end{syntax}
-% The \cs{IfNoValue} tests are used to check if \meta{argument} (|#1|,
+% The \cs{IfNoValue(TF)} tests are used to check if \meta{argument} (|#1|,
% |#2|, \emph{etc.}) is the special |-NoValue-| marker For example
% \begin{verbatim}
% \DeclareDocumentCommand \foo { o m }
@@ -418,6 +422,10 @@
% will use a different internal function if the optional argument
% is given than if it is not present.
%
+% Note that three tests are available, depending on which outcome
+% branches are required: \cs{IfNoValueTF}, \cs{IfNoValueT} and
+% \cs{IfNoValueF}.
+%
% As the \cs{IfNoValue(TF)} tests are expandable, it is possible to
% test these values later, for example at the point of typesetting or
% in an expansion context.
@@ -521,7 +529,7 @@
% input. The processed input is placed inside
% $\text{\meta{number}} + 1$ sets of braces for further use.
% If there are fewer than \Arg{number} of \Arg{tokens} in the argument
-% then empty brace groups are added at the end of the processed
+% then \cs{NoValue} markers are added at the end of the processed
% argument.
% \begin{verbatim}
% \DeclareDocumentCommand \foo
@@ -692,7 +700,7 @@
% \begin{macrocode}
%<*package>
% \end{macrocode}
-%
+%
% \begin{macrocode}
%<@@=xparse>
% \end{macrocode}
@@ -703,7 +711,7 @@
% \end{macrocode}
%
% \subsection{Variables and constants}
-%
+%
% \begin{variable}{\c_@@_no_value_tl}
% A special \enquote{awkward} token list: it contains two |-|~tokens with
% different category codes. This is used as the marker for nothing being
@@ -1661,12 +1669,14 @@
% \begin{macrocode}
\cs_new_protected_nopar:Npn \@@_add_expandable_type_g:w
{
- \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type } { g }
+ \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type }
+ { g }
\@@_add_expandable_type_m:w
}
\cs_new_protected_nopar:Npn \@@_add_expandable_type_G:w #1
{
- \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type } { G }
+ \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type }
+ { G }
\@@_add_expandable_type_m:w
}
% \end{macrocode}
@@ -1679,7 +1689,8 @@
% \begin{macrocode}
\cs_new_protected_nopar:Npn \@@_add_expandable_type_l:w
{
- \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type } { l }
+ \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type }
+ { l }
\@@_add_expandable_type_m:w
}
% \end{macrocode}
@@ -1753,7 +1764,8 @@
% \begin{macrocode}
\cs_new_protected_nopar:Npn \@@_add_expandable_type_u:w #1
{
- \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type } { u }
+ \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type }
+ { u }
\@@_add_expandable_type_m:w
}
% \end{macrocode}
@@ -1764,7 +1776,8 @@
% \begin{macrocode}
\cs_new_protected_nopar:Npn \@@_add_expandable_type_v:w
{
- \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type } { v }
+ \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type }
+ { v }
\@@_add_expandable_type_m:w
}
% \end{macrocode}
@@ -3143,20 +3156,20 @@
{
You~have~used~\NewDocumentCommand
with~a~command~that~already~has~a~definition. \\
- The~existing~definition~of~'#1'~will~be~overwritten.
+ The~existing~definition~of~'#1'~will~not~be~altered.
}
\__msg_kernel_new:nnnn { xparse } { command-not-yet-defined }
{ Command ~'#1'~not~yet~defined! }
{
You~have~used~\RenewDocumentCommand
- with~a~command~that~was~never~defined.\\
+ with~a~command~that~was~never~defined. \\
A~new~command~'#1'~will~be~created.
}
\__msg_kernel_new:nnnn { xparse } { environment-already-defined }
{ Environment~'#1'~already~defined! }
{
You~have~used~\NewDocumentEnvironment
- with~an~environment~that~already~has~a~definition.\\
+ with~an~environment~that~already~has~a~definition. \\
The~existing~definition~of~'#1'~will~be~overwritten.
}
\__msg_kernel_new:nnnn { xparse } { environment-mismatch }
@@ -3169,18 +3182,20 @@
{ Environment~'#1'~not~yet~defined! }
{
You~have~used~\RenewDocumentEnvironment
- with~an~environment~that~was~never~defined.\\
+ with~an~environment~that~was~never~defined. \\
A~new~environment~'#1'~will~be~created.
}
\__msg_kernel_new:nnnn { xparse } { environment-unknown }
{ Environment~'#1'~undefined. }
{
You~have~tried~to~start~an~environment~called~'#1',~
- but~this~has~never~been~defined.\\
+ but~this~has~never~been~defined. \\
The~command~will~be~ignored.
}
\__msg_kernel_new:nnnn { xparse } { expandable-ending-optional }
- { Argument~specification~for~expandable~command~ends~with~optional~argument. }
+ {
+ Argument~specification~for~expandable~command~ends~with~optional~argument.
+ }
{
\c_msg_coding_error_text_tl
Expandable~commands~must~have~a~final~mandatory~argument~
@@ -3449,7 +3464,7 @@
% \end{macro}
%
% \subsection{Package options}
-%
+%
% \begin{variable}{\l_@@_options_clist}
% \begin{variable}{\l_@@_log_bool}
% Key--value option to log information: done by hand to keep dependencies
diff --git a/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx b/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx
index 534ebfa4c28..bef0843c51c 100644
--- a/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx
+++ b/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx
@@ -4,7 +4,7 @@
%% David Carlisle
%% (C) Copyright 2004-2010 Frank Mittelbach,
%% The LaTeX3 Project
-%% (C) Copyright 2011-2013 The LaTeX3 Project
+%% (C) Copyright 2011-2014 The 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
@@ -41,8 +41,8 @@
%<*driver|package>
% The version of expl3 required is tested as early as possible, as
% some really old versions do not define \ProvidesExplPackage.
-\RequirePackage{expl3}[2013/12/31]
-%<package>\@ifpackagelater{expl3}{2013/12/31}
+\RequirePackage{expl3}[2014/05/05]
+%<package>\@ifpackagelater{expl3}{2014/05/05}
%<package> {}
%<package> {%
%<package> \PackageError{xtemplate}{Support package l3kernel too old}
@@ -54,7 +54,7 @@
%<package> }%
%<package> \endinput
%<package> }
-\GetIdInfo$Id: xtemplate.dtx 4634 2013-12-31 17:32:19Z joseph $
+\GetIdInfo$Id: xtemplate.dtx 4740 2014-05-05 14:04:24Z joseph $
{L3 Experimental prototype document functions}
%</driver|package>
%<*driver>
@@ -657,7 +657,7 @@
% \texttt{a}, \texttt{b} and \texttt{c}, plus code for an \texttt{unknown}
% branch.
% \end{function}
-%
+%
% \section{Collections}
%
% The implementation of templates includes a concept termed
@@ -671,7 +671,7 @@
% achieve this, at least with the current approach. As such, the collection
% functions should be regarded as deprecated: they remain available to support
% existing code, but will be removed when a better mechanism is developed.
-%
+%
%
% \begin{function}{\ShowCollectionInstanceValues}
% \begin{syntax}
@@ -691,7 +691,7 @@
% \begin{macrocode}
%<*package>
% \end{macrocode}
-%
+%
% \begin{macrocode}
%<@@=xtemplate>
% \end{macrocode}
@@ -2278,7 +2278,7 @@
% \begin{macro}[aux]{\@@_assign_tokenlist_aux:NN}
% Life would be easy here if it were not for \cs{KeyValue}. To deal
% correctly with that, we need to allow for the recovery a a stored value
-% at point of use.
+% at point of use.
% \begin{macrocode}
\cs_new_protected_nopar:Npn \@@_assign_tokenlist:
{