[latex3-commits] [latex3/latex2e] latex-lab/uf-review-05: switch to e-type (507cc33b)

github at latex-project.org github at latex-project.org
Mon Nov 6 00:37:26 CET 2023


Repository : https://github.com/latex3/latex2e
On branch  : latex-lab/uf-review-05
Link       : https://github.com/latex3/latex2e/commit/507cc33bf969180a5bff00e3e73dbfec76f372ee

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

commit 507cc33bf969180a5bff00e3e73dbfec76f372ee
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date:   Mon Nov 6 00:37:26 2023 +0100

    switch to e-type


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

507cc33bf969180a5bff00e3e73dbfec76f372ee
 required/latex-lab/latex-lab-bib.dtx     | 4 ++--
 required/latex-lab/latex-lab-block.dtx   | 4 ++--
 required/latex-lab/latex-lab-float.dtx   | 6 +++---
 required/latex-lab/latex-lab-graphic.dtx | 9 ++++++---
 required/latex-lab/latex-lab-math.dtx    | 2 +-
 required/latex-lab/latex-lab-sec.dtx     | 8 ++++----
 required/latex-lab/latex-lab-toc.dtx     | 8 ++++----
 7 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/required/latex-lab/latex-lab-bib.dtx b/required/latex-lab/latex-lab-bib.dtx
