babel (18oct18)

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

4 files changed, 30 insertions, 25 deletions

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