diff options
author | Karl Berry <karl@freefriends.org> | 2018-10-03 22:45:31 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2018-10-03 22:45:31 +0000 |
commit | 6b428e6cd33a420b0df0915e9ac45f66786c3099 (patch) | |
tree | cd9dd8952bae469cc215d21ac717baad839d0f61 /Master/texmf-dist/tex/generic/babel/luababel.def | |
parent | bc810e6340a36baa5a2918ed256a605f54f04811 (diff) |
babel (3oct18)
git-svn-id: svn://tug.org/texlive/trunk@48825 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/babel/luababel.def')
-rw-r--r-- | Master/texmf-dist/tex/generic/babel/luababel.def | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/Master/texmf-dist/tex/generic/babel/luababel.def b/Master/texmf-dist/tex/generic/babel/luababel.def index 22bc238a7c7..8d7467cf185 100644 --- a/Master/texmf-dist/tex/generic/babel/luababel.def +++ b/Master/texmf-dist/tex/generic/babel/luababel.def @@ -417,10 +417,11 @@ \ifx\fontspec\@undefined \usepackage{fontspec}% \fi - \EnableBabelHook{babel-fontspec}% + \EnableBabelHook{babel-fontspec}% Just calls \bbl@switchfont \bbl@bblfont} \newcommand\bbl@bblfont[2][]{% 1=features 2=fontname \bbl@ifunset{\bbl@tempb family}{\bbl@providefam{\bbl@tempb}}{}% + % For the default font, just in case: \bbl@ifunset{bbl@lsys@\languagename}{\bbl@provide@lsys{\languagename}}{}% \expandafter\bbl@ifblank\expandafter{\bbl@tempa}% {\bbl@csarg\edef{\bbl@tempb dflt@}{<>{#1}{#2}}% save bbl@rmdflt@ @@ -457,8 +458,9 @@ \def\bbl@tempa{% \bbl@warning{The current font is not a standard family:\\% \fontname\font\\% - Script and Language are not applied. Consider defining a\\% - new family with \string\babelfont. Reported}}% + Script and Language are not applied. Consider\\% + defining a new family with \string\babelfont.\\% + Reported}}% \bbl@foreach\bbl@font@fams{% don't gather with prev for \bbl@ifunset{bbl@##1dflt@\languagename}% {\bbl@cs{famrst@##1}% @@ -481,8 +483,18 @@ \def\bbl@fontspec@set#1#2#3{% eg \bbl@rmdflt@lang fnt-opt fnt-nme \let\bbl@tempe\bbl@mapselect \let\bbl@mapselect\relax - \bbl@exp{\<fontspec_set_family:Nnn>\\#1% - {\bbl@cs{lsys@\languagename},#2}}{#3}% + \bbl@exp{% TODO - should be global, but even local does its job + % I'm still not sure -- must investigate + \<keys_if_exist:nnF>{fontspec-opentype}% + {Script/\bbl@cs{sname@\languagename}}% + {\\\newfontscript{\bbl@cs{sname@\languagename}}% + {\bbl@cs{sotf@\languagename}}}% + \<keys_if_exist:nnF>{fontspec-opentype}% + {Language/\bbl@cs{lname@\languagename}}% + {\\\newfontlanguage{\bbl@cs{lname@\languagename}}% + {\bbl@cs{lotf@\languagename}}}% + \<fontspec_set_family:Nnn>\\#1% + {\bbl@cs{lsys@\languagename},#2}}{#3}% ie \bbl@exp{..}{#3} \let\bbl@mapselect\bbl@tempe \bbl@toglobal#1}% \def\bbl@font@rst#1#2#3#4{% |