diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel/l3color.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/l3kernel/l3color.sty | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3color.sty b/Master/texmf-dist/tex/latex/l3kernel/l3color.sty index 989061981f4..5ea45852215 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3color.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/l3color.sty @@ -13,7 +13,7 @@ %% %% Do not distribute a modified version of this file. %% -%% File: l3color.dtx Copyright(C) 2011 The LaTeX3 Project +%% File: l3color.dtx Copyright(C) 2011,2012 The LaTeX3 Project %% %% It may be distributed and/or modified under the conditions of the %% LaTeX Project Public License (LPPL), either version 1.3c of this @@ -47,18 +47,30 @@ %% ----------------------------------------------------------------------- %% \RequirePackage{l3names} -\GetIdInfo$Id: l3color.dtx 2776 2011-09-07 18:33:19Z joseph $ +\GetIdInfo$Id: l3color.dtx 3986 2012-07-15 19:23:51Z joseph $ {L3 Experimental colour support} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} -\package_check_loaded_expl: +\__expl_package_check: \cs_new_eq:NN \color_group_begin: \group_begin: \cs_new_protected_nopar:Npn \color_group_end: { \tex_par:D \group_end: } -\cs_new_protected_nopar:Npn \color_ensure_current: { \set@color } +\cs_new_protected_nopar:Npn \color_ensure_current: { } +\AtBeginDocument + { + \cs_if_exist:NTF \__driver_color_ensure_current: + { + \cs_set_protected_nopar:Npn \color_ensure_current: + { \__driver_color_ensure_current: } + } + { + \cs_if_exist:NT \set@color + { \cs_set_protected_nopar:Npn \color_ensure_current: { \set@color } } + } + } %% %% %% End of file `l3color.sty'. |