diff options
author | Karl Berry <karl@freefriends.org> | 2024-03-29 21:35:44 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2024-03-29 21:35:44 +0000 |
commit | ff4e3b54056f06c0dce5f9423003d8c8fbb5fe33 (patch) | |
tree | 47983b51719b2c01111fb63e49f991ad138ef999 /Master/texmf-dist/tex | |
parent | 59e30b63db8a55f8b463dfd85e7a17ace98d5622 (diff) |
babel (29mar24)
git-svn-id: svn://tug.org/texlive/trunk@70809 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
9 files changed, 61 insertions, 43 deletions
diff --git a/Master/texmf-dist/tex/generic/babel/babel.def b/Master/texmf-dist/tex/generic/babel/babel.def index 3a1f99d2e7c..a76f7f47b11 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}[2024/02/07 v24.2 Babel common definitions] +\ProvidesFile{babel.def}[2024/03/29 v24.3 Babel common definitions] \ifx\AtBeginDocument\@undefined % TODO. change test. \def\@empty{} \def\loadlocalcfg#1{% @@ -596,8 +596,8 @@ \toks@\expandafter{\bbl@tempc#3}% \expandafter\edef\csname extras\languagename\endcsname{\the\toks@}% \fi} -\def\bbl@version{24.2} -\def\bbl@date{2024/02/07} +\def\bbl@version{24.3} +\def\bbl@date{2024/03/29} \ifx\language\@undefined \csname newcount\endcsname\language \fi @@ -735,6 +735,7 @@ \bbl@push@language \aftergroup\bbl@pop@language \bbl@set@language{#1}} +\let\endselectlanguage\relax \def\BabelContentsFiles{toc,lof,lot} \def\bbl@set@language#1{% from selectlanguage, pop@ % The old buggy way. Preserved for compatibility. @@ -890,8 +891,7 @@ \ifnum\bbl@hymapsel=\@cclv\let\bbl@hymapsel\thr@@\fi \csname selectlanguage \endcsname{#1}% \ignorespaces} -\long\def\endotherlanguage{% - \global\@ignoretrue\ignorespaces} +\long\def\endotherlanguage{\@ignoretrue\ignorespaces} \expandafter\def\csname otherlanguage*\endcsname{% \@ifnextchar[\bbl@otherlanguage@s{\bbl@otherlanguage@s[]}} \def\bbl@otherlanguage@s[#1]#2{% diff --git a/Master/texmf-dist/tex/generic/babel/babel.sty b/Master/texmf-dist/tex/generic/babel/babel.sty index 0eb07150d03..35fa58deff0 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}[2024/02/07 v24.2 The Babel package] +\ProvidesPackage{babel}[2024/03/29 v24.3 The Babel package] \@ifpackagewith{babel}{debug} {\providecommand\bbl@trace[1]{\message{^^J[ #1 ]}}% \let\bbl@debug\@firstofone @@ -466,8 +466,8 @@ \expandafter\@secondoftwo \fi} \fi -\def\bbl@version{24.2} -\def\bbl@date{2024/02/07} +\def\bbl@version{24.3} +\def\bbl@date{2024/03/29} \ifx\language\@undefined \csname newcount\endcsname\language \fi @@ -633,6 +633,7 @@ \bbl@push@language \aftergroup\bbl@pop@language \bbl@set@language{#1}} +\let\endselectlanguage\relax \def\BabelContentsFiles{toc,lof,lot} \def\bbl@set@language#1{% from selectlanguage, pop@ % The old buggy way. Preserved for compatibility. @@ -788,8 +789,7 @@ \ifnum\bbl@hymapsel=\@cclv\let\bbl@hymapsel\thr@@\fi \csname selectlanguage \endcsname{#1}% \ignorespaces} -\long\def\endotherlanguage{% - \global\@ignoretrue\ignorespaces} +\long\def\endotherlanguage{\@ignoretrue\ignorespaces} \expandafter\def\csname otherlanguage*\endcsname{% \@ifnextchar[\bbl@otherlanguage@s{\bbl@otherlanguage@s[]}} \def\bbl@otherlanguage@s[#1]#2{% @@ -3630,6 +3630,15 @@ \directlua{ Babel.ignore_pre_char = function(node) return false end }} +\@namedef{bbl@ADJ@interchar.disable@nohyphenation}{% + \def\bbl@ignoreinterchar{% + \ifnum\language=\l@nohyphenation + \expandafter\@gobble + \else + \expandafter\@firstofone + \fi}} +\@namedef{bbl@ADJ@interchar.disable@off}{% + \let\bbl@ignoreinterchar\@firstofone} \@namedef{bbl@ADJ@select.write@shift}{% \let\bbl@restorelastskip\relax \def\bbl@savelastskip{% diff --git a/Master/texmf-dist/tex/generic/babel/hyphen.cfg b/Master/texmf-dist/tex/generic/babel/hyphen.cfg index 9b356af30fe..b667ec61a93 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}[2024/02/07 v24.2 Babel hyphens] +\ProvidesFile{hyphen.cfg}[2024/03/29 v24.3 Babel hyphens] \xdef\bbl@format{\jobname} -\def\bbl@version{24.2} -\def\bbl@date{2024/02/07} +\def\bbl@version{24.3} +\def\bbl@date{2024/03/29} \ifx\AtBeginDocument\@undefined \def\@empty{} \fi diff --git a/Master/texmf-dist/tex/generic/babel/locale/brx/babel-brx.ini b/Master/texmf-dist/tex/generic/babel/locale/brx/babel-brx.ini index e95f7fdb714..acffcff76ee 100644 --- a/Master/texmf-dist/tex/generic/babel/locale/brx/babel-brx.ini +++ b/Master/texmf-dist/tex/generic/babel/locale/brx/babel-brx.ini @@ -9,8 +9,8 @@ [identification] charset = utf8 -version = 1.5 -date = 2022-06-14 +version = 1.6 +date = 2024-03-18 name.local = बर’ name.english = Bodo name.babel = bodo @@ -171,3 +171,4 @@ plusSign = + superscriptingExponent = × [counters] +alphabetic = क ख ग घ ङ च छ ज झ ञ ट ठ ड ढ ण त थ द ध न प फ ब भ म य र ल व श ष स ह
\ No newline at end of file diff --git a/Master/texmf-dist/tex/generic/babel/locale/fr/babel-french-canada.tex b/Master/texmf-dist/tex/generic/babel/locale/fr/babel-french-canada.tex index 43351e1d342..c12481ca1c1 100644 --- a/Master/texmf-dist/tex/generic/babel/locale/fr/babel-french-canada.tex +++ b/Master/texmf-dist/tex/generic/babel/locale/fr/babel-french-canada.tex @@ -10,11 +10,10 @@ \BabelBeforeIni{fr-CA}{% } - \ifcase\bbl@engine\or\or % XeTeX % Partly based on babel-french, by Daniel Flipo -\IfBabelIntercharT{puntuation.space}{% +\IfBabelIntercharT{punctuation.space}{% \providecommand{\BabelFrenchGuillemetSpace}{% \leavevmode\nobreak\hskip.8\fontdimen2\font plus.3\fontdimen3\font @@ -26,19 +25,19 @@ \babelcharclass{\CurrentOption}{rightguillemet}{»}% \babelcharclass{\CurrentOption}{opening}{([\{}% just make != default % - \babelinterchar[label=puntuation.space]{\CurrentOption}% + \babelinterchar[label=punctuation.space]{\CurrentOption}% {default, rightguillemet}{colon}{\BabelFrenchColonSpace}% - \babelinterchar[label=puntuation.space]{\CurrentOption}% + \babelinterchar[label=punctuation.space]{\CurrentOption}% {leftguillemet}{default}{\BabelFrenchGuillemetSpace}% - \babelinterchar[label=puntuation.space]{\CurrentOption}% + \babelinterchar[label=punctuation.space]{\CurrentOption}% {default}{rightguillemet}{\BabelFrenchGuillemetSpace}% % % Here boundary means essentialy space: - \babelinterchar[label=puntuation.space]{\CurrentOption}% + \babelinterchar[label=punctuation.space]{\CurrentOption}% {boundary}{colon}{\ifhmode\unskip\nobreak\fi\BabelFrenchColonSpace}% - \babelinterchar[label=puntuation.space]{\CurrentOption}% + \babelinterchar[label=punctuation.space]{\CurrentOption}% {leftguillemet}{boundary}{\BabelFrenchGuillemetSpace\ignorespaces}% - \babelinterchar[label=puntuation.space]{\CurrentOption}% + \babelinterchar[label=punctuation.space]{\CurrentOption}% {boundary}{rightguillemet}{\ifhmode\unskip\fi\BabelFrenchGuillemetSpace}% } diff --git a/Master/texmf-dist/tex/generic/babel/locale/fr/babel-french.tex b/Master/texmf-dist/tex/generic/babel/locale/fr/babel-french.tex index a53769ba554..56502534242 100644 --- a/Master/texmf-dist/tex/generic/babel/locale/fr/babel-french.tex +++ b/Master/texmf-dist/tex/generic/babel/locale/fr/babel-french.tex @@ -13,7 +13,7 @@ \ifcase\bbl@engine\or\or % XeTeX % Partly based on babel-french, by Daniel Flipo -\IfBabelIntercharT{puntuation.space}{% +\IfBabelIntercharT{punctuation.space}{% \providecommand{\BabelFrenchGuillemetSpace}{% \leavevmode\nobreak\hskip.8\fontdimen2\font plus.3\fontdimen3\font @@ -28,23 +28,23 @@ \babelcharclass{\CurrentOption}{rightguillemet}{»}% \babelcharclass{\CurrentOption}{opening}{([\{}% just make != default % - \babelinterchar[label=puntuation.space]{\CurrentOption}% + \babelinterchar[label=punctuation.space]{\CurrentOption}% {default, rightguillemet, high, colon}{high}{\BabelFrenchHighSpace}% - \babelinterchar[label=puntuation.space]{\CurrentOption}% + \babelinterchar[label=punctuation.space]{\CurrentOption}% {default, rightguillemet, high}{colon}{\BabelFrenchColonSpace}% - \babelinterchar[label=puntuation.space]{\CurrentOption}% + \babelinterchar[label=punctuation.space]{\CurrentOption}% {leftguillemet}{default}{\BabelFrenchGuillemetSpace}% - \babelinterchar[label=puntuation.space]{\CurrentOption}% + \babelinterchar[label=punctuation.space]{\CurrentOption}% {default, high}{rightguillemet}{\BabelFrenchGuillemetSpace}% % % Here boundary means essentialy space: - \babelinterchar[label=puntuation.space]{\CurrentOption}% + \babelinterchar[label=punctuation.space]{\CurrentOption}% {boundary}{high}{\ifhmode\unskip\nobreak\fi\BabelFrenchHighSpace}% - \babelinterchar[label=puntuation.space]{\CurrentOption}% + \babelinterchar[label=punctuation.space]{\CurrentOption}% {boundary}{colon}{\ifhmode\unskip\nobreak\fi\BabelFrenchColonSpace}% - \babelinterchar[label=puntuation.space]{\CurrentOption}% + \babelinterchar[label=punctuation.space]{\CurrentOption}% {leftguillemet}{boundary}{\BabelFrenchGuillemetSpace\ignorespaces}% - \babelinterchar[label=puntuation.space]{\CurrentOption}% + \babelinterchar[label=punctuation.space]{\CurrentOption}% {boundary}{rightguillemet}{\ifhmode\unskip\fi\BabelFrenchGuillemetSpace}% } diff --git a/Master/texmf-dist/tex/generic/babel/luababel.def b/Master/texmf-dist/tex/generic/babel/luababel.def index 78272358244..b531bcdeb3d 100644 --- a/Master/texmf-dist/tex/generic/babel/luababel.def +++ b/Master/texmf-dist/tex/generic/babel/luababel.def @@ -996,7 +996,7 @@ end \let\\\bbl@tempfs@nxx\<__fontspec_warning:nxx>% \let\<__fontspec_warning:nxx>\\\bbl@fs@warn@nxx \\\renewfontfamily\\#4% - [\bbl@cl{lsys},% + [\bbl@cl{lsys},% xetex removes unknown features :-( \ifcase\bbl@engine\or RawFeature={family=\bbl@tempb},\fi #2]}{#3}% ie \bbl@exp{..}{#3} \bbl@exp{% @@ -1466,9 +1466,14 @@ end local d = node.new(node.id'dir') d.dir = '+TRT' node.insert_before(head, node.has_glyph(head), d) + local inmath = false for item in node.traverse(head) do - node.set_attribute(item, - Babel.attr_dir, token.get_macro('bbl@thedir')) + if item.id == 11 then + inmath = (item.subtype == 0) + elseif not inmath then + node.set_attribute(item, + Babel.attr_dir, token.get_macro('bbl@thedir')) + end end end end @@ -1478,6 +1483,9 @@ end "Babel.math_box_dir", 0) }}% \fi +\DeclareRobustCommand\localebox[1]{% + {\def\bbl@insidemath{0}% + \mbox{\foreignlanguage{\languagename}{#1}}}} \bbl@trace{Redefinitions for bidi layout} \ifnum\bbl@bidimode>\z@ % Any bidi= \matheqdirmode\@ne % A luatex primitive diff --git a/Master/texmf-dist/tex/generic/babel/nil.ldf b/Master/texmf-dist/tex/generic/babel/nil.ldf index 434542c8e9f..987796efd1e 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}[2024/02/07 v24.2 Nil language] +\ProvidesLanguage{nil}[2024/03/29 v24.3 Nil language] \LdfInit{nil}{datenil} \ifx\l@nil\@undefined \newlanguage\l@nil diff --git a/Master/texmf-dist/tex/generic/babel/xebabel.def b/Master/texmf-dist/tex/generic/babel/xebabel.def index 4da5bc3949a..e1f5387a0ef 100644 --- a/Master/texmf-dist/tex/generic/babel/xebabel.def +++ b/Master/texmf-dist/tex/generic/babel/xebabel.def @@ -248,7 +248,7 @@ \let\\\bbl@tempfs@nxx\<__fontspec_warning:nxx>% \let\<__fontspec_warning:nxx>\\\bbl@fs@warn@nxx \\\renewfontfamily\\#4% - [\bbl@cl{lsys},% + [\bbl@cl{lsys},% xetex removes unknown features :-( \ifcase\bbl@engine\or RawFeature={family=\bbl@tempb},\fi #2]}{#3}% ie \bbl@exp{..}{#3} \bbl@exp{% @@ -348,16 +348,17 @@ \else \bbl@error{double-hyphens-class}{}{}{}% \fi\fi} +\def\bbl@ignoreinterchar{% + \ifnum\language=\l@nohyphenation + \expandafter\@gobble + \else + \expandafter\@firstofone + \fi} \newcommand\babelinterchar[5][]{% \let\bbl@kv@label\@empty \bbl@forkv{#1}{\bbl@csarg\edef{kv@##1}{##2}}% \@namedef{\zap@space bbl@xeinter@\bbl@kv@label @#3@#4@#2 \@empty}% - {\ifnum\language=\l@nohyphenation - \expandafter\@gobble - \else - \expandafter\@firstofone - \fi - {#5}}% + {\bbl@ignoreinterchar{#5}}% \bbl@csarg\let{ic@\bbl@kv@label @#2}\@firstofone \bbl@exp{\\\bbl@for\\\bbl@tempa{\zap@space#3 \@empty}}{% \bbl@exp{\\\bbl@for\\\bbl@tempb{\zap@space#4 \@empty}}{% |