platex/config: babel 3.9a

git-svn-id: svn://tug.org/texlive/trunk@30315 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 99 insertions, 287 deletions

diff --git a/Master/texmf-dist/tex/platex/config/hyphen.cfg b/Master/texmf-dist/tex/platex/config/hyphen.cfg
index 394204ee7dc..87b7cc8953d 100644
--- a/Master/texmf-dist/tex/platex/config/hyphen.cfg
+++ b/Master/texmf-dist/tex/platex/config/hyphen.cfg
@@ -4,9 +4,10 @@
 %%
 %% The original source files were:
 %%
-%% babel.dtx  (with options: `kernel,patterns')
+%% babel.dtx  (with options: `patterns')
 %% This is a generated file.
 %% 
+%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams.
 %% Copyright 1989-2008 Johannes L. Braams and any individual authors
 %% listed elsewhere in this file.  All rights reserved.
 %% 
@@ -23,7 +24,7 @@
 %% 
 %% This work has the LPPL maintenance status "maintained".
 %% 
-%% The Current Maintainer of this work is Johannes Braams.
+%% The Current Maintainer of this work is Javier Bezos.
 %% 
 %% This file may only be distributed together with a copy of the Babel
 %% system. You may however distribute the Babel system without
@@ -36,45 +37,28 @@
 %% The list of derived (unpacked) files belonging to the distribution
 %% 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}[2008/07/08 v3.8m The Babel package]
+%%\ProvidesFile{babel.dtx}[2013/04/15 v3.9e The Babel package]
 %% Babel package for LaTeX2e.
 %% Copyright (C) 1989 -- 2008 by Johannes Braams,
 %%                            TeXniek
 %%                            all rights reserved.
