summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-11-22 23:37:49 +0000
committerKarl Berry <karl@freefriends.org>2012-11-22 23:37:49 +0000
commitd27c7eb7c70ce56b5ac1c6d7b5277f5c3fc888ee (patch)
tree4074a79e9d21cb85e640d8233f6b0fe5dce89416 /Master/texmf-dist/tex/latex
parent6348770c313c5104acd5b60d68377af2621c9a2d (diff)
l3 (22nov12)
git-svn-id: svn://tug.org/texlive/trunk@28333 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty4
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/expl3.sty137
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3basics.sty2
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3box.sty6
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3candidates.sty110
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3doc.cls12
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def131
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3dvips.def125
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3fp.sty2
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3keys.sty2
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def159
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3quark.sty2
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3skip.sty10
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3token.sty4
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def131
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty7
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty4
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty6
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty68
19 files changed, 827 insertions, 95 deletions
diff --git a/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty b/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty
index 5e6a07f9f50..f8552f3f8e4 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty
@@ -47,8 +47,8 @@
%%
%% -----------------------------------------------------------------------
%%
-\RequirePackage{l3bootstrap}
-\GetIdInfo$Id: xgalley.dtx 4155 2012-08-29 10:29:58Z joseph $
+\RequirePackage{expl3}
+\GetIdInfo$Id: xgalley.dtx 4253 2012-11-01 21:01:54Z joseph $
{L3 Experimental galley}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
index 0991128f880..268d2cd285d 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
@@ -60,8 +60,8 @@
}
\def\ExplFileName{expl3}
\def\ExplFileDescription{L3 Experimental code bundle wrapper}
-\def\ExplFileDate{2012/09/29}
-\def\ExplFileVersion{4249}
+\def\ExplFileDate{2012/11/21}
+\def\ExplFileVersion{4332}
\RequirePackage{etex}
\reserveinserts{32}
\ProvidesExplPackage
@@ -75,8 +75,22 @@
}
\expl@create@bool@option { check-declarations } \l@expl@check@declarations@bool
\expl@create@bool@option { log-functions } \l@expl@log@functions@bool
-\expl@create@bool@option { native-drivers } \l@expl@native@drivers@bool
\let \expl@create@bool@option \@undefined
+\newcommand* \l@expl@options@clist { }
+\DeclareOption*
+ {
+ \ifx \l@expl@options@clist \@empty
+ \let \l@expl@options@clist \CurrentOption
+ \else
+ \edef \l@expl@options@clist
+ {
+ \unexpanded \expandafter \expandafter \expandafter
+ {
+ \expandafter \l@expl@options@clist \expandafter , \CurrentOption
+ }
+ }
+ \fi
+ }
\ProcessOptions \relax
\RequirePackage { l3basics, l3expan, l3tl }
\ifodd \l@expl@check@declarations@bool \relax
@@ -219,19 +233,112 @@
\cs_if_exist:NF \color
{ \DeclareRobustCommand \color [2] [ ] { } }
}
-\bool_if:nTF { \l@expl@native@drivers@bool }
+\RequirePackage{ifpdf}
+\__msg_kernel_new:nnnn { expl } { wrong-driver }
+ { Driver~request~inconsistent~with~engine:~using~'#2'~driver. }
+ {
+ You~have~requested~driver~'#1',~but~this~is~not~suitable~for~use~with~the~
+ active~engine.~LaTeX3~will~use~the~'#2'~driver~instead.
+ }
+\tl_new:N \l__expl_driver_tl
+\keys_define:nn { expl }
{
- \xetex_if_engine:TF
- { \file_input:n { l3xdvipdfmx.def } }
+ driver .choice:,
+ driver / auto .code:n =
{
- \RequirePackage { ifpdf }
- \ifpdf
- \file_input:n { l3pdfmode.def }
- \else
- \file_input:n { l3dvips.def }
- \fi
- }
+ \xetex_if_engine:TF
+ { \tl_set:Nn \l__expl_driver_tl { xdvipdfmx } }
+ {
+ \ifpdf
+ \tl_set:Nn \l__expl_driver_tl { pdfmode }
+ \else
+ \tl_set:Nn \l__expl_driver_tl { dvips }
+ \fi
+ }
+ },
+ driver / dvipdfmx .code:n =
+ {
+ \tl_set:Nn \l__expl_driver_tl { dvipdfmx }
+ \xetex_if_engine:TF
+ {
+ \__msg_kernel_error:nnnn { expl } { wrong-driver }
+ { dvipdfmx } { xdvipdfmx }
+ \tl_set:Nn \l__expl_driver_tl { xdvipdmx }
+ }
+ {
+ \ifpdf
+ \__msg_kernel_error:nnnn { expl } { wrong-driver }
+ { dvipdfmx } { pdfmode }
+ \tl_set:Nn \l__expl_driver_tl { pdfmode }
+ \fi
+ }
+ },
+ driver / dvips .code:n =
+ {
+ \tl_set:Nn \l__expl_driver_tl { dvips }
+ \xetex_if_engine:TF
+ {
+ \__msg_kernel_error:nnnn { expl } { wrong-driver }
+ { dvips } { xdvipdfmx }
+ \tl_set:Nn \l__expl_driver_tl { xdvipdfmx }
+ }
+ {
+ \ifpdf
+ \__msg_kernel_error:nnnn { expl } { wrong-driver }
+ { dvips } { pdfmode }
+ \tl_set:Nn \l__expl_driver_tl { pdfmode }
+ \fi
+ }
+ },
+ driver / latex2e .code:n =
+ { \tl_set:Nn \l__expl_driver_tl { latex2e } },
+ driver / pdfmode .code:n =
+ {
+ \tl_set:Nn \l__expl_driver_tl { pdfmode }
+ \xetex_if_engine:TF
+ {
+ \__msg_kernel_error:nnnn { expl } { wrong-driver }
+ { pdfmode } { xdvipdfmx }
+ \tl_set:Nn \l__expl_driver_tl { xdvipdfmx }
+ }
+ {
+ \ifpdf
+ \else
+ \__msg_kernel_error:nnnn { expl } { wrong-driver }
+ { pdfmode } { dvips }
+ \tl_set:Nn \l__expl_driver_tl { dvips }
+ \fi
+ }
+ },
+ driver / xdvipdfmx .code:n =
+ {
+ \tl_set:Nn \l__expl_driver_tl { xdvipdfmx }
+ \xetex_if_engine:F
+ {
+ \ifpdf
+ \__msg_kernel_error:nnnn { expl } { wrong-driver }
+ { xdvipdfmx } { pdfmode }
+ \tl_set:Nn \l__expl_driver_tl { pdfmode }
+ \else
+ \__msg_kernel_error:nnnn { expl } { wrong-driver }
+ { xdvipdfmx } { dvips }
+ \tl_set:Nn \l__expl_driver_tl { dvips }
+ \fi
+ }
+ },
+ driver .initial:n = { latex2e } ,
+ native-drivers .choice:,
+ native-drivers .default:n = { true },
+ native-drivers / false .meta:n = { driver = latex2e },
+ native-drivers / true .meta:n = { driver = auto }
}
+\keys_define:nn { expl }
+ {
+ check-declarations .bool_set:N = \l@expl@check@declarations@bool,
+ log-functions .bool_set:N = \l@expl@log@functions@bool
+ }
+\keys_set:nV { expl } \l@expl@options@clist
+\str_if_eq:nVTF { latex2e } \l__expl_driver_tl
{
\tl_gput_left:Nn \@begindocumenthook { \RequirePackage { graphics } }
\__msg_kernel_new:nnnn { box } { clipping-not-available }
@@ -283,6 +390,10 @@
}
}
}
+ {
+ \tl_const:Nn \c__expl_def_ext_tl { def }
+ \@onefilewithoptions { l3 \l__expl_driver_tl } [ ] [ ] \c__expl_def_ext_tl
+ }
\cs_set_protected_nopar:Npn \ExplSyntaxOn
{
\bool_if:NF \l__kernel_expl_bool
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3basics.sty b/Master/texmf-dist/tex/latex/l3kernel/l3basics.sty
index e9dc558a962..318c7d9bcb2 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3basics.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3basics.sty
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3bootstrap}
-\GetIdInfo$Id: l3basics.dtx 4212 2012-09-09 12:24:04Z bruno $
+\GetIdInfo$Id: l3basics.dtx 4306 2012-11-10 12:57:20Z joseph $
{L3 Basic definitions}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3box.sty b/Master/texmf-dist/tex/latex/l3kernel/l3box.sty
index c1da395227b..a9e84331634 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3box.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3box.sty
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3bootstrap}
-\GetIdInfo$Id: l3box.dtx 3991 2012-07-16 19:00:35Z joseph $
+\GetIdInfo$Id: l3box.dtx 4259 2012-11-04 17:15:11Z joseph $
{L3 Experimental boxes}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -143,8 +143,8 @@
{ \tex_global:D \box_set_to_last:N }
\cs_generate_variant:Nn \box_set_to_last:N { c }
\cs_generate_variant:Nn \box_gset_to_last:N { c }
-\cs_new_eq:NN \c_empty_box \voidb@x
-\cs_new_eq:NN \l_tmpa_box \@tempboxa
+\box_new:N \c_empty_box
+\box_new:N \l_tmpa_box
\box_new:N \l_tmpb_box
\box_new:N \g_tmpa_box
\box_new:N \g_tmpb_box
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3candidates.sty b/Master/texmf-dist/tex/latex/l3kernel/l3candidates.sty
index 433ff506d60..cee29baf26e 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3candidates.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3candidates.sty
@@ -47,7 +47,7 @@
%% -----------------------------------------------------------------------
%%
\RequirePackage{l3bootstrap}
-\GetIdInfo$Id: l3candidates.dtx 3633 2012-05-12 20:11:32Z joseph $
+\GetIdInfo$Id: l3candidates.dtx 4298 2012-11-09 13:34:43Z joseph $
{L3 Experimental additions to l3kernel}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -288,7 +288,12 @@
}
{
\box_set_wd:Nn \l__box_internal_box { \l__box_right_new_dim }
- \box_use:N \l__box_internal_box
+ \hbox:n
+ {
+ \tex_kern:D \c_zero_dim
+ \box_use:N \l__box_internal_box
+ \tex_hss:D
+ }
}
}
\cs_new_protected:Npn \box_clip:N #1
@@ -296,49 +301,89 @@
\cs_generate_variant:Nn \box_clip:N { c }
\cs_new_protected:Npn \box_trim:Nnnnn #1#2#3#4#5
{
- \box_set_wd:Nn #1 { \box_wd:N #1 - (#4) - (#2) }
- \hbox_set:Nn #1
+ \hbox_set:Nn \l__box_internal_box
{
- \skip_horizontal:n { - \dim_eval:n {#2} }
+ \tex_kern:D -\__dim_eval:w #2 \__dim_eval_end:
\box_use:N #1
+ \tex_kern:D -\__dim_eval:w #4 \__dim_eval_end:
}
\dim_compare:nNnTF { \box_dp:N #1 } > {#3}
- { \box_set_dp:Nn #1 { \box_dp:N #1 - (#3) } }
{
- \hbox_set:Nn #1
- { \box_move_down:nn { #3 - \box_dp:N #1 } { \box_use:N #1 } }
- \box_set_dp:Nn #1 \c_zero_dim
+ \hbox_set:Nn \l__box_internal_box
+ {
+ \box_move_down:nn \c_zero_dim
+ { \box_use:N \l__box_internal_box }
+ }
+ \box_set_dp:Nn \l__box_internal_box { \box_dp:N #1 - (#3) }
+ }
+ {
+ \hbox_set:Nn \l__box_internal_box
+ {
+ \box_move_down:nn { #3 - \box_dp:N #1 }
+ { \box_use:N \l__box_internal_box }
+ }
+ \box_set_dp:Nn \l__box_internal_box \c_zero_dim
+ }
+ \dim_compare:nNnTF { \box_ht:N \l__box_internal_box } > {#5}
+ {
+ \hbox_set:Nn \l__box_internal_box
+ { \box_move_up:nn \c_zero_dim { \box_use:N \l__box_internal_box } }
+ \box_set_ht:Nn \l__box_internal_box
+ { \box_ht:N \l__box_internal_box - (#5) }
}
- \dim_compare:nNnTF { \box_ht:N #1 } > {#5}
- { \box_set_ht:Nn #1 { \box_ht:N #1 - (#5) } }
{
- \hbox_set:Nn #1
- { \box_move_up:nn { #5 - \box_ht:N #1 } { \box_use:N #1 } }
- \box_set_ht:Nn #1 \c_zero_dim
+ \hbox_set:Nn \l__box_internal_box
+ {
+ \box_move_up:nn { #5 - \box_ht:N \l__box_internal_box }
+ { \box_use:N \l__box_internal_box }
+ }
+ \box_set_ht:Nn \l__box_internal_box \c_zero_dim
}
+ \box_set_eq:NN #1 \l__box_internal_box
}
\cs_generate_variant:Nn \box_trim:Nnnnn { c }
\cs_new_protected:Npn \box_viewport:Nnnnn #1#2#3#4#5
{
- \box_set_wd:Nn #1 { (#4) - (#2) }
- \hbox_set:Nn #1
+ \hbox_set:Nn \l__box_internal_box
{
- \skip_horizontal:n { - \dim_eval:n {#2} }
+ \tex_kern:D -\__dim_eval:w #2 \__dim_eval_end:
\box_use:N #1
+ \tex_kern:D \__dim_eval:w #4 - \box_wd:N #1 \__dim_eval_end:
+ }
+ \dim_compare:nNnTF {#3} < \c_zero_dim
+ {
+ \hbox_set:Nn \l__box_internal_box
+ {
+ \box_move_down:nn \c_zero_dim
+ { \box_use:N \l__box_internal_box }
+ }
+ \box_set_dp:Nn \l__box_internal_box { -\dim_eval:n {#3} }
}
- \dim_compare:nNnTF {#3} > \c_zero_dim
{
- \hbox_set:Nn #1 { \box_move_down:nn {#3} { \box_use:N #1 } }
- \box_set_dp:Nn #1 \c_zero_dim
+ \hbox_set:Nn \l__box_internal_box
+ { \box_move_down:nn {#3} { \box_use:N \l__box_internal_box } }
+ \box_set_dp:Nn \l__box_internal_box \c_zero_dim
}
- { \box_set_dp:Nn #1 { - \dim_eval:n {#3} } }
\dim_compare:nNnTF {#5} > \c_zero_dim
- { \box_set_ht:Nn #1 {#5} }
{
- \hbox_set:Nn #1
- { \box_move_up:nn { -\dim_eval:n {#5} } { \box_use:N #1 } }
- \box_set_ht:Nn #1 \c_zero_dim
+ \hbox_set:Nn \l__box_internal_box
+ { \box_move_up:nn \c_zero_dim { \box_use:N \l__box_internal_box } }
+ \box_set_ht:Nn \l__box_internal_box
+ {
+ #5
+ \dim_compare:nNnT {#3} > \c_zero_dim
+ { - (#3) }
+ }
}
+ {
+ \hbox_set:Nn \l__box_internal_box
+ {
+ \box_move_up:nn { -\dim_eval:n {#5} }
+ { \box_use:N \l__box_internal_box }
+ }
+ \box_set_ht:Nn \l__box_internal_box \c_zero_dim
+ }
+ \box_set_eq:NN #1 \l__box_internal_box
}
\cs_generate_variant:Nn \box_viewport:Nnnnn { c }
\cs_new:Npn \clist_item:Nn #1#2
@@ -494,18 +539,21 @@
\__coffin_find_corner_maxima:N #1
\__coffin_find_bounding_shift:
\box_rotate:Nn #1 {#2}
- \hbox_set:Nn #1
+ \hbox_set:Nn \l__coffin_internal_box
{
- \tex_kern:D \l__coffin_bounding_shift_dim
- \tex_kern:D -\l__coffin_left_corner_dim
+ \tex_kern:D
+ \__dim_eval:w
+ \l__coffin_bounding_shift_dim - \l__coffin_left_corner_dim
+ \__dim_eval_end:
\box_move_down:nn { \l__coffin_bottom_corner_dim }
{ \box_use:N #1 }
}
- \box_set_ht:Nn #1
+ \box_set_ht:Nn \l__coffin_internal_box
{ \l__coffin_top_corner_dim - \l__coffin_bottom_corner_dim }
- \box_set_dp:Nn #1 { 0 pt }
- \box_set_wd:Nn #1
+ \box_set_dp:Nn \l__coffin_internal_box { 0 pt }
+ \box_set_wd:Nn \l__coffin_internal_box
{ \l__coffin_right_corner_dim - \l__coffin_left_corner_dim }
+ \hbox_set:Nn #1 { \box_use:N \l__coffin_internal_box }
\prop_map_inline:cn { l__coffin_corners_ \__int_value:w #1 _prop }
{ \__coffin_shift_corner:Nnnn #1 {##1} ##2 }
\prop_map_inline:cn { l__coffin_poles_ \__int_value:w #1 _prop }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls b/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls
index b75f0c5779c..4aa57de4d9d 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls
@@ -52,7 +52,7 @@
\let \fileversionOld \ExplFileVersion
\let \filedescriptionOld \ExplFileDescription
\RequirePackage{expl3,xparse,calc}
-\GetIdInfo$Id: l3doc.dtx 4230 2012-09-24 21:44:28Z joseph $
+\GetIdInfo$Id: l3doc.dtx 4267 2012-11-04 19:42:13Z joseph $
{L3 Experimental documentation class}
\ProvidesExplClass
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -405,7 +405,15 @@
\tl_gclear:N \g__codedoc_macro_tl
% populate "\l__codedoc_functions_block_prop" with info on the functions present:
- \clist_map_function:nN {#1} \__codedoc_parse_functions:n
+ % with a hack as we don't currently read verbatim and that means that
+ % \q_recursion_tail is an issue!
+ \str_if_eq:nnTF {#1} { \q_recursion_tail }
+ {
+ \prop_put:Nxx \l__codedoc_functions_block_prop
+ { \cs_to_str:N \q_recursion_tail }
+ { { -1 } { } }
+ }
+ { \clist_map_function:nN {#1} \__codedoc_parse_functions:n }
\small\ttfamily
\begin{tabular}{ @{} l @{} r @{} }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def b/Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def
new file mode 100644
index 00000000000..2924160ac17
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def
@@ -0,0 +1,131 @@
+%%
+%% This is file `l3dvipdfmx.def',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% l3drivers.dtx (with options: `package,dvipdfmx')
+%%
+%% EXPERIMENTAL CODE
+%%
+%% Do not distribute this file without also distributing the
+%% source files specified above.
+%%
+%% Do not distribute a modified version of this file.
+%%
+%% File: l3drivers.dtx Copyright(C) 2011-2012 The LaTeX3 Project
+%%
+%% It may be distributed and/or modified under the conditions of the
+%% LaTeX Project Public License (LPPL), either version 1.3c of this
+%% license or (at your option) any later version. The latest version
+%% of this license is in the file
+%%
+%% http://www.latex-project.org/lppl.txt
+%%
+%% This file is part of the "l3kernel bundle" (The Work in LPPL)
+%% and all files in that bundle must be distributed together.
+%%
+%% The released version of this bundle is available from CTAN.
+%%
+%% -----------------------------------------------------------------------
+%%
+%% The development version of the bundle can be found at
+%%
+%% http://www.latex-project.org/svnroot/experimental/trunk/
+%%
+%% for those people who are interested.
+%%
+%%%%%%%%%%%
+%% NOTE: %%
+%%%%%%%%%%%
+%%
+%% Snapshots taken from the repository represent work in progress and may
+%% not work or may contain conflicting material! We therefore ask
+%% people _not_ to put them into distributions, archives, etc. without
+%% prior consultation with the LaTeX Project Team.
+%%
+%% -----------------------------------------------------------------------
+%%
+\RequirePackage{l3bootstrap}
+\GetIdInfo$Id: l3drivers.dtx 4280 2012-11-07 07:13:51Z joseph $
+ {L3 Experimental drivers}
+\ProvidesExplFile
+ {l3dvidpfmx.def}{\ExplFileDate}{\ExplFileVersion}
+ {L3 Experimental driver: dvipdfmx}
+\__expl_package_check:
+\cs_new_protected_nopar:Npn \__driver_graphic_state_save:
+ { \tex_special:D { pdf:bcontent } }
+\cs_new_protected_nopar:Npn \__driver_graphic_state_restore:
+ { \tex_special:D { pdf:econtent } }
+\cs_new_protected:Npn \__driver_pdf_literal:n #1
+ { \tex_special:D { pdf:content~ #1 } }
+\cs_new_protected:Npn \__driver_pdf_literal_direct:n #1
+ { \tex_special:D { pdf:literal~direct~ #1 } }
+\cs_new_protected:Npn \__driver_box_use_clip:N #1
+ {
+ \__driver_graphic_state_save:
+ \__driver_pdf_literal_direct:n
+ {
+ 0 ~
+ \__dim_strip_bp:n { - \box_dp:N #1 } ~
+ \__dim_strip_bp:n { \box_wd:N #1 } ~
+ \__dim_strip_bp:n { \box_ht:N #1 + \box_dp:N #1 } ~
+ re~W~n
+ }
+ \hbox_overlap_right:n { \box_use:N #1 }
+ \__driver_graphic_state_restore:
+ \skip_horizontal:n { \box_wd:N #1 }
+ }
+\cs_new_protected_nopar:Npn \__driver_box_rotate_begin:
+ {
+ \__driver_graphic_state_save:
+ \box_set_wd:Nn \l__box_internal_box \c_zero_dim
+ \fp_set:Nn \l__box_cos_fp
+ {
+ \fp_compare:nNnTF \l__box_cos_fp = \c_zero_fp
+ { 0 }
+ { round ( \l__box_cos_fp , 5 ) }
+ }
+ \fp_set:Nn \l__box_sin_fp { round ( \l__box_sin_fp , 5 ) }
+ \__driver_pdf_matrix:n
+ {
+ \fp_use:N \l__box_cos_fp \c_space_tl
+ \fp_compare:nNnTF \l__box_sin_fp = \c_zero_fp
+ { 0~0 }
+ {
+ \fp_use:N \l__box_sin_fp
+ \c_space_tl
+ \fp_eval:n { -\l__box_sin_fp }
+ }
+ \c_space_tl
+ \fp_use:N \l__box_cos_fp
+ }
+ }
+\cs_new_eq:NN \__driver_box_rotate_end: \__driver_graphic_state_restore:
+\cs_new_protected_nopar:Npn \__driver_box_scale_begin:
+ {
+ \fp_set:Nn \l__box_scale_x_fp { round ( \l__box_scale_x_fp , 5 ) }
+ \fp_set:Nn \l__box_scale_y_fp { round ( \l__box_scale_y_fp , 5 ) }
+ \__driver_graphic_state_save:
+ \__driver_pdf_matrix:n
+ {
+ \fp_use:N \l__box_scale_x_fp \c_space_tl
+ 0~0~
+ \fp_use:N \l__box_scale_y_fp
+ }
+ }
+\cs_new_eq:NN \__driver_box_scale_end: \__driver_graphic_state_restore:
+\cs_new_protected:Npn \__driver_pdf_matrix:n #1
+ { \__driver_pdf_literal_direct:n { #1 \c_space_tl 0~0~cm } }
+\tl_new:N \l__driver_current_color_tl
+\tl_set:Nn \l__driver_current_color_tl { gray~0 }
+\cs_new_protected_nopar:Npn \__driver_color_ensure_current:
+ {
+ \tex_special:D { color~push~\l__driver_current_color_tl }
+ \group_insert_after:N \__driver_color_reset:
+ }
+\cs_new_protected_nopar:Npn \__driver_color_reset:
+ { \tex_special:D { color~pop } }
+%%
+%%
+%% End of file `l3dvipdfmx.def'.
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3dvips.def b/Master/texmf-dist/tex/latex/l3kernel/l3dvips.def
new file mode 100644
index 00000000000..fd499957e55
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3dvips.def
@@ -0,0 +1,125 @@
+%%
+%% This is file `l3dvips.def',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% l3drivers.dtx (with options: `package,dvips')
+%%
+%% EXPERIMENTAL CODE
+%%
+%% Do not distribute this file without also distributing the
+%% source files specified above.
+%%
+%% Do not distribute a modified version of this file.
+%%
+%% File: l3drivers.dtx Copyright(C) 2011-2012 The LaTeX3 Project
+%%
+%% It may be distributed and/or modified under the conditions of the
+%% LaTeX Project Public License (LPPL), either version 1.3c of this
+%% license or (at your option) any later version. The latest version
+%% of this license is in the file
+%%
+%% http://www.latex-project.org/lppl.txt
+%%
+%% This file is part of the "l3kernel bundle" (The Work in LPPL)
+%% and all files in that bundle must be distributed together.
+%%
+%% The released version of this bundle is available from CTAN.
+%%
+%% -----------------------------------------------------------------------
+%%
+%% The development version of the bundle can be found at
+%%
+%% http://www.latex-project.org/svnroot/experimental/trunk/
+%%
+%% for those people who are interested.
+%%
+%%%%%%%%%%%
+%% NOTE: %%
+%%%%%%%%%%%
+%%
+%% Snapshots taken from the repository represent work in progress and may
+%% not work or may contain conflicting material! We therefore ask
+%% people _not_ to put them into distributions, archives, etc. without
+%% prior consultation with the LaTeX Project Team.
+%%
+%% -----------------------------------------------------------------------
+%%
+\RequirePackage{l3bootstrap}
+\GetIdInfo$Id: l3drivers.dtx 4280 2012-11-07 07:13:51Z joseph $
+ {L3 Experimental drivers}
+\ProvidesExplFile
+ {l3dvips.def}{\ExplFileDate}{\ExplFileVersion}
+ {L3 Experimental driver: dvips}
+\__expl_package_check:
+\cs_new_protected_nopar:Npn \__driver_graphic_state_save:
+ { \tex_special:D { ps:gsave } }
+\cs_new_protected_nopar:Npn \__driver_graphic_state_restore:
+ { \tex_special:D { ps:grestore } }
+\cs_new_protected:Npn \__driver_ps_literal:n #1
+ { \tex_special:D { ps: #1 } }
+\cs_new_protected:Npn \__driver_box_use_clip:N #1
+ {
+ \__driver_graphic_state_save:
+ \__driver_ps_literal:n
+ {
+ /savedmatrix~matrix~currentmatrix~def~
+ currentpoint~translate~
+ Resolution~72~div~VResolution~72~div~scale
+ }
+ \__driver_ps_literal:n
+ {
+ 0~
+ \__dim_strip_bp:n { \box_dp:N #1 } ~
+ \__dim_strip_bp:n { \box_wd:N #1 } ~
+ \__dim_strip_bp:n { - \box_ht:N #1 - \box_dp:N #1 } ~
+ rectclip
+ }
+ \__driver_ps_literal:n { savedmatrix~setmatrix }
+ \hbox_overlap_right:n { \box_use:N #1 }
+ \__driver_graphic_state_restore:
+ \skip_horizontal:n { \box_wd:N #1 }
+ }
+\cs_new_protected_nopar:Npn \__driver_box_rotate_begin:
+ {
+ \__driver_graphic_state_save:
+ \__driver_ps_literal:n
+ {
+ currentpoint~
+ currentpoint~translate~
+ \fp_compare:nNnTF \l__box_angle_fp = \c_zero_fp
+ { 0 }
+ { \fp_eval:n { round ( - \l__box_angle_fp , 5 ) } }
+ \c_space_tl rotate~
+ neg~exch~neg~exch~translate
+ }
+ }
+\cs_new_eq:NN \__driver_box_rotate_end: \__driver_graphic_state_restore:
+\cs_new_protected_nopar:Npn \__driver_box_scale_begin:
+ {
+ \fp_set:Nn \l__box_scale_x_fp { round ( \l__box_scale_x_fp , 5 ) }
+ \fp_set:Nn \l__box_scale_y_fp { round ( \l__box_scale_y_fp , 5 ) }
+ \__driver_graphic_state_save:
+ \__driver_ps_literal:n
+ {
+ currentpoint~
+ currentpoint~translate~
+ \fp_use:N \l__box_scale_x_fp \c_space_tl
+ \fp_use:N \l__box_scale_y_fp \c_space_tl scale~
+ neg~exch~neg~exch~translate
+ }
+ }
+\cs_new_eq:NN \__driver_box_scale_end: \__driver_graphic_state_restore:
+\tl_new:N \l__driver_current_color_tl
+\tl_set:Nn \l__driver_current_color_tl { Black }
+\cs_new_protected_nopar:Npn \__driver_color_ensure_current:
+ {
+ \tex_special:D { color~push~\l__driver_current_color_tl }
+ \group_insert_after:N \__driver_color_reset:
+ }
+\cs_new_protected_nopar:Npn \__driver_color_reset:
+ { \tex_special:D { color~pop } }
+%%
+%%
+%% End of file `l3dvips.def'.
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3fp.sty b/Master/texmf-dist/tex/latex/l3kernel/l3fp.sty
index 6c9d3b3bc2e..4754b592c0c 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3fp.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3fp.sty
@@ -59,7 +59,7 @@
%% -----------------------------------------------------------------------
%%
\RequirePackage{l3bootstrap}
-\GetIdInfo$Id: l3fp.dtx 4234 2012-09-26 09:43:31Z bruno $
+\GetIdInfo$Id: l3fp.dtx 4305 2012-11-10 08:40:25Z joseph $
{L3 Floating points}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3keys.sty b/Master/texmf-dist/tex/latex/l3kernel/l3keys.sty
index 82dc4a656f7..fd2cac0632c 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3keys.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3keys.sty
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3bootstrap}
-\GetIdInfo$Id: l3keys.dtx 4248 2012-09-29 19:55:27Z joseph $
+\GetIdInfo$Id: l3keys.dtx 4256 2012-11-02 08:47:41Z joseph $
{L3 Experimental key-value interfaces}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def b/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def
new file mode 100644
index 00000000000..1d31d48342c
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def
@@ -0,0 +1,159 @@
+%%
+%% This is file `l3pdfmode.def',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% l3drivers.dtx (with options: `package,pdfmode')
+%%
+%% EXPERIMENTAL CODE
+%%
+%% Do not distribute this file without also distributing the
+%% source files specified above.
+%%
+%% Do not distribute a modified version of this file.
+%%
+%% File: l3drivers.dtx Copyright(C) 2011-2012 The LaTeX3 Project
+%%
+%% It may be distributed and/or modified under the conditions of the
+%% LaTeX Project Public License (LPPL), either version 1.3c of this
+%% license or (at your option) any later version. The latest version
+%% of this license is in the file
+%%
+%% http://www.latex-project.org/lppl.txt
+%%
+%% This file is part of the "l3kernel bundle" (The Work in LPPL)
+%% and all files in that bundle must be distributed together.
+%%
+%% The released version of this bundle is available from CTAN.
+%%
+%% -----------------------------------------------------------------------
+%%
+%% The development version of the bundle can be found at
+%%
+%% http://www.latex-project.org/svnroot/experimental/trunk/
+%%
+%% for those people who are interested.
+%%
+%%%%%%%%%%%
+%% NOTE: %%
+%%%%%%%%%%%
+%%
+%% Snapshots taken from the repository represent work in progress and may
+%% not work or may contain conflicting material! We therefore ask
+%% people _not_ to put them into distributions, archives, etc. without
+%% prior consultation with the LaTeX Project Team.
+%%
+%% -----------------------------------------------------------------------
+%%
+\RequirePackage{l3bootstrap}
+\GetIdInfo$Id: l3drivers.dtx 4280 2012-11-07 07:13:51Z joseph $
+ {L3 Experimental drivers}
+\ProvidesExplFile
+ {l3pdfmode.def}{\ExplFileDate}{\ExplFileVersion}
+ {L3 Experimental driver: PDF mode}
+\__expl_package_check:
+\cs_if_exist:NTF \pdftex_pdfsave:D
+ {
+ \cs_new_eq:NN \__driver_graphic_state_save: \pdftex_pdfsave:D
+ \cs_new_eq:NN \__driver_graphic_state_restore: \pdftex_pdfrestore:D
+ }
+ {
+ \cs_new_protected_nopar:Npn \__driver_graphic_state_save:
+ { \pdftex_pdfliteral:D { q } }
+ \cs_new_protected_nopar:Npn \__driver_graphic_state_restore:
+ { \pdftex_pdfliteral:D { Q } }
+ }
+\cs_new_protected:Npn \__driver_pdf_literal:n #1
+ { \pdftex_pdfliteral:D {#1} }
+\cs_new_protected:Npn \__driver_pdf_literal_direct:n #1
+ { \pdftex_pdfliteral:D direct~{#1} }
+\cs_new_protected:Npn \__driver_box_use_clip:N #1
+ {
+ \__driver_graphic_state_save:
+ \__driver_pdf_literal_direct:n
+ {
+ 0 ~
+ \__dim_strip_bp:n { - \box_dp:N #1 } ~
+ \__dim_strip_bp:n { \box_wd:N #1 } ~
+ \__dim_strip_bp:n { \box_ht:N #1 + \box_dp:N #1 } ~
+ re~W~n
+ }
+ \hbox_overlap_right:n { \box_use:N #1 }
+ \__driver_graphic_state_restore:
+ \skip_horizontal:n { \box_wd:N #1 }
+ }
+\cs_new_protected_nopar:Npn \__driver_box_rotate_begin:
+ {
+ \__driver_graphic_state_save:
+ \box_set_wd:Nn \l__box_internal_box \c_zero_dim
+ \fp_set:Nn \l__box_cos_fp
+ {
+ \fp_compare:nNnTF \l__box_cos_fp = \c_zero_fp
+ { 0 }
+ { round ( \l__box_cos_fp , 5 ) }
+ }
+ \fp_set:Nn \l__box_sin_fp { round ( \l__box_sin_fp , 5 ) }
+ \__driver_pdf_matrix:n
+ {
+ \fp_use:N \l__box_cos_fp \c_space_tl
+ \fp_compare:nNnTF \l__box_sin_fp = \c_zero_fp
+ { 0~0 }
+ {
+ \fp_use:N \l__box_sin_fp
+ \c_space_tl
+ \fp_eval:n { -\l__box_sin_fp }
+ }
+ \c_space_tl
+ \fp_use:N \l__box_cos_fp
+ }
+ }
+\cs_new_eq:NN \__driver_box_rotate_end: \__driver_graphic_state_restore:
+\cs_new_protected_nopar:Npn \__driver_box_scale_begin:
+ {
+ \fp_set:Nn \l__box_scale_x_fp { round ( \l__box_scale_x_fp , 5 ) }
+ \fp_set:Nn \l__box_scale_y_fp { round ( \l__box_scale_y_fp , 5 ) }
+ \__driver_graphic_state_save:
+ \__driver_pdf_matrix:n
+ {
+ \fp_use:N \l__box_scale_x_fp \c_space_tl
+ 0~0~
+ \fp_use:N \l__box_scale_y_fp
+ }
+ }
+\cs_new_eq:NN \__driver_box_scale_end: \__driver_graphic_state_restore:
+\cs_if_exist:NTF \pdftex_pdfsetmatrix:D
+ {
+ \cs_new_protected:Npn \__driver_pdf_matrix:n #1
+ { \pdftex_pdfsetmatrix:D {#1} }
+ }
+ {
+ \cs_new_protected:Npn \__driver_pdf_matrix:n #1
+ { \__driver_pdf_literal:n { #1 \c_space_tl 0~0~cm } }
+ }
+\tl_new:N \l__driver_current_color_tl
+\tl_set:Nn \l__driver_current_color_tl { 0~g~0~G }
+\int_new:N \l__driver_color_stack_int
+\cs_if_exist:NTF \pdftex_pdfcolorstack:D
+ {
+ \cs_new_protected_nopar:Npn \__driver_color_ensure_current:
+ {
+ \pdftex_pdfcolorstack:D \l__driver_color_stack_int push
+ { \l__driver_current_color_tl }
+ \group_insert_after:N \__driver_color_reset:
+ }
+ \cs_new_protected_nopar:Npn \__driver_color_reset:
+ { \pdftex_pdfcolorstack:D \l__driver_color_stack_int pop }
+ }
+ {
+ \cs_new_protected_nopar:Npn \__driver_color_ensure_current:
+ {
+ \__driver_pdf_literal:n { \l__driver_current_color_tl }
+ \group_insert_after:N \__driver_color_reset:
+ }
+ \cs_new_protected_nopar:Npn \__driver_color_reset:
+ { \__driver_pdf_literal:n { \l__driver_current_color_tl } }
+ }
+%%
+%%
+%% End of file `l3pdfmode.def'.
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3quark.sty b/Master/texmf-dist/tex/latex/l3kernel/l3quark.sty
index fdb0515e2c1..11ace1c7380 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3quark.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3quark.sty
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3bootstrap}
-\GetIdInfo$Id: l3quark.dtx 4065 2012-08-08 21:37:44Z bruno $
+\GetIdInfo$Id: l3quark.dtx 4268 2012-11-04 22:19:48Z joseph $
{L3 Quarks}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3skip.sty b/Master/texmf-dist/tex/latex/l3kernel/l3skip.sty
index 4e7c82c333a..c9e6836ca2b 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3skip.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3skip.sty
@@ -47,7 +47,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3bootstrap}
-\GetIdInfo$Id: l3skip.dtx 4235 2012-09-26 09:48:18Z bruno $
+\GetIdInfo$Id: l3skip.dtx 4260 2012-11-04 17:20:25Z joseph $
{L3 Dimensions and skips}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -277,8 +277,8 @@
\cs_generate_variant:Nn \dim_show:N { c }
\cs_new_protected:Npn \dim_show:n #1
{ \etex_showtokens:D \exp_after:wN { \dim_use:N \__dim_eval:w #1 } }
-\cs_new_eq:NN \c_zero_dim \z@
-\cs_new_eq:NN \c_max_dim \maxdimen
+\dim_const:Nn \c_zero_dim { 0 pt }
+\dim_const:Nn \c_max_dim { 16383.99999 pt }
\dim_new:N \l_tmpa_dim
\dim_new:N \l_tmpb_dim
\dim_new:N \g_tmpa_dim
@@ -371,8 +371,8 @@
\cs_generate_variant:Nn \skip_show:N { c }
\cs_new_protected:Npn \skip_show:n #1
{ \etex_showtokens:D \exp_after:wN { \tex_the:D \etex_glueexpr:D #1 } }
-\cs_new_eq:NN \c_zero_skip \c_zero_dim
-\cs_new_eq:NN \c_max_skip \c_max_dim
+\skip_const:Nn \c_zero_skip { \c_zero_dim }
+\skip_const:Nn \c_max_skip { \c_max_dim }
\skip_new:N \l_tmpa_skip
\skip_new:N \l_tmpb_skip
\skip_new:N \g_tmpa_skip
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3token.sty b/Master/texmf-dist/tex/latex/l3kernel/l3token.sty
index 668d699fcfe..a95678f3d6c 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3token.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3token.sty
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3bootstrap}
-\GetIdInfo$Id: l3token.dtx 4069 2012-08-08 23:12:57Z bruno $
+\GetIdInfo$Id: l3token.dtx 4251 2012-11-01 16:30:06Z joseph $
{L3 Experimental token manipulation}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -633,7 +633,7 @@
}
\cs_set:Npn \__peek_def:nnnnn #1#2#3#4#5
{
- \cs_new_nopar:cpx { #1 #5 }
+ \cs_new_protected_nopar:cpx { #1 #5 }
{
\tl_if_empty:nF {#2}
{ \exp_not:n { \cs_set_eq:NN \__peek_execute_branches: #2 } }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def b/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def
new file mode 100644
index 00000000000..dceeb7d5585
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def
@@ -0,0 +1,131 @@
+%%
+%% This is file `l3xdvipdfmx.def',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% l3drivers.dtx (with options: `package,xdvipdfmx')
+%%
+%% EXPERIMENTAL CODE
+%%
+%% Do not distribute this file without also distributing the
+%% source files specified above.
+%%
+%% Do not distribute a modified version of this file.
+%%
+%% File: l3drivers.dtx Copyright(C) 2011-2012 The LaTeX3 Project
+%%
+%% It may be distributed and/or modified under the conditions of the
+%% LaTeX Project Public License (LPPL), either version 1.3c of this
+%% license or (at your option) any later version. The latest version
+%% of this license is in the file
+%%
+%% http://www.latex-project.org/lppl.txt
+%%
+%% This file is part of the "l3kernel bundle" (The Work in LPPL)
+%% and all files in that bundle must be distributed together.
+%%
+%% The released version of this bundle is available from CTAN.
+%%
+%% -----------------------------------------------------------------------
+%%
+%% The development version of the bundle can be found at
+%%
+%% http://www.latex-project.org/svnroot/experimental/trunk/
+%%
+%% for those people who are interested.
+%%
+%%%%%%%%%%%
+%% NOTE: %%
+%%%%%%%%%%%
+%%
+%% Snapshots taken from the repository represent work in progress and may
+%% not work or may contain conflicting material! We therefore ask
+%% people _not_ to put them into distributions, archives, etc. without
+%% prior consultation with the LaTeX Project Team.
+%%
+%% -----------------------------------------------------------------------
+%%
+\RequirePackage{l3bootstrap}
+\GetIdInfo$Id: l3drivers.dtx 4280 2012-11-07 07:13:51Z joseph $
+ {L3 Experimental drivers}
+\ProvidesExplFile
+ {l3xdvidpfmx.def}{\ExplFileDate}{\ExplFileVersion}
+ {L3 Experimental driver: xdvipdfmx}
+\__expl_package_check:
+\cs_new_protected_nopar:Npn \__driver_graphic_state_save:
+ { \tex_special:D { pdf:bcontent } }
+\cs_new_protected_nopar:Npn \__driver_graphic_state_restore:
+ { \tex_special:D { pdf:econtent } }
+\cs_new_protected:Npn \__driver_pdf_literal:n #1
+ { \tex_special:D { pdf:content~ #1 } }
+\cs_new_protected:Npn \__driver_pdf_literal_direct:n #1
+ { \tex_special:D { pdf:literal~direct~ #1 } }
+\cs_new_protected:Npn \__driver_box_use_clip:N #1
+ {
+ \__driver_graphic_state_save:
+ \__driver_pdf_literal_direct:n
+ {
+ 0 ~
+ \__dim_strip_bp:n { - \box_dp:N #1 } ~
+ \__dim_strip_bp:n { \box_wd:N #1 } ~
+ \__dim_strip_bp:n { \box_ht:N #1 + \box_dp:N #1 } ~
+ re~W~n
+ }
+ \hbox_overlap_right:n { \box_use:N #1 }
+ \__driver_graphic_state_restore:
+ \skip_horizontal:n { \box_wd:N #1 }
+ }
+\cs_new_protected_nopar:Npn \__driver_box_rotate_begin:
+ {
+ \__driver_graphic_state_save:
+ \box_set_wd:Nn \l__box_internal_box \c_zero_dim
+ \fp_set:Nn \l__box_cos_fp
+ {
+ \fp_compare:nNnTF \l__box_cos_fp = \c_zero_fp
+ { 0 }
+ { round ( \l__box_cos_fp , 5 ) }
+ }
+ \fp_set:Nn \l__box_sin_fp { round ( \l__box_sin_fp , 5 ) }
+ \__driver_pdf_matrix:n
+ {
+ \fp_use:N \l__box_cos_fp \c_space_tl
+ \fp_compare:nNnTF \l__box_sin_fp = \c_zero_fp
+ { 0~0 }
+ {
+ \fp_use:N \l__box_sin_fp
+ \c_space_tl
+ \fp_eval:n { -\l__box_sin_fp }
+ }
+ \c_space_tl
+ \fp_use:N \l__box_cos_fp
+ }
+ }
+\cs_new_eq:NN \__driver_box_rotate_end: \__driver_graphic_state_restore:
+\cs_new_protected_nopar:Npn \__driver_box_scale_begin:
+ {
+ \fp_set:Nn \l__box_scale_x_fp { round ( \l__box_scale_x_fp , 5 ) }
+ \fp_set:Nn \l__box_scale_y_fp { round ( \l__box_scale_y_fp , 5 ) }
+ \__driver_graphic_state_save:
+ \__driver_pdf_matrix:n
+ {
+ \fp_use:N \l__box_scale_x_fp \c_space_tl
+ 0~0~
+ \fp_use:N \l__box_scale_y_fp
+ }
+ }
+\cs_new_eq:NN \__driver_box_scale_end: \__driver_graphic_state_restore:
+\cs_new_protected:Npn \__driver_pdf_matrix:n #1
+ { \__driver_pdf_literal_direct:n { #1 \c_space_tl 0~0~cm } }
+\tl_new:N \l__driver_current_color_tl
+\tl_set:Nn \l__driver_current_color_tl { gray~0 }
+\cs_new_protected_nopar:Npn \__driver_color_ensure_current:
+ {
+ \tex_special:D { color~push~\l__driver_current_color_tl }
+ \group_insert_after:N \__driver_color_reset:
+ }
+\cs_new_protected_nopar:Npn \__driver_color_reset:
+ { \tex_special:D { color~pop } }
+%%
+%%
+%% End of file `l3xdvipdfmx.def'.
diff --git a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
index 778ae75d921..365837076f4 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/09/29]
-\@ifpackagelater{expl3}{2012/09/29}
+\RequirePackage{expl3}[2012/11/21]
+\@ifpackagelater{expl3}{2012/11/21}
{}
{%
\PackageError{l3keys2e}{Support package l3kernel too old.}
@@ -58,8 +58,7 @@
}%
\endinput
}
-\RequirePackage{xparse}
-\GetIdInfo$Id: l3keys2e.dtx 4249 2012-09-29 22:17:28Z joseph $
+\GetIdInfo$Id: l3keys2e.dtx 4332 2012-11-21 21:40:31Z 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 7835dc2427e..44b4a39bba0 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 3991 2012-07-16 19:00:35Z joseph $
+\GetIdInfo$Id: xfrac.dtx 4299 2012-11-09 18:48:51Z joseph $
{L3 Experimental split-level fractions}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -83,7 +83,7 @@
\tl_new:N \l__xfrac_phantom_tl
\tl_new:N \l__xfrac_slash_symbol_tl
\tl_new:N \l__xfrac_slash_symbol_font_tl
-\cs_new_nopar:Npn \__xfrac_fontscale:
+\cs_new_nopar:Npn \__xfrac_fontscale: { }
\cs_new:Npn \__xfrac_math:n #1 { }
\cs_new_nopar:Npn \__xfrac_denominator_font_change: { }
\cs_new:Npn \__xfrac_denominator_format:n #1 { }
diff --git a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
index 7596d3105c3..f1a144b2e16 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/09/29]
-\@ifpackagelater{expl3}{2012/09/29}
+\RequirePackage{expl3}[2012/11/21]
+\@ifpackagelater{expl3}{2012/11/21}
{}
{%
\PackageError{xparse}{Support package l3kernel too old.}
@@ -62,7 +62,7 @@
}%
\endinput
}
-\GetIdInfo$Id: xparse.dtx 4249 2012-09-29 22:17:28Z joseph $
+\GetIdInfo$Id: xparse.dtx 4332 2012-11-21 21:40:31Z 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 0ed7ef8e49e..c2fa5195eba 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/09/29]
-\@ifpackagelater{expl3}{2012/09/29}
+\RequirePackage{expl3}[2012/11/21]
+\@ifpackagelater{expl3}{2012/11/21}
{}
{%
\PackageError{xtemplate}{Support package l3kernel too old.}
@@ -62,7 +62,7 @@
}%
\endinput
}
-\GetIdInfo$Id: xtemplate.dtx 4249 2012-09-29 22:17:28Z joseph $
+\GetIdInfo$Id: xtemplate.dtx 4332 2012-11-21 21:40:31Z joseph $
{L3 Experimental prototype document functions}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -146,13 +146,15 @@
{#1} {#2}
}
}
-\prg_new_conditional:Npnn \__xtemplate_if_key_value:n #1 { T }
+\prg_new_conditional:Npnn \__xtemplate_if_key_value:n #1 { T , F , TF }
{
\str_if_eq:noTF { \KeyValue } { \tl_head:w #1 \q_nil \q_stop }
- {\prg_return_true: }
+ { \prg_return_true: }
{ \prg_return_false: }
}
-\cs_generate_variant:Nn \__xtemplate_if_key_value:nT { o }
+\cs_generate_variant:Nn \__xtemplate_if_key_value:nT { o }
+\cs_generate_variant:Nn \__xtemplate_if_key_value:nF { o }
+\cs_generate_variant:Nn \__xtemplate_if_key_value:nTF { o }
\prg_new_conditional:Npnn \__xtemplate_if_eval_now:n #1 { TF }
{
\str_if_eq:noTF { \EvaluateNow } { \tl_head:w #1 \q_nil \q_stop }
@@ -843,7 +845,7 @@
{
\__xtemplate_if_key_value:oT \l__xtemplate_value_tl
{ \__xtemplate_key_to_value: }
- \tl_put_left:Nx \l__xtemplate_assignments_tl
+ \tl_put_right:Nx \l__xtemplate_assignments_tl
{
\exp_not:c { #1 _ \l__xtemplate_value_tl :N }
\exp_not:o \l__xtemplate_var_tl
@@ -877,7 +879,7 @@
\cs_generate_variant:Nn \__xtemplate_assign_choice_aux:nF { x }
\cs_new_protected_nopar:Npn \__xtemplate_assign_code:
{
- \tl_put_left:Nx \l__xtemplate_assignments_tl
+ \tl_put_right:Nx \l__xtemplate_assignments_tl
{
\cs_set_protected:Npn \__xtemplate_assign_code:n \exp_not:n {##1}
{ \exp_not:o \l__xtemplate_var_tl }
@@ -893,7 +895,7 @@
}
\cs_new_protected_nopar:Npn \__xtemplate_assign_function_aux:N #1
{
- \tl_put_left:Nx \l__xtemplate_assignments_tl
+ \tl_put_right:Nx \l__xtemplate_assignments_tl
{
\cs_generate_from_arg_count:NNnn
\exp_not:o \l__xtemplate_var_tl
@@ -910,7 +912,7 @@
}
\cs_new_protected_nopar:Npn \__xtemplate_assign_instance_aux:N #1
{
- \tl_put_left:Nx \l__xtemplate_assignments_tl
+ \tl_put_right:Nx \l__xtemplate_assignments_tl
{
\exp_not:N #1 \exp_not:o \l__xtemplate_var_tl
{
@@ -953,50 +955,68 @@
\cs_new_protected_nopar:Npn \__xtemplate_assign_tokenlist:
{
\bool_if:NTF \l__xtemplate_global_bool
- { \__xtemplate_assign_tokenlist_aux:N \tl_gset:Nn }
- { \__xtemplate_assign_tokenlist_aux:N \tl_set:Nn }
+ { \__xtemplate_assign_tokenlist_aux:NN \tl_gset:NV \tl_gset:Nn }
+ { \__xtemplate_assign_tokenlist_aux:NN \tl_set:NV \tl_set:Nn }
}
-\cs_new_protected_nopar:Npn \__xtemplate_assign_tokenlist_aux:N #1
+\cs_new_protected_nopar:Npn \__xtemplate_assign_tokenlist_aux:NN #1#2
{
- \__xtemplate_if_key_value:oT \l__xtemplate_value_tl
- { \__xtemplate_key_to_value: }
- \tl_put_left:Nx \l__xtemplate_assignments_tl
+ \__xtemplate_if_key_value:oTF \l__xtemplate_value_tl
{
- #1 \exp_not:o \l__xtemplate_var_tl
- { \exp_not:o \l__xtemplate_value_tl }
+ \__xtemplate_key_to_value:
+ \tl_put_right:Nx \l__xtemplate_assignments_tl
+ {
+ #1 \exp_not:o \l__xtemplate_var_tl
+ \exp_not:o \l__xtemplate_value_tl
+ }
+ }
+ {
+ \tl_put_right:Nx \l__xtemplate_assignments_tl
+ {
+ #2 \exp_not:o \l__xtemplate_var_tl
+ { \exp_not:o \l__xtemplate_value_tl }
+ }
}
}
\cs_new_protected_nopar:Npn \__xtemplate_assign_commalist:
{
\bool_if:NTF \l__xtemplate_global_bool
- { \__xtemplate_assign_tokenlist_aux:N \clist_gset:Nn }
- { \__xtemplate_assign_tokenlist_aux:N \clist_set:Nn }
+ { \__xtemplate_assign_tokenlist_aux:NN \clist_gset:NV \clist_gset:Nn }
+ { \__xtemplate_assign_tokenlist_aux:NN \clist_set:NV \clist_set:Nn }
}
\cs_new_protected_nopar:Npn \__xtemplate_assign_variable:N #1
{
\__xtemplate_if_key_value:oT \l__xtemplate_value_tl
{ \__xtemplate_key_to_value: }
- \tl_put_left:Nx \l__xtemplate_assignments_tl
+ \tl_put_right:Nx \l__xtemplate_assignments_tl
{
#1 \exp_not:o \l__xtemplate_var_tl
{ \exp_not:o \l__xtemplate_value_tl }
}
}
\cs_new_protected_nopar:Npn \__xtemplate_key_to_value:
- { \exp_after:wN \__xtemplate_key_to_value_aux:w \l__xtemplate_value_tl }
-\cs_new_protected:Npn \__xtemplate_key_to_value_aux:w \KeyValue #1
+ { \exp_after:wN \__xtemplate_key_to_value_auxi:w \l__xtemplate_value_tl }
+\cs_new_protected:Npn \__xtemplate_key_to_value_auxi:w \KeyValue #1
{
\tl_set:Nx \l__xtemplate_tmp_tl { \tl_to_str:n {#1} }
\tl_remove_all:Nn \l__xtemplate_key_name_tl { ~ }
- \prop_get:NoNF
+ \prop_get:NoNTF
\l__xtemplate_vars_prop
\l__xtemplate_tmp_tl
\l__xtemplate_value_tl
{
+ \exp_after:wN \__xtemplate_key_to_value_auxii:w \l__xtemplate_value_tl
+ \q_mark global \q_nil \q_stop
+ }
+ {
\msg_error:nnx { xtemplate } { unknown-attribute }
{ \l__xtemplate_tmp_tl }
}
}
+\cs_new_protected:Npn \__xtemplate_key_to_value_auxii:w #1 global #2#3 \q_stop
+ {
+ \quark_if_nil:NF #2
+ { \tl_set:Nn \l__xtemplate_value_tl {#2} }
+ }
\cs_new_protected:Npn \__xtemplate_use_instance:nn #1#2
{
\__xtemplate_if_use_template:nTF {#2}