From f95f2dab244cf167851907d2f86f66d059993afd Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 17 Dec 2017 23:16:51 +0000 Subject: l3 (17dec17) git-svn-id: svn://tug.org/texlive/trunk@46085 c570f23f-e606-0410-a88d-b1316a301751 --- .../source/latex/l3packages/l3keys2e/l3keys2e.dtx | 8 ++--- .../texmf-dist/source/latex/l3packages/xfp/xfp.dtx | 8 ++--- .../source/latex/l3packages/xfrac/xfrac.dtx | 8 ++--- .../source/latex/l3packages/xparse/xparse.dtx | 35 ++++++++++++++++------ .../latex/l3packages/xtemplate/xtemplate.dtx | 8 ++--- 5 files changed, 42 insertions(+), 25 deletions(-) (limited to 'Master/texmf-dist/source/latex/l3packages') diff --git a/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx b/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx index b904af63032..fa581df7a07 100644 --- a/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx +++ b/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx @@ -23,8 +23,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}[2017/12/05] -%\@ifpackagelater{expl3}{2017/12/05} +\RequirePackage{expl3}[2017/12/16] +%\@ifpackagelater{expl3}{2017/12/16} % {} % {% % \PackageError{l3keys2e}{Support package l3kernel too old} @@ -60,7 +60,7 @@ % }^^A % } % -% \date{Released 2017/12/05} +% \date{Released 2017/12/16} % % \maketitle % @@ -131,7 +131,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{l3keys2e}{2017/12/05}{} +\ProvidesExplPackage{l3keys2e}{2017/12/16}{} {LaTeX2e option processing using LaTeX3 keys} % \end{macrocode} % diff --git a/Master/texmf-dist/source/latex/l3packages/xfp/xfp.dtx b/Master/texmf-dist/source/latex/l3packages/xfp/xfp.dtx index 56b1613bab5..fae989a5d14 100644 --- a/Master/texmf-dist/source/latex/l3packages/xfp/xfp.dtx +++ b/Master/texmf-dist/source/latex/l3packages/xfp/xfp.dtx @@ -23,8 +23,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}[2017/12/05] -%\@ifpackagelater{expl3}{2017/12/05} +\RequirePackage{expl3}[2017/12/16] +%\@ifpackagelater{expl3}{2017/12/16} % {} % {% % \PackageError{xfp}{Support package l3kernel too old} @@ -62,7 +62,7 @@ % }^^A % } % -% \date{Released 2017/12/05} +% \date{Released 2017/12/16} % % \maketitle % @@ -159,7 +159,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{xfp}{2017/12/05}{} +\ProvidesExplPackage{xfp}{2017/12/16}{} {L3 Floating point unit} % \end{macrocode} % diff --git a/Master/texmf-dist/source/latex/l3packages/xfrac/xfrac.dtx b/Master/texmf-dist/source/latex/l3packages/xfrac/xfrac.dtx index 57c52c61b36..54057c4b5b4 100644 --- a/Master/texmf-dist/source/latex/l3packages/xfrac/xfrac.dtx +++ b/Master/texmf-dist/source/latex/l3packages/xfrac/xfrac.dtx @@ -24,8 +24,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}[2017/12/05] -%\@ifpackagelater{expl3}{2017/12/05} +\RequirePackage{expl3}[2017/12/16] +%\@ifpackagelater{expl3}{2017/12/16} % {} % {% % \PackageError{xfrac}{Support package l3kernel too old} @@ -63,7 +63,7 @@ % }^^A % } % -% \date{Released 2017/12/05} +% \date{Released 2017/12/16} % % \maketitle % @@ -533,7 +533,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{xfrac}{2017/12/05}{} +\ProvidesExplPackage{xfrac}{2017/12/16}{} {L3 Experimental split-level fractions} % \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 7dfc3d4d0eb..1cf07be68d5 100644 --- a/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx +++ b/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx @@ -27,8 +27,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}[2017/12/05] -%\@ifpackagelater{expl3}{2017/12/05} +\RequirePackage{expl3}[2017/12/16] +%\@ifpackagelater{expl3}{2017/12/16} % {} % {% % \PackageError{xparse}{Support package l3kernel too old} @@ -67,7 +67,7 @@ % }^^A % } % -% \date{Released 2017/12/05} +% \date{Released 2017/12/16} % % \maketitle % @@ -520,14 +520,14 @@ % % \begin{function}[EXP]{\IfBooleanT, \IfBooleanF, \IfBooleanTF} % \begin{syntax} -% \cs{IfBooleanTF} \meta{argument} \Arg{true code} \Arg{false code} +% \cs{IfBooleanTF} \Arg{argument} \Arg{true code} \Arg{false code} % \end{syntax} % Used to test if \meta{argument} (|#1|, |#2|, \emph{etc.}) is % \cs{BooleanTrue} or \cs{BooleanFalse}. For example % \begin{verbatim} % \NewDocumentCommand \foo { s m } % { -% \IfBooleanTF #1 +% \IfBooleanTF {#1} % { \DoSomethingWithStar {#2} } % { \DoSomethingWithoutStar {#2} } % } @@ -776,7 +776,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{xparse}{2017/12/05}{} +\ProvidesExplPackage{xparse}{2017/12/16}{} {L3 Experimental document command parser} % \end{macrocode} % @@ -4042,6 +4042,13 @@ (or~no~arguments~at~all).~You~cannot~have~a~terminal~optional~ argument~with~expandable~commands. } +\__msg_kernel_new:nnnn { xparse } { if-boolean } + { Invalid~use~\iow_char:N\\IfBooleanTF~{#1} } + { + \c__msg_coding_error_text_tl + The~first~argument~of~\iow_char:N\\IfBoolean(TF/T/F)~must~be~ + a~boolean~argument~obtained~from~parsing~'s'~or~'t'~arguments. + } \__msg_kernel_new:nnnn { xparse } { inconsistent-long } { Inconsistent~long~arguments~for~expandable~command~'#1'. } { @@ -4377,9 +4384,19 @@ % normal \cs{c_true_bool} and \cs{c_false_bool}, so testing for them is % done with the \cs{bool_if:NTF} functions from \textsf{l3prg}. % \begin{macrocode} -\cs_new_eq:NN \IfBooleanTF \bool_if:NTF -\cs_new_eq:NN \IfBooleanT \bool_if:NT -\cs_new_eq:NN \IfBooleanF \bool_if:NF +\cs_new:Npn \IfBooleanTF #1 + { + \bool_lazy_and:nnTF + { \tl_if_single_p:n {#1} } + { \tl_if_single_token_p:n #1 } + { \bool_if:NTF #1 } + { + \__msg_kernel_error:nnn { xparse } { if-boolean } {#1} + \use_ii:nn + } + } +\cs_new:Npn \IfBooleanT #1#2 { \IfBooleanTF {#1} {#2} { } } +\cs_new:Npn \IfBooleanF #1 { \IfBooleanTF {#1} { } } % \end{macrocode} % \end{macro} % diff --git a/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx b/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx index feffe2b561c..3d85476d9a4 100644 --- a/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx +++ b/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx @@ -27,8 +27,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}[2017/12/05] -%\@ifpackagelater{expl3}{2017/12/05} +\RequirePackage{expl3}[2017/12/16] +%\@ifpackagelater{expl3}{2017/12/16} % {} % {% % \PackageError{xtemplate}{Support package l3kernel too old} @@ -63,7 +63,7 @@ % }^^A % } % -% \date{Released 2017/12/05} +% \date{Released 2017/12/16} % % \maketitle % @@ -682,7 +682,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{xtemplate}{2017/12/05}{} +\ProvidesExplPackage{xtemplate}{2017/12/16}{} {L3 Experimental prototype document functions} % \end{macrocode} % -- cgit v1.2.3