diff options
20 files changed, 81 insertions, 60 deletions
diff --git a/Master/texmf-dist/doc/latex/babel/README.md b/Master/texmf-dist/doc/latex/babel/README.md index 97ff35a6918..912b1bb0d42 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.28 +## Babel 3.29 This package manages culturally-determined typographical (and other) rules, and hyphenation patterns for a wide range of languages. Many @@ -27,7 +27,7 @@ be improved in next releases. If you wish to report a problem or bug in any of these packages please use the -[Issue Tracker for LaTeX2e on GitHub](https://github.com/latex3/latex2e/issues) +[Issue Tracker for LaTeX2e on GitHub](https://github.com/latex3/babel/issues) and follow the guidelines that pop up if you press the `New issue` button. @@ -51,7 +51,10 @@ respective authors. ### Latest changes ``` -3.28 - Fixes - wrong dir after math, in math inside tabular, in weak L +3.29 - The fix for boxes inside math is incompatible with ams. + Removed (a better fix is under study). + - Options bidi-l and bidi-r (for the bidi package). +3.28 - Fixes - wrong dir after math, in math inside tabular, in weak L inside R inside L, and in boxes inside math. - \babelfont now takes into account \defaultfontfeatures. This is a potential source of backwards incompatibilities, but @@ -125,5 +128,5 @@ respective authors. ``` Javier Bezos -2019/04/01 +2019/04/03 diff --git a/Master/texmf-dist/doc/latex/babel/babel.pdf b/Master/texmf-dist/doc/latex/babel/babel.pdf Binary files differindex c8a3099ce4b..d74872dab72 100644 --- a/Master/texmf-dist/doc/latex/babel/babel.pdf +++ b/Master/texmf-dist/doc/latex/babel/babel.pdf diff --git a/Master/texmf-dist/source/latex/babel/babel.dtx b/Master/texmf-dist/source/latex/babel/babel.dtx index ca43f71b84f..f182740cffc 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-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. @@ -31,7 +31,7 @@ % % \iffalse %<*filedriver> -\ProvidesFile{babel.dtx}[2019/04/01 v3.28 The Babel package] +\ProvidesFile{babel.dtx}[2019/04/03 v3.29 The Babel package] \documentclass{ltxdoc} \GetFileInfo{babel.dtx} \usepackage{fontspec} @@ -236,15 +236,15 @@ Javier Bezos \item Changes and new features with relation to version 3.8 are highlighted with \New{X.XX}\hspace{-.5em}. The most recent features could be still unstable. Please, report any issues you find on - \texttt{https://github.com/latex3/latex2e/issues}, which is better + \texttt{https://github.com/latex3/babel/issues}, which is better than just complaining on an e-mail list or a web forum. \item If you are interested in the \TeX{} multilingual support, please join the \textsf{kadingira} list on - \texttt{http://tug.org/mailman/listinfo/kadingira}. You can follow + \texttt{http://tug.org/mailman/listinfo/kadingira}. You can follow the development of \babel{} on - \texttt{https://github.com/latex3/latex2e/tree/master/required/babel} - (which provides some sample files, too). + \texttt{https://github.com/latex3/babel} (which provides some sample + files, too). \item See section \ref{contribute} for contributing a language. @@ -3917,8 +3917,8 @@ help from Bernd Raichle, for which I am grateful. % \section{Tools} % % \begin{macrocode} -%<<version=3.28>> -%<<date=2019/04/01>> +%<<version=3.29>> +%<<date=2019/04/03>> % \end{macrocode} % % \textbf{Do not use the following macros in \texttt{ldf} files. They @@ -9294,16 +9294,14 @@ help from Bernd Raichle, for which I am grateful. \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} @@ -10805,6 +10803,9 @@ help from Bernd Raichle, for which I am grateful. \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 @@ -10820,16 +10821,24 @@ help from Bernd Raichle, for which I am grateful. \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/source/latex/babel/babel.ins b/Master/texmf-dist/source/latex/babel/babel.ins index 21bbb5de892..2d3b5d0a4e2 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-2018 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2019 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{2019/04/01} +\def\filedate{2019/04/03} \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 0ee121329d8..73f6bbcb4a0 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}[2019/04/01 v3.28] +\ProvidesFile{bbcompat.dtx}[2019/04/03 v3.29] %</dtx> % %% File 'bbcompat.dtx' diff --git a/Master/texmf-dist/source/latex/babel/locale.zip b/Master/texmf-dist/source/latex/babel/locale.zip Binary files differindex 3e717ac7485..9dcb099b579 100644 --- a/Master/texmf-dist/source/latex/babel/locale.zip +++ b/Master/texmf-dist/source/latex/babel/locale.zip 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. |