diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex')
16 files changed, 301 insertions, 164 deletions
diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def index 54c4b43301d..ecef294a754 100644 --- a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def +++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def @@ -25,7 +25,7 @@ %% %% File: l3backend-basics.dtx \ProvidesExplFile - {l3backend-dvipdfmx.def}{2020-09-01}{} + {l3backend-dvipdfmx.def}{2020-09-11}{} {L3 backend support: dvipdfmx} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { @@ -87,19 +87,26 @@ } \cs_new_protected:Npn \__color_backend_select_separation:nn #1#2 { \__color_backend_select:n { @#1 ~ [#2] } } +\cs_new_protected:Npn \__color_backend_select:n #1 + { + \__kernel_backend_literal:n { pdf: bc ~ #1 } + \group_insert_after:N \__color_backend_reset: + } \cs_new_protected:Npn \__color_backend_separation_init:nnnnn #1#2#3#4#5 { + \pdf_object_now:nx { dict } + { + /FunctionType ~ 2 + /Domain ~ [0 ~ 1] + \tl_if_blank:nF {#3} { /Range ~ [#3] } + /C0 ~ [#4] ~ + /C1 ~ [#5] /N ~ 1 + } \__color_backend_separation_init:n { /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 - >> + \pdf_object_last: } } \cs_if_exist:NF \pdf_object_now:nn @@ -108,36 +115,37 @@ { \__kernel_backend_literal:x { - pdf:obj ~ @ color \int_use:N \g__color_separation_int \c_space_tl + pdf:obj ~ @color \int_use:N \g__color_separation_int \c_space_tl [#1] } } -\cs_new_protected:Npn \__color_backend_separation_init_cielab:nnnnn #1#2#3#4#5 +\cs_new_protected:Npn \__color_backend_separation_init_CIELAB:nnn #1#2#3 { + \pdf_object_if_exist:nF { __color_illuminant_CIELAB_ #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_CIELAB_tl ] + >> + } + } \__color_backend_separation_init:nnnnn {#2} - { \pdf_object_ref:n { __color_illuminant_cielab_ #1 } } - { \c__color_model_range_lab_tl } + { \pdf_object_ref:n { __color_illuminant_CIELAB_ #1 } } + { \c__color_model_range_CIELAB_tl } { 100 ~ 0 ~ 0 } - { #3 ~ #4 ~ #5 } + {#3} } \cs_if_exist:NF \pdf_object_now:nn - { \cs_gset_protected:Npn \__color_backend_separation_init_cielab:nnnnn #1#2#3#4#5 { } } -\cs_new_protected:Npn \__color_backend_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_backend_separation_init_cielab:n #1 { } } + \cs_gset_protected:Npn \__color_backend_separation_init_CIELAB:nnn #1#2#3 + { } + } \cs_new_protected:Npn \__color_backend_fill_cmyk:n #1 { \__kernel_backend_literal_pdf:n { #1 ~ k } } \cs_new_protected:Npn \__color_backend_fill_gray:n #1 diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def index 7065ad419dd..84ff37e80c0 100644 --- a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def +++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def @@ -25,7 +25,7 @@ %% %% File: l3backend-basics.dtx \ProvidesExplFile - {l3backend-dvips.def}{2020-09-01}{} + {l3backend-dvips.def}{2020-09-11}{} {L3 backend support: dvips} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { @@ -111,40 +111,157 @@ \cs_new_protected:Npn \__color_backend_reset: { \__kernel_backend_literal:n { color~pop } } \cs_new_protected:Npn \__color_backend_select_separation:nn #1#2 - { \__color_backend_select:n { setspotcolor ~ #1 ~ #2 } } + { \__color_backend_select:n { separation ~ #1 ~ #2 } } \cs_new_protected:Npx \__color_backend_separation_init:nnnnn #1#2#3#4#5 { \bool_if:NT \g__kernel_backend_header_bool { \cs_if_exist:NTF \AtBeginDvi - { \AtBeginDvi } + { \exp_not:N \AtBeginDvi } { \use:n } { - \exp_not:N \__color_backend_separation_init:nnn - {#1} {#2} {#5} + \exp_not:N \__color_backend_separation_init_aux:nnnnn + {#1} {#2} {#3} {#4} {#5} } } } -\cs_new_protected:Npn \__color_backend_separation_init:nnn #1#2#3 +\cs_generate_variant:Nn \__color_backend_separation_init:nnnnn { nxx } +\cs_new_protected:Npn \__color_backend_separation_init_aux:nnnnn #1#2#3#4#5 { \__kernel_backend_literal:e { ! TeXDict ~ begin ~ - /color \int_use:N \g__color_separation_int \c_space_tl - [#3] ~ aload ~ pop ~ ( \str_convert_pdfname:n {#1} ) ~ - find \__color_backend_separation_init:n {#2} customcolor ~ def ~ + /color \int_use:N \g__color_separation_int + { + [ ~ + /Separation ~ ( \str_convert_pdfname:n {#1} ) ~ + [ ~ #2 ~ ] ~ + { + \cs_if_exist_use:cF { __color_backend_separation_init_ #2 :nnn } + { \__color_backend_separation_init:nnn } + {#3} {#4} {#5} + } + ] ~ setcolorspace + } ~ def ~ end } } -\cs_new:Npn \__color_backend_separation_init:n #1 +\cs_new:cpn { __color_backend_separation_init_ /DeviceCMYK :nnn } #1#2#3 + { \__color_backend_separation_init_Device:Nn 4 {#3} } +\cs_new:cpn { __color_backend_separation_init_ /DeviceGray :nnn } #1#2#3 + { \__color_backend_separation_init_Device:Nn 1 {#3} } +\cs_new:cpn { __color_backend_separation_init_ /DeviceRGB :nnn } #1#2#3 + { \__color_backend_separation_init_Device:Nn 2 {#3} } +\cs_new:Npn \__color_backend_separation_init_Device:Nn #1#2 + { + #2 ~ + \prg_replicate:nn {#1} + { #1 ~ index ~ mul ~ #1 ~ 1 ~ roll ~ } + \int_eval:n { #1 + 1 } ~ -1 ~ roll ~ pop + } +\cs_new:Npn \__color_backend_separation_init:nnn #1#2#3 + { + \exp_args:Ne \__color_backend_separation_init:nnnn + { \__color_backend_separation_init_count:n {#2} } + {#1} {#2} {#3} + } +\cs_new:Npn \__color_backend_separation_init_count:n #1 + { \int_eval:n { 0 \__color_backend_separation_init_count:w #1 ~ \s__color_stop } } +\cs_new:Npn \__color_backend_separation_init_count:w #1 ~ #2 \s__color_stop { - \__color_backend_separation_init:w #1 /Device #1 /Device \s__color_stop + +1 + \tl_if_blank:nF {#2} + { \__color_backend_separation_init_count:w #2 \s__color_stop } + } +\cs_new:Npn \__color_backend_separation_init:nnnn #1#2#3#4 + { + \__color_backend_separation_init:w #3 ~ \s__color_stop #4 ~ \s__color_stop + \prg_replicate:nn {#1} + { + pop ~ 1 ~ index ~ neg ~ 1 ~ index ~ add ~ + \int_eval:n { 3 * #1 } ~ index ~ mul ~ + 2 ~ index ~ add ~ + \int_eval:n { 3 * #1 } ~ #1 ~ roll ~ + } + \int_step_function:nnnN {#1} { -1 } { 1 } + \__color_backend_separation_init:n + \int_eval:n { 4 * #1 + 1 } ~ #1 ~ roll ~ + \prg_replicate:nn { 3 * #1 + 1 } { pop ~ } + \tl_if_blank:nF {#2} + { \__color_backend_separation_init:nw {#1} #2 ~ \s__color_stop } + } +\cs_new:Npn \__color_backend_separation_init:w + #1 ~ #2 \s__color_stop #3 ~ #4 \s__color_stop + { + #1 ~ #3 ~ 0 ~ + \tl_if_blank:nF {#2} + { \__color_backend_separation_init:w #2 \s__color_stop #4 \s__color_stop } + } +\cs_new:Npn \__color_backend_separation_init:n #1 + { \int_eval:n { #1 * 2 } ~ index ~ } +\cs_new:Npn \__color_backend_separation_init:nw #1#2 ~ #3 ~ #4 \s__color_stop + { + #2 ~ #3 ~ + 2 ~ index ~ 2 ~ index ~ lt ~ + { ~ pop ~ exch ~ pop ~ } ~ + { ~ + 2 ~ index ~ 1 ~ index ~ gt ~ + { ~ exch ~ pop ~ exch ~ pop ~ } ~ + { ~ pop ~ pop ~ } ~ + ifelse ~ + } + ifelse ~ + #1 ~ 1 ~ roll ~ + \tl_if_blank:nF {#4} + { \__color_backend_separation_init:nw {#1} #4 \s__color_stop } + } +\cs_new_protected:Npn \__color_backend_separation_init_CIELAB:nnn #1#2#3 + { + \__color_backend_separation_init:nxxnn + {#2} + { + /CIEBasedABC ~ + << ~ + /RangeABC ~ [ ~ \c__color_model_range_CIELAB_tl \c_space_tl ] ~ + /DecodeABC ~ + [ ~ + { ~ 16 ~ add ~ 116 ~ div ~ } ~ bind ~ + { ~ 500 ~ div ~ } ~ bind ~ + { ~ 200 ~ div ~ } ~ bind ~ + ] ~ + /MatrixABC ~ [ ~ 1 ~ 1 ~ 1 ~ 1 ~ 0 ~ 0 ~ 0 ~ 0 ~ -1 ~ ] ~ + /DecodeLMN ~ + [ ~ + { ~ + dup ~ 6 ~ 29 ~ div ~ ge ~ + { ~ dup ~ dup ~ mul ~ mul ~ ~ } ~ + { ~ 4 ~ 29 ~ div ~ sub ~ 108 ~ 841 ~ div ~ mul ~ } ~ + ifelse ~ + 0.9505 ~ mul ~ + } ~ bind ~ + { ~ + dup ~ 6 ~ 29 ~ div ~ ge ~ + { ~ dup ~ dup ~ mul ~ mul ~ } ~ + { ~ 4 ~ 29 ~ div ~ sub ~ 108 ~ 841 ~ div ~ mul ~ } ~ + ifelse ~ + } ~ bind ~ + { ~ + dup ~ 6 ~ 29 ~ div ~ ge ~ + { ~ dup ~ dup ~ mul ~ mul ~ } ~ + { ~ 4 ~ 29 ~ div ~ sub ~ 108 ~ 841 ~ div ~ mul ~ } ~ + ifelse ~ + 1.0890 ~ mul ~ + } ~ bind + ] ~ + /WhitePoint ~ + [ ~ \tl_use:c { c__color_model_whitepoint_CIELAB_ #1 _tl } ~ ] ~ + >> + } + { \c__color_model_range_CIELAB_tl } + { 100 ~ 0 ~ 0 } + {#3} } -\cs_new:Npn \__color_backend_separation_init:w #1 /Device #2 /Device #3 \s__color_stop - { \str_lowercase:n {#2} } -\cs_new_protected:Npn \__color_backend_separation_init_cielab:nnnnn #1#2#3#4#5 { } -\cs_new_protected:Npn \__color_backend_separation_init_cielab:n #1 { } \cs_new_protected:Npn \__color_backend_fill_cmyk:n #1 { \__kernel_backend_postscript:n { /color.fc { #1 ~ setcmykcolor } def } } \cs_new_protected:Npn \__color_backend_fill_gray:n #1 diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def index fed3c0d3721..a2616cd5741 100644 --- a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def +++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def @@ -25,7 +25,7 @@ %% %% File: l3backend-basics.dtx \ProvidesExplFile - {l3backend-dvisvgm.def}{2020-09-01}{} + {l3backend-dvisvgm.def}{2020-09-11}{} {L3 backend support: dvisvgm} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { @@ -122,8 +122,7 @@ { \__kernel_backend_literal:n { color~pop } } \cs_new_protected:Npn \__color_backend_select_separation:nn #1#2 { } \cs_new_protected:Npn \__color_backend_separation_init:nnnnn #1#2#3#4#5 { } -\cs_new_protected:Npn \__color_backend_separation_init_cielab:nnnnn #1#2#3#4#5 { } -\cs_new_protected:Npn \__color_backend_separation_init_cielab:n #1 { } +\cs_new_protected:Npn \__color_backend_separation_init_CIELAB:nnnnnn #1#2#3 { } \cs_new_protected:Npn \__color_backend_fill_cmyk:n #1 { \__color_backend_cmyk:nw { fill } #1 \s__color_stop } \cs_new_protected:Npn \__color_backend_stroke_cmyk:n #1 diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.def index 309dfca33cf..f7eb09b28bc 100644 --- a/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.def +++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.def @@ -25,7 +25,7 @@ %% %% File: l3backend-basics.dtx \ProvidesExplFile - {l3backend-luatex.def}{2020-09-01}{} + {l3backend-luatex.def}{2020-09-11}{} {L3 backend support: PDF output (LuaTeX)} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { @@ -125,17 +125,19 @@ { \__color_backend_select:n { /#1 ~ cs ~ /#1 ~ CS ~ #2 ~ scn ~ #2 ~ SCN } } \cs_new_protected:Npn \__color_backend_separation_init:nnnnn #1#2#3#4#5 { + \pdf_object_now:nx { dict } + { + /FunctionType ~ 2 + /Domain ~ [0 ~ 1] + \tl_if_blank:nF {#3} { /Range ~ [#3] } + /C0 ~ [#4] ~ + /C1 ~ [#5] /N ~ 1 + } \__color_backend_separation_init:n { /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 - >> + \pdf_object_last: } \use:x { @@ -151,32 +153,33 @@ { \pdf_object_now:nx { array } {#1} } -\cs_new_protected:Npn \__color_backend_separation_init_cielab:nnnnn #1#2#3#4#5 +\cs_new_protected:Npn \__color_backend_separation_init_CIELAB:nnn #1#2#3 { + \pdf_object_if_exist:nF { __color_illuminant_CIELAB_ #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_CIELAB_tl ] + >> + } + } \__color_backend_separation_init:nnnnn {#2} - { \pdf_object_ref:n { __color_illuminant_cielab_ #1 } } - { \c__color_model_range_lab_tl } + { \pdf_object_ref:n { __color_illuminant_CIELAB_ #1 } } + { \c__color_model_range_CIELAB_tl } { 100 ~ 0 ~ 0 } - { #3 ~ #4 ~ #5 } + {#3} } \cs_if_exist:NF \pdf_object_now:nn - { \cs_gset_protected:Npn \__color_backend_separation_init_cielab:nnnnn #1#2#3#4#5 { } } -\cs_new_protected:Npn \__color_backend_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_gset_protected:Npn \__color_backend_separation_init_CIELAB:nnn #1#2#3 + { } } -\cs_if_exist:NF \pdf_object_new:nn - { \cs_gset_protected:Npn \__color_backend_separation_init_cielab:n #1 { } } \cs_new_protected:Npn \__color_backend_fill_cmyk:n #1 { \__kernel_backend_literal_pdf:n { #1 ~ k } } \cs_new_protected:Npn \__color_backend_fill_gray:n #1 @@ -479,7 +482,7 @@ \cs_new:Npx \__pdf_backend_annotation_last: { \exp_not:N \int_value:w - \exp_not:N \tex_pdffeedback:D lastannot + \exp_not:N \tex_pdffeedback:D lastannot ~ \c_space_tl 0 ~ R } \cs_new_protected:Npn \__pdf_backend_link_begin_goto:nnw #1#2 @@ -499,7 +502,7 @@ \cs_new:Npx \__pdf_backend_link_last: { \exp_not:N \int_value:w - \exp_not:N \tex_pdffeedback:D lastlink + \exp_not:N \tex_pdffeedback:D lastlink ~ \c_space_tl 0 ~ R } \cs_new_protected:Npn \__pdf_backend_link_margin:n #1 @@ -555,7 +558,7 @@ \int_const:cn { c__pdf_backend_object_ \tl_to_str:n {#1} _int } { \tex_pdffeedback:D lastobj } - \prop_gput:Nnn \exp_not:N \g__pdf_backend_object_prop {#1} {#2} + \prop_gput:Nnn \g__pdf_backend_object_prop {#1} {#2} } \cs_new:Npn \__pdf_backend_object_ref:n #1 { \int_use:c { c__pdf_backend_object_ \tl_to_str:n {#1} _int } ~ 0 ~ R } diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def index 1307f33a12c..85d24278f52 100644 --- a/Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def +++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def @@ -25,7 +25,7 @@ %% %% File: l3backend-basics.dtx \ProvidesExplFile - {l3backend-pdftex.def}{2020-09-01}{} + {l3backend-pdftex.def}{2020-09-11}{} {L3 backend support: PDF output (pdfTeX)} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { @@ -125,17 +125,19 @@ { \__color_backend_select:n { /#1 ~ cs ~ /#1 ~ CS ~ #2 ~ scn ~ #2 ~ SCN } } \cs_new_protected:Npn \__color_backend_separation_init:nnnnn #1#2#3#4#5 { + \pdf_object_now:nx { dict } + { + /FunctionType ~ 2 + /Domain ~ [0 ~ 1] + \tl_if_blank:nF {#3} { /Range ~ [#3] } + /C0 ~ [#4] ~ + /C1 ~ [#5] /N ~ 1 + } \__color_backend_separation_init:n { /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 - >> + \pdf_object_last: } \use:x { @@ -151,32 +153,33 @@ { \pdf_object_now:nx { array } {#1} } -\cs_new_protected:Npn \__color_backend_separation_init_cielab:nnnnn #1#2#3#4#5 +\cs_new_protected:Npn \__color_backend_separation_init_CIELAB:nnn #1#2#3 { + \pdf_object_if_exist:nF { __color_illuminant_CIELAB_ #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_CIELAB_tl ] + >> + } + } \__color_backend_separation_init:nnnnn {#2} - { \pdf_object_ref:n { __color_illuminant_cielab_ #1 } } - { \c__color_model_range_lab_tl } + { \pdf_object_ref:n { __color_illuminant_CIELAB_ #1 } } + { \c__color_model_range_CIELAB_tl } { 100 ~ 0 ~ 0 } - { #3 ~ #4 ~ #5 } + {#3} } \cs_if_exist:NF \pdf_object_now:nn - { \cs_gset_protected:Npn \__color_backend_separation_init_cielab:nnnnn #1#2#3#4#5 { } } -\cs_new_protected:Npn \__color_backend_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_gset_protected:Npn \__color_backend_separation_init_CIELAB:nnn #1#2#3 + { } } -\cs_if_exist:NF \pdf_object_new:nn - { \cs_gset_protected:Npn \__color_backend_separation_init_cielab:n #1 { } } \cs_new_protected:Npn \__color_backend_fill_cmyk:n #1 { \__kernel_backend_literal_pdf:n { #1 ~ k } } \cs_new_protected:Npn \__color_backend_fill_gray:n #1 @@ -479,7 +482,7 @@ \cs_new:Npx \__pdf_backend_annotation_last: { \exp_not:N \int_value:w - \exp_not:N \tex_pdfannot:D + \exp_not:N \tex_pdflastannot:D \c_space_tl 0 ~ R } \cs_new_protected:Npn \__pdf_backend_link_begin_goto:nnw #1#2 @@ -555,7 +558,7 @@ \int_const:cn { c__pdf_backend_object_ \tl_to_str:n {#1} _int } { \tex_pdflastobj:D } - \prop_gput:Nnn \exp_not:N \g__pdf_backend_object_prop {#1} {#2} + \prop_gput:Nnn \g__pdf_backend_object_prop {#1} {#2} } \cs_new:Npn \__pdf_backend_object_ref:n #1 { \int_use:c { c__pdf_backend_object_ \tl_to_str:n {#1} _int } ~ 0 ~ R } diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def index 1250c1577f0..bc40c6ee387 100644 --- a/Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def +++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def @@ -25,7 +25,7 @@ %% %% File: l3backend-basics.dtx \ProvidesExplFile - {l3backend-xetex.def}{2020-09-01}{} + {l3backend-xetex.def}{2020-09-11}{} {L3 backend support: XeTeX} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { @@ -87,19 +87,26 @@ } \cs_new_protected:Npn \__color_backend_select_separation:nn #1#2 { \__color_backend_select:n { @#1 ~ [#2] } } +\cs_new_protected:Npn \__color_backend_select:n #1 + { + \__kernel_backend_literal:n { pdf: bc ~ #1 } + \group_insert_after:N \__color_backend_reset: + } \cs_new_protected:Npn \__color_backend_separation_init:nnnnn #1#2#3#4#5 { + \pdf_object_now:nx { dict } + { + /FunctionType ~ 2 + /Domain ~ [0 ~ 1] + \tl_if_blank:nF {#3} { /Range ~ [#3] } + /C0 ~ [#4] ~ + /C1 ~ [#5] /N ~ 1 + } \__color_backend_separation_init:n { /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 - >> + \pdf_object_last: } } \cs_if_exist:NF \pdf_object_now:nn @@ -108,36 +115,37 @@ { \__kernel_backend_literal:x { - pdf:obj ~ @ color \int_use:N \g__color_separation_int \c_space_tl + pdf:obj ~ @color \int_use:N \g__color_separation_int \c_space_tl [#1] } } -\cs_new_protected:Npn \__color_backend_separation_init_cielab:nnnnn #1#2#3#4#5 +\cs_new_protected:Npn \__color_backend_separation_init_CIELAB:nnn #1#2#3 { + \pdf_object_if_exist:nF { __color_illuminant_CIELAB_ #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_CIELAB_tl ] + >> + } + } \__color_backend_separation_init:nnnnn {#2} - { \pdf_object_ref:n { __color_illuminant_cielab_ #1 } } - { \c__color_model_range_lab_tl } + { \pdf_object_ref:n { __color_illuminant_CIELAB_ #1 } } + { \c__color_model_range_CIELAB_tl } { 100 ~ 0 ~ 0 } - { #3 ~ #4 ~ #5 } + {#3} } \cs_if_exist:NF \pdf_object_now:nn - { \cs_gset_protected:Npn \__color_backend_separation_init_cielab:nnnnn #1#2#3#4#5 { } } -\cs_new_protected:Npn \__color_backend_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_backend_separation_init_cielab:n #1 { } } + \cs_gset_protected:Npn \__color_backend_separation_init_CIELAB:nnn #1#2#3 + { } + } \cs_new_protected:Npn \__color_backend_fill_cmyk:n #1 { \__kernel_backend_literal_pdf:n { #1 ~ k } } \cs_new_protected:Npn \__color_backend_fill_gray:n #1 diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3benchmark/l3benchmark.sty b/Master/texmf-dist/tex/latex/l3experimental/l3benchmark/l3benchmark.sty index 32e0160e734..25891307496 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-09-01}{} +\ProvidesExplPackage{l3benchmark}{2020-09-11}{} {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 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~ diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty b/Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty index 3df21b0ac45..292d4fe6f35 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-09-01}{} +\ProvidesExplPackage{l3draw}{2020-09-11}{} {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 e0aab473e3a..797321a00dc 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-09-01}{} +\ProvidesExplPackage{l3graphics}{2020-09-11}{} {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 7f9640f2dfe..018102c7a98 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-09-01}{} +\ProvidesExplPackage{l3pdf}{2020-09-11}{} {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 50a8da96d89..bee09eb299b 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-09-01}{} +\ProvidesExplPackage{l3str-format}{2020-09-11}{} {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 733cedf6edd..97e8ba69c8f 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-09-01}{} +\ProvidesExplPackage{l3sys-shell}{2020-09-11}{} {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 b49642fc2e6..f745fb21f8f 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-09-01}{} +\ProvidesExplPackage{xcoffins}{2020-09-11}{} {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 5079bb06a79..9e66d0a8cd1 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-09-01}{} +\ProvidesExplPackage{l3galley}{2020-09-11}{} {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 90536a80800..5a074a0d7ac 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-09-01}{} +\ProvidesExplPackage{xgalley}{2020-09-11}{} {L3 Experimental galley} \RequirePackage{xparse,xtemplate,l3galley} \clist_new:N \l__galley_tmpa_clist |