From bc5ed4f3a9e7ab2e27842c931b8b945a2d22d616 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 24 Feb 2022 20:55:39 +0000 Subject: babel (24feb22) git-svn-id: svn://tug.org/texlive/trunk@62166 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/generic/babel/babel.def | 8 +- Master/texmf-dist/tex/generic/babel/babel.sty | 12 ++- Master/texmf-dist/tex/generic/babel/hyphen.cfg | 6 +- .../tex/generic/babel/locale/pl/babel-pl.ini | 8 +- .../tex/generic/babel/locale/th/babel-th.ini | 30 ++++---- Master/texmf-dist/tex/generic/babel/luababel.def | 90 ++++++++-------------- Master/texmf-dist/tex/generic/babel/nil.ldf | 2 +- 7 files changed, 70 insertions(+), 86 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/generic/babel/babel.def b/Master/texmf-dist/tex/generic/babel/babel.def index b60ad25a125..32fefbdc2ef 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/13 3.71 Babel common definitions] +\ProvidesFile{babel.def}[2022/02/24 3.72 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.71} -\def\bbl@date{2022/02/13} +\def\bbl@version{3.72} +\def\bbl@date{2022/02/24} \ifx\language\@undefined \csname newcount\endcsname\language \fi @@ -2524,6 +2524,8 @@ % == onchar == \ifx\bbl@KVP@onchar\@nil\else \bbl@luahyphenate + \bbl@exp{% + \\\AddToHook{env/document/before}{{\\\select@language{#2}{}}}}% \directlua{ if Babel.locale_mapped == nil then Babel.locale_mapped = true diff --git a/Master/texmf-dist/tex/generic/babel/babel.sty b/Master/texmf-dist/tex/generic/babel/babel.sty index 47e17405b35..da65d33d5ad 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/13 3.71 The Babel package] +\ProvidesPackage{babel}[2022/02/24 3.72 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.71} -\def\bbl@date{2022/02/13} +\def\bbl@version{3.72} +\def\bbl@date{2022/02/24} \ifx\language\@undefined \csname newcount\endcsname\language \fi @@ -2571,6 +2571,8 @@ % == onchar == \ifx\bbl@KVP@onchar\@nil\else \bbl@luahyphenate + \bbl@exp{% + \\\AddToHook{env/document/before}{{\\\select@language{#2}{}}}}% \directlua{ if Babel.locale_mapped == nil then Babel.locale_mapped = true @@ -4211,6 +4213,10 @@ \fi \fi}% \fi +\else + \bbl@info{Main language set with 'main='. Except if you have\\% + problems, prefer the default mechanism for setting\\% + the main language. Reported} \fi \ifx\bbl@opt@main\@nnil\else \bbl@csarg\let{loadmain\expandafter}\csname ds@\bbl@opt@main\endcsname diff --git a/Master/texmf-dist/tex/generic/babel/hyphen.cfg b/Master/texmf-dist/tex/generic/babel/hyphen.cfg index 542b6546e5d..4a4d3c113cf 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/13 3.71 Babel hyphens] +\ProvidesFile{hyphen.cfg}[2022/02/24 3.72 Babel hyphens] \xdef\bbl@format{\jobname} -\def\bbl@version{3.71} -\def\bbl@date{2022/02/13} +\def\bbl@version{3.72} +\def\bbl@date{2022/02/24} \ifx\AtBeginDocument\@undefined \def\@empty{} \fi diff --git a/Master/texmf-dist/tex/generic/babel/locale/pl/babel-pl.ini b/Master/texmf-dist/tex/generic/babel/locale/pl/babel-pl.ini index c36cba8621c..c331d1ecf56 100644 --- a/Master/texmf-dist/tex/generic/babel/locale/pl/babel-pl.ini +++ b/Master/texmf-dist/tex/generic/babel/locale/pl/babel-pl.ini @@ -11,8 +11,8 @@ [identification] charset = utf8 -version = 1.3 -date = 2021-04-24 +version = 1.4 +date = 2022-02-24 name.local = polski name.english = Polish name.babel = polish @@ -43,7 +43,7 @@ figure = Rysunek table = Tablica part = Cześć encl = Załacznik -cc = Kopie: +cc = Kopie headto = Do page = Strona see = Porównaj @@ -66,7 +66,7 @@ figure = Rysunek table = Tablica part = Cze\'s\'c encl = Za\l acznik -cc = Kopie: +cc = Kopie headto = Do page = Strona see = Por\'ownaj diff --git a/Master/texmf-dist/tex/generic/babel/locale/th/babel-th.ini b/Master/texmf-dist/tex/generic/babel/locale/th/babel-th.ini index 58fbe840658..65f800f6f85 100644 --- a/Master/texmf-dist/tex/generic/babel/locale/th/babel-th.ini +++ b/Master/texmf-dist/tex/generic/babel/locale/th/babel-th.ini @@ -11,8 +11,8 @@ [identification] charset = utf8 -version = 1.7 -date = 2020-09-30 +version = 1.8 +date = 2022-02-17 name.local = ไทย name.english = Thai name.babel = thai @@ -30,26 +30,26 @@ derivate = no require.babel = thai [captions] -preface = คำนำ -ref = เอกสารอ้างอิง -abstract = บทคดั ยอ่ -bib = บรรณานกุ รม -chapter = บทท่ี +preface = บทนำ +ref = หนังสืออ้างอิง +abstract = บทคัดย่อ +bib = บรรณานุกรม +chapter = บทที่ appendix = ภาคผนวก contents = สารบัญ -listfigure = สารบัญรปู -listtable = สารบญั ตาราง +listfigure = สารบัญรูป +listtable = สารบัญตาราง index = ดรรชนี -figure = รปู ท่ี -table = ตารางท่ี +figure = รูปที่ +table = ตารางที่ part = ภาค -encl = สง่ิ ทแ่ี นบมาด้วย +encl = สิ่งที่แนบมาด้วย cc = สำเนาถึง -headto = เรยี น +headto = เรียน page = หน้า see = ดู -also = ดูเพ่ิมเตมิ -proof = พิสจู น์ +also = ดูเพิ่มเติม +proof = พิสูจน์ glossary = [captions.licr] diff --git a/Master/texmf-dist/tex/generic/babel/luababel.def b/Master/texmf-dist/tex/generic/babel/luababel.def index 1405e5710ba..15be747ccc1 100644 --- a/Master/texmf-dist/tex/generic/babel/luababel.def +++ b/Master/texmf-dist/tex/generic/babel/luababel.def @@ -1348,19 +1348,8 @@ end \def\bbl@dirparastext{\pardir\the\textdir\relax}% %%%% \ifnum\bbl@bidimode>\z@ \def\bbl@insidemath{0}% - \def\bbl@mathboxdir{% - \ifcase\bbl@thetextdir\relax - \everyhbox{\bbl@mathboxdir@aux L}% - \else - \everyhbox{\bbl@mathboxdir@aux R}% - \fi} - \def\bbl@mathboxdir@aux#1{% - \@ifnextchar\egroup{}{\textdir T#1T\relax}} \def\bbl@everymath{\def\bbl@insidemath{1}} - \def\bbl@everydisplay{% - \bbl@mathboxdir - \def\bbl@everymath{\bbl@mathboxdir}% - \def\bbl@insidemath{2}} + \def\bbl@everydisplay{\def\bbl@insidemath{2}} \frozen@everymath\expandafter{% \expandafter\bbl@everymath\the\frozen@everymath} \frozen@everydisplay\expandafter{% @@ -1412,69 +1401,56 @@ end \fi \else % amstex \ifx\bbl@noamsmath\@undefined - \edef\bbl@tempa{% - \catcode58=\the\catcode58\relax - \catcode95=\the\catcode95\relax}% - \catcode58=11 - \catcode95=11 + \@ifpackagewith{amsmath}{leqno}% + {\let\bbl@ams@lap\hbox}% = leqno + {\let\bbl@ams@lap\llap}% = default + \ExplSyntaxOn \bbl@sreplace\intertext@{\normalbaselines}% {\normalbaselines \ifx\bbl@eqnodir\relax\else\bbl@pardir\@ne\bbl@eqnodir\fi}% - \bbl@tempa - \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 0.01pt{% - \ifx\bbl@ams@lap\hbox - \hbox to\displaywidth{\hss\box\z@}\hss - \else - \hss\hbox to\displaywidth{\box\z@\hss}% - \fi}} + \ExplSyntaxOff + \def\bbl@ams@tagbox#1#2{#1{\bbl@eqnodir#2}}% #1=hbox|@lap|flip + \ifx\bbl@ams@lap\hbox % leqno + \def\bbl@ams@flip#1{% + \hbox to 0.01pt{\hss\hbox to\displaywidth{{#1}\hss}}}% + \else % eqno + \def\bbl@ams@flip#1{% + \hbox to 0.01pt{\hbox to\displaywidth{\hss{#1}}\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 - % + \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}% \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}{\\\\\tag*{}\}}% + \AddToHook{env/eqnalign/begin}{\bbl@ams@preset\hbox}% + % Hackish, for proper alignment. Don’t ask me why it works!: + \AddToHook{env/align*/end}{\iftag@\else\tag*{}\fi}% \AddToHook{env/flalign/begin}{\bbl@ams@preset\hbox}% \AddToHook{env/split/before}{% \ifnum\bbl@thetextdir>\z@ - \def\bbl@tempa{equation}% - \ifx\@currenvir\bbl@tempa - \def\bbl@ams@eqtagbox#1{% - \ifx\bbl@ams@lap\hbox - \hbox to0.01pt{\hss\bbl@eqnodir#1}% leqno - \else - \hbox to0.01pt{\bbl@eqnodir#1\hss}% eqno - \fi} - \fi - \fi} - \AddToHook{env/equation/begin}{% - \ifnum\bbl@thetextdir>\z@ - \ifx\bbl@ams@lap\llap\hrule\@height\z@\fi - \edef\bbl@eqnodir{\noexpand\bbl@textdir{\the\bbl@thetextdir}}% - \bbl@sreplace\maketag@@@{\hbox}{\bbl@ams@eqtagbox}% - \fi}% - \AddToHook{env/equation*/begin}{% - \ifnum\bbl@thetextdir>\z@ - \edef\bbl@eqnodir{\noexpand\bbl@textdir{\the\bbl@thetextdir}}% - \bbl@sreplace\maketag@@@{\hbox}{\bbl@ams@eqtagbox}% + \bbl@ifsamestring\@currenvir{equation}% + {\ifx\bbl@ams@lap\hbox % leqno + \def\bbl@ams@flip#1{% + \hbox to 0.01pt{\hbox to\displaywidth{{#1}\hss}\hss}}% + \else + \def\bbl@ams@flip#1{% + \hbox to 0.01pt{\hss\hbox to\displaywidth{\hss{#1}}}}% + \fi}% + {}% \fi}% - \fi \fi} \fi \ifx\bbl@opt@layout\@nnil\endinput\fi % if no layout diff --git a/Master/texmf-dist/tex/generic/babel/nil.ldf b/Master/texmf-dist/tex/generic/babel/nil.ldf index 937d1f50a8b..25006ce03d6 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/13 3.71 Nil language] +\ProvidesLanguage{nil}[2022/02/24 3.72 Nil language] \LdfInit{nil}{datenil} \ifx\l@nil\@undefined \newlanguage\l@nil -- cgit v1.2.3