diff options
Diffstat (limited to 'Master/texmf-dist/tex')
20 files changed, 98 insertions, 63 deletions
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 7f3269bbb91..d1fb3c00fce 100644 --- a/Master/texmf-dist/tex/generic/babel/babel-bidi-basic.lua +++ b/Master/texmf-dist/tex/generic/babel/babel-bidi-basic.lua @@ -42,6 +42,13 @@ Babel.fontmap[1] = {} -- r Babel.fontmap[2] = {} -- al/an Babel.bidi_enabled = true +Babel.mirroring_enabled = true + +-- Temporary: + +if harf then + Babel.mirroring_enabled = false +end require('babel-data-bidi.lua') @@ -331,7 +338,7 @@ function Babel.bidi(head, ispar, hdir) for r = first_on, q - 1 do nodes[r][2] = temp item = nodes[r][1] -- MIRRORING - if item.id == GLYPH and temp == 'r' then + if Babel.mirroring_enabled and item.id == GLYPH and temp == 'r' then item.char = characters[item.char].m or item.char end end diff --git a/Master/texmf-dist/tex/generic/babel/babel.def b/Master/texmf-dist/tex/generic/babel/babel.def index 2500bdb4a0c..02e3a8c8f6d 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}[2019/06/03 3.32 Babel common definitions] +\ProvidesFile{babel.def}[2019/07/19 3.33 Babel common definitions] \ifx\AtBeginDocument\@undefined \input plain.def\relax \fi @@ -265,22 +265,25 @@ \@namedef{\bbl@tempa\space}} \@onlypreamble\bbl@redefinerobust \bbl@trace{Hooks} -\def\AddBabelHook#1#2{% - \bbl@ifunset{bbl@hk@#1}{\EnableBabelHook{#1}}{}% - \def\bbl@tempa##1,#2=##2,##3\@empty{\def\bbl@tempb{##2}}% - \expandafter\bbl@tempa\bbl@evargs,#2=,\@empty - \bbl@ifunset{bbl@ev@#1@#2}% - {\bbl@csarg\bbl@add{ev@#2}{\bbl@elt{#1}}% - \bbl@csarg\newcommand}% - {\bbl@csarg\let{ev@#1@#2}\relax - \bbl@csarg\newcommand}% - {ev@#1@#2}[\bbl@tempb]} -\def\EnableBabelHook#1{\bbl@csarg\let{hk@#1}\@firstofone} -\def\DisableBabelHook#1{\bbl@csarg\let{hk@#1}\@gobble} +\newcommand\AddBabelHook[3][]{% + \bbl@ifunset{bbl@hk@#2}{\EnableBabelHook{#2}}{}% + \def\bbl@tempa##1,#3=##2,##3\@empty{\def\bbl@tempb{##2}}% + \expandafter\bbl@tempa\bbl@evargs,#3=,\@empty + \bbl@ifunset{bbl@ev@#2@#3@#1}% + {\bbl@csarg\bbl@add{ev@#3@#1}{\bbl@elt{#2}}}% + {\bbl@csarg\let{ev@#2@#3@#1}\relax}% + \bbl@csarg\newcommand{ev@#2@#3@#1}[\bbl@tempb]} +\newcommand\EnableBabelHook[1]{\bbl@csarg\let{hk@#1}\@firstofone} +\newcommand\DisableBabelHook[1]{\bbl@csarg\let{hk@#1}\@gobble} \def\bbl@usehooks#1#2{% \def\bbl@elt##1{% - \@nameuse{bbl@hk@##1}{\@nameuse{bbl@ev@##1@#1}#2}}% - \@nameuse{bbl@ev@#1}} + \@nameuse{bbl@hk@##1}{\@nameuse{bbl@ev@##1@#1@}#2}}% + \@nameuse{bbl@ev@#1@}% + \ifx\languagename\@undefined\else % Test required for Plain (?) + \def\bbl@elt##1{% + \@nameuse{bbl@hk@##1}{\@nameuse{bbl@ev@##1@#1@\languagename}#2}}% + \@nameuse{bbl@ev@#1@\languagename}% + \fi} \def\bbl@evargs{,% <- don't delete this comma everylanguage=1,loadkernel=1,loadpatterns=1,loadexceptions=1,% adddialect=2,patterns=2,defaultcommands=0,encodedcommands=2,write=0,% @@ -1213,7 +1216,7 @@ \ProvideTextCommandDefault{\glq}{% \textormath{\quotesinglbase}{\mbox{\quotesinglbase}}} \ProvideTextCommand{\grq}{T1}{% - \textormath{\textquoteleft}{\mbox{\textquoteleft}}} + \textormath{\kern\z@\textquoteleft}{\mbox{\textquoteleft}}} \ProvideTextCommand{\grq}{TU}{% \textormath{\textquoteleft}{\mbox{\textquoteleft}}} \ProvideTextCommand{\grq}{OT1}{% @@ -1641,8 +1644,8 @@ {{\bbl@exp{\\\addlanguage\<l@##1>}}}% {}% \bbl@ifunset{l@##1}% - {}% - {\bbl@exp{\let\bbl@tempa\<l@##1>}}% + {}% + {\bbl@exp{\let\bbl@tempa\<l@##1>}}% \fi}% \fi \ifx\bbl@tempa\relax % if no opt or no language in opt found @@ -1657,7 +1660,15 @@ {\bbl@ifunset{l@#1}% no hyphenrules found - fallback {\bbl@exp{\\\adddialect\<l@#1>\language}}% {}}% so, l@<lang> is ok - nothing to do - {\bbl@exp{\\\adddialect\<l@#1>\bbl@tempa}}}% found in opt list or ini + {\bbl@exp{\\\adddialect\<l@#1>\bbl@tempa}}% found in opt list or ini + \bbl@ifunset{bbl@prehc@\languagename}% + {}% TODO - XeTeX, based on \babelfont and HyphenChar? + {\ifodd\bbl@engine\bbl@exp{% + \\\bbl@ifblank{\@nameuse{bbl@prehc@#1}}% + {}% + {\\\AddBabelHook[\languagename]{babel-prehc-\languagename}{patterns}% + {\prehyphenchar=\@nameuse{bbl@prehc@\languagename}\relax}}}% + \fi}} \def\bbl@read@ini#1{% \openin1=babel-#1.ini % FIXME - number must not be hardcoded \ifeof1 @@ -1719,6 +1730,7 @@ \def\bbl@after@ini{% \bbl@exportkey{lfthm}{typography.lefthyphenmin}{2}% \bbl@exportkey{rgthm}{typography.righthyphenmin}{3}% + \bbl@exportkey{prehc}{typography.prehyphenchar}{}% \bbl@exportkey{hyphr}{typography.hyphenrules}{}% \bbl@exportkey{intsp}{typography.intraspace}{}% \bbl@exportkey{jstfy}{typography.justify}{w}% diff --git a/Master/texmf-dist/tex/generic/babel/babel.sty b/Master/texmf-dist/tex/generic/babel/babel.sty index b4d8860a7a4..e866fbbdd6a 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}[2019/06/03 3.32 The Babel package] +\ProvidesPackage{babel}[2019/07/19 3.33 The Babel package] \@ifpackagewith{babel}{debug} {\providecommand\bbl@trace[1]{\message{^^J[ #1 ]}}% \let\bbl@debug\@firstofone} @@ -250,7 +250,10 @@ or luatexbase.priority_in_callback('hpack_filter', 'luaotfload.node_processor') or nil) - }} + }% + \@ifpackageloaded{harfload}% + {\directlua{ Babel.mirroring_enabled = false }}% + {}} \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 60086951039..d658be7135f 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}[2019/06/03 3.32 Babel hyphens] +\ProvidesFile{hyphen.cfg}[2019/07/19 3.33 Babel hyphens] \xdef\bbl@format{\jobname} \ifx\AtBeginDocument\@undefined \def\@empty{} diff --git a/Master/texmf-dist/tex/generic/babel/locale/as/babel-as.ini b/Master/texmf-dist/tex/generic/babel/locale/as/babel-as.ini index 2a3c80e99db..0ba54fd05d6 100644 --- a/Master/texmf-dist/tex/generic/babel/locale/as/babel-as.ini +++ b/Master/texmf-dist/tex/generic/babel/locale/as/babel-as.ini @@ -11,8 +11,8 @@ [identification] charset = utf8 -version = 1.1 -date = 2018-04-11 +version = 1.2 +date = 2019-06-16 name.local = অসমীয়া name.english = Assamese name.babel = assamese @@ -136,7 +136,7 @@ hyphenrules = assaseme lefthyphenmin = righthyphenmin = hyphenchar = -prehyphenchar = +prehyphenchar = 0 posthyphenchar = exhyphenchar = preexhyphenchar = diff --git a/Master/texmf-dist/tex/generic/babel/locale/bn/babel-bn.ini b/Master/texmf-dist/tex/generic/babel/locale/bn/babel-bn.ini index ebe1bb59b9b..9a5dc3924e3 100644 --- a/Master/texmf-dist/tex/generic/babel/locale/bn/babel-bn.ini +++ b/Master/texmf-dist/tex/generic/babel/locale/bn/babel-bn.ini @@ -11,8 +11,8 @@ [identification] charset = utf8 -version = 1.1 -date = 2018-04-11 +version = 1.2 +date = 2019-06-16 name.local = বাংলা name.english = Bangla name.babel = bengali @@ -113,7 +113,7 @@ hyphenrules = bengali lefthyphenmin = 2 righthyphenmin = 2 hyphenchar = -prehyphenchar = +prehyphenchar = 0 posthyphenchar = exhyphenchar = preexhyphenchar = diff --git a/Master/texmf-dist/tex/generic/babel/locale/gu/babel-gu.ini b/Master/texmf-dist/tex/generic/babel/locale/gu/babel-gu.ini index c7d3c2a250e..617b4c29353 100644 --- a/Master/texmf-dist/tex/generic/babel/locale/gu/babel-gu.ini +++ b/Master/texmf-dist/tex/generic/babel/locale/gu/babel-gu.ini @@ -11,8 +11,8 @@ [identification] charset = utf8 -version = 1.1 -date = 2018-04-11 +version = 1.2 +date = 2019-06-16 name.local = ગુજરાતી name.english = Gujarati name.babel = gujarati @@ -136,7 +136,7 @@ hyphenrules = gujarati lefthyphenmin = righthyphenmin = hyphenchar = -prehyphenchar = +prehyphenchar = 0 posthyphenchar = exhyphenchar = preexhyphenchar = diff --git a/Master/texmf-dist/tex/generic/babel/locale/hi/babel-hi.ini b/Master/texmf-dist/tex/generic/babel/locale/hi/babel-hi.ini index 735e5392ba6..365fd0b5aa0 100644 --- a/Master/texmf-dist/tex/generic/babel/locale/hi/babel-hi.ini +++ b/Master/texmf-dist/tex/generic/babel/locale/hi/babel-hi.ini @@ -12,8 +12,8 @@ [identification] charset = utf8 -version = 1.0 -date = 2019-01-31 +version = 1.1 +date = 2019-06-16 name.local = हिन्दी name.english = Hindi name.babel = hindi @@ -163,7 +163,7 @@ hyphenrules = hindi lefthyphenmin = righthyphenmin = hyphenchar = -prehyphenchar = +prehyphenchar = 0 posthyphenchar = exhyphenchar = preexhyphenchar = diff --git a/Master/texmf-dist/tex/generic/babel/locale/kn/babel-kn.ini b/Master/texmf-dist/tex/generic/babel/locale/kn/babel-kn.ini index 9896e92fc5c..eed7f7575da 100644 --- a/Master/texmf-dist/tex/generic/babel/locale/kn/babel-kn.ini +++ b/Master/texmf-dist/tex/generic/babel/locale/kn/babel-kn.ini @@ -11,8 +11,8 @@ [identification] charset = utf8 -version = 1.1 -date = 2018-04-11 +version = 1.2 +date = 2019-06-16 name.local = ಕನ್ನಡ name.english = Kannada name.babel = kannada @@ -118,7 +118,7 @@ hyphenrules = kannada lefthyphenmin = 2 righthyphenmin = 2 hyphenchar = -prehyphenchar = +prehyphenchar = 0 posthyphenchar = exhyphenchar = preexhyphenchar = diff --git a/Master/texmf-dist/tex/generic/babel/locale/ml/babel-ml.ini b/Master/texmf-dist/tex/generic/babel/locale/ml/babel-ml.ini index 9343955b43d..f41fa44e0a8 100644 --- a/Master/texmf-dist/tex/generic/babel/locale/ml/babel-ml.ini +++ b/Master/texmf-dist/tex/generic/babel/locale/ml/babel-ml.ini @@ -11,8 +11,8 @@ [identification] charset = utf8 -version = 1.1 -date = 2018-04-11 +version = 1.2 +date = 2019-06-16 name.local = മലയാളം name.english = Malayalam name.babel = malayalam @@ -124,7 +124,7 @@ hyphenrules = malayalam lefthyphenmin = 2 righthyphenmin = 2 hyphenchar = -prehyphenchar = +prehyphenchar = 0 posthyphenchar = exhyphenchar = preexhyphenchar = diff --git a/Master/texmf-dist/tex/generic/babel/locale/mr/babel-mr.ini b/Master/texmf-dist/tex/generic/babel/locale/mr/babel-mr.ini index eeba0f7b8a4..6e095b04204 100644 --- a/Master/texmf-dist/tex/generic/babel/locale/mr/babel-mr.ini +++ b/Master/texmf-dist/tex/generic/babel/locale/mr/babel-mr.ini @@ -11,8 +11,8 @@ [identification] charset = utf8 -version = 1.1 -date = 2018-04-11 +version = 1.2 +date = 2019-06-16 name.local = मराठी name.english = Marathi name.babel = marathi @@ -113,7 +113,7 @@ hyphenrules = marathi lefthyphenmin = 2 righthyphenmin = 2 hyphenchar = -prehyphenchar = +prehyphenchar = 0 posthyphenchar = exhyphenchar = preexhyphenchar = diff --git a/Master/texmf-dist/tex/generic/babel/locale/or/babel-or.ini b/Master/texmf-dist/tex/generic/babel/locale/or/babel-or.ini index 71b11dc7ee0..3f09cb33521 100644 --- a/Master/texmf-dist/tex/generic/babel/locale/or/babel-or.ini +++ b/Master/texmf-dist/tex/generic/babel/locale/or/babel-or.ini @@ -11,8 +11,8 @@ [identification] charset = utf8 -version = 1.1 -date = 2018-04-11 +version = 1.2 +date = 2019-06-16 name.local = ଓଡ଼ିଆ name.english = Odia name.babel = oriya @@ -136,7 +136,7 @@ hyphenrules = oriya lefthyphenmin = righthyphenmin = hyphenchar = -prehyphenchar = +prehyphenchar = 0 posthyphenchar = exhyphenchar = preexhyphenchar = diff --git a/Master/texmf-dist/tex/generic/babel/locale/pa/babel-pa-Guru.ini b/Master/texmf-dist/tex/generic/babel/locale/pa/babel-pa-Guru.ini index e190a51e010..51336211e73 100644 --- a/Master/texmf-dist/tex/generic/babel/locale/pa/babel-pa-Guru.ini +++ b/Master/texmf-dist/tex/generic/babel/locale/pa/babel-pa-Guru.ini @@ -11,8 +11,8 @@ [identification] charset = utf8 -version = 1.1 -date = 2018-04-11 +version = 1.2 +date = 2019-06-16 name.local = ਪੰਜਾਬੀ name.english = Punjabi name.babel = punjabi-gurmukhi @@ -137,7 +137,7 @@ hyphenrules = punjabi lefthyphenmin = righthyphenmin = hyphenchar = -prehyphenchar = +prehyphenchar = 0 posthyphenchar = exhyphenchar = preexhyphenchar = diff --git a/Master/texmf-dist/tex/generic/babel/locale/pa/babel-pa.ini b/Master/texmf-dist/tex/generic/babel/locale/pa/babel-pa.ini index 79838563841..234405d4e5c 100644 --- a/Master/texmf-dist/tex/generic/babel/locale/pa/babel-pa.ini +++ b/Master/texmf-dist/tex/generic/babel/locale/pa/babel-pa.ini @@ -11,8 +11,8 @@ [identification] charset = utf8 -version = 1.1 -date = 2018-04-11 +version = 1.2 +date = 2019-06-16 name.local = ਪੰਜਾਬੀ name.english = Punjabi name.babel = punjabi @@ -136,7 +136,7 @@ hyphenrules = punjabi lefthyphenmin = righthyphenmin = hyphenchar = -prehyphenchar = +prehyphenchar = 0 posthyphenchar = exhyphenchar = preexhyphenchar = diff --git a/Master/texmf-dist/tex/generic/babel/locale/ta/babel-ta.ini b/Master/texmf-dist/tex/generic/babel/locale/ta/babel-ta.ini index 6ebfb1da490..78e11223d4a 100644 --- a/Master/texmf-dist/tex/generic/babel/locale/ta/babel-ta.ini +++ b/Master/texmf-dist/tex/generic/babel/locale/ta/babel-ta.ini @@ -11,8 +11,8 @@ [identification] charset = utf8 -version = 1.1 -date = 2018-04-11 +version = 1.2 +date = 2019-06-16 name.local = தமிழ் name.english = Tamil name.babel = tamil @@ -136,7 +136,7 @@ hyphenrules = tamil lefthyphenmin = 2 righthyphenmin = 2 hyphenchar = -prehyphenchar = +prehyphenchar = 0 posthyphenchar = exhyphenchar = preexhyphenchar = diff --git a/Master/texmf-dist/tex/generic/babel/locale/te/babel-te.ini b/Master/texmf-dist/tex/generic/babel/locale/te/babel-te.ini index 4880bc0d08c..9f81944fba9 100644 --- a/Master/texmf-dist/tex/generic/babel/locale/te/babel-te.ini +++ b/Master/texmf-dist/tex/generic/babel/locale/te/babel-te.ini @@ -11,8 +11,8 @@ [identification] charset = utf8 -version = 1.1 -date = 2018-04-11 +version = 1.2 +date = 2019-06-16 name.local = తెలుగు name.english = Telugu name.babel = telugu @@ -113,7 +113,7 @@ hyphenrules = telugu lefthyphenmin = 2 righthyphenmin = 2 hyphenchar = -prehyphenchar = +prehyphenchar = 0 posthyphenchar = exhyphenchar = preexhyphenchar = diff --git a/Master/texmf-dist/tex/generic/babel/locale/tr/babel-tr.ini b/Master/texmf-dist/tex/generic/babel/locale/tr/babel-tr.ini index 58c217b70c9..b765218e3dd 100644 --- a/Master/texmf-dist/tex/generic/babel/locale/tr/babel-tr.ini +++ b/Master/texmf-dist/tex/generic/babel/locale/tr/babel-tr.ini @@ -24,6 +24,7 @@ script.tag.opentype = latn level = 1 encodings = T1 OT1 LY1 derivate = no +require.babel = turkish [captions] preface = Önsöz diff --git a/Master/texmf-dist/tex/generic/babel/locale/tr/babel-turkish.tex b/Master/texmf-dist/tex/generic/babel/locale/tr/babel-turkish.tex index 0becc4f003f..e7346cf2515 100644 --- a/Master/texmf-dist/tex/generic/babel/locale/tr/babel-turkish.tex +++ b/Master/texmf-dist/tex/generic/babel/locale/tr/babel-turkish.tex @@ -9,4 +9,16 @@ \fi \BabelBeforeIni{tr}{% } + +\StartBabelCommands*{turkish}{} + \SetCase + {\uccode`i=`İ\relax + \uccode`ı=`I\relax} + {\lccode`İ=`i\relax + \lccode`I=`ı\relax} + \SetHyphenMap{% + \BabelLower{`İ}{`i}% + \BabelLower{`I}{`ı}} +\EndBabelCommands + \endinput
\ No newline at end of file diff --git a/Master/texmf-dist/tex/generic/babel/nil.ldf b/Master/texmf-dist/tex/generic/babel/nil.ldf index 773a8f4c078..d16b8e4f752 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}[2019/06/03 3.32 Nil language] +\ProvidesLanguage{nil}[2019/07/19 3.33 Nil language] \LdfInit{nil}{datenil} \ifx\l@nil\@undefined \newlanguage\l@nil diff --git a/Master/texmf-dist/tex/generic/babel/switch.def b/Master/texmf-dist/tex/generic/babel/switch.def index 010ac0f13fa..c0a24834630 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}[2019/06/03 3.32 Babel switching mechanism] +\ProvidesFile{switch.def}[2019/07/19 3.33 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.32} -\def\bbl@date{2019/06/03} +\def\bbl@version{3.33} +\def\bbl@date{2019/07/19} \def\adddialect#1#2{% \global\chardef#1#2\relax \bbl@usehooks{adddialect}{{#1}{#2}}% |