-%% Please report errors to: J.L. Braams
-%%                          babel at braams.xs4all.nl
+%% Copyright (C) 2013         by Johannes Braams
+%%                            TeXniek
+%%                            by Javier Bezos
+%%                            all rights reserved.
+\xdef\bbl@format{\jobname}
 \ifx\ProvidesFile\@undefined
   \def\ProvidesFile#1[#2 #3 #4]{%
     \wlog{File: #1 #4 #3 <#2>}%
-    \toks8{Babel <#3> and hyphenation patterns for }%
     \let\ProvidesFile\@undefined
     }
-  \def\ProvidesLanguage#1[#2 #3 #4]{%
-    \wlog{Language: #1 #4 #3 <#2>}%
-    }
-\else
-  \let\bbl@tempa\ProvidesFile
-  \def\ProvidesFile#1[#2 #3 #4]{%
-    \toks8{Babel <#3> and hyphenation patterns for }%
-    \bbl@tempa#1[#2 #3 #4]%
-    \let\ProvidesFile\bbl@tempa}
-  \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
 \ProvidesFile{hyphen.cfg}
-                [2008/07/08 v3.8m %
-      Babel language switching mechanism]
+    [2013/04/15 v3.9e %
+     Babel language switching mechanism]
 \ifx\AtBeginDocument\@undefined
+  \let\orig@dump\dump
   \input plain.def\relax
 \fi
 \ifx\language\@undefined
@@ -82,12 +66,8 @@
 \fi
 \ifx\newlanguage\@undefined
   \csname newcount\endcsname\last@language
-\else
-  \countdef\last@language=19
-\fi
-\ifx\newlanguage\@undefined
   \def\addlanguage#1{%
-    \global\advance\last@language \@ne
+    \global\advance\last@language\@ne
     \ifnum\last@language<\@cclvi
     \else
         \errmessage{No room for a new \string\language!}%
@@ -95,307 +75,139 @@
     \global\chardef#1\last@language
     \wlog{\string#1 = \string\language\the\last@language}}
 \else
+  \countdef\last@language=19
   \def\addlanguage{\alloc@9\language\chardef\@cclvi}
 \fi
-\def\adddialect#1#2{%
-    \global\chardef#1#2\relax
-    \wlog{\string#1 = a dialect from \string\language#2}}
-\def\iflanguage#1{%
-  \expandafter\ifx\csname l@#1\endcsname\relax
-    \@nolanerr{#1}%
-  \else
-    \bbl@afterfi{\ifnum\csname l@#1\endcsname=\language
-      \expandafter\@firstoftwo
-    \else
-      \expandafter\@secondoftwo
-    \fi}%
-  \fi}
-\edef\selectlanguage{%
-  \noexpand\protect
-  \expandafter\noexpand\csname selectlanguage \endcsname
-  }
-\ifx\@undefined\protect\let\protect\relax\fi
-\ifx\documentclass\@undefined
-  \def\xstring{\string\string\string}
-\else
-  \let\xstring\string
-\fi
-\xdef\bbl@language@stack{}
-\def\bbl@push@language{%
-  \xdef\bbl@language@stack{\languagename+\bbl@language@stack}%
-  }
-\def\bbl@pop@lang#1+#2-#3{%
-  \def\languagename{#1}\xdef#3{#2}%
-  }
-\def\bbl@pop@language{%
-  \expandafter\bbl@pop@lang\bbl@language@stack-\bbl@language@stack
-  \expandafter\bbl@set@language\expandafter{\languagename}%
-  }
-\expandafter\def\csname selectlanguage \endcsname#1{%
-  \bbl@push@language
-  \aftergroup\bbl@pop@language
-  \bbl@set@language{#1}}
-\def\bbl@set@language#1{%
-  \edef\languagename{%
-    \ifnum\escapechar=\expandafter`\string#1\@empty
-    \else \string#1\@empty\fi}%
-  \select@language{\languagename}%
-  \if@filesw
-    \protected@write\@auxout{}{\string\select@language{\languagename}}%
-    \addtocontents{toc}{\xstring\select@language{\languagename}}%
-    \addtocontents{lof}{\xstring\select@language{\languagename}}%
-    \addtocontents{lot}{\xstring\select@language{\languagename}}%
-  \fi}
-\def\select@language#1{%
-  \expandafter\ifx\csname l@#1\endcsname\relax
-    \@nolanerr{#1}%
-  \else
-    \expandafter\ifx\csname date#1\endcsname\relax
-      \@noopterr{#1}%
-    \else
-      \bbl@patterns{\languagename}%
-      \originalTeX
-      \expandafter\def\expandafter\originalTeX
-          \expandafter{\csname noextras#1\endcsname
-                       \let\originalTeX\@empty}%
-      \languageshorthands{none}%
-      \babel@beginsave
-      \csname captions#1\endcsname
-      \csname date#1\endcsname
-      \csname extras#1\endcsname\relax
-      \babel@savevariable\lefthyphenmin
-      \babel@savevariable\righthyphenmin
-      \expandafter\ifx\csname #1hyphenmins\endcsname\relax
-        \set@hyphenmins\tw@\thr@@\relax
-      \else
-        \expandafter\expandafter\expandafter\set@hyphenmins
-          \csname #1hyphenmins\endcsname\relax
-      \fi
-    \fi
-  \fi}
-\long\def\otherlanguage#1{%
-  \csname selectlanguage \endcsname{#1}%
-  \ignorespaces
-  }
-\long\def\endotherlanguage{%
-  \originalTeX
-  \global\@ignoretrue\ignorespaces
-  }
-\expandafter\def\csname otherlanguage*\endcsname#1{%
-  \foreign@language{#1}%
-  }
-\expandafter\def\csname endotherlanguage*\endcsname{%
-  \csname noextras\languagename\endcsname
-  }
-\def\foreignlanguage{\protect\csname foreignlanguage \endcsname}
-\expandafter\def\csname foreignlanguage \endcsname#1#2{%
-  \begingroup
-    \originalTeX
-    \foreign@language{#1}%
-    #2%
-    \csname noextras#1\endcsname
-  \endgroup
-  }
-\def\foreign@language#1{%
-  \def\languagename{#1}%
-  \expandafter\ifx\csname l@#1\endcsname\relax
-    \@nolanerr{#1}%
-  \else
-    \bbl@patterns{\languagename}%
-    \languageshorthands{none}%
-    \csname extras#1\endcsname
-    \expandafter\ifx\csname #1hyphenmins\endcsname\relax
-      \set@hyphenmins\tw@\thr@@\relax
-    \else
-      \expandafter\expandafter\expandafter\set@hyphenmins
-        \csname #1hyphenmins\endcsname\relax
-    \fi
-  \fi
-  }
-\def\bbl@patterns#1{%
-  \language=\expandafter\ifx\csname l@#1:\f@encoding\endcsname\relax
-    \csname l@#1\endcsname
-  \else
-    \csname l@#1:\f@encoding\endcsname
-  \fi\relax
-}
-\def\hyphenrules#1{%
-  \expandafter\ifx\csname l@#1\endcsname\@undefined
-    \@nolanerr{#1}%
-  \else
-    \bbl@patterns{#1}%
-    \languageshorthands{none}%
-       \expandafter\ifx\csname #1hyphenmins\endcsname\relax
-         \set@hyphenmins\tw@\thr@@\relax
-       \else
-         \expandafter\expandafter\expandafter\set@hyphenmins
-         \csname #1hyphenmins\endcsname\relax
-       \fi
-  \fi
-  }
-\def\endhyphenrules{}
-\def\providehyphenmins#1#2{%
-  \expandafter\ifx\csname #1hyphenmins\endcsname\relax
-    \@namedef{#1hyphenmins}{#2}%
-  \fi}
-\def\set@hyphenmins#1#2{\lefthyphenmin#1\righthyphenmin#2}
-\def\LdfInit{%
-  \chardef\atcatcode=\catcode`\@
-  \catcode`\@=11\relax
-  \input babel.def\relax
-  \catcode`\@=\atcatcode \let\atcatcode\relax
-  \LdfInit}
-\ifx\originalTeX\@undefined\let\originalTeX\@empty\fi
-\ifx\babel@beginsave\@undefined\let\babel@beginsave\relax\fi
-\ifx\PackageError\@undefined
-  \def\@nolanerr#1{%
-    \errhelp{Your command will be ignored, type <return> to proceed}%
-    \errmessage{You haven't defined the language #1\space yet}}
-  \def\@nopatterns#1{%
-    \message{No hyphenation patterns were loaded for}%
-    \message{the language `#1'}%
-    \message{I will use the patterns loaded for \string\language=0
-          instead}}
-  \def\@noopterr#1{%
-    \errmessage{The option #1 was not specified in \string\usepackage}
-    \errhelp{You may continue, but expect unexpected results}}
-  \def\@activated#1{%
-    \wlog{Package babel Info: Making #1 an active character}}
-\else
-  \newcommand*{\@nolanerr}[1]{%
-    \PackageError{babel}%
-                 {You haven't defined the language #1\space yet}%
-        {Your command will be ignored, type <return> to proceed}}
-  \newcommand*{\@nopatterns}[1]{%
-    \PackageWarningNoLine{babel}%
-        {No hyphenation patterns were loaded for\MessageBreak
-          the language `#1'\MessageBreak
-          I will use the patterns loaded for \string\language=0
-          instead}}
-  \newcommand*{\@noopterr}[1]{%
-    \PackageError{babel}%
-                 {You haven't loaded the option #1\space yet}%
-             {You may proceed, but expect unexpected results}}
-  \newcommand*{\@activated}[1]{%
-    \PackageInfo{babel}{%
-      Making #1 an active character}}
-\fi
-\def\process@line#1#2 #3/{%
-  \ifx=#1
-    \process@synonym#2 /
+\toks8{Babel <3.9e> and hyphenation patterns for }%
+\def\process@line#1#2 #3 #4 {%
+  \ifx=#1%
+    \process@synonym{#2}%
   \else
-    \process@language#1#2 #3/%
+    \process@language{#1#2}{#3}{#4}%
   \fi
-  }
+  \ignorespaces}
 \toks@{}
-\def\process@synonym#1 /{%
+\def\bbl@languages{}
+\def\process@synonym#1{%
   \ifnum\last@language=\m@ne
-    \expandafter\chardef\csname l@#1\endcsname0\relax
-    \wlog{\string\l@#1=\string\language0}
-    \toks@\expandafter{\the\toks@
-      \expandafter\let\csname #1hyphenmins\expandafter\endcsname
-      \csname\languagename hyphenmins\endcsname}%
+    \toks@\expandafter{\the\toks@\relax\process@synonym{#1}}%
   \else
     \expandafter\chardef\csname l@#1\endcsname\last@language
-    \wlog{\string\l@#1=\string\language\the\last@language}
+    \wlog{\string\l@#1=\string\language\the\last@language}%
     \expandafter\let\csname #1hyphenmins\expandafter\endcsname
-    \csname\languagename hyphenmins\endcsname
-  \fi
-  }
-\def\process@language#1 #2 #3/{%
+      \csname\languagename hyphenmins\endcsname
+    \let\bbl@elt\relax
+    \edef\bbl@languages{\bbl@languages\bbl@elt{#1}{\the\last@language}{}{}}%
+  \fi}
+\def\process@language#1#2#3{%
   \expandafter\addlanguage\csname l@#1\endcsname
   \expandafter\language\csname l@#1\endcsname
-  \def\languagename{#1}%
-  \global\toks8\expandafter{\the\toks8#1, }%
+  \edef\languagename{#1}%
+  \bbl@hook@everylanguage{#1}%
+  \bbl@get@enc#1::\@@@
   \begingroup
-    \bbl@get@enc#1:\@@@
-    \ifx\bbl@hyph@enc\@empty
-    \else
-      \fontencoding{\bbl@hyph@enc}\selectfont
-    \fi
     \lefthyphenmin\m@ne
-    \input #2\relax
+    \bbl@hook@loadpatterns{#2}%
     \ifnum\lefthyphenmin=\m@ne
     \else
       \expandafter\xdef\csname #1hyphenmins\endcsname{%
         \the\lefthyphenmin\the\righthyphenmin}%
     \fi
   \endgroup
+  \def\bbl@tempa{#3}%
+  \ifx\bbl@tempa\@empty\else
+    \bbl@hook@loadexceptions{#3}%
+  \fi
+  \let\bbl@elt\relax
+  \edef\bbl@languages{%
+    \bbl@languages\bbl@elt{#1}{\the\language}{#2}{\bbl@tempa}}%
   \ifnum\the\language=\z@
-    \expandafter\ifx\csname #1hyphenmins\endcsname\relax
-      \set@hyphenmins\tw@\thr@@\relax
-    \else
-      \expandafter\expandafter\expandafter\set@hyphenmins
-        \csname #1hyphenmins\endcsname
-    \fi
     \the\toks@
-  \fi
-  \toks@{}%
-  \def\bbl@tempa{#3}%
-  \ifx\bbl@tempa\@empty
-  \else
-    \ifx\bbl@tempa\space
+    \toks@{}%
+  \fi}
+\def\bbl@get@enc#1:#2:#3\@@@{\def\bbl@hyph@enc{#2}}
+\def\bbl@hook@everylanguage#1{}
+\def\bbl@hook@loadpatterns#1{\input #1\relax}
+\let\bbl@hook@loadexceptions\bbl@hook@loadpatterns
+\let\bbl@hook@loadkernel\bbl@hook@loadpatterns
+\begingroup
+  \def\AddBabelHook#1#2{%
+    \expandafter\ifx\csname bbl@hook@#2\endcsname\relax
+      \def\next{\toks1}%
     \else
-      \input #3\relax
+      \def\next{\expandafter\gdef\csname bbl@hook@#2\endcsname####1}%
+    \fi
+    \next}
+  \ifx\directlua\@undefined
+    \ifx\XeTeXinputencoding\@undefined\else
+      \input xebabel.def
     \fi
+  \else
+    \input luababel.def
   \fi
-  }
-\def\bbl@get@enc#1:#2\@@@{%
-  \def\bbl@tempa{#1}%
-  \def\bbl@tempb{#2}%
-  \ifx\bbl@tempb\@empty
-    \let\bbl@hyph@enc\@empty
+  \openin1 = babel-\bbl@format.cfg
+  \ifeof1
   \else
-    \bbl@get@enc#2\@@@
-    \edef\bbl@hyph@enc{\bbl@tempa}%
-  \fi}
+    \input babel-\bbl@format.cfg\relax
+  \fi
+  \closein1
+\endgroup
+\bbl@hook@loadkernel{switch.def}
 \openin1 = language.dat
+\def\languagename{english}%
 \ifeof1
   \message{I couldn't find the file language.dat,\space
            I will try the file hyphen.tex}
   \input hyphen.tex\relax
-  \def\l@english{0}%
-  \def\languagename{english}%
+  \chardef\l@english\z@
 \else
   \last@language\m@ne
   \loop
     \endlinechar\m@ne
     \read1 to \bbl@line
     \endlinechar`\^^M
-    \ifx\bbl@line\@empty
-    \else
-      \edef\bbl@line{\bbl@line\space/}%
-      \expandafter\process@line\bbl@line
-      \ifx\bbl@defaultlanguage\@undefined
-        \let\bbl@defaultlanguage\languagename
+    \if T\ifeof1F\fi T\relax
+      \ifx\bbl@line\@empty\else
+        \edef\bbl@line{\bbl@line\space\space\space}%
+        \expandafter\process@line\bbl@line\relax
       \fi
-    \fi
-    \iftrue \csname fi\endcsname
-    \csname if\ifeof1 false\else true\fi\endcsname
   \repeat
-  \language=0
-  \let\languagename\bbl@defaultlanguage
-  \let\bbl@defaultlanguage\@undefined
+  \begingroup
+    \def\bbl@elt#1#2#3#4{%
+      \global\language=#2\relax
+      \gdef\languagename{#1}%
+      \def\bbl@elt##1##2##3##4{}}%
+    \bbl@languages
+  \endgroup
 \fi
 \closein1
-\let\process@language\@undefined
-\let\process@synonym\@undefined
-\let\process@line\@undefined
-\let\bbl@tempa\@undefined
-\let\bbl@tempb\@undefined
-\let\bbl@eq@\@undefined
-\let\bbl@line\@undefined
-\let\bbl@get@enc\@undefined
+\if/\the\toks@/\else
+  \errhelp{language.dat loads no language, only synonyms}
+  \errmessage{Orphan language synonym}
+\fi
 \ifx\addto@hook\@undefined
 \else
-  \expandafter\addto@hook\expandafter\everyjob\expandafter{%
-    \expandafter\typeout\expandafter{\the\toks8 loaded.}}
+  \edef\bbl@tempa{%
+    \noexpand\typeout{\the\toks8 \the\last@language\space languages
+    loaded.}}%
+  \expandafter\addto@hook\expandafter\everyjob\expandafter{\bbl@tempa}
 \fi
+\let\bbl@line\@undefined
+\let\process@line\@undefined
+\let\process@synonym\@undefined
+\let\process@language\@undefined
+\let\bbl@get@enc\@undefined
+\let\bbl@hyph@enc\@undefined
+\let\bbl@tempa\@undefined
+\let\bbl@hook@loadkernel\@undefined
+\let\bbl@hook@everylanguage\@undefined
+\let\bbl@hook@loadpatterns\@undefined
+\let\bbl@hook@loadexceptions\@undefined
 %%
 %% ( written by Tono san ) 
 %%
 \ifx\platexDUMP\@undefined\else
-    \edef\platexBANNER{\the\toks8 }%
+    \edef\platexBANNER{\the\toks8 \the\last@language\space languages\space}%
 \fi%%
 %%
 %% \CharacterTable