From 3415fbd0508eeafd0f7970490bbd418c9c476b79 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 28 Jan 2020 22:33:05 +0000 Subject: hycolor (28jan20) git-svn-id: svn://tug.org/texlive/trunk@53584 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/hycolor/hycolor.sty | 100 +++++++++++++++++++-- .../texmf-dist/tex/latex/hycolor/xcolor-patch.sty | 7 +- 2 files changed, 95 insertions(+), 12 deletions(-) (limited to 'Master/texmf-dist/tex/latex/hycolor') diff --git a/Master/texmf-dist/tex/latex/hycolor/hycolor.sty b/Master/texmf-dist/tex/latex/hycolor/hycolor.sty index 63b09e2b6fe..a6050bcd36e 100644 --- a/Master/texmf-dist/tex/latex/hycolor/hycolor.sty +++ b/Master/texmf-dist/tex/latex/hycolor/hycolor.sty @@ -9,11 +9,11 @@ %% This is a generated file. %% %% Project: hycolor -%% Version: 2019/12/15 v1.9 +%% Version: 2020-01-27 v1.10 %% %% Copyright (C) %% 2007-2011 Heiko Oberdiek -%% 2016-2019 Oberdiek Package Support Group +%% 2016-2020 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/hycolor/issues %% -%% %% This work consists of the main source file hycolor.dtx %% and the derived files %% hycolor.sty, hycolor.pdf, hycolor.ins, hycolor.drv, @@ -39,8 +38,93 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{hycolor}% - [2019/12/15 v1.9 Color options for hyperref/bookmark (HO)]% -\RequirePackage{xcolor-patch}[2019/12/15] + [2020-01-27 v1.10 Color options for hyperref/bookmark (HO)]% +\AtBeginDocument{% +\def\@tempa#1,{% + \XC@ifxcase\tm{% + \XC@mod@rgb{% + \XC@calcN{#1}\@@tmp + \edef\@@tmp{\@@tmp,\@@tmp,\@@tmp}% + }% + \XC@mod@cmy{% + \XC@calcC{#1}\@@tmp + \edef\@@tmp{\@@tmp,\@@tmp,\@@tmp}% + }% + \XC@mod@cmyk{% + \XC@calcC{#1}\@@tmp + \edef\@@tmp{0,0,0,\@@tmp}% + }% + \XC@mod@RGB{% + \edef\@@scl{\rangeRGB}% + \XC@calcM{#1}\@@tmp + \edef\@@tmp{\@@tmp,\@@tmp,\@@tmp}% + }% + \XC@mod@HTML{% + \edef\@@scl{\@cclv}% + \XC@calcM{#1}\@@tmp + \XC@calcH\@@tmp\@@tmp + \edef\@@tmp{\@@tmp\@@tmp\@@tmp}% + }% + \XC@mod@HSB{% + \edef\@@scl{\rangeHSB}% + \XC@calcM{#1}\@@tmp + \edef\@@tmp{0,0,\@@tmp}% + }% + \XC@mod@Gray{% + \edef\@@scl{\rangeGray}% + \XC@calcM{#1}\@@tmp + }% + }% + {% + \XC@calcN{#1}\@@tmp + \edef\@@tmp{0,0,\@@tmp}% + }% + }% +\ifx\XC@cnv@gray\@tempa + \def\XC@cnv@gray#1,{% + \XC@ifxcase\tm{% + \XC@mod@rgb{% + \XC@calcN{#1}\@@tmp + \edef\@@tmp{\@@tmp,\@@tmp,\@@tmp}% + }% + \XC@mod@gray{}% + \XC@mod@cmy{% + \XC@calcC{#1}\@@tmp + \edef\@@tmp{\@@tmp,\@@tmp,\@@tmp}% + }% + \XC@mod@cmyk{% + \XC@calcC{#1}\@@tmp + \edef\@@tmp{0,0,0,\@@tmp}% + }% + \XC@mod@RGB{% + \edef\@@scl{\rangeRGB}% + \XC@calcM{#1}\@@tmp + \edef\@@tmp{\@@tmp,\@@tmp,\@@tmp}% + }% + \XC@mod@HTML{% + \edef\@@scl{\@cclv}% + \XC@calcM{#1}\@@tmp + \XC@calcH\@@tmp\@@tmp + \edef\@@tmp{\@@tmp\@@tmp\@@tmp}% + }% + \XC@mod@HSB{% + \edef\@@scl{\rangeHSB}% + \XC@calcM{#1}\@@tmp + \edef\@@tmp{0,0,\@@tmp}% + }% + \XC@mod@Gray{% + \edef\@@scl{\rangeGray}% + \XC@calcM{#1}\@@tmp + }% + }% + {% + \XC@calcN{#1}\@@tmp + \edef\@@tmp{0,0,\@@tmp}% + }% + }% +\fi +\let\@tempa\relax +} \begingroup \catcode`\!=13 % \catcode`\:=13 % @@ -218,11 +302,11 @@ \def\HyColor@model@Gray{Gray} \@onelevel@sanitize\HyColor@model@Gray \def\HyColor@UseColor#1{% - \ifx#1\relax + \ifx\relax#1\@empty \else - \ifx#1\@empty + \ifx\@empty#1\@empty \else - \expandafter\HyColor@@UseColor#1\@nil + \expandafter\expandafter\expandafter\HyColor@@UseColor#1\@nil \fi \fi } diff --git a/Master/texmf-dist/tex/latex/hycolor/xcolor-patch.sty b/Master/texmf-dist/tex/latex/hycolor/xcolor-patch.sty index d59367fdd0c..ee1d7e4f418 100644 --- a/Master/texmf-dist/tex/latex/hycolor/xcolor-patch.sty +++ b/Master/texmf-dist/tex/latex/hycolor/xcolor-patch.sty @@ -9,11 +9,11 @@ %% This is a generated file. %% %% Project: hycolor -%% Version: 2019/12/15 v1.9 +%% Version: 2020-01-27 v1.10 %% %% Copyright (C) %% 2007-2011 Heiko Oberdiek -%% 2016-2019 Oberdiek Package Support Group +%% 2016-2020 Oberdiek Package Support Group %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -31,14 +31,13 @@ %% Heiko Oberdiek and the Oberdiek Package Support Group %% https://github.com/ho-tex/hycolor/issues %% -%% %% This work consists of the main source file hycolor.dtx %% and the derived files %% hycolor.sty, hycolor.pdf, hycolor.ins, hycolor.drv, %% xcolor-patch.sty %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{xcolor-patch}[2019/12/15 xcolor patch] +\ProvidesPackage{xcolor-patch}[2020/01/27 v1.10 xcolor patch] \RequirePackage{hopatch} \hopatch@AfterPackage{xcolor}{% \long\def\reserved@a#1#2#3{% -- cgit v1.2.3