[latex3-commits] [git/LaTeX3-latex3-pdfresources] develop: correct auxiliary functions of internal color commands (85f67cf)

[Ulrike Fischer]

Repository : https://github.com/latex3/pdfresources
On branch  : develop
Link       : https://github.com/latex3/pdfresources/commit/85f67cfcb452c19c4306550d7b4d060e257933bb

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

commit 85f67cfcb452c19c4306550d7b4d060e257933bb
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date:   Mon Apr 5 21:14:02 2021 +0200

    correct auxiliary functions of internal color commands


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

85f67cfcb452c19c4306550d7b4d060e257933bb
 hyperref-generic.dtx | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/hyperref-generic.dtx b/hyperref-generic.dtx
index a1bed35..5ff74a9 100644
--- a/hyperref-generic.dtx
+++ b/hyperref-generic.dtx
@@ -2292,17 +2292,16 @@
 % \section{Link decorations}
 % \subsection{Functions to export and select colors}
 % We support two input syntax: color expressions and model with values.
-% \begin{function}{\@@_color_export:nnN,\@@_colormodel_export:nnnN}
+% \begin{function}{\@@_color_export:nnN}
 %   \begin{syntax}
-%    \cs{@@_color_export:nnN} \Arg{color} \Arg{export format} \meta{tlvar}\\
-%    \cs{@@_colormodel_export:nnnN} \Arg{color model}\Arg{value} \Arg{export format} \meta{tlvar}
+%    \cs{@@_color_export:nnN} \Arg{color} \Arg{export format} \meta{tlvar}
 %   \end{syntax}
 %   This exports a color as space separated numbers as needed in in |/C|.
 %  \Arg{color} should have either the format |[model]{value}| or be a color expression.
 %  For examples: |[rgb]{1,0,.5}| or |red!50!blue|. The export format is either
 %  |space-sep-cmyk| or |space-sep-rgb|.
 % \end{function}
-%  \begin{macro}{\@@_color_export:nnN,\@@_colormodel_export:nnnN}
+%  \begin{macro}{\@@_color_export:nnN,\@@_color_export_aux:wnnN}
 %   Color keys need to parse color expressions. Two input types are supported:
 %  |color=[rgb]{1,0,.5}| and |color=red!50!blue|. The colors are exported
 %  to PDF syntax (space separated numbers).
@@ -2311,14 +2310,14 @@
  {
    \tl_if_head_eq_charcode:nNTF {#1}[ %]
     {
-      \@@_colormodel_export:wnnN  #1 {#2} #3
+      \@@_color_export_aux:wnnN  #1 {#2} #3
     }
     {
       \color_export:nnN {#1} {#2} #3
     }
  }
 
-\cs_new_protected:Npn \@@_colormodel_export:wnnN  [#1] #2 #3 #4
+\cs_new_protected:Npn \@@_color_export_aux:wnnN  [#1] #2 #3 #4
   {
      \color_export:nnnN {#1}{#2}{#3}#4
   }
@@ -2335,7 +2334,7 @@
 %  \Arg{color} should have either the format |[model]{value}| or be a color expression.
 %  For examples: |[rgb]{1,0,.5}| or |red!50!blue|
 % \end{function}
-%  \begin{macro}{\@@_color_select:n,\@@_colormodel_select_aux:wn}
+%  \begin{macro}{\@@_color_select:n,\@@_color_select_aux:wn}
 %   Color keys need to parse color expressions. Two input types are supported:
 %  |color=[rgb]{1,0,.5}| and |color=red!50!blue|.
 %    \begin{macrocode}
@@ -2343,14 +2342,14 @@
  {
    \tl_if_head_eq_charcode:nNTF {#1}[ %]
     {
-      \@@_colormodel_select_aux:wn  #1
+      \@@_color_select_aux:wn  #1
     }
     {
       \color_select:n {#1}
     }
  }
 
-\cs_new_protected:Npn \@@_colormodel_select_aux:wn  [#1] #2
+\cs_new_protected:Npn \@@_color_select_aux:wn  [#1] #2
   {
      \color_select:nn {#1}{#2}
   }
@@ -2367,7 +2366,7 @@
 %  \Arg{color} should have either the format |[model]{value}| or be a color expression.
 %  For examples: |[rgb]{1,0,.5}| or |red!50!blue|
 % \end{function}
-%  \begin{macro}{\@@_color_set:nn,\@@_colormodel_set_aux:nwn}
+%  \begin{macro}{\@@_color_set:nn,\@@_color_set_aux:nwn}
 %   Color keys need to parse color expressions. Two input types are supported:
 %  |color=[rgb]{1,0,.5}| and |color=red!50!blue|.
 %    \begin{macrocode}
@@ -2375,14 +2374,14 @@
  {
    \tl_if_head_eq_charcode:nNTF {#2}[ %]
     {
-      \@@_colormodel_set_aux:nwn  { #1 } #2
+      \@@_color_set_aux:nwn  { #1 } #2
     }
     {
       \color_set:nn {#1} {#2}
     }
  }
 
-\cs_new_protected:Npn \@@_colormodel_set_aux:nwn #1 [#2] #3
+\cs_new_protected:Npn \@@_color_set_aux:nwn #1 [#2] #3
   {
      \color_set:nnn {#1}{#2}{#3}
   }