diff options
author | Karl Berry <karl@freefriends.org> | 2012-08-31 17:59:43 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2012-08-31 17:59:43 +0000 |
commit | e5a3e047c5cac01088ac7ff188774249eb852cad (patch) | |
tree | aab4d0898d88121226c8285aa5a45fef240238bc /Master/texmf-dist/tex | |
parent | 12907d9fa0bec7cb55d96f610a8a9390f2883b1d (diff) |
l3experimental 3160 (31aug12)
git-svn-id: svn://tug.org/texlive/trunk@27561 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
6 files changed, 509 insertions, 69 deletions
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3dt/l3dt.sty b/Master/texmf-dist/tex/latex/l3experimental/l3dt/l3dt.sty index 804c0c2b294..408f52b8bdd 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/l3dt/l3dt.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/l3dt/l3dt.sty @@ -47,7 +47,7 @@ %% ----------------------------------------------------------------------- %% \RequirePackage{expl3} -\GetIdInfo$Id: l3dt.dtx 3991 2012-07-16 19:00:35Z joseph $ +\GetIdInfo$Id: l3dt.dtx 4153 2012-08-29 07:18:26Z joseph $ {L3 Experimental data tables} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -57,14 +57,15 @@ \tl_const:Nn \c_empty_dt { { 0 } + { 0 } \q__dt \q_nil \q__dt_header \q__dt_row } -\cs_new_protected:Npn \dt_new:N #1 { \cs_new_eq:NN #1 \c_empty_dt } -\cs_new_protected:Npn \dt_clear:N #1 { \cs_set_eq:NN #1 \c_empty_dt } -\cs_new_protected:Npn \dt_gclear:N #1 { \cs_gset_eq:NN #1 \c_empty_dt } +\cs_new_protected:Npn \dt_new:N #1 { \cs_new_eq:NN #1 \c_empty_dt } +\cs_new_protected:Npn \dt_clear:N #1 { \cs_set_eq:NN #1 \c_empty_dt } +\cs_new_protected:Npn \dt_gclear:N #1 { \cs_gset_eq:NN #1 \c_empty_dt } \cs_new_protected:Npn \dt_clear_new:N #1 { \cs_if_exist:NTF #1 { \dt_clear:N #1 } { \dt_new:N #1 } } \cs_new_protected:Npn \dt_gclear_new:N #1 @@ -96,10 +97,10 @@ \cs_new_protected:Npn \__dt_split_key_list_aux:NnTF #1#2 { \cs_set_protected:Npn \__dt_split:w - ##1##2 \q__dt #2 \q__dt ##3##4 \q__dt_header ##5 \q_mark ##6 \q_stop + ##1##2##3 \q__dt #2 \q__dt ##4##5 \q__dt_header ##6 \q_mark ##7 \q_stop { - \__dt_split:nnnn ##3 - { { {##1} ##2 \q__dt } { ##3##4 \q__dt_header ##5 } } + \__dt_split:nnnn ##4 + { { {##1} {##2} ##3 \q__dt } { ##4##5 \q__dt_header ##6 } } } \exp_after:wN \__dt_split:w #1 \q_mark \q__dt #2 \q__dt { ? \use_ii:nn { } } \q__dt_header \q_mark \q_stop @@ -130,33 +131,38 @@ } } \cs_new_protected:Npn \__dt_add_key:NNnnn #1#2#3#4#5 + { \__dt_add_key:NNnnnwnn #1 #2 #4 \q_stop {#3} {#5} } +\cs_new_protected:Npn \__dt_add_key:NNnnnwnn #1#2#3#4#5 \q_stop #6#7 { #1 #2 { - \exp_not:n {#4} - \tl_to_str:n {#3} - \exp_not:n { \q__dt \q_nil #5 } + {#3} + { \int_eval:n { #4 + \c_one } } + \exp_not:n {#5} + \tl_to_str:n {#6} + \exp_not:n { \q__dt \q_nil #7 } } } \cs_new_protected_nopar:Npn \dt_add_row:N { \__dt_add_row:NN \tl_set:Nx } \cs_new_protected_nopar:Npn \dt_gadd_row:N { \__dt_add_row:NN \tl_gset:Nx } \cs_new_protected:Npn \__dt_add_row:NN #1#2 - { \exp_args:NNf \__dt_add_row:NnN #1 { \dt_rows:N #2 } #2 } + { \__dt_add_row:NfN #1 { \int_eval:n { \dt_rows:N #2 + \c_one } } #2 } \cs_new_protected:Npn \__dt_add_row:NnN #1#2#3 { #1 #3 { - { \int_eval:n { #2 + \c_one } } + {#2} \exp_after:wN \__dt_add_row:nw #3 \q_stop #2 \exp_not:n { \q__dt \q_nil \q__dt_row } } } +\cs_generate_variant:Nn \__dt_add_row:NnN { Nf } \cs_new:Npn \__dt_add_row:nw #1#2 \q_stop { \exp_not:n {#2} } \cs_new_protected:Npn \dt_put:Nnn #1 - { \dt_put:Nnnn #1 { \dt_rows:N #1 - \c_one } } + { \dt_put:Nnnn #1 { \dt_rows:N #1 } } \cs_new_protected:Npn \dt_gput:Nnn #1 - { \dt_gput:Nnnn #1 { \dt_rows:N #1 - \c_one } } + { \dt_gput:Nnnn #1 { \dt_rows:N #1 } } \cs_new_protected_nopar:Npn \dt_put:Nnnn { \__dt_put:NNNnnn \dt_add_key:Nn \tl_set:Nx } \cs_new_protected_nopar:Npn \dt_gput:Nnnn @@ -197,29 +203,14 @@ } } \cs_new:Npn \__dt_put_add_to_row_aux:w #1 \q_nil {#1} -\cs_new:Npn \dt_keys:N #1 - { \__dt_split_header:NT #1 { \__dt_keys:nn } } -\cs_new:Npn \__dt_keys:nn #1#2 - { - \int_eval:n - { - 0 - \exp_after:wN \__dt_keys:wN \use_none:nn #1 \q_recursion_tail \q__dt - \__prg_break_point:Nn \dt_map_break: { } - } - } -\cs_new:Npn \__dt_keys:wN #1 \q__dt - { - \__quark_if_recursion_tail_break:nN {#1} \dt_map_break: - +1 - \__dt_keys:wN - } +\cs_new:Npn \dt_keys:N #1 { \exp_after:wN \__dt_keys:nnw #1 \q_stop } +\cs_new:Npn \__dt_keys:nnw #1#2#3 \q_stop {#2} \cs_new:Npn \dt_rows:N #1 { \exp_after:wN \use_i_delimit_by_q_stop:nw #1 \q_stop } -\cs_new_protected:Npn \dt_remove:Nn #1 { \dt_remove:Nnn #1 - { \dt_rows:N #1 - \c_one } } -\cs_new_protected:Npn \dt_gremove:Nn #1 { \dt_gremove:Nnn #1 - { \dt_rows:N #1 - \c_one } } +\cs_new_protected:Npn \dt_remove:Nn #1 + { \dt_remove:Nnn #1 { \dt_rows:N #1 } } +\cs_new_protected:Npn \dt_gremove:Nn #1 + { \dt_gremove:Nnn #1 { \dt_rows:N #1 } } \cs_new_protected_nopar:Npn \dt_remove:Nnn { \dt_remove_aux:NNnn \tl_set:Nn } \cs_new_protected_nopar:Npn \dt_gremove:Nnn { \dt_remove_aux:NNnn \tl_gset:Nn } \cs_new_protected:Npn \dt_remove_aux:NNnn #1#2#3#4 @@ -247,6 +238,8 @@ { } } \cs_new_protected:Npn \dt_remove_key_aux:nNNnn #1#2#3#4#5 + { \dt_remove_key_aux:nNNnnwn {#1} #2 #3 #4 \q_stop {#5} } +\cs_new_protected:Npn \dt_remove_key_aux:nNNnnwn #1#2#3#4#5#6 \q_stop #7 { \cs_set:Npn \dt_remove_key_aux:w ##1 \q__dt #1 \q__dt ##2 ##3 { @@ -254,10 +247,13 @@ \__quark_if_recursion_tail_break:nN {##3} \dt_map_break: \dt_remove_key_aux:w ##3 } + #2 #3 { - \exp_not:n {#4} - \dt_remove_key_aux:w #5 \q__dt #1 \q__dt { } \q_recursion_tail + {#4} + { \int_eval:n { #5 - \c_one } } + \exp_not:n {#6} + \dt_remove_key_aux:w #7 \q__dt #1 \q__dt { } \q_recursion_tail \__prg_break_point:Nn \dt_map_break: { } } } @@ -320,14 +316,14 @@ \tl_set:Nn #1 {#3} \prg_return_true: } -\cs_new_protected:Npn \dt_get:NnN #1 { \dt_get:NnnN #1 - { \dt_rows:N #1 - \c_one } } -\cs_new_protected:Npn \dt_get:NnNT #1 { \dt_get:NnnNF #1 - { \dt_rows:N #1 - \c_one } } -\cs_new_protected:Npn \dt_get:NnNF #1 { \dt_get:NnnNF #1 - { \dt_rows:N #1 - \c_one } } -\cs_new_protected:Npn \dt_get:NnNTF #1 { \dt_get:NnnNTF #1 - { \dt_rows:N #1 - \c_one } } +\cs_new_protected:Npn \dt_get:NnN #1 + { \dt_get:NnnN #1 { \dt_rows:N #1 } } +\cs_new_protected:Npn \dt_get:NnNT #1 + { \dt_get:NnnNF #1 { \dt_rows:N #1 } } +\cs_new_protected:Npn \dt_get:NnNF #1 + { \dt_get:NnnNF #1 { \dt_rows:N #1 } } +\cs_new_protected:Npn \dt_get:NnNTF #1 + { \dt_get:NnnNTF #1 { \dt_rows:N #1 } } \int_new:N \g_dt_map_level_int \cs_new_protected:Npn \dt_map_variables:Nnn #1#2#3 { @@ -434,14 +430,14 @@ \fi: \__prg_break: } -\cs_new:Npn \dt_if_in_row_p:Nn #1 { \dt_if_in_row_p:Nnn #1 - { \dt_rows:N #1 - \c_one } } -\cs_new:Npn \dt_if_in_row:NnT #1 { \dt_if_in_row:NnnT #1 - { \dt_rows:N #1 - \c_one } } -\cs_new:Npn \dt_if_in_row:NnF #1 { \dt_if_in_row:NnnF #1 - { \dt_rows:N #1 - \c_one } } -\cs_new:Npn \dt_if_in_row:NnTF #1 { \dt_if_in_row:NnnTF #1 - { \dt_rows:N #1 - \c_one } } +\cs_new:Npn \dt_if_in_row_p:Nn #1 + { \dt_if_in_row_p:Nnn #1 { \dt_rows:N #1 } } +\cs_new:Npn \dt_if_in_row:NnT #1 + { \dt_if_in_row:NnnT #1 { \dt_rows:N #1 } } +\cs_new:Npn \dt_if_in_row:NnF #1 + { \dt_if_in_row:NnnF #1 { \dt_rows:N #1 } } +\cs_new:Npn \dt_if_in_row:NnTF #1 + { \dt_if_in_row:NnnTF #1 { \dt_rows:N #1 } } \__msg_kernel_new:nnnn { dt } { unknown-row } { Data~table~#1~does~not~contain~a~row~'#2'. } { diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty new file mode 100644 index 00000000000..902d147cd3f --- /dev/null +++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty @@ -0,0 +1,453 @@ +%% +%% This is file `l3str-format.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% l3str-format.dtx (with options: `package') +%% +%% 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: l3str-format.dtx Copyright (C) 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 "l3experimental 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 LaTeX3 Project. +%% +%% ----------------------------------------------------------------------- +\RequirePackage{expl3} +\GetIdInfo$Id: l3str-format.dtx 3940 2012-07-09 00:41:44Z bruno $ + {L3 Experimental string formatting} +\ProvidesExplPackage + {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} +\RequirePackage{l3str} +\cs_generate_variant:Nn \use:nn { nf } +\cs_generate_variant:Nn \use:nnn { fnf } +\cs_generate_variant:Nn \tl_to_str:n { f } +\prg_new_conditional:Npnn \__str_format_if_digit:N #1 { TF } + { + \if_int_compare:w \c_nine < 1 #1 \exp_stop_f: + \prg_return_true: \else: \prg_return_false: \fi: + } +\cs_new:Npn \__str_format_put:nw #1 #2 \s__stop { #2 \s__stop #1 } +\cs_generate_variant:Nn \__str_format_put:nw { o , f } +\cs_new:Npn \__str_format_parse:n #1 + { + \exp_last_unbraced:Nf \__str_format_parse_i:NN + \__str_to_other:n {#1} \s__stop \s__stop {#1} + } +\cs_new:Npx \__str_format_parse_i:NN #1#2 + { + \exp_not:N \__str_if_contains_char:nNTF { < > = ^ } #2 + { \exp_not:N \__str_format_parse_iii:nN { #1 #2 } } + { + \exp_not:N \__str_format_parse_ii:nN + { \c_catcode_other_space_tl } #1 #2 + } + } +\cs_new:Npn \__str_format_parse_ii:nN #1#2 + { + \__str_if_contains_char:nNTF { < > = ^ } #2 + { \__str_format_parse_iii:nN { #1 #2 } } + { \__str_format_parse_iii:nN { #1 ? } #2 } + } +\cs_new:Npx \__str_format_parse_iii:nN #1#2 + { + \exp_not:N \__str_if_contains_char:nNTF + { + - \c_catcode_other_space_tl } + #2 + { \exp_not:N \__str_format_parse_iv:nwN { #1 #2 } ; } + { \exp_not:N \__str_format_parse_iv:nwN { #1 ? } ; #2 } + } +\cs_new:Npn \__str_format_parse_iv:nwN #1#2; #3 + { + \__str_format_if_digit:NTF #3 + { \__str_format_parse_iv:nwN {#1} #2 #3 ; } + { \__str_format_parse_v:nN { #1 {#2} } #3 } + } +\cs_new:Npn \__str_format_parse_v:nN #1#2 + { + \token_if_eq_charcode:NNTF . #2 + { \__str_format_parse_vi:nwN {#1} 0 ; } + { \__str_format_parse_vii:nN { #1 { } } #2 } + } +\cs_new:Npn \__str_format_parse_vi:nwN #1#2; #3 + { + \__str_format_if_digit:NTF #3 + { \__str_format_parse_vi:nwN {#1} #2 #3 ; } + { \__str_format_parse_vii:nN { #1 {#2} } #3 } + } +\cs_new:Npn \__str_format_parse_vii:nN #1#2 + { + \token_if_eq_meaning:NNTF \s__stop #2 + { \__str_format_parse_end:nwn { #1 ? } #2 } + { \__str_format_parse_end:nwn { #1 #2 } } + } +\cs_new:Npn \__str_format_parse_end:nwn #1 #2 \s__stop \s__stop #3 + { + \tl_if_empty:nF {#2} + { \__msg_kernel_expandable_error:nnn { str } { invalid-format } {#3} } + #1 + } +\cs_new:cpn { __str_format_align_<:nnnN } #1#2#3#4 + { + \use:nf { #2 #1 } + { + \prg_replicate:nn + { \int_max:nn { #3 - \__str_count_unsafe:n { #2 #1 } } { 0 } } + {#4} + } + } +\cs_new:cpn { __str_format_align_>:nnnN } #1#2#3#4 + { + \prg_replicate:nn + { \int_max:nn { #3 - \__str_count_unsafe:n { #2 #1 } } { 0 } } + {#4} + #2 #1 + } +\cs_new:cpn { __str_format_align_^:nnnN } #1#2#3#4 + { + \use:fnf + { + \prg_replicate:nn + { + \int_max:nn \c_zero + { #3 - \__str_count_unsafe:n { #2 #1 } - \c_one } + / \c_two + } + {#4} + } + { #2 #1 } + { + \prg_replicate:nn + { + \int_max:nn \c_zero + { #3 - \__str_count_unsafe:n { #2 #1 } } + / \c_two + } + {#4} + } + } +\cs_new:cpn { __str_format_align_=:nnnN } #1#2#3#4 + { + \use:nf {#2} + { + \prg_replicate:nn + { \int_max:nn { #3 - \__str_count_unsafe:n { #2 #1 } } { 0 } } + {#4} + } + #1 + } +\cs_new_nopar:Npn \tl_format:Nn { \exp_args:No \tl_format:nn } +\cs_generate_variant:Nn \tl_format:Nn { c } +\cs_new:Npn \tl_format:nn #1#2 + { + \tl_to_str:f + { + \exp_last_unbraced:Nf \__str_format_tl:NNNnnNn + { \__str_format_parse:n {#2} } + {#1} + } + } +\cs_new:Npn \__str_format_tl:NNNnnNn #1#2#3#4#5#6 + { + \token_if_eq_charcode:NNTF #2 = + { + \__msg_kernel_expandable_error:nnnn + { str } { invalid-align-format } {#2} {tl} + \__str_format_put:nw { #1 < } + } + { + \token_if_eq_charcode:NNTF #2 ? + { \__str_format_put:nw { #1 < } } + { \__str_format_put:nw { #1 #2 } } + } + \token_if_eq_charcode:NNF #3 ? + { + \__msg_kernel_expandable_error:nnnn + { str } { invalid-sign-format } {#3} {tl} + } + \__str_format_put:nw { {#4} } + \tl_if_empty:nTF {#5} + { \__str_format_put:nw { \use:n { } } } + { \__str_format_put:nw { \__str_substr_unsafe:nnn { {1} {#5} } } } + \token_if_eq_charcode:NNF #6 s + { + \token_if_eq_charcode:NNF #6 ? + { + \__msg_kernel_expandable_error:nnnn + { str } { invalid-style-format } {#6} {tl} + } + } + \__str_format_tl_s:NNnnNNn + \s__stop + } +\cs_new:Npn \__str_format_tl_s:NNnnNNn #1#2#3#4#5#6#7 + { + \exp_args:Nc \exp_args:Nf + { __str_format_align_#6:nnnN } + { \exp_args:Nf #2 { \__str_to_other:n {#7} } #3 } + { } + {#4} #5 + } +\cs_new:Npn \seq_format:Nn #1#2 + { + \tl_to_str:f + { \__str_format_seq:of {#1} { \__str_format_parse:n {#2} } } + } +\cs_generate_variant:Nn \seq_format:Nn { c } +\cs_new:Npn \__str_format_seq:nn #1#2 + { + \__str_format_seq_loop:nnNn { } {#2} + #1 + { ? \__str_format_seq_end:w } { } + } +\cs_generate_variant:Nn \__str_format_seq:nn { of } +\cs_new:Npn \__str_format_seq_loop:nnNn #1#2#3#4 + { + \use_none:n #3 + \exp_args:Nf \__str_format_seq_loop:nnNn + { \use:nf {#1} { \__str_format_tl:NNNnnNn #2 {#4} } } + {#2} + } +\cs_new:Npn \__str_format_seq_end:w #1#2#3#4 { \use_ii:nnn #3 } +\cs_new:Npn \int_format:nn #1 + { \exp_args:Nf \__str_format_int:nn { \int_eval:n {#1} } } +\cs_new:Npn \__str_format_int:nn #1#2 + { + \tl_to_str:f + { + \exp_last_unbraced:Nf \__str_format_int:NNNnnNn + { \__str_format_parse:n {#2} } + {#1} + } + } +\cs_new:Npn \__str_format_int:NNNnnNn #1#2#3#4#5#6#7 + { + \token_if_eq_charcode:NNTF #2 ? + { \__str_format_put:nw { #1 > } } + { \__str_format_put:nw { #1 #2 } } + \int_compare:nNnTF {#7} < \c_zero + { \__str_format_put:nw { - } } + { + \str_case:nnn {#3} + { + { ~ } { \__str_format_put:ow { \c_catcode_other_space_tl } } + { + } { \__str_format_put:nw { + } } + } + { \__str_format_put:nw { { } } } + } + \__str_format_put:nw { {#4} } + \tl_if_empty:nF {#5} + { + \__msg_kernel_expandable_error:nnnn + { str } { invalid-precision-format } {#5} {int} + } + \str_case:nnn {#6} + { + { ? } { \__str_format_int:NwnnNNn \use:n } + { d } { \__str_format_int:NwnnNNn \use:n } + { b } { \__str_format_int:NwnnNNn \int_to_binary:n } + { o } { \__str_format_int:NwnnNNn \int_to_octal:n } + { X } { \__str_format_int:NwnnNNn \int_to_hexadecimal:n } + } + { + \__msg_kernel_expandable_error:nnnn + { str } { invalid-style-format } {#6} { int } + \__str_format_int:NwnnNNn \use:n + } + \s__stop {#7} + } +\cs_new:Npn \__str_format_int:NwnnNNn #1#2 \s__stop #3#4#5#6#7 + { + \exp_args:Nc \exp_args:Nf + { __str_format_align_#6:nnnN } + { #1 { \int_abs:n {#7} } } + {#4} + {#3} #5 + } +\cs_new:Npn \fp_format:nn #1 + { \exp_args:Nf \__str_format_fp:nn { \__fp_parse:n {#1} } } +\cs_new:Npn \__str_format_fp:nn #1#2 + { + \tl_to_str:f + { + \exp_last_unbraced:Nf \__str_format_fp:NNNnnNw + { \__str_format_parse:n {#2} } + #1 + } + } +\cs_new:Npn \__str_format_fp:NNNnnNw + #1#2#3#4#5#6 \s__fp \__fp_chk:w #7 #8 + { + \token_if_eq_charcode:NNTF #2 ? + { \__str_format_put:nw { #1 > } } + { \__str_format_put:nw { #1 #2 } } + \token_if_eq_meaning:NNTF 2 #8 + { \__str_format_put:nw { - } } + { + \str_case:nnn {#3} + { + { ~ } { \__str_format_put:ow { \c_catcode_other_space_tl } } + { + } { \__str_format_put:nw { + } } + } + { \__str_format_put:nw { { } } } + } + \__str_format_put:nw { {#4} } + \tl_if_empty:nTF {#5} + { \__str_format_put:nw { { 6} } } + { \__str_format_put:nw { {#5} } } + \str_case:nnn {#6} + { + { e } { \__str_format_fp:wnnnNNw \__str_format_fp_e:wn } + { f } { \__str_format_fp:wnnnNNw \__str_format_fp_f:wn } + { g } { \__str_format_fp:wnnnNNw \__str_format_fp_g:wn } + { ? } { \__str_format_fp:wnnnNNw \__str_format_fp_g:wn } + } + { + \__msg_kernel_expandable_error:nnnn + { str } { invalid-style-format } {#6} { fp } + \__str_format_fp:wnnnNNw \__str_format_fp_g:wn + } + \s__stop + \s__fp \__fp_chk:w #7 #8 + } +\cs_new:Npn \__str_format_fp:wnnnNNw + #1 \s__stop #2 #3 #4 #5#6 #7 ; + { + \exp_args:Nc \exp_args:Nf + { __str_format_align_#6:nnnN } + { #1 #7 ; {#2} } + {#4} + {#3} #5 + } +\cs_new:Npn \__str_format_fp_round:wn #1 ; #2 + { \__fp_parse:n { round ( #1; , #2 - \__fp_exponent:w #1; ) } } +\group_begin: +\char_set_catcode_other:N E +\tl_to_lowercase:n + { + \group_end: + \cs_new:Npn \__str_format_fp_e:wn \s__fp \__fp_chk:w #1#2#3 ; #4 + { + \int_case:nnn {#1} + { + {0} { \use:nf { 0 . } { \prg_replicate:nn {#4} { 0 } } e 0 } + {2} { inf } + {3} { nan } + } + { + \exp_last_unbraced:Nf \__str_format_fp_e_ii:wn + \__str_format_fp_round:wn \s__fp \__fp_chk:w #1#2#3 ; { #4 + 1 } + {#4} + } + } + \cs_new:Npn \__str_format_fp_e_ii:wn + \s__fp \__fp_chk:w #1#2 #3 #4#5#6#7 ; #8 + { + \__str_format_put:fw { \int_eval:n { #3 - 1 } } + \__str_format_put:nw { e } + \int_compare:nNnTF {#8} > \c_sixteen + { + \__str_format_put:fw { \prg_replicate:nn { #8 - \c_fifteen } {0} } + \__str_format_put:fw { \use_none:n #4#5#6#7 } + } + { + \__str_format_put:fw + { \str_substr:nnn { #4#5#6#7 0 } { 2 } { #8 + 1 } } + } + \__str_format_put:fw { \use_i:nnnn #4 . } + \use_none:n \s__stop + } + } +\cs_new:Npn \__str_format_fp_f:wn \s__fp \__fp_chk:w #1#2#3 ; #4 + { + \int_case:nnn {#1} + { + {0} { \use:nf { 0 . } { \prg_replicate:nn {#4} { 0 } } } + {2} { inf } + {3} { nan } + } + { + \exp_last_unbraced:Nf \__str_format_fp_f_ii:wwwn + \fp_to_decimal:n + { abs ( round ( \s__fp \__fp_chk:w #1#2#3 ; , #4 ) ) } + . . ; + {#4} + } + } +\cs_new:Npn \__str_format_fp_f_ii:wwwn #1 . #2 . #3 ; #4 + { + \use:nf + { #1 . #2 } + { \prg_replicate:nn { #4 - \__str_count_unsafe:n {#2} } {0} } + } +\cs_new:Npn \__str_format_fp_g:wn \s__fp \__fp_chk:w #1#2 ; #3 + { + \int_case:nnn {#1} + { + {0} { 0 } + {2} { inf } + {3} { nan } + } + { + \exp_last_unbraced:Nf \__str_format_fp_g_ii:wn + \__str_format_fp_round:wn \s__fp \__fp_chk:w #1#2 ; + { \int_max:nn {1} {#3} } + { \int_max:nn {1} {#3} } + } + } +\cs_new:Npn \__str_format_fp_g_ii:wn #1; #2 + { + \int_compare:nNnTF { \__fp_exponent:w #1; } < { -3 } + { \fp_to_scientific:n } + { + \int_compare:nNnTF { \__fp_exponent:w #1; } > {#2} + { \fp_to_scientific:n } + { \fp_to_decimal:n } + } + { \__fp_abs_o:w #1; \prg_do_nothing: } + } +\__msg_kernel_new:nnn { str } { invalid-format } + { Invalid~format~'#1'. } +\__msg_kernel_new:nnn { str } { invalid-align-format } + { Invalid~alignment~'#1'~for~type~'#2'. } +\__msg_kernel_new:nnn { str } { invalid-sign-format } + { Invalid~sign~'#1'~for~type~'#2'. } +\__msg_kernel_new:nnn { str } { invalid-precision-format } + { Invalid~precision~'#1'~for~type~'#2'. } +\__msg_kernel_new:nnn { str } { invalid-style-format } + { Invalid~style~'#1'~for~type~'#2'. } +%% +%% +%% End of file `l3str-format.sty'. diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str.sty index 3ad97283e3b..05cd375a84d 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str.sty @@ -46,7 +46,7 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{expl3} -\GetIdInfo$Id: l3str.dtx 3940 2012-07-09 00:41:44Z bruno $ +\GetIdInfo$Id: l3str.dtx 4119 2012-08-16 22:35:59Z bruno $ {L3 Experimental strings} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -391,14 +391,13 @@ \prg_new_conditional:Npnn \__str_if_contains_char:NN #1#2 { T , TF } { \exp_after:wN \__str_if_contains_char_aux:NN \exp_after:wN #2 - \etex_detokenize:D \exp_after:wN {#1} { \__prg_break:n { ? \fi: } } + #1 { \__prg_break:n { ? \fi: } } \__prg_break_point: \prg_return_false: } \prg_new_conditional:Npnn \__str_if_contains_char:nN #1#2 { TF } { - \exp_after:wN \__str_if_contains_char_aux:NN \exp_after:wN #2 - \tl_to_str:n {#1} { \__prg_break:n { ? \fi: } } + \__str_if_contains_char_aux:NN #2 #1 { \__prg_break:n { ? \fi: } } \__prg_break_point: \prg_return_false: } diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-analysis.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-analysis.sty index 8b90db9c751..0dfd6401fae 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-analysis.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-analysis.sty @@ -361,7 +361,7 @@ \cs_new_protected:Npn \tl_show_analysis:N #1 { \exp_args:No \__tl_analysis:n {#1} - \__msg_show_variable:Nnn #1 + \__msg_show_variable:Nnx #1 { tl-analysis } { \exp_after:wN \__tl_analysis_show_loop:wNw \g__tl_analysis_result_tl diff --git a/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty b/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty index ded7ca681b1..30c72196f57 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty @@ -48,7 +48,7 @@ %% ----------------------------------------------------------------------- %% \RequirePackage{xparse} -\GetIdInfo$Id: l3galley.dtx 4009 2012-07-20 18:18:29Z joseph $ +\GetIdInfo$Id: l3galley.dtx 4155 2012-08-29 10:29:58Z joseph $ {L3 Experimental galley code} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} diff --git a/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty b/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty index fa9a8ef1730..5e6a07f9f50 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty @@ -48,7 +48,7 @@ %% ----------------------------------------------------------------------- %% \RequirePackage{l3bootstrap} -\GetIdInfo$Id: xgalley.dtx 3991 2012-07-16 19:00:35Z joseph $ +\GetIdInfo$Id: xgalley.dtx 4155 2012-08-29 10:29:58Z joseph $ {L3 Experimental galley} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -298,14 +298,6 @@ end-skip = 15 pt plus 1 fil , indent-width = 0 pt } -\DeclareInstance { justification } { centered } { std } - { - end-skip = 0 pt , - fixed-word-spacing = true , - indent-width = 0 pt , - left-skip = 0 pt plus 1 em , - right-skip = 0 pt plus 1 em - } \DeclareInstance { justification } { ragged-left } { std } { end-skip = 0 pt , @@ -322,7 +314,7 @@ left-skip = 0 pt , right-skip = 0 pt plus 2 em } -\DeclareInstance { justification } { centering } { std } +\DeclareInstance { justification } { center } { std } { end-skip = 0 pt , fixed-word-spacing = true , |