diff options
author | Karl Berry <karl@freefriends.org> | 2018-11-13 22:49:31 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2018-11-13 22:49:31 +0000 |
commit | a92860ca9d8aca00fe575cd4905ec943fde3fb4f (patch) | |
tree | 662dd50947b0af21b58aea0513c1cfb4db03fdfd /Master/texmf-dist/tex/generic | |
parent | 6c23b6c5c4a8d7014a6dfd751bc1cab326902655 (diff) |
babel (13nov18)
git-svn-id: svn://tug.org/texlive/trunk@49149 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic')
-rw-r--r-- | Master/texmf-dist/tex/generic/babel/babel.def | 26 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/babel/babel.sty | 12 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/babel/hyphen.cfg | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/babel/locale/vi/babel-vi.ini | 9 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/babel/nil.ldf | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/babel/switch.def | 8 |
6 files changed, 41 insertions, 18 deletions
diff --git a/Master/texmf-dist/tex/generic/babel/babel.def b/Master/texmf-dist/tex/generic/babel/babel.def index 5fc96c3a2b1..5d2db7261f2 100644 --- a/Master/texmf-dist/tex/generic/babel/babel.def +++ b/Master/texmf-dist/tex/generic/babel/babel.def @@ -41,7 +41,7 @@ \wlog{File: #1 #4 #3 <#2>}% \let\ProvidesFile\@undefined} \fi -\ProvidesFile{babel.def}[2018/10/16 3.26 Babel common definitions] +\ProvidesFile{babel.def}[2018/11/13 3.27 Babel common definitions] \ifx\AtBeginDocument\@undefined \input plain.def\relax \fi @@ -1944,18 +1944,18 @@ } \@onlypreamble\substitutefontfamily \bbl@trace{Encoding and fonts} -\newcommand\BabelNonASCII - {LGR,X2,OT2,OT3,OT6,LHE,LWN,LMA,LMC,LMS,LMU,TS1,T3,TS3} +\newcommand\BabelNonASCII{LGR,X2,OT2,OT3,OT6,LHE,LWN,LMA,LMC,LMS,LMU} +\newcommand\BabelNonText{TS1,T3,TS3} \let\org@TeX\TeX \let\org@LaTeX\LaTeX \let\ensureascii\@firstofone \AtBeginDocument{% \in@false - \bbl@foreach\BabelNonASCII{% is there a non-ascii enc? + \bbl@foreach\BabelNonASCII{% is there a text non-ascii enc? \ifin@\else \lowercase{\bbl@xin@{,#1enc.def,}{,\@filelist,}}% \fi}% - \ifin@ % if a non-ascii has been loaded + \ifin@ % if a text non-ascii has been loaded \def\ensureascii#1{{\fontencoding{OT1}\selectfont#1}}% \DeclareTextCommandDefault{\TeX}{\org@TeX}% \DeclareTextCommandDefault{\LaTeX}{\org@LaTeX}% @@ -1964,7 +1964,7 @@ \ifx\@empty#2\else \bbl@ifunset{T@#1}% {}% - {\bbl@xin@{,#1,}{,\BabelNonASCII,}% + {\bbl@xin@{,#1,}{,\BabelNonASCII,\BabelNonText,}% \ifin@ \DeclareTextCommand{\TeX}{#1}{\ensureascii{\org@TeX}}% \DeclareTextCommand{\LaTeX}{#1}{\ensureascii{\org@LaTeX}}% @@ -1973,7 +1973,7 @@ \fi}% \fi}% \bbl@foreach\@filelist{\bbl@tempb#1\@@}% TODO - \@@ de mas?? - \bbl@xin@{,\cf@encoding,}{,\BabelNonASCII,}% + \bbl@xin@{,\cf@encoding,}{,\BabelNonASCII,\BabelNonText,}% \ifin@\else \edef\ensureascii#1{{% \noexpand\fontencoding{\cf@encoding}\noexpand\selectfont#1}}% @@ -2120,6 +2120,18 @@ \newtoks\everypar \everypar=\bbl@severypar \bbl@severypar{\bbl@xeeverypar\the\everypar}} + \@ifpackagewith{babel}{bidi=bidi}% + {\let\bbl@textdir@i\@gobbletwo + \let\bbl@xebidipar\@empty + \AddBabelHook{bidi}{foreign}{% + \def\bbl@tempa{\def\BabelText####1}% + \ifcase\bbl@thetextdir + \expandafter\bbl@tempa\expandafter{\BabelText{\LR{##1}}}% + \else + \expandafter\bbl@tempa\expandafter{\BabelText{\RL{##1}}}% + \fi} + \def\bbl@pardir#1{\ifcase#1\relax\setLR\else\setRL\fi}} + {}% \fi \DeclareRobustCommand\babelsublr[1]{\leavevmode{\bbl@textdir\z@#1}} \bbl@trace{Local Language Configuration} diff --git a/Master/texmf-dist/tex/generic/babel/babel.sty b/Master/texmf-dist/tex/generic/babel/babel.sty index 93026515a73..c0b470c1ed2 100644 --- a/Master/texmf-dist/tex/generic/babel/babel.sty +++ b/Master/texmf-dist/tex/generic/babel/babel.sty @@ -33,7 +33,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2005/12/01] -\ProvidesPackage{babel}[2018/10/16 3.26 The Babel package] +\ProvidesPackage{babel}[2018/11/13 3.27 The Babel package] \@ifpackagewith{babel}{debug} {\providecommand\bbl@trace[1]{\message{^^J[ #1 ]}}% \let\bbl@debug\@firstofone} @@ -291,6 +291,16 @@ \AtEndOfPackage{% \EnableBabelHook{babel-bidi}% \bbl@xebidipar}} + \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} \fi \DeclareOption{bidi=default}% {\let\bbl@beforeforeign\leavevmode diff --git a/Master/texmf-dist/tex/generic/babel/hyphen.cfg b/Master/texmf-dist/tex/generic/babel/hyphen.cfg index c6c8b671b11..f537754e5de 100644 --- a/Master/texmf-dist/tex/generic/babel/hyphen.cfg +++ b/Master/texmf-dist/tex/generic/babel/hyphen.cfg @@ -37,7 +37,7 @@ \wlog{File: #1 #4 #3 <#2>}% \let\ProvidesFile\@undefined} \fi -\ProvidesFile{hyphen.cfg}[2018/10/16 3.26 Babel hyphens] +\ProvidesFile{hyphen.cfg}[2018/11/13 3.27 Babel hyphens] \xdef\bbl@format{\jobname} \ifx\AtBeginDocument\@undefined \def\@empty{} diff --git a/Master/texmf-dist/tex/generic/babel/locale/vi/babel-vi.ini b/Master/texmf-dist/tex/generic/babel/locale/vi/babel-vi.ini index 21f6cbb5d81..396a9c7a731 100644 --- a/Master/texmf-dist/tex/generic/babel/locale/vi/babel-vi.ini +++ b/Master/texmf-dist/tex/generic/babel/locale/vi/babel-vi.ini @@ -8,11 +8,12 @@ ; * Common Locale Data Repository (license Unicode): ; http://cldr.unicode.org/ ; http://unicode.org/copyright.html +; With suggestions by Reinhard Kotucha [identification] charset = utf8 -version = 1.0 -date = 2017-09-01 +version = 1.1 +date = 2018-11-12 name.local = Tiếng Việt name.english = Vietnamese name.babel = vietnamese @@ -23,7 +24,7 @@ script.name = Latin script.tag.bcp47 = Latn script.tag.opentype = latn level = 1 -encodings = T1 OT1 LY1 +encodings = T5 derivate = no [captions] @@ -147,7 +148,7 @@ time.short = [HH]:[mm] [typography] frenchspacing = yes -hyphenrules = vietnam +hyphenrules = lefthyphenmin = 2 righthyphenmin = 3 hyphenchar = diff --git a/Master/texmf-dist/tex/generic/babel/nil.ldf b/Master/texmf-dist/tex/generic/babel/nil.ldf index 48f3b6d27ee..7ef76efb096 100644 --- a/Master/texmf-dist/tex/generic/babel/nil.ldf +++ b/Master/texmf-dist/tex/generic/babel/nil.ldf @@ -32,7 +32,7 @@ %% extension |.ins|) which are part of the distribution. %% -\ProvidesLanguage{nil}[2018/10/16 3.26 Nil language] +\ProvidesLanguage{nil}[2018/11/13 3.27 Nil language] \LdfInit{nil}{datenil} \ifx\l@nohyphenation\@undefined \@nopatterns{nil} diff --git a/Master/texmf-dist/tex/generic/babel/switch.def b/Master/texmf-dist/tex/generic/babel/switch.def index 0d9ced0dfc7..486e4da6b14 100644 --- a/Master/texmf-dist/tex/generic/babel/switch.def +++ b/Master/texmf-dist/tex/generic/babel/switch.def @@ -37,7 +37,7 @@ \wlog{File: #1 #4 #3 <#2>}% \let\ProvidesFile\@undefined} \fi -\ProvidesFile{switch.def}[2018/10/16 3.26 Babel switching mechanism] +\ProvidesFile{switch.def}[2018/11/13 3.27 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.26} -\def\bbl@date{2018/10/16} +\def\bbl@version{3.27} +\def\bbl@date{2018/11/13} \def\adddialect#1#2{% \global\chardef#1#2\relax \bbl@usehooks{adddialect}{{#1}{#2}}% @@ -397,7 +397,7 @@ \def\bbl@tentative{\protect\bbl@tentative@i} \def\bbl@tentative@i#1{% \bbl@warning{% - Some functions in '#1' are tentative.\\% + Some functions for '#1' are tentative.\\% They might not work as expected and their behavior\\% could change in the future.\\% Reported}} |