summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/l3experimental/l3color/l3color.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3experimental/l3color/l3color.sty')
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3color/l3color.sty47
1 files changed, 23 insertions, 24 deletions
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3color/l3color.sty b/Master/texmf-dist/tex/latex/l3experimental/l3color/l3color.sty
index 715d0ca1d16..0d6d0ca16c6 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-09-01}{}
+\ProvidesExplPackage{l3color}{2020-09-11}{}
{L3 Experimental color support}
\tl_new:N \l__color_internal_tl
\scan_new:N \s__color_mark
@@ -699,14 +699,14 @@
{ \tl_set:Nx #1 {#2} }
\prop_new:N \l__color_internal_prop
\int_new:N \g__color_separation_int
-\tl_const:Nn \c__color_model_whitepoint_cielab_a_tl { 1.0985 ~ 1 ~ 0.3558 }
-\tl_const:Nn \c__color_model_whitepoint_cielab_b_tl { 0.9807~ 1 ~ 1.1822 }
-\tl_const:Nn \c__color_model_whitepoint_cielab_e_tl { 1 ~ 1 ~ 1 }
-\tl_const:cn { c__color_model_whitepoint_cielab_d50_tl } { 0.9642 ~, 1 ~ 0.8251 }
-\tl_const:cn { c__color_model_whitepoint_cielab_d55_tl } { 0.9568 ~ 1 ~ 0.9214 }
-\tl_const:cn { c__color_model_whitepoint_cielab_d65_tl } { 0.9504 ~ 1 ~ 1.0888 }
-\tl_const:cn { c__color_model_whitepoint_cielab_d75_tl } { 0.9497 ~ 1 ~ 1.2261 }
-\tl_const:Nn \c__color_model_range_cielab_tl { -128 ~ 127 ~ -128 ~ 127 }
+\tl_const:Nn \c__color_model_whitepoint_CIELAB_a_tl { 1.0985 ~ 1 ~ 0.3558 }
+\tl_const:Nn \c__color_model_whitepoint_CIELAB_b_tl { 0.9807 ~ 1 ~ 1.1822 }
+\tl_const:Nn \c__color_model_whitepoint_CIELAB_e_tl { 1 ~ 1 ~ 1 }
+\tl_const:cn { c__color_model_whitepoint_CIELAB_d50_tl } { 0.9642 ~ 1 ~ 0.8251 }
+\tl_const:cn { c__color_model_whitepoint_CIELAB_d55_tl } { 0.9568 ~ 1 ~ 0.9214 }
+\tl_const:cn { c__color_model_whitepoint_CIELAB_d65_tl } { 0.9504 ~ 1 ~ 1.0888 }
+\tl_const:cn { c__color_model_whitepoint_CIELAB_d75_tl } { 0.9497 ~ 1 ~ 1.2261 }
+\tl_const:Nn \c__color_model_range_CIELAB_tl { 0 ~ 100 ~ -128 ~ 127 ~ -128 ~ 127 }
\cs_new_protected:Npn \color_model_new:nnn #1#2#3
{
\exp_args:Nee \__color_model_new:nnn
@@ -858,24 +858,23 @@
\c_space_tl \exp_not:N \s__color_stop
}
}
-\cs_new_protected:Npn \__color_model_separation_cielab:nnnnnn #1#2#3#4#5#6
+\cs_new_protected:Npn \__color_model_separation_CIELAB:nnnnnn #1#2#3#4#5#6
{
\prop_get:NnNF \l__color_internal_prop { illuminant }
\l__color_internal_tl
{
\__kernel_msg_error:nnn { color }
- { cielab-requires-illuminant } {#1}
+ { CIELAB-requires-illuminant } {#1}
\tl_set:Nn \l__color_internal_tl { d50 }
}
- \exp_args:NV \__color_model_separation_cielab:nnnnnnn
+ \exp_args:NV \__color_model_separation_CIELAB:nnnnnnn
\l__color_internal_tl {#1} {#2} {#3} {#4} {#5} {#6}
}
-\cs_new_protected:Npn \__color_model_separation_cielab:nnnnnnn #1#2#3#4#5#6#7
+\cs_new_protected:Npn \__color_model_separation_CIELAB:nnnnnnn #1#2#3#4#5#6#7
{
- \tl_if_exist:cTF { c__color_model_whitepoint_cielab_ #1 _tl }
+ \tl_if_exist:cTF { c__color_model_whitepoint_CIELAB_ #1 _tl }
{
- \__color_backend_separation_init_cielab:n {#1}
- \__color_backend_separation_init_cielab:nnnnn {#2} {#3} {#4} {#5} {#6}
+ \__color_backend_separation_init_CIELAB:nnn {#1} {#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
@@ -885,7 +884,7 @@
}
{
\__kernel_msg_error:nnn { color }
- { unknown-cielab-illuminant } {#1}
+ { unknown-CIELAB-illuminant } {#1}
}
}
\cs_new_protected:Npn \color_show:n #1
@@ -908,12 +907,12 @@
{
\msg_show_item_unbraced:nn { model } {#1}
}
-\__kernel_msg_new:nnnn { color } { cielab-requires-illuminant }
+\__kernel_msg_new:nnnn { color } { CIELAB-requires-illuminant }
{ CIELAB~color~space~'#1'~require~an~illuminant. }
{
LaTeX~has~been~asked~to~create~a~separation~color~space~using~
CIELAB~specifications,~but~no~\\ \\
- \iow_indent:n { illuminant = <basis> }
+ \iow_indent:n { illuminant~=~<basis> }
\\ \\
key~was~given~with~the~correct~information.~LaTeX~will~use~illuminant~
'd50'~for~recovery.
@@ -935,7 +934,7 @@
{
LaTeX~has~been~asked~to~create~a~separation~color~space,~
but~no~\\ \\
- \iow_indent:n { alternative-model = <model> }
+ \iow_indent:n { alternative-model~=~<model> }
\\ \\
key~was~given~with~the~correct~information.
}
@@ -944,7 +943,7 @@
{
LaTeX~has~been~asked~to~create~a~separation~color~space,~
but~no~\\ \\
- \iow_indent:n { alternative-values = <model> }
+ \iow_indent:n { alternative-values~=~<model> }
\\ \\
key~was~given~with~the~correct~information.
}
@@ -953,7 +952,7 @@
{
LaTeX~has~been~asked~to~create~a~separation~color~space,~
but~no~\\ \\
- \iow_indent:n { name = <formal~name> }
+ \iow_indent:n { name~=~<formal~name> }
\\ \\
key~was~given~with~the~correct~information.
}
@@ -968,7 +967,7 @@
{
LaTeX~has~been~asked~to~create~a~separation~color~space,~
but~the~model~given~as\\ \\
- \iow_indent:n { alternative-model = <model> }
+ \iow_indent:n { alternative-model~=~<model> }
\\ \\
is~unknown.
}
@@ -978,7 +977,7 @@
LaTeX~has~been~asked~to~export~a~color~in~format~'#1',~
but~this~has~never~been~defined.
}
-\__kernel_msg_new:nnnn { color } { unknown-cielab-illuminant }
+\__kernel_msg_new:nnnn { color } { unknown-CIELAB-illuminant }
{ Unknown~illuminant~model~'#1'. }
{
LaTeX~has~been~asked~to~use~create~a~color~space~using~CIELAB~