1 files changed, 21 insertions, 6 deletions
diff --git a/Master/texmf-dist/tex/latex/polyglossia/polyglossia.sty b/Master/texmf-dist/tex/latex/polyglossia/polyglossia.sty
index 7e5c3251f61..e56d5a9e70a 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/polyglossia.sty
+++ b/Master/texmf-dist/tex/latex/polyglossia/polyglossia.sty
@@ -1,5 +1,5 @@
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{polyglossia}[2013/06/27 v1.33.4
+\ProvidesPackage{polyglossia}[2014/05/21 v1.33.5
   Babel replacement for XeLaTeX and LuaTeX]
 \RequirePackage{etoolbox}
 \RequirePackage{makecmds}
@@ -10,6 +10,8 @@
 % LuaTeX, but it's not if we run XeTeX, and we need it to know which of
 % the two engines it is!  Hence we include it here.
 \RequirePackage{ifluatex}
+% For symmetry with ifluatex
+\RequirePackage{ifxetex}
 % fontspec now uses LaTeX3 packages such as expl3, so we need this:
 \ExplSyntaxOn
 
@@ -211,8 +213,17 @@
     \ifcsundef{l@#1}%
       {\xpg@nopatterns{\csname xpg@langname@#1\endcsname}%
        \expandafter\adddialect\csname l@#1\endcsname\l@nohyphenation\relax}{}%
-    \csdef{#1@language}{\language=\csname l@#1\endcsname\ifluatex\directlua{polyglossia.select_language('\luatexluaescapestring{\string#1}', \the\csname l@#1\endcsname)}\fi}%
+    \csdef{#1@language}{%
+      \ifbool{xpg@hyphenation@disabled}{%
+        \xdef\xpg@lastlanguage{\the\csname l@#1\endcsname}%
+      }{%
+        \ifluatex%
+          \xpg@set@language@luatex@ii{#1}%
+        \fi%
+        \language=\csname l@#1\endcsname%
+      }%
     }%
+  }%
   \define@choicekey+[xpg@setup]{#1}{direction}[\val\nr]{LR,RL}[LR]%
     {\ifcase\nr\relax
         \togglefalse{#1@RL}%
@@ -646,9 +657,13 @@
    \docsvlist{#1}}%
 
 \def\common@language{% FIXME is this really needed???
-   \language=\z@
-   \lefthyphenmin=\tw@
-   \righthyphenmin=\thr@@}
+  \ifbool{xpg@hyphenation@disabled}{%
+    \xdef\xpg@lastlanguage{\z@}%
+  }{%
+    \language=\z@
+  }%
+  \lefthyphenmin=\tw@
+  \righthyphenmin=\thr@@}
 
 \def\noextrascurrent#1{\csuse{noextras@#1}}
 
@@ -729,7 +744,7 @@
        \global\@namedef{lu@texhyphen@loaded@\the\language}{}%
        \directlua{polyglossia.select_language('\luatexluaescapestring{\string#1}', \the\csname l@#1\endcsname)}%
      \fi %
-   \fi %                                          
+   \fi %
    \xpg@initial@setup%
    \select@@language{#1}%
    \ifcsundef{setRL}{}%