diff options
author | Karl Berry <karl@freefriends.org> | 2012-02-06 01:22:25 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2012-02-06 01:22:25 +0000 |
commit | a9533a6794104fad593912e3481304047dcd0025 (patch) | |
tree | f07323a55f2fcce31eb88053cf3400087ccdb306 /Master | |
parent | 88ad42f78998b5210fa58a05e2e7750f897b2550 (diff) |
l3packages 3287
git-svn-id: svn://tug.org/texlive/trunk@25307 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r-- | Master/texmf-dist/doc/latex/l3packages/l3keys2e/l3keys2e.pdf | bin | 469327 -> 469335 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/l3packages/xfrac/xfrac.pdf | bin | 624397 -> 624400 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/l3packages/xparse/xparse.pdf | bin | 749776 -> 429372 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/l3packages/xtemplate/xtemplate.pdf | bin | 657878 -> 397298 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 | 6 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx | 7 | ||||
-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 | 6 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty | 7 |
11 files changed, 20 insertions, 61 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 f6a55fc4d1a..e9f1bf33bc2 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 09d5269ee01..ee3276e1e44 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 e3617a3bfd1..cb3c04995f0 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 717e7e0d21d..8e883e3bb63 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 deleted file mode 100644 index 96d007999ac..00000000000 --- a/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e-demo.tex +++ /dev/null @@ -1,43 +0,0 @@ -% 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 23904106533..bd77465fd3b 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/19] -%<package>\@ifpackagelater{expl3}{2012/01/19} +\RequirePackage{expl3}[2012/01/31] +%<package>\@ifpackagelater{expl3}{2012/01/31} %<package> {} %<package> { %<package> \PackageError{l3keys2e}{Support package l3kernel too old.} @@ -50,7 +50,7 @@ %<package> \endinput %<package> } \RequirePackage{xparse} -\GetIdInfo$Id: l3keys2e.dtx 3207 2012-01-19 08:50:24Z joseph $ +\GetIdInfo$Id: l3keys2e.dtx 3285 2012-01-31 21:49:24Z 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 e6fbc7a4b6a..66bb99d4f14 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/19] -%<package>\@ifpackagelater{expl3}{2012/01/19} +\RequirePackage{expl3}[2012/01/31] +%<package>\@ifpackagelater{expl3}{2012/01/31} %<package> {} %<package> { %<package> \PackageError{xparse}{Support package l3kernel too old.} @@ -53,7 +53,7 @@ %<package> } %<package> \endinput %<package> } -\GetIdInfo$Id: xparse.dtx 3209 2012-01-19 09:21:50Z joseph $ +\GetIdInfo$Id: xparse.dtx 3285 2012-01-31 21:49:24Z joseph $ {L3 Experimental document command parser} %</driver|package> %<*driver> diff --git a/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx b/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx index 1dbbd0afd15..d5b58926748 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/19] -%<package>\@ifpackagelater{expl3}{2012/01/19} +\RequirePackage{expl3}[2012/01/31] +%<package>\@ifpackagelater{expl3}{2012/01/31} %<package> {} %<package> { %<package> \PackageError{xtemplate}{Support package l3kernel too old.} @@ -53,7 +53,7 @@ %<package> } %<package> \endinput %<package> } -\GetIdInfo$Id: xtemplate.dtx 3207 2012-01-19 08:50:24Z joseph $ +\GetIdInfo$Id: xtemplate.dtx 3285 2012-01-31 21:49:24Z joseph $ {L3 Experimental prototype document functions} %</driver|package> %<*driver> @@ -1625,6 +1625,7 @@ \prg_case_str:onn \l_xtemplate_keytype_tl { { boolean } { \bool_new:N #1 } + { commalist } { \clist_new:N #1 } { function } { \cs_new:Npn #1 { } } { instance } { \cs_new_protected:Npn #1 { } } { integer } { \int_new:N #1 } diff --git a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty index 89ae6dcdd14..fea54df4ea1 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/19] -\@ifpackagelater{expl3}{2012/01/19} +\RequirePackage{expl3}[2012/01/31] +\@ifpackagelater{expl3}{2012/01/31} {} { \PackageError{l3keys2e}{Support package l3kernel too old.} @@ -59,7 +59,7 @@ \endinput } \RequirePackage{xparse} -\GetIdInfo$Id: l3keys2e.dtx 3207 2012-01-19 08:50:24Z joseph $ +\GetIdInfo$Id: l3keys2e.dtx 3285 2012-01-31 21:49:24Z 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 4c6955b7daf..1c27921509c 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/19] -\@ifpackagelater{expl3}{2012/01/19} +\RequirePackage{expl3}[2012/01/31] +\@ifpackagelater{expl3}{2012/01/31} {} { \PackageError{xparse}{Support package l3kernel too old.} @@ -62,7 +62,7 @@ } \endinput } -\GetIdInfo$Id: xparse.dtx 3209 2012-01-19 09:21:50Z joseph $ +\GetIdInfo$Id: xparse.dtx 3285 2012-01-31 21:49:24Z joseph $ {L3 Experimental document command parser} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} diff --git a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty index a7d0663e2b8..e492449a0d1 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/19] -\@ifpackagelater{expl3}{2012/01/19} +\RequirePackage{expl3}[2012/01/31] +\@ifpackagelater{expl3}{2012/01/31} {} { \PackageError{xtemplate}{Support package l3kernel too old.} @@ -62,7 +62,7 @@ } \endinput } -\GetIdInfo$Id: xtemplate.dtx 3207 2012-01-19 08:50:24Z joseph $ +\GetIdInfo$Id: xtemplate.dtx 3285 2012-01-31 21:49:24Z joseph $ {L3 Experimental prototype document functions} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -568,6 +568,7 @@ \prg_case_str:onn \l_xtemplate_keytype_tl { { boolean } { \bool_new:N #1 } + { commalist } { \clist_new:N #1 } { function } { \cs_new:Npn #1 { } } { instance } { \cs_new_protected:Npn #1 { } } { integer } { \int_new:N #1 } |