summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/babel/switch.def
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-04-28 21:20:36 +0000
committerKarl Berry <karl@freefriends.org>2017-04-28 21:20:36 +0000
commitee0045bb26510bf9200dfc2d5b283d0efd3f73fd (patch)
treef704475f1daafcca526825bc1efdf31ec4d0ef7a /Master/texmf-dist/tex/generic/babel/switch.def
parentf293e42154e00d9414a9ed54e00742b27b8c9066 (diff)
babel (28apr17)
git-svn-id: svn://tug.org/texlive/trunk@44101 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/babel/switch.def')
-rw-r--r--Master/texmf-dist/tex/generic/babel/switch.def58
1 files changed, 28 insertions, 30 deletions
diff --git a/Master/texmf-dist/tex/generic/babel/switch.def b/Master/texmf-dist/tex/generic/babel/switch.def
index 3db45b28347..89156b84423 100644
--- a/Master/texmf-dist/tex/generic/babel/switch.def
+++ b/Master/texmf-dist/tex/generic/babel/switch.def
@@ -38,21 +38,21 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'babel.dtx'
-%%\ProvidesFile{babel.dtx}[2016/04/23 v3.9r The Babel package]
+%%\ProvidesFile{babel.dtx}[2017/04/28 v3.9t The Babel package]
%% Babel package for LaTeX2e.
%% Copyright (C) 1989-2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
-%% Copyright (C) 2013-2016 by Johannes Braams
+%% Copyright (C) 2013-2017 by Johannes Braams
%% TeXniek
-%% by Javier Bezos
+%% by Javier Bezos
%% all rights reserved.
\ifx\ProvidesFile\@undefined
\def\ProvidesFile#1[#2 #3 #4]{%
\wlog{File: #1 #4 #3 <#2>}%
\let\ProvidesFile\@undefined}
\fi
-\ProvidesFile{switch.def}[2016/04/23 3.9r Babel switching mechanism]
+\ProvidesFile{switch.def}[2017/04/28 3.9t Babel switching mechanism]
\ifx\AtBeginDocument\@undefined
\input plain.def\relax
\fi
@@ -65,7 +65,7 @@
\global\advance\last@language\@ne
\ifnum\last@language<\@cclvi
\else
- \errmessage{No room for a new \string\language!}%
+ \errmessage{No room for a new \string\language!}%
\fi
\global\chardef#1\last@language
\wlog{\string#1 = \string\language\the\last@language}}
@@ -73,8 +73,8 @@
\countdef\last@language=19
\def\addlanguage{\alloc@9\language\chardef\@cclvi}
\fi
-\def\bbl@version{3.9r}
-\def\bbl@date{2016/04/23}
+\def\bbl@version{3.9t}
+\def\bbl@date{2017/04/28}
\def\adddialect#1#2{%
\global\chardef#1#2\relax
\bbl@usehooks{adddialect}{{#1}{#2}}%
@@ -151,17 +151,12 @@
misspelled its name, it has not been installed,\\%
or you requested it in a previous run. Fix its name,\\%
install it or just rerun the file, respectively}%
- {You may proceed, but expect unexpected results}%
+ {You may proceed, but expect wrong results}%
\else
\let\bbl@select@type\z@
\expandafter\bbl@switch\expandafter{\languagename}%
\fi}}
-\def\select@language@x#1{%
- \ifcase\bbl@select@type
- \bbl@ifsamestring\languagename{#1}{}{\select@language{#1}}%
- \else
- \select@language{#1}%
- \fi}
+\let\select@language@x\select@language
\def\bbl@switch#1{%
\originalTeX
\expandafter\def\expandafter\originalTeX\expandafter{%
@@ -171,8 +166,8 @@
\bbl@usehooks{afterreset}{}%
\languageshorthands{none}%
\ifcase\bbl@select@type
- \csname captions#1\endcsname
- \csname date#1\endcsname
+ \csname captions#1\endcsname\relax
+ \csname date#1\endcsname\relax
\fi
\bbl@usehooks{beforeextras}{}%
\csname extras#1\endcsname\relax
@@ -198,16 +193,6 @@
\expandafter\expandafter\expandafter\set@hyphenmins
\csname #1hyphenmins\endcsname\relax
\fi}
-\def\bbl@ifsamestring#1#2{%
- \protected@edef\bbl@tempb{#1}%
- \edef\bbl@tempb{\expandafter\strip@prefix\meaning\bbl@tempb}%
- \protected@edef\bbl@tempc{#2}%
- \edef\bbl@tempc{\expandafter\strip@prefix\meaning\bbl@tempc}%
- \ifx\bbl@tempb\bbl@tempc
- \expandafter\@firstoftwo
- \else
- \expandafter\@secondoftwo
- \fi}
\long\def\otherlanguage#1{%
\ifnum\bbl@hymapsel=\@cclv\let\bbl@hymapsel\thr@@\fi
\csname selectlanguage \endcsname{#1}%
@@ -232,8 +217,11 @@
\bbl@iflanguage\languagename{%
\expandafter\ifx\csname date\languagename\endcsname\relax
\bbl@warning
- {You haven't loaded the language \languagename\space yet\\%
- I'll proceed, but expect unexpected results.\\%
+ {Unknown language `#1'. Either you have\\%
+ misspelled its name, it has not been installed,\\%
+ or you requested it in a previous run. Fix its name,\\%
+ install it or just rerun the file, respectively.\\%
+ I'll proceed, but expect wrong results.\\%
Reported}%
\fi
\let\bbl@select@type\@ne
@@ -250,9 +238,9 @@
\else
\csname l@#1:\f@encoding\endcsname
\edef\bbl@tempa{#1:\f@encoding}%
- \fi\relax
+ \fi
\@expandtwoargs\bbl@usehooks{patterns}{{#1}{\bbl@tempa}}%
- \@ifundefined{bbl@hyphenation@}{}{%
+ \@ifundefined{bbl@hyphenation@}{}{% Can be \relax!
\begingroup
\@expandtwoargs\in@{,\number\language,}{,\bbl@hyphlist}%
\ifin@\else
@@ -307,6 +295,16 @@
\LdfInit}
\ifx\originalTeX\@undefined\let\originalTeX\@empty\fi
\ifx\babel@beginsave\@undefined\let\babel@beginsave\relax\fi
+\newcommand\setlocale{%
+ \bbl@error
+ {Not yet available}%
+ {Find an armchair, sit down and wait}}
+\let\uselocale\setlocale
+\let\locale\setlocale
+\let\selectlocale\setlocale
+\let\textlocale\setlocale
+\let\textlanguage\setlocale
+\let\languagetext\setlocale
\edef\bbl@nulllanguage{\string\language=0}
\ifx\PackageError\@undefined
\def\bbl@error#1#2{%