summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-08-19 20:43:52 +0000
committerKarl Berry <karl@freefriends.org>2023-08-19 20:43:52 +0000
commitb3561b2ea4a2c4f0b07db0cf5304a28eb9b979e2 (patch)
treec694461e63c376f6a940344869d21e50459e3f49
parent31f5ca25b2fc6d2a135960eedb53f25f89c64ce7 (diff)
luacolor (19aug23)
git-svn-id: svn://tug.org/texlive/trunk@67987 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/luacolor/README.md19
-rw-r--r--Master/texmf-dist/doc/latex/luacolor/luacolor.pdfbin329760 -> 353916 bytes
-rw-r--r--Master/texmf-dist/source/latex/luacolor/luacolor.dtx36
-rw-r--r--Master/texmf-dist/tex/latex/luacolor/luacolor.lua7
-rw-r--r--Master/texmf-dist/tex/latex/luacolor/luacolor.sty10
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds1
6 files changed, 45 insertions, 28 deletions
diff --git a/Master/texmf-dist/doc/latex/luacolor/README.md b/Master/texmf-dist/doc/latex/luacolor/README.md
index fd1ca64042d..5febb99be63 100644
--- a/Master/texmf-dist/doc/latex/luacolor/README.md
+++ b/Master/texmf-dist/doc/latex/luacolor/README.md
@@ -1,7 +1,18 @@
-# luacolor
+# luacolor package for LaTeX
-luacolor package for LaTeX
+Version: 2023-08-18 v1.18
+Package luacolor implements color support based on LuaTeX's node attributes.
-Package luacolor implements color support based
-on LuaTeX's node attributes.
+## Copyright (C)
+
+* 2007, 2009-2011 Heiko Oberdiek
+* 2016-2023 Oberdiek Package Support Group
+
+## Issuetracker
+
+<https://github.com/ho-tex/luacolor/issues>
+
+## License
+
+LaTeX Project Public License, version 1.3c or later.
diff --git a/Master/texmf-dist/doc/latex/luacolor/luacolor.pdf b/Master/texmf-dist/doc/latex/luacolor/luacolor.pdf
index 3f6acfa53a8..c6e7d1a0a8b 100644
--- a/Master/texmf-dist/doc/latex/luacolor/luacolor.pdf
+++ b/Master/texmf-dist/doc/latex/luacolor/luacolor.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/luacolor/luacolor.dtx b/Master/texmf-dist/source/latex/luacolor/luacolor.dtx
index 8f072db0f15..89de724aaa0 100644
--- a/Master/texmf-dist/source/latex/luacolor/luacolor.dtx
+++ b/Master/texmf-dist/source/latex/luacolor/luacolor.dtx
@@ -1,12 +1,12 @@
% \iffalse meta-comment
%
% File: luacolor.dtx
-% Version: 2021-02-17 v1.17
+% Version: 2023-08-18 v1.18
% Info: Color support via LuaTeX's attributes
%
% Copyright (C)
% 2007, 2009-2011 Heiko Oberdiek
-% 2016-2021 Oberdiek Package Support Group
+% 2016-2023 Oberdiek Package Support Group
% https://github.com/ho-tex/luacolor/issues
%
% This work may be distributed and/or modified under the
@@ -80,7 +80,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: luacolor 2021-02-17 v1.17 Color support via LuaTeX's attributes (HO)}
+\Msg{* Package: luacolor 2023-08-18 v1.18 Color support via LuaTeX's attributes (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -92,11 +92,11 @@
This is a generated file.
Project: luacolor
-Version: 2021-02-17 v1.17
+Version: 2023-08-18 v1.18
Copyright (C)
2007, 2009-2011 Heiko Oberdiek
- 2016-2021 Oberdiek Package Support Group
+ 2016-2023 Oberdiek Package Support Group
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either
@@ -169,7 +169,7 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{luacolor.drv}%
- [2021-02-17 v1.17 Color support via LuaTeX's attributes (HO)]%
+ [2023-08-18 v1.18 Color support via LuaTeX's attributes (HO)]%
\documentclass{ltxdoc}
\usepackage{holtxdoc}[2011/11/22]
\usepackage{paralist}
@@ -189,7 +189,7 @@ and the derived files
% \GetFileInfo{luacolor.drv}
%
% \title{The \xpackage{luacolor} package}
-% \date{2021-02-17 v1.17}
+% \date{2023-08-18 v1.18}
% \author{Heiko Oberdiek\thanks
% {Please report any issues at \url{https://github.com/ho-tex/luacolor/issues}}}
%
@@ -236,9 +236,9 @@ and the derived files
%
% At last the attribute annotations of the nodes in the
% output box must be analyzed to insert the necessary color whatsits.
-% Currently \LuaTeX\ lacks an appropriate callback function.
-% Therefore package \xpackage{atbegshi} is used to get control
-% before a box is shipped out.
+% (With older \LuaTeX\ that lack the appropriate callback function
+% the package \xpackage{atbegshi} is used to get control
+% before a box is shipped out.)
%
% \begin{declcs}{luacolorProcessBox} \M{box}
% \end{declcs}
@@ -256,7 +256,7 @@ and the derived files
% the paragraph building and page breaking, when a
% page is to be shipped out. Therefore it cannot
% break ligatures, because the components might occupy
-% different space. Therefore it is the respondibility
+% different space. Therefore it is the responsibility
% of the ligature forming process to deal with different
% colored glyphs that form a ligature. The user can avoid
% the problem entirely by explicitly breaking the ligature
@@ -332,7 +332,7 @@ and the derived files
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{luacolor}%
- [2021-02-17 v1.17 Color support via LuaTeX's attributes (HO)]
+ [2023-08-18 v1.18 Color support via LuaTeX's attributes (HO)]
% \end{macrocode}
%
% \subsection{Check for \LuaTeX}
@@ -376,7 +376,7 @@ and the derived files
% \end{macrocode}
% \begin{macrocode}
\begingroup
- \edef\x{\directlua{tex.write("2021-02-17 v1.17")}}%
+ \edef\x{\directlua{tex.write("2023-08-18 v1.18")}}%
\edef\y{%
\directlua{%
if oberdiek.luacolor.getversion then %
@@ -442,6 +442,8 @@ and the derived files
% \end{macro}
%
% \begin{macro}{\set@color}
+% change 2023-08-18: added \cs{reset@color} so that \cs{mathcolor} can gobble it,
+% issue 7.
% \begin{macrocode}
\protected\def\set@color{%
\LuaCol@setattribute\LuaCol@Attribute{%
@@ -449,6 +451,7 @@ and the derived files
oberdiek.luacolor.get("\luaescapestring{\current@color}")%
}%
}%
+ \aftergroup\reset@color
}
% \end{macrocode}
% \end{macro}
@@ -614,7 +617,7 @@ oberdiek.luacolor = luacolor
% \begin{macro}{getversion()}
% \begin{macrocode}
function luacolor.getversion()
- tex.write("2021-02-17 v1.17")
+ tex.write("2023-08-18 v1.18")
end
% \end{macrocode}
% \end{macro}
@@ -1154,7 +1157,10 @@ end
% \end{Version}
% \begin{Version}{2021-02-17 v1.17}
% \item Use \LaTeXe's new \verb|pre_shipout_filter| callback if it's available to
-% allow coloring background and foregrund layer material
+% allow coloring background and foreground layer material
+% \end{Version}
+% \begin{Version}{2023-08-18 v1.18}
+% \item added \verb|\reset@color| to \verb|\set@color| for \verb|\mathcolor|, issue 7.
% \end{Version}
% \end{History}
%
diff --git a/Master/texmf-dist/tex/latex/luacolor/luacolor.lua b/Master/texmf-dist/tex/latex/luacolor/luacolor.lua
index 851b72c5190..b2cf4e9d8d0 100644
--- a/Master/texmf-dist/tex/latex/luacolor/luacolor.lua
+++ b/Master/texmf-dist/tex/latex/luacolor/luacolor.lua
@@ -9,11 +9,11 @@
-- This is a generated file.
--
-- Project: luacolor
--- Version: 2021-02-17 v1.17
+-- Version: 2023-08-18 v1.18
--
-- Copyright (C)
-- 2007, 2009-2011 Heiko Oberdiek
--- 2016-2021 Oberdiek Package Support Group
+-- 2016-2023 Oberdiek Package Support Group
--
-- This work may be distributed and/or modified under the
-- conditions of the LaTeX Project Public License, either
@@ -31,7 +31,6 @@
-- Heiko Oberdiek and the Oberdiek Package Support Group
-- https://github.com/ho-tex/luacolor/issues
--
---
-- This work consists of the main source file luacolor.dtx
-- and the derived files
-- luacolor.sty, luacolor.pdf, luacolor.ins, luacolor.drv,
@@ -41,7 +40,7 @@ oberdiek = oberdiek or {}
local luacolor = oberdiek.luacolor or {}
oberdiek.luacolor = luacolor
function luacolor.getversion()
- tex.write("2021-02-17 v1.17")
+ tex.write("2023-08-18 v1.18")
end
local ifpdf = tonumber(tex.outputmode or tex.pdfoutput) > 0
local prefix
diff --git a/Master/texmf-dist/tex/latex/luacolor/luacolor.sty b/Master/texmf-dist/tex/latex/luacolor/luacolor.sty
index b82069ea648..7fd5f830d7d 100644
--- a/Master/texmf-dist/tex/latex/luacolor/luacolor.sty
+++ b/Master/texmf-dist/tex/latex/luacolor/luacolor.sty
@@ -9,11 +9,11 @@
%% This is a generated file.
%%
%% Project: luacolor
-%% Version: 2021-02-17 v1.17
+%% Version: 2023-08-18 v1.18
%%
%% Copyright (C)
%% 2007, 2009-2011 Heiko Oberdiek
-%% 2016-2021 Oberdiek Package Support Group
+%% 2016-2023 Oberdiek Package Support Group
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -31,7 +31,6 @@
%% Heiko Oberdiek and the Oberdiek Package Support Group
%% https://github.com/ho-tex/luacolor/issues
%%
-%%
%% This work consists of the main source file luacolor.dtx
%% and the derived files
%% luacolor.sty, luacolor.pdf, luacolor.ins, luacolor.drv,
@@ -89,7 +88,7 @@
\edef\LuaCol@AtEnd{\LuaCol@AtEnd\noexpand\endinput}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{luacolor}%
- [2021-02-17 v1.17 Color support via LuaTeX's attributes (HO)]
+ [2023-08-18 v1.18 Color support via LuaTeX's attributes (HO)]
\RequirePackage{color}
\ifx\directlua\@undefined
\PackageError{luacolor}{%
@@ -112,7 +111,7 @@
require("luacolor")%
}
\begingroup
- \edef\x{\directlua{tex.write("2021-02-17 v1.17")}}%
+ \edef\x{\directlua{tex.write("2023-08-18 v1.18")}}%
\edef\y{%
\directlua{%
if oberdiek.luacolor.getversion then %
@@ -169,6 +168,7 @@
oberdiek.luacolor.get("\luaescapestring{\current@color}")%
}%
}%
+ \aftergroup\reset@color
}
\def\reset@color{}
\def\luacolorProcessBox#1{%
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 7a82e06b9cb..59906a8e9c1 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -3253,6 +3253,7 @@ my $core_latex = "$Master/texmf-dist/tex/latex";
'ltxcmds' => 'etex',
'lua-typo' => 'etex',
'lua-ul' => 'etex-answer-y', # https://github.com/latex3/latex2e/issues/558
+ 'luacolor' => 'etex',
'luaindex' => 'lualatex --shell-escape',
'luamathalign' => 'etex-answer-y',
'luatexja' => 'lualatex',