summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/l3experimental
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-09-02 21:38:04 +0000
committerKarl Berry <karl@freefriends.org>2020-09-02 21:38:04 +0000
commitc4ee329d9de36c54e6715838a7617a385228e519 (patch)
tree425aed8cb12860211598c572beea774479d8b351 /Master/texmf-dist/tex/latex/l3experimental
parentd59eb254bbc4402d6e35a1e112e652643512faa3 (diff)
l3 (2sep20)
git-svn-id: svn://tug.org/texlive/trunk@56245 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3experimental')
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3benchmark/l3benchmark.sty2
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3color/l3color.sty161
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty2
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3graphics/l3graphics.sty2
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3pdf/l3pdf.sty2
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty2
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3sys-shell/l3sys-shell.sty2
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/xcoffins/xcoffins.sty2
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty2
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty2
10 files changed, 103 insertions, 76 deletions
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3benchmark/l3benchmark.sty b/Master/texmf-dist/tex/latex/l3experimental/l3benchmark/l3benchmark.sty
index bcdecda9b78..32e0160e734 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3benchmark/l3benchmark.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3benchmark/l3benchmark.sty
@@ -20,7 +20,7 @@
%%
%% File: l3benchmark.dtx
\RequirePackage{expl3}
-\ProvidesExplPackage{l3benchmark}{2020-08-07}{}
+\ProvidesExplPackage{l3benchmark}{2020-09-01}{}
{L3 Experimental benchmarking}
\sys_if_engine_luatex:TF
{
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3color/l3color.sty b/Master/texmf-dist/tex/latex/l3experimental/l3color/l3color.sty
index e57c0db800d..715d0ca1d16 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3color/l3color.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3color/l3color.sty
@@ -20,7 +20,7 @@
%%
%% File: l3color.dtx
\RequirePackage{expl3}
-\ProvidesExplPackage{l3color}{2020-08-07}{}
+\ProvidesExplPackage{l3color}{2020-09-01}{}
{L3 Experimental color support}
\tl_new:N \l__color_internal_tl
\scan_new:N \s__color_mark
@@ -269,17 +269,14 @@
\__color_parse_number:n {#4}
}
}
-\cs_new:Npn \__color_parse_model_spot:w #1 , #2 \s__color_stop
- {
- { spot }
- { \__color_parse_spot_aux:w #1 ! 100 ! \s__color_stop }
- }
-\cs_new:Npn \__color_parse_spot_aux:w #1 ! #2 ! #3 \s__color_stop
- { #1 ~ \fp_eval:n { #2 / 100 } }
\cs_new:Npn \__color_parse_number:n #1
{ \__color_parse_number:w #1 . 0 . \s__color_stop }
\cs_new:Npn \__color_parse_number:w #1 . #2 . #3 \s__color_stop
{ \tl_if_blank:nTF {#1} { 0 } {#1} . #2 }
+\cs_new:Npn \__color_parse_model_Gray:w #1 , #2 \s__color_stop
+ { { gray } { \fp_eval:n { #1 / 15 } } }
+\cs_new:Npn \__color_parse_model_hsb:w #1 , #2 , #3 , #4 \s__color_stop
+ { \__color_parse_model_hsb:nnn {#1} {#2} {#3} }
\cs_new:Npn \__color_parse_model_Hsb:w #1 , #2 , #3 , #4 \s__color_stop
{
\exp_args:Ne \__color_parse_model_hsb:nnn { \fp_eval:n { #1 / 360 } }
@@ -323,9 +320,9 @@
\cs_new:Npn \__color_parse_model_HSB:w #1 , #2 , #3 , #4 \s__color_stop
{
\exp_args:Neee \__color_parse_model_hsb:nnn
- { \fp_eval:n {#1 / 360} }
- { \fp_eval:n {#2 / 255} }
- { \fp_eval:n {#3 / 255} }
+ { \fp_eval:n {#1 / 240} }
+ { \fp_eval:n {#2 / 240} }
+ { \fp_eval:n {#3 / 240} }
}
\cs_new:Npn \__color_parse_model_HTML:w #1 , #2 \s__color_stop
{ \__color_parse_model_HTML_aux:w #1 0 0 0 0 0 0 \s__color_stop }
@@ -347,6 +344,71 @@
\fp_eval:n { round(#3 / 255,5) }
}
}
+\cs_new:Npn \__color_parse_model_wave:w #1 , #2 \s__color_stop
+ {
+ { rgb }
+ {
+ \fp_compare:nNnTF {#1} < { 420 }
+ { \__color_parse_model_wave_auxi:nn {#1} { 0.3 + 0.7 * (#1 - 380) / 40 }
+ }
+ {
+ \fp_compare:nNnTF {#1} > { 700 }
+ { \__color_parse_model_wave_auxi:nn {#1} { 0.3 + 0.7 * (#1 - 780) / -80 } }
+ { \__color_parse_model_wave_auxi:nn {#1} { 1 } }
+ }
+ }
+ }
+\cs_new:Npn \__color_parse_model_wave_auxi:nn #1#2
+ {
+ \fp_compare:nNnTF {#1} < { 440 }
+ {
+ \__color_parse_model_wave_auxii:nn
+ { 4 + \__color_parse_model_wave_rho:n { (#1 - 440) / -60 } }
+ {#2}
+ }
+ {
+ \fp_compare:nNnTF {#1} < { 490 }
+ {
+ \__color_parse_model_wave_auxii:nn
+ { 4 - \__color_parse_model_wave_rho:n { (#1 - 440) / 50 } }
+ {#2}
+ }
+ {
+ \fp_compare:nNnTF {#1} < { 510 }
+ {
+ \__color_parse_model_wave_auxii:nn
+ { 2 + \__color_parse_model_wave_rho:n { (#1 - 510) / -20 } }
+ {#2}
+ }
+ {
+ \fp_compare:nNnTF {#1} < { 580 }
+ {
+ \__color_parse_model_wave_auxii:nn
+ { 2 - \__color_parse_model_wave_rho:n { (#1 - 510) / 70 } }
+ {#2}
+ }
+ {
+ \fp_compare:nNnTF {#1} < { 645 }
+ {
+ \__color_parse_model_wave_auxii:nn
+ { \__color_parse_model_wave_rho:n { (#1 - 645) / -65 } }
+ {#2}
+ }
+ { \__color_parse_model_wave_auxii:nn { 0 } {#2} }
+ }
+ }
+ }
+ }
+ }
+\cs_new:Npn \__color_parse_model_wave_auxii:nn #1#2
+ {
+ \exp_args:Neee \__color_parse_model_hsb_aux:nnn
+ { \fp_eval:n {#1} }
+ { 1 }
+ { \__color_parse_model_wave_rho:n {#2} }
+ }
+\cs_new:Npn \__color_parse_model_wave_rho:n #1
+ { \fp_eval:n { min(1, max(0,#1) ) } }
\tl_new:N \l_color_fixed_model_tl
\cs_new_protected:Npn \__color_check_model:N #1
{
@@ -493,15 +555,28 @@
}
}
}
-\cs_new_protected:Npn \color_set:nnn #1#2#3
+\cs_new_protected:Npx \color_set:nnn #1#2#3
{
- \str_if_eq:nnF {#1} { . }
+ \exp_not:N \str_if_eq:nnF {#1} { . }
{
\tl_clear_new:c { l__color_named_ #1 _tl }
\prop_clear_new:c { l__color_named_ #1 _prop }
- \__color_set_loop:nw {#1} #2 / / \s__color_mark #3 / / \s__color_stop
+ \exp_not:N \__color_set_colon:nnw {#1} {#3}
+ #2 \c_colon_str \c_colon_str \exp_not:N \s__color_stop
}
}
+\use:x
+ {
+ \cs_new_protected:Npn \exp_not:N \__color_set_colon:nnw
+ ##1##2 ##3 \c_colon_str ##4 \c_colon_str
+ ##5 \exp_not:N \s__color_stop
+ }
+ {
+ \tl_if_blank:nTF {#4}
+ { \__color_set_loop:nw {#1} #3 }
+ { \__color_set_loop:nw {#1} #4 }
+ / / \s__color_mark #2 / / \s__color_stop
+ }
\cs_new_protected:Npn \__color_set_loop:nw
#1#2 / #3 \s__color_mark #4 / #5 \s__color_stop
{
@@ -738,7 +813,7 @@
}
\__color_model_convert:nnn {#1} { cmyk } { rgb }
\__color_model_convert:nnn {#1} { cmyk } { gray }
- \__color_model_separation_init:nnnnn {#2} { /DeviceCMYK } { }
+ \__color_backend_separation_init:nnnnn {#2} { /DeviceCMYK } { }
{ 0 ~ 0 ~ 0 ~ 0 } { #3 ~ #4 ~ #5 ~ #6 }
}
\cs_new_protected:Npn \__color_model_separation_rgb:nnnnnn #1#2#3#4#5#6
@@ -751,7 +826,7 @@
}
\__color_model_convert:nnn {#1} { rgb } { cmyk }
\__color_model_convert:nnn {#1} { rgb } { gray }
- \__color_model_separation_init:nnnnn {#2} { /DeviceRGB } { }
+ \__color_backend_separation_init:nnnnn {#2} { /DeviceRGB } { }
{ 0 ~ 0 ~ 0 } { #3 ~ #4 ~ #5 }
}
\cs_new_protected:Npn \__color_model_separation_gray:nnnnnn #1#2#3#4#5#6
@@ -771,7 +846,7 @@
\fp_eval:n {##1 * #3} ~
\fp_eval:n {##1 * #3}
}
- \__color_model_separation_init:nnnnn {#2} { /DeviceGray } { } { 0 } {#3}
+ \__color_backend_separation_init:nnnnn {#2} { /DeviceGray } { } { 0 } {#3}
}
\cs_new_protected:Npn \__color_model_convert:nnn #1#2#3
{
@@ -799,8 +874,8 @@
{
\tl_if_exist:cTF { c__color_model_whitepoint_cielab_ #1 _tl }
{
- \__color_model_separation_init_cielab:n {#1}
- \__color_model_separation_init_cielab:nnnnn {#2} {#3} {#4} {#5} {#6}
+ \__color_backend_separation_init_cielab:n {#1}
+ \__color_backend_separation_init_cielab:nnnnn {#2} {#3} {#4} {#5} {#6}
\cs_new:cpn { __color_convert_ #2 _cmyk:w } ##1 ~ ##2 \s__color_stop
{ 0 ~ 0 ~ 0 ~ 1 }
\cs_new:cpn { __color_convert_ #2 _rgb:w } ##1 ~ ##2 \s__color_stop
@@ -813,54 +888,6 @@
{ unknown-cielab-illuminant } {#1}
}
}
-\cs_new_protected:Npn \__color_model_separation_init:nnnnn #1#2#3#4#5
- {
- \pdf_object_now:nx { array }
- {
- /Separation
- / \str_convert_pdfname:n {#1} ~ #2 ~
- <<
- /FunctionType ~ 2
- /Domain ~ [0 ~ 1]
- \tl_if_blank:nF {#3} { /Range ~ [#3] }
- /C0 ~ [#4] ~
- /C1 ~ [#5] /N ~ 1
- >>
- }
- \use:x
- {
- \pdfcoredict_gput:nnn
- { Page / Resources / ColorSpace }
- { color \int_use:N \g__color_separation_int }
- { \pdf_object_last: }
- }
- }
-\cs_if_exist:NF \pdf_object_now:nn
- { \cs_gset_protected:Npn \__color_model_separation_init:nnnnn #1#2#3#4#5 { } }
-\cs_new_protected:Npn \__color_model_separation_init_cielab:n #1
- {
- \pdf_object_new:nn { __color_illuminant_cielab_ #1 } { array }
- \pdf_object_write:nx { __color_illuminant_cielab_ #1 }
- {
- /Lab ~
- <<
- /WhitePoint ~
- [ \tl_use:c { c__color_model_whitepoint_cielab_ #1 _tl } ]
- /Range ~ [ \c__color_model_range_lab_tl ]
- >>
- }
- }
-\cs_if_exist:NF \pdf_object_new:nn
- { \cs_gset_protected:Npn \__color_model_separation_init_cielab:n #1 { } }
-\cs_new_protected:Npn \__color_model_separation_init_cielab:nnnnn #1#2#3#4#5
- {
- \__color_model_separation_init:nnnnn
- {#2}
- { \pdf_object_ref:n { __color_illuminant_cielab_ #1 } }
- { \c__color_model_range_lab_tl }
- { 100 ~ 0 ~ 0 }
- { #3 ~ #4 ~ #5 }
- }
\cs_new_protected:Npn \color_show:n #1
{
\msg_show:nnxxxx { LaTeX / color } { show }
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty b/Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty
index 442ef0d914d..3df21b0ac45 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty
@@ -28,7 +28,7 @@
%%
%% File: l3draw.dtx
\RequirePackage{expl3}
-\ProvidesExplPackage{l3draw}{2020-08-07}{}
+\ProvidesExplPackage{l3draw}{2020-09-01}{}
{L3 Experimental core drawing support}
\RequirePackage { l3color }
\scan_new:N \s__draw_mark
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3graphics/l3graphics.sty b/Master/texmf-dist/tex/latex/l3experimental/l3graphics/l3graphics.sty
index ce0665a29ce..e0aab473e3a 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3graphics/l3graphics.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3graphics/l3graphics.sty
@@ -20,7 +20,7 @@
%%
%% File: l3graphics.dtx
\RequirePackage{expl3}
-\ProvidesExplPackage{l3graphics}{2020-08-07}{}
+\ProvidesExplPackage{l3graphics}{2020-09-01}{}
{L3 Experimental graphics inclusion support}
\ior_new:N \l__graphics_tmp_ior
\tl_new:N \l__graphics_tmp_tl
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3pdf/l3pdf.sty b/Master/texmf-dist/tex/latex/l3experimental/l3pdf/l3pdf.sty
index bb5772c97e8..7f9640f2dfe 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3pdf/l3pdf.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3pdf/l3pdf.sty
@@ -20,7 +20,7 @@
%%
%% File: l3pdf.dtx
\RequirePackage{expl3}
-\ProvidesExplPackage{l3pdf}{2020-08-07}{}
+\ProvidesExplPackage{l3pdf}{2020-09-01}{}
{L3 Experimental core PDF support}
\scan_new:N \s__pdf_stop
\bool_new:N \g__pdf_init_bool
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty
index bd5c500e1aa..50a8da96d89 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty
@@ -20,7 +20,7 @@
%%
%% File: l3str-format.dtx
\RequirePackage{expl3}
-\ProvidesExplPackage{l3str-format}{2020-08-07}{}
+\ProvidesExplPackage{l3str-format}{2020-09-01}{}
{L3 Experimental string formatting}
\cs_generate_variant:Nn \use:nn { nf }
\cs_generate_variant:Nn \use:nnn { fnf }
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3sys-shell/l3sys-shell.sty b/Master/texmf-dist/tex/latex/l3experimental/l3sys-shell/l3sys-shell.sty
index 419d1734ce1..733cedf6edd 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3sys-shell/l3sys-shell.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3sys-shell/l3sys-shell.sty
@@ -20,7 +20,7 @@
%%
%% File: l3sys-shell.dtx
\RequirePackage{expl3}
-\ProvidesExplPackage{l3sys-shell}{2020-08-07}{}
+\ProvidesExplPackage{l3sys-shell}{2020-09-01}{}
{L3 Experimental system shell functions}
\scan_new:N \s__sys_stop
\quark_new:N \q__sys_nil
diff --git a/Master/texmf-dist/tex/latex/l3experimental/xcoffins/xcoffins.sty b/Master/texmf-dist/tex/latex/l3experimental/xcoffins/xcoffins.sty
index 435b6ddf396..b49642fc2e6 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/xcoffins/xcoffins.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/xcoffins/xcoffins.sty
@@ -20,7 +20,7 @@
%%
%% File: xcoffins.dtx
\RequirePackage{xparse}
-\ProvidesExplPackage{xcoffins}{2020-08-07}{}
+\ProvidesExplPackage{xcoffins}{2020-09-01}{}
{L3 Experimental design level coffins}
\keys_define:nn { coffin }
{
diff --git a/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty b/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty
index 3377bcd000d..5079bb06a79 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty
@@ -32,7 +32,7 @@
}%
\endinput
}
-\ProvidesExplPackage{l3galley}{2020-08-07}{}
+\ProvidesExplPackage{l3galley}{2020-09-01}{}
{L3 Experimental galley code}
\int_new:N \l__galley_tmp_int
\seq_new:N \g__galley_tmpa_seq
diff --git a/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty b/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty
index e4cd26aaa37..90536a80800 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty
@@ -20,7 +20,7 @@
%%
%% File: xgalley.dtx
\RequirePackage{xparse}
-\ProvidesExplPackage{xgalley}{2020-08-07}{}
+\ProvidesExplPackage{xgalley}{2020-09-01}{}
{L3 Experimental galley}
\RequirePackage{xparse,xtemplate,l3galley}
\clist_new:N \l__galley_tmpa_clist