diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex')
-rw-r--r-- | Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex | 56 |
1 files changed, 31 insertions, 25 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex index 6b7daba5139..4f63da38cfb 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex @@ -46,7 +46,7 @@ %% %% Do not distribute a modified version of this file. %% -%% File: expl3.dtx Copyright (C) 1990-2014 The LaTeX3 Project +%% File: expl3.dtx Copyright (C) 1990-2015 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 @@ -80,8 +80,8 @@ %% ----------------------------------------------------------------------- \def\ExplFileName{expl3} \def\ExplFileDescription{L3 programming layer} -\def\ExplFileDate{2014/11/25} -\def\ExplFileVersion{5471} +\def\ExplFileDate{2015/01/29} +\def\ExplFileVersion{5502} \begingroup \def\next{\endgroup} \expandafter\ifx\csname PackageError\endcsname\relax @@ -139,7 +139,7 @@ \ExplFileDate\space v\ExplFileVersion\space \ExplFileDescription\space (code) } -%% File: l3bootstrap.dtx Copyright (C) 2011-2014 The LaTeX3 project +%% File: l3bootstrap.dtx Copyright (C) 2011-2015 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 @@ -240,7 +240,7 @@ } } \endgroup -\GetIdInfo$Id: l3bootstrap.dtx 5354 2014-08-23 01:35:39Z bruno $ +\GetIdInfo$Id: l3bootstrap.dtx 5500 2015-01-27 14:37:04Z joseph $ {L3 Bootstrap code} \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname pdfstrcmp\endcsname\relax @@ -907,7 +907,7 @@ \tex_let:D \tex_middle:D \normalmiddle \tex_let:D \tex_right:D \normalright \tex_fi:D -%% File: l3basics.dtx Copyright (C) 1990-2014 The LaTeX3 project +%% File: l3basics.dtx Copyright (C) 1990-2015 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 @@ -939,7 +939,7 @@ %% prior consultation with the LaTeX3 Project. %% %% ----------------------------------------------------------------------- -\GetIdInfo$Id: l3basics.dtx 5364 2014-08-24 20:19:24Z joseph $ +\GetIdInfo$Id: l3basics.dtx 5500 2015-01-27 14:37:04Z joseph $ {L3 Basic definitions} \tex_let:D \if_true: \tex_iftrue:D \tex_let:D \if_false: \tex_iffalse:D @@ -1736,7 +1736,7 @@ %% prior consultation with the LaTeX3 Project. %% %% ----------------------------------------------------------------------- -\GetIdInfo$Id: l3expan.dtx 5349 2014-08-22 21:46:59Z bruno $ +\GetIdInfo$Id: l3expan.dtx 5472 2014-11-27 09:10:40Z joseph $ {L3 Argument expansion} \cs_new:Npn \__exp_arg_next:nnn #1#2#3 { #2 \::: { #3 {#1} } } \cs_new:Npn \__exp_arg_next:Nnn #1#2#3 { #2 \::: { #3 #1 } } @@ -2180,7 +2180,7 @@ \exp_after:wN \exp_not:N \cs:w :: #1 \cs_end: \__cs_generate_internal_variant_loop:n } -%% File: l3tl.dtx Copyright (C) 1990-2014 The LaTeX3 Project +%% File: l3tl.dtx Copyright (C) 1990-2015 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 @@ -2212,7 +2212,7 @@ %% prior consultation with the LaTeX3 Project. %% %% ----------------------------------------------------------------------- -\GetIdInfo$Id: l3tl.dtx 5460 2014-11-19 10:09:42Z joseph $ +\GetIdInfo$Id: l3tl.dtx 5500 2015-01-27 14:37:04Z joseph $ {L3 Token lists} \cs_new_protected:Npn \tl_new:N #1 { @@ -8513,7 +8513,7 @@ \cs_new_eq:NN \dim_case:nnn \dim_case:nnF \cs_new_eq:NN \__dim_strip_bp:n \dim_to_decimal_in_bp:n \cs_new_eq:NN \__dim_strip_pt:n \dim_to_decimal:n -%% File: l3keys.dtx Copyright (C) 2006-2014 The LaTeX3 Project +%% File: l3keys.dtx Copyright (C) 2006-2015 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 @@ -8545,7 +8545,7 @@ %% prior consultation with the LaTeX3 Project. %% %% ----------------------------------------------------------------------- -\GetIdInfo$Id: l3keys.dtx 5354 2014-08-23 01:35:39Z bruno $ +\GetIdInfo$Id: l3keys.dtx 5500 2015-01-27 14:37:04Z joseph $ {L3 Key-value interfaces} \int_new:N \g__keyval_level_int \tl_new:N \l__keyval_key_tl @@ -15941,7 +15941,7 @@ } } } -%% File: l3candidates.dtx Copyright(C) 2012-2014 The LaTeX3 Project +%% File: l3candidates.dtx Copyright(C) 2012-2015 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 @@ -15974,7 +15974,7 @@ %% %% ----------------------------------------------------------------------- %% -\GetIdInfo$Id: l3candidates.dtx 5466 2014-11-23 12:37:29Z joseph $ +\GetIdInfo$Id: l3candidates.dtx 5499 2015-01-27 14:33:48Z joseph $ {L3 Experimental additions to l3kernel} \group_begin: \tex_lccode:D `? = `: \scan_stop: @@ -16143,7 +16143,7 @@ \dim_to_fp:n {#3} / \dim_to_fp:n { \l__box_top_dim - \l__box_bottom_dim } } - \__box_resize:Nn #1 {#2} + \__box_resize:N #1 \group_end: } } @@ -16155,15 +16155,21 @@ \dim_set:Nn \l__box_right_dim { \box_wd:N #1 } \dim_zero:N \l__box_left_dim } -\cs_new_protected:Npn \__box_resize:Nn #1#2 +\cs_new_protected:Npn \__box_resize:N #1 { - \dim_set:Nn \l__box_right_new_dim { \dim_abs:n {#2} } - \dim_set:Nn \l__box_bottom_new_dim - { \fp_abs:n { \l__box_scale_y_fp } \l__box_bottom_dim } - \dim_set:Nn \l__box_top_new_dim - { \fp_abs:n { \l__box_scale_y_fp } \l__box_top_dim } + \__box_resize:NNN \l__box_right_new_dim + \l__box_scale_x_fp \l__box_right_dim + \__box_resize:NNN \l__box_bottom_new_dim + \l__box_scale_y_fp \l__box_bottom_dim + \__box_resize:NNN \l__box_top_new_dim + \l__box_scale_y_fp \l__box_top_dim \__box_resize_common:N #1 } +\cs_new_protected:Npn \__box_resize:NNN #1#2#3 + { + \dim_set:Nn #1 + { \fp_to_dim:n { \fp_abs:n { #2 } * \dim_to_fp:n { #3 } } } + } \cs_new_protected:Npn \box_resize_to_ht:Nn #1#2 { \hbox_set:Nn #1 @@ -16176,7 +16182,7 @@ / \dim_to_fp:n { \l__box_top_dim } } \fp_set_eq:NN \l__box_scale_x_fp \l__box_scale_y_fp - \__box_resize:Nn #1 {#2} + \__box_resize:N #1 \group_end: } } @@ -16193,7 +16199,7 @@ / \dim_to_fp:n { \l__box_top_dim - \l__box_bottom_dim } } \fp_set_eq:NN \l__box_scale_x_fp \l__box_scale_y_fp - \__box_resize:Nn #1 {#2} + \__box_resize:N #1 \group_end: } } @@ -16207,7 +16213,7 @@ \fp_set:Nn \l__box_scale_x_fp { \dim_to_fp:n {#2} / \dim_to_fp:n { \l__box_right_dim } } \fp_set_eq:NN \l__box_scale_y_fp \l__box_scale_x_fp - \__box_resize:Nn #1 {#2} + \__box_resize:N #1 \group_end: } } @@ -16225,7 +16231,7 @@ \dim_to_fp:n {#3} / \dim_to_fp:n { \l__box_top_dim } } - \__box_resize:Nn #1 {#2} + \__box_resize:N #1 \group_end: } } |