babel (26jan22)

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

17 files changed, 115 insertions, 59 deletions

diff --git a/Master/texmf-dist/tex/generic/babel/babel-bidi-basic-r.lua b/Master/texmf-dist/tex/generic/babel/babel-bidi-basic-r.lua
index 43328442bee..6897cea2c37 100644
--- a/Master/texmf-dist/tex/generic/babel/babel-bidi-basic-r.lua
+++ b/Master/texmf-dist/tex/generic/babel/babel-bidi-basic-r.lua
@@ -7,7 +7,7 @@
 -- babel.dtx  (with options: `basic-r')
 -- 
 --
--- Copyright (C) 2012-2021 Javier Bezos and Johannes L. Braams.
+-- Copyright (C) 2012-2022 Javier Bezos and Johannes L. Braams.
 -- Copyright (C) 1989-2012 Johannes L. Braams and
 --           any individual authors listed elsewhere in this file.
 -- All rights reserved.
diff --git a/Master/texmf-dist/tex/generic/babel/babel-bidi-basic.lua b/Master/texmf-dist/tex/generic/babel/babel-bidi-basic.lua
index a6a8b8e8954..6196198698f 100644
--- a/Master/texmf-dist/tex/generic/babel/babel-bidi-basic.lua
+++ b/Master/texmf-dist/tex/generic/babel/babel-bidi-basic.lua
@@ -7,7 +7,7 @@
 -- babel.dtx  (with options: `basic')
 -- 
 --
--- Copyright (C) 2012-2021 Javier Bezos and Johannes L. Braams.
+-- Copyright (C) 2012-2022 Javier Bezos and Johannes L. Braams.
 -- Copyright (C) 1989-2012 Johannes L. Braams and
 --           any individual authors listed elsewhere in this file.
 -- All rights reserved.
@@ -341,7 +341,10 @@ function Babel.bidi(head, ispar, hdir)
         item = nodes[r][1]    -- MIRRORING
         if Babel.mirroring_enabled and item.id == GLYPH
              and temp == 'r' and characters[item.char] then
-          local font_mode = font.fonts[item.font].properties.mode
+          local font_mode = ''
+          if font.fonts[item.font].properties then
+            font_mode = font.fonts[item.font].properties.mode
+          end
           if font_mode ~= 'harf' and font_mode ~= 'plug' then
             item.char = characters[item.char].m or item.char
           end
diff --git a/Master/texmf-dist/tex/generic/babel/babel-data-bidi.lua b/Master/texmf-dist/tex/generic/babel/babel-data-bidi.lua
index 3e69d2516ca..ec1489f35cb 100644
--- a/Master/texmf-dist/tex/generic/babel/babel-data-bidi.lua
+++ b/Master/texmf-dist/tex/generic/babel/babel-data-bidi.lua
@@ -7,7 +7,7 @@
 -- babel.dtx  (with options: `bididata')
 -- 
 --
--- Copyright (C) 2012-2021 Javier Bezos and Johannes L. Braams.
+-- Copyright (C) 2012-2022 Javier Bezos and Johannes L. Braams.
 -- Copyright (C) 1989-2012 Johannes L. Braams and
 --           any individual authors listed elsewhere in this file.
 -- All rights reserved.
diff --git a/Master/texmf-dist/tex/generic/babel/babel-data-cjk.lua b/Master/texmf-dist/tex/generic/babel/babel-data-cjk.lua
index 2c1b2645138..09ae4066554 100644
--- a/Master/texmf-dist/tex/generic/babel/babel-data-cjk.lua
+++ b/Master/texmf-dist/tex/generic/babel/babel-data-cjk.lua
@@ -7,7 +7,7 @@
 -- babel.dtx  (with options: `cjkdata')
 -- 
 --
--- Copyright (C) 2012-2021 Javier Bezos and Johannes L. Braams.
+-- Copyright (C) 2012-2022 Javier Bezos and Johannes L. Braams.
 -- Copyright (C) 1989-2012 Johannes L. Braams and
 --           any individual authors listed elsewhere in this file.
 -- All rights reserved.
diff --git a/Master/texmf-dist/tex/generic/babel/babel-transforms.lua b/Master/texmf-dist/tex/generic/babel/babel-transforms.lua
index fee8a1515b8..ec062a37a87 100644
--- a/Master/texmf-dist/tex/generic/babel/babel-transforms.lua
+++ b/Master/texmf-dist/tex/generic/babel/babel-transforms.lua
@@ -7,7 +7,7 @@
 -- babel.dtx  (with options: `transforms')
 -- 
 --
--- Copyright (C) 2012-2021 Javier Bezos and Johannes L. Braams.
+-- Copyright (C) 2012-2022 Javier Bezos and Johannes L. Braams.
 -- Copyright (C) 1989-2012 Johannes L. Braams and
 --           any individual authors listed elsewhere in this file.
 -- All rights reserved.
diff --git a/Master/texmf-dist/tex/generic/babel/babel.def b/Master/texmf-dist/tex/generic/babel/babel.def
index fc9043ad95f..a426500edd5 100644
--- a/Master/texmf-dist/tex/generic/babel/babel.def
+++ b/Master/texmf-dist/tex/generic/babel/babel.def
@@ -7,7 +7,7 @@
 %% babel.dtx  (with options: `core')
 %% 
 %%
-%% Copyright (C) 2012-2021 Javier Bezos and Johannes L. Braams.
+%% Copyright (C) 2012-2022 Javier Bezos and Johannes L. Braams.
 %% Copyright (C) 1989-2012 Johannes L. Braams and
 %%           any individual authors listed elsewhere in this file.
 %% All rights reserved.
@@ -40,7 +40,7 @@
     \wlog{File: #1 #4 #3 <#2>}%
     \let\ProvidesFile\@undefined}
 \fi
-\ProvidesFile{babel.def}[2021/12/30 3.69 Babel common definitions]
+\ProvidesFile{babel.def}[2022/01/26 3.70 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.69}
-\def\bbl@date{2021/12/30}
+\def\bbl@version{3.70}
+\def\bbl@date{2022/01/26}
 \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 d9702697458..26de1e5a34a 100644
--- a/Master/texmf-dist/tex/generic/babel/babel.sty
+++ b/Master/texmf-dist/tex/generic/babel/babel.sty
@@ -7,7 +7,7 @@
 %% babel.dtx  (with options: `package')
 %% 
 %%
-%% Copyright (C) 2012-2021 Javier Bezos and Johannes L. Braams.
+%% Copyright (C) 2012-2022 Javier Bezos and Johannes L. Braams.
 %% Copyright (C) 1989-2012 Johannes L. Braams and
 %%           any individual authors listed elsewhere in this file.
 %% All rights reserved.
@@ -34,7 +34,7 @@
 %%
 
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
-\ProvidesPackage{babel}[2021/12/30 3.69 The Babel package]
+\ProvidesPackage{babel}[2022/01/26 3.70 The Babel package]
 \@ifpackagewith{babel}{debug}
   {\providecommand\bbl@trace[1]{\message{^^J[ #1 ]}}%
    \let\bbl@debug\@firstofone
@@ -453,8 +453,8 @@
       \expandafter\@secondoftwo
     \fi}
 \fi
-\def\bbl@version{3.69}
-\def\bbl@date{2021/12/30}
+\def\bbl@version{3.70}
+\def\bbl@date{2022/01/26}
 \ifx\language\@undefined
   \csname newcount\endcsname\language
 \fi
diff --git a/Master/texmf-dist/tex/generic/babel/blplain.tex b/Master/texmf-dist/tex/generic/babel/blplain.tex
index 96b2eb1d307..de6c9c90e8d 100644
--- a/Master/texmf-dist/tex/generic/babel/blplain.tex
+++ b/Master/texmf-dist/tex/generic/babel/blplain.tex
@@ -7,7 +7,7 @@
 %% babel.dtx  (with options: `blplain')
 %% 
 %%
-%% Copyright (C) 2012-2021 Javier Bezos and Johannes L. Braams.
+%% Copyright (C) 2012-2022 Javier Bezos and Johannes L. Braams.
 %% Copyright (C) 1989-2012 Johannes L. Braams and
 %%           any individual authors listed elsewhere in this file.
 %% All rights reserved.
diff --git a/Master/texmf-dist/tex/generic/babel/bplain.tex b/Master/texmf-dist/tex/generic/babel/bplain.tex
index 9f9f73ae2e8..8804967480a 100644
--- a/Master/texmf-dist/tex/generic/babel/bplain.tex
+++ b/Master/texmf-dist/tex/generic/babel/bplain.tex
@@ -7,7 +7,7 @@
 %% babel.dtx  (with options: `bplain')
 %% 
 %%
-%% Copyright (C) 2012-2021 Javier Bezos and Johannes L. Braams.
+%% Copyright (C) 2012-2022 Javier Bezos and Johannes L. Braams.
 %% Copyright (C) 1989-2012 Johannes L. Braams and
 %%           any individual authors listed elsewhere in this file.
 %% All rights reserved.
diff --git a/Master/texmf-dist/tex/generic/babel/hyphen.cfg b/Master/texmf-dist/tex/generic/babel/hyphen.cfg
index fb4d9c22b48..0bb128d4577 100644
--- a/Master/texmf-dist/tex/generic/babel/hyphen.cfg
+++ b/Master/texmf-dist/tex/generic/babel/hyphen.cfg
@@ -7,7 +7,7 @@
 %% babel.dtx  (with options: `patterns')
 %% 
 %%
-%% Copyright (C) 2012-2021 Javier Bezos and Johannes L. Braams.
+%% Copyright (C) 2012-2022 Javier Bezos and Johannes L. Braams.
 %% Copyright (C) 1989-2012 Johannes L. Braams and
 %%           any individual authors listed elsewhere in this file.
 %% All rights reserved.
@@ -38,10 +38,10 @@
     \wlog{File: #1 #4 #3 <#2>}%
     \let\ProvidesFile\@undefined}
 \fi
-\ProvidesFile{hyphen.cfg}[2021/12/30 3.69 Babel hyphens]
+\ProvidesFile{hyphen.cfg}[2022/01/26 3.70 Babel hyphens]
 \xdef\bbl@format{\jobname}
-\def\bbl@version{3.69}
-\def\bbl@date{2021/12/30}
+\def\bbl@version{3.70}
+\def\bbl@date{2022/01/26}
 \ifx\AtBeginDocument\@undefined
   \def\@empty{}
 \fi
diff --git a/Master/texmf-dist/tex/generic/babel/locale/fi/babel-fi.ini b/Master/texmf-dist/tex/generic/babel/locale/fi/babel-fi.ini
index 03617d9dd11..303bc289690 100644
--- a/Master/texmf-dist/tex/generic/babel/locale/fi/babel-fi.ini
+++ b/Master/texmf-dist/tex/generic/babel/locale/fi/babel-fi.ini
@@ -12,8 +12,8 @@
 
 [identification]
 charset = utf8
-version = 1.3
-date = 2020-06-30
+version = 1.4
+date = 2022-01-02
 name.local = suomi
 name.english = Finnish
 name.babel = finnish
@@ -184,3 +184,10 @@ plusSign = +
 superscriptingExponent = ×
 
 [counters]
+
+[transforms.prehyphenation]
+prehyphen.nobreak.1.0 = { [{p}|] () -{a} () }
+prehyphen.nobreak.1.1 =   {}
+prehyphen.nobreak.1.2 =   { insert, penalty = 10000 }
+prehyphen.nobreak.1.3 =   { insert, space = 0 0 0 }
+prehyphen.nobreak.1.4 =   {}
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/luababel.def b/Master/texmf-dist/tex/generic/babel/luababel.def
index 391ddb448e9..41137096197 100644
--- a/Master/texmf-dist/tex/generic/babel/luababel.def
+++ b/Master/texmf-dist/tex/generic/babel/luababel.def
@@ -7,7 +7,7 @@
 %% babel.dtx  (with options: `luatex')
 %% 
 %%
-%% Copyright (C) 2012-2021 Javier Bezos and Johannes L. Braams.
+%% Copyright (C) 2012-2022 Javier Bezos and Johannes L. Braams.
 %% Copyright (C) 1989-2012 Johannes L. Braams and
 %%           any individual authors listed elsewhere in this file.
 %% All rights reserved.
@@ -1340,39 +1340,85 @@ end
   \ifcase\bbl@attr@dir\expandafter\rlap\else\expandafter\llap\fi}
 \bbl@trace{Redefinitions for bidi layout}
 \ifnum\bbl@bidimode>\z@
-  \AtBeginDocument{% amsmath
-    \ifx\place@tag\@undefined\else
-      \bbl@sreplace\place@tag{\llap}{\bbl@truellap}%
-      \bbl@sreplace\place@tag@gather{\llap}{\bbl@truellap}%
-      \bbl@sreplace\place@tag{\rlap}{\bbl@truerlap}%
-      \bbl@sreplace\place@tag@gather{\rlap}{\bbl@truerlap}%
-    \fi}
-  \ifx\AddToHook\@undefined\else
-    \AddToHook{env/equation/before}{\pardir TLT }{}
-  \fi
-  \ifx\@eqnnum\@undefined\else
-    \ifx\bbl@attr@dir\@undefined\else
+  \let\bbl@eqnodir\relax
+  \AtBeginDocument{%
+    \ifx\maketag@@@\@undefined % Normal equation, eqnarray
+      \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}%
+        \fi}%
+      \AddToHook{env/equation/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@
-        \bbl@sreplace\@eqnnum{\rlap}{\bbl@leqno@aux}
-        \def\bbl@leqno@aux#1{%
-          \bbl@truerlap{%
-            \ifcase\bbl@attr@dir
-              #1%
-            \else
-              \bbl@textdir\@ne
-              #1%
-              \hskip-\displaywidth
-            \fi}}
-      \else
-        \bbl@exp{%
-          \def\\\@eqnnum{{%
-            \<ifcase>\\\bbl@attr@dir\<else>\\\bbl@textdir\@ne\<fi>%
-            \\\bbl@ifsamestring{\\\@currenvir}{equation}%
-               {}{\\\bbl@truellap}{\[@eqnnum]}}}}
+        \def\@eqnnum{%
+           \setbox\z@\hbox{\normalfont\normalcolor(\theequation)}%
+           \hbox to0.01pt{\hss\hbox to\displaywidth{\box\z@\hss}}}%
       \fi
-    \fi
-  \fi
+    \else % amstex
+      \bbl@sreplace\intertext@{\normalbaselines}%
+        {\normalbaselines
+         \ifx\bbl@eqnodir\relax\else\bbl@pardir\@ne\bbl@textdir\@ne\fi}
+      \def\bbl@ams@tagbox#1#2{#1{\bbl@eqnodir#2}}% #1=\hbox|ams@lap
+      \def\bbl@ams@eqtagbox#1{%
+        \setbox\z@\hbox{\bbl@eqnodir#1}%
+        \hbox to\wd\z@{%
+          \ifx\bbl@ams@lap\hbox
+            \hss\hbox to\displaywidth{\box\z@\hss}%
+          \else
+            \hbox to\displaywidth{\hss\box\z@}\hss
+          \fi}}
+      \def\bbl@ams@preset#1{%
+        \ifnum\bbl@thetextdir>\z@
+          \edef\bbl@eqnodir{\noexpand\bbl@textdir{\the\bbl@thetextdir}}%
+          \chardef\bbl@thetextdir\z@
+          \bbl@sreplace\textdef@{\hbox}{\bbl@ams@tagbox\hbox}%
+          \bbl@sreplace\maketag@@@{\hbox}{\bbl@ams@tagbox#1}%
+        \fi}
+      \@ifpackagewith{amsmath}{leqno}%
+        {\let\bbl@ams@lap\hbox}% = leqno
+        {\let\bbl@ams@lap\llap}% = default
+      % Not required?: split, alignat
+      \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}%
+      \AddToHook{env/gather*/begin}{\bbl@ams@preset\bbl@ams@lap}%
+      \AddToHook{env/align/begin}{\bbl@ams@preset\bbl@ams@lap}%
+      \AddToHook{env/align*/begin}{\bbl@ams@preset\bbl@ams@lap}%
+      % Hackish, for proper alignment-don’t ask me why it works! :-)
+      \bbl@exp{%
+        \\\AddToHook{env/align*/end}{\<iftag@>\<else>\\\tag*{}\<fi>}}%
+      \AddToHook{env/flalign/begin}{\bbl@ams@preset\hbox}%
+      \AddToHook{env/split/before}{%
+        \def\bbl@tempa{equation}%
+        \ifx\@currenvir\bbl@tempa
+          \def\bbl@ams@eqtagbox#1{%
+            \setbox\z@\hbox{\bbl@eqnodir#1}%
+            \hbox to\wd\z@{\box\z@}}%
+        \fi}
+      \AddToHook{env/equation/begin}{%
+        \bbl@add\ignorespacesafterend{\hrule\@height\z@}%
+        \ifnum\bbl@thetextdir>\z@
+          \ifx\bbl@ams@lap\llap\hrule\@height\z@\fi
+          \def\bbl@eqnodir{\bbl@textdir\@ne}%
+          \bbl@textdir\z@
+          \bbl@sreplace\maketag@@@{\hbox}{\bbl@ams@eqtagbox}%
+        \fi}%
+      \AddToHook{env/equation*/begin}{%
+        \bbl@add\ignorespacesafterend{\hrule\@height\z@}%
+        \ifnum\bbl@thetextdir>\z@
+          \def\bbl@eqnodir{\bbl@textdir\@ne}%
+          \bbl@textdir\z@
+          \bbl@sreplace\maketag@@@{\hbox}{\bbl@ams@eqtagbox}%
+        \fi}%
+      \fi}
 \fi
 \ifx\bbl@opt@layout\@nnil\endinput\fi  % if no layout
 \ifnum\bbl@bidimode>\z@
diff --git a/Master/texmf-dist/tex/generic/babel/nil.ldf b/Master/texmf-dist/tex/generic/babel/nil.ldf
index 0ab634e179c..78e6c9d5f46 100644
--- a/Master/texmf-dist/tex/generic/babel/nil.ldf
+++ b/Master/texmf-dist/tex/generic/babel/nil.ldf
@@ -7,7 +7,7 @@
 %% babel.dtx  (with options: `nil')
 %% 
 %%
-%% Copyright (C) 2012-2021 Javier Bezos and Johannes L. Braams.
+%% Copyright (C) 2012-2022 Javier Bezos and Johannes L. Braams.
 %% Copyright (C) 1989-2012 Johannes L. Braams and
 %%           any individual authors listed elsewhere in this file.
 %% All rights reserved.
@@ -33,7 +33,7 @@
 %% extension |.ins|) which are part of the distribution.
 %%
 
-\ProvidesLanguage{nil}[2021/12/30 3.69 Nil language]
+\ProvidesLanguage{nil}[2022/01/26 3.70 Nil language]
 \LdfInit{nil}{datenil}
 \ifx\l@nil\@undefined
   \newlanguage\l@nil
diff --git a/Master/texmf-dist/tex/generic/babel/plain.def b/Master/texmf-dist/tex/generic/babel/plain.def
index 95bcd3b014a..f11a944416f 100644
--- a/Master/texmf-dist/tex/generic/babel/plain.def
+++ b/Master/texmf-dist/tex/generic/babel/plain.def
@@ -7,7 +7,7 @@
 %% babel.dtx  (with options: `plain')
 %% 
 %%
-%% Copyright (C) 2012-2021 Javier Bezos and Johannes L. Braams.
+%% Copyright (C) 2012-2022 Javier Bezos and Johannes L. Braams.
 %% Copyright (C) 1989-2012 Johannes L. Braams and
 %%           any individual authors listed elsewhere in this file.
 %% All rights reserved.
diff --git a/Master/texmf-dist/tex/generic/babel/switch.def b/Master/texmf-dist/tex/generic/babel/switch.def
index cd18f9c2d78..20749c65387 100644
--- a/Master/texmf-dist/tex/generic/babel/switch.def
+++ b/Master/texmf-dist/tex/generic/babel/switch.def
@@ -7,7 +7,7 @@
 %% babel.dtx  (with options: `kernel')
 %% 
 %%
-%% Copyright (C) 2012-2021 Javier Bezos and Johannes L. Braams.
+%% Copyright (C) 2012-2022 Javier Bezos and Johannes L. Braams.
 %% Copyright (C) 1989-2012 Johannes L. Braams and
 %%           any individual authors listed elsewhere in this file.
 %% All rights reserved.
diff --git a/Master/texmf-dist/tex/generic/babel/txtbabel.def b/Master/texmf-dist/tex/generic/babel/txtbabel.def
index b3f45db945f..b6a4aa89585 100644
--- a/Master/texmf-dist/tex/generic/babel/txtbabel.def
+++ b/Master/texmf-dist/tex/generic/babel/txtbabel.def
@@ -7,7 +7,7 @@
 %% babel.dtx  (with options: `texxet')
 %% 
 %%
-%% Copyright (C) 2012-2021 Javier Bezos and Johannes L. Braams.
+%% Copyright (C) 2012-2022 Javier Bezos and Johannes L. Braams.
 %% Copyright (C) 1989-2012 Johannes L. Braams and
 %%           any individual authors listed elsewhere in this file.
 %% All rights reserved.
diff --git a/Master/texmf-dist/tex/generic/babel/xebabel.def b/Master/texmf-dist/tex/generic/babel/xebabel.def
index 3698e256ebe..0550094a529 100644
--- a/Master/texmf-dist/tex/generic/babel/xebabel.def
+++ b/Master/texmf-dist/tex/generic/babel/xebabel.def
@@ -7,7 +7,7 @@
 %% babel.dtx  (with options: `xetex')
 %% 
 %%
-%% Copyright (C) 2012-2021 Javier Bezos and Johannes L. Braams.
+%% Copyright (C) 2012-2022 Javier Bezos and Johannes L. Braams.
 %% Copyright (C) 1989-2012 Johannes L. Braams and
 %%           any individual authors listed elsewhere in this file.
 %% All rights reserved.