[latex3-commits] [l3svn] 01/02: Minor modification of internal variable name

noreply at latex-project.org noreply at latex-project.org
Sat May 13 17:43:24 CEST 2017 

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

joseph pushed a commit to branch master
in repository l3svn.

commit 4fac80b4c44ba287ccae59e3aacef8c735623399
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Sat May 13 16:38:50 2017 +0100

    Minor modification of internal variable name
    
    This should help keep the various parts of the driver code
    'related'.
---
 l3kernel/l3drivers.dtx                  |   42 +++++++++++++++----------------
 l3kernel/testfiles/m3expl001.luatex.tlg |    2 +-
 l3kernel/testfiles/m3expl001.ptex.tlg   |    2 +-
 l3kernel/testfiles/m3expl001.tlg        |    2 +-
 l3kernel/testfiles/m3expl001.uptex.tlg  |    2 +-
 l3kernel/testfiles/m3expl001.xetex.tlg  |    2 +-
 l3kernel/testfiles/m3expl003.luatex.tlg |    2 +-
 l3kernel/testfiles/m3expl003.ptex.tlg   |    2 +-
 l3kernel/testfiles/m3expl003.tlg        |    2 +-
 l3kernel/testfiles/m3expl003.uptex.tlg  |    2 +-
 l3kernel/testfiles/m3expl003.xetex.tlg  |    2 +-
 11 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/l3kernel/l3drivers.dtx b/l3kernel/l3drivers.dtx
index bc8cd00..4f6feec 100644
--- a/l3kernel/l3drivers.dtx
+++ b/l3kernel/l3drivers.dtx
@@ -640,17 +640,17 @@
 %
 % \subsubsection{Color}
 %
-% \begin{variable}{\l_@@_current_color_tl}
+% \begin{variable}{\l_@@_color_current_tl}
 %   The current color in driver-dependent format: pick up the package-mode
 %   data if available.
 %    \begin{macrocode}
-\tl_new:N \l_@@_current_color_tl
-\tl_set:Nn \l_@@_current_color_tl { 0~g~0~G }
+\tl_new:N \l_@@_color_current_tl
+\tl_set:Nn \l_@@_color_current_tl { 0~g~0~G }
 %<*package>
 \AtBeginDocument
   {
     \@ifpackageloaded { color }
-      { \tl_set:Nn \l_@@_current_color_tl { \current at color } }
+      { \tl_set:Nn \l_@@_color_current_tl { \current at color } }
       { }
   }
 %</package>
@@ -676,7 +676,7 @@
       { \luatex_pdfextension:D colorstack }
       { \pdftex_pdfcolorstack:D }
         \exp_not:N \l_@@_color_stack_int push
-          { \exp_not:N \l_@@_current_color_tl }
+          { \exp_not:N \l_@@_color_current_tl }
     \group_insert_after:N \exp_not:N \@@_color_reset:
   }
 \cs_new_protected:Npx \@@_color_reset:
@@ -799,16 +799,16 @@
 %
 % \subsubsection{Color}
 %
-% \begin{variable}{\l_@@_current_color_tl}
+% \begin{variable}{\l_@@_color_current_tl}
 %   The current color in driver-dependent format.
 %    \begin{macrocode}
-\tl_new:N \l_@@_current_color_tl
-\tl_set:Nn \l_@@_current_color_tl { [ 0 ] }
+\tl_new:N \l_@@_color_current_tl
+\tl_set:Nn \l_@@_color_current_tl { [ 0 ] }
 %<*package>
 \AtBeginDocument
   {
     \@ifpackageloaded { color }
-      { \tl_set:Nn \l_@@_current_color_tl { \current at color } }
+      { \tl_set:Nn \l_@@_color_current_tl { \current at color } }
       { }
   }
 %</package>
@@ -821,7 +821,7 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_color_ensure_current:
   {
-    \tex_special:D { pdf:bcolor~\l_@@_current_color_tl }
+    \tex_special:D { pdf:bcolor~\l_@@_color_current_tl }
     \group_insert_after:N \@@_color_reset:
   }
 \cs_new_protected:Npn \@@_color_reset:
