summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-10-19 20:45:24 +0000
committerKarl Berry <karl@freefriends.org>2021-10-19 20:45:24 +0000
commitd11aca7e491df85caaa8039770d1c5bc6aceed3c (patch)
tree40b1bc2c05c6a937ec5a80164dc5eca0cabd95ef /Master/texmf-dist/tex
parentfb0a85aa8509302ec094d735f114d0337604b70f (diff)
babel (19oct21)
git-svn-id: svn://tug.org/texlive/trunk@60805 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/generic/babel/babel.def6
-rw-r--r--Master/texmf-dist/tex/generic/babel/babel.sty174
-rw-r--r--Master/texmf-dist/tex/generic/babel/hyphen.cfg6
-rw-r--r--Master/texmf-dist/tex/generic/babel/nil.ldf2
4 files changed, 107 insertions, 81 deletions
diff --git a/Master/texmf-dist/tex/generic/babel/babel.def b/Master/texmf-dist/tex/generic/babel/babel.def
index a2d1dcefeec..3559fa4cbf0 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}[2021/10/13 3.64 Babel common definitions]
+\ProvidesFile{babel.def}[2021/10/19 3.65 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.64}
-\def\bbl@date{2021/10/13}
+\def\bbl@version{3.65}
+\def\bbl@date{2021/10/19}
\ifx\language\@undefined
\csname newcount\endcsname\language
\fi
diff --git a/Master/texmf-dist/tex/generic/babel/babel.sty b/Master/texmf-dist/tex/generic/babel/babel.sty
index 227f72a92b3..82eba26afc1 100644
--- a/Master/texmf-dist/tex/generic/babel/babel.sty
+++ b/Master/texmf-dist/tex/generic/babel/babel.sty
@@ -34,7 +34,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
-\ProvidesPackage{babel}[2021/10/13 3.64 The Babel package]
+\ProvidesPackage{babel}[2021/10/19 3.65 The Babel package]
\@ifpackagewith{babel}{debug}
{\providecommand\bbl@trace[1]{\message{^^J[ #1 ]}}%
\let\bbl@debug\@firstofone
@@ -390,11 +390,7 @@
\ifin@
\expandafter\bbl@tempa\CurrentOption\bbl@tempa
\else
- \bbl@xin@{,\CurrentOption,}{,\bbl@language@opts,}%
- \ifin@
- \bbl@exp{\\\bbl@replace\\\bbl@language@opts{,\CurrentOption,}{}}%
- \fi
- \edef\bbl@language@opts{\bbl@language@opts,\CurrentOption,}
+ \bbl@add@list\bbl@language@opts{\CurrentOption}%
\fi}
\ProcessOptions*
\ifx\bbl@opt@provide\@nnil
@@ -446,7 +442,9 @@
\def\bbl@opt@safe{BR}
\fi
\ifx\bbl@opt@main\@nnil\else
- \edef\bbl@language@opts{\bbl@language@opts,\bbl@opt@main,}
+ \edef\bbl@language@opts{%
+ \ifx\bbl@language@opts\@empty\else\bbl@language@opts,\fi
+ \bbl@opt@main}
\fi
\bbl@trace{Defining IfBabelLayout}
\ifx\bbl@opt@layout\@nnil
@@ -460,8 +458,8 @@
\expandafter\@secondoftwo
\fi}
\fi
-\def\bbl@version{3.64}
-\def\bbl@date{2021/10/13}
+\def\bbl@version{3.65}
+\def\bbl@date{2021/10/19}
\ifx\language\@undefined
\csname newcount\endcsname\language
\fi
@@ -4174,55 +4172,79 @@
Local config file '\bbl@opt@config.cfg' not found}{%
Perhaps you misspelled it.}}%
\fi
-\let\bbl@elt\relax
-\let\bbl@tempe\@empty
+\let\bbl@tempc\relax
+\bbl@foreach\bbl@language@opts{%
+ \ifcase\bbl@iniflag % Default
+ \bbl@ifunset{ds@#1}%
+ {\DeclareOption{#1}{\bbl@load@language{#1}}}%
+ {}%
+ \or % provide=*
+ \@gobble % case 2 same as 1
+ \or % provide+=*
+ \bbl@ifunset{ds@#1}%
+ {\IfFileExists{#1.ldf}{}%
+ {\IfFileExists{babel-#1.tex}{}{\@namedef{ds@#1}{}}}}%
+ {}%
+ \bbl@ifunset{ds@#1}%
+ {\def\bbl@tempc{#1}%
+ \DeclareOption{#1}{%
+ \ifnum\bbl@iniflag>\@ne
+ \bbl@ldfinit
+ \babelprovide[import]{#1}%
+ \bbl@afterldf{}%
+ \else
+ \bbl@load@language{#1}%
+ \fi}}%
+ {}%
+ \or % provide*=*
+ \def\bbl@tempc{#1}%
+ \bbl@ifunset{ds@#1}%
+ {\DeclareOption{#1}{%
+ \bbl@ldfinit
+ \babelprovide[import]{#1}%
+ \bbl@afterldf{}}}%
+ {}%
+ \fi}
+\let\bbl@tempb\@nnil
+\let\bbl@clsoptlst\@classoptionslist
\bbl@foreach\@classoptionslist{%
- \bbl@xin@{,#1,$}{\bbl@language@opts$}% Match last
- \ifin@\else
- \bbl@xin@{,#1,}{\bbl@language@opts}% Match non-last
- \ifin@
- \bbl@replace\bbl@language@opts{,#1,}{,,}%
- \edef\bbl@tempe{\bbl@tempe\bbl@elt{3}{#1}}%
+ \bbl@ifunset{ds@#1}%
+ {\IfFileExists{#1.ldf}%
+ {\def\bbl@tempb{#1}%
+ \DeclareOption{#1}{%
+ \ifnum\bbl@iniflag>\@ne
+ \bbl@ldfinit
+ \babelprovide[import]{#1}%
+ \bbl@afterldf{}%
+ \else
+ \bbl@load@language{#1}%
+ \fi}}%
+ {\IfFileExists{babel-#1.tex}%
+ {\def\bbl@tempb{#1}%
+ \ifnum\bbl@iniflag>\z@
+ \DeclareOption{#1}{%
+ \ifnum\bbl@iniflag>\@ne
+ \bbl@ldfinit
+ \babelprovide[import]{#1}%
+ \bbl@afterldf{}%
+ \fi}%
+ \fi}%
+ {}}}%
+ {}}
+\ifnum\bbl@iniflag=\z@\else
+ \ifx\bbl@opt@main\@nnil
+ \ifx\bbl@tempc\relax
+ \let\bbl@opt@main\bbl@tempb
\else
- \babel@savecnt\z@ % Use as temp
- \ifnum\bbl@iniflag<\thr@@ % Optimization: 3 = always ini
- \IfFileExists{#1.ldf}{\advance\babel@savecnt\@ne}{}%
- \fi
- \ifnum\bbl@iniflag>\z@ % Optimization: 0 = always ldf
- \IfFileExists{babel-#1.tex}{\advance\babel@savecnt\tw@}{}%
- \fi
- \ifnum\babel@savecnt>\z@
- \edef\bbl@tempe{\bbl@tempe\bbl@elt{\the\babel@savecnt}{#1}}%
- \fi
- \fi
- \fi}
-\let\bbl@savemain\@empty
-\bbl@foreach\bbl@language@opts{%
- \edef\bbl@tempe{\bbl@tempe\bbl@elt{3}{#1}}}
-\def\bbl@elt#1#2#3{%
- \ifx#3\relax % if last
- \bbl@ifunset{ds@#2}{}%
- {\bbl@exp{\def\\\bbl@savemain{\\\DeclareOption{#2}{\[ds@#2]}}}}%
- \bbl@add\bbl@savemain{\bbl@elt{#1}{#2}}% Save main
- \DeclareOption{#2}{}%
- \else
- \ifnum\bbl@iniflag<\tw@ % other as ldf
- \ifodd#1\relax % Class: if ldf exists 1,3. Package: always 3
- \bbl@ifunset{ds@#2}%
- {\DeclareOption{#2}{\bbl@load@language{#2}}}%
- {}%
- \fi
- \else % other as ini
- \ifnum#1>\@ne % % Class: if ini exists 2,3. Package: always 3
- \DeclareOption{#2}{%
- \bbl@ldfinit
- \babelprovide[import]{#2}%
- \bbl@afterldf{}}%
- \fi
+ \let\bbl@opt@main\bbl@tempc
\fi
\fi
- #3}
-\bbl@tempe\relax % \relax catches last
+\fi
+\ifx\bbl@opt@main\@nnil\else
+ \expandafter
+ \let\expandafter\bbl@loadmain\csname ds@\bbl@opt@main\endcsname
+ \expandafter\let\csname ds@\bbl@opt@main\endcsname\@empty
+\fi
\def\AfterBabelLanguage#1{%
\bbl@ifsamestring\CurrentOption{#1}{\global\bbl@add\bbl@afterlang}{}}
\DeclareOption*{}
@@ -4244,27 +4266,31 @@
and a package option. Use 'main=\bbl@tempc' as\\%
option. Reported}%
\fi
-\fi
-\def\bbl@elt#1#2{% main
- \ifodd\bbl@iniflag % as ini = 1(=), 3(*=)
- \ifnum#1>\@ne % % Class: if ini exists 2,3. Package: always 3
- \def\CurrentOption{#2}% Directly, because luatexbase
- \bbl@ldfinit
- \babelprovide[\bbl@opt@provide,main,import]{#2}%
- \bbl@afterldf{}%
- \DeclareOption{#2}{}%
- \fi
- \else % as ldf = 0(no), 2(+=)
- \ifodd#1\relax % Class: if ldf exists 1,3. Package: always 3
- \bbl@ifunset{ds@#2}%
- {\DeclareOption{#2}{\bbl@load@language{#2}}}%
- {}%
- \ExecuteOptions{#2}%
+\else
+ \ifodd\bbl@iniflag % case 1,3
+ \bbl@ldfinit
+ \let\CurrentOption\bbl@opt@main
+ \ifx\bbl@opt@provide\@nnil
+ \bbl@exp{\\\babelprovide[import,main]{\bbl@opt@main}}%
+ \else
+ \bbl@exp{\\\bbl@forkv{\@nameuse{@raw@opt@babel.sty}}}{%
+ \bbl@xin@{,provide,}{,#1,}%
+ \ifin@
+ \def\bbl@opt@provide{#2}%
+ \bbl@replace\bbl@opt@provide{;}{,}%
+ \fi}%
+ \bbl@exp{%
+ \\\babelprovide[\bbl@opt@provide,import,main]{\bbl@opt@main}}%
\fi
- \fi}
-\bbl@savemain
-\DeclareOption*{}%
-\ProcessOptions*
+ \bbl@afterldf{}%
+ \else % case 0,2
+ \chardef\bbl@iniflag\z@ % Force ldf
+ \expandafter\let\csname ds@\bbl@opt@main\endcsname\bbl@loadmain
+ \ExecuteOptions{\bbl@opt@main}
+ \DeclareOption*{}%
+ \ProcessOptions*
+ \fi
+\fi
\def\AfterBabelLanguage{%
\bbl@error
{Too late for \string\AfterBabelLanguage}%
diff --git a/Master/texmf-dist/tex/generic/babel/hyphen.cfg b/Master/texmf-dist/tex/generic/babel/hyphen.cfg
index 9fdd99688a1..511b5df08d5 100644
--- a/Master/texmf-dist/tex/generic/babel/hyphen.cfg
+++ b/Master/texmf-dist/tex/generic/babel/hyphen.cfg
@@ -38,10 +38,10 @@
\wlog{File: #1 #4 #3 <#2>}%
\let\ProvidesFile\@undefined}
\fi
-\ProvidesFile{hyphen.cfg}[2021/10/13 3.64 Babel hyphens]
+\ProvidesFile{hyphen.cfg}[2021/10/19 3.65 Babel hyphens]
\xdef\bbl@format{\jobname}
-\def\bbl@version{3.64}
-\def\bbl@date{2021/10/13}
+\def\bbl@version{3.65}
+\def\bbl@date{2021/10/19}
\ifx\AtBeginDocument\@undefined
\def\@empty{}
\fi
diff --git a/Master/texmf-dist/tex/generic/babel/nil.ldf b/Master/texmf-dist/tex/generic/babel/nil.ldf
index 64b70e70fc4..42fced5f3c7 100644
--- a/Master/texmf-dist/tex/generic/babel/nil.ldf
+++ b/Master/texmf-dist/tex/generic/babel/nil.ldf
@@ -33,7 +33,7 @@
%% extension |.ins|) which are part of the distribution.
%%
-\ProvidesLanguage{nil}[2021/10/13 3.64 Nil language]
+\ProvidesLanguage{nil}[2021/10/19 3.65 Nil language]
\LdfInit{nil}{datenil}
\ifx\l@nil\@undefined
\newlanguage\l@nil