babel (30apr22)

git-svn-id: svn://tug.org/texlive/trunk@63189 c570f23f-e606-0410-a88d-b1316a301751

8 files changed, 135 insertions, 66 deletions

diff --git a/Master/texmf-dist/tex/generic/babel/babel.def b/Master/texmf-dist/tex/generic/babel/babel.def
index d36d26395b3..a2badd86813 100644
--- a/Master/texmf-dist/tex/generic/babel/babel.def
+++ b/Master/texmf-dist/tex/generic/babel/babel.def
@@ -40,7 +40,7 @@
     \wlog{File: #1 #4 #3 <#2>}%
     \let\ProvidesFile\@undefined}
 \fi
-\ProvidesFile{babel.def}[2022/02/26 3.73 Babel common definitions]
+\ProvidesFile{babel.def}[2022/04/30 3.74 Babel common definitions]
 \ifx\AtBeginDocument\@undefined  % TODO. change test.
   \def\@empty{}
 \def\loadlocalcfg#1{%
@@ -406,8 +406,8 @@
 \expandafter\newif\csname ifbbl@single\endcsname
 \chardef\bbl@bidimode\z@
 \fi
-\def\bbl@version{3.73}
-\def\bbl@date{2022/02/26}
+\def\bbl@version{3.74}
+\def\bbl@date{2022/04/30}
 \ifx\language\@undefined
   \csname newcount\endcsname\language
 \fi
