polyglossia (14may15)

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

14 files changed, 253 insertions, 47 deletions

diff --git a/Master/texmf-dist/tex/latex/polyglossia/farsical.sty b/Master/texmf-dist/tex/latex/polyglossia/farsical.sty
index b78d29809c3..7c715c82471 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/farsical.sty
+++ b/Master/texmf-dist/tex/latex/polyglossia/farsical.sty
@@ -1,7 +1,8 @@
 \ProvidesPackage{farsical}
         [2008/07/02 v0.1 %
          Farsi (jalali) calendar]
-\RequirePackage{bidi,calc,arabicnumbers}
+\ifluatex\RequirePackage{luabidi}\else\RequirePackage{bidi}\fi
+\RequirePackage{calc,arabicnumbers}
 
 %TODO - rewrite completely using calc 
 %%    - use Reingold & Dershowitz ME
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-arabic.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-arabic.ldf
index 2d5e2441502..441b2f2dd28 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-arabic.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-arabic.ldf
@@ -5,7 +5,7 @@ I will proceed with the compilation, but\MessageBreak
 the output is not guaranteed to be correct\MessageBreak
 and may look very wrong.}
 \fi
-\RequirePackage{bidi}
+\RequireBidi
 \RequirePackage{arabicnumbers}
 \RequirePackage{hijrical}
 
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-divehi.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-divehi.ldf
index 19f539f521b..8685b26c5df 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-divehi.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-divehi.ldf
@@ -5,7 +5,7 @@ I will proceed with the compilation, but\MessageBreak
 the output is not guaranteed to be correct\MessageBreak
 and may look very wrong.}
 \fi
-\RequirePackage{bidi}
+\RequireBidi
 \PolyglossiaSetup{divehi}{
   script=Thaana,
   scripttag=thaa,
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-farsi.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-farsi.ldf
index d74ade2a03a..f9149badf6e 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-farsi.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-farsi.ldf
@@ -5,7 +5,7 @@ I will proceed with the compilation, but\MessageBreak
 the output is not guaranteed to be correct\MessageBreak
 and may look very wrong.}
 \fi
-\RequirePackage{bidi}
+\RequireBidi
 \RequirePackage{arabicnumbers}
 \RequirePackage{farsical}
 \RequirePackage{hijrical}
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-german.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-german.ldf
index e3e343c48eb..8e6674fdcef 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-german.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-german.ldf
@@ -35,11 +35,22 @@
 
 \newif\if@austrian@locale
 \@austrian@localefalse
+\newif\if@swiss@locale
+\@swiss@localefalse
 \def\tmp@austrian{austrian}
+\def\tmp@swiss{swiss}
 \define@key{german}{variant}[german]{%
 	\def\@tmpa{#1}%
 	\ifx\@tmpa\tmp@austrian\@austrian@localetrue\else
 	  \@austrian@localefalse%
+	\fi
+	\ifx\@tmpa\tmp@swiss\@swiss@localetrue
+	  \ifcsundef{l@swissgerman}%
+	    {\xpg@warning{No hyphenation patterns were loaded for "Swiss German (Old Spelling)"\MessageBreak
+	      I will use the standard patterns for German (old spelling) instead}%
+	    \adddialect\l@swissgerman\l@german\relax}{}%
+	\else
+	  \@swiss@localefalse%
 	\fi}
 
 \newif\if@german@fraktur
@@ -54,7 +65,7 @@
 
 \define@boolkey{german}[german@]{babelshorthands}[true]{}
 
-\setkeys{german}{spelling,latesthyphen,script}
+\setkeys{german}{spelling,latesthyphen,script,variant}
 
 \ifsystem@babelshorthands
   \setkeys{german}{babelshorthands=true}
@@ -145,6 +156,10 @@
   \def\enclname{Beilage(n)}%
 }
 
