summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/l3kernel/l3color.dtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-01-21 22:49:34 +0000
committerKarl Berry <karl@freefriends.org>2022-01-21 22:49:34 +0000
commit87aba59c84e17b383ab231357b7f9e75330738a4 (patch)
tree26cc1381a3b5189f541326c112e932b144030a91 /Master/texmf-dist/source/latex/l3kernel/l3color.dtx
parent7e5007eab3107fa4ad6a70beb002fe0bb541ef52 (diff)
l3kernel (21jan22)
git-svn-id: svn://tug.org/texlive/trunk@61685 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3color.dtx')
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3color.dtx13
1 files changed, 9 insertions, 4 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3color.dtx b/Master/texmf-dist/source/latex/l3kernel/l3color.dtx
index c6c8eb32625..cdd2f31ac6d 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3color.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3color.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2022-01-12}
+% \date{Released 2022-01-21}
%
% \maketitle
%
@@ -600,12 +600,17 @@
%
% \begin{macro}[TF, EXP]{\@@_if_defined:n}
% A simple wrapper to avoid needing to have the lookup repeated in too many
-% places.
+% places.To guard against a color created in a group, we need to test for
+% entries in the |prop|.
% \begin{macrocode}
\prg_new_conditional:Npnn \@@_if_defined:n #1 { T, F, TF }
{
\prop_if_exist:cTF { l_@@_named_ #1 _prop }
- \prg_return_true:
+ {
+ \prop_if_empty:cTF { l_@@_named_ #1 _prop }
+ \prg_return_false:
+ \prg_return_true:
+ }
\prg_return_false:
}
% \end{macrocode}
@@ -795,7 +800,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_parse_aux:nN #1#2
{
- \tl_if_exist:cTF { l_@@_named_ #1 _prop }
+ \@@_if_defined:nTF {#1}
{ \@@_parse_set_eq:Nn #2 {#1} }
{ \@@_parse:Nw #2#1 ! \s_@@_stop }
\@@_check_model:N #2