babel (18oct18)

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

11 files changed, 63 insertions, 54 deletions

diff --git a/Master/texmf-dist/doc/latex/babel/README.md b/Master/texmf-dist/doc/latex/babel/README.md
index 4b6f7601548..3a191530b8d 100644
--- a/Master/texmf-dist/doc/latex/babel/README.md
+++ b/Master/texmf-dist/doc/latex/babel/README.md
@@ -1,4 +1,4 @@
-## Babel 3.25
+## Babel 3.26
 
 This package manages culturally-determined typographical (and other)
 rules, and hyphenation patterns for a wide range of languages.  Many
@@ -51,6 +51,7 @@ respective authors.
 ### Latest changes
 
 ```
+3.26   - Fix for 3.25 - \babelprovide raised an error with xetex. 
 3.25   - Fixes for 3.23 - mapfont=direction could raise an error.
          Language and Script were not always defined correctly.
        - Improved tentative support for Thai, Lao and Khmer in both 
@@ -114,5 +115,5 @@ respective authors.
 ```
 
 Javier Bezos
-2018/10/03
+2018/10/16
 
diff --git a/Master/texmf-dist/doc/latex/babel/babel.pdf b/Master/texmf-dist/doc/latex/babel/babel.pdf
index a3923e40a47..f624409eedc 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 5bc0f3f699e..ab5d8146295 100644
--- a/Master/texmf-dist/source/latex/babel/babel.dtx
+++ b/Master/texmf-dist/source/latex/babel/babel.dtx
@@ -31,7 +31,7 @@
 %
 % \iffalse
 %<*filedriver>
-\ProvidesFile{babel.dtx}[2018/10/03 v3.25 The Babel package]
+\ProvidesFile{babel.dtx}[2018/10/16 v3.26 The Babel package]
 \documentclass{ltxdoc}
 \GetFileInfo{babel.dtx}
 \usepackage{fontspec}
@@ -3857,8 +3857,8 @@ help from Bernd Raichle, for which I am grateful.
 % \section{Tools}
 %
 %    \begin{macrocode}
-%<<version=3.25>>
-%<<date=2018/10/03>>
+%<<version=3.26>>
+%<<date=2018/10/16>>
 %    \end{macrocode}
 %
 % \textbf{Do not use the following macros in \texttt{ldf} files. They
@@ -7724,6 +7724,8 @@ help from Bernd Raichle, for which I am grateful.
 % \changes{babel~3.20}{2018/05/01}{Handle native digits (TeX level).
 %   New option - maparabic.}
 % \changes{babel~3.23}{2018/09/01}{Valueless import}
+% \changes{babel~3.26}{2018/10/16}{Quick fix for xetex - test the 
+%   script for intraspace}
 %
 %    \begin{macrocode}
 \bbl@trace{Creating languages and reading ini files}
@@ -7830,28 +7832,31 @@ help from Bernd Raichle, for which I am grateful.
         \expandafter\bbl@intrapenalty\bbl@KVP@intrapenalty\@@
       \fi}%
   \or 
-    \bbl@ifunset{bbl@intsp@\languagename}{}%
-      {\expandafter\ifx\csname bbl@intsp@\languagename\endcsname\@empty\else
-        \ifx\bbl@KVP@intraspace\@nil
-           \bbl@exp{%
-             \\\bbl@intraspace\bbl@cs{intsp@\languagename}\\\@@}%
+    \bbl@xin@{\bbl@cs{sbcp@\languagename}}{Thai,Laoo,Khmr}%
+    \ifin@
+      \bbl@ifunset{bbl@intsp@\languagename}{}%
+        {\expandafter\ifx\csname bbl@intsp@\languagename\endcsname\@empty\else
+          \ifx\bbl@KVP@intraspace\@nil
+             \bbl@exp{%
+               \\\bbl@intraspace\bbl@cs{intsp@\languagename}\\\@@}%
+          \fi
+          \ifx\bbl@KVP@intrapenalty\@nil
+            \bbl@intrapenalty0\@@
+          \fi
         \fi
-        \ifx\bbl@KVP@intrapenalty\@nil
-          \bbl@intrapenalty0\@@
+        \ifx\bbl@KVP@intraspace\@nil\else % We may override the ini
+          \expandafter\bbl@intraspace\bbl@KVP@intraspace\@@
         \fi
-      \fi
-      \ifx\bbl@KVP@intraspace\@nil\else % We may override the ini
-        \expandafter\bbl@intraspace\bbl@KVP@intraspace\@@
-      \fi
-      \ifx\bbl@KVP@intrapenalty\@nil\else
-        \expandafter\bbl@intrapenalty\bbl@KVP@intrapenalty\@@
-      \fi
-      \ifx\bbl@ispacesize\@undefined
-        \AtBeginDocument{%
-          \expandafter\bbl@add
-          \csname selectfont \endcsname{\bbl@ispacesize}}%
-        \def\bbl@ispacesize{\bbl@cs{xeisp@\bbl@cs{sbcp@\languagename}}}%
-      \fi}%
+        \ifx\bbl@KVP@intrapenalty\@nil\else
+          \expandafter\bbl@intrapenalty\bbl@KVP@intrapenalty\@@
+        \fi
+        \ifx\bbl@ispacesize\@undefined
+          \AtBeginDocument{%
+            \expandafter\bbl@add
+            \csname selectfont \endcsname{\bbl@ispacesize}}%
+          \def\bbl@ispacesize{\bbl@cs{xeisp@\bbl@cs{sbcp@\languagename}}}%
+        \fi}%
+    \fi
   \fi
   % Native digits, if provided in ini
   \ifcase\bbl@engine\else
