diff options
Diffstat (limited to 'Master')
-rw-r--r-- | Master/texmf-dist/doc/latex/l3packages/l3keys2e/l3keys2e.pdf | bin | 469335 -> 469059 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/l3packages/xfrac/xfrac.pdf | bin | 624400 -> 624397 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/l3packages/xparse/xparse.pdf | bin | 429372 -> 750823 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/l3packages/xtemplate/xtemplate.pdf | bin | 397298 -> 657708 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e-demo.tex | 43 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx | 6 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx | 13 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx | 6 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty | 6 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty | 8 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty | 6 |
11 files changed, 66 insertions, 22 deletions
diff --git a/Master/texmf-dist/doc/latex/l3packages/l3keys2e/l3keys2e.pdf b/Master/texmf-dist/doc/latex/l3packages/l3keys2e/l3keys2e.pdf Binary files differindex e9f1bf33bc2..2f4e2dff767 100644 --- a/Master/texmf-dist/doc/latex/l3packages/l3keys2e/l3keys2e.pdf +++ b/Master/texmf-dist/doc/latex/l3packages/l3keys2e/l3keys2e.pdf diff --git a/Master/texmf-dist/doc/latex/l3packages/xfrac/xfrac.pdf b/Master/texmf-dist/doc/latex/l3packages/xfrac/xfrac.pdf Binary files differindex ee3276e1e44..596bfc92dd6 100644 --- a/Master/texmf-dist/doc/latex/l3packages/xfrac/xfrac.pdf +++ b/Master/texmf-dist/doc/latex/l3packages/xfrac/xfrac.pdf diff --git a/Master/texmf-dist/doc/latex/l3packages/xparse/xparse.pdf b/Master/texmf-dist/doc/latex/l3packages/xparse/xparse.pdf Binary files differindex cb3c04995f0..65577b389a2 100644 --- a/Master/texmf-dist/doc/latex/l3packages/xparse/xparse.pdf +++ b/Master/texmf-dist/doc/latex/l3packages/xparse/xparse.pdf diff --git a/Master/texmf-dist/doc/latex/l3packages/xtemplate/xtemplate.pdf b/Master/texmf-dist/doc/latex/l3packages/xtemplate/xtemplate.pdf Binary files differindex 8e883e3bb63..da9c3b77f50 100644 --- a/Master/texmf-dist/doc/latex/l3packages/xtemplate/xtemplate.pdf +++ b/Master/texmf-dist/doc/latex/l3packages/xtemplate/xtemplate.pdf diff --git a/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e-demo.tex b/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e-demo.tex new file mode 100644 index 00000000000..96d007999ac --- /dev/null +++ b/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e-demo.tex @@ -0,0 +1,43 @@ +% This file demonstrates the use of the l3keys2e module to allow +% LaTeX3 keyvals (created using l3keys) to be used as LaTeX2e +% package or class options. +% + +% First, create a class +\begin{filecontents}{l3keys2e-class.cls} + \LoadClass{article} + \RequirePackage{l3keys2e} + \ProvidesExplClass{l3keys2e-class}{0000/00/00}{0.0}{test} + \keys_define:nn { test1 } { + option1 .code:n = {\wlog{You~gave~`#1'~for~option1}} + } + \ProcessKeysOptions { test1 } +\end{filecontents} + +% Load the class with some options. +% The class itself recognises `option1', leaving `option2' and +% `option3' as global optons which are not yet used. +\documentclass[option1=check,option2=more stuff,option3=unused] + {l3keys2e-class} + +%Now create a package +\begin{filecontents}{l3keys2e-package.sty} + \RequirePackage{l3keys2e} + \ProvidesExplPackage{l3keys2e-package}{0000/00/00}{0.0}{test} + \keys_define:nn { test2 } { + option1 .code:n = {\wlog{You~gave~`#1'~for~option1~(again)}}, + option2 .code:n = {\wlog{You~gave~`#1'~for~option2}}, + option4 .code:n = {\wlog{You~gave~`#1'~for~option4}}, + } + \ProcessKeysOptions { test2 } +\end{filecontents} + +% Load the package. +\usepackage[option4={extra stuff},option5=undefined!] + {l3keys2e-package} + +\begin{document} +% The log should show that option3 is an unused global option, and that +% option5 is not known by the l3keys2e-demo package. Everything else +% should simply be listed in the log. +\end{document} diff --git a/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx b/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx index bd77465fd3b..f1f8909fce6 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/01/31] -%<package>\@ifpackagelater{expl3}{2012/01/31} +\RequirePackage{expl3}[2012/02/07] +%<package>\@ifpackagelater{expl3}{2012/02/07} %<package> {} %<package> { %<package> \PackageError{l3keys2e}{Support package l3kernel too old.} @@ -50,7 +50,7 @@ %<package> \endinput %<package> } \RequirePackage{xparse} -\GetIdInfo$Id: l3keys2e.dtx 3285 2012-01-31 21:49:24Z joseph $ +\GetIdInfo$Id: l3keys2e.dtx 3330 2012-02-07 15:13:36Z joseph $ {LaTeX2e option processing using LaTeX3 keys} %</driver|package> %<*driver> diff --git a/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx b/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx index 66bb99d4f14..5c76244e928 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/01/31] -%<package>\@ifpackagelater{expl3}{2012/01/31} +\RequirePackage{expl3}[2012/02/07] +%<package>\@ifpackagelater{expl3}{2012/02/07} %<package> {} %<package> { %<package> \PackageError{xparse}{Support package l3kernel too old.} @@ -53,7 +53,7 @@ %<package> } %<package> \endinput %<package> } -\GetIdInfo$Id: xparse.dtx 3285 2012-01-31 21:49:24Z joseph $ +\GetIdInfo$Id: xparse.dtx 3330 2012-02-07 15:13:36Z joseph $ {L3 Experimental document command parser} %</driver|package> %<*driver> @@ -595,10 +595,11 @@ % available: % \begin{itemize} % \item The last argument (if any are present) must be one of the -% mandatory types \texttt{m} or \texttt{r}. (Types \texttt{l} and -% \texttt{u} are not available.) +% mandatory types \texttt{m} or \texttt{r}. % \item All arguments are either short or long: it is not possible % to mix short and long argument types. +% \item The mandatory argument types \texttt{l} and \texttt{u} are +% not available. % \item The \enquote{optional group} argument types \texttt{g} and % \texttt{G} are not available. % \item The \enquote{verbatim} argument type \texttt{v} is not available. @@ -3094,7 +3095,7 @@ short~or~all~be~long.~You~have~tried~to~mix~the~two~types. } \msg_kernel_new:nnnn { xparse } { invalid-expandable-argument-type } - { Unknown~argument~type~'#1'~replaced~by~'m'. } + { Argument~type~'#1'~not~available~for~an~expandable~function. } { \c_msg_coding_error_text_tl The~letter~'#1'~does~not~specify~an~argument~type~which~can~be~used~ diff --git a/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx b/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx index d5b58926748..d5a669f96ef 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/01/31] -%<package>\@ifpackagelater{expl3}{2012/01/31} +\RequirePackage{expl3}[2012/02/07] +%<package>\@ifpackagelater{expl3}{2012/02/07} %<package> {} %<package> { %<package> \PackageError{xtemplate}{Support package l3kernel too old.} @@ -53,7 +53,7 @@ %<package> } %<package> \endinput %<package> } -\GetIdInfo$Id: xtemplate.dtx 3285 2012-01-31 21:49:24Z joseph $ +\GetIdInfo$Id: xtemplate.dtx 3330 2012-02-07 15:13:36Z joseph $ {L3 Experimental prototype document functions} %</driver|package> %<*driver> diff --git a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty index fea54df4ea1..1f4b655bfe2 100644 --- a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty +++ b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty @@ -46,8 +46,8 @@ %% %% ----------------------------------------------------------------------- %% -\RequirePackage{expl3}[2012/01/31] -\@ifpackagelater{expl3}{2012/01/31} +\RequirePackage{expl3}[2012/02/07] +\@ifpackagelater{expl3}{2012/02/07} {} { \PackageError{l3keys2e}{Support package l3kernel too old.} @@ -59,7 +59,7 @@ \endinput } \RequirePackage{xparse} -\GetIdInfo$Id: l3keys2e.dtx 3285 2012-01-31 21:49:24Z joseph $ +\GetIdInfo$Id: l3keys2e.dtx 3330 2012-02-07 15:13:36Z joseph $ {LaTeX2e option processing using LaTeX3 keys} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} diff --git a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty index 1c27921509c..9c1d7c81eb4 100644 --- a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty +++ b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty @@ -50,8 +50,8 @@ %% %% ----------------------------------------------------------------------- %% -\RequirePackage{expl3}[2012/01/31] -\@ifpackagelater{expl3}{2012/01/31} +\RequirePackage{expl3}[2012/02/07] +\@ifpackagelater{expl3}{2012/02/07} {} { \PackageError{xparse}{Support package l3kernel too old.} @@ -62,7 +62,7 @@ } \endinput } -\GetIdInfo$Id: xparse.dtx 3285 2012-01-31 21:49:24Z joseph $ +\GetIdInfo$Id: xparse.dtx 3330 2012-02-07 15:13:36Z joseph $ {L3 Experimental document command parser} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -1409,7 +1409,7 @@ short~or~all~be~long.~You~have~tried~to~mix~the~two~types. } \msg_kernel_new:nnnn { xparse } { invalid-expandable-argument-type } - { Unknown~argument~type~'#1'~replaced~by~'m'. } + { Argument~type~'#1'~not~available~for~an~expandable~function. } { \c_msg_coding_error_text_tl The~letter~'#1'~does~not~specify~an~argument~type~which~can~be~used~ diff --git a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty index e492449a0d1..7d496cca0fa 100644 --- a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty +++ b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty @@ -50,8 +50,8 @@ %% %% ----------------------------------------------------------------------- %% -\RequirePackage{expl3}[2012/01/31] -\@ifpackagelater{expl3}{2012/01/31} +\RequirePackage{expl3}[2012/02/07] +\@ifpackagelater{expl3}{2012/02/07} {} { \PackageError{xtemplate}{Support package l3kernel too old.} @@ -62,7 +62,7 @@ } \endinput } -\GetIdInfo$Id: xtemplate.dtx 3285 2012-01-31 21:49:24Z joseph $ +\GetIdInfo$Id: xtemplate.dtx 3330 2012-02-07 15:13:36Z joseph $ {L3 Experimental prototype document functions} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} |