summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/babel/babel.def
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/generic/babel/babel.def')
-rw-r--r--Master/texmf-dist/tex/generic/babel/babel.def46
1 files changed, 32 insertions, 14 deletions
diff --git a/Master/texmf-dist/tex/generic/babel/babel.def b/Master/texmf-dist/tex/generic/babel/babel.def
index 5411afe6282..d13f7573336 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}[2018/06/05 3.22 Babel common definitions]
+\ProvidesFile{babel.def}[2018/09/02 3.23 Babel common definitions]
\ifx\AtBeginDocument\@undefined
\input plain.def\relax
\fi
@@ -265,7 +265,7 @@
\def\bbl@elt##1{%
\@nameuse{bbl@hk@##1}{\@nameuse{bbl@ev@##1@#1}#2}}%
\@nameuse{bbl@ev@#1}}
-\def\bbl@evargs{,% don't delete the comma
+\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,%
beforeextras=0,afterextras=0,stopcommands=0,stringprocess=0,%
@@ -680,6 +680,7 @@
\def\bbl@deactivate#1{%
\bbl@ifshorthand{#1}{\bbl@s@deactivate{#1}}{}}
\fi
+\newcommand\ifbabelshorthand[3]{\bbl@ifunset{bbl@active@\string#1}{#3}{#2}}
\def\bbl@prim@s{%
\prime\futurelet\@let@token\bbl@pr@m@s}
\def\bbl@if@primes#1#2{%
@@ -1314,6 +1315,14 @@
\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@import\@nil\else
+ \bbl@exp{\\\bbl@ifblank{\bbl@KVP@import}}%
+ {\begingroup
+ \def\BabelBeforeIni##1##2{\gdef\bbl@KVP@import{##1}\endinput}%
+ \InputIfFileExists{babel-#2.tex}{}{}%
+ \endgroup}%
+ {}%
+ \fi
\ifx\bbl@KVP@captions\@nil
\let\bbl@KVP@captions\bbl@KVP@import
\fi
@@ -1368,8 +1377,13 @@
\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
+ \ifx\bbl@latinarabic\@undefined
+ \expandafter\let\expandafter\@arabic
+ \csname bbl@counter@\languagename\endcsname
+ \else % ie, if layout=counters, which redefines \@arabic
+ \expandafter\let\expandafter\bbl@latinarabic
+ \csname bbl@counter@\languagename\endcsname
+ \fi
\fi
\fi}%
\fi
@@ -1647,16 +1661,17 @@
{}%
\bbl@csarg\let{lsys@#1}\@empty
\bbl@ifunset{bbl@sname@#1}{\bbl@csarg\gdef{sname@#1}{Default}}{}%
- \bbl@ifunset{bbl@sotf#1}{\bbl@csarg\gdef{sotf@#1}{DFLT}}{}%
+ \bbl@ifunset{bbl@sotf@#1}{\bbl@csarg\gdef{sotf@#1}{DFLT}}{}%
\bbl@csarg\bbl@add@list{lsys@#1}{Script=\bbl@cs{sname@#1}}%
\bbl@ifunset{bbl@lname@#1}{}%
{\bbl@csarg\bbl@add@list{lsys@#1}{Language=\bbl@cs{lname@#1}}}%
- \bbl@csarg\bbl@toglobal{lsys@#1}}%
- % \bbl@exp{% TODO - should be global
- % \<keys_if_exist:nnF>{fontspec-opentype/Script}{\bbl@cs{sname@#1}}%
- % {\\\newfontscript{\bbl@cs{sname@#1}}{\bbl@cs{sotf@#1}}}%
- % \<keys_if_exist:nnF>{fontspec-opentype/Language}{\bbl@cs{lname@#1}}%
- % {\\\newfontlanguage{\bbl@cs{lname@#1}}{\bbl@cs{lotf@#1}}}}}
+ \bbl@csarg\bbl@toglobal{lsys@#1}%}%
+ \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@#1}}%
+ {\\\newfontscript{\bbl@cs{sname@#1}}{\bbl@cs{sotf@#1}}}%
+ \<keys_if_exist:nnF>{fontspec-opentype}{Language/\bbl@cs{lname@#1}}%
+ {\\\newfontlanguage{\bbl@cs{lname@#1}}{\bbl@cs{lotf@#1}}}}}
\def\bbl@ini@ids#1{%
\def\BabelBeforeIni##1##2{%
\begingroup
@@ -1758,7 +1773,9 @@
\g@addto@macro\@resetactivechars{%
\set@typeset@protect
\expandafter\select@language@x\expandafter{\bbl@main@language}%
- \let\protect\noexpand}%
+ \let\protect\noexpand
+ \edef\thepage{%
+ \noexpand\babelsublr{\unexpanded\expandafter{\thepage}}}}%
\fi}
{\bbl@redefine\markright#1{%
\bbl@ifblank{#1}%
@@ -1766,7 +1783,7 @@
{\toks@{#1}%
\bbl@exp{%
\\\org@markright{\\\protect\\\foreignlanguage{\languagename}%
- {\\\protect\\\bbl@restore@actives\the\toks@}}}}}
+ {\\\protect\\\bbl@restore@actives\the\toks@}}}}}%
\ifx\@mkboth\markboth
\def\bbl@tempc{\let\@mkboth\markboth}
\else
@@ -1857,7 +1874,8 @@
}
\@onlypreamble\substitutefontfamily
\bbl@trace{Encoding and fonts}
-\newcommand\BabelNonASCII{LGR,X2,OT2,OT3,OT6,LHE,LWN,LMA,LMC,LMS,LMU,}
+\newcommand\BabelNonASCII
+ {LGR,X2,OT2,OT3,OT6,LHE,LWN,LMA,LMC,LMS,LMU,TS1,T3,TS3}
\let\org@TeX\TeX
\let\org@LaTeX\LaTeX
\let\ensureascii\@firstofone