+\def\captions@german@swiss{%
+  \def\enclname{Beilage(n)}%
+}
+
 %%Strings for Fraktur contributed by Gerrit <z0idberg . gmx . de>
 \def\captions@german@fraktur{%
   \captions@german%
@@ -166,6 +181,7 @@
 \def\captionsgerman{%
   \if@german@fraktur\captions@german@fraktur\else\captions@german\fi
   \if@austrian@locale\captions@german@austrian\fi
+  \if@swiss@locale\captions@german@swiss\fi
 }
 
 \def\dategerman{%
@@ -173,13 +189,43 @@
 }
 
 \def\german@language{\language=%
-  \csname l@\if@german@oldspelling\else n\fi german\ifgerman@latesthyphen -x-latest\fi\endcsname
+  \csname l@%
+    \if@swiss@locale
+       \if@german@oldspelling
+           swissgerman%
+       \else
+            ngerman%
+            \ifgerman@latesthyphen
+                -x-latest
+            \fi
+        \fi
+    \else% (german, austrian)
+      \if@german@oldspelling\else n\fi german\ifgerman@latesthyphen -x-latest\fi
+    \fi
+  \endcsname
   % LuaTeX
-  % \let\pattname{\if@german@oldspelling\else n\fi german\ifgerman@latesthyphen -x-latest\fi}
-  % \xpg@set@language@luatex@ii{\pattname}}
   \ifgerman@latesthyphen
-    \if@german@oldspelling\xpg@set@language@luatex@ii{german-x-latest}\else\xpg@set@language@luatex@ii{ngerman-x-latest}\fi
-    \else\if@german@oldspelling\xpg@set@language@luatex@ii{german}\else\xpg@set@language@luatex@ii{ngerman}\fi\fi}
+    \if@german@oldspelling
+        \if@swiss@locale
+            \xpg@set@language@luatex@ii{swissgerman}
+        \else
+            \xpg@set@language@luatex@ii{german-x-latest}
+        \fi
+    \else
+        \xpg@set@language@luatex@ii{ngerman-x-latest}
+    \fi
+  \else% (latesthyphen=false)
+    \if@german@oldspelling
+        \if@swiss@locale
+            \xpg@set@language@luatex@ii{swissgerman}
+        \else
+            \xpg@set@language@luatex@ii{german}
+        \fi
+    \else
+        \xpg@set@language@luatex@ii{ngerman}
+    \fi
+  \fi
+}
 
 \def\noextras@german{%
   \nogerman@shorthands%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-hebrew.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-hebrew.ldf
index 73163d1b5a6..cb6ed7ef2b6 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-hebrew.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-hebrew.ldf
@@ -5,7 +5,7 @@ I will proceed with the compilation, but\MessageBreak
 the output is not guaranteed to be correct\MessageBreak
 and may look very wrong.}
 \fi
-\RequirePackage{bidi}
+\RequireBidi
 \RequirePackage{hebrewcal}
 
 \providebool{@hebrew@marcheshvan}
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-latin.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-latin.ldf
index 66be7360066..7170dd7553a 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-latin.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-latin.ldf
@@ -1,12 +1,109 @@
+% !TEX encoding = UTF-8 Unicode
 \ProvidesFile{gloss-latin.ldf}[polyglossia: module for latin]
 \PolyglossiaSetup{latin}{
-  hyphennames={latin},
-  hyphenmins={2,2},
+%  hyphennames={latin},
+%  hyphenmins={2,2},
   frenchspacing=true,
   fontsetup=true,
 }
 