diff --git a/Master/texmf-dist/source/latex/babel/babel.ins b/Master/texmf-dist/source/latex/babel/babel.ins
index c166c12e3a8..aefa4079493 100644
--- a/Master/texmf-dist/source/latex/babel/babel.ins
+++ b/Master/texmf-dist/source/latex/babel/babel.ins
@@ -26,7 +26,7 @@
 %% and covered by LPPL is defined by the unpacking scripts (with
 %% extension .ins) which are part of the distribution.
 %%
-\def\filedate{2018/10/03}
+\def\filedate{2018/10/16}
 \def\batchfile{babel.ins}
 \input docstrip.tex
 
diff --git a/Master/texmf-dist/source/latex/babel/bbcompat.dtx b/Master/texmf-dist/source/latex/babel/bbcompat.dtx
index b5a5ca8fe69..c25a6ea7de7 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}[2018/10/03 v3.25]
+\ProvidesFile{bbcompat.dtx}[2018/10/16 v3.26]
 %</dtx>
 %
 %% File 'bbcompat.dtx'
diff --git a/Master/texmf-dist/source/latex/babel/locale.zip b/Master/texmf-dist/source/latex/babel/locale.zip
index ca8bd9c4107..3dc2df365cd 100644
--- a/Master/texmf-dist/source/latex/babel/locale.zip
+++ b/Master/texmf-dist/source/latex/babel/locale.zip
diff --git a/Master/texmf-dist/tex/generic/babel/babel.def b/Master/texmf-dist/tex/generic/babel/babel.def
index d26dea6ff9c..5fc96c3a2b1 100644
--- a/Master/texmf-dist/tex/generic/babel/babel.def
+++ b/Master/texmf-dist/tex/generic/babel/babel.def
@@ -41,7 +41,7 @@
     \wlog{File: #1 #4 #3 <#2>}%
     \let\ProvidesFile\@undefined}
 \fi
-\ProvidesFile{babel.def}[2018/10/03 3.25 Babel common definitions]
+\ProvidesFile{babel.def}[2018/10/16 3.26 Babel common definitions]
 \ifx\AtBeginDocument\@undefined
   \input plain.def\relax
 \fi
@@ -1405,28 +1405,31 @@
         \expandafter\bbl@intrapenalty\bbl@KVP@intrapenalty\@@
       \fi}%
   \or
