diff options
Diffstat (limited to 'Master/texmf-dist/source')
85 files changed, 372 insertions, 566 deletions
diff --git a/Master/texmf-dist/source/latex/l3backend/l3backend-basics.dtx b/Master/texmf-dist/source/latex/l3backend/l3backend-basics.dtx index 80504ebf034..b7f09e7dbde 100644 --- a/Master/texmf-dist/source/latex/l3backend/l3backend-basics.dtx +++ b/Master/texmf-dist/source/latex/l3backend/l3backend-basics.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % @@ -70,27 +70,27 @@ % \begin{macrocode} \ProvidesExplFile %<*dvipdfmx> - {l3backend-dvipdfmx.def}{2021-02-06}{} + {l3backend-dvipdfmx.def}{2021-02-18}{} {L3 backend support: dvipdfmx} %</dvipdfmx> %<*dvips> - {l3backend-dvips.def}{2021-02-06}{} + {l3backend-dvips.def}{2021-02-18}{} {L3 backend support: dvips} %</dvips> %<*dvisvgm> - {l3backend-dvisvgm.def}{2021-02-06}{} + {l3backend-dvisvgm.def}{2021-02-18}{} {L3 backend support: dvisvgm} %</dvisvgm> %<*luatex> - {l3backend-luatex.def}{2021-02-06}{} + {l3backend-luatex.def}{2021-02-18}{} {L3 backend support: PDF output (LuaTeX)} %</luatex> %<*pdftex> - {l3backend-pdftex.def}{2021-02-06}{} + {l3backend-pdftex.def}{2021-02-18}{} {L3 backend support: PDF output (pdfTeX)} %</pdftex> %<*xetex> - {l3backend-xetex.def}{2021-02-06}{} + {l3backend-xetex.def}{2021-02-18}{} {L3 backend support: XeTeX} %</xetex> % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/l3backend/l3backend-box.dtx b/Master/texmf-dist/source/latex/l3backend/l3backend-box.dtx index f6268a776c5..bc0a3ffdd5f 100644 --- a/Master/texmf-dist/source/latex/l3backend/l3backend-box.dtx +++ b/Master/texmf-dist/source/latex/l3backend/l3backend-box.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3backend/l3backend-color.dtx b/Master/texmf-dist/source/latex/l3backend/l3backend-color.dtx index 9373df677d3..451a0039a55 100644 --- a/Master/texmf-dist/source/latex/l3backend/l3backend-color.dtx +++ b/Master/texmf-dist/source/latex/l3backend/l3backend-color.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % @@ -241,13 +241,13 @@ % \end{variable} % \end{macro} % -% \begin{macro}{\@@_backend_stack_push:nn, \@@_backend_stack_push:nx} -% \begin{macro}{\@@_backend_stack_pop:n} +% \begin{macro}{\__kernel_color_backend_stack_push:nn, \__kernel_color_backend_stack_push:nx} +% \begin{macro}{\__kernel_color_backend_stack_pop:n} % Simple enough but needs a version check. % \begin{macrocode} \int_compare:nNnF \c__kernel_sys_dvipdfmx_version_int < { 20201111 } { - \cs_new_protected:Npn \@@_backend_stack_push:nn #1#2 + \cs_new_protected:Npn \__kernel_color_backend_stack_push:nn #1#2 { \__kernel_backend_literal:x { @@ -256,8 +256,8 @@ push ~ (#2) } } - \cs_generate_variant:Nn \@@_backend_stack_push:nn { nx } - \cs_new_protected:Npn \@@_backend_stack_pop:n #1 + \cs_generate_variant:Nn \__kernel_color_backend_stack_push:nn { nx } + \cs_new_protected:Npn \__kernel_color_backend_stack_pop:n #1 { \__kernel_backend_literal:x { @@ -300,10 +300,10 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}{\@@_backend_stack_push:nn, \@@_backend_stack_push:nx} -% \begin{macro}{\@@_backend_stack_pop:n} +% \begin{macro}{\__kernel_color_backend_stack_push:nn, \__kernel_color_backend_stack_push:nx} +% \begin{macro}{\__kernel_color_backend_stack_pop:n} % \begin{macrocode} -\cs_new_protected:Npn \@@_backend_stack_push:nn #1#2 +\cs_new_protected:Npn \__kernel_color_backend_stack_push:nn #1#2 { %<*luatex> \tex_pdfextension:D colorstack ~ @@ -313,8 +313,8 @@ %</pdftex> \int_eval:n {#1} ~ push ~ {#2} } -\cs_generate_variant:Nn \@@_backend_stack_push:nn { nx } -\cs_new_protected:Npn \@@_backend_stack_pop:n #1 +\cs_generate_variant:Nn \__kernel_color_backend_stack_push:nn { nx } +\cs_new_protected:Npn \__kernel_color_backend_stack_pop:n #1 { %<*luatex> \tex_pdfextension:D colorstack ~ @@ -410,11 +410,11 @@ { \tl_set:Nn \l_@@_backend_fill_tl {#1} \tl_set:Nn \l_@@_backend_stroke_tl {#2} - \@@_backend_stack_push:nn \l_@@_backend_stack_int { #1 ~ #2 } + \__kernel_color_backend_stack_push:nn \l_@@_backend_stack_int { #1 ~ #2 } \group_insert_after:N \@@_backend_reset: } \cs_new_protected:Npn \@@_backend_reset: - { \@@_backend_stack_pop:n \l_@@_backend_stack_int } + { \__kernel_color_backend_stack_pop:n \l_@@_backend_stack_int } % \end{macrocode} % \end{macro} % \end{macro} @@ -790,7 +790,7 @@ % \begin{macrocode} \cs_new_protected:Npn \@@_backend_separation_init:nnnnn #1#2#3#4#5 { - \pdf_object_now:nx { dict } + \pdf_object_unnamed_write:nx { dict } { /FunctionType ~ 2 /Domain ~ [0 ~ 1] @@ -802,21 +802,22 @@ { /Separation ~ / \str_convert_pdfname:n {#1} ~ #2 ~ - \pdf_object_last: + \pdf_object_ref_last: } - \use:x + \cs_if_exist:NT \pdfmanagement_add:nnn { - \pdfmanagement_add:nnn - { Page / Resources / ColorSpace } - { color \int_use:N \g_@@_model_int } - { \pdf_object_last: } + \use:x + { + \pdfmanagement_add:nnn + { Page / Resources / ColorSpace } + { color \int_use:N \g_@@_model_int } + { \pdf_object_ref_last: } + } } } -\cs_if_exist:NF \pdf_object_now:nn - { \cs_gset_protected:Npn \@@_backend_separation_init:nnnnn #1#2#3#4#5 { } } \cs_new_protected:Npn \@@_backend_separation_init:n #1 { - \pdf_object_now:nx { array } {#1} + \pdf_object_unnamed_write:nx { array } {#1} } % \end{macrocode} % For CIELAB colors, we need one object per document for the illuminant, @@ -844,7 +845,7 @@ { 100 ~ 0 ~ 0 } {#3} } -\cs_if_exist:NF \pdf_object_now:nn +\cs_if_exist:NF \pdf_object_unnamed_write:nn { \cs_gset_protected:Npn \@@_backend_separation_init_CIELAB:nnn #1#2#3 { } @@ -862,7 +863,7 @@ % \begin{macrocode} \cs_new_protected:Npn \@@_backend_devicen_init:nnn #1#2#3 { - \pdf_object_now:nx { stream } + \pdf_object_unnamed_write:nx { stream } { { /FunctionType ~ 4 ~ @@ -889,18 +890,19 @@ /DeviceN ~ [ ~ #1 ~ ] ~ #2 ~ - \pdf_object_last: + \pdf_object_ref_last: } - \use:x + \cs_if_exist:NT \pdfmanagement_add:nnn { - \pdfmanagement_add:nnn - { Page / Resources / ColorSpace } - { color \int_use:N \g_@@_model_int } - { \pdf_object_last: } + \use:x + { + \pdfmanagement_add:nnn + { Page / Resources / ColorSpace } + { color \int_use:N \g_@@_model_int } + { \pdf_object_ref_last: } + } } } -\cs_if_exist:NF \pdf_object_now:nn - { \cs_gset_protected:Npn \@@_backend_devicen_init:nnn #1#2#3 { } } \cs_new:Npn \@@_backend_devicen_init:w #1 ~ #2 \s_@@_stop { + 1 @@ -976,7 +978,7 @@ \cs_new_protected:Npn \@@_backend_fill:n #1 { \tl_set:Nn \l_@@_backend_fill_tl {#1} - \@@_backend_stack_push:nn \l_@@_backend_stack_int + \__kernel_color_backend_stack_push:nn \l_@@_backend_stack_int { #1 ~ \l_@@_backend_stroke_tl } \group_insert_after:N \@@_backend_reset: } @@ -989,7 +991,7 @@ \cs_new_protected:Npn \@@_backend_stroke:n #1 { \tl_set:Nn \l_@@_backend_stroke_tl {#1} - \@@_backend_stack_push:nn \l_@@_backend_stack_int + \__kernel_color_backend_stack_push:nn \l_@@_backend_stack_int { \l_@@_backend_fill_tl \c_space_tl #1 } \group_insert_after:N \@@_backend_reset: } diff --git a/Master/texmf-dist/source/latex/l3backend/l3backend-draw.dtx b/Master/texmf-dist/source/latex/l3backend/l3backend-draw.dtx index 8602a4da4cf..5536391276a 100644 --- a/Master/texmf-dist/source/latex/l3backend/l3backend-draw.dtx +++ b/Master/texmf-dist/source/latex/l3backend/l3backend-draw.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3backend/l3backend-graphics.dtx b/Master/texmf-dist/source/latex/l3backend/l3backend-graphics.dtx index 484e5b20b9d..c3ec121c073 100644 --- a/Master/texmf-dist/source/latex/l3backend/l3backend-graphics.dtx +++ b/Master/texmf-dist/source/latex/l3backend/l3backend-graphics.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3backend/l3backend-header.dtx b/Master/texmf-dist/source/latex/l3backend/l3backend-header.dtx index 77d1d93a266..eafd36f50d7 100644 --- a/Master/texmf-dist/source/latex/l3backend/l3backend-header.dtx +++ b/Master/texmf-dist/source/latex/l3backend/l3backend-header.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3backend/l3backend-opacity.dtx b/Master/texmf-dist/source/latex/l3backend/l3backend-opacity.dtx index 06d17b6745f..ee4702a3cdf 100644 --- a/Master/texmf-dist/source/latex/l3backend/l3backend-opacity.dtx +++ b/Master/texmf-dist/source/latex/l3backend/l3backend-opacity.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % @@ -151,7 +151,7 @@ \pdfmanagement_add:nnn { Page / Resources / ExtGState } { opacity #1 } { << /ca ~ #1 /CA ~ #1 >> } - \@@_backend_stack_push:nn \c_@@_backend_stack_int + \__kernel_color_backend_stack_push:nn \c_@@_backend_stack_int { /opacity #1 ~ gs } \group_insert_after:N \@@_backend_reset: } @@ -160,7 +160,7 @@ \cs_gset_protected:Npn \@@_backend_select_aux:n #1 { } } \cs_new_protected:Npn \@@_backend_reset: - { \@@_backend_stack_pop:n \c_@@_backend_stack_int } + { \__kernel_color_backend_stack_pop:n \c_@@_backend_stack_int } % \end{macrocode} % \end{macro} % \end{macro} @@ -195,7 +195,7 @@ \pdfmanagement_add:nnn { Page / Resources / ExtGState } { opacity.stroke #1 } { << /CA ~ #2 >> } - \@@_backend_stack_push:nn \c_@@_backend_stack_int + \__kernel_color_backend_stack_push:nn \c_@@_backend_stack_int { /opacity.fill #1 ~ gs /opacity.stroke #2 ~ gs } \group_insert_after:N \@@_backend_reset: } diff --git a/Master/texmf-dist/source/latex/l3backend/l3backend-pdf.dtx b/Master/texmf-dist/source/latex/l3backend/l3backend-pdf.dtx index dd279399d95..ad2b0d51705 100644 --- a/Master/texmf-dist/source/latex/l3backend/l3backend-pdf.dtx +++ b/Master/texmf-dist/source/latex/l3backend/l3backend-pdf.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3experimental/l3benchmark/l3benchmark.dtx b/Master/texmf-dist/source/latex/l3experimental/l3benchmark/l3benchmark.dtx index 76f36777816..1771ac26668 100644 --- a/Master/texmf-dist/source/latex/l3experimental/l3benchmark/l3benchmark.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/l3benchmark/l3benchmark.dtx @@ -46,7 +46,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % @@ -129,7 +129,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{l3benchmark}{2021-02-06}{} +\ProvidesExplPackage{l3benchmark}{2021-02-18}{} {L3 Experimental benchmarking} % \end{macrocode} % diff --git a/Master/texmf-dist/source/latex/l3experimental/l3bitset/l3bitset.dtx b/Master/texmf-dist/source/latex/l3experimental/l3bitset/l3bitset.dtx index 7c61b81f834..686df60ccd4 100644 --- a/Master/texmf-dist/source/latex/l3experimental/l3bitset/l3bitset.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/l3bitset/l3bitset.dtx @@ -42,7 +42,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % \begin{documentation} @@ -264,7 +264,7 @@ %<@@=bitset> % \end{macrocode} % \begin{macrocode} -\ProvidesExplPackage{l3bitset}{2021-02-06}{} +\ProvidesExplPackage{l3bitset}{2021-02-18}{} {L3 Experimental bitset support} % \end{macrocode} % A bitset is a string variable. diff --git a/Master/texmf-dist/source/latex/l3experimental/l3color/l3color.ins b/Master/texmf-dist/source/latex/l3experimental/l3color/l3color.ins deleted file mode 100644 index e1704a9715b..00000000000 --- a/Master/texmf-dist/source/latex/l3experimental/l3color/l3color.ins +++ /dev/null @@ -1,58 +0,0 @@ -\iffalse meta-comment - -File: l3color.ins - -Copyright (C) 2017-2021 The LaTeX 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 development version of the bundle can be found at - - https://github.com/latex3/latex3 - -for those people who are interested. - ------------------------------------------------------------------------ - -Any modification of this file should ensure that the copyright and -license information is placed in the derived files. - -\fi - -\input l3docstrip.tex -\askforoverwritefalse - -\preamble - -Copyright (C) 2017-2021 The LaTeX 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. - -\endpreamble -% stop docstrip adding \endinput -\postamble -\endpostamble - -\keepsilent - -\generate{\file{l3color.sty}{\from{l3color.dtx}{package}}} - -\endbatchfile diff --git a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-boxes.dtx b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-boxes.dtx index 29103416ee0..64bc0cfa646 100644 --- a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-boxes.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-boxes.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-layers.dtx b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-layers.dtx index 0ed23162fda..f193ceb4d64 100644 --- a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-layers.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-layers.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-paths.dtx b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-paths.dtx index bfad9e14a3a..a846d4046a2 100644 --- a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-paths.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-paths.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-points.dtx b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-points.dtx index 8c170eeb27e..70e088d0cf7 100644 --- a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-points.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-points.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-scopes.dtx b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-scopes.dtx index 4b28b103970..60792f27ed0 100644 --- a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-scopes.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-scopes.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-softpath.dtx b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-softpath.dtx index 2bda7e3c2d4..9d70d5d7e2c 100644 --- a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-softpath.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-softpath.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-state.dtx b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-state.dtx index 42709122b70..105120a391d 100644 --- a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-state.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-state.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-transforms.dtx b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-transforms.dtx index 880fff8b1a8..839fce91a61 100644 --- a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-transforms.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw-transforms.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw.dtx b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw.dtx index 68f83903ecb..1b6cdd8ab9f 100644 --- a/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/l3draw/l3draw.dtx @@ -110,7 +110,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % @@ -231,7 +231,7 @@ % \begin{syntax} % \cs{draw_linewidth:n} \Arg{width} % \end{syntax} -% Sets the width to be used for stroking to the \meta{width} (an +% Sets the width to be used for stroking to the \meta{width} (an % \meta{fp expr}). % \end{function} % @@ -268,7 +268,7 @@ % \draw_end: % \end{demo} % Setting an empty pattern will produce a solid line. -% +% % Note the \meta{pattern} interface here is different from that in \pkg{pgf}: % the list is comma-separated not given in brace groups. % \end{function} @@ -410,7 +410,7 @@ % Gives the co-ordinates of the point at \meta{angle} (an \meta{fp expr} in % \emph{degrees}) and \meta{radius}. The three-argument version accepts % two radii of different lengths. -% +% % Note the interface here is somewhat different from that in \pkg{pgf}: % the one- and two-radii versions in \pkg{l3draw} use separate functions, % whilst in \pkg{pgf} they use the same function and a keyword. @@ -470,7 +470,7 @@ % \emph{degrees}) and \meta{radius}, relative to the prevailing % $x$- and $y$-vectors. The three-argument version accepts two radii of % different lengths. -% +% % Note the interface here is somewhat different from that in \pkg{pgf}: % the one- and two-radii versions in \pkg{l3draw} use separate functions, % whilst in \pkg{pgf} they use the same function and a keyword. @@ -795,7 +795,7 @@ % \begin{syntax} % \cs{draw_path_circle:nn} \Arg{center} \Arg{radius} % \end{syntax} -% Appends a circle of \meta{radius} at \meta{center} to the current path. +% Appends a circle of \meta{radius} at \meta{center} to the current path. % This is a shortcut for \cs{draw_path_ellipse:nnn}. % \end{function} % @@ -1136,14 +1136,10 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{l3draw}{2021-02-06}{} +\ProvidesExplPackage{l3draw}{2021-02-18}{} {L3 Experimental core drawing support} % \end{macrocode} % -% \begin{macrocode} -\RequirePackage { l3color } -% \end{macrocode} -% % \subsection{Internal auxiliaries} % % \begin{variable}{\s_@@_mark,\s_@@_stop} diff --git a/Master/texmf-dist/source/latex/l3experimental/l3graphics/l3graphics.dtx b/Master/texmf-dist/source/latex/l3experimental/l3graphics/l3graphics.dtx index c244ad7258f..5b4144c062e 100644 --- a/Master/texmf-dist/source/latex/l3experimental/l3graphics/l3graphics.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/l3graphics/l3graphics.dtx @@ -46,7 +46,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % @@ -240,7 +240,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{l3graphics}{2021-02-06}{} +\ProvidesExplPackage{l3graphics}{2021-02-18}{} {L3 Experimental graphics inclusion support} % \end{macrocode} % diff --git a/Master/texmf-dist/source/latex/l3experimental/l3pdf/l3pdf.ins b/Master/texmf-dist/source/latex/l3experimental/l3pdf/l3pdf.ins deleted file mode 100644 index e422ceb995e..00000000000 --- a/Master/texmf-dist/source/latex/l3experimental/l3pdf/l3pdf.ins +++ /dev/null @@ -1,60 +0,0 @@ -\iffalse meta-comment - -File: l3pdf.ins - -Copyright (C) 2019-2021 The LaTeX 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 development version of the bundle can be found at - - https://github.com/latex3/latex3 - -for those people who are interested. - ------------------------------------------------------------------------ - -Any modification of this file should ensure that the copyright and -license information is placed in the derived files. - -\fi - -\input l3docstrip.tex -\askforoverwritefalse - -\preamble - -Copyright (C) 2019-2021 The LaTeX 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 "l3pdf bundle" (The Work in LPPL) -and all files in that bundle must be distributed together. - -\endpreamble -% stop docstrip adding \endinput -\postamble -\endpostamble - -\keepsilent - -\generate{\file{l3pdf.sty} - {\from{l3pdf.dtx}{package}} -} - -\endbatchfile diff --git a/Master/texmf-dist/source/latex/l3experimental/l3str/l3str-format.dtx b/Master/texmf-dist/source/latex/l3experimental/l3str/l3str-format.dtx index e39f2e7e032..9b0cf4a5a4d 100644 --- a/Master/texmf-dist/source/latex/l3experimental/l3str/l3str-format.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/l3str/l3str-format.dtx @@ -48,7 +48,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % @@ -166,7 +166,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{l3str-format}{2021-02-06}{} +\ProvidesExplPackage{l3str-format}{2021-02-18}{} {L3 Experimental string formatting} % \end{macrocode} % diff --git a/Master/texmf-dist/source/latex/l3experimental/l3sys-shell/l3sys-shell.dtx b/Master/texmf-dist/source/latex/l3experimental/l3sys-shell/l3sys-shell.dtx index 2e1d15d8db0..9a7920fe3f3 100644 --- a/Master/texmf-dist/source/latex/l3experimental/l3sys-shell/l3sys-shell.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/l3sys-shell/l3sys-shell.dtx @@ -46,7 +46,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % @@ -135,7 +135,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{l3sys-shell}{2021-02-06}{} +\ProvidesExplPackage{l3sys-shell}{2021-02-18}{} {L3 Experimental system shell functions} % \end{macrocode} % diff --git a/Master/texmf-dist/source/latex/l3experimental/xcoffins/xcoffins.dtx b/Master/texmf-dist/source/latex/l3experimental/xcoffins/xcoffins.dtx index 37ef1c2cfe2..86d3add8ae5 100644 --- a/Master/texmf-dist/source/latex/l3experimental/xcoffins/xcoffins.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/xcoffins/xcoffins.dtx @@ -53,7 +53,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % @@ -672,7 +672,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{xcoffins}{2021-02-06}{} +\ProvidesExplPackage{xcoffins}{2021-02-18}{} {L3 Experimental design level coffins} % \end{macrocode} % diff --git a/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx b/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx index 2209ce8d9e0..1c7c9bd9418 100644 --- a/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx @@ -61,7 +61,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % @@ -686,7 +686,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{l3galley}{2021-02-06}{} +\ProvidesExplPackage{l3galley}{2021-02-18}{} {L3 Experimental galley code} % \end{macrocode} % diff --git a/Master/texmf-dist/source/latex/l3experimental/xgalley/xgalley.dtx b/Master/texmf-dist/source/latex/l3experimental/xgalley/xgalley.dtx index 9292de08894..680e288fe37 100644 --- a/Master/texmf-dist/source/latex/l3experimental/xgalley/xgalley.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/xgalley/xgalley.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % @@ -731,7 +731,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{xgalley}{2021-02-06}{} +\ProvidesExplPackage{xgalley}{2021-02-18}{} {L3 Experimental galley} \RequirePackage{xtemplate,l3galley} % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/l3kernel/expl3.dtx b/Master/texmf-dist/source/latex/l3kernel/expl3.dtx index bf589f7c8c2..23bbb5a8084 100644 --- a/Master/texmf-dist/source/latex/l3kernel/expl3.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/expl3.dtx @@ -24,7 +24,7 @@ % %<*driver|generic|package|2ekernel> %</driver|generic|package|2ekernel> -\def\ExplFileDate{2021-02-06}% +\def\ExplFileDate{2021-02-18}% %<*driver> \documentclass[full]{l3doc} \usepackage{graphicx} @@ -51,7 +51,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3.ins b/Master/texmf-dist/source/latex/l3kernel/l3.ins index d9ecef35e00..91c471e75e8 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3.ins +++ b/Master/texmf-dist/source/latex/l3kernel/l3.ins @@ -99,7 +99,8 @@ and all files in that bundle must be distributed together. \from{l3tl-analysis.dtx}{package} \from{l3regex.dtx} {package} \from{l3box.dtx} {package} - \from{l3color-base.dtx} {package} + \from{l3color.dtx} {package} + \from{l3pdf.dtx} {package} \from{l3coffins.dtx} {package} \from{l3luatex.dtx} {package,tex} \from{l3unicode.dtx} {package} diff --git a/Master/texmf-dist/source/latex/l3kernel/l3basics.dtx b/Master/texmf-dist/source/latex/l3kernel/l3basics.dtx index 535226f9b44..9a82102634f 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3basics.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3basics.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx b/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx index 2849deda777..81fb06a5796 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3box.dtx b/Master/texmf-dist/source/latex/l3kernel/l3box.dtx index 0247deaf42e..5dcf864f73c 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3box.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3box.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3candidates.dtx b/Master/texmf-dist/source/latex/l3kernel/l3candidates.dtx index a19ed84dd39..aa0f4e1f8ae 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3candidates.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3candidates.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % @@ -86,8 +86,6 @@ % % \section{Additions to \pkg{l3box}} % -% \subsection{Viewing part of a box} -% % \begin{function}[updated = 2019-01-23] % {\box_clip:N, \box_clip:c, \box_gclip:N, \box_gclip:c} % \begin{syntax} @@ -254,8 +252,6 @@ % This is not available in older versions of \XeTeX{}. % \end{function} % -% \subsection{Working with contents of integer arrays} -% % \begin{function}[added = 2018-05-04, rEXP]{\intarray_to_clist:N} % \begin{syntax} % \cs{intarray_to_clist:N} \meta{intarray~var} @@ -279,32 +275,6 @@ % |1+2| then this logs |> 1+2=3.| % \end{function} % -% \begin{function}[added = 2017-12-04] -% { -% \msg_show:nnnnnn , -% \msg_show:nnnnn , -% \msg_show:nnnn , -% \msg_show:nnn , -% \msg_show:nn , -% \msg_show:nnxxxx , -% \msg_show:nnxxx , -% \msg_show:nnxx , -% \msg_show:nnx -% } -% \begin{syntax} -% \cs{msg_show:nnnnnn} \Arg{module} \Arg{message} \Arg{arg one} \Arg{arg two} \Arg{arg three} \Arg{arg four} -% \end{syntax} -% Issues \meta{module} information \meta{message}, passing \meta{arg -% one} to \meta{arg four} to the text-creating functions. The -% information text is shown on the terminal and the \TeX{} run is -% interrupted in a manner similar to \cs{tl_show:n}. This is used in -% conjunction with \cs{msg_show_item:n} and similar functions to print -% complex variable contents completely. If the formatted text does -% not contain |>~| at the start of a line, an additional line |>~.| -% will be put at the end. In addition, a final period is added if not -% present. -% \end{function} -% % \begin{function}[EXP, added = 2017-12-04] % {\msg_show_item:n, \msg_show_item_unbraced:n, \msg_show_item:nn, \msg_show_item_unbraced:nn} % \begin{syntax} diff --git a/Master/texmf-dist/source/latex/l3kernel/l3cctab.dtx b/Master/texmf-dist/source/latex/l3kernel/l3cctab.dtx index 6e9d1c240ca..46d682bd544 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3cctab.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3cctab.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3clist.dtx b/Master/texmf-dist/source/latex/l3kernel/l3clist.dtx index 05b2ca2255e..02064b80ea9 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3clist.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3clist.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx b/Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx index 6dc7ab596e0..ae2e660caa5 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % @@ -2247,34 +2247,6 @@ % \end{macrocode} % \end{variable} % -% \begin{macro}{\@@_color:n} -% Calls \tn{color}, and otherwise does nothing if \tn{color} is not defined. -% As this is relatively rarely used, we have it self-define rather than delay -% using a hook. -% \begin{macrocode} -\cs_new_protected:Npn \@@_color:n #1 {#1} -\bool_lazy_and:nnT - { \cs_if_exist_p:N \fmtname } - { \str_if_eq_p:Vn \fmtname { LaTeX2e } } - { - \cs_gset_protected:Npn \@@_color:n - { - \cs_gset_protected:Npx \@@_color:n - { - \cs_if_exist:NTF \color_select:n - { \color_select:n } - { - \cs_if_exist:NTF \color - { \exp_not:N \color } - { \exp_not:N \use_none:n } - } - } - \@@_color:n - } - } -% \end{macrocode} -% \end{macro} -% % \begin{macro}{\@@_rule:nn} % Abstract out creation of rules here until there is a higher-level interface. % \begin{macrocode} @@ -2298,14 +2270,14 @@ { \hcoffin_set:Nn \l_@@_display_pole_coffin { - \@@_color:n {#4} + \color_select:n {#4} \@@_rule:nn { 1pt } { 1pt } } \@@_attach_mark:NnnNnnnn #1 {#2} {#3} \l_@@_display_pole_coffin { hc } { vc } { 0pt } { 0pt } \hcoffin_set:Nn \l_@@_display_coord_coffin { - \@@_color:n {#4} + \color_select:n {#4} \l_@@_display_font_tl ( \tl_to_str:n { #2 , #3 } ) } @@ -2357,7 +2329,7 @@ { \hcoffin_set:Nn \l_@@_display_pole_coffin { - \@@_color:n {#2} + \color_select:n {#2} \@@_rule:nn { 1pt } { 1pt } } \prop_set_eq:Nc \l_@@_display_poles_prop @@ -2398,7 +2370,7 @@ { 0pt } { 0pt } \hcoffin_set:Nn \l_@@_display_coord_coffin { - \@@_color:n {#6} + \color_select:n {#6} \l_@@_display_font_tl ( \tl_to_str:n { #1 , ##1 } ) } diff --git a/Master/texmf-dist/source/latex/l3kernel/l3color-base.dtx b/Master/texmf-dist/source/latex/l3kernel/l3color-base.dtx deleted file mode 100644 index 497f7fbe781..00000000000 --- a/Master/texmf-dist/source/latex/l3kernel/l3color-base.dtx +++ /dev/null @@ -1,183 +0,0 @@ -% \iffalse meta-comment -% -%% File: l3color-base.dtx -% -% Copyright (C) 2011,2012,2014,2016-2021 The LaTeX 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 -% -% https://www.latex-project.org/lppl.txt -% -% This file is part of the "l3kernel bundle" (The Work in LPPL) -% and all files in that bundle must be distributed together. -% -% ----------------------------------------------------------------------- -% -% The development version of the bundle can be found at -% -% https://github.com/latex3/latex3 -% -% for those people who are interested. -% -%<*driver> -\documentclass[full,kernel]{l3doc} -\begin{document} - \DocInput{\jobname.dtx} -\end{document} -%</driver> -% \fi -% -% \title{^^A -% The \textsf{l3color-base} package\\ Color support^^A -% } -% -% \author{^^A -% The \LaTeX{} Project\thanks -% {^^A -% E-mail: -% \href{mailto:latex-team@latex-project.org} -% {latex-team@latex-project.org}^^A -% }^^A -% } -% -% \date{Released 2021-02-06} -% -% \maketitle -% -% \begin{documentation} -% -% This module provides support for color in \LaTeX3{}. At present, the -% material here is mainly intended to support a small number of low-level -% requirements in other \pkg{l3kernel} modules. -% -% \section{Color in boxes} -% -% Controlling the color of text in boxes requires a small number of control -% functions, so that the boxed material uses the color at the point where -% it is set, rather than where it is used. -% -% \begin{function}[added = 2011-09-03]{\color_group_begin:, \color_group_end:} -% \begin{syntax} -% \cs{color_group_begin:} -% \ldots -% \cs{color_group_end:} -% \end{syntax} -% Creates a color group: one used to \enquote{trap} color settings. -% This grouping is built in to for example \cs{hbox_set:Nn}. -% \end{function} -% -% \begin{function}[added = 2011-09-03]{\color_ensure_current:} -% \begin{syntax} -% \cs{color_ensure_current:} -% \end{syntax} -% Ensures that material inside a box uses the foreground color -% at the point where the box is set, rather than that in force when the -% box is used. This function should usually be used within a -% \cs{color_group_begin:} \ldots \cs{color_group_end:} group. -% \end{function} -% -% \end{documentation} -% -% \begin{implementation} -% -% \section{\pkg{l3color-base} Implementation} -% -% \begin{macrocode} -%<*package> -% \end{macrocode} -% -% \begin{macrocode} -%<@@=color> -% \end{macrocode} -% -% \begin{variable} -% {\l_@@_current_tl} -% The color currently active for foreground (text, \emph{etc.}) material. -% This is stored in the form of a color model followed by one or more -% values. There are four pre-defined models, three of which take numerical -% values in the range $[0,1]$: -% \begin{itemize} -% \item \texttt{gray \meta{gray}} Grayscale color with the \meta{gray} -% value running from $0$ (fully black) to $1$ (fully white) -% \item \texttt{cmyk \meta{cyan} \meta{magenta} \meta{yellow} \meta{black}} -% \item \texttt{rgb \meta{red} \meta{green} \meta{blue}} -% \end{itemize} -% Notice that the value are separated by spaces. There is a fourth pre-defined -% model using a string value and a numerical one: -% \begin{itemize} -% \item \texttt{spot \meta{name} \meta{tint}} A pre-defined spot color, -% where the \meta{name} should be a pre-defined string color name and the -% \meta{tint} should be in the range $[0,1]$. -% \end{itemize} -% -% Additional models may be created to allow mixing of spot colors. The -% number of data entries these require will depend on the number of -% colors to be mixed. -% \begin{texnote} -% The content of \cs{l_@@_current_tl} comprises two brace groups, the -% first containing the color model and the second containing the value(s) -% applicable in that model. -% \end{texnote} -% \end{variable} -% -% \begin{macro}{\color_group_begin:, \color_group_end:} -% Grouping for color is the same as using the basic \cs{group_begin:} -% and \cs{group_end:} functions. However, for semantic reasons, they -% are renamed here. -% \begin{macrocode} -\cs_new_eq:NN \color_group_begin: \group_begin: -\cs_new_eq:NN \color_group_end: \group_end: -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\color_ensure_current:} -% A driver-independent wrapper for setting the foreground color to the -% current color \enquote{now}. -% \begin{macrocode} -\cs_new_protected:Npn \color_ensure_current: - { - \@@_backend_pickup:N \l_@@_current_tl - \@@_select:N \l_@@_current_tl - } -% \end{macrocode} -% \end{macro} -% -% \begin{variable}{\s_@@_stop} -% Internal scan marks. -% \begin{macrocode} -\scan_new:N \s_@@_stop -% \end{macrocode} -% \end{variable} -% -% \begin{macro}{\@@_select:N} -% \begin{macro}{\@@_select:nn} -% Take an internal color specification and pass it to the driver. This code -% is needed to ensure the current color but will also be used by the -% higher-level experimental material. -% \begin{macrocode} -\cs_new_protected:Npn \@@_select:N #1 - { \exp_after:wN \@@_select:nn #1 } -\cs_new_protected:Npn \@@_select:nn #1#2 - { \use:c { @@_backend_select_ #1 :n } {#2} } -% \end{macrocode} -% \end{macro} -% \end{macro} -% -% \begin{variable}{\l_@@_current_tl} -% The current color, with the model and -% \begin{macrocode} -\tl_new:N \l_@@_current_tl -\tl_set:Nn \l_@@_current_tl { { gray } { 0 } } -% \end{macrocode} -% \end{variable} -% -% \begin{macrocode} -%</package> -% \end{macrocode} -% -% \end{implementation} -% -% \PrintIndex diff --git a/Master/texmf-dist/source/latex/l3experimental/l3color/l3color.dtx b/Master/texmf-dist/source/latex/l3kernel/l3color.dtx index 0f1b130da88..b3fd3cfa7a3 100644 --- a/Master/texmf-dist/source/latex/l3experimental/l3color/l3color.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3color.dtx @@ -11,7 +11,7 @@ % % http://www.latex-project.org/lppl.txt % -% This file is part of the "l3experimental bundle" (The Work in LPPL) +% This file is part of the "l3kernel bundle" (The Work in LPPL) % and all files in that bundle must be distributed together. % % ----------------------------------------------------------------------- @@ -22,9 +22,6 @@ % % for those people who are interested. % -%<*driver|package> -\RequirePackage{expl3} -%</driver|package> %<*driver> \documentclass[full]{l3doc} \begin{document} @@ -34,7 +31,7 @@ % \fi % % \title{^^A -% The \textsf{l3color} package\\ Experimental color support^^A +% The \textsf{l3color} package\\ Color support^^A % } % % \author{^^A @@ -46,12 +43,38 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % % \begin{documentation} % +% \section{Color in boxes} +% +% Controlling the color of text in boxes requires a small number of control +% functions, so that the boxed material uses the color at the point where +% it is set, rather than where it is used. +% +% \begin{function}[added = 2011-09-03]{\color_group_begin:, \color_group_end:} +% \begin{syntax} +% \cs{color_group_begin:} +% \ldots +% \cs{color_group_end:} +% \end{syntax} +% Creates a color group: one used to \enquote{trap} color settings. +% This grouping is built in to for example \cs{hbox_set:Nn}. +% \end{function} +% +% \begin{function}[added = 2011-09-03]{\color_ensure_current:} +% \begin{syntax} +% \cs{color_ensure_current:} +% \end{syntax} +% Ensures that material inside a box uses the foreground color +% at the point where the box is set, rather than that in force when the +% box is used. This function should usually be used within a +% \cs{color_group_begin:} \ldots \cs{color_group_end:} group. +% \end{function} +% % \section{Color models} % % A color \emph{model} is a way to represent sets of colors. Different models @@ -79,7 +102,7 @@ % \begin{itemize} % \item \texttt{Gray} Grayscale color, with a single axis running from % $0$ (fully black) to $15$ (fully white) -% \item \texttt{hsb} Hue-saturation-brightness color, with three axes,all +% \item \texttt{hsb} Hue-saturation-brightness color, with three axes,all % real values in the range $[0,1]$ for hue saturation and brightness % \item \texttt{Hsb} Hue-saturation-brightness color, with three axes, integer % in the range $[0,360]$ for hue, real values in the range $[0,1]$ for @@ -94,11 +117,11 @@ % $380$ to $780$ (nanometres) % \end{itemize} % All interface models are internally stored as |rgb|. -% +% % To allow parsing of data from \pkg{xcolor}, any leading model up the first % \texttt{:} will be discarded; the approach of selecting an internal form % for data is \emph{not} used in \pkg{l3color}. -% +% % Additional models may be created to allow mixing of separation colors % with each other or with those from other models. See % Section~\ref{l3color:sec:new-models} for more detail of color support @@ -123,7 +146,7 @@ % red!50!green % \end{verbatim} % is a mixture of $50\,\%$ red and $50\,\%$ green. A trailing percentage is -% interpreted as implicitly followed by |white|, and so +% interpreted as implicitly followed by |white|, and so % \begin{verbatim} % red!25 % \end{verbatim} @@ -296,7 +319,7 @@ % The manually-specified conversion will be used in preference to automated % calculation whenever the model(s) listed are used: both in expressions and % when a fixed model is active. -% +% % Similarly, the same syntax can be applied to directly selecting a color. % \begin{verbatim} % \color_select:nn { cmyk / rgb } @@ -356,7 +379,7 @@ % \texttt{DeviceRGB}, \texttt{DeviceGray}), these are synonymous. This % is not generally the case: see the PDF reference for more details. (Note that % \pkg{l3color} uses the shorter names \texttt{cmyk}, etc.) -% +% % \begin{function}{\color_model_new:nnn} % \begin{syntax} % \cs{color_model_new:nnn} \Arg{model} \Arg{family} \Arg{params} @@ -422,10 +445,89 @@ %<@@=color> % \end{macrocode} % +% \subsection{Basics} +% +% \begin{variable} +% {\l_@@_current_tl} +% The color currently active for foreground (text, \emph{etc.}) material. +% This is stored in the form of a color model followed by one or more +% values. There are four pre-defined models, three of which take numerical +% values in the range $[0,1]$: +% \begin{itemize} +% \item \texttt{gray \meta{gray}} Grayscale color with the \meta{gray} +% value running from $0$ (fully black) to $1$ (fully white) +% \item \texttt{cmyk \meta{cyan} \meta{magenta} \meta{yellow} \meta{black}} +% \item \texttt{rgb \meta{red} \meta{green} \meta{blue}} +% \end{itemize} +% Notice that the value are separated by spaces. There is a fourth pre-defined +% model using a string value and a numerical one: +% \begin{itemize} +% \item \texttt{spot \meta{name} \meta{tint}} A pre-defined spot color, +% where the \meta{name} should be a pre-defined string color name and the +% \meta{tint} should be in the range $[0,1]$. +% \end{itemize} +% +% Additional models may be created to allow mixing of spot colors. The +% number of data entries these require will depend on the number of +% colors to be mixed. +% \begin{texnote} +% The content of \cs{l_@@_current_tl} comprises two brace groups, the +% first containing the color model and the second containing the value(s) +% applicable in that model. +% \end{texnote} +% \end{variable} +% +% \begin{macro}{\color_group_begin:, \color_group_end:} +% Grouping for color is the same as using the basic \cs{group_begin:} +% and \cs{group_end:} functions. However, for semantic reasons, they +% are renamed here. +% \begin{macrocode} +\cs_new_eq:NN \color_group_begin: \group_begin: +\cs_new_eq:NN \color_group_end: \group_end: +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\color_ensure_current:} +% A driver-independent wrapper for setting the foreground color to the +% current color \enquote{now}. +% \begin{macrocode} +\cs_new_protected:Npn \color_ensure_current: + { + \@@_backend_pickup:N \l_@@_current_tl + \@@_select:N \l_@@_current_tl + } +% \end{macrocode} +% \end{macro} +% +% \begin{variable}{\s_@@_stop} +% Internal scan marks. +% \begin{macrocode} +\scan_new:N \s_@@_stop +% \end{macrocode} +% \end{variable} +% +% \begin{macro}{\@@_select:N} +% \begin{macro}{\@@_select:nn} +% Take an internal color specification and pass it to the driver. This code +% is needed to ensure the current color but will also be used by the +% higher-level experimental material. % \begin{macrocode} -\ProvidesExplPackage{l3color}{2021-02-06}{} - {L3 Experimental color support} +\cs_new_protected:Npn \@@_select:N #1 + { \exp_after:wN \@@_select:nn #1 } +\cs_new_protected:Npn \@@_select:nn #1#2 + { \use:c { @@_backend_select_ #1 :n } {#2} } % \end{macrocode} +% \end{macro} +% \end{macro} +% +% \begin{variable}{\l_@@_current_tl} +% The current color, with the model and +% \begin{macrocode} +\tl_new:N \l_@@_current_tl +\tl_set:Nn \l_@@_current_tl { { gray } { 0 } } +% \end{macrocode} +% \end{variable} + % % \subsection{Predefined color names} % @@ -1006,7 +1108,7 @@ { \fp_compare:nNnTF {#1} < { 490 } { - \@@_parse_model_wave_auxii:nn + \@@_parse_model_wave_auxii:nn { 4 - \@@_parse_model_wave_rho:n { (#1 - 440) / 50 } } {#2} } @@ -1040,7 +1142,7 @@ \cs_new:Npn \@@_parse_model_wave_auxii:nn #1#2 { \exp_args:Neee \@@_parse_model_hsb_aux:nnn - { \fp_eval:n {#1} } + { \fp_eval:n {#1} } { 1 } { \@@_parse_model_wave_rho:n {#2} } } @@ -1571,7 +1673,7 @@ % \c_@@_model_whitepoint_CIELAB_d65_tl , % \c_@@_model_whitepoint_CIELAB_d75_tl % } -% Whitepoint data for the CIELAB profiles. +% Whitepoint data for the CIELAB profiles. % \begin{macrocode} \tl_const:Nn \c_@@_model_whitepoint_CIELAB_a_tl { 1.0985 ~ 1 ~ 0.3558 } \tl_const:Nn \c_@@_model_whitepoint_CIELAB_b_tl { 0.9807 ~ 1 ~ 1.1822 } @@ -2256,8 +2358,8 @@ } \cs_new:Npn \@@_model_devicen_convert:n #1 { - { - \exp_args:Ne \@@_model_devicen_convert_aux:n + { + \exp_args:Ne \@@_model_devicen_convert_aux:n { \prop_item:Nn \g_@@_alternative_values_prop {#1} } } } @@ -2308,7 +2410,7 @@ #5 \s_@@_mark #6 \s_@@_stop } } -\cs_new:Npn \@@_convert_devicen_gray:nw +\cs_new:Npn \@@_convert_devicen_gray:nw #1#2 ~ #3 \s_@@_mark #4#5 \s_@@_stop { \@@_convert_devicen_gray:nnn {#2} {#1} #4 diff --git a/Master/texmf-dist/source/latex/l3kernel/l3debug.dtx b/Master/texmf-dist/source/latex/l3kernel/l3debug.dtx index 80a2cc426a6..107601afe8e 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3debug.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3debug.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3deprecation.dtx b/Master/texmf-dist/source/latex/l3kernel/l3deprecation.dtx index 96d386ecfec..e5a70436f62 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3deprecation.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3deprecation.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx b/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx index e3fd13dab6d..47f57dfb669 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx @@ -79,7 +79,7 @@ and all files in that bundle must be distributed together. % % \title{The \cls{l3doc} class} % \author{\Team} -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % \maketitle % \tableofcontents % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3docstrip.dtx b/Master/texmf-dist/source/latex/l3kernel/l3docstrip.dtx index a1f86a9c19c..c0b1db04876 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3docstrip.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3docstrip.dtx @@ -63,7 +63,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx b/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx index 0025d711d8b..c4de266f4e9 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3file.dtx b/Master/texmf-dist/source/latex/l3kernel/l3file.dtx index 01693e26dc2..76c21c537e7 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3file.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3file.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3flag.dtx b/Master/texmf-dist/source/latex/l3kernel/l3flag.dtx index 0e6892fc6db..c55b5564537 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3flag.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3flag.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-assign.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-assign.dtx index 4e5c3d6b456..30d9cc9ad57 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3fp-assign.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-assign.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % \maketitle % % \begin{documentation} diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-aux.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-aux.dtx index be4dec34c95..451f0952fc0 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3fp-aux.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-aux.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-basics.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-basics.dtx index 445ea0006d7..0742eafffd3 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3fp-basics.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-basics.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-convert.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-convert.dtx index dbdee9f5b8e..ccac4b8a42c 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3fp-convert.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-convert.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-expo.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-expo.dtx index 38e41cd8fa0..09e0a27689f 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3fp-expo.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-expo.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-extended.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-extended.dtx index 549e9451ab2..d3654cf4f5b 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3fp-extended.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-extended.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-logic.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-logic.dtx index b2060ef461b..e6da23c805c 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3fp-logic.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-logic.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx index c8c0ed52dd2..ce534ca6c68 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-random.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-random.dtx index 5cf52ba78e5..cf909120d9a 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3fp-random.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-random.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-round.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-round.dtx index e2f868e939c..c67804df2be 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3fp-round.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-round.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-traps.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-traps.dtx index 1e0524c0923..c9d3d19deb2 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3fp-traps.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-traps.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % \maketitle % % \begin{documentation} diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-trig.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-trig.dtx index 287efa3d54f..55460c8a8fe 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3fp-trig.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-trig.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp.dtx index aabdf049248..476e7a8789b 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3fp.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3fp.dtx @@ -49,7 +49,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fparray.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fparray.dtx index 8ed455c2df4..9d4ca672adb 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3fparray.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3fparray.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3int.dtx b/Master/texmf-dist/source/latex/l3kernel/l3int.dtx index 9a96fb09eba..85da3a199e1 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3int.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3int.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3intarray.dtx b/Master/texmf-dist/source/latex/l3kernel/l3intarray.dtx index 97185bab736..dc7b7fdee8c 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3intarray.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3intarray.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3kernel-functions.dtx b/Master/texmf-dist/source/latex/l3kernel/l3kernel-functions.dtx index 31484c04732..f0fd4227077 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3kernel-functions.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3kernel-functions.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3keys.dtx b/Master/texmf-dist/source/latex/l3kernel/l3keys.dtx index 03e7b5210cd..4c2b01526a0 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3keys.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3keys.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3legacy.dtx b/Master/texmf-dist/source/latex/l3kernel/l3legacy.dtx index 02b7e3037ef..b3c3627c6f7 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3legacy.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3legacy.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx b/Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx index d58eeb50106..e4aed9498ce 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx b/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx index 747d087bc98..e51d93a30e9 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % @@ -444,6 +444,34 @@ % all (see the discussion of message redirection). % \end{function} % +% \subsection{Messages for showing material} +% +% \begin{function}[added = 2017-12-04] +% { +% \msg_show:nnnnnn , +% \msg_show:nnnnn , +% \msg_show:nnnn , +% \msg_show:nnn , +% \msg_show:nn , +% \msg_show:nnxxxx , +% \msg_show:nnxxx , +% \msg_show:nnxx , +% \msg_show:nnx +% } +% \begin{syntax} +% \cs{msg_show:nnnnnn} \Arg{module} \Arg{message} \Arg{arg one} \Arg{arg two} \Arg{arg three} \Arg{arg four} +% \end{syntax} +% Issues \meta{module} information \meta{message}, passing \meta{arg +% one} to \meta{arg four} to the text-creating functions. The +% information text is shown on the terminal and the \TeX{} run is +% interrupted in a manner similar to \cs{tl_show:n}. This is used in +% conjunction with \cs{msg_show_item:n} and similar functions to print +% complex variable contents completely. If the formatted text does +% not contain |>~| at the start of a line, an additional line |>~.| +% will be put at the end. In addition, a final period is added if not +% present. +% \end{function} +% % \subsection{Expandable error messages} % % In very rare cases it may be necessary to produce errors in an diff --git a/Master/texmf-dist/source/latex/l3kernel/l3names.dtx b/Master/texmf-dist/source/latex/l3kernel/l3names.dtx index a456c295d3b..bc7d4f12384 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3names.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3names.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3experimental/l3pdf/l3pdf.dtx b/Master/texmf-dist/source/latex/l3kernel/l3pdf.dtx index f5a5c72cfe3..58f99438acc 100644 --- a/Master/texmf-dist/source/latex/l3experimental/l3pdf/l3pdf.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3pdf.dtx @@ -11,7 +11,7 @@ % % http://www.latex-project.org/lppl.txt % -% This file is part of the "l3experimental bundle" (The Work in LPPL) +% This file is part of the "l3kernel bundle" (The Work in LPPL) % and all files in that bundle must be distributed together. % % ----------------------------------------------------------------------- @@ -22,9 +22,6 @@ % % for those people who are interested. % -%<*driver|package> -\RequirePackage{expl3} -%</driver|package> %<*driver> \documentclass[full]{l3doc} \begin{document} @@ -46,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % @@ -56,7 +53,7 @@ % % \subsection{Objects} % -% \begin{function}[added = 2019-06-02]{\pdf_object_new:nn} +% \begin{function}[added = 2021-02-10]{\pdf_object_new:nn} % \begin{syntax} % \cs{pdf_object_new:nn} \Arg{object} \Arg{type} % \end{syntax} @@ -78,7 +75,7 @@ % \end{syntax} % Tests whether an object with name \Arg{object} has been defined. % \end{function} -% \begin{function}[added = 2019-06-02] +% \begin{function}[added = 2021-02-10] % {\pdf_object_write:nn, \pdf_object_write:nx} % \begin{syntax} % \cs{pdf_object_write:nn} \Arg{object} \Arg{content} @@ -97,7 +94,7 @@ % \end{itemize} % \end{function} % -% \begin{function}[EXP, added = 2019-06-02]{\pdf_object_ref:n} +% \begin{function}[EXP, added = 2021-02-10]{\pdf_object_ref:n} % \begin{syntax} % \cs{pdf_object_ref:n} \Arg{object} % \end{syntax} @@ -105,10 +102,10 @@ % in for example page resource allocation % \end{function} % -% \begin{function}[added = 2019-06-02] -% {\pdf_object_now:nn, \pdf_object_now:nx} +% \begin{function}[added = 2021-02-10] +% {\pdf_object_unnamed_write:nn, \pdf_object_unnamed_write:nx} % \begin{syntax} -% \cs{pdf_object_now:nn} \Arg{type} \Arg{content} +% \cs{pdf_object_unnamed_write:nn} \Arg{type} \Arg{content} % \end{syntax} % Writes the \meta{content} as content of an anonymous object. Depending on the % \meta{type}, the format required for the \meta{data} will vary @@ -123,17 +120,24 @@ % \end{itemize} % \end{function} % -% \begin{function}[EXP, added = 2019-06-02]{\pdf_object_last:} +% \begin{function}[EXP, added = 2021-02-10]{\pdf_object_ref_last:} % \begin{syntax} -% \cs{pdf_object_last:} +% \cs{pdf_object_ref_last:} % \end{syntax} % Inserts the appropriate information to reference the last \meta{object} % created. This is particularly useful for anonymous objects. % \end{function} % +% \begin{function}[EXP, added = 2021-02-10]{\pdf_pageobject_ref:n} +% \begin{syntax} +% \cs{pdf_pagobject_ref:n} \Arg{pageobject} +% \end{syntax} +% Inserts the appropriate information to reference the \meta{pageobject}. +% \end{function} +% % \subsection{Version} % -% \begin{function}[pTF, EXP, added = 2019-06-02]{\pdf_version_compare:Nn} +% \begin{function}[pTF, EXP, added = 2021-02-10]{\pdf_version_compare:Nn} % \begin{syntax} % \cs{pdf_version_compare:NnTF} \meta{comparator} \Arg{version} \Arg{true code} \Arg{false code} % \end{syntax} @@ -142,7 +146,7 @@ % or \meta{false code} will be left in the output stream. % \end{function} % -% \begin{function}[added = 2019-06-02] +% \begin{function}[added = 2021-02-10] % {\pdf_version_gset:n, \pdf_version_min_gset:n} % \begin{syntax} % \cs{pdf_version_gset:n} \Arg{version} @@ -155,7 +159,7 @@ % initialised. % \end{function} % -% \begin{function}[EXP, added = 2019-06-02] +% \begin{function}[EXP, added = 2021-02-10] % {\pdf_version:, \pdf_version_major:, \pdf_version_minor:} % \begin{syntax} % \cs{pdf_version:} @@ -165,7 +169,7 @@ % % \subsection{Compression} % -% \begin{function}[added = 2019-06-02]{\pdf_uncompress:} +% \begin{function}[added = 2021-02-10]{\pdf_uncompress:} % \begin{syntax} % \cs{pdf_uncompress:} % \end{syntax} @@ -257,11 +261,6 @@ %<@@=pdf> % \end{macrocode} % -% \begin{macrocode} -\ProvidesExplPackage{l3pdf}{2021-02-06}{} - {L3 Experimental core PDF support} -% \end{macrocode} -% % \begin{variable}{\s_@@_stop} % Internal scan marks. % \begin{macrocode} @@ -271,16 +270,20 @@ % % \begin{variable}{\g_@@_init_bool} % A flag so we have some chance of avoiding setting things we are not -% allowed to. +% allowed to. As we are potentially early in the format, we have to work +% a bit harder than ideal. % \begin{macrocode} \bool_new:N \g_@@_init_bool -%<*package> -\cs_if_exist:NT \documentclass +\bool_lazy_and:nnT + { \str_if_eq_p:Vn \fmtname { LaTeX2e } } + { \tl_if_exist_p:N \@expl@finalise@setup@@@@ } { - \AtBeginDocument - { \bool_gset_true:N \g_@@_init_bool } + \tl_gput_right:Nn \@expl@finalise@setup@@@@ + { + \tl_gput_right:Nn \@kernel@after@begindocument + { \bool_gset_true:N \g_@@_init_bool } + } } -%</package> % \end{macrocode} % \end{variable} % @@ -305,26 +308,32 @@ % \begin{macro}{\pdf_object_new:nn, \pdf_object_write:nn, \pdf_object_write:nx} % \begin{macro}[pTF]{\pdf_object_if_exist:n} % \begin{macro}{\pdf_object_ref:n} -% \begin{macro}{\pdf_object_now:nn, \pdf_object_now:nx} -% \begin{macro}{\pdf_object_last:} +% \begin{macro}{\pdf_object_unnamed_write:nn, \pdf_object_unnamed_write:nx} +% \begin{macro}{\pdf_object_ref_last:} % Simple to do. % \begin{macrocode} \cs_new_protected:Npn \pdf_object_new:nn #1#2 { \@@_backend_object_new:nn {#1} {#2} } \prg_new_conditional:Npnn \pdf_object_if_exist:n #1 { p , T , F , TF } { - \int_if_exist:cTF { c__pdf_backend_object_ \tl_to_str:n {#1} _int } + \int_if_exist:cTF { c_@@_backend_object_ \tl_to_str:n {#1} _int } { \prg_return_true: } { \prg_return_false:} } \cs_new_protected:Npn \pdf_object_write:nn #1#2 - { \@@_backend_object_write:nn {#1} {#2} } + { + \@@_backend_object_write:nn {#1} {#2} + \bool_gset_true:N \g_@@_init_bool + } \cs_generate_variant:Nn \pdf_object_write:nn { nx } \cs_new:Npn \pdf_object_ref:n #1 { \@@_backend_object_ref:n {#1} } -\cs_new_protected:Npn \pdf_object_now:nn #1#2 - { \@@_backend_object_now:nn {#1} {#2} } -\cs_generate_variant:Nn \pdf_object_now:nn { nx } -\cs_new:Npn \pdf_object_last: { \@@_backend_object_last: } +\cs_new_protected:Npn \pdf_object_unnamed_write:nn #1#2 + { + \@@_backend_object_now:nn {#1} {#2} + \bool_gset_true:N \g_@@_init_bool + } +\cs_generate_variant:Nn \pdf_object_unnamed_write:nn { nx } +\cs_new:Npn \pdf_object_ref_last: { \@@_backend_object_last: } % \end{macrocode} % \end{macro} % \end{macro} @@ -332,6 +341,13 @@ % \end{macro} % \end{macro} % +% \begin{macro}{\pdf_pageobject_ref:n} +% \begin{macrocode} +\cs_new:Npn \pdf_pageobject_ref:n #1 + { \@@_backend_pageobject_ref:n {#1} } +% \end{macrocode} +% \end{macro} +% % \subsection{Version} % % \begin{macro}{\pdf_version_compare:Nn} @@ -341,9 +357,9 @@ % @@_version_compare_<:w , % @@_version_compare_>:w % } -% \begin{macrocode} % To compare version, we need to split the given value then deal with both % major and minor version +% \begin{macrocode} \prg_new_conditional:Npnn \pdf_version_compare:Nn #1#2 { p , T , F , TF } { \use:c { @@_version_compare_ #1 :w } #2 . . \s_@@_stop } \cs_new:cpn { @@_version_compare_=:w } #1 . #2 . #3 \s_@@_stop @@ -419,14 +435,14 @@ % % \begin{macro}{\pdf_destination:nn} % \begin{macrocode} -\cs_new_protected:Npn \pdf_destination:nn #1 #2 - { \@@_backend_destination:nn {#1}{#2} } +\cs_new_protected:Npn \pdf_destination:nn #1#2 + { \@@_backend_destination:nn {#1} {#2} } % \end{macrocode} % \end{macro} % % \begin{macro}{\pdf_destination:nnnn} % \begin{macrocode} -\cs_new_protected:Npn \pdf_destination:nnnn #1 #2 #3 #4 +\cs_new_protected:Npn \pdf_destination:nnnn #1#2#3#4 { \hbox_to_zero:n { \@@_backend_destination:nnnn {#1} {#2} {#3} {#4} } diff --git a/Master/texmf-dist/source/latex/l3kernel/l3prg.dtx b/Master/texmf-dist/source/latex/l3kernel/l3prg.dtx index a8089df0b49..e75ab65899f 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3prg.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3prg.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3prop.dtx b/Master/texmf-dist/source/latex/l3kernel/l3prop.dtx index fe8ffaf5885..d8c7410aaa8 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3prop.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3prop.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3quark.dtx b/Master/texmf-dist/source/latex/l3kernel/l3quark.dtx index 3b7d7ea1c25..8177a2a5899 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3quark.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3quark.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3regex.dtx b/Master/texmf-dist/source/latex/l3kernel/l3regex.dtx index c26c8c0dd09..ef7ab6becc5 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3regex.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3regex.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % @@ -7033,6 +7033,13 @@ } % \end{macrocode} % +% Some escaped alphanumerics are not allowed everywhere. +% \begin{macrocode} +\__kernel_msg_new:nnnn { kernel } { backwards-quantifier } + { Quantifer~"{#1,#2}"~is~backwards. } + { The~values~given~in~a~quantifier~must~be~in~order. } +% \end{macrocode} +% % Used when showing a regex. % \begin{macrocode} \__kernel_msg_new:nnn { kernel } { show-regex } diff --git a/Master/texmf-dist/source/latex/l3kernel/l3seq.dtx b/Master/texmf-dist/source/latex/l3kernel/l3seq.dtx index 134f3c57dc7..046f42b8c5e 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3seq.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3seq.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx b/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx index fe5be582f59..97eaef163d2 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3sort.dtx b/Master/texmf-dist/source/latex/l3kernel/l3sort.dtx index b55b2223da6..13b94daf67a 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3sort.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3sort.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3str-convert.dtx b/Master/texmf-dist/source/latex/l3kernel/l3str-convert.dtx index 9ea4c901667..4cc29c2d21e 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3str-convert.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3str-convert.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % @@ -106,6 +106,8 @@ % \midrule % \texttt{clist} & comma-list of integers \\ % \meta{empty} & native (Unicode) string \\ +% \texttt{default} & like \texttt{utf8} with 8-bit engines, +% and like native with unicode-engines \\ % \bottomrule % \end{tabular} % \end{table} @@ -317,6 +319,17 @@ \prop_gput:Nnn \g_@@_alias_prop { utf32le } { utf32 } \prop_gput:Nnn \g_@@_alias_prop { utf32be } { utf32 } \prop_gput:Nnn \g_@@_alias_prop { hexadecimal } { hex } +\bool_lazy_any:nTF + { + \sys_if_engine_luatex_p: + \sys_if_engine_xetex_p: + } + { + \prop_gput:Nnn \g_@@_alias_prop { default } { } + } + { + \prop_gput:Nnn \g_@@_alias_prop { default } { utf8 } + } % \end{macrocode} % \end{variable} % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3str.dtx b/Master/texmf-dist/source/latex/l3kernel/l3str.dtx index 00c26f5f45b..2a0b175bfee 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3str.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3str.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3sys.dtx b/Master/texmf-dist/source/latex/l3kernel/l3sys.dtx index 8761c5f4e7f..9bcbee56a66 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3sys.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3sys.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3text-case.dtx b/Master/texmf-dist/source/latex/l3kernel/l3text-case.dtx index 8ebc6e3ccb5..19f6e85035b 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3text-case.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3text-case.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3text-purify.dtx b/Master/texmf-dist/source/latex/l3kernel/l3text-purify.dtx index 2495a89db0e..f939085021c 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3text-purify.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3text-purify.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3text.dtx b/Master/texmf-dist/source/latex/l3kernel/l3text.dtx index 2634fd0a4ca..046bf686772 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3text.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3text.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % @@ -107,6 +107,7 @@ % function name. The category code of letters are not changed by this % process (at least where they can be represented by the engine as a single % token: $8$-bit engines may require active characters). +% \end{function} % % Upper- and lowercase have the obvious meanings. Titlecasing may be regarded % informally as converting the first character of the \meta{tokens} to @@ -194,7 +195,6 @@ % \cs{l_text_titlecase_check_letter_bool} is \texttt{false}, the first % character is uppercased, and the rest lowercased, irrespective of the nature % of the character. -% \end{function} % % \subsection{Removing formatting from text} % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3tl-analysis.dtx b/Master/texmf-dist/source/latex/l3kernel/l3tl-analysis.dtx index 8bc8bb8652f..51ad05c9952 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3tl-analysis.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3tl-analysis.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3tl.dtx b/Master/texmf-dist/source/latex/l3kernel/l3tl.dtx index 5e11227e3c4..c7038b08d12 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3tl.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3tl.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3token.dtx b/Master/texmf-dist/source/latex/l3kernel/l3token.dtx index a0027a698bd..31d4d7fcde9 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3token.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3token.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3unicode.dtx b/Master/texmf-dist/source/latex/l3kernel/l3unicode.dtx index 8d4c2092ae5..a52823c1a2e 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3unicode.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3unicode.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2021-02-06} +% \date{Released 2021-02-18} % % \maketitle % |