@@ -854,7 +854,7 @@
       {
         \cs_set_protected:Npn \@@_color_ensure_current:
           {
-            \tex_special:D { color~push~\l_@@_current_color_tl }
+            \tex_special:D { color~push~\l_@@_color_current_tl }
             \group_insert_after:N \@@_color_reset:
           }
         \cs_set_protected:Npn \@@_color_reset:
@@ -1341,16 +1341,16 @@
 %
 % \subsubsection{Color}
 %
-% \begin{variable}{\l_@@_current_color_tl}
+% \begin{variable}{\l_@@_color_current_tl}
 %   The current color in driver-dependent format.
 %    \begin{macrocode}
-\tl_new:N \l_@@_current_color_tl
-\tl_set:Nn \l_@@_current_color_tl { gray~0 }
+\tl_new:N \l_@@_color_current_tl
+\tl_set:Nn \l_@@_color_current_tl { gray~0 }
 %<*package>
 \AtBeginDocument
   {
     \@ifpackageloaded { color }
-      { \tl_set:Nn \l_@@_current_color_tl { \current at color } }
+      { \tl_set:Nn \l_@@_color_current_tl { \current at color } }
       { }
   }
 %</package>
@@ -1363,7 +1363,7 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_color_ensure_current:
   {
-    \tex_special:D { color~push~\l_@@_current_color_tl }
+    \tex_special:D { color~push~\l_@@_color_current_tl }
     \group_insert_after:N \@@_color_reset:
   }
 \cs_new_protected:Npn \@@_color_reset:
@@ -1972,17 +1972,17 @@
 %
 % \subsubsection{Color}
 %
-% \begin{variable}{\l_@@_current_color_tl}
+% \begin{variable}{\l_@@_color_current_tl}
 %   The current color in driver-dependent format: the same as for
 %   \texttt{dvips}.
 %    \begin{macrocode}
-\tl_new:N \l_@@_current_color_tl
-\tl_set:Nn \l_@@_current_color_tl { gray~0 }
+\tl_new:N \l_@@_color_current_tl
+\tl_set:Nn \l_@@_color_current_tl { gray~0 }
 %<*package>
 \AtBeginDocument
   {
     \@ifpackageloaded { color }
-      { \tl_set:Nn \l_@@_current_color_tl { \current at color } }
+      { \tl_set:Nn \l_@@_color_current_tl { \current at color } }
       { }
   }
 %</package>
@@ -1995,7 +1995,7 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_color_ensure_current:
   {
-    \tex_special:D { color~push~\l_@@_current_color_tl }
+    \tex_special:D { color~push~\l_@@_color_current_tl }
     \group_insert_after:N \@@_color_reset:
   }
 \cs_new_protected:Npn \@@_color_reset:
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 66d0b7a..f252112 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -5055,7 +5055,7 @@ Defining \__driver_box_use_rotate:Nn on line ...
 Defining \l__driver_cos_fp on line ...
 Defining \l__driver_sin_fp on line ...
 Defining \__driver_box_use_scale:Nnn on line ...
-Defining \l__driver_current_color_tl on line ...
+Defining \l__driver_color_current_tl on line ...
 Defining \l__driver_color_stack_int on line ...
 \l__driver_color_stack_int=\count147
 Defining \__driver_color_ensure_current: on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 8794273..680d6f6 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -5015,7 +5015,7 @@ Defining \__driver_scope_end: on line ...
 Defining \__driver_box_use_clip:N on line ...
 Defining \__driver_box_use_rotate:Nn on line ...
 Defining \__driver_box_use_scale:Nnn on line ...
-Defining \l__driver_current_color_tl on line ...
+Defining \l__driver_color_current_tl on line ...
 Defining \__driver_color_ensure_current: on line ...
 Defining \__driver_color_reset: on line ...
 Defining \__driver_draw_literal:n on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index b754c50..5f55d5d 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -5244,7 +5244,7 @@ Defining \__driver_box_use_rotate:Nn on line ...
 Defining \l__driver_cos_fp on line ...
 Defining \l__driver_sin_fp on line ...
 Defining \__driver_box_use_scale:Nnn on line ...
-Defining \l__driver_current_color_tl on line ...
+Defining \l__driver_color_current_tl on line ...
 Defining \l__driver_color_stack_int on line ...
 \l__driver_color_stack_int=\count147
 Defining \__driver_color_ensure_current: on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 87a3743..0931547 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -5216,7 +5216,7 @@ Defining \__driver_scope_end: on line ...
 Defining \__driver_box_use_clip:N on line ...
 Defining \__driver_box_use_rotate:Nn on line ...
 Defining \__driver_box_use_scale:Nnn on line ...
-Defining \l__driver_current_color_tl on line ...
+Defining \l__driver_color_current_tl on line ...
 Defining \__driver_color_ensure_current: on line ...
 Defining \__driver_color_reset: on line ...
 Defining \__driver_draw_literal:n on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index b47169b..3d33a52 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -5025,7 +5025,7 @@ Defining \__driver_scope_end: on line ...
 Defining \__driver_box_use_clip:N on line ...
 Defining \__driver_box_use_rotate:Nn on line ...
 Defining \__driver_box_use_scale:Nnn on line ...
-Defining \l__driver_current_color_tl on line ...
+Defining \l__driver_color_current_tl on line ...
 Defining \__driver_color_ensure_current: on line ...
 Defining \__driver_color_reset: on line ...
 Defining \__driver_draw_literal:n on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 268a723..cda7fbb 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -5056,7 +5056,7 @@ Defining \__driver_box_use_rotate:Nn on line ...
 Defining \l__driver_cos_fp on line ...
 Defining \l__driver_sin_fp on line ...
 Defining \__driver_box_use_scale:Nnn on line ...
-Defining \l__driver_current_color_tl on line ...
+Defining \l__driver_color_current_tl on line ...
 Defining \l__driver_color_stack_int on line ...
 \l__driver_color_stack_int=\count147
 Defining \__driver_color_ensure_current: on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 1e2b13b..44778ab 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -5016,7 +5016,7 @@ Defining \__driver_scope_end: on line ...
 Defining \__driver_box_use_clip:N on line ...
 Defining \__driver_box_use_rotate:Nn on line ...
 Defining \__driver_box_use_scale:Nnn on line ...
-Defining \l__driver_current_color_tl on line ...
+Defining \l__driver_color_current_tl on line ...
 Defining \__driver_color_ensure_current: on line ...
 Defining \__driver_color_reset: on line ...
 Defining \__driver_draw_literal:n on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index ab10f24..d52cae6 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -5245,7 +5245,7 @@ Defining \__driver_box_use_rotate:Nn on line ...
 Defining \l__driver_cos_fp on line ...
 Defining \l__driver_sin_fp on line ...
 Defining \__driver_box_use_scale:Nnn on line ...
-Defining \l__driver_current_color_tl on line ...
+Defining \l__driver_color_current_tl on line ...
 Defining \l__driver_color_stack_int on line ...
 \l__driver_color_stack_int=\count147
 Defining \__driver_color_ensure_current: on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index fb904a0..89e91bb 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -5217,7 +5217,7 @@ Defining \__driver_scope_end: on line ...
 Defining \__driver_box_use_clip:N on line ...
 Defining \__driver_box_use_rotate:Nn on line ...
 Defining \__driver_box_use_scale:Nnn on line ...
-Defining \l__driver_current_color_tl on line ...
+Defining \l__driver_color_current_tl on line ...
 Defining \__driver_color_ensure_current: on line ...
 Defining \__driver_color_reset: on line ...
 Defining \__driver_draw_literal:n on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index 181e2e8..5fcc183 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -5026,7 +5026,7 @@ Defining \__driver_scope_end: on line ...
 Defining \__driver_box_use_clip:N on line ...
 Defining \__driver_box_use_rotate:Nn on line ...
 Defining \__driver_box_use_scale:Nnn on line ...
-Defining \l__driver_current_color_tl on line ...
+Defining \l__driver_color_current_tl on line ...
 Defining \__driver_color_ensure_current: on line ...
 Defining \__driver_color_reset: on line ...
 Defining \__driver_draw_literal:n on line ...

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

More information about the latex3-commits mailing list