diff options
author | Karl Berry <karl@freefriends.org> | 2021-12-28 22:51:15 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-12-28 22:51:15 +0000 |
commit | 41b890981336d35e8af90cc4fef09ad6570b56b8 (patch) | |
tree | 14968e679b302f69e62f42ca98a1283f91cdb30d /Master/texmf-dist/tex/generic | |
parent | a76a5a98b10442234e0a271beedc8e4d87b8fa2c (diff) |
babel (28dec21)
git-svn-id: svn://tug.org/texlive/trunk@61433 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic')
9 files changed, 114 insertions, 116 deletions
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 27467e83fd4..a6a8b8e8954 100644 --- a/Master/texmf-dist/tex/generic/babel/babel-bidi-basic.lua +++ b/Master/texmf-dist/tex/generic/babel/babel-bidi-basic.lua @@ -209,7 +209,7 @@ function Babel.bidi(head, ispar, hdir) elseif item.id == DIR then d = nil - new_d = true + if head ~= item then new_d = true end elseif item.id == node.id'glue' and item.subtype == 13 then glue_d = d diff --git a/Master/texmf-dist/tex/generic/babel/babel.def b/Master/texmf-dist/tex/generic/babel/babel.def index d80ec90556c..5e034823ad5 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}[2021/11/29 3.67 Babel common definitions] +\ProvidesFile{babel.def}[2021/12/28 3.68 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.67} -\def\bbl@date{2021/11/29} +\def\bbl@version{3.68} +\def\bbl@date{2021/12/28} \ifx\language\@undefined \csname newcount\endcsname\language \fi @@ -2927,8 +2927,8 @@ \ifeof\bbl@readstream \bbl@error {There is no ini file for the requested language\\% - (#1). Perhaps you misspelled it or your installation\\% - is not complete.}% + (#1: \languagename). Perhaps you misspelled it or your\\% + installation is not complete.}% {Fix the name or reinstall babel.}% \else % == Store ini data in \bbl@inidata == diff --git a/Master/texmf-dist/tex/generic/babel/babel.sty b/Master/texmf-dist/tex/generic/babel/babel.sty index 991dbb42e3f..da64be20fdf 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}[2021/11/29 3.67 The Babel package] +\ProvidesPackage{babel}[2021/12/28 3.68 The Babel package] \@ifpackagewith{babel}{debug} {\providecommand\bbl@trace[1]{\message{^^J[ #1 ]}}% \let\bbl@debug\@firstofone @@ -441,11 +441,6 @@ \ifx\bbl@opt@safe\@undefined \def\bbl@opt@safe{BR} \fi -\ifx\bbl@opt@main\@nnil\else - \edef\bbl@language@opts{% - \ifx\bbl@language@opts\@empty\else\bbl@language@opts,\fi - \bbl@opt@main} -\fi \bbl@trace{Defining IfBabelLayout} \ifx\bbl@opt@layout\@nnil \newcommand\IfBabelLayout[3]{#3}% @@ -458,8 +453,8 @@ \expandafter\@secondoftwo \fi} \fi -\def\bbl@version{3.67} -\def\bbl@date{2021/11/29} +\def\bbl@version{3.68} +\def\bbl@date{2021/12/28} \ifx\language\@undefined \csname newcount\endcsname\language \fi @@ -2979,8 +2974,8 @@ \ifeof\bbl@readstream \bbl@error {There is no ini file for the requested language\\% - (#1). Perhaps you misspelled it or your installation\\% - is not complete.}% + (#1: \languagename). Perhaps you misspelled it or your\\% + installation is not complete.}% {Fix the name or reinstall babel.}% \else % == Store ini data in \bbl@inidata == @@ -4202,79 +4197,57 @@ Local config file '\bbl@opt@config.cfg' not found}{% Perhaps you misspelled it.}}% \fi -\let\bbl@tempc\relax +\ifx\bbl@opt@main\@nnil + \ifnum\bbl@iniflag>\z@ % if all ldf's: set implicitly, no main pass + \let\bbl@tempb\@empty + \edef\bbl@tempa{\@classoptionslist,\bbl@language@opts}% + \bbl@foreach\bbl@tempa{\edef\bbl@tempb{#1,\bbl@tempb}}% + \bbl@foreach\bbl@tempb{% \bbl@tempb is a reversed list + \ifx\bbl@opt@main\@nnil % ie, if not yet assigned + \ifodd\bbl@iniflag % = *= + \IfFileExists{babel-#1.tex}{\def\bbl@opt@main{#1}}{}% + \else % n += + \IfFileExists{#1.ldf}{\def\bbl@opt@main{#1}}{}% + \fi + \fi}% + \fi +\fi +\ifx\bbl@opt@main\@nnil\else + \bbl@csarg\let{loadmain\expandafter}\csname ds@\bbl@opt@main\endcsname + \expandafter\let\csname ds@\bbl@opt@main\endcsname\relax +\fi \bbl@foreach\bbl@language@opts{% - \ifcase\bbl@iniflag % Default + \def\bbl@tempa{#1}% + \ifx\bbl@tempa\bbl@opt@main\else \bbl@ifunset{ds@#1}% - {\DeclareOption{#1}{\bbl@load@language{#1}}}% - {}% - \or % provide=* - \@gobble % case 2 same as 1 - \or % provide+=* - \bbl@ifunset{ds@#1}% - {\IfFileExists{#1.ldf}{}% - {\IfFileExists{babel-#1.tex}{}{\@namedef{ds@#1}{}}}}% - {}% - \bbl@ifunset{ds@#1}% - {\def\bbl@tempc{#1}% - \DeclareOption{#1}{% - \ifnum\bbl@iniflag>\@ne + {\ifnum\bbl@iniflag<\tw@ % 0 ø (other = ldf) + \DeclareOption{#1}{\bbl@load@language{#1}}% + \else % + * (other = ini) + \DeclareOption{#1}{% \bbl@ldfinit \babelprovide[import]{#1}% - \bbl@afterldf{}% - \else - \bbl@load@language{#1}% - \fi}}% - {}% - \or % provide*=* - \def\bbl@tempc{#1}% - \bbl@ifunset{ds@#1}% - {\DeclareOption{#1}{% - \bbl@ldfinit - \babelprovide[import]{#1}% - \bbl@afterldf{}}}% + \bbl@afterldf{}}% + \fi}% {}% \fi} -\let\bbl@tempb\@nnil -\let\bbl@clsoptlst\@classoptionslist \bbl@foreach\@classoptionslist{% - \bbl@ifunset{ds@#1}% - {\IfFileExists{#1.ldf}% - {\def\bbl@tempb{#1}% - \DeclareOption{#1}{% - \ifnum\bbl@iniflag>\@ne - \bbl@ldfinit - \babelprovide[import]{#1}% - \bbl@afterldf{}% - \else - \bbl@load@language{#1}% - \fi}}% - {\IfFileExists{babel-#1.tex}% - {\def\bbl@tempb{#1}% - \ifnum\bbl@iniflag>\z@ - \DeclareOption{#1}{% - \ifnum\bbl@iniflag>\@ne - \bbl@ldfinit - \babelprovide[import]{#1}% - \bbl@afterldf{}% - \fi}% - \fi}% - {}}}% - {}} -\ifnum\bbl@iniflag=\z@\else - \ifx\bbl@opt@main\@nnil - \ifx\bbl@tempc\relax - \let\bbl@opt@main\bbl@tempb - \else - \let\bbl@opt@main\bbl@tempc - \fi - \fi -\fi -\ifx\bbl@opt@main\@nnil\else - \expandafter - \let\expandafter\bbl@loadmain\csname ds@\bbl@opt@main\endcsname - \expandafter\let\csname ds@\bbl@opt@main\endcsname\@empty -\fi + \def\bbl@tempa{#1}% + \ifx\bbl@tempa\bbl@opt@main\else + \bbl@ifunset{ds@#1}% + {\ifnum\bbl@iniflag<\tw@ % 0 ø (other = ldf) + \IfFileExists{#1.ldf}% + {\DeclareOption{#1}{\bbl@load@language{#1}}}% + {}% + \else % + * (other = ini) + \IfFileExists{babel-#1.tex}% + {\DeclareOption{#1}{% + \bbl@ldfinit + \babelprovide[import]{#1}% + \bbl@afterldf{}}}% + {}% + \fi}% + {}% + \fi} \def\AfterBabelLanguage#1{% \bbl@ifsamestring\CurrentOption{#1}{\global\bbl@add\bbl@afterlang}{}} \DeclareOption*{} @@ -4294,32 +4267,27 @@ but the last processed one was '\bbl@tempb'.\\% The main language can't be set as both a global\\% and a package option. Use 'main=\bbl@tempc' as\\% - option. Reported}% + option. Reported} \fi \else - \ifodd\bbl@iniflag % case 1,3 + \ifodd\bbl@iniflag % case 1,3 (main is ini) \bbl@ldfinit \let\CurrentOption\bbl@opt@main - \ifx\bbl@opt@provide\@nnil - \bbl@exp{\\\babelprovide[import,main]{\bbl@opt@main}}% + \bbl@exp{% \bbl@opt@provide = empty if * + \\\babelprovide[\bbl@opt@provide,import,main]{\bbl@opt@main}}% + \bbl@afterldf{} + \DeclareOption{\bbl@opt@main}{} + \else % case 0,2 (main is ldf) + \ifx\bbl@loadmain\relax + \DeclareOption{\bbl@opt@main}{\bbl@load@language{\bbl@opt@main}} \else - \bbl@exp{\\\bbl@forkv{\@nameuse{@raw@opt@babel.sty}}}{% - \bbl@xin@{,provide,}{,#1,}% - \ifin@ - \def\bbl@opt@provide{#2}% - \bbl@replace\bbl@opt@provide{;}{,}% - \fi}% - \bbl@exp{% - \\\babelprovide[\bbl@opt@provide,import,main]{\bbl@opt@main}}% + \DeclareOption{\bbl@opt@main}{\bbl@loadmain} \fi - \bbl@afterldf{}% - \else % case 0,2 - \chardef\bbl@iniflag\z@ % Force ldf - \expandafter\let\csname ds@\bbl@opt@main\endcsname\bbl@loadmain \ExecuteOptions{\bbl@opt@main} - \DeclareOption*{}% - \ProcessOptions* + \@namedef{ds@\bbl@opt@main}{}% \fi + \DeclareOption*{} + \ProcessOptions* \fi \def\AfterBabelLanguage{% \bbl@error diff --git a/Master/texmf-dist/tex/generic/babel/hyphen.cfg b/Master/texmf-dist/tex/generic/babel/hyphen.cfg index d020af4e954..496427e3bf7 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}[2021/11/29 3.67 Babel hyphens] +\ProvidesFile{hyphen.cfg}[2021/12/28 3.68 Babel hyphens] \xdef\bbl@format{\jobname} -\def\bbl@version{3.67} -\def\bbl@date{2021/11/29} +\def\bbl@version{3.68} +\def\bbl@date{2021/12/28} \ifx\AtBeginDocument\@undefined \def\@empty{} \fi diff --git a/Master/texmf-dist/tex/generic/babel/locale/as/babel-as.ini b/Master/texmf-dist/tex/generic/babel/locale/as/babel-as.ini index 582bc6350d3..c8662c3d848 100644 --- a/Master/texmf-dist/tex/generic/babel/locale/as/babel-as.ini +++ b/Master/texmf-dist/tex/generic/babel/locale/as/babel-as.ini @@ -12,8 +12,8 @@ [identification] charset = utf8 -version = 1.9 -date = 2021-06-25 +version = 1.10 +date = 2021-12-13 name.local = অসমীয়া name.english = Assamese name.babel = assamese @@ -116,7 +116,7 @@ hyphenrules = assaseme lefthyphenmin = righthyphenmin = hyphenchar = -prehyphenchar = 0 +prehyphenchar = posthyphenchar = exhyphenchar = preexhyphenchar = diff --git a/Master/texmf-dist/tex/generic/babel/locale/bn/babel-bn.ini b/Master/texmf-dist/tex/generic/babel/locale/bn/babel-bn.ini index 69d04371581..ce2def128d1 100644 --- a/Master/texmf-dist/tex/generic/babel/locale/bn/babel-bn.ini +++ b/Master/texmf-dist/tex/generic/babel/locale/bn/babel-bn.ini @@ -11,8 +11,8 @@ [identification] charset = utf8 -version = 1.9 -date = 2021-06-25 +version = 1.10 +date = 2021-12-13 name.local = বাংলা name.english = Bangla name.babel = bengali @@ -116,7 +116,7 @@ hyphenrules = bengali lefthyphenmin = 2 righthyphenmin = 2 hyphenchar = -prehyphenchar = 0 +prehyphenchar = posthyphenchar = exhyphenchar = preexhyphenchar = diff --git a/Master/texmf-dist/tex/generic/babel/locale/gu/babel-gu.ini b/Master/texmf-dist/tex/generic/babel/locale/gu/babel-gu.ini index 76da70546a4..e47339cf266 100644 --- a/Master/texmf-dist/tex/generic/babel/locale/gu/babel-gu.ini +++ b/Master/texmf-dist/tex/generic/babel/locale/gu/babel-gu.ini @@ -11,8 +11,8 @@ [identification] charset = utf8 -version = 1.8 -date = 2021-06-25 +version = 1.9 +date = 2021-12-13 name.local = ગુજરાતી name.english = Gujarati name.babel = gujarati @@ -138,7 +138,7 @@ hyphenrules = gujarati lefthyphenmin = righthyphenmin = hyphenchar = -prehyphenchar = 0 +prehyphenchar = posthyphenchar = exhyphenchar = preexhyphenchar = diff --git a/Master/texmf-dist/tex/generic/babel/luababel.def b/Master/texmf-dist/tex/generic/babel/luababel.def index d5c8c17511b..2978df88822 100644 --- a/Master/texmf-dist/tex/generic/babel/luababel.def +++ b/Master/texmf-dist/tex/generic/babel/luababel.def @@ -1334,12 +1334,42 @@ end \frozen@everydisplay\expandafter{% \expandafter\bbl@mathboxdir\the\frozen@everydisplay} \fi +\def\bbl@truellap{%s + \ifcase\bbl@attr@dir\expandafter\llap\else\expandafter\rlap\fi} +\def\bbl@truerlap{% + \ifcase\bbl@attr@dir\expandafter\rlap\else\expandafter\llap\fi} \bbl@trace{Redefinitions for bidi layout} +\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 - \edef\@eqnnum{{% - \unexpanded{\ifcase\bbl@attr@dir\else\bbl@textdir\@ne\fi}% - \unexpanded\expandafter{\@eqnnum}}} + \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]}}}} + \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 c484114f956..59b40c34ce0 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}[2021/11/29 3.67 Nil language] +\ProvidesLanguage{nil}[2021/12/28 3.68 Nil language] \LdfInit{nil}{datenil} \ifx\l@nil\@undefined \newlanguage\l@nil |