summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-01-26 21:08:47 +0000
committerKarl Berry <karl@freefriends.org>2022-01-26 21:08:47 +0000
commitb3e927c8043ceabb5dae6645819e150244f9f11d (patch)
treee0fb5dc9697201b5940b49cdd96b1f89ef46446e
parent385278ff3cbd9c60e27e500807b3db97102b2d7f (diff)
babel (26jan22)
git-svn-id: svn://tug.org/texlive/trunk@61748 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/babel/README.md23
-rw-r--r--Master/texmf-dist/doc/latex/babel/babel.pdfbin861065 -> 853492 bytes
-rw-r--r--Master/texmf-dist/source/latex/babel/babel.dtx130
-rw-r--r--Master/texmf-dist/source/latex/babel/babel.ins4
-rw-r--r--Master/texmf-dist/source/latex/babel/bbcompat.dtx2
-rw-r--r--Master/texmf-dist/source/latex/babel/locale.zipbin794462 -> 794551 bytes
-rw-r--r--Master/texmf-dist/tex/generic/babel/babel-bidi-basic-r.lua2
-rw-r--r--Master/texmf-dist/tex/generic/babel/babel-bidi-basic.lua7
-rw-r--r--Master/texmf-dist/tex/generic/babel/babel-data-bidi.lua2
-rw-r--r--Master/texmf-dist/tex/generic/babel/babel-data-cjk.lua2
-rw-r--r--Master/texmf-dist/tex/generic/babel/babel-transforms.lua2
-rw-r--r--Master/texmf-dist/tex/generic/babel/babel.def8
-rw-r--r--Master/texmf-dist/tex/generic/babel/babel.sty8
-rw-r--r--Master/texmf-dist/tex/generic/babel/blplain.tex2
-rw-r--r--Master/texmf-dist/tex/generic/babel/bplain.tex2
-rw-r--r--Master/texmf-dist/tex/generic/babel/hyphen.cfg8
-rw-r--r--Master/texmf-dist/tex/generic/babel/locale/fi/babel-fi.ini11
-rw-r--r--Master/texmf-dist/tex/generic/babel/luababel.def108
-rw-r--r--Master/texmf-dist/tex/generic/babel/nil.ldf4
-rw-r--r--Master/texmf-dist/tex/generic/babel/plain.def2
-rw-r--r--Master/texmf-dist/tex/generic/babel/switch.def2
-rw-r--r--Master/texmf-dist/tex/generic/babel/txtbabel.def2
-rw-r--r--Master/texmf-dist/tex/generic/babel/xebabel.def2
23 files changed, 217 insertions, 116 deletions
diff --git a/Master/texmf-dist/doc/latex/babel/README.md b/Master/texmf-dist/doc/latex/babel/README.md
index 5702c7132b5..7587c42b97f 100644
--- a/Master/texmf-dist/doc/latex/babel/README.md
+++ b/Master/texmf-dist/doc/latex/babel/README.md
@@ -1,4 +1,4 @@
-## Babel 3.69
+## Babel 3.70
This package manages culturally-determined typographical (and other)
rules, and hyphenation patterns for a wide range of languages. Many
@@ -8,9 +8,9 @@ is a set of ini files for about 250 languages.
The latest stable version is available on <https://ctan.org/pkg/babel>.
-Changes in version 3.69 are described in:
+Changes in version 3.70 are described in:
-https://latex3.github.io/babel/news/whats-new-in-babel-3.69.html
+https://latex3.github.io/babel/news/whats-new-in-babel-3.70.html
Apart from the manual, you can find information on some aspects of babel at:
@@ -46,18 +46,11 @@ respective authors.
### Summary of Latest changes
```
-3.69 2021-12-30
- * Fixes a severe bug with amsmath and mathtools introduced in
- 3.68 (#162).
-
-3.68 2021-12-28
- * Fixes:
- - Assamese, Bengali, Gujarati set incorrectly prehyphenchar.
- - The syntax provide=* didn’t work with Hebrew and a few other
- languages.
- - Wrong equation direction in first column in array and tabular
- environment (#158).
- - Tentative fixes for labels in displayed math (#159).
+3.70 2022-01-26
+ * Finnish: transform 'prehyphen.nobreak'.
+ * Better fixes for amsmath, as well as for the default
+ 'equation' and 'eqnarray' (but still not perfect).
+ * Fix an error with bidi=basic and some fonts for graphics.
```
### Previous changes
diff --git a/Master/texmf-dist/doc/latex/babel/babel.pdf b/Master/texmf-dist/doc/latex/babel/babel.pdf
index fe1d580f2e5..58449b95d40 100644
--- a/Master/texmf-dist/doc/latex/babel/babel.pdf
+++ b/Master/texmf-dist/doc/latex/babel/babel.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/babel/babel.dtx b/Master/texmf-dist/source/latex/babel/babel.dtx
index 47e8df74c5b..a9b4ad69f9c 100644
--- a/Master/texmf-dist/source/latex/babel/babel.dtx
+++ b/Master/texmf-dist/source/latex/babel/babel.dtx
@@ -1,7 +1,7 @@
% \iffalse
% This document requires lualatex
%%
-%% 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.
@@ -32,7 +32,7 @@
%
% \iffalse
%<*filedriver>
-\ProvidesFile{babel.dtx}[2021/12/30 v3.69 The Babel package]
+\ProvidesFile{babel.dtx}[2022/01/26 v3.70 The Babel package]
\documentclass{ltxdoc}
\GetFileInfo{babel.dtx}
\usepackage{fontspec}
@@ -3150,11 +3150,14 @@ Spanish}{hyphen.repeat}{Explicit hyphens behave like
\trans{Czech, Polish, Slovak}{oneletter.nobreak}{Converts a space after
a non-syllabic preposition or conjunction into a non-breaking space.}
+\trans{Finnish}{prehyphen.nobreak}{Line breaks just after hyphens
+prepended to words are prevented, like in “pakastekaapit ja -arkut”.}
+
\trans{Greek}{diaeresis.hyphen}{Removes the diaeresis above iota and
upsilon if hyphenated just before. It works with the three variants.}
-\trans{Greek}{transliteration.omega}{Although he provided combinations
-are not exactly the same, this transform follows the syntax of Omega:
+\trans{Greek}{transliteration.omega}{Although the provided combinations
+are not the full set, this transform follows the syntax of Omega:
|=| for the circumflex, |v| for digamma, and so on. For better
compatibility with Levy’s system, \texttt{\string~} (as ‘string’) is an
alternative to |=|. |'| is tonos in Monotonic Greek, but oxia in
@@ -5119,8 +5122,8 @@ help from Bernd Raichle, for which I am grateful.
% \section{Tools}
%
% \begin{macrocode}
-%<<version=3.69>>
-%<<date=2021/12/30>>
+%<<version=3.70>>
+%<<date=2022/01/26>>
% \end{macrocode}
%
% \textbf{Do not use the following macros in \texttt{ldf} files. They
@@ -14301,8 +14304,8 @@ end
else
rep = rep:gsub( '(no)%s*=%s*([^%s,]*)', Babel.capture_func)
rep = rep:gsub( '(pre)%s*=%s*([^%s,]*)', Babel.capture_func)
- rep = rep:gsub( '(post)%s*=%s*([^%s,]*)', Babel.capture_func)
- end
+ rep = rep:gsub( '(post)%s*=%s*([^%s,]*)', Babel.capture_func)
+ end
tex.print([[\string\babeltempa{{]] .. rep .. [[}}]])
}}}&%
\let\bbl@kv@attribute\relax
@@ -14516,39 +14519,85 @@ end
% \begin{macrocode}
\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@
@@ -21986,7 +22035,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/source/latex/babel/babel.ins b/Master/texmf-dist/source/latex/babel/babel.ins
index 16bde4384ee..cc5a9a01893 100644
--- a/Master/texmf-dist/source/latex/babel/babel.ins
+++ b/Master/texmf-dist/source/latex/babel/babel.ins
@@ -3,7 +3,7 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright 2012-2021 Javier Bezos and Johannes L. Braams.
+%% Copyright 2012-2022 Javier Bezos and Johannes L. Braams.
%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
@@ -26,7 +26,7 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%%
-\def\filedate{2021/12/30}
+\def\filedate{2022/01/26}
\def\batchfile{babel.ins}
\input docstrip.tex
diff --git a/Master/texmf-dist/source/latex/babel/bbcompat.dtx b/Master/texmf-dist/source/latex/babel/bbcompat.dtx
index ed07287c375..c96b67d1bc3 100644
--- a/Master/texmf-dist/source/latex/babel/bbcompat.dtx
+++ b/Master/texmf-dist/source/latex/babel/bbcompat.dtx
@@ -30,7 +30,7 @@
%
% \iffalse
%<*dtx>
-\ProvidesFile{bbcompat.dtx}[2021/12/30 v3.69]
+\ProvidesFile{bbcompat.dtx}[2022/01/26 v3.70]
%</dtx>
%
%% File 'bbcompat.dtx'
diff --git a/Master/texmf-dist/source/latex/babel/locale.zip b/Master/texmf-dist/source/latex/babel/locale.zip
index 4654c0645f8..9fda96f7c07 100644
--- a/Master/texmf-dist/source/latex/babel/locale.zip
+++ b/Master/texmf-dist/source/latex/babel/locale.zip
Binary files differ
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.