summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/l3packages
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-02-11 00:57:44 +0000
committerKarl Berry <karl@freefriends.org>2012-02-11 00:57:44 +0000
commit7d9db8166e583e36ac70386c1c3bb352e4b543d0 (patch)
tree0db061e6c8f6f22622c09cd12f1096a327f01d6f /Master/texmf-dist/source/latex/l3packages
parent74211cc9a2b9b059dfc2802a474a5edbb41f8e0b (diff)
l3packages 3341 (8feb12)
git-svn-id: svn://tug.org/texlive/trunk@25358 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/l3packages')
-rw-r--r--Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e-demo.tex43
-rw-r--r--Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx8
-rw-r--r--Master/texmf-dist/source/latex/l3packages/xfrac/xfrac.dtx18
-rw-r--r--Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx8
-rw-r--r--Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx8
5 files changed, 23 insertions, 62 deletions
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>