Merge branch 'develop' of https://github.com/latex3/pdfresources into…

… develop

CHANGELOG.md

@@ -8,7 +8,9 @@ this project uses date-based 'snapshot' version identifiers.
 
 ### Fixed 
  - l3pdfmeta: adapted wtpdf declaration uri to corrected version.
-
+ - colorlinks=false no longer resets pdfborder (issue #69)
+ - added support to omit CidSet with luatex
+
 ## [2024-04-09]
 Version: 2024-04-09, 0.96h
 

hyperref-generic.dtx

@@ -486,7 +486,8 @@
 %   would arise it would possible to change this.
 %  \subsection{Changed behaviour}
 %   \begin{description}
-%   \item[colorlinks] |colorlinks| will as before disable the |pdfborder|, but it is possible
+%   \item[colorlinks] |colorlinks| or |colorlinks=true| will as before disable the |pdfborder| 
+%   (|colorlinks=false| will leave the |pdfborder| untouched), but it is possible
 %    to use the key in the document at any time, or to reenable the border if wanted.
 %    Internally |colorlinks| \& friends will no longer define/undefine
 %    |\Hy@colorlink|, but instead use the hooks provided by the \pkg{l3pdfannot} package.
@@ -2652,7 +2653,8 @@
 %    \begin{macrocode}
 \keys_define:nn { hyp }
   {
-    ,colorlinks .meta:n =
+    ,colorlinks .choice:
+    ,colorlinks / true  .meta:n =
       {
         ,pdfborder={0~0~0}
         ,pdfborderstyle=
@@ -2662,6 +2664,14 @@
         ,colormenu =#1
         ,colorfile =#1
         }
+    ,colorlinks / false  .meta:n =
+      {
+        ,colorurl  =#1
+        ,colorlink =#1
+        ,colorrun  =#1
+        ,colormenu =#1
+        ,colorfile =#1
+        }        
     ,colorlinks .default:n = {true}
   }
 %    \end{macrocode}

l3backend-testphase.dtx

@@ -2528,6 +2528,23 @@
 %    \end{macrocode}
 % \end{macro}
 % 
+%  With luatex it is for some standards also necessary to suppress the CidSet
+%  entry in the fonts (with xetex there seem to be no problem. 
+% \begin{macro}{\@@_backend_omit_cidset:n}
+% The option to omit /Charset exists already for quite some time for the two 
+% engines.
+%    \begin{macrocode}
+%<*xdvipdfmx|dvipdfmx|dvips|dvisvgm|pdftex>
+\cs_new_protected:Npn \@@_backend_omit_cidset:n #1 {} %#1 number
+%</xdvipdfmx|dvipdfmx|dvips|dvisvgm>
+%<*luatex>
+\cs_new_protected:Npn \@@_backend_omit_cidset:n #1 %#1 number
+  {
+    \tex_pdfvariable:D omitcidset  = #1 \scan_stop:
+  } 
+%</luatex>
+%    \end{macrocode}
+% \end{macro}
 
 %
 % \subsection{lua code for lualatex}

testfiles-pdftex/colorlinks.pvt

@@ -0,0 +1,15 @@
+% from issue #69
+\ExplSyntaxOn
+\debug_on:n { check-declarations , deprecation }
+\msg_redirect_module:nnn { pdf } { none } { warning }
+\ExplSyntaxOff
+\DocumentMetadata
+ {}
+\input{regression-test}
+\documentclass{book}
+\usepackage{hyperref}
+\hypersetup{colorlinks      = false}
+\begin{document}
+\START
+    \url{https://www.example.com}
+\end{document}