From c2a0065ea224673b4596d0c66fe1ffa3ba0dad99 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 3 Apr 2019 21:42:12 +0000 Subject: babel (3apr19) git-svn-id: svn://tug.org/texlive/trunk@50741 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/generic/babel/babel-bidi-basic-r.lua | 2 +- .../tex/generic/babel/babel-bidi-basic.lua | 2 +- Master/texmf-dist/tex/generic/babel/babel-bidi.lua | 2 +- Master/texmf-dist/tex/generic/babel/babel.def | 10 +++---- Master/texmf-dist/tex/generic/babel/babel.sty | 31 +++++++++++++++------- Master/texmf-dist/tex/generic/babel/blplain.tex | 2 +- Master/texmf-dist/tex/generic/babel/bplain.tex | 2 +- Master/texmf-dist/tex/generic/babel/hyphen.cfg | 4 +-- Master/texmf-dist/tex/generic/babel/luababel.def | 2 +- Master/texmf-dist/tex/generic/babel/nil.ldf | 4 +-- Master/texmf-dist/tex/generic/babel/plain.def | 2 +- Master/texmf-dist/tex/generic/babel/switch.def | 8 +++--- Master/texmf-dist/tex/generic/babel/txtbabel.def | 2 +- Master/texmf-dist/tex/generic/babel/xebabel.def | 2 +- 14 files changed, 42 insertions(+), 33 deletions(-) (limited to 'Master/texmf-dist/tex') 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 008d27e0658..c9c45087a99 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-2018 Javier Bezos and Johannes L. Braams. +-- Copyright (C) 2012-2019 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 be342c12fe5..345c90a2fef 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-2018 Javier Bezos and Johannes L. Braams. +-- Copyright (C) 2012-2019 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.lua b/Master/texmf-dist/tex/generic/babel/babel-bidi.lua index 9c4c7ed9777..97f6bb69c27 100644 --- a/Master/texmf-dist/tex/generic/babel/babel-bidi.lua +++ b/Master/texmf-dist/tex/generic/babel/babel-bidi.lua @@ -7,7 +7,7 @@ -- babel.dtx (with options: `bidi') -- -- --- Copyright (C) 2012-2018 Javier Bezos and Johannes L. Braams. +-- Copyright (C) 2012-2019 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 accbb739ae7..530548f8eec 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-2018 Javier Bezos and Johannes L. Braams. +%% Copyright (C) 2012-2019 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. @@ -41,7 +41,7 @@ \wlog{File: #1 #4 #3 <#2>}% \let\ProvidesFile\@undefined} \fi -\ProvidesFile{babel.def}[2019/04/01 3.28 Babel common definitions] +\ProvidesFile{babel.def}[2019/04/03 3.29 Babel common definitions] \ifx\AtBeginDocument\@undefined \input plain.def\relax \fi @@ -2072,16 +2072,14 @@ \def\bbl@bodydir{\bbl@setluadir{body}\bodydir} \def\bbl@pagedir{\bbl@setluadir{page}\pagedir} \def\bbl@dirparastext{\pardir\the\textdir\relax}% %%%% - % Sadly, we have to deal with boxes in math with basic: + % Sadly, we have to deal with boxes in math with basic. + % Activated every math with the package option bidi=: \def\bbl@mathboxdir{% \ifcase\bbl@thetextdir\relax \everyhbox{\bgroup\aftergroup\egroup\textdir TLT\relax}% \else \everyhbox{\bgroup\aftergroup\egroup\textdir TRT\relax}% \fi} - % TODO - the same trick as bbl@severypar - \everymath{\bbl@mathboxdir} - \everydisplay{\bbl@mathboxdir} \else % pdftex=0, xetex=2 \AddBabelHook{babel-bidi}{afterextras}{\bbl@switchdir} \DisableBabelHook{babel-bidi} diff --git a/Master/texmf-dist/tex/generic/babel/babel.sty b/Master/texmf-dist/tex/generic/babel/babel.sty index 3f616f84bef..62fd68065fc 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-2018 Javier Bezos and Johannes L. Braams. +%% Copyright (C) 2012-2019 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 @@ %% \NeedsTeXFormat{LaTeX2e}[2005/12/01] -\ProvidesPackage{babel}[2019/04/01 3.28 The Babel package] +\ProvidesPackage{babel}[2019/04/03 3.29 The Babel package] \@ifpackagewith{babel}{debug} {\providecommand\bbl@trace[1]{\message{^^J[ #1 ]}}% \let\bbl@debug\@firstofone} @@ -276,6 +276,9 @@ \DeclareOption{bidi=basic}% {\let\bbl@beforeforeign\leavevmode \newattribute\bbl@attr@dir + % TODO - the same trick as bbl@severypar + % \everymath{\bbl@mathboxdir}% + % \everydisplay{\bbl@mathboxdir}% \bbl@exp{\output{\bodydir\pagedir\the\output}}% \AtEndOfPackage{\EnableBabelHook{babel-bidi}}} \else @@ -291,16 +294,24 @@ \AtEndOfPackage{% \EnableBabelHook{babel-bidi}% \bbl@xebidipar}} + \def\bbl@loadxebidi#1{% + \ifx\RTLfootnotetext\@undefined + \AtEndOfPackage{% + \EnableBabelHook{babel-bidi}% + \ifx\fontspec\@undefined + \usepackage{fontspec}% bidi needs fontspec + \fi + \usepackage#1{bidi}}% + \fi} \DeclareOption{bidi=bidi}% {\bbl@tentative{bidi=bidi}% - \ifx\RTLfootnotetext\@undefined - \AtEndOfPackage{% - \EnableBabelHook{babel-bidi}% - \ifx\fontspec\@undefined - \usepackage{fontspec}% bidi needs fontspec - \fi - \usepackage{bidi}}% - \fi} + \bbl@loadxebidi{}} + \DeclareOption{bidi=bidi-r}% + {\bbl@tentative{bidi=bidi-r}% + \bbl@loadxebidi{[rldocument]}} + \DeclareOption{bidi=bidi-l}% + {\bbl@tentative{bidi=bidi-l}% + \bbl@loadxebidi{}} \fi \DeclareOption{bidi=default}% {\let\bbl@beforeforeign\leavevmode diff --git a/Master/texmf-dist/tex/generic/babel/blplain.tex b/Master/texmf-dist/tex/generic/babel/blplain.tex index ccab720ece2..2031c1e7974 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-2018 Javier Bezos and Johannes L. Braams. +%% Copyright (C) 2012-2019 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 5d8c490d664..e2a67c88065 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-2018 Javier Bezos and Johannes L. Braams. +%% Copyright (C) 2012-2019 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 91fa39860e6..cd1afb4d293 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-2018 Javier Bezos and Johannes L. Braams. +%% Copyright (C) 2012-2019 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. @@ -37,7 +37,7 @@ \wlog{File: #1 #4 #3 <#2>}% \let\ProvidesFile\@undefined} \fi -\ProvidesFile{hyphen.cfg}[2019/04/01 3.28 Babel hyphens] +\ProvidesFile{hyphen.cfg}[2019/04/03 3.29 Babel hyphens] \xdef\bbl@format{\jobname} \ifx\AtBeginDocument\@undefined \def\@empty{} diff --git a/Master/texmf-dist/tex/generic/babel/luababel.def b/Master/texmf-dist/tex/generic/babel/luababel.def index 0f08afd5b2a..85899a726ba 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-2018 Javier Bezos and Johannes L. Braams. +%% Copyright (C) 2012-2019 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/nil.ldf b/Master/texmf-dist/tex/generic/babel/nil.ldf index 7a2b9fdc525..4be4ec7477d 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-2018 Javier Bezos and Johannes L. Braams. +%% Copyright (C) 2012-2019 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 @@ %% extension |.ins|) which are part of the distribution. %% -\ProvidesLanguage{nil}[2019/04/01 3.28 Nil language] +\ProvidesLanguage{nil}[2019/04/03 3.29 Nil language] \LdfInit{nil}{datenil} \ifx\l@nohyphenation\@undefined \@nopatterns{nil} diff --git a/Master/texmf-dist/tex/generic/babel/plain.def b/Master/texmf-dist/tex/generic/babel/plain.def index 506cf37dd58..a1fc1e47094 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-2018 Javier Bezos and Johannes L. Braams. +%% Copyright (C) 2012-2019 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 6495fb6ab65..1755128ad0a 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-2018 Javier Bezos and Johannes L. Braams. +%% Copyright (C) 2012-2019 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. @@ -37,7 +37,7 @@ \wlog{File: #1 #4 #3 <#2>}% \let\ProvidesFile\@undefined} \fi -\ProvidesFile{switch.def}[2019/04/01 3.28 Babel switching mechanism] +\ProvidesFile{switch.def}[2019/04/03 3.29 Babel switching mechanism] \ifx\AtBeginDocument\@undefined \input plain.def\relax \fi @@ -58,8 +58,8 @@ \countdef\last@language=19 \def\addlanguage{\alloc@9\language\chardef\@cclvi} \fi -\def\bbl@version{3.28} -\def\bbl@date{2019/04/01} +\def\bbl@version{3.29} +\def\bbl@date{2019/04/03} \def\adddialect#1#2{% \global\chardef#1#2\relax \bbl@usehooks{adddialect}{{#1}{#2}}% diff --git a/Master/texmf-dist/tex/generic/babel/txtbabel.def b/Master/texmf-dist/tex/generic/babel/txtbabel.def index d122b891335..86e5a95d83d 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-2018 Javier Bezos and Johannes L. Braams. +%% Copyright (C) 2012-2019 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 1159998dde1..bf2da9aca63 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-2018 Javier Bezos and Johannes L. Braams. +%% Copyright (C) 2012-2019 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. -- cgit v1.2.3