summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/babel/switch.def
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-10-12 22:48:28 +0000
committerKarl Berry <karl@freefriends.org>2013-10-12 22:48:28 +0000
commit246b5665edc2af75b55662b748e9ad83f3dac101 (patch)
treeee34732675812d84422a6593f588e528e3d6fdf2 /Master/texmf-dist/tex/generic/babel/switch.def
parent0ec188e4bda5bbce1ca6bb39f8e121f7c47d0adf (diff)
babel (12oct13)
git-svn-id: svn://tug.org/texlive/trunk@31886 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.def60
1 files changed, 38 insertions, 22 deletions
diff --git a/Master/texmf-dist/tex/generic/babel/switch.def b/Master/texmf-dist/tex/generic/babel/switch.def
index b56bd93ef6e..4c29ac1367d 100644
--- a/Master/texmf-dist/tex/generic/babel/switch.def
+++ b/Master/texmf-dist/tex/generic/babel/switch.def
@@ -38,7 +38,7 @@
%% 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}[2013/05/16 v3.9f The Babel package]
+%%\ProvidesFile{babel.dtx}[2013/10/10 v3.9g The Babel package]
%% Babel package for LaTeX2e.
%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
@@ -47,31 +47,12 @@
%% TeXniek
%% by Javier Bezos
%% all rights reserved.
-\def\bbl@version{3.9f}
-\def\bbl@date{2013/05/16}
\ifx\ProvidesFile\@undefined
\def\ProvidesFile#1[#2 #3 #4]{%
\wlog{File: #1 #4 #3 <#2>}%
- \let\ProvidesFile\@undefined
- }
- \def\ProvidesLanguage#1[#2 #3 #4]{%
- \wlog{Language: #1 #4 #3 <#2>}%
- }
-\else
- \def\ProvidesLanguage#1{%
- \begingroup
- \catcode`\ 10 %
- \@makeother\/%
- \@ifnextchar[%]
- {\@provideslanguage{#1}}{\@provideslanguage{#1}[]}}
- \def\@provideslanguage#1[#2]{%
- \wlog{Language: #1 #2}%
- \expandafter\xdef\csname ver@#1.ldf\endcsname{#2}%
- \endgroup}
+ \let\ProvidesFile\@undefined}
\fi
-\ProvidesFile{switch.def}
- [2013/05/16 v3.9f %
- Babel language switching mechanism]
+\ProvidesFile{switch.def}[2013/10/10 3.9g Babel switching mechanism]
\ifx\AtBeginDocument\@undefined
\input plain.def\relax
\fi
@@ -92,6 +73,8 @@
\countdef\last@language=19
\def\addlanguage{\alloc@9\language\chardef\@cclvi}
\fi
+\def\bbl@version{3.9g}
+\def\bbl@date{2013/10/10}
\def\adddialect#1#2{%
\global\chardef#1#2\relax
\bbl@usehooks{adddialect}{{#1}{#2}}%
@@ -139,6 +122,7 @@
\expandafter\bbl@pop@lang\bbl@language@stack-\bbl@language@stack
\expandafter\bbl@set@language\expandafter{\languagename}}
\expandafter\def\csname selectlanguage \endcsname#1{%
+ \ifnum\bbl@hymapsel=\@cclv\let\bbl@hymapsel\tw@\fi
\bbl@push@language
\aftergroup\bbl@pop@language
\bbl@set@language{#1}}
@@ -157,6 +141,7 @@
\fi
\fi}
\def\select@language#1{%
+ \ifnum\bbl@hymapsel=\@cclv\chardef\bbl@hymapsel4\relax\fi
\edef\languagename{#1}%
\bbl@fixname\languagename
\bbl@iflanguage\languagename{%
@@ -188,6 +173,18 @@
\bbl@usehooks{beforeextras}{}%
\csname extras#1\endcsname\relax
\bbl@usehooks{afterextras}{}%
+ \ifcase\bbl@hymapopt\or
+ \renewcommand\BabelLower[2]{\lccode##1=##2\relax}%
+ \ifnum\bbl@hymapsel>4\else
+ \csname\languagename @bbl@hyphenmap\endcsname
+ \fi
+ \chardef\bbl@hymapopt\z@
+ \else
+ \ifnum\bbl@hymapsel>\bbl@hymapopt\else
+ \csname\languagename @bbl@hyphenmap\endcsname
+ \fi
+ \fi
+ \global\let\bbl@hymapsel\@cclv
\bbl@patterns{#1}%
\babel@savevariable\lefthyphenmin
\babel@savevariable\righthyphenmin
@@ -208,11 +205,13 @@
\expandafter\@secondoftwo
\fi}
\long\def\otherlanguage#1{%
+ \ifnum\bbl@hymapsel=\@cclv\let\bbl@hymapsel\thr@@\fi
\csname selectlanguage \endcsname{#1}%
\ignorespaces}
\long\def\endotherlanguage{%
\global\@ignoretrue\ignorespaces}
\expandafter\def\csname otherlanguage*\endcsname#1{%
+ \ifnum\bbl@hymapsel=\@cclv\chardef\bbl@hymapsel4\relax\fi
\foreign@language{#1}}
\expandafter\let\csname endotherlanguage*\endcsname\relax
\edef\foreignlanguage{%
@@ -237,6 +236,7 @@
\expandafter\bbl@switch\expandafter{\languagename}}}
\let\bbl@hyphlist\@empty
\let\bbl@hyphenation@\relax
+\let\bbl@hymapsel=\@cclv
\def\bbl@patterns#1{%
\language=\expandafter\ifx\csname l@#1:\f@encoding\endcsname\relax
\csname l@#1\endcsname
@@ -277,6 +277,22 @@
\@namedef{#1hyphenmins}{#2}%
\fi}
\def\set@hyphenmins#1#2{\lefthyphenmin#1\relax\righthyphenmin#2\relax}
+\ifx\ProvidesFile\@undefined
+ \def\ProvidesLanguage#1[#2 #3 #4]{%
+ \wlog{Language: #1 #4 #3 <#2>}%
+ }
+\else
+ \def\ProvidesLanguage#1{%
+ \begingroup
+ \catcode`\ 10 %
+ \@makeother\/%
+ \@ifnextchar[%]
+ {\@provideslanguage{#1}}{\@provideslanguage{#1}[]}}
+ \def\@provideslanguage#1[#2]{%
+ \wlog{Language: #1 #2}%
+ \expandafter\xdef\csname ver@#1.ldf\endcsname{#2}%
+ \endgroup}
+\fi
\def\LdfInit{%
\chardef\atcatcode=\catcode`\@
\catcode`\@=11\relax