summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/l3packages
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-08-16 22:41:08 +0000
committerKarl Berry <karl@freefriends.org>2012-08-16 22:41:08 +0000
commitca1c73f9a8de69e467230c4a57ccf8b07cd275a9 (patch)
tree6272657307f73c14327d6b8bce5d6b7ff97c3f66 /Master/texmf-dist/source/latex/l3packages
parent22c251adda514ed7b453066de05b2f89707d0fe6 (diff)
finish l3 update
git-svn-id: svn://tug.org/texlive/trunk@27427 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.dtx6
-rw-r--r--Master/texmf-dist/source/latex/l3packages/xfrac/xfrac.dtx4
-rw-r--r--Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx42
-rw-r--r--Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx6
4 files changed, 20 insertions, 38 deletions
diff --git a/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx b/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx
index 564a45a7ce5..8b479be2279 100644
--- a/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx
+++ b/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx
@@ -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}[2012/07/16]
-%<package>\@ifpackagelater{expl3}{2012/07/16}
+\RequirePackage{expl3}[2012/08/14]
+%<package>\@ifpackagelater{expl3}{2012/08/14}
%<package> {}
%<package> {%
%<package> \PackageError{l3keys2e}{Support package l3kernel too old.}
@@ -50,7 +50,7 @@
%<package> \endinput
%<package> }
\RequirePackage{xparse}
-\GetIdInfo$Id: l3keys2e.dtx 3990 2012-07-16 07:46:03Z joseph $
+\GetIdInfo$Id: l3keys2e.dtx 4091 2012-08-14 08:13:50Z joseph $
{LaTeX2e option processing using LaTeX3 keys}
%</driver|package>
%<*driver>
diff --git a/Master/texmf-dist/source/latex/l3packages/xfrac/xfrac.dtx b/Master/texmf-dist/source/latex/l3packages/xfrac/xfrac.dtx
index 1ee8b2a7088..7a867b71117 100644
--- a/Master/texmf-dist/source/latex/l3packages/xfrac/xfrac.dtx
+++ b/Master/texmf-dist/source/latex/l3packages/xfrac/xfrac.dtx
@@ -37,7 +37,7 @@
%
%<*driver|package>
\RequirePackage{amstext,graphicx,l3keys2e,textcomp,xparse,xtemplate}
-\GetIdInfo$Id: xfrac.dtx 3875 2012-06-30 12:38:05Z joseph $
+\GetIdInfo$Id: xfrac.dtx 3991 2012-07-16 19:00:35Z joseph $
{L3 Experimental split-level fractions}
%</driver|package>
%<*driver>
@@ -1139,4 +1139,4 @@
%
% \end{implementation}
%
-% \PrintIndex \ No newline at end of file
+% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx b/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx
index b003f5d012c..8f77a0b3231 100644
--- a/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx
+++ b/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx
@@ -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}[2012/07/16]
-%<package>\@ifpackagelater{expl3}{2012/07/16}
+\RequirePackage{expl3}[2012/08/14]
+%<package>\@ifpackagelater{expl3}{2012/08/14}
%<package> {}
%<package> {%
%<package> \PackageError{xparse}{Support package l3kernel too old.}
@@ -53,7 +53,7 @@
%<package> }%
%<package> \endinput
%<package> }
-\GetIdInfo$Id: xparse.dtx 3990 2012-07-16 07:46:03Z joseph $
+\GetIdInfo$Id: xparse.dtx 4091 2012-08-14 08:13:50Z joseph $
{L3 Experimental document command parser}
%</driver|package>
%<*driver>
@@ -1063,36 +1063,18 @@
{
\@@_declare_cmd_internal:cnx { environment~ #1 } {#2}
{
- \group_begin:
- \cs_set_protected_nopar:Npx \exp_not:c { environment_ #1 _end_aux: }
- {
- \exp_not:c { environment_ #1 _end_aux:w }
- \exp_not:n
- {
- \exp_args:No \exp_not:o
- { \exp_after:wN \use_none:n \l_@@_args_tl }
-%<*initex>
- \group_end:
-%</initex>
-%<*package>
- \exp_not:n
- {
- \if@endpe
- \exp_after:wN \group_end:
- \exp_after:wN \@endpetrue
- \else
- \exp_after:wN \group_end:
- \fi
- }
-%</package>
- }
- }
+ \cs_set_protected_nopar:Npx \exp_not:c { environment~ #1 ~end~aux }
+ {
+ \exp_not:c { environment~ #1~end~aux~ }
+ \exp_not:n
+ { { \tl_tail:N \l_@@_args_tl } }
+ }
\exp_not:n {#3}
}
\cs_set_protected_nopar:cpx { environment~ #1 ~end }
- { \exp_not:c { environment_ #1 _end_aux: } }
+ { \exp_not:c { environment~ #1 ~end~aux } }
\cs_generate_from_arg_count:cNnn
- { environment_ #1 _end_aux:w } \cs_set_protected:Npn
+ { environment~ #1 ~end~aux~ } \cs_set_protected:Npn
\l_@@_current_arg_int {#4}
%<*package>
\cs_set_eq:cc {#1} { environment~ #1 }
@@ -3442,4 +3424,4 @@
%
% \end{implementation}
%
-% \PrintIndex \ No newline at end of file
+% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx b/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx
index 790c5667742..efe49ab6781 100644
--- a/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx
+++ b/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx
@@ -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}[2012/07/16]
-%<package>\@ifpackagelater{expl3}{2012/07/16}
+\RequirePackage{expl3}[2012/08/14]
+%<package>\@ifpackagelater{expl3}{2012/08/14}
%<package> {}
%<package> {%
%<package> \PackageError{xtemplate}{Support package l3kernel too old.}
@@ -53,7 +53,7 @@
%<package> }%
%<package> \endinput
%<package> }
-\GetIdInfo$Id: xtemplate.dtx 3990 2012-07-16 07:46:03Z joseph $
+\GetIdInfo$Id: xtemplate.dtx 4091 2012-08-14 08:13:50Z joseph $
{L3 Experimental prototype document functions}
%</driver|package>
%<*driver>