diff options
13 files changed, 46 insertions, 81 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 2f4e2dff767..ef4f17f7393 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 596bfc92dd6..2a43c4ab5fd 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 65577b389a2..e7400ae1c87 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 da9c3b77f50..b89dacccf9e 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 f1f8909fce6..de1850a183e 100644 --- a/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx +++ b/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx @@ -37,20 +37,20 @@ %<*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/02/07] -%<package>\@ifpackagelater{expl3}{2012/02/07} +\RequirePackage{expl3}[2012/02/08] +%<package>\@ifpackagelater{expl3}{2012/02/08} %<package> {} %<package> { %<package> \PackageError{l3keys2e}{Support package l3kernel too old.} %<package> { -%<package> Please install an up to date~version of l3kernel +%<package> Please install an up to date version of l3kernel %<package> using your TeX package manager or from CTAN.\\ \\ %<package> Loading l3keys2e will abort! %<package> } %<package> \endinput %<package> } \RequirePackage{xparse} -\GetIdInfo$Id: l3keys2e.dtx 3330 2012-02-07 15:13:36Z joseph $ +\GetIdInfo$Id: l3keys2e.dtx 3342 2012-02-08 19:34:51Z 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 9875bd8f030..a2b28d94bd8 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 2896 2011-10-09 20:36:50Z joseph $ +\GetIdInfo$Id: xfrac.dtx 3341 2012-02-08 19:30:37Z joseph $ {L3 Experimental split-level fractions} %</driver|package> %<*driver> @@ -842,9 +842,11 @@ { \raisebox { - \box_ht:N \l_xfrac_slash_box - - \box_dp:N \l_xfrac_slash_box - - \height + \dim_eval:w + \box_ht:N \l_xfrac_slash_box + - \box_dp:N \l_xfrac_slash_box + - \height + \dim_eval_end: } } \dim_compare:nNnTF @@ -868,9 +870,11 @@ { \raisebox { - \box_ht:N \l_xfrac_slash_box - - \dim_use:N \l_xfrac_numerator_top_sep_dim - - \height + \dim_eval:w + \box_ht:N \l_xfrac_slash_box + - \dim_use:N \l_xfrac_numerator_top_sep_dim + - \height + \dim_eval_end: } } } diff --git a/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx b/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx index 5c76244e928..bb1d17cac39 100644 --- a/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx +++ b/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx @@ -41,19 +41,19 @@ %<*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/02/07] -%<package>\@ifpackagelater{expl3}{2012/02/07} +\RequirePackage{expl3}[2012/02/08] +%<package>\@ifpackagelater{expl3}{2012/02/08} %<package> {} %<package> { %<package> \PackageError{xparse}{Support package l3kernel too old.} %<package> { -%<package> Please install an up to date~version of l3kernel +%<package> Please install an up to date version of l3kernel %<package> using your TeX package manager or from CTAN.\\ \\ %<package> Loading xparse will abort! %<package> } %<package> \endinput %<package> } -\GetIdInfo$Id: xparse.dtx 3330 2012-02-07 15:13:36Z joseph $ +\GetIdInfo$Id: xparse.dtx 3342 2012-02-08 19:34:51Z 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 d5a669f96ef..7377ad5e3fd 100644 --- a/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx +++ b/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx @@ -41,19 +41,19 @@ %<*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/02/07] -%<package>\@ifpackagelater{expl3}{2012/02/07} +\RequirePackage{expl3}[2012/02/08] +%<package>\@ifpackagelater{expl3}{2012/02/08} %<package> {} %<package> { %<package> \PackageError{xtemplate}{Support package l3kernel too old.} %<package> { -%<package> Please install an up to date~version of l3kernel +%<package> Please install an up to date version of l3kernel %<package> using your TeX package manager or from CTAN.\\ \\ %<package> Loading xtemplate will abort! %<package> } %<package> \endinput %<package> } -\GetIdInfo$Id: xtemplate.dtx 3330 2012-02-07 15:13:36Z joseph $ +\GetIdInfo$Id: xtemplate.dtx 3342 2012-02-08 19:34:51Z 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 1f4b655bfe2..ec58cbfdeeb 100644 --- a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty +++ b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty @@ -46,20 +46,20 @@ %% %% ----------------------------------------------------------------------- %% -\RequirePackage{expl3}[2012/02/07] -\@ifpackagelater{expl3}{2012/02/07} +\RequirePackage{expl3}[2012/02/08] +\@ifpackagelater{expl3}{2012/02/08} {} { \PackageError{l3keys2e}{Support package l3kernel too old.} { - Please install an up to date~version of l3kernel + Please install an up to date version of l3kernel using your TeX package manager or from CTAN.\\ \\ Loading l3keys2e will abort! } \endinput } \RequirePackage{xparse} -\GetIdInfo$Id: l3keys2e.dtx 3330 2012-02-07 15:13:36Z joseph $ +\GetIdInfo$Id: l3keys2e.dtx 3342 2012-02-08 19:34:51Z joseph $ {LaTeX2e option processing using LaTeX3 keys} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} diff --git a/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty b/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty index bb6844bc538..000fe4fa209 100644 --- a/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty +++ b/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty @@ -48,7 +48,7 @@ %% ----------------------------------------------------------------------- %% \RequirePackage{amstext,graphicx,l3keys2e,textcomp,xparse,xtemplate} -\GetIdInfo$Id: xfrac.dtx 2896 2011-10-09 20:36:50Z joseph $ +\GetIdInfo$Id: xfrac.dtx 3341 2012-02-08 19:30:37Z joseph $ {L3 Experimental split-level fractions} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -226,9 +226,11 @@ { \raisebox { - \box_ht:N \l_xfrac_slash_box - - \box_dp:N \l_xfrac_slash_box - - \height + \dim_eval:w + \box_ht:N \l_xfrac_slash_box + - \box_dp:N \l_xfrac_slash_box + - \height + \dim_eval_end: } } \dim_compare:nNnTF @@ -252,9 +254,11 @@ { \raisebox { - \box_ht:N \l_xfrac_slash_box - - \dim_use:N \l_xfrac_numerator_top_sep_dim - - \height + \dim_eval:w + \box_ht:N \l_xfrac_slash_box + - \dim_use:N \l_xfrac_numerator_top_sep_dim + - \height + \dim_eval_end: } } } diff --git a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty index 9c1d7c81eb4..045016b235a 100644 --- a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty +++ b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty @@ -50,19 +50,19 @@ %% %% ----------------------------------------------------------------------- %% -\RequirePackage{expl3}[2012/02/07] -\@ifpackagelater{expl3}{2012/02/07} +\RequirePackage{expl3}[2012/02/08] +\@ifpackagelater{expl3}{2012/02/08} {} { \PackageError{xparse}{Support package l3kernel too old.} { - Please install an up to date~version of l3kernel + Please install an up to date version of l3kernel using your TeX package manager or from CTAN.\\ \\ Loading xparse will abort! } \endinput } -\GetIdInfo$Id: xparse.dtx 3330 2012-02-07 15:13:36Z joseph $ +\GetIdInfo$Id: xparse.dtx 3342 2012-02-08 19:34:51Z 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 7d496cca0fa..57b3af26f0c 100644 --- a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty +++ b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty @@ -50,19 +50,19 @@ %% %% ----------------------------------------------------------------------- %% -\RequirePackage{expl3}[2012/02/07] -\@ifpackagelater{expl3}{2012/02/07} +\RequirePackage{expl3}[2012/02/08] +\@ifpackagelater{expl3}{2012/02/08} {} { \PackageError{xtemplate}{Support package l3kernel too old.} { - Please install an up to date~version of l3kernel + Please install an up to date version of l3kernel using your TeX package manager or from CTAN.\\ \\ Loading xtemplate will abort! } \endinput } -\GetIdInfo$Id: xtemplate.dtx 3330 2012-02-07 15:13:36Z joseph $ +\GetIdInfo$Id: xtemplate.dtx 3342 2012-02-08 19:34:51Z joseph $ {L3 Experimental prototype document functions} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} |