[latex3-commits] [git/LaTeX3-latex3-latex3] master: Back to "scope" for states (0a51dfe)

[Joseph Wright]

Repository : https://github.com/latex3/latex3
On branch  : master
Link       : https://github.com/latex3/latex3/commit/0a51dfe63eb90999fec3c6ee4c00718b01d301a1

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

commit 0a51dfe63eb90999fec3c6ee4c00718b01d301a1
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Fri Mar 2 09:37:06 2018 +0000

    Back to "scope" for states
    
    This longer name doesn't really help.


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

0a51dfe63eb90999fec3c6ee4c00718b01d301a1
 l3experimental/l3draw/l3draw-scopes.dtx             |    6 +++---
 l3experimental/l3draw/l3draw.dtx                    |   10 +++++-----
 l3experimental/l3draw/testfiles/m3draw005.lvt       |    6 +++---
 l3experimental/l3draw/testfiles/m3draw005.ptex.tlg  |    2 +-
 l3experimental/l3draw/testfiles/m3draw005.tlg       |    2 +-
 l3experimental/l3draw/testfiles/m3draw005.uptex.tlg |    2 +-
 l3experimental/l3draw/testfiles/m3draw005.xetex.tlg |    2 +-
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/l3experimental/l3draw/l3draw-scopes.dtx b/l3experimental/l3draw/l3draw-scopes.dtx
index e2b6ef7..2210845 100644
--- a/l3experimental/l3draw/l3draw-scopes.dtx
+++ b/l3experimental/l3draw/l3draw-scopes.dtx
@@ -177,11 +177,11 @@
 % \end{variable}
 % \end{variable}
 %
-% \begin{macro}{\draw_scope_state_begin:, \draw_scope_state_begin:}
+% \begin{macro}{\draw_scope_begin:, \draw_scope_begin:}
 %   As well as the graphics (and \TeX{}) scope, also deal with global
 %   data structures.
 %    \begin{macrocode}
-\cs_new_protected:Npn \draw_scope_state_begin:
+\cs_new_protected:Npn \draw_scope_begin:
   {
     \driver_draw_scope_begin:
     \group_begin:
@@ -189,7 +189,7 @@
       \tl_set_eq:NN \l_@@_fill_color_tl \g_@@_fill_color_tl
       \tl_set_eq:NN \l_@@_stroke_color_tl \g_@@_stroke_color_tl
   }