diff --git a/Master/texmf-dist/tex/generic/babel/babel.sty b/Master/texmf-dist/tex/generic/babel/babel.sty
index 87ca08bbc74..2c97c5384a5 100644
--- a/Master/texmf-dist/tex/generic/babel/babel.sty
+++ b/Master/texmf-dist/tex/generic/babel/babel.sty
@@ -34,7 +34,7 @@
 %%
 
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
-\ProvidesPackage{babel}[2022/02/26 3.73 The Babel package]
+\ProvidesPackage{babel}[2022/04/30 3.74 The Babel package]
 \@ifpackagewith{babel}{debug}
   {\providecommand\bbl@trace[1]{\message{^^J[ #1 ]}}%
    \let\bbl@debug\@firstofone
@@ -360,6 +360,8 @@
 \DeclareOption{safe=none}{\let\bbl@opt@safe\@empty}
 \DeclareOption{safe=bib}{\def\bbl@opt@safe{B}}
 \DeclareOption{safe=ref}{\def\bbl@opt@safe{R}}
+\DeclareOption{safe=refbib}{\def\bbl@opt@safe{BR}}
+\DeclareOption{safe=bibref}{\def\bbl@opt@safe{BR}}
 \chardef\bbl@bidimode\z@
 \DeclareOption{bidi=default}{\chardef\bbl@bidimode=\@ne}
 \DeclareOption{bidi=basic}{\chardef\bbl@bidimode=101 }
@@ -367,6 +369,9 @@
 \DeclareOption{bidi=bidi}{\chardef\bbl@bidimode=201 }
 \DeclareOption{bidi=bidi-r}{\chardef\bbl@bidimode=202 }
 \DeclareOption{bidi=bidi-l}{\chardef\bbl@bidimode=203 }
+\chardef\bbl@eqnpos\z@
+\DeclareOption{leqno}{\chardef\bbl@eqnpos\@ne}
+\DeclareOption{fleqn}{\chardef\bbl@eqnpos\tw@}
 \let\bbl@opt@shorthands\@nnil
 \let\bbl@opt@config\@nnil
 \let\bbl@opt@main\@nnil
@@ -453,8 +458,8 @@
       \expandafter\@secondoftwo
     \fi}
 \fi
-\def\bbl@version{3.73}
-\def\bbl@date{2022/02/26}
+\def\bbl@version{3.74}
+\def\bbl@date{2022/04/30}
 \ifx\language\@undefined
   \csname newcount\endcsname\language
 \fi
@@ -3723,7 +3728,7 @@
   \fi
 \fi
 \bbl@trace{Cross referencing macros}
-\ifx\bbl@opt@safe\@empty\else
+\ifx\bbl@opt@safe\@empty\else % ie, if 'ref' and/or 'bib'
   \def\@newl@bel#1#2#3{%
    {\@safe@activestrue
     \bbl@ifunset{#1@#2}%
@@ -3755,10 +3760,24 @@
 \fi
 \bbl@xin@{R}\bbl@opt@safe
 \ifin@
-  \bbl@redefinerobust\ref#1{%
-    \@safe@activestrue\org@ref{#1}\@safe@activesfalse}
-  \bbl@redefinerobust\pageref#1{%
-    \@safe@activestrue\org@pageref{#1}\@safe@activesfalse}
+  \edef\bbl@tempc{\expandafter\string\csname ref code\endcsname}%
+  \bbl@xin@{\expandafter\strip@prefix\meaning\bbl@tempc}%
+    {\expandafter\strip@prefix\meaning\ref}%
+  \ifin@
+    \bbl@redefine\@kernel@ref#1{%
+      \@safe@activestrue\org@@kernel@ref{#1}\@safe@activesfalse}
+    \bbl@redefine\@kernel@pageref#1{%
+      \@safe@activestrue\org@@kernel@pageref{#1}\@safe@activesfalse}
+    \bbl@redefine\@kernel@sref#1{%
+      \@safe@activestrue\org@@kernel@sref{#1}\@safe@activesfalse}
+    \bbl@redefine\@kernel@spageref#1{%
+      \@safe@activestrue\org@@kernel@spageref{#1}\@safe@activesfalse}
+  \else
+    \bbl@redefinerobust\ref#1{%
+      \@safe@activestrue\org@ref{#1}\@safe@activesfalse}
+    \bbl@redefinerobust\pageref#1{%
+      \@safe@activestrue\org@pageref{#1}\@safe@activesfalse}
+  \fi
 \else
   \let\org@ref\ref
   \let\org@pageref\pageref
@@ -3841,28 +3860,30 @@
        \bbl@tempc
      \fi}  % end ifbbl@single, end \IfBabelLayout
 \bbl@trace{Preventing clashes with other packages}
-\bbl@xin@{R}\bbl@opt@safe
-\ifin@
-  \AtBeginDocument{%
-    \@ifpackageloaded{ifthen}{%
-      \bbl@redefine@long\ifthenelse#1#2#3{%
-        \let\bbl@temp@pref\pageref
-        \let\pageref\org@pageref
-        \let\bbl@temp@ref\ref
-        \let\ref\org@ref
-        \@safe@activestrue
-        \org@ifthenelse{#1}%
-          {\let\pageref\bbl@temp@pref
-           \let\ref\bbl@temp@ref
-           \@safe@activesfalse
-           #2}%
-          {\let\pageref\bbl@temp@pref
-           \let\ref\bbl@temp@ref
-           \@safe@activesfalse
-           #3}%
-        }%
-      }{}%
-    }
+\ifx\org@ref\@undefined\else
+  \bbl@xin@{R}\bbl@opt@safe
+  \ifin@
+    \AtBeginDocument{%
+      \@ifpackageloaded{ifthen}{%
+        \bbl@redefine@long\ifthenelse#1#2#3{%
+          \let\bbl@temp@pref\pageref
+          \let\pageref\org@pageref
+          \let\bbl@temp@ref\ref
+          \let\ref\org@ref
+          \@safe@activestrue
+          \org@ifthenelse{#1}%
+            {\let\pageref\bbl@temp@pref
+             \let\ref\bbl@temp@ref
+             \@safe@activesfalse
+             #2}%
+            {\let\pageref\bbl@temp@pref
+             \let\ref\bbl@temp@ref
+             \@safe@activesfalse
+             #3}%
+          }%
+        }{}%
+      }
+\fi
   \AtBeginDocument{%
     \@ifpackageloaded{varioref}{%
       \bbl@redefine\@@vpageref#1[#2]#3{%
diff --git a/Master/texmf-dist/tex/generic/babel/hyphen.cfg b/Master/texmf-dist/tex/generic/babel/hyphen.cfg
index 757202584f7..45ff587e515 100644
--- a/Master/texmf-dist/tex/generic/babel/hyphen.cfg
+++ b/Master/texmf-dist/tex/generic/babel/hyphen.cfg
@@ -38,10 +38,10 @@
     \wlog{File: #1 #4 #3 <#2>}%
     \let\ProvidesFile\@undefined}
 \fi
-\ProvidesFile{hyphen.cfg}[2022/02/26 3.73 Babel hyphens]
+\ProvidesFile{hyphen.cfg}[2022/04/30 3.74 Babel hyphens]
 \xdef\bbl@format{\jobname}
-\def\bbl@version{3.73}
-\def\bbl@date{2022/02/26}
+\def\bbl@version{3.74}
+\def\bbl@date{2022/04/30}
 \ifx\AtBeginDocument\@undefined
   \def\@empty{}
 \fi
diff --git a/Master/texmf-dist/tex/generic/babel/locale/km/babel-km.ini b/Master/texmf-dist/tex/generic/babel/locale/km/babel-km.ini
index 7c8c6e5e4b5..f34c9fb0723 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/km/babel-km.ini
+++ b/Master/texmf-dist/tex/generic/babel/locale/km/babel-km.ini
@@ -11,8 +11,8 @@
 
 [identification]
 charset = utf8
-version = 1.9
-date = 2020-10-11
+version = 1.10
+date = 2022-04-07
 name.local = ខ្មែរ
 name.english = Khmer
 name.babel = khmer
@@ -149,7 +149,7 @@ intraspace = 0 .1 0
 linebreaking = s
 
 [characters]
-ranges = 1780..17FF
+ranges = 1780..17FF 19E0..19FF
 delimiters.quotes = “”‘’
 auxiliary = [\u17B4\u17B5\u200B \u17CC \u17CE \u17CF \u17D1 ឝ ឞ]
 exemplarCharacters = [\u17D0 ៈ \u17CB \u17C9 \u17CA \u17CD ក ខ គ ឃ ង ច ឆ ជ ឈ ញ ដ ឋ ឌ ឍ ណ ត ថ ទ ធ ន ប ផ ព ភ ម យ រ ឫ ឬ ល ឭ ឮ វ ស ហ ឡ អ {អា} ឥ ឦ ឧ {ឧក} ឩ ឪ ឯ ឰ ឱ ឲ ឳ ា \u17B7 \u17B8 \u17B9 \u17BA \u17BB \u17BC \u17BD ើ ឿ ៀ េ ែ ៃ ោ ៅ \u17C6 ះ \u17D2]
diff --git a/Master/texmf-dist/tex/generic/babel/locale/mr/babel-mr.ini b/Master/texmf-dist/tex/generic/babel/locale/mr/babel-mr.ini
index 7e933e127ea..6951ee273d6 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/mr/babel-mr.ini
+++ b/Master/texmf-dist/tex/generic/babel/locale/mr/babel-mr.ini
@@ -13,8 +13,8 @@
 
 [identification]
 charset = utf8
-version = 1.11
-date = 2021-06-25
+version = 1.12
+date = 2022-04-07
 name.local = मराठी
 name.english = Marathi
 name.babel = marathi
@@ -24,8 +24,8 @@ language.tag.bcp47 = mr
 tag.bcp47.likely = mr-Deva-IN
 tag.opentype = MAR
 script.name = Devanagari
-script.tag.bcp47 = Mahj
-script.tag.opentype = mahj
+script.tag.bcp47 = Deva
+script.tag.opentype = deva
 level = 1
 encodings = 
 derivate = no
diff --git a/Master/texmf-dist/tex/generic/babel/locale/tk/babel-tk.ini b/Master/texmf-dist/tex/generic/babel/locale/tk/babel-tk.ini
index ccf51238d32..86d51b0383a 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/tk/babel-tk.ini
+++ b/Master/texmf-dist/tex/generic/babel/locale/tk/babel-tk.ini
@@ -11,8 +11,8 @@
 
 [identification]
 charset = utf8
-version = 1.4
-date = 2020-06-30
+version = 1.5
+date = 2022-04-07
 name.local = tk
 name.english = Turkmen
 name.babel = turkmen
@@ -21,7 +21,7 @@ tag.bcp47 = tk
 language.tag.bcp47 = tk
 tag.bcp47.likely = tk-Latn-TM
 tag.opentype = TKM
-script.name = Arabic
+script.name = Latin
 script.tag.bcp47 = Latn
 script.tag.opentype = latn
 level = 1
diff --git a/Master/texmf-dist/tex/generic/babel/luababel.def b/Master/texmf-dist/tex/generic/babel/luababel.def
index f0682627191..3deb849a853 100644
--- a/Master/texmf-dist/tex/generic/babel/luababel.def
+++ b/Master/texmf-dist/tex/generic/babel/luababel.def
@@ -1162,6 +1162,7 @@ end
 \catcode`\~=12
 \catcode`\%=12
 \catcode`\&=14
+\catcode`\|=12
 \gdef\babelprehyphenation{&%
   \@ifnextchar[{\bbl@settransform{0}}{\bbl@settransform{0}[]}}
 \gdef\babelposthyphenation{&%
@@ -1377,33 +1378,71 @@ end
 \bbl@trace{Redefinitions for bidi layout}
 \def\BabelNoAMSMath{\let\bbl@noamsmath\relax}
 \ifnum\bbl@bidimode>\z@
+  \ifx\matheqdirmode\@undefined\else
+    \matheqdirmode\@ne
+  \fi
   \let\bbl@eqnodir\relax
+  \def\bbl@eqdel{()}
+  \def\bbl@eqnum{%
+    {\normalfont\normalcolor
+     \expandafter\@firstoftwo\bbl@eqdel
+     \theequation
+     \expandafter\@secondoftwo\bbl@eqdel}}
+  \def\bbl@puteqno#1{\eqno\hbox{#1}}
+  \def\bbl@putleqno#1{\leqno\hbox{#1}}
+  \def\bbl@eqno@flip#1{%
+    \ifdim\predisplaysize=-\maxdimen
+      \eqno
+      \hb@xt@.01pt{\hb@xt@\displaywidth{\hss{#1}}\hss}%
+    \else
+      \leqno\hbox{#1}%
+    \fi}
+  \def\bbl@leqno@flip#1{%
+    \ifdim\predisplaysize=-\maxdimen
+      \leqno
+      \hb@xt@.01pt{\hss\hb@xt@\displaywidth{{#1}\hss}}%
+    \else
+      \eqno\hbox{#1}%
+    \fi}
   \AtBeginDocument{%
     \ifx\maketag@@@\@undefined % Normal equation, eqnarray
-      \AddToHook{env/eqnarray/begin}{%
+      \AddToHook{env/equation/begin}{%
         \ifnum\bbl@thetextdir>\z@
+          \let\@eqnnum\bbl@eqnum
           \edef\bbl@eqnodir{\noexpand\bbl@textdir{\the\bbl@thetextdir}}%
           \chardef\bbl@thetextdir\z@
           \bbl@add\normalfont{\bbl@eqnodir}%
+          \ifcase\bbl@eqnpos
+            \let\bbl@puteqno\bbl@eqno@flip
+          \or
+            \let\bbl@puteqno\bbl@leqno@flip
+          \fi
         \fi}%
-      \AddToHook{env/equation/begin}{%
+      \ifnum\bbl@eqnpos=\tw@\else
+        \def\endequation{\bbl@puteqno{\@eqnnum}$$\@ignoretrue}%
+      \fi
+      \AddToHook{env/eqnarray/begin}{%
         \ifnum\bbl@thetextdir>\z@
           \edef\bbl@eqnodir{\noexpand\bbl@textdir{\the\bbl@thetextdir}}%
           \chardef\bbl@thetextdir\z@
           \bbl@add\normalfont{\bbl@eqnodir}%
-          \pardir TLT % dir for \eqno is \pardir!
-        \fi}%
-      \bbl@xin@{,leqno,}{,\@classoptionslist,}%
-      \ifin@
-        \def\@eqnnum{%
-          \setbox\z@\hbox{\normalfont\normalcolor(\theequation)}%
-          \hbox to0.01pt{\hss\hbox to\displaywidth{\box\z@\hss}}}%
-      \fi
+          \ifnum\bbl@eqnpos=\@ne
+            \def\@eqnnum{%
+             \setbox\z@\hbox{\bbl@eqnum}%
+             \hbox to0.01pt{\hss\hbox to\displaywidth{\box\z@\hss}}}%
+          \else
+             \let\@eqnnum\bbl@eqnum
+          \fi
+        \fi}
+      % Hack. YA luatex bug?:
+      \expandafter\bbl@sreplace\csname] \endcsname{$$}{\eqno\kern.001pt$$}%
     \else % amstex
       \ifx\bbl@noamsmath\@undefined
-        \@ifpackagewith{amsmath}{leqno}%
-          {\let\bbl@ams@lap\hbox}% = leqno
-          {\let\bbl@ams@lap\llap}% = default
+        \ifnum\bbl@eqnpos=\@ne
+          \let\bbl@ams@lap\hbox
+        \else
+          \let\bbl@ams@lap\llap
+        \fi
         \ExplSyntaxOn
         \bbl@sreplace\intertext@{\normalbaselines}%
           {\normalbaselines
@@ -1423,12 +1462,21 @@ end
             \bbl@sreplace\textdef@{\hbox}{\bbl@ams@tagbox\hbox}%
             \bbl@sreplace\maketag@@@{\hbox}{\bbl@ams@tagbox#1}%
           \fi}%
-        \AddToHook{env/equation/begin}{%
-          \ifnum\bbl@thetextdir>\z@
-            \ifx\bbl@ams@lap\llap\hrule\@height\z@\fi
-            \bbl@ams@preset\bbl@ams@flip
-          \fi}%
-        \AddToHook{env/equation*/begin}{\bbl@ams@preset\bbl@ams@flip}%
+        \ifnum\bbl@eqnpos=\tw@\else
+          \def\bbl@ams@equation{%
+            \ifnum\bbl@thetextdir>\z@
+              \edef\bbl@eqnodir{\noexpand\bbl@textdir{\the\bbl@thetextdir}}%
+              \chardef\bbl@thetextdir\z@
+              \bbl@add\normalfont{\bbl@eqnodir}%
+              \ifcase\bbl@eqnpos
+                \def\veqno##1##2{\bbl@eqno@flip{##1##2}}%
+              \or
+                \def\veqno##1##2{\bbl@leqno@flip{##1##2}}%
+              \fi
+            \fi}%
+          \AddToHook{env/equation/begin}{\bbl@ams@equation}%
+          \AddToHook{env/equation*/begin}{\bbl@ams@equation}%
+        \fi
         \AddToHook{env/cases/begin}{\bbl@ams@preset\bbl@ams@lap}%
         \AddToHook{env/multline/begin}{\bbl@ams@preset\hbox}%
         \AddToHook{env/gather/begin}{\bbl@ams@preset\bbl@ams@lap}%
diff --git a/Master/texmf-dist/tex/generic/babel/nil.ldf b/Master/texmf-dist/tex/generic/babel/nil.ldf
index d93c2127b24..8c8c69776ee 100644
--- a/Master/texmf-dist/tex/generic/babel/nil.ldf
+++ b/Master/texmf-dist/tex/generic/babel/nil.ldf
@@ -33,7 +33,7 @@
 %% extension |.ins|) which are part of the distribution.
 %%
 
-\ProvidesLanguage{nil}[2022/02/26 3.73 Nil language]
+\ProvidesLanguage{nil}[2022/04/30 3.74 Nil language]
 \LdfInit{nil}{datenil}
 \ifx\l@nil\@undefined
   \newlanguage\l@nil