summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/l3packages
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-03-19 22:13:10 +0000
committerKarl Berry <karl@freefriends.org>2017-03-19 22:13:10 +0000
commita9b5c8812a42ed9fc7bd6323b1185a096ecb7c0e (patch)
tree3130ecf7e791b7a7bf9587e8d8d3a339921de401 /Master/texmf-dist/tex/latex/l3packages
parentdd8d54441efc71090eb7f91c1315b3d08ddbdcdc (diff)
l3 (19mar17)
git-svn-id: svn://tug.org/texlive/trunk@43548 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3packages')
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty14
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty14
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty14
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty45
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty14
5 files changed, 45 insertions, 56 deletions
diff --git a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
index 17a54eb826d..6047fb45863 100644
--- a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
@@ -19,8 +19,8 @@
%% and all files in that bundle must be distributed together.
%%
%% File: l3keys2e.dtx (C) Copyright 2009,2011-2017 The LaTeX3 Project
-\RequirePackage{expl3}[2017/03/11]
-\@ifpackagelater{expl3}{2017/03/11}
+\RequirePackage{expl3}[2017/03/18]
+\@ifpackagelater{expl3}{2017/03/18}
{}
{%
\PackageError{l3keys2e}{Support package l3kernel too old}
@@ -32,12 +32,10 @@
}%
\endinput
}
-\def\ExplFileName{l3keys2e}
-\def\ExplFileDescription{LaTeX2e option processing using LaTeX3 keys}
-\def\ExplFileDate{2017/03/11}
-\def\ExplFileVersion{6988}
-\ProvidesExplPackage
- {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
+\def\ExplFileDate{2017/03/18}
+\def\ExplFileVersion{7019}
+\ProvidesExplPackage{l3keys2e}{\ExplFileDate}{\ExplFileVersion}
+ {LaTeX2e option processing using LaTeX3 keys}
\cs_generate_variant:Nn \clist_put_right:Nn { Nv }
\cs_generate_variant:Nn \keys_if_exist:nnT { nx }
\cs_generate_variant:Nn \keys_if_exist:nnTF { nx }
diff --git a/Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty b/Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty
index 62b592f28bd..13a6bf6baf3 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty
@@ -19,8 +19,8 @@
%% and all files in that bundle must be distributed together.
%%
%% File: xfp.dtx (C) Copyright 2017 The LaTeX3 Project
-\RequirePackage{expl3}[2017/03/11]
-\@ifpackagelater{expl3}{2017/03/11}
+\RequirePackage{expl3}[2017/03/18]
+\@ifpackagelater{expl3}{2017/03/18}
{}
{%
\PackageError{xfpu}{Support package l3kernel too old}
@@ -33,12 +33,10 @@
\endinput
}
\RequirePackage{xparse}
-\def\ExplFileName{xfp}
-\def\ExplFileDescription{LaTeX Floating Point Unit}
-\def\ExplFileDate{2017/03/11}
-\def\ExplFileVersion{6988}
-\ProvidesExplPackage
- {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
+\def\ExplFileDate{2017/03/18}
+\def\ExplFileVersion{7019}
+\ProvidesExplPackage{xfp}{\ExplFileDate}{\ExplFileVersion}
+ {L3 Floating point unit}
\NewExpandableDocumentCommand \fpeval { m } { \fp_eval:n {#1} }
%%
%%
diff --git a/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty b/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty
index 56671044029..e3c154f47f7 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty
@@ -20,8 +20,8 @@
%%
%% File: xfrac.dtx Copyright (C) 2004, 2008-2010 Morten Hoegholm
%% (C) 2011,2012,2014-2017 The LaTeX3 Project
-\RequirePackage{expl3}[2017/03/11]
-\@ifpackagelater{expl3}{2017/03/11}
+\RequirePackage{expl3}[2017/03/18]
+\@ifpackagelater{expl3}{2017/03/18}
{}
{%
\PackageError{xfrac}{Support package l3kernel too old}
@@ -34,12 +34,10 @@
\endinput
}
\RequirePackage{amstext,graphicx,l3keys2e,textcomp,xparse,xtemplate}
-\def\ExplFileName{xfrac}
-\def\ExplFileDescription{L3 Experimental split-level fractions}
-\def\ExplFileDate{2017/03/11}
-\def\ExplFileVersion{6988}
-\ProvidesExplPackage
- {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
+\def\ExplFileDate{2017/03/18}
+\def\ExplFileVersion{7019}
+\ProvidesExplPackage{xfrac}{\ExplFileDate}{\ExplFileVersion}
+ {L3 Experimental split-level fractions}
\keys_define:nn { xfrac }
{
cm-recommended .choice:,
diff --git a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
index 12966bb5c87..33a8c34a06a 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
@@ -23,8 +23,8 @@
%% (C) Copyright 2004-2008 Frank Mittelbach,
%% The LaTeX3 Project
%% (C) Copyright 2009-2017 The LaTeX3 Project
-\RequirePackage{expl3}[2017/03/11]
-\@ifpackagelater{expl3}{2017/03/11}
+\RequirePackage{expl3}[2017/03/18]
+\@ifpackagelater{expl3}{2017/03/18}
{}
{%
\PackageError{xparse}{Support package l3kernel too old}
@@ -36,12 +36,10 @@
}%
\endinput
}
-\def\ExplFileName{xparse}
-\def\ExplFileDescription{L3 Experimental document command parser}
-\def\ExplFileDate{2017/03/11}
-\def\ExplFileVersion{6988}
-\ProvidesExplPackage
- {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
+\def\ExplFileDate{2017/03/18}
+\def\ExplFileVersion{7019}
+\ProvidesExplPackage{xparse}{\ExplFileDate}{\ExplFileVersion}
+ {L3 Experimental document command parser}
\tl_const:Nx \c__xparse_no_value_tl
{ \char_generate:nn { `\- } { 11 } NoValue- }
\tl_new:N \l__xparse_arg_spec_tl
@@ -305,7 +303,7 @@
\__xparse_if_no_value:nTF {#2}
{
\tl_put_right:Nx \l__xparse_tmpa_tl
- { { \exp_not:N \exp_not:n { \exp_not:o { \use_none:n #3 } } } }
+ { { \exp_not:N \exp_not:n { \exp_not:o {#3} } } }
}
{
\tl_put_right:Nn \l__xparse_tmpa_tl
@@ -379,7 +377,7 @@
}
{
\__xparse_if_no_value:nTF {#2}
- { \exp_args:No \__xparse_end_expandable_defaults:nw { \use_none:n #1 } }
+ { \exp_args:No \__xparse_end_expandable_defaults:nw {#1} }
{ \__xparse_end_expandable_defaults:nw {#2} }
}
}
@@ -698,7 +696,7 @@
\bool_set_true:N \l__xparse_prefixed_bool
\bool_set_true:N \l__xparse_process_some_bool
\int_decr:N \l__xparse_current_arg_int
- \tl_put_right:Nn \l__xparse_process_one_tl { {#1} }
+ \tl_put_left:Nn \l__xparse_process_one_tl { {#1} }
\__xparse_prepare_signature_bypass:N
}
\cs_new_protected:Npn \__xparse_add_type_D:w #1#2#3
@@ -815,30 +813,29 @@
}
\cs_new_protected:Npn \__xparse_add_default:n #1
{
- \bool_set_true:N \l__xparse_defaults_bool
- \tl_put_right:Nn \l__xparse_defaults_tl { { . #1} }
+ \__xparse_if_no_value:nTF {#1}
+ { \__xparse_add_default: }
+ {
+ \bool_set_true:N \l__xparse_defaults_bool
+ \tl_put_right:Nn \l__xparse_defaults_tl { { \prg_do_nothing: #1 } }
+ }
}
\cs_new_protected:Npn \__xparse_add_default:
- { \tl_put_right:Nn \l__xparse_defaults_tl { . } }
+ { \tl_put_right:Nn \l__xparse_defaults_tl { \c__xparse_no_value_tl } }
\cs_new_protected:Npn \__xparse_add_default_E:nn #1#2
{
\bool_set_true:N \l__xparse_defaults_bool
- \tl_set:Nx \l__xparse_tmpa_tl
- {
- \exp_not:n {#2}
- \prg_replicate:nn
- { \tl_count:n {#1} - \tl_count:n {#2} }
- { { \c__xparse_no_value_tl } }
- }
\tl_put_right:Nx \l__xparse_defaults_tl
{
{
- \exp_not:f
- { \exp_after:wN \__xparse_add_default_E_aux:n \l__xparse_tmpa_tl }
+ \tl_map_function:nN {#2} \__xparse_add_default_E_aux:n
+ \prg_replicate:nn
+ { \tl_count:n {#1} - \tl_count:n {#2} }
+ { { \c__xparse_no_value_tl } }
}
}
}
-\cs_new:Npn \__xparse_add_default_E_aux:n #1 { {#1} }
+\cs_new:Npn \__xparse_add_default_E_aux:n #1 { \exp_not:n { {#1} } }
\cs_new_protected:cpn { __xparse_add_expandable_type_+:w }
{
\bool_set_true:N \l__xparse_long_bool
diff --git a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
index fb1e6b0ac14..e52dff4d266 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
@@ -23,8 +23,8 @@
%% (C) Copyright 2004-2010 Frank Mittelbach,
%% The LaTeX3 Project
%% (C) Copyright 2011-2016 The LaTeX3 Project
-\RequirePackage{expl3}[2017/03/11]
-\@ifpackagelater{expl3}{2017/03/11}
+\RequirePackage{expl3}[2017/03/18]
+\@ifpackagelater{expl3}{2017/03/18}
{}
{%
\PackageError{xtemplate}{Support package l3kernel too old}
@@ -36,12 +36,10 @@
}%
\endinput
}
-\def\ExplFileName{xtemplate}
-\def\ExplFileDescription{L3 Experimental prototype document functions}
-\def\ExplFileDate{2017/03/11}
-\def\ExplFileVersion{6988}
-\ProvidesExplPackage
- {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
+\def\ExplFileDate{2017/03/18}
+\def\ExplFileVersion{7019}
+\ProvidesExplPackage{xtemplate}{\ExplFileDate}{\ExplFileVersion}
+ {L3 Experimental prototype document functions}
\tl_const:Nn \c__xtemplate_code_root_tl { template~code~>~ }
\tl_const:Nn \c__xtemplate_defaults_root_tl { template~defaults~>~ }
\tl_const:Nn \c__xtemplate_instances_root_tl { template~instance~>~ }