-\def\captionslatin{%
+
+\define@boolkey{latin}[latin@]{babelshorthands}[true]{}
+
+
+\ifsystem@babelshorthands
+  \setkeys{latin}{babelshorthands=true}
+\else
+  \setkeys{latin}{babelshorthands=false}
+\fi
+
+
+\ifcsundef{initiate@active@char}{%
+\input{babelsh.def}%
+}{}\initiate@active@char{"}%
+
+
+
+\def\latin@shorthands{%
+  \bbl@activate{"}%
+  \def\language@group{latin}%
+  \declare@shorthand{latin}{"}{%
+    \relax\ifmmode
+      \def\xpgla@next{''}%
+    \else
+      \def\xpgla@next{\futurelet\xpgla@temp\xpgla@cwm}%
+    \fi
+  \xpgla@next}%
+}
+
+
+\def\xpgla@allowhyphens{\bbl@allowhyphens\discretionary{-}{}{}\bbl@allowhyphens}
+\newcommand*{\xpgla@cwm}{\let\xpgla@@next\relax
+  \ifcat\noexpand\xpgla@temp a%
+    \let\xpgla@@next\xpgla@allowhyphens
+  \else
+    \ifx\xpgla@temp\ae
+        \let\xpgla@@next\xpgla@allowhyphens
+    \else
+        \ifx\xpgla@temp\oe
+           \let\xpgla@@next\xpgla@allowhyphens
+        \else
+           \if\noexpand\xpgla@temp\string|%
+              \def\xpgla@@next{\xpgla@allowhyphens\@gobble}%
+           \fi
+        \fi
+    \fi
+  \fi
+  \xpgla@@next}%
+
+\def\nolatin@shorthands{%
+  \@ifundefined{initiate@active@char}{}{\bbl@deactivate{"}}%
+}
+
+
+% set modern as default
+\def\latin@variant{\l@latin}%
+\def\captionslatin{\modernlatincaptions}%
+\def\datelatin{\modernlatindate}%
+\def\classicuclccodes{\lccode`\V=`\u \uccode`\u=`\V}
+
+\def\tmp@modern{modern}
+\def\tmp@medieval{medieval}
+\def\tmp@classic{classic}
+
+\define@key{latin}{variant}[modern]{%
+\def\@tempa{#1}%
+\ifx\@tempa\tmp@medieval
+  \def\latin@variant{\l@latin}%
+  \def\captionslatin{\medievallatincaptions}%
+  \def\datelatin{\classiclatindate}% 
+  \classicuclccodes
+  \xpg@info{Option: Medieval Latin}%
+\else
+  \ifx\@tempa\tmp@classic
+    \ifx\l@classiclatin\undefined
+       \xpg@nopatterns{Classic Latin}%
+       \adddialect\l@classiclatin\l@latin
+       \def\latin@variant{\l@latin}%
+    \else
+      \def\latin@variant{\l@classiclatin}%
+    \fi
+    \def\captionslatin{\modernlatincaptions}%
+    \def\datelatin{\classiclatindate}%
+    \classicuclccodes
+    \xpg@info{Option: Classic Latin}%
+  \else
+    \def\latin@variant{\l@latin}%
+    \def\captionslatin{\modernlatincaptions}%
+    \def\datelatin{\modernlatindate}%
+    \xpg@info{Option: Modern Latin}%
+  \fi
+\fi
+}
+
+\def\latin@language{\language=\latin@variant}%
+
+\def\modernlatincaptions{%
    \def\prefacename{Praefatio}%
    \def\refname{Conspectus librorum}%
    \def\abstractname{Summarium}%
@@ -23,13 +120,38 @@
    \def\enclname{Additur}%
    \def\ccname{Exemplar}%
    \def\headtoname{\ignorespaces}%
-   \def\pagename{pagina}%
+   \def\pagename{charta}%
+   \def\seename{cfr.}%
+   \def\alsoname{cfr.}%
+   \def\proofname{Demonstratio}%
+   \def\glossaryname{Glossarium}%
+   }
+      
+\def\medievallatincaptions{%
+   \def\prefacename{Præfatio}%
+   \def\refname{Conspectus librorum}%
+   \def\abstractname{Summarium}%
+   \def\bibname{Conspectus librorum}%
+   \def\chaptername{Caput}%
+   \def\appendixname{Additamentum}%
+   \def\contentsname{Index}%
+   \def\listfigurename{Conspectus descriptionum}%
+   \def\listtablename{Conspectus tabularum}%
+   \def\indexname{Index rerum notabilium}%
+   \def\figurename{Descriptio}%
+   \def\tablename{Tabula}%
+   \def\partname{Pars}%
+   \def\enclname{Additur}%
+   \def\ccname{Exemplar}%
+   \def\headtoname{\ignorespaces}%
+   \def\pagename{charta}%
    \def\seename{cfr.}%
    \def\alsoname{cfr.}%
    \def\proofname{Demonstratio}%
    \def\glossaryname{Glossarium}%
    }
-\def\datelatin{%   
+
+\def\modernlatindate{%   
    \def\today{\uppercase\expandafter{\romannumeral\day}%
       \space \ifcase\month%
       \or Januarii\or Februarii\or Martii\or Aprilis\or Maji\or Junii\or%
@@ -37,4 +159,40 @@
       Decembris\fi%
       \space \uppercase\expandafter{\romannumeral\year}}}
 
+\def\classiclatindate{%   
+   \def\today{\uppercase\expandafter{\romannumeral\day}%
+      \space \ifcase\month
+      \or Januarii\or Februarii\or Martii\or Aprilis\or Maii\or Junii\or
+      Julii\or Augusti\or Septembris\or Octobris\or Nouembris\or
+      Decembris\fi
+      \space \uppercase\expandafter{\romannumeral\year}}}
+      
+\let\xpgla@savedvalues\empty
+\AtEndPreamble{% the user or the class might define different values
+  \edef\xpgla@savedvalues{%
+    \clubpenalty=\the\clubpenalty\space
+    \@clubpenalty=\the\@clubpenalty\space
+    \widowpenalty=\the\widowpenalty\space
+    \finalhyphendemerits=\the\finalhyphendemerits}
+}
+
+
+\def\noextras@latin{%
+   \lccode\string"2019=\z@
+   \nolatin@shorthands
+   \xpgla@savedvalues
+}
+
+\def\blockextras@latin{%
+   \lccode\string"2019=\string"2019
+   \clubpenalty=3000 \@clubpenalty=3000 \widowpenalty=3000
+   \finalhyphendemerits=50000000
+   \iflatin@babelshorthands\latin@shorthands\fi
+}
+
+\def\inlineextras@latin{%
+   \lccode\string"2019=\string"2019
+   \iflatin@babelshorthands\latin@shorthands\fi
+}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-syriac.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-syriac.ldf
index 0cda3fd0e0a..817a6f29bc9 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-syriac.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-syriac.ldf
@@ -5,7 +5,7 @@ I will proceed with the compilation, but\MessageBreak
 the output is not guaranteed to be correct\MessageBreak
 and may look very wrong.}
 \fi
-\RequirePackage{bidi}
+\RequireBidi
 \RequirePackage{arabicnumbers}
 
 \PolyglossiaSetup{syriac}{
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-tibetan.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-tibetan.ldf
index 3ca18cf0c96..e5702096b73 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-tibetan.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-tibetan.ldf
@@ -141,43 +141,31 @@
 }
 
 \def\tibetan@globalnumbers{%
-   \let\orig@arabic\@arabic%
+   \let\xpg@orig@arabic\@arabic%
    \let\@arabic\tibetannumber%
    \renewcommand{\thefootnote}{\protect\tibetannumber{\c@footnote}}%
 }
 
 \def\notibetan@globalnumbers{%
-   \let\@arabic\orig@arabic%
+   \let\@arabic\xpg@orig@arabic%
    \renewcommand\thefootnote{\protect\number{\c@footnote}}%
 }
 
 \def\noextras@tibetan{%
    \notibetan@eol%
-   \let\baselinestrech\orig@baselinestretch%
-   }
-
-\def\blockextras@tibetan{%
-   % copied from Thai, not tested
-   \let\orig@baselinestrech\baselinestretch%
-   \renewcommand{\baselinestretch}{1.2}%
-   \tibetan@eol%
+   \ifcsname xpg@orig@baselinestretch\endcsname\renewcommand{\baselinestretch}{\xpg@orig@baselinestretch}\fi %
    }
 
 \def\inlineextras@tibetan{%
-   \let\orig@baselinestrech\baselinestretch%
+   \xdef\xpg@orig@baselinestretch{\ifcsname baselinestretch\endcsname \baselinestretch \else 1\fi}%
    \renewcommand{\baselinestretch}{1.2}%
    \tibetan@eol%
    }
 
 \def\blockextras@tibetan{%
-   \let\orig@baselinestrech\baselinestretch%
+   \xdef\xpg@orig@baselinestretch{\ifcsname baselinestretch\endcsname \baselinestretch \else 1\fi}%
    \renewcommand{\baselinestretch}{1.2}%
    \tibetan@eol%
 }
 
-\def\noblockextras@tibetan{%
-   \notibetan@eol%
-   \let\baselinestrech\orig@baselinestretch%
-}
-
 \endinput
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-turkish.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-turkish.ldf
index 7df181f50cb..e937e7bf009 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-turkish.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-turkish.ldf
@@ -76,7 +76,7 @@
     Ocak\or Şubat\or Mart\or Nisan\or Mayıs\or Haziran\or
     Temmuz\or Ağustos\or Eylül\or Ekim\or Kasım\or
     Aralık\fi
-    \space\number\year}
+    \space\number\year}%
 }
 \def\hijrimonthturkish#1{\ifcase#1%
 \or Muharrem\or Safer\or Rebiülevvel\or Rebiülahir\or Cemaziyelevvel\or Cemaziyelahir\or Recep\or Şaban\or Ramazan\or Şevval\or Zilkade\or Zilhicce\fi}
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ukrainian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ukrainian.ldf
index e7001edda42..b6656ea5274 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ukrainian.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ukrainian.ldf
@@ -54,11 +54,13 @@
     грудня\fi%
     \space\number\year~р.}}
 
