Use language environments properly

See latex3/babel#288
moewew · Mar 11, 2024 · 134da03 · 134da03
1 parent 70cad39
commit 134da03
Showing 1 changed file with 16 additions and 10 deletions.
diff --git a/tex/latex/biblatex/biblatex.sty b/tex/latex/biblatex/biblatex.sty
@@ -6761,16 +6761,18 @@
               {\blx@hook@initlang
                \def\blx@endlang{%
                  \blx@hook@endlang
-                 \csname end\blx@thelangenv\endcsname
+                 \expandafter\end\expandafter{\blx@thelangenv}%
                  \endgroup}%
                \iftoggle{blx@autolangbib}
                  {\let\blx@endlangbib\blx@endlang}
                  {}%
                \iftoggle{blx@autolangcite}
                  {\let\blx@endlangcite\blx@endlang}
                  {}%
-               \csname\blx@thelangenv\expandafter\endcsname
-               \expandafter{\abx@field@langid}}}
+               \expandafter\expandafter\expandafter\begin
+                 \expandafter\expandafter\expandafter{%
+                   \expandafter\blx@thelangenv\expandafter}%
+                     \expandafter{\abx@field@langid}}}
            {}}}
     {}%
   \def\blx@imc@mainlang{%
@@ -6838,8 +6840,8 @@
                 \blx@hook@endlang
                 % Polyglossia language envs are \<lang>[]
                 \ifcsstring{blx@thelangenv}{langname}
-                  {\csname end\abx@field@langid\endcsname}
-                  {\csname end\blx@thelangenv\endcsname}%
+                  {\expandafter\end\expandafter{\abx@field@langid}}
+                  {\expandafter\end\expandafter{\blx@thelangenv}}%
                 \endgroup}%
               \iftoggle{blx@autolangbib}
                 {\let\blx@endlangbib\blx@endlang}
@@ -6849,11 +6851,15 @@
                 {}%
               \ifcsstring{blx@thelangenv}{langname}
                 {\ifdef\abx@field@langidopts
-                   {\csname\abx@field@langid\expandafter\endcsname
-                      \expandafter[\abx@field@langidopts]}
-                   {\csname\abx@field@langid\endcsname}}
-                {\csname\blx@thelangenv\expandafter\endcsname
-                   \expandafter{\abx@field@langid}}%
+                   {\expandafter\expandafter\expandafter\begin
+                      \expandafter\expandafter\expandafter{%
+                        \expandafter\abx@field@langid\expandafter}%
+                          \expandafter[\abx@field@langidopts]}
+                   {\expandafter\begin\expandafter{\abx@field@langid}}}
+                {\expandafter\expandafter\expandafter\begin
+                   \expandafter\expandafter\expandafter{%
+                     \expandafter\blx@thelangenv\expandafter}%
+                       \expandafter{\abx@field@langid}}%
               \blx@beglang@spacefactors}}
           {}}}
        {}%