From 24994bf3727b2e3aaa26b585177bdfe0a275af8c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 2 May 2018 20:50:59 +0000 Subject: babel (2may18) git-svn-id: svn://tug.org/texlive/trunk@47576 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/generic/babel/babel-bidi-basic-r.lua | 17 +++++--- .../tex/generic/babel/babel-bidi-basic.lua | 38 ++++++++++++------ Master/texmf-dist/tex/generic/babel/babel.def | 46 +++++++++++++++++++++- Master/texmf-dist/tex/generic/babel/babel.sty | 20 +--------- Master/texmf-dist/tex/generic/babel/hyphen.cfg | 4 +- Master/texmf-dist/tex/generic/babel/nil.ldf | 2 +- Master/texmf-dist/tex/generic/babel/switch.def | 6 +-- 7 files changed, 89 insertions(+), 44 deletions(-) (limited to 'Master/texmf-dist/tex/generic') 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 ab455dc3d4c..0d66b33ccde 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 @@ -81,15 +81,22 @@ function Babel.bidi(head, ispar) for item in node.traverse(head) do -- three cases: glyph, dir, otherwise - if item.id == node.id'glyph' then + if item.id == node.id'glyph' + or (item.id == 7 and item.subtype == 2) then - local chardata = characters[item.char] + local itemchar + if item.id == 7 and item.subtype == 2 then + itemchar = item.replace.char + else + itemchar = item.char + end + local chardata = characters[itemchar] dir = chardata and chardata.d or nil if not dir then for nn, et in ipairs(ranges) do - if item.char < et[1] then + if itemchar < et[1] then break - elseif item.char <= et[2] then + elseif itemchar <= et[2] then dir = et[3] break end @@ -100,7 +107,7 @@ function Babel.bidi(head, ispar) attr_dir = 0 for at in node.traverse(item.attr) do if at.number == luatexbase.registernumber'bbl@attr@dir' then - attr_dir = at.value + attr_dir = at.value % 3 end end if attr_dir == 1 then 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 c5104648763..3f13f99b773 100644 --- a/Master/texmf-dist/tex/generic/babel/babel-bidi-basic.lua +++ b/Master/texmf-dist/tex/generic/babel/babel-bidi-basic.lua @@ -131,28 +131,40 @@ function Babel.bidi(head, ispar, hdir) -- current one is not added until we start processing the neutrals. -- three cases: glyph, dir, otherwise - if item.id == GLYPH then + if item.id == GLYPH + or (item.id == 7 and item.subtype == 2) then - local chardata = characters[item.char] + local d_font = nil + local item_r + if item.id == 7 and item.subtype == 2 then + item_r = item.replace -- automatic discs have just 1 glyph + else + item_r = item + end + local chardata = characters[item_r.char] d = chardata and chardata.d or nil - if not d then + if not d or d == 'nsm' then for nn, et in ipairs(ranges) do - if item.char < et[1] then + if item_r.char < et[1] then break - elseif item.char <= et[2] then - d = et[3] + elseif item_r.char <= et[2] then + if not d then d = et[3] + elseif d == 'nsm' then d_font = et[3] + end break end end end d = d or 'l' - - local temp = (d == 'l' and 0) or - (d == 'r' and 1) or - (d == 'al' and 2) or - (d == 'an' and 2) or nil - if temp and fontmap and fontmap[temp][item.font] then - item.font = fontmap[temp][item.font] + d_font = d_font or d + + d_font = (d_font == 'l' and 0) or + (d_font == 'nsm' and 0) or + (d_font == 'r' and 1) or + (d_font == 'al' and 2) or + (d_font == 'an' and 2) or nil + if d_font and fontmap and fontmap[d_font][item_r.font] then + item_r.font = fontmap[d_font][item_r.font] end if new_d then diff --git a/Master/texmf-dist/tex/generic/babel/babel.def b/Master/texmf-dist/tex/generic/babel/babel.def index ed07f9563db..4a4e31018df 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}[2018/04/25 3.19 Babel common definitions] +\ProvidesFile{babel.def}[2018/05/02 3.20 Babel common definitions] \ifx\AtBeginDocument\@undefined \input plain.def\relax \fi @@ -1311,6 +1311,7 @@ \let\bbl@KVP@dir\@nil \let\bbl@KVP@hyphenrules\@nil \let\bbl@KVP@mapfont\@nil + \let\bbl@KVP@maparabic\@nil \bbl@forkv{#1}{\bbl@csarg\def{KVP@##1}{##2}}% TODO - error handling \ifx\bbl@KVP@captions\@nil \let\bbl@KVP@captions\bbl@KVP@import @@ -1360,7 +1361,48 @@ \fi \bbl@exp{\\\bbl@add\\\bbl@mapselect{\\\bbl@mapdir{\languagename}}}% \fi + \ifcase\bbl@engine\else + \bbl@ifunset{bbl@dgnat@\languagename}{}% + {\expandafter\ifx\csname bbl@dgnat@\languagename\endcsname\@empty\else + \expandafter\expandafter\expandafter + \bbl@setdigits\csname bbl@dgnat@\languagename\endcsname + \ifx\bbl@KVP@maparabic\@nil\else + \expandafter\let\expandafter\@arabic + \csname bbl@counter@\languagename\endcsname + \fi + \fi}% + \fi \let\languagename\bbl@savelangname} +\def\bbl@setdigits#1#2#3#4#5{% + \bbl@exp{% + \def\<\languagename digits>####1{% ie, \langdigits + \####1\\\@nil}% + \def\<\languagename counter>####1{% ie, \langcounter + \\\expandafter\% + \\\csname c@####1\endcsname}% + \def\####1{% ie, \bbl@counter@lang + \\\expandafter\% + \\\number####1\\\@nil}}% + \def\bbl@tempa##1##2##3##4##5{% + \bbl@exp{% Wow, quite a lot of hashes! :-( + \def\########1{% + \\\ifx########1\\\@nil % ie, \bbl@digits@lang + \\\else + \\\ifx0########1#1% + \\\else\\\ifx1########1#2% + \\\else\\\ifx2########1#3% + \\\else\\\ifx3########1#4% + \\\else\\\ifx4########1#5% + \\\else\\\ifx5########1##1% + \\\else\\\ifx6########1##2% + \\\else\\\ifx7########1##3% + \\\else\\\ifx8########1##4% + \\\else\\\ifx9########1##5% + \\\else########1% + \\\fi\\\fi\\\fi\\\fi\\\fi\\\fi\\\fi\\\fi\\\fi\\\fi + \\\expandafter\% + \\\fi}}}% + \bbl@tempa} \def\bbl@provide@new#1{% \@namedef{date#1}{}% marks lang exists - required by \StartBabelCommands \@namedef{extras#1}{}% @@ -1495,10 +1537,12 @@ \bbl@exportkey{sbcp}{identification.script.tag.bcp47}{}% \bbl@exportkey{sotf}{identification.script.tag.opentype}{DFLT}} \let\bbl@secline@typography\bbl@inikv +\let\bbl@secline@numbers\bbl@inikv \def\bbl@after@ini{% \bbl@exportkey{lfthm}{typography.lefthyphenmin}{2}% \bbl@exportkey{rgthm}{typography.righthyphenmin}{3}% \bbl@exportkey{hyphr}{typography.hyphenrules}{}% + \bbl@exportkey{dgnat}{numbers.digits.native}{}% \bbl@xin@{0.9}{\@nameuse{bbl@@kv@identification.version}}% \ifin@ \bbl@warning{% diff --git a/Master/texmf-dist/tex/generic/babel/babel.sty b/Master/texmf-dist/tex/generic/babel/babel.sty index 453dc5afde1..defc080ce7d 100644 --- a/Master/texmf-dist/tex/generic/babel/babel.sty +++ b/Master/texmf-dist/tex/generic/babel/babel.sty @@ -32,7 +32,7 @@ %% extension |.ins|) which are part of the distribution. %% \NeedsTeXFormat{LaTeX2e}[2005/12/01] -\ProvidesPackage{babel}[2018/04/25 3.19 The Babel package] +\ProvidesPackage{babel}[2018/05/02 3.20 The Babel package] \@ifpackagewith{babel}{debug} {\providecommand\bbl@trace[1]{\message{^^J[ #1 ]}}% \let\bbl@debug\@firstofone} @@ -186,24 +186,6 @@ \bbl@languages \fi \ifodd\bbl@engine - \def\bbl@loadbidi#1{% - \let\bbl@beforeforeign\leavevmode - \AtEndOfPackage{\EnableBabelHook{babel-bidi}}% - \RequirePackage{luatexbase}% - \directlua{ - require('babel-bidi.lua') - require('babel-bidi-#1.lua') - luatexbase.add_to_callback('pre_linebreak_filter', - Babel.pre_otfload_v, - 'Babel.pre_otfload_v', - luatexbase.priority_in_callback('pre_linebreak_filter', - 'luaotfload.node_processor') or nil) - luatexbase.add_to_callback('hpack_filter', - Babel.pre_otfload_h, - 'Babel.pre_otfload_h', - luatexbase.priority_in_callback('hpack_filter', - 'luaotfload.node_processor') or nil) - }} \let\bbl@tempa\relax \@ifpackagewith{babel}{bidi=basic}% {\def\bbl@tempa{basic}}% diff --git a/Master/texmf-dist/tex/generic/babel/hyphen.cfg b/Master/texmf-dist/tex/generic/babel/hyphen.cfg index 2f746b1c779..9e4269e11b8 100644 --- a/Master/texmf-dist/tex/generic/babel/hyphen.cfg +++ b/Master/texmf-dist/tex/generic/babel/hyphen.cfg @@ -36,7 +36,7 @@ \wlog{File: #1 #4 #3 <#2>}% \let\ProvidesFile\@undefined} \fi -\ProvidesFile{hyphen.cfg}[2018/04/25 3.19 Babel hyphens] +\ProvidesFile{hyphen.cfg}[2018/05/02 3.20 Babel hyphens] \xdef\bbl@format{\jobname} \ifx\AtBeginDocument\@undefined \def\@empty{} @@ -67,7 +67,7 @@ \countdef\last@language=19 \def\addlanguage{\alloc@9\language\chardef\@cclvi} \fi -\toks8{Babel <3.19> and hyphenation patterns for }% +\toks8{Babel <3.20> and hyphenation patterns for }% \def\process@line#1#2 #3 #4 {% \ifx=#1% \process@synonym{#2}% diff --git a/Master/texmf-dist/tex/generic/babel/nil.ldf b/Master/texmf-dist/tex/generic/babel/nil.ldf index 10004499411..e6a5aad4c3e 100644 --- a/Master/texmf-dist/tex/generic/babel/nil.ldf +++ b/Master/texmf-dist/tex/generic/babel/nil.ldf @@ -31,7 +31,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension |.ins|) which are part of the distribution. %% -\ProvidesLanguage{nil}[2018/04/25 3.19 Nil language] +\ProvidesLanguage{nil}[2018/05/02 3.20 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 0c5f6c2d68d..ba84053fe3e 100644 --- a/Master/texmf-dist/tex/generic/babel/switch.def +++ b/Master/texmf-dist/tex/generic/babel/switch.def @@ -36,7 +36,7 @@ \wlog{File: #1 #4 #3 <#2>}% \let\ProvidesFile\@undefined} \fi -\ProvidesFile{switch.def}[2018/04/25 3.19 Babel switching mechanism] +\ProvidesFile{switch.def}[2018/05/02 3.20 Babel switching mechanism] \ifx\AtBeginDocument\@undefined \input plain.def\relax \fi @@ -57,8 +57,8 @@ \countdef\last@language=19 \def\addlanguage{\alloc@9\language\chardef\@cclvi} \fi -\def\bbl@version{3.19} -\def\bbl@date{2018/04/25} +\def\bbl@version{3.20} +\def\bbl@date{2018/05/02} \def\adddialect#1#2{% \global\chardef#1#2\relax \bbl@usehooks{adddialect}{{#1}{#2}}% -- cgit v1.2.3