babel[.tds.zip] (23apr16)

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

14 files changed, 96 insertions, 77 deletions

diff --git a/Master/texmf-dist/doc/latex/babel/README b/Master/texmf-dist/doc/latex/babel/README
index 7e48c02a098..766a038f9cd 100644
--- a/Master/texmf-dist/doc/latex/babel/README
+++ b/Master/texmf-dist/doc/latex/babel/README
@@ -1,7 +1,7 @@
-Babel 3.9q
+Babel 3.9r
 ----------
 
-This is Babel 3.9q.
+This is Babel 3.9r.
 
 *** Babel 3.9o and 3.9p are deprecated ***
 *** For incompatibilities with polyglossia read the manual ***
@@ -102,6 +102,10 @@ New
 3.9p  - A little change for bbunicode 1.1b.
 3.9q  - base now reads patterns in lua
       - Some minor changes for luatex
+3.9r  - The three main dtx files now share version numbers.
+      - bbunicode - Fixed a line break at \cs{foreignlanguage} with
+        unloaded patterns. Also added \babelcatcodetablenum, just in
+	case.
 
 * bbunicode.dtx
 1.0b  - Improvements by Elie Roux for LuaTeX.
@@ -113,8 +117,10 @@ New
 1.1a  - Revamped hyphenation loader for luatex.
 1.1b  - Now patterns are loaded with lua(e)tex (and a bug fixed).
 1.1c  - Patterns loader thorougly revised
-   
+3.9r and later - The three main dtx files now share version numbers. See
+        changes above    
+
 ------------
 Javier Bezos
-2016-02-24
+2016-04-23
 
diff --git a/Master/texmf-dist/doc/latex/babel/babel.pdf b/Master/texmf-dist/doc/latex/babel/babel.pdf
index 2579efe5c20..ad3a837955f 100644
--- a/Master/texmf-dist/doc/latex/babel/babel.pdf
+++ b/Master/texmf-dist/doc/latex/babel/babel.pdf
diff --git a/Master/texmf-dist/source/latex/babel/babel.dtx b/Master/texmf-dist/source/latex/babel/babel.dtx
index 612d5a9c08e..59d49aed4d0 100644
--- a/Master/texmf-dist/source/latex/babel/babel.dtx
+++ b/Master/texmf-dist/source/latex/babel/babel.dtx
@@ -36,7 +36,7 @@
 %\iffalse
 %% File 'babel.dtx'
 %\fi
-%%\ProvidesFile{babel.dtx}[2016/02/24 v3.9q The Babel package]
+%%\ProvidesFile{babel.dtx}[2016/04/23 v3.9r The Babel package]
 %\iffalse
 %
 % Babel DOCUMENT-STYLE option for LaTeX version 2.09 or plain TeX;
@@ -196,8 +196,8 @@
 \vspace{2cm}\hspace{1.5cm}
 \begin{minipage}{5cm}
 \Large
-Version 3.9q\newline
-2016/02/24
+Version 3.9r\newline
+2016/04/23
 
 \vspace{1cm}
 \textit{Original author}\newline
@@ -1650,7 +1650,7 @@ explained in in sec. \ref{s:strings} (\babel{} 3.9 and later).
 
 \begin{verbatim}
 \ProvidesLanguage{<language>}
-     [2016/02/24 v0.0 <Language> support from the babel system]
+     [2016/04/23 v0.0 <Language> support from the babel system]
 \LdfInit{<language>}{captions<language>}
 
 \ifx\undefined\l@<language>
@@ -2433,8 +2433,8 @@ help from Bernd Raichle, for which I am grateful.
 %    little bit of literate programming.
 %
 %    \begin{macrocode}
-%<<version=3.9q>>
-%<<date=2016/02/24>>
+%<<version=3.9r>>
+%<<date=2016/04/23>>
 %    \end{macrocode}
 %
 %    We define some basic macros which just make the code cleaner.
diff --git a/Master/texmf-dist/source/latex/babel/bbcompat.dtx b/Master/texmf-dist/source/latex/babel/bbcompat.dtx
index 342e394e91e..bd2392526fc 100644
--- a/Master/texmf-dist/source/latex/babel/bbcompat.dtx
+++ b/Master/texmf-dist/source/latex/babel/bbcompat.dtx
@@ -30,7 +30,7 @@
 %
 % \iffalse
 %<*dtx>
-\ProvidesFile{bbcompat.dtx}[2013/07/28 v1.2l]
+\ProvidesFile{bbcompat.dtx}[2016/04/23 v3.9r]
 %</dtx>
 %
 %% File 'bbcompat.dtx'