+\def\Asbuk#1{\expandafter\ukrainian@Alph\csname c@#1\endcsname}
 \def\ukrainian@Alph#1{\ifcase#1\or
    А\or Б\or В\or г\or д\or Е\or Є\or Ж\or
    З\or И\or І\or Ї\or Й\or К\or Л\or М\or Н\or О\or
    П\or Р\or С\or Т\or У\or Ф\or Х\or
    Ц\or Ч\or Ш\or Щ\or Ю\or Я\else\xpg@ill@value{#1}{ukrainian@Alph}\fi}
+\def\asbuk#1{\expandafter\ukrainian@alph\csname c@#1\endcsname}
 \def\ukrainian@alph#1{\ifcase#1\or
    а\or б\or в\or г\or д\or е\or є\or ж\or
    з\or и\or і\or ї\or й\or к\or л\or м\or н\or о\or
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-urdu.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-urdu.ldf
index e092125e2ff..31e998dede3 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-urdu.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-urdu.ldf
@@ -6,7 +6,7 @@ I will proceed with the compilation, but\MessageBreak
 the output is not guaranteed to be correct\MessageBreak
 and may look very wrong.}
 \fi
-\RequirePackage{bidi}
+\RequireBidi
 \RequirePackage{arabicnumbers}
 \RequirePackage{hijrical}
 