-    \bbl@ifunset{bbl@intsp@\languagename}{}%
-      {\expandafter\ifx\csname bbl@intsp@\languagename\endcsname\@empty\else
-        \ifx\bbl@KVP@intraspace\@nil
-           \bbl@exp{%
-             \\\bbl@intraspace\bbl@cs{intsp@\languagename}\\\@@}%
+    \bbl@xin@{\bbl@cs{sbcp@\languagename}}{Thai,Laoo,Khmr}%
+    \ifin@
+      \bbl@ifunset{bbl@intsp@\languagename}{}%
+        {\expandafter\ifx\csname bbl@intsp@\languagename\endcsname\@empty\else
+          \ifx\bbl@KVP@intraspace\@nil
+             \bbl@exp{%
+               \\\bbl@intraspace\bbl@cs{intsp@\languagename}\\\@@}%
+          \fi
+          \ifx\bbl@KVP@intrapenalty\@nil
+            \bbl@intrapenalty0\@@
+          \fi
         \fi
-        \ifx\bbl@KVP@intrapenalty\@nil
-          \bbl@intrapenalty0\@@
+        \ifx\bbl@KVP@intraspace\@nil\else % We may override the ini
+          \expandafter\bbl@intraspace\bbl@KVP@intraspace\@@
         \fi
-      \fi
-      \ifx\bbl@KVP@intraspace\@nil\else % We may override the ini
-        \expandafter\bbl@intraspace\bbl@KVP@intraspace\@@
-      \fi
-      \ifx\bbl@KVP@intrapenalty\@nil\else
-        \expandafter\bbl@intrapenalty\bbl@KVP@intrapenalty\@@
-      \fi
-      \ifx\bbl@ispacesize\@undefined
-        \AtBeginDocument{%
-          \expandafter\bbl@add
-          \csname selectfont \endcsname{\bbl@ispacesize}}%
-        \def\bbl@ispacesize{\bbl@cs{xeisp@\bbl@cs{sbcp@\languagename}}}%
-      \fi}%
+        \ifx\bbl@KVP@intrapenalty\@nil\else
+          \expandafter\bbl@intrapenalty\bbl@KVP@intrapenalty\@@
+        \fi
+        \ifx\bbl@ispacesize\@undefined
+          \AtBeginDocument{%
+            \expandafter\bbl@add
+            \csname selectfont \endcsname{\bbl@ispacesize}}%
+          \def\bbl@ispacesize{\bbl@cs{xeisp@\bbl@cs{sbcp@\languagename}}}%
+        \fi}%
+    \fi
   \fi
   % Native digits, if provided in ini
   \ifcase\bbl@engine\else
diff --git a/Master/texmf-dist/tex/generic/babel/babel.sty b/Master/texmf-dist/tex/generic/babel/babel.sty
index 221bc62f33b..93026515a73 100644
--- a/Master/texmf-dist/tex/generic/babel/babel.sty
+++ b/Master/texmf-dist/tex/generic/babel/babel.sty
@@ -33,7 +33,7 @@
 %%
 
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
-\ProvidesPackage{babel}[2018/10/03 3.25 The Babel package]
+\ProvidesPackage{babel}[2018/10/16 3.26 The Babel package]
 \@ifpackagewith{babel}{debug}
   {\providecommand\bbl@trace[1]{\message{^^J[ #1 ]}}%
    \let\bbl@debug\@firstofone}
diff --git a/Master/texmf-dist/tex/generic/babel/hyphen.cfg b/Master/texmf-dist/tex/generic/babel/hyphen.cfg
index 31a45fe1d36..c6c8b671b11 100644
--- a/Master/texmf-dist/tex/generic/babel/hyphen.cfg
+++ b/Master/texmf-dist/tex/generic/babel/hyphen.cfg
@@ -37,7 +37,7 @@
     \wlog{File: #1 #4 #3 <#2>}%
     \let\ProvidesFile\@undefined}
 \fi
-\ProvidesFile{hyphen.cfg}[2018/10/03 3.25 Babel hyphens]
+\ProvidesFile{hyphen.cfg}[2018/10/16 3.26 Babel hyphens]
 \xdef\bbl@format{\jobname}
 \ifx\AtBeginDocument\@undefined
   \def\@empty{}
diff --git a/Master/texmf-dist/tex/generic/babel/nil.ldf b/Master/texmf-dist/tex/generic/babel/nil.ldf
index 588216ac805..48f3b6d27ee 100644
--- a/Master/texmf-dist/tex/generic/babel/nil.ldf
+++ b/Master/texmf-dist/tex/generic/babel/nil.ldf
@@ -32,7 +32,7 @@
 %% extension |.ins|) which are part of the distribution.
 %%
 
-\ProvidesLanguage{nil}[2018/10/03 3.25 Nil language]
+\ProvidesLanguage{nil}[2018/10/16 3.26 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 3487910b226..0d9ced0dfc7 100644
--- a/Master/texmf-dist/tex/generic/babel/switch.def
+++ b/Master/texmf-dist/tex/generic/babel/switch.def
@@ -37,7 +37,7 @@
     \wlog{File: #1 #4 #3 <#2>}%
     \let\ProvidesFile\@undefined}
 \fi
-\ProvidesFile{switch.def}[2018/10/03 3.25 Babel switching mechanism]
+\ProvidesFile{switch.def}[2018/10/16 3.26 Babel switching mechanism]
 \ifx\AtBeginDocument\@undefined
   \input plain.def\relax
 \fi
@@ -58,8 +58,8 @@
   \countdef\last@language=19
   \def\addlanguage{\alloc@9\language\chardef\@cclvi}
 \fi
-\def\bbl@version{3.25}
-\def\bbl@date{2018/10/03}
+\def\bbl@version{3.26}
+\def\bbl@date{2018/10/16}
 \def\adddialect#1#2{%
   \global\chardef#1#2\relax
   \bbl@usehooks{adddialect}{{#1}{#2}}%