-\cs_new_protected:Npn \draw_scope_state_end:
+\cs_new_protected:Npn \draw_scope_end:
   {
       \dim_gset_eq:NN \g_@@_linewidth_dim \l_@@_linewidth_dim
       \tl_gset_eq:NN \g_@@_fill_color_tl \l_@@_fill_color_tl
diff --git a/l3experimental/l3draw/l3draw.dtx b/l3experimental/l3draw/l3draw.dtx
index 4aa7c1a..88e393a 100644
--- a/l3experimental/l3draw/l3draw.dtx
+++ b/l3experimental/l3draw/l3draw.dtx
@@ -246,11 +246,11 @@
 % group (\cs{groupd_being:}/\cs{group_end:} pair): as such, they must be
 % nested correctly.
 %
-% \begin{function}{\draw_scope_state_begin:, \draw_scope_state_end:}
+% \begin{function}{\draw_scope_begin:, \draw_scope_end:}
 %   \begin{syntax}
-%     \cs{draw_scope_state_begin:}
+%     \cs{draw_scope_begin:}
 %     ...
-%     \cs{draw_scope_state_end:}
+%     \cs{draw_scope_end:}
 %   \end{syntax}
 %   Creates a scope for localisation of state settings within a drawing.
 %   A scope forms a \TeX{} group but will also localise global state
@@ -258,7 +258,7 @@
 %   concepts such as the termination of lines.
 %   \begin{demo}
 %     \draw_begin:
-%       \draw_scope_state_begin:
+%       \draw_scope_begin:
 %         \group_begin:
 %           \draw_linewidth:n { 2pt }
 %           \draw_path_rectangle:nn { 0 , 0 } { 2ex , 2ex }
@@ -266,7 +266,7 @@
 %         \group_end:
 %         \draw_path_rectangle:nn { 3ex , 0ex } { 2ex , 2ex }
 %         \draw_path_use:n  { stroke }
-%       \draw_scope_state_end:
+%       \draw_scope_end:
 %       \draw_path_rectangle:nn { 6ex , 0ex } { 2ex , 2ex }
 %       \draw_path_use_clear:n  { stroke }
 %     \draw_end:
diff --git a/l3experimental/l3draw/testfiles/m3draw005.lvt b/l3experimental/l3draw/testfiles/m3draw005.lvt
index d98a4c5..77bc293 100644
--- a/l3experimental/l3draw/testfiles/m3draw005.lvt
+++ b/l3experimental/l3draw/testfiles/m3draw005.lvt
@@ -31,16 +31,16 @@
 
 \START
 
-\TEST { \draw_scope_state_begin: }
+\TEST { \draw_scope_begin: }
   {
     \test:n
       {
-        \draw_scope_state_begin:
+        \draw_scope_begin:
           \draw_linewidth:n { 1pt }
           \draw_path_lineto:n { 1cm, 10cm }
           \draw_path_lineto:n { 2cm , 20cm }
           \draw_path_use_clear:n { stroke }
-        \draw_scope_state_end:
+        \draw_scope_end:
       }
   }
 
diff --git a/l3experimental/l3draw/testfiles/m3draw005.ptex.tlg b/l3experimental/l3draw/testfiles/m3draw005.ptex.tlg
index eceb466..f2e3dcc 100644
--- a/l3experimental/l3draw/testfiles/m3draw005.ptex.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw005.ptex.tlg
@@ -1,7 +1,7 @@
 This is a generated file for the LaTeX (2e + expl3) validation system.
 Don't change this file in any respect.
 ============================================================
-TEST 1: \draw_scope_state_begin: 
+TEST 1: \draw_scope_begin: 
 ============================================================
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
diff --git a/l3experimental/l3draw/testfiles/m3draw005.tlg b/l3experimental/l3draw/testfiles/m3draw005.tlg
index 246dafe..75fe1c6 100644
--- a/l3experimental/l3draw/testfiles/m3draw005.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw005.tlg
@@ -1,7 +1,7 @@
 This is a generated file for the LaTeX (2e + expl3) validation system.
 Don't change this file in any respect.
 ============================================================
-TEST 1: \draw_scope_state_begin: 
+TEST 1: \draw_scope_begin: 
 ============================================================
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
diff --git a/l3experimental/l3draw/testfiles/m3draw005.uptex.tlg b/l3experimental/l3draw/testfiles/m3draw005.uptex.tlg
index eceb466..f2e3dcc 100644
--- a/l3experimental/l3draw/testfiles/m3draw005.uptex.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw005.uptex.tlg
@@ -1,7 +1,7 @@
 This is a generated file for the LaTeX (2e + expl3) validation system.
 Don't change this file in any respect.
 ============================================================
-TEST 1: \draw_scope_state_begin: 
+TEST 1: \draw_scope_begin: 
 ============================================================
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
diff --git a/l3experimental/l3draw/testfiles/m3draw005.xetex.tlg b/l3experimental/l3draw/testfiles/m3draw005.xetex.tlg
index eceb466..f2e3dcc 100644
--- a/l3experimental/l3draw/testfiles/m3draw005.xetex.tlg
+++ b/l3experimental/l3draw/testfiles/m3draw005.xetex.tlg
@@ -1,7 +1,7 @@
 This is a generated file for the LaTeX (2e + expl3) validation system.
 Don't change this file in any respect.
 ============================================================
-TEST 1: \draw_scope_state_begin: 
+TEST 1: \draw_scope_begin: 
 ============================================================
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !