[latex3-commits] [l3svn] 01/02: Simplify ensuring current colour

[noreply at latex-project.org]

This is an automated email from the git hooks/post-receive script.

joseph pushed a commit to branch master
in repository l3svn.

commit 8175d6f8ff3404627a8f048ef2a29c3452b2ad84
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Wed Apr 5 17:06:18 2017 +0100

    Simplify ensuring current colour
    
    As we always load some driver, there is no reason to make this so complex in
    the color submodule.
---
 l3kernel/expl3.dtx   |    1 +
 l3kernel/l3color.dtx |   25 -------------------------
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/l3kernel/expl3.dtx b/l3kernel/expl3.dtx
index c9de1d0..9d61683 100644
--- a/l3kernel/expl3.dtx
+++ b/l3kernel/expl3.dtx
@@ -1479,6 +1479,7 @@
               { \box_use:N #1 }
           }
       }
+    \cs_new_protected:Npn \color_ensure_current: { \set at color }
   }
 %    \end{macrocode}
 % \end{macro}
diff --git a/l3kernel/l3color.dtx b/l3kernel/l3color.dtx
index e6631c6..625b0ed 100644
--- a/l3kernel/l3color.dtx
+++ b/l3kernel/l3color.dtx
@@ -104,33 +104,8 @@
 %   A driver-independent wrapper for setting the foreground color to the
 %   current color \enquote{now}.
 %    \begin{macrocode}
-%<*initex>
 \cs_new_protected:Npn \color_ensure_current:
   { \__driver_color_ensure_current: }
-%</initex>
-%    \end{macrocode}
-%   In package mode, the driver code may not be loaded. To keep down
-%   dependencies, if there is no driver code available and no \cs{set at color}
-%   then color is not in use and this function can be a no-op.
-%    \begin{macrocode}
-%<*package>
-\cs_new_protected:Npn \color_ensure_current: { }
-\AtBeginDocument
-  {
-    \cs_if_exist:NTF \__driver_color_ensure_current:
-      {
-        \cs_set_protected:Npn \color_ensure_current:
-          { \__driver_color_ensure_current: }
-      }
-      {
-        \cs_if_exist:NT \set at color
-          {
-            \cs_set_protected:Npn \color_ensure_current:
-              { \set at color }
-          }
-      }
-  }
-%</package>
 %    \end{macrocode}
 % \end{macro}
 %

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.