[latex3-commits] [git/LaTeX3-latex3-latex3] color-export: Correct HTML/annotation split (ce357a331)

[Joseph Wright]

Repository : https://github.com/latex3/latex3
On branch  : color-export
Link       : https://github.com/latex3/latex3/commit/ce357a33197afe7b37ae93c8e4aab694fa65b339

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

commit ce357a33197afe7b37ae93c8e4aab694fa65b339
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Sat Jun 13 19:55:16 2020 +0100

    Correct HTML/annotation split


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

ce357a33197afe7b37ae93c8e4aab694fa65b339
 l3experimental/l3color/l3color.dtx              |  4 ++--
 l3experimental/l3color/testfiles/m3color002.tlg | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/l3experimental/l3color/l3color.dtx b/l3experimental/l3color/l3color.dtx
index 5431abce8..605b916da 100644
--- a/l3experimental/l3color/l3color.dtx
+++ b/l3experimental/l3color/l3color.dtx
@@ -1018,9 +1018,9 @@
 %   required, then do some simple maths.
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_export_format_annotation:nnN #1#2#3
-  { \@@_export_rgb:nnNN {#1} {#2} #3 \@@_export_HTML:Nw }
+  { \@@_export_rgb:nnNN {#1} {#2} #3 \@@_export_annotation:Nw }
 \cs_new_protected:Npn \@@_export_format_HTML:nnN #1#2#3
-  { \@@_export_rgb:nnNN {#1} {#2}#3 \@@_export_annotation:Nw }
+  { \@@_export_rgb:nnNN {#1} {#2}#3 \@@_export_HTML:Nw }
 \cs_new_protected:Npn \@@_export_rgb:nnNN #1#2#3#4
   {
     \str_if_eq:nnTF {#1} { rgb }
diff --git a/l3experimental/l3color/testfiles/m3color002.tlg b/l3experimental/l3color/testfiles/m3color002.tlg
index 8268b22a2..d44e881cd 100644
--- a/l3experimental/l3color/testfiles/m3color002.tlg
+++ b/l3experimental/l3color/testfiles/m3color002.tlg
@@ -69,28 +69,28 @@ l. ...  }
 ============================================================
 TEST 3: Exporting colors
 ============================================================
-> \l_tmpa_tl=0000FF.
+> \l_tmpa_tl=0.0 0.0 1.0.
 <recently read> }
 l. ...  }
-> \l_tmpa_tl=800080.
+> \l_tmpa_tl=0.5 0 0.5.
 <recently read> }
 l. ...  }
-> \l_tmpa_tl=00FFFF.
+> \l_tmpa_tl=0 1 1.
 <recently read> }
 l. ...  }
-> \l_tmpa_tl=999999.
+> \l_tmpa_tl=0.6 0.6 0.6.
 <recently read> }
 l. ...  }
-> \l_tmpa_tl=0.0 0.0 1.0.
+> \l_tmpa_tl=0000FF.
 <recently read> }
 l. ...  }
-> \l_tmpa_tl=0.5 0 0.5.
+> \l_tmpa_tl=800080.
 <recently read> }
 l. ...  }
-> \l_tmpa_tl=0 1 1.
+> \l_tmpa_tl=00FFFF.
 <recently read> }
 l. ...  }
-> \l_tmpa_tl=0.6 0.6 0.6.
+> \l_tmpa_tl=999999.
 <recently read> }
 l. ...  }
 ============================================================