diff options
author | Karl Berry <karl@freefriends.org> | 2016-02-09 22:23:21 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-02-09 22:23:21 +0000 |
commit | 986747ca8579ba0d0c3fb8167f943b89563234bc (patch) | |
tree | 7e2d3cefb2c0d417e6c9ec5189e12880f3643288 /Master/texmf-dist/tex | |
parent | 4d30a4ce33e5b019dcdbdbfd4be5897406d7e7fa (diff) |
babel (9feb16)
git-svn-id: svn://tug.org/texlive/trunk@39646 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/generic/babel/babel.def | 11 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/babel/babel.sty | 6 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/babel/blplain.tex | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/babel/bplain.tex | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/babel/hyphen.cfg | 10 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/babel/luababel.def | 115 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/babel/nil.ldf | 4 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/babel/plain.def | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/babel/switch.def | 8 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/babel/xebabel.def | 2 |
10 files changed, 51 insertions, 111 deletions
diff --git a/Master/texmf-dist/tex/generic/babel/babel.def b/Master/texmf-dist/tex/generic/babel/babel.def index 318457015d2..2841b87e0aa 100644 --- a/Master/texmf-dist/tex/generic/babel/babel.def +++ b/Master/texmf-dist/tex/generic/babel/babel.def @@ -38,7 +38,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. %% File 'babel.dtx' -%%\ProvidesFile{babel.dtx}[2016/02/01 v3.9o The Babel package] +%%\ProvidesFile{babel.dtx}[2016/01/08 v3.9n The Babel package] %% Babel package for LaTeX2e. %% Copyright (C) 1989-2008 by Johannes Braams, %% TeXniek @@ -56,7 +56,7 @@ \wlog{File: #1 #4 #3 <#2>}% \let\ProvidesFile\@undefined} \fi -\ProvidesFile{babel.def}[2016/02/01 3.9o Babel common definitions] +\ProvidesFile{babel.def}[2016/01/08 3.9n Babel common definitions] \ifx\AtBeginDocument\@undefined \input plain.def\relax \fi @@ -67,7 +67,7 @@ \let\bbl@afterlang\relax \let\bbl@language@opts\@empty \fi -\def\bbl@tempa{3.9o}% +\def\bbl@tempa{3.9n}% \ifx\bbl@version\bbl@tempa\else \input switch.def\relax \fi @@ -1422,10 +1422,7 @@ \AtEndOfPackage{\edef\latinencoding{\cf@encoding}} \AtBeginDocument{% \@ifpackageloaded{fontspec}% - {\xdef\latinencoding{% - \@ifundefined{UTFencname}% - {EU\ifcase\bbl@engine\or2\or1\fi}% - {\UTFencname}}}% + {\xdef\latinencoding{EU\ifcase\bbl@engine\or2\or1\fi}}% {\gdef\latinencoding{OT1}% \ifx\cf@encoding\bbl@t@one \xdef\latinencoding{\bbl@t@one}% diff --git a/Master/texmf-dist/tex/generic/babel/babel.sty b/Master/texmf-dist/tex/generic/babel/babel.sty index 7c02823b036..56092628c2a 100644 --- a/Master/texmf-dist/tex/generic/babel/babel.sty +++ b/Master/texmf-dist/tex/generic/babel/babel.sty @@ -38,7 +38,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. %% File 'babel.dtx' -%%\ProvidesFile{babel.dtx}[2016/02/01 v3.9o The Babel package] +%%\ProvidesFile{babel.dtx}[2016/01/08 v3.9n The Babel package] %% Babel package for LaTeX2e. %% Copyright (C) 1989-2008 by Johannes Braams, %% TeXniek @@ -48,10 +48,10 @@ %% by Javier Bezos %% all rights reserved. \NeedsTeXFormat{LaTeX2e}[2005/12/01] -\ProvidesPackage{babel}[2016/02/01 3.9o The Babel package] +\ProvidesPackage{babel}[2016/01/08 3.9n The Babel package] \@ifpackagewith{babel}{debug} {\input switch.def\relax} - {\def\bbl@tempa{3.9o}% + {\def\bbl@tempa{3.9n}% \ifx\bbl@version\bbl@tempa\else \input switch.def\relax \fi} diff --git a/Master/texmf-dist/tex/generic/babel/blplain.tex b/Master/texmf-dist/tex/generic/babel/blplain.tex index c45e48d9886..7e5c1506863 100644 --- a/Master/texmf-dist/tex/generic/babel/blplain.tex +++ b/Master/texmf-dist/tex/generic/babel/blplain.tex @@ -38,7 +38,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. %% File 'babel.dtx' -%%\ProvidesFile{babel.dtx}[2016/02/01 v3.9o The Babel package] +%%\ProvidesFile{babel.dtx}[2016/01/08 v3.9n The Babel package] %% Babel package for LaTeX2e. %% Copyright (C) 1989-2008 by Johannes Braams, %% TeXniek diff --git a/Master/texmf-dist/tex/generic/babel/bplain.tex b/Master/texmf-dist/tex/generic/babel/bplain.tex index b31c656e590..e36555f07ef 100644 --- a/Master/texmf-dist/tex/generic/babel/bplain.tex +++ b/Master/texmf-dist/tex/generic/babel/bplain.tex @@ -38,7 +38,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. %% File 'babel.dtx' -%%\ProvidesFile{babel.dtx}[2016/02/01 v3.9o The Babel package] +%%\ProvidesFile{babel.dtx}[2016/01/08 v3.9n The Babel package] %% Babel package for LaTeX2e. %% Copyright (C) 1989-2008 by Johannes Braams, %% TeXniek diff --git a/Master/texmf-dist/tex/generic/babel/hyphen.cfg b/Master/texmf-dist/tex/generic/babel/hyphen.cfg index 2da740373e9..3b11277b823 100644 --- a/Master/texmf-dist/tex/generic/babel/hyphen.cfg +++ b/Master/texmf-dist/tex/generic/babel/hyphen.cfg @@ -38,7 +38,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. %% File 'babel.dtx' -%%\ProvidesFile{babel.dtx}[2016/02/01 v3.9o The Babel package] +%%\ProvidesFile{babel.dtx}[2016/01/08 v3.9n The Babel package] %% Babel package for LaTeX2e. %% Copyright (C) 1989-2008 by Johannes Braams, %% TeXniek @@ -52,7 +52,7 @@ \wlog{File: #1 #4 #3 <#2>}% \let\ProvidesFile\@undefined} \fi -\ProvidesFile{hyphen.cfg}[2016/02/01 3.9o Babel hyphens] +\ProvidesFile{hyphen.cfg}[2016/01/08 3.9n Babel hyphens] \xdef\bbl@format{\jobname} \ifx\AtBeginDocument\@undefined \def\@empty{} @@ -83,7 +83,7 @@ \countdef\last@language=19 \def\addlanguage{\alloc@9\language\chardef\@cclvi} \fi -\toks8{Babel <3.9o> and hyphenation patterns for }% +\toks8{Babel <3.9n> and hyphenation patterns for }% \def\process@line#1#2 #3 #4 {% \ifx=#1% \process@synonym{#2}% @@ -196,7 +196,6 @@ \errhelp{language.dat loads no language, only synonyms} \errmessage{Orphan language synonym} \fi -\advance\last@language\@ne \edef\bbl@tempa{% \everyjob{% \the\everyjob @@ -205,8 +204,7 @@ \else \noexpand\typeout \fi - {\the\toks8 \the\last@language\space language(s) loaded.}}} -\advance\last@language\m@ne + {\the\toks8 \the\last@language\space languages loaded.}}} \bbl@tempa \let\bbl@line\@undefined \let\process@line\@undefined diff --git a/Master/texmf-dist/tex/generic/babel/luababel.def b/Master/texmf-dist/tex/generic/babel/luababel.def index 7829e7cd41c..3a3519c1989 100644 --- a/Master/texmf-dist/tex/generic/babel/luababel.def +++ b/Master/texmf-dist/tex/generic/babel/luababel.def @@ -39,79 +39,15 @@ %% extension .ins) which are part of the distribution. %% File `bbunicode.dtx' %% Babel package for LaTeX version 2e -%% Copyright (C) 2103-2016 +%% Copyright (C) 2103-2014 %% by Javier Bezos -\ifx\bbl@get@enc\@undefined - \def\bbl@process@line#1#2 #3 #4 {% - \ifx=#1% - \bbl@process@synonym{#2}% - \else - \bbl@process@language{#1#2}{#3}{#4}% - \fi - \ignorespaces} - \def\bbl@process@language#1#2#3{% - \@ifundefined{l@#1}% - {\expandafter\addlanguage\csname l@#1\endcsname - \expandafter\language\csname l@#1\endcsname - \let\bbl@elt\relax - \edef\bbl@languages{% - \bbl@languages\bbl@elt{#1}{\the\language}{#2}{#3}}}% - {}} - \def\bbl@process@synonym#1{% - \@ifundefined{l@#1}% - {\expandafter\chardef\csname l@#1\endcsname\last@language - \let\bbl@elt\relax - \edef\bbl@languages{% - \bbl@languages\bbl@elt{#1}{\the\last@language}{}{}}}% - {}} - \ifnum\last@language>\z@ - \bbl@warning{Wrong or old hyphenation setup. Please, rebuild\\% - the format. I'll try to fix it for this run.\\% - Reported}% - \def\bbl@elt#1#2#3#4{% - \ifnum#2>\z@\else - \noexpand\bbl@elt{#1}{#2}{#3}{#4}% - \fi}% - \edef\bbl@languages{\bbl@languages}% - \fi - \ifnum\l@english=\z@\else - \bbl@warning{Wrong hyphenation setup. The 0th language must\\% - be `english'. Reported}% - \fi - \@namedef{bbl@hyphendata@0}{{hyphen.tex}{}}% - \openin1=language.dat - \ifeof1 - \bbl@warning{I couldn't find language.dat. No additional\\% - patterns loaded. Reported}% - \else - \loop - \endlinechar\m@ne - \read1 to \bbl@line - \endlinechar`\^^M - \if T\ifeof1F\fi T\relax - \ifx\bbl@line\@empty\else - \edef\bbl@line{\bbl@line\space\space\space}% - \expandafter\bbl@process@line\bbl@line\relax - \fi - \repeat - \fi - \def\bbl@get@enc#1:#2:#3\@@@{\def\bbl@hyph@enc{#2}} - \def\bbl@luapatterns#1#2{% - \bbl@get@enc#1::\@@@ - \begingroup - \input #1\relax - \endgroup - \def\bbl@tempa{#2}% - \ifx\bbl@tempa\@empty\else - \input #2\relax - \fi}% -\fi \begingroup \catcode`\%=12 \catcode`\'=12 \catcode`\"=12 \catcode`\:=12 \directlua{ + require("luatex-hyphen") Babel = {} function Babel.bytes(line) return line:gsub("(.)", @@ -173,23 +109,12 @@ \luabbl@stop \let\luabbl@stop\relax} \AddBabelHook{luatex}{patterns}{% - \@ifundefined{bbl@hyphendata@\the\language}% - {\def\bbl@elt##1##2##3##4{% - \def\bbl@tempa{##1}% - \def\bbl@tempb{##3}% - \ifx\bbl@tempb\@empty\else % if not synonymous - \def\bbl@tempc{{##3}{##4}}% - \fi - \def\bbl@tempb{#2}% eg, spanish, dutch:OT1, etc. - \ifx\bbl@tempa\bbl@tempb - \bbl@csarg\edef{hyphendata@##2}{\bbl@tempc}% - \fi}% - \bbl@languages - \@ifundefined{bbl@hyphendata@\the\language}% - {\bbl@info{No hyphenation patterns were set for\\% - language ‘#2’. Reported}}% - {\expandafter\expandafter\expandafter\bbl@luapatterns - \csname bbl@hyphendata@\the\language\endcsname}}{}% + \ifcsname lu@texhyphen@loaded@\the\language\endcsname \else + \global\@namedef{lu@texhyphen@loaded@\the\language}{}% + \directlua{ + luatexhyphen.loadlanguage([[\string#1]], + '\the\language')}% + \fi \@ifundefined{bbl@patterns@}{}{% \begingroup \@expandtwoargs\in@{,\number\language,}{,\bbl@pttnlist}% @@ -206,9 +131,29 @@ \xdef\bbl@pttnlist{\bbl@pttnlist\number\language,}% \fi \endgroup}} +\AddBabelHook{luatex}{adddialect}{% + \ifx\directlua\relax\else + \directlua{ + luatexhyphen.adddialect([[\string#1]], + [[\string#2]]) + }% + \fi} \AddBabelHook{luatex}{everylanguage}{% - \def\process@language##1##2##3{% - \def\process@line####1####2 ####3 ####4 {}}} + \directlua{ + processnow = (tex.language == 0) or + (luatexhyphen.lookupname([[\string#1]]) == nil)}% + \ifnum0=\directlua{tex.sprint(processnow and "0" or "1")}\relax + \global\@namedef{lu@texhyphen@loaded@\the\language}{}% + \fi} +\AddBabelHook{luatex}{loadpatterns}{% + \ifnum0=\directlua{tex.sprint(processnow and "0" or "1")}\relax + \input #1\relax + \fi} +\AddBabelHook{luatex}{loadexceptions}{% + \ifnum0=\directlua{tex.sprint(processnow and "0" or "1")}\relax + \input #1\relax + \fi + \directlua{processnow = nil}} \@onlypreamble\babelpatterns \AtEndOfPackage{% \newcommand\babelpatterns[2][\@empty]{% diff --git a/Master/texmf-dist/tex/generic/babel/nil.ldf b/Master/texmf-dist/tex/generic/babel/nil.ldf index 910a0595c45..cf3bd82b178 100644 --- a/Master/texmf-dist/tex/generic/babel/nil.ldf +++ b/Master/texmf-dist/tex/generic/babel/nil.ldf @@ -38,7 +38,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. %% File 'babel.dtx' -%%\ProvidesFile{babel.dtx}[2016/02/01 v3.9o The Babel package] +%%\ProvidesFile{babel.dtx}[2016/01/08 v3.9n The Babel package] %% Babel package for LaTeX2e. %% Copyright (C) 1989-2008 by Johannes Braams, %% TeXniek @@ -47,7 +47,7 @@ %% TeXniek %% by Javier Bezos %% all rights reserved. -\ProvidesLanguage{nil}[2016/02/01 3.9o Nil language] +\ProvidesLanguage{nil}[2016/01/08 3.9n 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 5ec8ed03339..7c98fade2c3 100644 --- a/Master/texmf-dist/tex/generic/babel/plain.def +++ b/Master/texmf-dist/tex/generic/babel/plain.def @@ -38,7 +38,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. %% File 'babel.dtx' -%%\ProvidesFile{babel.dtx}[2016/02/01 v3.9o The Babel package] +%%\ProvidesFile{babel.dtx}[2016/01/08 v3.9n The Babel package] %% Babel package for LaTeX2e. %% Copyright (C) 1989-2008 by Johannes Braams, %% TeXniek diff --git a/Master/texmf-dist/tex/generic/babel/switch.def b/Master/texmf-dist/tex/generic/babel/switch.def index 025bb0c5a7e..3f1af9a714a 100644 --- a/Master/texmf-dist/tex/generic/babel/switch.def +++ b/Master/texmf-dist/tex/generic/babel/switch.def @@ -38,7 +38,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. %% File 'babel.dtx' -%%\ProvidesFile{babel.dtx}[2016/02/01 v3.9o The Babel package] +%%\ProvidesFile{babel.dtx}[2016/01/08 v3.9n The Babel package] %% Babel package for LaTeX2e. %% Copyright (C) 1989-2008 by Johannes Braams, %% TeXniek @@ -52,7 +52,7 @@ \wlog{File: #1 #4 #3 <#2>}% \let\ProvidesFile\@undefined} \fi -\ProvidesFile{switch.def}[2016/02/01 3.9o Babel switching mechanism] +\ProvidesFile{switch.def}[2016/01/08 3.9n Babel switching mechanism] \ifx\AtBeginDocument\@undefined \input plain.def\relax \fi @@ -73,8 +73,8 @@ \countdef\last@language=19 \def\addlanguage{\alloc@9\language\chardef\@cclvi} \fi -\def\bbl@version{3.9o} -\def\bbl@date{2016/02/01} +\def\bbl@version{3.9n} +\def\bbl@date{2016/01/08} \def\adddialect#1#2{% \global\chardef#1#2\relax \bbl@usehooks{adddialect}{{#1}{#2}}% diff --git a/Master/texmf-dist/tex/generic/babel/xebabel.def b/Master/texmf-dist/tex/generic/babel/xebabel.def index 747f5f90a2b..e15e701ac6d 100644 --- a/Master/texmf-dist/tex/generic/babel/xebabel.def +++ b/Master/texmf-dist/tex/generic/babel/xebabel.def @@ -39,7 +39,7 @@ %% extension .ins) which are part of the distribution. %% File `bbunicode.dtx' %% Babel package for LaTeX version 2e -%% Copyright (C) 2103-2016 +%% Copyright (C) 2103-2014 %% by Javier Bezos \def\BabelStringsDefault{unicode} \let\xebbl@stop\relax |