diff --git a/Master/texmf-dist/source/latex/babel/bbunicode.dtx b/Master/texmf-dist/source/latex/babel/bbunicode.dtx
index f41054716d4..edc6b714c46 100644
--- a/Master/texmf-dist/source/latex/babel/bbunicode.dtx
+++ b/Master/texmf-dist/source/latex/babel/bbunicode.dtx
@@ -31,7 +31,7 @@
 % \iffalse
 %<*dtx>
 \ProvidesFile{bbunicode.dtx}
-       [2016/02/24 v1.1c Babel hooks for Unicode engines]
+       [2016/04/23 v3.9r Babel hooks for Unicode engines]
 %</dtx>
 %
 %% File `bbunicode.dtx'
@@ -246,6 +246,9 @@
 % \changes{bbunicode~1.1c}{2016/02/08}{Some hacks for polyglossia. To
 %   be improved.}
 % \changes{bbunicode~1.1c}{2016/02/23}{Thoroughly revised.}
+% \changes{bbunicode~1.1d}{2016/4/22}{Lua: Fixed a line break at
+%   \cs{foreignlanguage} with unloaded patterns. Added
+%   \cs{babelcatcodetablenum}, just in case.}
 %
 %    \begin{macrocode}
 %<*luatex>
@@ -309,7 +312,7 @@
       \ifnum#2>\z@\else
         \noexpand\bbl@elt{#1}{#2}{#3}{#4}%
       \fi}%
-    \xdef\bbl@languages{\bbl@languages}% 
+    \xdef\bbl@languages{\bbl@languages}%
   \fi
   \def\bbl@elt#1#2#3#4{\@namedef{zth@#1}{}} % Define flags
   \bbl@languages
@@ -331,30 +334,35 @@
   \fi
 \endgroup
 \def\bbl@get@enc#1:#2:#3\@@@{\def\bbl@hyph@enc{#2}}
+\ifx\babelcatcodetablenum\@undefined
+  \def\babelcatcodetablenum{5211}
+\fi
 \def\bbl@luapatterns#1#2{%
   \bbl@get@enc#1::\@@@
-  \begingroup
-    \ifx\catcodetable\@undefined
-      \let\savecatcodetable\luatexsavecatcodetable
-      \let\initcatcodetable\luatexinitcatcodetable
-      \let\catcodetable\luatexcatcodetable
+  \setbox\z@\hbox\bgroup
+    \begingroup
+      \ifx\catcodetable\@undefined
+        \let\savecatcodetable\luatexsavecatcodetable
+        \let\initcatcodetable\luatexinitcatcodetable
+        \let\catcodetable\luatexcatcodetable
+      \fi
+      \savecatcodetable\babelcatcodetablenum\relax
+      \initcatcodetable\numexpr\babelcatcodetablenum+1\relax
+      \catcodetable\numexpr\babelcatcodetablenum+1\relax
+      \catcode`\#=6  \catcode`\$=3 \catcode`\&=4 \catcode`\^=7
+      \catcode`\_=8  \catcode`\{=1 \catcode`\}=2 \catcode`\~=13
+      \catcode`\@=11 \catcode`\^^I=10 \catcode`\^^J=12
+      \catcode`\<=12 \catcode`\>=12 \catcode`\*=12 \catcode`\.=12
+      \catcode`\-=12 \catcode`\/=12 \catcode`\[=12 \catcode`\]=12
+      \catcode`\`=12 \catcode`\'=12 \catcode`\"=12
+      \input #1\relax
+      \catcodetable\babelcatcodetablenum\relax
+    \endgroup
+    \def\bbl@tempa{#2}%
+    \ifx\bbl@tempa\@empty\else
+      \input #2\relax
     \fi
-    \savecatcodetable5211
-    \initcatcodetable5212
-    \catcodetable5212
-    \catcode`\#=6  \catcode`\$=3 \catcode`\&=4 \catcode`\^=7
-    \catcode`\_=8  \catcode`\{=1 \catcode`\}=2 \catcode`\~=13
-    \catcode`\@=11 \catcode`\^^I=10 \catcode`\^^J=12
-    \catcode`\<=12 \catcode`\>=12 \catcode`\*=12 \catcode`\.=12
-    \catcode`\-=12 \catcode`\/=12 \catcode`\[=12 \catcode`\]=12
-    \catcode`\`=12 \catcode`\'=12 \catcode`\"=12
-    \input #1\relax
-    \catcodetable5211
-  \endgroup
-  \def\bbl@tempa{#2}%
-  \ifx\bbl@tempa\@empty\else
-    \input #2\relax
-  \fi}%
+  \egroup}%
 \def\bbl@patterns@lua#1{%
   \language=\expandafter\ifx\csname l@#1:\f@encoding\endcsname\relax
     \csname l@#1\endcsname
@@ -371,7 +379,7 @@
          \ifx\bbl@tempb\@empty\else % if not a synonymous
            \def\bbl@tempc{{##3}{##4}}%
          \fi
-         \bbl@csarg\edef{hyphendata@##2}{\bbl@tempc}%
+         \bbl@csarg\xdef{hyphendata@##2}{\bbl@tempc}%
        \fi}%
      \bbl@languages
      \@ifundefined{bbl@hyphendata@\the\language}%
@@ -454,7 +462,7 @@
          \ifx\bbl@tempb\@empty\else % if not a synonymous
            \def\bbl@tempc{{##3}{##4}}%
          \fi
-         \bbl@csarg\edef{hyphendata@##2}{\bbl@tempc}%
+         \bbl@csarg\xdef{hyphendata@##2}{\bbl@tempc}%
        \fi}%
      \bbl@languages
      \@ifundefined{bbl@hyphendata@\the\language}%
diff --git a/Master/texmf-dist/tex/generic/babel/babel.def b/Master/texmf-dist/tex/generic/babel/babel.def
index 9af228d1ae3..0853150c854 100644
--- a/Master/texmf-dist/tex/generic/babel/babel.def
+++ b/Master/texmf-dist/tex/generic/babel/babel.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}[2016/02/24 v3.9q The Babel package]
+%%\ProvidesFile{babel.dtx}[2016/04/23 v3.9r The Babel package]
 %% Babel package for LaTeX2e.
 %% Copyright (C) 1989-2008 by Johannes Braams,
 %%                            TeXniek
@@ -56,7 +56,7 @@
     \wlog{File: #1 #4 #3 <#2>}%
     \let\ProvidesFile\@undefined}
 \fi
-\ProvidesFile{babel.def}[2016/02/24 3.9q Babel common definitions]
+\ProvidesFile{babel.def}[2016/04/23 3.9r Babel common definitions]
 \ifx\AtBeginDocument\@undefined
   \input plain.def\relax
 \fi
@@ -67,7 +67,7 @@
   \let\bbl@afterlang\relax
   \let\bbl@language@opts\@empty
 \fi
-\def\bbl@tempa{3.9q}%
+\def\bbl@tempa{3.9r}%
 \ifx\bbl@version\bbl@tempa\else
   \input switch.def\relax
 \fi
diff --git a/Master/texmf-dist/tex/generic/babel/babel.sty b/Master/texmf-dist/tex/generic/babel/babel.sty
index f9f6eeadf4b..0e136565768 100644
--- a/Master/texmf-dist/tex/generic/babel/babel.sty
+++ b/Master/texmf-dist/tex/generic/babel/babel.sty
@@ -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}[2016/02/24 v3.9q The Babel package]
+%%\ProvidesFile{babel.dtx}[2016/04/23 v3.9r The Babel package]
 %% Babel package for LaTeX2e.
 %% Copyright (C) 1989-2008 by Johannes Braams,
 %%                            TeXniek
@@ -48,10 +48,10 @@
 %%                            by Javier Bezos
 %%                            all rights reserved.
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
-\ProvidesPackage{babel}[2016/02/24 3.9q The Babel package]
+\ProvidesPackage{babel}[2016/04/23 3.9r The Babel package]
 \@ifpackagewith{babel}{debug}
  {\input switch.def\relax}
- {\def\bbl@tempa{3.9q}%
+ {\def\bbl@tempa{3.9r}%
 \ifx\bbl@version\bbl@tempa\else
   \input switch.def\relax
 \fi}
diff --git a/Master/texmf-dist/tex/generic/babel/blplain.tex b/Master/texmf-dist/tex/generic/babel/blplain.tex
index 7f5aa952238..39c02cd12ff 100644
--- a/Master/texmf-dist/tex/generic/babel/blplain.tex
+++ b/Master/texmf-dist/tex/generic/babel/blplain.tex
@@ -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}[2016/02/24 v3.9q The Babel package]
+%%\ProvidesFile{babel.dtx}[2016/04/23 v3.9r The Babel package]
 %% Babel package for LaTeX2e.
 %% Copyright (C) 1989-2008 by Johannes Braams,
 %%                            TeXniek
diff --git a/Master/texmf-dist/tex/generic/babel/bplain.tex b/Master/texmf-dist/tex/generic/babel/bplain.tex
index 8d26ee4d88d..ab408ff77ce 100644
--- a/Master/texmf-dist/tex/generic/babel/bplain.tex
+++ b/Master/texmf-dist/tex/generic/babel/bplain.tex
@@ -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}[2016/02/24 v3.9q The Babel package]
+%%\ProvidesFile{babel.dtx}[2016/04/23 v3.9r The Babel package]
 %% Babel package for LaTeX2e.
 %% Copyright (C) 1989-2008 by Johannes Braams,
 %%                            TeXniek
diff --git a/Master/texmf-dist/tex/generic/babel/hyphen.cfg b/Master/texmf-dist/tex/generic/babel/hyphen.cfg
index df1715a099a..8726732f802 100644
--- a/Master/texmf-dist/tex/generic/babel/hyphen.cfg
+++ b/Master/texmf-dist/tex/generic/babel/hyphen.cfg
@@ -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}[2016/02/24 v3.9q The Babel package]
+%%\ProvidesFile{babel.dtx}[2016/04/23 v3.9r The Babel package]
 %% Babel package for LaTeX2e.
 %% Copyright (C) 1989-2008 by Johannes Braams,
 %%                            TeXniek
@@ -52,7 +52,7 @@
     \wlog{File: #1 #4 #3 <#2>}%
     \let\ProvidesFile\@undefined}
 \fi
-\ProvidesFile{hyphen.cfg}[2016/02/24 3.9q Babel hyphens]
+\ProvidesFile{hyphen.cfg}[2016/04/23 3.9r Babel hyphens]
 \xdef\bbl@format{\jobname}
 \ifx\AtBeginDocument\@undefined
   \def\@empty{}
@@ -83,7 +83,7 @@
   \countdef\last@language=19
   \def\addlanguage{\alloc@9\language\chardef\@cclvi}
 \fi
-\toks8{Babel <3.9q> and hyphenation patterns for }%
+\toks8{Babel <3.9r> 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 173c8c2bbaf..a91c808b5eb 100644
--- a/Master/texmf-dist/tex/generic/babel/luababel.def
+++ b/Master/texmf-dist/tex/generic/babel/luababel.def
@@ -123,30 +123,35 @@
   \fi
 \endgroup
 \def\bbl@get@enc#1:#2:#3\@@@{\def\bbl@hyph@enc{#2}}
+\ifx\babelcatcodetablenum\@undefined
+  \def\babelcatcodetablenum{5211}
+\fi
 \def\bbl@luapatterns#1#2{%
   \bbl@get@enc#1::\@@@
-  \begingroup
-    \ifx\catcodetable\@undefined
-      \let\savecatcodetable\luatexsavecatcodetable
-      \let\initcatcodetable\luatexinitcatcodetable
-      \let\catcodetable\luatexcatcodetable
+  \setbox\z@\hbox\bgroup
+    \begingroup
+      \ifx\catcodetable\@undefined
+        \let\savecatcodetable\luatexsavecatcodetable
+        \let\initcatcodetable\luatexinitcatcodetable
+        \let\catcodetable\luatexcatcodetable
+      \fi
+      \savecatcodetable\babelcatcodetablenum\relax
+      \initcatcodetable\numexpr\babelcatcodetablenum+1\relax
+      \catcodetable\numexpr\babelcatcodetablenum+1\relax
+      \catcode`\#=6  \catcode`\$=3 \catcode`\&=4 \catcode`\^=7
+      \catcode`\_=8  \catcode`\{=1 \catcode`\}=2 \catcode`\~=13
+      \catcode`\@=11 \catcode`\^^I=10 \catcode`\^^J=12
+      \catcode`\<=12 \catcode`\>=12 \catcode`\*=12 \catcode`\.=12
+      \catcode`\-=12 \catcode`\/=12 \catcode`\[=12 \catcode`\]=12
+      \catcode`\`=12 \catcode`\'=12 \catcode`\"=12
+      \input #1\relax
+      \catcodetable\babelcatcodetablenum\relax
+    \endgroup
+    \def\bbl@tempa{#2}%
+    \ifx\bbl@tempa\@empty\else
+      \input #2\relax
     \fi
-    \savecatcodetable5211
-    \initcatcodetable5212
-    \catcodetable5212
-    \catcode`\#=6  \catcode`\$=3 \catcode`\&=4 \catcode`\^=7
-    \catcode`\_=8  \catcode`\{=1 \catcode`\}=2 \catcode`\~=13
-    \catcode`\@=11 \catcode`\^^I=10 \catcode`\^^J=12
-    \catcode`\<=12 \catcode`\>=12 \catcode`\*=12 \catcode`\.=12
-    \catcode`\-=12 \catcode`\/=12 \catcode`\[=12 \catcode`\]=12
-    \catcode`\`=12 \catcode`\'=12 \catcode`\"=12
-    \input #1\relax
-    \catcodetable5211
-  \endgroup
-  \def\bbl@tempa{#2}%
-  \ifx\bbl@tempa\@empty\else
-    \input #2\relax
-  \fi}%
+  \egroup}%
 \def\bbl@patterns@lua#1{%
   \language=\expandafter\ifx\csname l@#1:\f@encoding\endcsname\relax
     \csname l@#1\endcsname
@@ -163,7 +168,7 @@
          \ifx\bbl@tempb\@empty\else % if not a synonymous
            \def\bbl@tempc{{##3}{##4}}%
          \fi
-         \bbl@csarg\edef{hyphendata@##2}{\bbl@tempc}%
+         \bbl@csarg\xdef{hyphendata@##2}{\bbl@tempc}%
        \fi}%
      \bbl@languages
      \@ifundefined{bbl@hyphendata@\the\language}%
@@ -246,7 +251,7 @@
          \ifx\bbl@tempb\@empty\else % if not a synonymous
            \def\bbl@tempc{{##3}{##4}}%
          \fi
-         \bbl@csarg\edef{hyphendata@##2}{\bbl@tempc}%
+         \bbl@csarg\xdef{hyphendata@##2}{\bbl@tempc}%
        \fi}%
      \bbl@languages
      \@ifundefined{bbl@hyphendata@\the\language}%
diff --git a/Master/texmf-dist/tex/generic/babel/nil.ldf b/Master/texmf-dist/tex/generic/babel/nil.ldf
index 0f0ea0fa20f..4ba3de3d807 100644
--- a/Master/texmf-dist/tex/generic/babel/nil.ldf
+++ b/Master/texmf-dist/tex/generic/babel/nil.ldf
@@ -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}[2016/02/24 v3.9q The Babel package]
+%%\ProvidesFile{babel.dtx}[2016/04/23 v3.9r The Babel package]
 %% Babel package for LaTeX2e.
 %% Copyright (C) 1989-2008 by Johannes Braams,
 %%                            TeXniek
@@ -47,7 +47,7 @@
 %%                            TeXniek
 %%                            by Javier Bezos
 %%                            all rights reserved.
-\ProvidesLanguage{nil}[2016/02/24 3.9q Nil language]
+\ProvidesLanguage{nil}[2016/04/23 3.9r Nil language]
 \LdfInit{nil}{datenil}
 \ifx\l@nohyphenation\@undefined
    \@nopatterns{nil}
diff --git a/Master/texmf-dist/tex/generic/babel/plain.def b/Master/texmf-dist/tex/generic/babel/plain.def
index d25d0c425a3..c7ac4590445 100644
--- a/Master/texmf-dist/tex/generic/babel/plain.def
+++ b/Master/texmf-dist/tex/generic/babel/plain.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}[2016/02/24 v3.9q The Babel package]
+%%\ProvidesFile{babel.dtx}[2016/04/23 v3.9r The Babel package]
 %% Babel package for LaTeX2e.
 %% Copyright (C) 1989-2008 by Johannes Braams,
 %%                            TeXniek
diff --git a/Master/texmf-dist/tex/generic/babel/switch.def b/Master/texmf-dist/tex/generic/babel/switch.def
index e6258033a43..3db45b28347 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}[2016/02/24 v3.9q The Babel package]
+%%\ProvidesFile{babel.dtx}[2016/04/23 v3.9r The Babel package]
 %% Babel package for LaTeX2e.
 %% Copyright (C) 1989-2008 by Johannes Braams,
 %%                            TeXniek
@@ -52,7 +52,7 @@
     \wlog{File: #1 #4 #3 <#2>}%
     \let\ProvidesFile\@undefined}
 \fi
-\ProvidesFile{switch.def}[2016/02/24 3.9q Babel switching mechanism]
+\ProvidesFile{switch.def}[2016/04/23 3.9r Babel switching mechanism]
 \ifx\AtBeginDocument\@undefined
   \input plain.def\relax
 \fi
@@ -73,8 +73,8 @@
   \countdef\last@language=19
   \def\addlanguage{\alloc@9\language\chardef\@cclvi}
 \fi
-\def\bbl@version{3.9q}
-\def\bbl@date{2016/02/24}
+\def\bbl@version{3.9r}
+\def\bbl@date{2016/04/23}
 \def\adddialect#1#2{%
   \global\chardef#1#2\relax
   \bbl@usehooks{adddialect}{{#1}{#2}}%