summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/babel/xebabel.def
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/generic/babel/xebabel.def')
-rw-r--r--Master/texmf-dist/tex/generic/babel/xebabel.def16
1 files changed, 10 insertions, 6 deletions
diff --git a/Master/texmf-dist/tex/generic/babel/xebabel.def b/Master/texmf-dist/tex/generic/babel/xebabel.def
index 31085b2ce9b..be92128a20e 100644
--- a/Master/texmf-dist/tex/generic/babel/xebabel.def
+++ b/Master/texmf-dist/tex/generic/babel/xebabel.def
@@ -122,9 +122,10 @@
\<bbl@##1dflt@*\bbl@tempa>}}}%
{}}% 1=T - language, already defined
\def\bbl@tempa{%
- \bbl@warning{The current font is not a standard family.\\%
- Script and Language are not applied. Consider defining\\%
- a new family with \string\babelfont,}}%
+ \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}}%
\bbl@foreach\bbl@font@fams{% don't gather with prev for
\bbl@ifunset{bbl@##1dflt@\languagename}%
{\bbl@cs{famrst@##1}%
@@ -136,17 +137,20 @@
\\\bbl@font@set\<bbl@##1dflt@\languagename>% the main part!
\<##1default>\<##1family>}}}%
\bbl@ifrestoring{}{\bbl@tempa}}%
-\def\bbl@font@set#1#2#3{%
+\def\bbl@font@set#1#2#3{% eg \bbl@rmdflt@lang \rmdefault \rmfamily
\bbl@xin@{<>}{#1}%
\ifin@
\bbl@exp{\\\bbl@fontspec@set\\#1\expandafter\@gobbletwo#1}%
\fi
\bbl@exp{%
- \def\\#2{#1}% eg, \rmdefault{\bbl@rm1dflt@lang}
+ \def\\#2{#1}% eg, \rmdefault{\bbl@rmdflt@lang}
\\\bbl@ifsamestring{#2}{\f@family}{\\#3\let\\\bbl@tempa\relax}{}}}
-\def\bbl@fontspec@set#1#2#3{%
+\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}%
+ \let\bbl@mapselect\bbl@tempe
\bbl@toglobal#1}%
\def\bbl@font@rst#1#2#3#4{%
\bbl@csarg\def{famrst@#4}{\bbl@font@set{#1}#2#3}}