index a467bf31..9e4aaa1e 100644
--- a/required/latex-lab/latex-lab-bib.dtx
+++ b/required/latex-lab/latex-lab-bib.dtx
@@ -264,7 +264,7 @@
 \AddToHookWithArguments{bibcite/before}
   {
     \tag_mc_end_push:
-    \exp_args:Nx\tagstructbegin{tag=Reference,ref=cite.#1\@extra at b@citeb}
+    \exp_args:Ne\tagstructbegin{tag=Reference,ref=cite.#1\@extra at b@citeb}
     \tagmcbegin{}
   }
 \AddToHookWithArguments{bibcite/after}[tag]
@@ -318,7 +318,7 @@
  {
    \leavevmode
    \tag_mc_end_push:
-   \exp_args:Nx\tag_struct_begin:n{tag=Reference,ref=cite.#1\@extra at b@citeb}
+   \exp_args:Ne\tag_struct_begin:n{tag=Reference,ref=cite.#1\@extra at b@citeb}
    \tag_mc_begin:n{}
  }
 \AddToHook{cmd/hyper at natlinkend/after}
diff --git a/required/latex-lab/latex-lab-block.dtx b/required/latex-lab/latex-lab-block.dtx
index e0a723ca..8ed73325 100644
--- a/required/latex-lab/latex-lab-block.dtx
+++ b/required/latex-lab/latex-lab-block.dtx
@@ -1342,14 +1342,14 @@
            \@definecounter {#2}
            \IfNoValueTF {#4}
              {  % @ynthm
-               \tl_gset:cx { the #2 }
+               \tl_gset:ce { the #2 }
                   {
                     \@thmcounter{#2}
                   }
              }
              {  % @xnthm
                \@newctr{#1}[#4]
-               \tl_gset:cx { the #2 }
+               \tl_gset:ce { the #2 }
                   {
                     \expandafter\noexpand\csname the#4\endcsname
                     \@thmcountersep
diff --git a/required/latex-lab/latex-lab-float.dtx b/required/latex-lab/latex-lab-float.dtx
index 3bd34836..ccd25610 100644
--- a/required/latex-lab/latex-lab-float.dtx
+++ b/required/latex-lab/latex-lab-float.dtx
@@ -182,7 +182,7 @@
         \seq_map_inline:Nn\g_@@_float_types_seq
           {
             \tag_struct_begin:n{tag=##1s,stash}
-            \prop_gput:Nnx\g_@@_float_sect_prop {##1-struct}{\int_use:N\c at g__tag_struct_abs_int} 
+            \prop_gput:Nne\g_@@_float_sect_prop {##1-struct}{\int_use:N\c at g__tag_struct_abs_int} 
             \tag_struct_end:
           }  
       }   
@@ -290,12 +290,12 @@
    {
      \exp_args:Ne
      \tag_struct_begin:n{tag=float,parent=0\prop_item:No\g_@@_float_sect_prop{\@captype-struct}}%
-     \prop_gput:Nxx \g_@@_float_sect_prop {\@captype-used}{true}
+     \prop_gput:Nee \g_@@_float_sect_prop {\@captype-used}{true}
    }
    {
      \tag_struct_begin:n{tag=float}
    }
-     \tl_set:Nx\@current at float@struct{\tag_get:n{struct_num}}%
+     \tl_set:Ne\@current at float@struct{\tag_get:n{struct_num}}%
      \typeout{Float structure: \@current at float@struct}   
  }
 
diff --git a/required/latex-lab/latex-lab-graphic.dtx b/required/latex-lab/latex-lab-graphic.dtx
index 158b0d2a..9585bee1 100644
--- a/required/latex-lab/latex-lab-graphic.dtx
+++ b/required/latex-lab/latex-lab-graphic.dtx
@@ -184,7 +184,10 @@
 \RequirePackage{l3opacity}
 %    \end{macrocode}
 %
-%
+% Needed during switch to e-type:
+%    \begin{macrocode}
+\cs_generate_variant:Nn \@@_prop_gput:Nnn {cne}
+%    \end{macrocode}
 % \begin{macro}{\@@_graphic_savepos:n}
 % this is the command which stores the position. Similar to 
 % zref-savepos it uses two savepos commands 
@@ -894,7 +897,7 @@
 % The structure and the mc must be open earlier, before the \cs{setbox}  (at least
 % for luatex it has to). TODO: think about interface if more attributes are needed.
 %    \begin{macrocode}
-      \@@_prop_gput:cnx
+      \@@_prop_gput:cne
          { g_@@_struct_\int_eval:n {\c at g_@@_struct_abs_int}_prop }
          { A } 
          {
@@ -970,7 +973,7 @@
            {red}
            {\int_use:N\g_@@_graphic_int}
         }
-      \@@_prop_gput:cnx
+      \@@_prop_gput:cne
             { g_@@_struct_\int_eval:n {\c at g_@@_struct_abs_int}_prop }
             { A } 
             {
diff --git a/required/latex-lab/latex-lab-math.dtx b/required/latex-lab/latex-lab-math.dtx
index fe76edd8..fcd4db50 100644
--- a/required/latex-lab/latex-lab-math.dtx
+++ b/required/latex-lab/latex-lab-math.dtx
@@ -792,7 +792,7 @@
 \def\@kernel at math@begin {
 %  \typeout{==>~math~begin}
 % needs different handling if we support nesting
-  \tl_gset:Nx\tmpmathcontent
+  \tl_gset:Ne\tmpmathcontent
      {
        LaTeX~ formula~ starts~
        \exp_not:N\begin{\g_@@_grabbed_env_tl}
diff --git a/required/latex-lab/latex-lab-sec.dtx b/required/latex-lab/latex-lab-sec.dtx
index ae7a0b85..77fa2039 100644
--- a/required/latex-lab/latex-lab-sec.dtx
+++ b/required/latex-lab/latex-lab-sec.dtx
@@ -214,11 +214,11 @@
   \fi
   \IfBooleanTF {#1}
    {
-     \tl_gset:Nx \@currentHref {#3}
+     \tl_gset:Ne \@currentHref {#3}
    }
    {
      \int_gincr:N\g__kernel_target_int
-     \tl_gset:Nx \@currentHref {target*.\int_use:N\g__kernel_target_int}
+     \tl_gset:Ne \@currentHref {target*.\int_use:N\g__kernel_target_int}
    }  
  }
 \ExplSyntaxOff 
@@ -260,7 +260,7 @@
          tag= {\int_compare:nNnTF {#1}={-1}{Part}{Sect}}
         ,#2
       } 
-    \seq_gpush:Nx \g__tag_sec_stack_seq {{\g__tag_struct_tag_tl}{\int_eval:n{#1}}}    
+    \seq_gpush:Ne \g__tag_sec_stack_seq {{\g__tag_struct_tag_tl}{\int_eval:n{#1}}}    
   }
 %    \end{macrocode}
 % \end{macro}
@@ -289,7 +289,7 @@
               \__tag_sec_end:n {#1}        
             }
             { 
-              \msg_warning:nnxx {tag}{wrong-sect-nesting}
+              \msg_warning:nnee {tag}{wrong-sect-nesting}
                { \exp_last_unbraced:NV\use_i:nn \l__tag_tmpa_tl }
                { \exp_last_unbraced:NV\use_i:nn \l__tag_tmpb_tl } 
             }
diff --git a/required/latex-lab/latex-lab-toc.dtx b/required/latex-lab/latex-lab-toc.dtx
index 6def505e..a5bbb0f1 100644
--- a/required/latex-lab/latex-lab-toc.dtx
+++ b/required/latex-lab/latex-lab-toc.dtx
@@ -271,7 +271,7 @@
             { \int_compare_p:nNn { \g_@@_toc_level_int } > {-100} }
             { \int_compare_p:nNn { \use:c{toclevel@#1} }   > { \g_@@_toc_level_int } }
             {
-              \seq_gpush:Nx \g_@@_toc_stack_seq {{TOC}\use:c{toclevel@#1}}
+              \seq_gpush:Ne \g_@@_toc_stack_seq {{TOC}\use:c{toclevel@#1}}
               \tag_struct_begin:n{tag=TOC}
             }
 %    \end{macrocode}
@@ -298,7 +298,7 @@
 %    \begin{macrocode}
           \group_begin:
            \text_declare_expand_equivalent:Nn \numberline \use_none:n
-           \exp_args:Nx \tag_struct_begin:n{tag=TOCI,title={\text_purify:n {#2}}}
+           \exp_args:Ne \tag_struct_begin:n{tag=TOCI,title={\text_purify:n {#2}}}
 %    \end{macrocode}
 % The TOCI structure should get a /Ref, so we put a request with its destination
 % name into the prop.
@@ -307,9 +307,9 @@
 % need to store fake names.
 % \end{NOTE}
 %    \begin{macrocode}
-           \prop_gput:Nxx \g_@@_struct_ref_by_dest_prop
+           \prop_gput:Nee \g_@@_struct_ref_by_dest_prop
              { \tag_get:n {struct_num} }{#3}
-           \seq_gpush:Nx \g_@@_toc_stack_seq {{TOCI}\use:c{toclevel@#1}}
+           \seq_gpush:Ne \g_@@_toc_stack_seq {{TOCI}\use:c{toclevel@#1}}
           \group_end:
        }
     }





More information about the latex3-commits mailing list.