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.def74
1 files changed, 27 insertions, 47 deletions
diff --git a/Master/texmf-dist/tex/generic/babel/babel.def b/Master/texmf-dist/tex/generic/babel/babel.def
index 0d7a3c40075..e50195a5835 100644
--- a/Master/texmf-dist/tex/generic/babel/babel.def
+++ b/Master/texmf-dist/tex/generic/babel/babel.def
@@ -40,7 +40,7 @@
\wlog{File: #1 #4 #3 <#2>}%
\let\ProvidesFile\@undefined}
\fi
-\ProvidesFile{babel.def}[2022/10/23 3.82 Babel common definitions]
+\ProvidesFile{babel.def}[2022/11/30 3.83 Babel common definitions]
\ifx\AtBeginDocument\@undefined % TODO. change test.
\def\@empty{}
\def\loadlocalcfg#1{%
@@ -406,8 +406,8 @@
\expandafter\newif\csname ifbbl@single\endcsname
\chardef\bbl@bidimode\z@
\fi
-\def\bbl@version{3.82}
-\def\bbl@date{2022/10/23}
+\def\bbl@version{3.83}
+\def\bbl@date{2022/11/30}
\ifx\language\@undefined
\csname newcount\endcsname\language
\fi
@@ -1896,48 +1896,25 @@
{\bbl@tolower\@empty}{\bbl@toupper\@empty}}%
\gdef\bbl@tolower{\csname\languagename @bbl@lc\endcsname}%
\gdef\bbl@toupper{\csname\languagename @bbl@uc\endcsname}}}
-\ifx\BabelCaseHack\@undefined
-\AtBeginDocument{%
- \bbl@xin@{\string\@uclclist}%
- {\bbl@carg\meaning{MakeUppercase }}%
- \ifin@\else
- \chardef\bbl@ulflag\z@
- \bbl@ncarg\let\bbl@newuc{MakeUppercase }%
- \protected\@namedef{MakeUppercase }#1{{%
- \chardef\bbl@ulflag\@ne
- \ifx\bbl@uclc\@undefined
- \bbl@newuc{#1}%
- \else
- \bbl@ifunset{\languagename @bbl@uclc}%
- {\bbl@newuc{#1}}%
- {\def\reserved@a##1##2{\let##1##2\reserved@a}%
- \bbl@uclc\reserved@a\reserved@b{\reserved@b\@gobble}%
- \protected@edef\reserved@a{\bbl@newuc{#1}}% Pre-expand
- \reserved@a}%
- \fi}}%
- \bbl@ncarg\let\bbl@newlc{MakeLowercase }%
- \protected\@namedef{MakeLowercase }#1{{%
- \chardef\bbl@ulflag\tw@
- \ifx\bbl@uclc\@undefined
- \bbl@newlc{#1}%
- \else
- \bbl@ifunset{\languagename @bbl@uclc}%
- {\bbl@newlc{#1}}%
- {\def\reserved@a##1##2{\let##2##1\reserved@a}%
- \bbl@uclc\reserved@a\reserved@b{\reserved@b\@gobble}%
- \protected@edef\reserved@a{\bbl@newlc{#1}}% Pre-expand
- \reserved@a}%
- \fi}}%
- \def\bbl@cased{%
- \ifcase\bbl@ulflag
- \expandafter\@firstofone
- \or
- \expandafter\MakeUppercase
- \or
- \expandafter\MakeLowercase
- \fi}%
- \fi}
-\fi
+\def\BabelRestoreCase{%
+ \DeclareRobustCommand{\MakeUppercase}[1]{{%
+ \def\reserved@a####1####2{\let####1####2\reserved@a}%
+ \def\i{I}\def\j{J}%
+ \expandafter\reserved@a\@uclclist\reserved@b{\reserved@b\@gobble}%
+ \let\UTF@two@octets@noexpand\@empty
+ \let\UTF@three@octets@noexpand\@empty
+ \let\UTF@four@octets@noexpand\@empty
+ \protected@edef\reserved@a{\uppercase{##1}}%
+ \reserved@a
+ }}%
+ \DeclareRobustCommand{\MakeLowercase}[1]{{%
+ \def\reserved@a####1####2{\let####2####1\reserved@a}%
+ \expandafter\reserved@a\@uclclist\reserved@b{\reserved@b\@gobble}%
+ \let\UTF@two@octets@noexpand\@empty
+ \let\UTF@three@octets@noexpand\@empty
+ \let\UTF@four@octets@noexpand\@empty
+ \protected@edef\reserved@a{\lowercase{##1}}%
+ \reserved@a}}}
\@onlypreamble\StartBabelCommands
\def\StartBabelCommands{%
\begingroup
@@ -3264,8 +3241,11 @@
\fi
\bbl@xin@{,\bbl@tempa,}{,figure,table,}%
\ifin@
- \toks@\expandafter{\bbl@toreplace}%
- \bbl@exp{\gdef\<fnum@\bbl@tempa>{\the\toks@}}%
+ \global\bbl@csarg\let{\bbl@tempa fmt@#2}\bbl@toreplace
+ \bbl@exp{\gdef\<fnum@\bbl@tempa>{%
+ \\\bbl@ifunset{bbl@\bbl@tempa fmt@\\\languagename}%
+ {\[fnum@\bbl@tempa]}%
+ {\\\@nameuse{bbl@\bbl@tempa fmt@\\\languagename}}}}%
\fi}
\def\bbl@ini@captions@aux#1#2{%
\bbl@trim@def\bbl@tempa{#1}%