diff options
Diffstat (limited to 'Master/texmf-dist/tex/generic/babel/xebabel.def')
-rw-r--r-- | Master/texmf-dist/tex/generic/babel/xebabel.def | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/Master/texmf-dist/tex/generic/babel/xebabel.def b/Master/texmf-dist/tex/generic/babel/xebabel.def index f451a4b71bc..596d09da970 100644 --- a/Master/texmf-dist/tex/generic/babel/xebabel.def +++ b/Master/texmf-dist/tex/generic/babel/xebabel.def @@ -73,7 +73,7 @@ \fi \bbl@exp{% \\\bbl@add\<extras\languagename>{% - \XeTeXlinebreaklocale "\bbl@cl{lbcp}"% + \XeTeXlinebreaklocale "\bbl@cl{tbcp}"% \<bbl@xeisp@\languagename>% \<bbl@xeipn@\languagename>}% \\\bbl@toglobal\<extras\languagename>% @@ -120,9 +120,9 @@ \newcommand\babelfont[2][]{% 1=langs/scripts 2=fam \bbl@foreach{#1}{% \expandafter\ifx\csname date##1\endcsname\relax - \IfFileExists{babel-##1.tex}% - {\babelprovide{##1}}% - {}% + \IfFileExists{babel-##1.tex}% + {\babelprovide{##1}}% + {}% \fi}% \edef\bbl@tempa{#1}% \def\bbl@tempb{#2}% Used by \bbl@bblfont @@ -190,7 +190,7 @@ \bbl@ifunset{bbl@##1dflt@\languagename}% {\bbl@cs{famrst@##1}% \global\bbl@csarg\let{famrst@##1}\relax}% - {\bbl@exp{% order is relevant + {\bbl@exp{% order is relevant. TODO: but sometimes wrong! \\\bbl@add\\\originalTeX{% \\\bbl@font@rst{\bbl@cl{##1dflt}}% \<##1default>\<##1family>{##1}}% @@ -232,9 +232,13 @@ \ifin@ \bbl@exp{\\\bbl@fontspec@set\\#1\expandafter\@gobbletwo#1\\#3}% \fi - \bbl@exp{% + \bbl@exp{% 'Unprotected' macros return prev values \def\\#2{#1}% eg, \rmdefault{\bbl@rmdflt@lang} - \\\bbl@ifsamestring{#2}{\f@family}{\\#3\let\\\bbl@tempa\relax}{}}} + \\\bbl@ifsamestring{#2}{\f@family}% + {\\#3% + \\\bbl@ifsamestring{\f@series}{\bfdefault}{\\\bfseries}{}% + \let\\\bbl@tempa\relax}% + {}}} \def\bbl@fontspec@set#1#2#3#4{% eg \bbl@rmdflt@lang fnt-opt fnt-nme \xxfamily \let\bbl@tempe\bbl@mapselect \let\bbl@mapselect\relax @@ -298,7 +302,6 @@ \babel@save\bbl@langfeatures \edef\bbl@langfeatures{#2,}}} \input txtbabel.def - \endinput %% %% End of file `xebabel.def'. |