summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/l3packages/xparse
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/tex/latex/l3packages/xparse
parentb41cac6cebc8095cf8eaf7e84f8a2d5f63b7be38 (diff)
latex3 (5may14)
git-svn-id: svn://tug.org/texlive/trunk@33859 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3packages/xparse')
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty37
1 files changed, 22 insertions, 15 deletions
diff --git a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
index aa5177281ed..beae464378c 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
@@ -17,7 +17,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
@@ -50,8 +50,8 @@
%%
%% -----------------------------------------------------------------------
%%
-\RequirePackage{expl3}[2013/12/31]
-\@ifpackagelater{expl3}{2013/12/31}
+\RequirePackage{expl3}[2014/05/05]
+\@ifpackagelater{expl3}{2014/05/05}
{}
{%
\PackageError{xparse}{Support package l3kernel too old}
@@ -63,7 +63,7 @@
}%
\endinput
}
-\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}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -546,17 +546,20 @@
}
\cs_new_protected_nopar:Npn \__xparse_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 }
\__xparse_add_expandable_type_m:w
}
\cs_new_protected_nopar:Npn \__xparse_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 }
\__xparse_add_expandable_type_m:w
}
\cs_new_protected_nopar:Npn \__xparse_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 }
\__xparse_add_expandable_type_m:w
}
\cs_new_protected_nopar:Npn \__xparse_add_expandable_type_m:w
@@ -600,12 +603,14 @@
}
\cs_new_protected_nopar:Npn \__xparse_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 }
\__xparse_add_expandable_type_m:w
}
\cs_new_protected_nopar:Npn \__xparse_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 }
\__xparse_add_expandable_type_m:w
}
\cs_new_protected_nopar:Npn \__xparse_add_expandable_grabber_mandatory:n #1
@@ -1399,20 +1404,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 }
@@ -1425,18 +1430,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~