summaryrefslogtreecommitdiff
path: root/macros/latex-dev/required/l3backend
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex-dev/required/l3backend')
-rw-r--r--macros/latex-dev/required/l3backend/CHANGELOG.md15
-rw-r--r--macros/latex-dev/required/l3backend/README.md2
-rw-r--r--macros/latex-dev/required/l3backend/l3backend-basics.dtx14
-rw-r--r--macros/latex-dev/required/l3backend/l3backend-box.dtx2
-rw-r--r--macros/latex-dev/required/l3backend/l3backend-code.pdfbin907792 -> 907105 bytes
-rw-r--r--macros/latex-dev/required/l3backend/l3backend-color.dtx28
-rw-r--r--macros/latex-dev/required/l3backend/l3backend-draw.dtx4
-rw-r--r--macros/latex-dev/required/l3backend/l3backend-graphics.dtx2
-rw-r--r--macros/latex-dev/required/l3backend/l3backend-header.dtx4
-rw-r--r--macros/latex-dev/required/l3backend/l3backend-opacity.dtx2
-rw-r--r--macros/latex-dev/required/l3backend/l3backend-pdf.dtx6
11 files changed, 39 insertions, 40 deletions
diff --git a/macros/latex-dev/required/l3backend/CHANGELOG.md b/macros/latex-dev/required/l3backend/CHANGELOG.md
index ecd8593881..68f697ac5f 100644
--- a/macros/latex-dev/required/l3backend/CHANGELOG.md
+++ b/macros/latex-dev/required/l3backend/CHANGELOG.md
@@ -6,6 +6,14 @@ this project uses date-based 'snapshot' version identifiers.
## [Unreleased]
+## [2024-05-08]
+
+### Changed
+- Use built-in conversion for CMYK colors with `dvisvgm` (see \#1538)
+
+### Fixed
+- CMYK output from `dvisvgm`
+
## [2024-04-11]
### Added
@@ -40,7 +48,7 @@ this project uses date-based 'snapshot' version identifiers.
## [2023-11-09]
### Changed
-- Changed `luaotfload` integration to allow coexistance with (x)color.
+- Changed `luaotfload` integration to allow coexistence with (x)color.
## [2023-11-04]
@@ -225,7 +233,7 @@ this project uses date-based 'snapshot' version identifiers.
backend)
### Changed
-- Implementation of color wtih (x)dvipdfmx (requires an up-to-date
+- Implementation of color with (x)dvipdfmx (requires an up-to-date
backend)
## [2020-09-24]
@@ -347,7 +355,8 @@ this project uses date-based 'snapshot' version identifiers.
- Include `l3backend` in file names
- Moved backend code to internal for each 'parent' module
-[Unreleased]: https://github.com/latex3/latex3/compare/2024-04-11...HEAD
+[Unreleased]: https://github.com/latex3/latex3/compare/2024-05-08...HEAD
+[2024-05-08]: https://github.com/latex3/latex3/compare/2024-04-11...2024-05-08
[2024-04-11]: https://github.com/latex3/latex3/compare/2024-03-14...2024-04-11
[2024-03-14]: https://github.com/latex3/latex3/compare/2024-02-20...2024-03-14
[2024-02-20]: https://github.com/latex3/latex3/compare/2024-01-04...2024-02-20
diff --git a/macros/latex-dev/required/l3backend/README.md b/macros/latex-dev/required/l3backend/README.md
index 058fa63cc2..77eb591526 100644
--- a/macros/latex-dev/required/l3backend/README.md
+++ b/macros/latex-dev/required/l3backend/README.md
@@ -1,7 +1,7 @@
LaTeX3 Backend Drivers
======================
-Release 2024-04-11
+Release 2024-05-08
This package forms parts of `expl3`, and contains the code used to interface
with backends (drivers) across the `expl3` codebase. The functions here are
diff --git a/macros/latex-dev/required/l3backend/l3backend-basics.dtx b/macros/latex-dev/required/l3backend/l3backend-basics.dtx
index fbac503317..81c51b5b72 100644
--- a/macros/latex-dev/required/l3backend/l3backend-basics.dtx
+++ b/macros/latex-dev/required/l3backend/l3backend-basics.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-04-11}
+% \date{Released 2024-05-08}
%
% \maketitle
%
@@ -70,27 +70,27 @@
% \begin{macrocode}
\ProvidesExplFile
%<*dvipdfmx>
- {l3backend-dvipdfmx.def}{2024-04-11}{}
+ {l3backend-dvipdfmx.def}{2024-05-08}{}
{L3 backend support: dvipdfmx}
%</dvipdfmx>
%<*dvips>
- {l3backend-dvips.def}{2024-04-11}{}
+ {l3backend-dvips.def}{2024-05-08}{}
{L3 backend support: dvips}
%</dvips>
%<*dvisvgm>
- {l3backend-dvisvgm.def}{2024-04-11}{}
+ {l3backend-dvisvgm.def}{2024-05-08}{}
{L3 backend support: dvisvgm}
%</dvisvgm>
%<*luatex>
- {l3backend-luatex.def}{2024-04-11}{}
+ {l3backend-luatex.def}{2024-05-08}{}
{L3 backend support: PDF output (LuaTeX)}
%</luatex>
%<*pdftex>
- {l3backend-pdftex.def}{2024-04-11}{}
+ {l3backend-pdftex.def}{2024-05-08}{}
{L3 backend support: PDF output (pdfTeX)}
%</pdftex>
%<*xetex>
- {l3backend-xetex.def}{2024-04-11}{}
+ {l3backend-xetex.def}{2024-05-08}{}
{L3 backend support: XeTeX}
%</xetex>
% \end{macrocode}
diff --git a/macros/latex-dev/required/l3backend/l3backend-box.dtx b/macros/latex-dev/required/l3backend/l3backend-box.dtx
index 93d83293ef..8bfd0e1494 100644
--- a/macros/latex-dev/required/l3backend/l3backend-box.dtx
+++ b/macros/latex-dev/required/l3backend/l3backend-box.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-04-11}
+% \date{Released 2024-05-08}
%
% \maketitle
%
diff --git a/macros/latex-dev/required/l3backend/l3backend-code.pdf b/macros/latex-dev/required/l3backend/l3backend-code.pdf
index acc3e33012..0908eddc1b 100644
--- a/macros/latex-dev/required/l3backend/l3backend-code.pdf
+++ b/macros/latex-dev/required/l3backend/l3backend-code.pdf
Binary files differ
diff --git a/macros/latex-dev/required/l3backend/l3backend-color.dtx b/macros/latex-dev/required/l3backend/l3backend-color.dtx
index 307432d554..1dae4b5ce9 100644
--- a/macros/latex-dev/required/l3backend/l3backend-color.dtx
+++ b/macros/latex-dev/required/l3backend/l3backend-color.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-04-11}
+% \date{Released 2024-05-08}
%
% \maketitle
%
@@ -920,7 +920,7 @@
% Here, \texttt{dvipdfmx}/\XeTeX{} we write direct PDF specials for the fill,
% and only use the stack for the stroke color (see above for comments on why
% we cannot use multiple stacks with these backends). \LuaTeX{} and \pdfTeX{}
-% have mutiple stacks that can deal with fill and stroke. For \texttt{dvips}
+% have multiple stacks that can deal with fill and stroke. For \texttt{dvips}
% we have to manage fill and stroke color ourselves. We also handle
% \texttt{dvisvgm} independently, as there we can create SVG directly.
%
@@ -1138,8 +1138,7 @@
% \@@_backend_fill_rgb:n ,
% \@@_backend_fill:n
% }
-% Fill color here is the same as general color \emph{except} we skip the
-% stroke part.
+% Fill color here is the same as general color.
% \begin{macrocode}
\cs_new_protected:Npn \@@_backend_fill_cmyk:n #1
{ \@@_backend_fill:n { cmyk ~ #1 } }
@@ -1155,27 +1154,19 @@
% \end{macro}
%
% \begin{macro}{\@@_backend_stroke_cmyk:n}
-% \begin{macro}{\@@_backend_stroke_cmyk:w}
% \begin{macro}{\@@_backend_stroke_gray:n, \@@_backend_stroke_gray_aux:n}
% \begin{macro}{\@@_backend_stroke_rgb:n}
% \begin{macro}{\@@_backend_stroke_rgb:w}
% \begin{macro}{\@@_backend:nnn}
-% For drawings in SVG, we use scopes for all stroke colors. That
-% requires using \texttt{RGB} values, which luckily are easy to
-% convert here (|cmyk| to |RGB| is a fixed function).
+% For drawings in SVG, we use scopes for all stroke colors. The backend
+% provides the necessary conversion for CMYK but only if that is set as
+% the main color: a little bit of gymnastics as a result.
% \begin{macrocode}
\cs_new_protected:Npn \@@_backend_stroke_cmyk:n #1
- { \@@_backend_cmyk:w #1 \s_@@_stop }
-\cs_new_protected:Npn \@@_backend_stroke_cmyk:w
- #1 ~ #2 ~ #3 ~ #4 \s_@@_stop
{
- \use:e
- {
- \@@_backend:nnn
- { \fp_eval:n { -100 * ( 1 - min ( 1 , #1 + #4 ) ) } }
- { \fp_eval:n { -100 * ( 1 - min ( 1 , #2 + #4 ) ) } }
- { \fp_eval:n { -100 * ( 1 - min ( 1 , #3 + #4 ) ) } }
- }
+ \@@_backend_fill_cmyk:n {#1}
+ \__kernel_backend_scope:n { stroke = "{?color}" }
+ \@@_backend_reset:
}
\cs_new_protected:Npn \@@_backend_stroke_gray:n #1
{
@@ -1221,7 +1212,6 @@
% \end{macro}
% \end{macro}
% \end{macro}
-% \end{macro}
%
% \begin{macro}
% {
diff --git a/macros/latex-dev/required/l3backend/l3backend-draw.dtx b/macros/latex-dev/required/l3backend/l3backend-draw.dtx
index c651ab92fe..02d84ed656 100644
--- a/macros/latex-dev/required/l3backend/l3backend-draw.dtx
+++ b/macros/latex-dev/required/l3backend/l3backend-draw.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-04-11}
+% \date{Released 2024-05-08}
%
% \maketitle
%
@@ -776,7 +776,7 @@
% \end{macro}
%
% \begin{macro}{\@@_backend_begin:, \@@_backend_end:}
-% A drawing needs to be set up such that the co-ordinate system is
+% A drawing needs to be set up such that the coordinate system is
% translated. That is done inside a scope, which as described below
% \begin{macrocode}
\cs_new_protected:Npn \@@_backend_begin:
diff --git a/macros/latex-dev/required/l3backend/l3backend-graphics.dtx b/macros/latex-dev/required/l3backend/l3backend-graphics.dtx
index e20457368d..f487a323c1 100644
--- a/macros/latex-dev/required/l3backend/l3backend-graphics.dtx
+++ b/macros/latex-dev/required/l3backend/l3backend-graphics.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-04-11}
+% \date{Released 2024-05-08}
%
% \maketitle
%
diff --git a/macros/latex-dev/required/l3backend/l3backend-header.dtx b/macros/latex-dev/required/l3backend/l3backend-header.dtx
index 486f564822..4eb70cc536 100644
--- a/macros/latex-dev/required/l3backend/l3backend-header.dtx
+++ b/macros/latex-dev/required/l3backend/l3backend-header.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-04-11}
+% \date{Released 2024-05-08}
%
% \maketitle
%
@@ -184,7 +184,7 @@ false setglobal
% For finding the anchor point of a destination link. We make the use case
% a separate function as it comes up a lot, and as this makes it easier to
% adjust if we need additional effects. We also need a more complex approach
-% to convert a co-ordinate pair correctly when defining a rectangle: this
+% to convert a coordinate pair correctly when defining a rectangle: this
% can otherwise be out when using a landscape page. (Thanks to Alexander
% Grahn for the approach here.)
% \begin{macrocode}
diff --git a/macros/latex-dev/required/l3backend/l3backend-opacity.dtx b/macros/latex-dev/required/l3backend/l3backend-opacity.dtx
index 0c29574c37..1798146eec 100644
--- a/macros/latex-dev/required/l3backend/l3backend-opacity.dtx
+++ b/macros/latex-dev/required/l3backend/l3backend-opacity.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-04-11}
+% \date{Released 2024-05-08}
%
% \maketitle
%
diff --git a/macros/latex-dev/required/l3backend/l3backend-pdf.dtx b/macros/latex-dev/required/l3backend/l3backend-pdf.dtx
index cf09c0eec2..31ad60b7b6 100644
--- a/macros/latex-dev/required/l3backend/l3backend-pdf.dtx
+++ b/macros/latex-dev/required/l3backend/l3backend-pdf.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-04-11}
+% \date{Released 2024-05-08}
%
% \maketitle
%
@@ -266,7 +266,7 @@
%
% \begin{macro}{\@@_backend_annotation:nnnn}
% Annotations are objects, but we track them separately. Notably, they are
-% not in the object data lists. Here, to get the co-ordinates of the
+% not in the object data lists. Here, to get the coordinates of the
% annotation, we need to have the data collected at the PostScript level.
% That requires a bit of box trickery (effectively a \LaTeXe{} |picture|
% of zero size). Once the data is collected, use it to set up the annotation
@@ -376,7 +376,7 @@
% \begin{macro}{\@@_backend_link_minima:}
% \begin{macro}{\@@_backend_link_outerbox:n}
% \begin{macro}{\@@_backend_link_sf_save:, \@@_backend_link_sf_restore:}
-% Links are crated like annotations but with dedicated code to allow for
+% Links are created like annotations but with dedicated code to allow for
% adjusting the size of the rectangle. In contrast to \pkg{hyperref}, we
% grab the link content as a box which can then unbox: this allows the same
% interface as for \pdfTeX{}.