[latex3-commits] [git/LaTeX3-latex3-pdfresources] splitting: hyperref changes (5668fc0)

[Ulrike Fischer]

Repository : https://github.com/latex3/pdfresources
On branch  : splitting
Link       : https://github.com/latex3/pdfresources/commit/5668fc0f550823bbef848061e8f1a65e7720c777

>---------------------------------------------------------------

commit 5668fc0f550823bbef848061e8f1a65e7720c777
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date:   Thu Sep 3 00:41:21 2020 +0200

    hyperref changes


>---------------------------------------------------------------

5668fc0f550823bbef848061e8f1a65e7720c777
 experiments/hycolor-tests.tex   | 28 +++++-----------------------
 experiments/hyperref-colors.tex | 30 ++++++++++++++++++++++++++++++
 hgeneric-experimental.def       |  2 +-
 testfiles/catalog-remove.lvt    |  2 +-
 4 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/experiments/hycolor-tests.tex b/experiments/hycolor-tests.tex
index b439cf2..f45e1d3 100644
--- a/experiments/hycolor-tests.tex
+++ b/experiments/hycolor-tests.tex
@@ -7,23 +7,6 @@
 \usepackage[customdriver=hgeneric-experimental]{hyperref}
 
 \makeatletter
-\ExplSyntaxOn
-\cs_new:Npx \__color_split_colon:n #1
-  {
-    \exp_not:N \__color_split_colon:w  #1 \c_colon_str \c_colon_str
-    \exp_not:N \q_stop
-  }
-\use:x
-  {
-    \cs_new:Npn \exp_not:N \__color_split_colon:w ##1 \c_colon_str ##2 \c_colon_str
-    ##3 \exp_not:N \q_stop
-  }
-  {
-    \tl_if_blank:nTF {#2}
-      { #1 }
-      { #2 }
-  }
-  \ExplSyntaxOff
 \protected\def\definecolor#1#2#3{%
   \@ifundefined{color@#2}%
     {\c at lor@error{model `#2'}}%
@@ -47,8 +30,6 @@
       \c at lor@usename{#2}}}}
 \@onlypreamble\DefineNamedColor
 
-
-
 \usepackage[dvipsnames]{xcolor}
 
 \usepackage{etoolbox}
@@ -56,8 +37,9 @@
 \ExplSyntaxOn
 \cs_if_exist:NT \color_set:nnn
    {
-     \cs_new_protected:Npn \@expl at color@set at nnn #1#2#3
-       { \exp_args:Nnx\color_set:nnn {#1}{\__color_split_colon:n { #2 }}{#3}}
+    % \cs_new_protected:Npn \@expl at color@set at nnn #1#2#3
+%       { \exp_args:Nnx\color_set:nnn {#1}{#2}{#3}}
+     \cs_gset_eq:NN \@expl at color@set at nnn \color_set:nnn  
      \cs_gset_eq:NN \@expl at color@set at nn \color_set:nn
    }
 \pretocmd{\XC at definec@lor}{\@expl at color@set at nnn{#2}{#4}{#5}}{}{\fail}
@@ -89,8 +71,8 @@ works: gray,rgb, RGB,HTML,
 %\definecolor{htmlcol}{wave}{500} \color{htmlcol}XXXX
 %\end{document}
 
-\definecolor{blub}{rgb/cmyk}{1,0.123,0/1,1,1,0.1345}
-\providecolor{blub}{hsb:rgb/cmyk}{1,0.1773,0/1,1,1,0.1345}
+%\definecolor{blub}{rgb/cmyk}{1,0.123,0/1,1,1,0.1345}
+\definecolor{blub}{hsb:rgb/cmyk}{1,0.1773,0/1,1,1,0.1345}
 
 \colorlet{blab}{blub}
 
diff --git a/experiments/hyperref-colors.tex b/experiments/hyperref-colors.tex
new file mode 100644
index 0000000..6c6c218
--- /dev/null
+++ b/experiments/hyperref-colors.tex
@@ -0,0 +1,30 @@
+plans about keys
+
+    URI   = url,
+    GoTo  = link,
+    GoToR = file,
+    Named = menu,
+    Launch= run
+
+urlborder     boolean
+linkborder    boolean
+fileborder
+menuborder
+runborder
+allborder
+
+or?
+useborder     = {url,link,all,none}
+usecolor      = {url,link,all,none}
+colorlinks == usecolor=all,useborder=none
+
+borderstyle= [url,link,all]{/S/U/W 1}
+
+borderwidth= [url,link,all]{1 0 0}
+pdfborder alias for [all] ...
+
+
+bordercolor =[url,link,all]{
+urlbordercolor
+
+linkcolor
diff --git a/hgeneric-experimental.def b/hgeneric-experimental.def
index 5d4cc0b..fd05d53 100644
--- a/hgeneric-experimental.def
+++ b/hgeneric-experimental.def
@@ -41,7 +41,7 @@
   [2020/05/17 v0.6 %
   Hyperref driver for luaTeX]
 
-\RequirePackage{xparse,etoolbox}
+\RequirePackage{xparse,etoolbox,l3color}
 \chardef\Hy at VersionChecked=1 %don't check the version!
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \ExplSyntaxOn
diff --git a/testfiles/catalog-remove.lvt b/testfiles/catalog-remove.lvt
index 674a184..ca3ed1f 100644
--- a/testfiles/catalog-remove.lvt
+++ b/testfiles/catalog-remove.lvt
@@ -1,6 +1,6 @@
+\RequirePackage{pdfresources}\DeclareDocumentMetaData{}
 \input{regression-test}
 \documentclass{article}
-\usepackage{pdfresources}
 \ExplSyntaxOn
 \pdf_uncompress:
 \ExplSyntaxOff