2020-11-17 12:42:00

1 files changed, 30 insertions, 30 deletions

diff --git a/tex/context/base/mkiv/lang-lab.mkxl b/tex/context/base/mkiv/lang-lab.mkxl
index 881ad3861..8968631a0 100644
--- a/tex/context/base/mkiv/lang-lab.mkxl
+++ b/tex/context/base/mkiv/lang-lab.mkxl
@@ -67,28 +67,28 @@
      {\lang_labels_define_class_indeed
         {#1}%
         {\ifchknum#2\or#2\else\zerocount\fi}%
-        \expandafter\noexpand\csname   dogetupsome#1text\endcsname
-        \expandafter\noexpand\csname          #1language\endcsname
-        \expandafter\noexpand\csname dodogetupsome#1text\endcsname
-        \expandafter\noexpand\csname          left#1text\endcsname
-        \expandafter\noexpand\csname         right#1text\endcsname
-        \expandafter\noexpand\csname             #1texts\endcsname
-        \expandafter\noexpand\csname              #1text\endcsname}}
+        \expandafter\noexpand\csname lang_labels_#1_text_1\endcsname
+        \expandafter\noexpand\csname            #1language\endcsname
+        \expandafter\noexpand\csname lang_labels_#1_text_2\endcsname
+        \expandafter\noexpand\csname            left#1text\endcsname
+        \expandafter\noexpand\csname           right#1text\endcsname
+        \expandafter\noexpand\csname               #1texts\endcsname
+        \expandafter\noexpand\csname                #1text\endcsname}}
 
 % hm, not interfaced
 
 \let\thetextprefix\empty
 
 \protected\def\lang_labels_define_class_indeed#1#2#3#4#5#6#7#8#9%
-  {\setuvalue {setup#1text}{\protecttextprefixes#2\def\currenttextprefixclass{#1}\lang_labels_text_prefix_setup}%
-   \setuvalue{preset#1text}{\protecttextprefixes 1\def\currenttextprefixclass{#1}\lang_labels_text_prefix_setup}%
-   \setuvalue  {copy#1text}{\protecttextprefixes 1\def\currenttextprefixclass{#1}\lang_labels_text_prefix_copy }%
-   \setuvalue {start#1text}{\protecttextprefixes 1\def\currenttextprefixclass{#1}\lang_labels_text_prefix_start[#1]}%
-   \letvalue{stop#1text}\relax
-   \def#4{\reallanguagetag{\defaultlanguage\currentmainlanguage}}%
+  {\permanent\instance\setuvalue {setup#1text}{\protecttextprefixes#2\def\currenttextprefixclass{#1}\lang_labels_text_prefix_setup}%
+   \permanent\instance\setuvalue{preset#1text}{\protecttextprefixes 1\def\currenttextprefixclass{#1}\lang_labels_text_prefix_setup}%
+   \permanent\instance\setuvalue  {copy#1text}{\protecttextprefixes 1\def\currenttextprefixclass{#1}\lang_labels_text_prefix_copy }%
+   \permanent\instance\setuvalue {start#1text}{\protecttextprefixes 1\def\currenttextprefixclass{#1}\lang_labels_text_prefix_start[#1]}%
+   \permanent\instance\letvalue   {stop#1text}\relax
+   \permanent\instance\def#4{\reallanguagetag{\defaultlanguage\currentmainlanguage}}%
    \ifnum#2=\plustwo % used for math and tags
-     \def#3{#5#4}%
-     \def#5##1##2% ##1=language
+     \instance\def#3{#5#4}%
+     \instance\def#5##1##2% ##1=language
        {\ifcsname\??label\currentlabelcategory#1:##1:##2\endcsname
           \lastnamedcs
         \orelse\ifcsname\??label#1:##1:##2\endcsname
@@ -106,13 +106,13 @@
         \else
           ##2%
         \fi}%
-     \let#6\gobbleoneargument
-     \let#7\gobbleoneargument
-     \let#8\gobbletwoarguments
-     \let#9#3%
+     \permanent\instance\let#6\gobbleoneargument
+     \permanent\instance\let#7\gobbleoneargument
+     \permanent\instance\let#8\gobbletwoarguments
+     \permanent\instance\let#9#3%
    \else
-     \protected\def#3{#5#4}%
-     \protected\def#5##1##2%
+     \instance\protected\def#3{#5#4}%
+     \instance\protected\def#5##1##2%
        {\ifcsname\??label#1:##1:##2\endcsname
           \enforced\expandafter\let\expandafter\thetextprefix\lastnamedcs
         \orelse\ifcsname\??language#4\s!default\endcsname
@@ -124,16 +124,16 @@
         \else
           \enforced\let\thetextprefix\dummytextprefix
         \fi}%
-     \protected\def#6##1{#3{##1}\expandafter\flushleftlabelclass \thetextprefix}%
-     \protected\def#7##1{#3{##1}\expandafter\flushrightlabelclass\thetextprefix}%
-     \protected\def#8##1{#3{##1}\expandafter\flushbothlabelclass \thetextprefix}% #2
-     \protected\def#9##1{#3{##1}\expandafter\flushleftlabelclass \thetextprefix}%
+     \permanent\instance\protected\def#6##1{#3{##1}\expandafter\flushleftlabelclass \thetextprefix}%
+     \permanent\instance\protected\def#7##1{#3{##1}\expandafter\flushrightlabelclass\thetextprefix}%
+     \permanent\instance\protected\def#8##1{#3{##1}\expandafter\flushbothlabelclass \thetextprefix}% #2
+     \permanent\instance\protected\def#9##1{#3{##1}\expandafter\flushleftlabelclass \thetextprefix}%
    \fi
    \appendtoks
-     \let#6\firstofoneargument % to be checked
-     \let#7\firstofoneargument % to be checked
-     \let#8\firstofoneargument % to be checked
-     \let#9\firstofoneargument % to be checked
+     \enforced\permanent\instance\let#6\firstofoneargument % to be checked
+     \enforced\permanent\instance\let#7\firstofoneargument % to be checked
+     \enforced\permanent\instance\let#8\firstofoneargument % to be checked
+     \enforced\permanent\instance\let#9\firstofoneargument % to be checked
    \to \everysimplifycommands}
 
 % why not lang_* ?
@@ -159,7 +159,7 @@
 %D These macros enable us to automatically define head and label texts without
 %D replacing predefined ones. They are internal macros.
 
-\appendtoks \let\labellanguage\currentlanguage \to \everycurrentdate
+\appendtoks \enforced\let\labellanguage\currentlanguage \to \everycurrentdate
 
 \newconstant\protecttextprefixes