diff --git a/Master/texmf-dist/tex/latex/polyglossia/hebrewcal.sty b/Master/texmf-dist/tex/latex/polyglossia/hebrewcal.sty
index c75b2f5faa9..bf50422c19b 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/hebrewcal.sty
+++ b/Master/texmf-dist/tex/latex/polyglossia/hebrewcal.sty
@@ -1,8 +1,8 @@
 \ProvidesPackage{hebrewcal}
-        [2012/04/29 v2.5 %
+        [2015/04/17 v2.6 %
          Hebrew calendar for polyglossia (adapted from hebcal.sty in Babel)]
 \RequirePackage{xkeyval}
-\RequirePackage{bidi}
+\ifluatex\RequirePackage{luabidi}\else\RequirePackage{bidi}\fi
 
 \newif\if@xpg@hebrewcal@marcheshvan
 \DeclareOption{marcheshvan}{\@xpg@hebrewcal@marcheshvantrue}
@@ -38,20 +38,20 @@
 \def\HebrewYearName#1{{%
    \@tempcnta=#1\divide\@tempcnta by 1000\multiply\@tempcnta by 1000
    \ifnum#1=\@tempcnta\relax % divisible by 1000: disambiguate
-     \hebrewnumeral{#1}\ (לפ"ג)%
+     \Hebrewnumeral{#1}\ (לפ"ג)%
    \else % not divisible by 1000
      \ifnum#1<1000\relax     % first millennium: disambiguate
-       \hebrewnumeral{#1}\ (לפ"ג)%
+       \Hebrewnumeral{#1}\ (לפ"ג)%
      \else 
        \ifnum#1<5000
-         \hebrewnumeral{#1}%
+         \Hebrewnumeral{#1}%
        \else
          \ifnum#1<6000 % current millenium, print without thousands
            \@tempcnta=#1\relax
            \if@hebrew@fullyear\else\advance\@tempcnta by -5000\fi
-           \hebrewnumeral{\@tempcnta}%
+           \Hebrewnumeral{\@tempcnta}%
          \else % #1>6000
-           \hebrewnumeral{#1}%
+           \Hebrewnumeral{#1}%
          \fi
        \fi
      \fi
@@ -81,7 +81,7 @@
         \fi%
     \fi}
 \def\@FormatForHebrew#1#2#3{%
-  \hebrewnumeral{#1}~ב\HebrewMonthName{#2}{#3}~%
+  \Hebrewnumeral{#1}~ב\HebrewMonthName{#2}{#3}~%
   \HebrewYearName{#3}}
 \def\HebrewMonthNameInEnglish#1#2{%
     \ifnum #1 = 7%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/polyglossia.sty b/Master/texmf-dist/tex/latex/polyglossia/polyglossia.sty
index e56d5a9e70a..f9ff8a47ddd 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/polyglossia.sty
+++ b/Master/texmf-dist/tex/latex/polyglossia/polyglossia.sty
@@ -1,6 +1,6 @@
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{polyglossia}[2014/05/21 v1.33.5
-  Babel replacement for XeLaTeX and LuaTeX]
+\ProvidesPackage{polyglossia}[2015/05/13 v1.33.6
+  Alternative to Babel for XeLaTeX and LuaLaTeX]
 \RequirePackage{etoolbox}
 \RequirePackage{makecmds}
 \RequirePackage{xkeyval}[2008/08/13]
@@ -64,6 +64,17 @@
 \def\@@ensure@dir#1{\ifcsundef{@ensure@dir}{#1}{\@ensure@dir{#1}}}
 \def\@@ensure@maindir#1{\ifcsundef{@ensure@maindir}{#1}{\@ensure@maindir{#1}}}
 
+%% Used by the language definitions files for right-to-left languages
+\def\RequireBidi{%
+  \ifxetex
+    \RequirePackage{bidi}
+  \else\ifluatex
+    \RequirePackage{luabidi}
+  \else
+    \xpg@warning{You’re running a TeX engine that is not LuaTeX or XeTeX.\MessageBreak
+That is almost guaranteed to cause problems.}
+  \fi\fi}
+
 %% compatibility with babel
 \let\addto\gappto% gappto is defined in etoolbox
 
@@ -791,7 +802,7 @@
 
 \define@boolkey{polyglossia}[system@]{babelshorthands}[false]{}
 
-\AtEndPreamble{\@ifpackageloaded{bidi}{\newcommand*{\aemph}[1]{$\overline{\hboxR{#1}}$}}{}}
+\AtEndPreamble{\@ifpackageloaded{bidi}{\providecommand*{\aemph}[1]{$\overline{\hboxR{#1}}$}}{}}
 
 %% Package Options %%
 \DeclareOption{nolocalmarks}{\setkeys{polyglossia}{localmarks=false}}