summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/babel
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-05-10 21:37:22 +0000
committerKarl Berry <karl@freefriends.org>2018-05-10 21:37:22 +0000
commite019f4d7549ebc1de8ac89fc1e8d48f54dd12fd2 (patch)
treec28f1ecb5fbf898502bd5757f39867ee51f261e5 /Master/texmf-dist/tex/generic/babel
parentd404f60db070829b863601a0c3380fede121558b (diff)
babel (10may18)
git-svn-id: svn://tug.org/texlive/trunk@47664 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/babel')
-rw-r--r--Master/texmf-dist/tex/generic/babel/babel.def7
-rw-r--r--Master/texmf-dist/tex/generic/babel/babel.sty12
-rw-r--r--Master/texmf-dist/tex/generic/babel/hyphen.cfg16
-rw-r--r--Master/texmf-dist/tex/generic/babel/luababel.def12
-rw-r--r--Master/texmf-dist/tex/generic/babel/nil.ldf2
-rw-r--r--Master/texmf-dist/tex/generic/babel/switch.def6
6 files changed, 22 insertions, 33 deletions
diff --git a/Master/texmf-dist/tex/generic/babel/babel.def b/Master/texmf-dist/tex/generic/babel/babel.def
index 4a4e31018df..3896e7f51af 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/05/02 3.20 Babel common definitions]
+\ProvidesFile{babel.def}[2018/05/10 3.21 Babel common definitions]
\ifx\AtBeginDocument\@undefined
\input plain.def\relax
\fi
@@ -720,7 +720,7 @@
\ifin@
\bbl@warning{%
You have more than once selected the attribute '##1'\\%
- for language #1}%
+ for language #1. Reported}%
\else
\bbl@exp{%
\\\bbl@add@list\\\bbl@known@attribs{\bbl@tempc-##1}}%
@@ -1766,7 +1766,8 @@
\fi
\bbl@redefine\markboth#1#2{%
\protected@edef\bbl@tempb##1{%
- \protect\foreignlanguage{\languagename}{\protect\bbl@restore@actives##1}}%
+ \protect\foreignlanguage
+ {\languagename}{\protect\bbl@restore@actives##1}}%
\bbl@ifblank{#1}%
{\toks@{}}%
{\toks@\expandafter{\bbl@tempb{#1}}}%
diff --git a/Master/texmf-dist/tex/generic/babel/babel.sty b/Master/texmf-dist/tex/generic/babel/babel.sty
index defc080ce7d..b6d947b35bb 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/05/02 3.20 The Babel package]
+\ProvidesPackage{babel}[2018/05/10 3.21 The Babel package]
\@ifpackagewith{babel}{debug}
{\providecommand\bbl@trace[1]{\message{^^J[ #1 ]}}%
\let\bbl@debug\@firstofone}
@@ -482,12 +482,10 @@
{Too late for \string\AfterBabelLanguage}%
{Languages have been loaded, so I can do nothing}}
\ifx\bbl@main@language\@undefined
- \bbl@error{%
- You haven't specified a language option}{%
- You need to specify a language, either as a global option\\%
- or as an optional argument to the \string\usepackage\space
- command;\\%
- You shouldn't try to proceed from here, type x to quit.}
+ \bbl@info{%
+ You haven't specified a language. I'll use 'nil'\\%
+ as the main language. Reported}
+ \bbl@load@language{nil}
\fi
\endinput
%%
diff --git a/Master/texmf-dist/tex/generic/babel/hyphen.cfg b/Master/texmf-dist/tex/generic/babel/hyphen.cfg
index 9e4269e11b8..708a5e5da12 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/05/02 3.20 Babel hyphens]
+\ProvidesFile{hyphen.cfg}[2018/05/10 3.21 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.20> and hyphenation patterns for }%
+\toks8{Babel <3.21> and hyphenation patterns for }%
\def\process@line#1#2 #3 #4 {%
\ifx=#1%
\process@synonym{#2}%
@@ -180,18 +180,6 @@
\errhelp{language.dat loads no language, only synonyms}
\errmessage{Orphan language synonym}
\fi
-\advance\last@language\@ne
-\edef\bbl@tempa{%
- \everyjob{%
- \the\everyjob
- \ifx\typeout\@undefined
- \immediate\write16%
- \else
- \noexpand\typeout
- \fi
- {\the\toks8 \the\last@language\space language(s) loaded.}}}
-\advance\last@language\m@ne
-\bbl@tempa
\let\bbl@line\@undefined
\let\process@line\@undefined
\let\process@synonym\@undefined
diff --git a/Master/texmf-dist/tex/generic/babel/luababel.def b/Master/texmf-dist/tex/generic/babel/luababel.def
index 0cfc8ae200c..5fadc9ea054 100644
--- a/Master/texmf-dist/tex/generic/babel/luababel.def
+++ b/Master/texmf-dist/tex/generic/babel/luababel.def
@@ -165,7 +165,7 @@
\bbl@languages
\@ifundefined{bbl@hyphendata@\the\language}%
{\bbl@info{No hyphenation patterns were set for\\%
- language ‘\bbl@tempa’. Reported}}%
+ language '\bbl@tempa'. Reported}}%
{\expandafter\expandafter\expandafter\bbl@luapatterns
\csname bbl@hyphendata@\the\language\endcsname}}{}}
\endinput\fi
@@ -248,7 +248,7 @@
\bbl@languages
\@ifundefined{bbl@hyphendata@\the\language}%
{\bbl@info{No hyphenation patterns were set for\\%
- language ‘#2’. Reported}}%
+ language '#2'. Reported}}%
{\expandafter\expandafter\expandafter\bbl@luapatterns
\csname bbl@hyphendata@\the\language\endcsname}}{}%
\@ifundefined{bbl@patterns@}{}{%
@@ -457,9 +457,11 @@
\edef\bbl@langfeatures{#2,}}}
\bbl@trace{Redefinitions for bidi layout}
\ifx\@eqnnum\@undefined\else
- \edef\@eqnnum{{%
- \unexpanded{\ifcase\bbl@attr@dir\else\bbl@textdir\@ne\fi}%
- \unexpanded\expandafter{\@eqnnum}}}
+ \ifx\bbl@attr@dir\@undefined\else
+ \edef\@eqnnum{{%
+ \unexpanded{\ifcase\bbl@attr@dir\else\bbl@textdir\@ne\fi}%
+ \unexpanded\expandafter{\@eqnnum}}}
+ \fi
\fi
\ifx\bbl@opt@layout\@nnil\endinput\fi % if no layout
\ifx\bbl@beforeforeign\leavevmode % A poor test for bidi=
diff --git a/Master/texmf-dist/tex/generic/babel/nil.ldf b/Master/texmf-dist/tex/generic/babel/nil.ldf
index e6a5aad4c3e..02105baa3da 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/05/02 3.20 Nil language]
+\ProvidesLanguage{nil}[2018/05/10 3.21 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 ba84053fe3e..2d8ffc05430 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/05/02 3.20 Babel switching mechanism]
+\ProvidesFile{switch.def}[2018/05/10 3.21 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.20}
-\def\bbl@date{2018/05/02}
+\def\bbl@version{3.21}
+\def\bbl@date{2018/05/10}
\def\adddialect#1#2{%
\global\chardef#1#2\relax
\bbl@usehooks{adddialect}{{#1}{#2}}%