summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-01-25 21:53:06 +0000
committerKarl Berry <karl@freefriends.org>2018-01-25 21:53:06 +0000
commita3e963986c05c9ecf0db84a955d3070a84c5531c (patch)
tree9b40d99b5d2424b4f5a59db3e95f07a42bd920a6 /Master/texmf-dist/tex/generic
parentc2dfda6f7aa376ebc4e36c34a97e49dc5125fab7 (diff)
babel (25jan18)
git-svn-id: svn://tug.org/texlive/trunk@46442 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic')
-rw-r--r--Master/texmf-dist/tex/generic/babel/babel.def2
-rw-r--r--Master/texmf-dist/tex/generic/babel/babel.sty2
-rw-r--r--Master/texmf-dist/tex/generic/babel/hyphen.cfg4
-rw-r--r--Master/texmf-dist/tex/generic/babel/luababel.def61
-rw-r--r--Master/texmf-dist/tex/generic/babel/nil.ldf2
-rw-r--r--Master/texmf-dist/tex/generic/babel/switch.def8
-rw-r--r--Master/texmf-dist/tex/generic/babel/txtbabel.def80
7 files changed, 143 insertions, 16 deletions
diff --git a/Master/texmf-dist/tex/generic/babel/babel.def b/Master/texmf-dist/tex/generic/babel/babel.def
index 81f324c8fba..1d6c7c725d5 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}[2018/01/04 3.16 Babel common definitions]
+\ProvidesFile{babel.def}[2018/01/24 3.17 Babel common definitions]
\ifx\AtBeginDocument\@undefined
\input plain.def\relax
\fi
diff --git a/Master/texmf-dist/tex/generic/babel/babel.sty b/Master/texmf-dist/tex/generic/babel/babel.sty
index bd3fe93537c..b95260eb477 100644
--- a/Master/texmf-dist/tex/generic/babel/babel.sty
+++ b/Master/texmf-dist/tex/generic/babel/babel.sty
@@ -32,7 +32,7 @@
%% extension |.ins|) which are part of the distribution.
%%
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
-\ProvidesPackage{babel}[2018/01/04 3.16 The Babel package]
+\ProvidesPackage{babel}[2018/01/24 3.17 The Babel package]
\@ifpackagewith{babel}{debug}
{\let\bbl@debug\@firstofone}
{\let\bbl@debug\@gobble}
diff --git a/Master/texmf-dist/tex/generic/babel/hyphen.cfg b/Master/texmf-dist/tex/generic/babel/hyphen.cfg
index 6205a7080df..98d4fa97d73 100644
--- a/Master/texmf-dist/tex/generic/babel/hyphen.cfg
+++ b/Master/texmf-dist/tex/generic/babel/hyphen.cfg
@@ -36,7 +36,7 @@
\wlog{File: #1 #4 #3 <#2>}%
\let\ProvidesFile\@undefined}
\fi
-\ProvidesFile{hyphen.cfg}[2018/01/04 3.16 Babel hyphens]
+\ProvidesFile{hyphen.cfg}[2018/01/24 3.17 Babel hyphens]
\xdef\bbl@format{\jobname}
\ifx\AtBeginDocument\@undefined
\def\@empty{}
@@ -67,7 +67,7 @@
\countdef\last@language=19
\def\addlanguage{\alloc@9\language\chardef\@cclvi}
\fi
-\toks8{Babel <3.16> and hyphenation patterns for }%
+\toks8{Babel <3.17> and hyphenation patterns for }%
\def\process@line#1#2 #3 #4 {%
\ifx=#1%
\process@synonym{#2}%
diff --git a/Master/texmf-dist/tex/generic/babel/luababel.def b/Master/texmf-dist/tex/generic/babel/luababel.def
index 29da71ddf77..7e09edcd9d8 100644
--- a/Master/texmf-dist/tex/generic/babel/luababel.def
+++ b/Master/texmf-dist/tex/generic/babel/luababel.def
@@ -486,16 +486,69 @@
\fi
\ignorespaces}}
{}
-\IfBabelLayout{counters}% Global or language dependent? At begin doc?
- {\let\bbl@latinarabic=\@arabic
+\IfBabelLayout{counters}%
+ {\def\@textsuperscript#1{{% lua has separate settings for math
+ \m@th
+ \mathdir\pagedir % required with basic-r; ok with default, too
+ \ensuremath {^{\mbox {\fontsize \sf@size \z@ #1}}}}}%
+ \let\bbl@latinarabic=\@arabic
\def\@arabic#1{\babelsublr{\bbl@latinarabic#1}}%
- \@ifpackagewith{babel}{bidi=default}
+ \@ifpackagewith{babel}{bidi=default}%
{\let\bbl@asciiroman=\@roman
\def\@roman#1{\babelsublr{\ensureascii{\bbl@asciiroman#1}}}%
\let\bbl@asciiRoman=\@Roman
\def\@Roman#1{\babelsublr{\ensureascii{\bbl@asciiRoman#1}}}%
\def\labelenumii{)\theenumii(}%
- \def\p@enumiii{\p@enumii)\theenumii(}}}{}
+ \def\p@enumiii{\p@enumii)\theenumii(}}{}}{}
+\ifx\bbl@beforeforeign\leavevmode
+ \def\bbl@footnote#1#2#3{%
+ \@ifnextchar[%
+ {\bbl@footnote@o{#1}{#2}{#3}}%
+ {\bbl@footnote@x{#1}{#2}{#3}}}
+ \def\bbl@footnote@x#1#2#3#4{%
+ \bgroup
+ \select@language@x{\bbl@main@language}%
+ \bbl@fn@footnote{#2#1{\ignorespaces#4}#3}%
+ \egroup}
+ \def\bbl@footnote@o#1#2#3[#4]#5{%
+ \bgroup
+ \select@language@x{\bbl@main@language}%
+ \bbl@fn@footnote[#4]{#2#1{\ignorespaces#5}#3}%
+ \egroup}
+ \def\bbl@footnotetext#1#2#3{%
+ \@ifnextchar[%
+ {\bbl@footnotetext@o{#1}{#2}{#3}}%
+ {\bbl@footnotetext@x{#1}{#2}{#3}}}
+ \def\bbl@footnotetext@x#1#2#3#4{%
+ \bgroup
+ \select@language@x{\bbl@main@language}%
+ \bbl@fn@footnotetext{#2#1{\ignorespaces#4}#3}%
+ \egroup}
+ \def\bbl@footnotetext@o#1#2#3[#4]#5{%
+ \bgroup
+ \select@language@x{\bbl@main@language}%
+ \bbl@fn@footnotetext[#4]{#2#1{\ignorespaces#5}#3}%
+ \egroup}
+ \def\BabelFootnote#1#2#3#4{%
+ \ifx\bbl@fn@footnote\@undefined
+ \let\bbl@fn@footnote\footnote
+ \fi
+ \ifx\bbl@fn@footnotetext\@undefined
+ \let\bbl@fn@footnotetext\footnotetext
+ \fi
+ \bbl@ifblank{#2}%
+ {\def#1{\bbl@footnote{\@firstofone}{#3}{#4}}
+ \@namedef{\bbl@stripslash#1text}%
+ {\bbl@footnotetext{\@firstofone}{#3}{#4}}}%
+ {\def#1{\bbl@exp{\\\bbl@footnote{\\\foreignlanguage{#2}}}{#3}{#4}}%
+ \@namedef{\bbl@stripslash#1text}%
+ {\bbl@exp{\\\bbl@footnotetext{\\\foreignlanguage{#2}}}{#3}{#4}}}}
+\fi
+\IfBabelLayout{footnotes}%
+ {\BabelFootnote\footnote\languagename{}{}%
+ \BabelFootnote\localfootnote\languagename{}{}%
+ \BabelFootnote\mainfootnote{}{}{}}
+ {}
\endinput
%%
%% End of file `luababel.def'.
diff --git a/Master/texmf-dist/tex/generic/babel/nil.ldf b/Master/texmf-dist/tex/generic/babel/nil.ldf
index 8e69ddf22ee..f11e9b3820b 100644
--- a/Master/texmf-dist/tex/generic/babel/nil.ldf
+++ b/Master/texmf-dist/tex/generic/babel/nil.ldf
@@ -31,7 +31,7 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension |.ins|) which are part of the distribution.
%%
-\ProvidesLanguage{nil}[2018/01/04 3.16 Nil language]
+\ProvidesLanguage{nil}[2018/01/24 3.17 Nil language]
\LdfInit{nil}{datenil}
\ifx\l@nohyphenation\@undefined
\@nopatterns{nil}
diff --git a/Master/texmf-dist/tex/generic/babel/switch.def b/Master/texmf-dist/tex/generic/babel/switch.def
index 54d03e1c6b5..501e9d932c4 100644
--- a/Master/texmf-dist/tex/generic/babel/switch.def
+++ b/Master/texmf-dist/tex/generic/babel/switch.def
@@ -36,7 +36,7 @@
\wlog{File: #1 #4 #3 <#2>}%
\let\ProvidesFile\@undefined}
\fi
-\ProvidesFile{switch.def}[2018/01/04 3.16 Babel switching mechanism]
+\ProvidesFile{switch.def}[2018/01/24 3.17 Babel switching mechanism]
\ifx\AtBeginDocument\@undefined
\input plain.def\relax
\fi
@@ -57,8 +57,8 @@
\countdef\last@language=19
\def\addlanguage{\alloc@9\language\chardef\@cclvi}
\fi
-\def\bbl@version{3.16}
-\def\bbl@date{2018/01/04}
+\def\bbl@version{3.17}
+\def\bbl@date{2018/01/24}
\def\adddialect#1#2{%
\global\chardef#1#2\relax
\bbl@usehooks{adddialect}{{#1}{#2}}%
@@ -211,7 +211,7 @@
\ifnum\bbl@hymapsel=\@cclv\chardef\bbl@hymapsel4\relax\fi
\foreign@language{#1}}
\expandafter\let\csname endotherlanguage*\endcsname\relax
-\let\bbl@beforeforeign\@empty
+\providecommand\bbl@beforeforeign{}
\edef\foreignlanguage{%
\noexpand\protect
\expandafter\noexpand\csname foreignlanguage \endcsname}
diff --git a/Master/texmf-dist/tex/generic/babel/txtbabel.def b/Master/texmf-dist/tex/generic/babel/txtbabel.def
index c4c5f582f3b..9e547703fc0 100644
--- a/Master/texmf-dist/tex/generic/babel/txtbabel.def
+++ b/Master/texmf-dist/tex/generic/babel/txtbabel.def
@@ -77,8 +77,33 @@
\ifcase\bbl@thepardir\leftmargin\else\rightmargin\fi
\parshape\@ne\@totalleftmargin\linewidth
\ignorespaces}%
- \def\labelenumii{)\theenumii(}%
- \def\p@enumiii{\p@enumii)\theenumii(}}
+ \ifcase\bbl@engine
+ \def\labelenumii{)\theenumii(}%
+ \def\p@enumiii{\p@enumii)\theenumii(}%
+ \fi
+ \def\@verbatim{%
+ \trivlist \item\relax
+ \if@minipage\else\vskip\parskip\fi
+ \bbl@startskip\textwidth
+ \advance\bbl@startskip-\linewidth
+ \bbl@endskip\z@skip
+ \parindent\z@
+ \parfillskip\@flushglue
+ \parskip\z@skip
+ \@@par
+ \language\l@nohyphenation
+ \@tempswafalse
+ \def\par{%
+ \if@tempswa
+ \leavevmode\null
+ \@@par\penalty\interlinepenalty
+ \else
+ \@tempswatrue
+ \ifhmode\@@par\penalty\interlinepenalty\fi
+ \fi}%
+ \let\do\@makeother \dospecials
+ \obeylines \verbatim@font \@noligs
+ \everypar\expandafter{\the\everypar\unpenalty}}}
{}
\IfBabelLayout{contents}
{\def\@dottedtocline#1#2#3#4#5{%
@@ -146,7 +171,56 @@
\endgroup
\fi}}%
{}
-\IfBabelLayout{counters}% Global or language dependent? At begin doc?
+\ifx\bbl@beforeforeign\leavevmode
+ \def\bbl@footnote#1#2#3{%
+ \@ifnextchar[%
+ {\bbl@footnote@o{#1}{#2}{#3}}%
+ {\bbl@footnote@x{#1}{#2}{#3}}}
+ \def\bbl@footnote@x#1#2#3#4{%
+ \bgroup
+ \select@language@x{\bbl@main@language}%
+ \bbl@fn@footnote{#2#1{\ignorespaces#4}#3}%
+ \egroup}
+ \def\bbl@footnote@o#1#2#3[#4]#5{%
+ \bgroup
+ \select@language@x{\bbl@main@language}%
+ \bbl@fn@footnote[#4]{#2#1{\ignorespaces#5}#3}%
+ \egroup}
+ \def\bbl@footnotetext#1#2#3{%
+ \@ifnextchar[%
+ {\bbl@footnotetext@o{#1}{#2}{#3}}%
+ {\bbl@footnotetext@x{#1}{#2}{#3}}}
+ \def\bbl@footnotetext@x#1#2#3#4{%
+ \bgroup
+ \select@language@x{\bbl@main@language}%
+ \bbl@fn@footnotetext{#2#1{\ignorespaces#4}#3}%
+ \egroup}
+ \def\bbl@footnotetext@o#1#2#3[#4]#5{%
+ \bgroup
+ \select@language@x{\bbl@main@language}%
+ \bbl@fn@footnotetext[#4]{#2#1{\ignorespaces#5}#3}%
+ \egroup}
+ \def\BabelFootnote#1#2#3#4{%
+ \ifx\bbl@fn@footnote\@undefined
+ \let\bbl@fn@footnote\footnote
+ \fi
+ \ifx\bbl@fn@footnotetext\@undefined
+ \let\bbl@fn@footnotetext\footnotetext
+ \fi
+ \bbl@ifblank{#2}%
+ {\def#1{\bbl@footnote{\@firstofone}{#3}{#4}}
+ \@namedef{\bbl@stripslash#1text}%
+ {\bbl@footnotetext{\@firstofone}{#3}{#4}}}%
+ {\def#1{\bbl@exp{\\\bbl@footnote{\\\foreignlanguage{#2}}}{#3}{#4}}%
+ \@namedef{\bbl@stripslash#1text}%
+ {\bbl@exp{\\\bbl@footnotetext{\\\foreignlanguage{#2}}}{#3}{#4}}}}
+\fi
+\IfBabelLayout{footnotes}%
+ {\BabelFootnote\footnote\languagename{}{}%
+ \BabelFootnote\localfootnote\languagename{}{}%
+ \BabelFootnote\mainfootnote{}{}{}}
+ {}
+\IfBabelLayout{counters}%
{\let\bbl@latinarabic=\@arabic
\def\@arabic#1{\babelsublr{\bbl@latinarabic#1}}%
\let\bbl@asciiroman=\@roman