diff options
author | Karl Berry <karl@freefriends.org> | 2020-07-13 21:11:36 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-07-13 21:11:36 +0000 |
commit | 3e77979c65d09a262497f9d5df7414009d5c6a4a (patch) | |
tree | 169dd9a5b19c6baa24b7d7586a0fb2a4ecc34cf3 /Master/texmf-dist/tex/generic/babel/babel.def | |
parent | ef73787cfd526899301624dd2dc857195c1f6cfa (diff) |
babel (13jul20)
git-svn-id: svn://tug.org/texlive/trunk@55830 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/babel/babel.def')
-rw-r--r-- | Master/texmf-dist/tex/generic/babel/babel.def | 75 |
1 files changed, 38 insertions, 37 deletions
diff --git a/Master/texmf-dist/tex/generic/babel/babel.def b/Master/texmf-dist/tex/generic/babel/babel.def index 3fd75d82914..85484179dd5 100644 --- a/Master/texmf-dist/tex/generic/babel/babel.def +++ b/Master/texmf-dist/tex/generic/babel/babel.def @@ -39,7 +39,7 @@ \wlog{File: #1 #4 #3 <#2>}% \let\ProvidesFile\@undefined} \fi -\ProvidesFile{babel.def}[2020/07/07 3.46 Babel common definitions] +\ProvidesFile{babel.def}[2020/07/13 3.47 Babel common definitions] \ifx\AtBeginDocument\@undefined % TODO. change test. % == Code for plain == \def\@empty{} @@ -397,8 +397,8 @@ \fi \countdef\last@language=19 % TODO. why? remove? \def\addlanguage{\csname newlanguage\endcsname} -\def\bbl@version{3.46} -\def\bbl@date{2020/07/07} +\def\bbl@version{3.47} +\def\bbl@date{2020/07/13} \def\adddialect#1#2{% \global\chardef#1#2\relax \bbl@usehooks{adddialect}{{#1}{#2}}% @@ -635,18 +635,12 @@ \bbl@id@assign % switch captions, date \ifcase\bbl@select@type - \ifhmode - \hskip\z@skip % trick to ignore spaces + \bbl@bsphack \csname captions#1\endcsname\relax \csname date#1\endcsname\relax - \loop\ifdim\lastskip>\z@\unskip\repeat\unskip - \else - \csname captions#1\endcsname\relax - \csname date#1\endcsname\relax - \fi + \bbl@esphack \else - \ifhmode - \hskip\z@skip % trick to ignore spaces + \bbl@bsphack \bbl@xin@{,captions,}{,\bbl@select@opts,}% \ifin@ \csname captions#1\endcsname\relax @@ -655,17 +649,7 @@ \ifin@ % if \foreign... within \<lang>date \csname date#1\endcsname\relax \fi - \loop\ifdim\lastskip>\z@\unskip\repeat\unskip - \else - \bbl@xin@{,captions,}{,\bbl@select@opts,}% - \ifin@ - \csname captions#1\endcsname\relax - \fi - \bbl@xin@{,date,}{,\bbl@select@opts,}% - \ifin@ - \csname date#1\endcsname\relax - \fi - \fi + \bbl@esphack \fi % switch extras \bbl@usehooks{beforeextras}{}% @@ -865,8 +849,9 @@ \global\@namedef{#2}{\textbf{?#1?}}% \@nameuse{#2}% \bbl@warning{% - \@backslashchar#2 not set. Please, define\\% - it in the preamble with something like:\\% + \@backslashchar#2 not set. Please, define it\\% + after the language has been loaded (typically\\% + in the preamble) with something like:\\% \string\renewcommand\@backslashchar#2{..}\\% Reported}} \def\bbl@tentative{\protect\bbl@tentative@i} @@ -1045,6 +1030,13 @@ \else \@ne \fi +\def\bbl@bsphack{% + \ifhmode + \hskip\z@skip + \def\bbl@esphack{\loop\ifdim\lastskip>\z@\unskip\repeat\unskip}% + \else + \let\bbl@esphack\@empty + \fi} \bbl@trace{Compatibility with language.def} \ifx\bbl@languages\@undefined \ifx\directlua\@undefined @@ -2227,6 +2219,7 @@ % \global\@namedef{bbl@lcname@#2}{#2}% \bbl@id@assign \let\bbl@KVP@captions\@nil + \let\bbl@KVP@date\@nil \let\bbl@KVP@import\@nil \let\bbl@KVP@main\@nil \let\bbl@KVP@script\@nil @@ -2255,7 +2248,7 @@ {\ifx\bbl@initoload\relax \begingroup \def\BabelBeforeIni##1##2{\gdef\bbl@KVP@import{##1}\endinput}% - \bbl@input@ini{#2}% + \bbl@input@texini{#2}% \endgroup \else \xdef\bbl@KVP@import{\bbl@initoload}% @@ -2497,7 +2490,7 @@ \let\BabelBeforeIni\@gobbletwo \chardef\atcatcode=\catcode`\@ \catcode`\@=11\relax - \bbl@input@ini{\bbl@cs{rqtex@\languagename}}% + \bbl@input@texini{\bbl@cs{rqtex@\languagename}}% \catcode`\@=\atcatcode \let\atcatcode\relax \fi}% @@ -2604,7 +2597,7 @@ {\def\BabelBeforeIni##1##2{% \begingroup \catcode`\[=12 \catcode`\]=12 \catcode`\==12 - \catcode`\;=12 \catcode`\|=12 % + \catcode`\;=12 \catcode`\|=12 \catcode`\%=14 \let\bbl@ini@captions@aux\@gobbletwo \def\bbl@inidate ####1.####2.####3.####4\relax ####5####6{}% \bbl@read@ini{##1}0% @@ -2622,7 +2615,7 @@ \endgroup}% \begingroup % boxed, to avoid extra spaces: \ifx\bbl@initoload\relax - \bbl@input@ini{#1}% + \bbl@input@texini{#1}% \else \setbox\z@\hbox{\BabelBeforeIni{\bbl@initoload}{}}% \fi @@ -2666,8 +2659,13 @@ \ifx\bbl@readstream\@undefined \csname newread\endcsname\bbl@readstream \fi -\def\bbl@input@ini#1{% - \bbl@exp{\lowercase{\\\InputIfFileExists{babel-#1.tex}{}{}}}} +\def\bbl@input@texini#1{% + \bbl@bsphack + \bbl@exp{% + \catcode`\\\%=14 + \lowercase{\\\InputIfFileExists{babel-#1.tex}{}{}}% + \catcode`\\\%=\the\catcode`\%\relax}% + \bbl@esphack} \def\bbl@inipreread#1=#2\@@{% \bbl@trim@def\bbl@tempa{#1}% Redundant below !! \bbl@trim\toks@{#2}% @@ -3027,11 +3025,11 @@ \begingroup \bbl@add\bbl@secpost@identification{\closein\bbl@readstream }% \catcode`\[=12 \catcode`\]=12 \catcode`\==12 - \catcode`\;=12 \catcode`\|=12 % + \catcode`\;=12 \catcode`\|=12 \catcode`\%=14 \bbl@read@ini{##1}1% \endinput % babel- .tex may contain onlypreamble's \endgroup}% boxed, to avoid extra spaces: - {\bbl@input@ini{#1}}} + {\bbl@input@texini{#1}}} \def\bbl@buildifcase#1 {% Returns \bbl@tempa, requires \toks@={} \ifx\\#1% % \\ before, in case #1 is multiletter \bbl@exp{% @@ -3095,14 +3093,18 @@ \bbl@foreach\bbl@loaded{{% \def\languagename{##1}% \bbl@ensureinfo{##1}}}} -\newcommand\getlocaleproperty[3]{% +\newcommand\getlocaleproperty{% + \@ifstar\bbl@getproperty@s\bbl@getproperty@x} +\def\bbl@getproperty@s#1#2#3{% \let#1\relax \def\bbl@elt##1##2##3{% \bbl@ifsamestring{##1/##2}{#3}% {\providecommand#1{##3}% \def\bbl@elt####1####2####3{}}% {}}% - \bbl@cs{inidata@#2}% + \bbl@cs{inidata@#2}}% +\def\bbl@getproperty@x#1#2#3{% + \bbl@getproperty@s{#1}{#2}{#3}% \ifx#1\relax \bbl@error {Unknown key for locale '#2':\\% @@ -3182,8 +3184,7 @@ \newif\ifbbl@bcptoname \@namedef{bbl@ADJ@bcp47.toname@on}{% \bbl@bcptonametrue - \BabelEnsureInfo - } + \BabelEnsureInfo} \@namedef{bbl@ADJ@bcp47.toname@off}{% \bbl@bcptonamefalse} \ifx\directlua\@undefined\else |