polyglossia (15may13)

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

4 files changed, 11 insertions, 417 deletions

diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-english.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-english.ldf
index f10c7197748..b1685259ce6 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-english.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-english.ldf
@@ -57,7 +57,7 @@
       {\xpg@warning{No hyphenation patterns were loaded for British English\MessageBreak
          I will use the patterns for US English instead}%
        \adddialect\l@ukenglish\l@english\relax}{}%
-    \gdef\english@language{\language=\l@ukenglish}%
+    \gdef\english@language{\language=\l@ukenglish\xpg@set@language@luatex@ii{ukenglish}}%
   \fi
   % and we reset \do to its previous definition here:
   \renewcommand*{\do}[1]{\setotherlanguage{#1}}%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-german.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-german.ldf
index b9a79ee33b2..ea0c2100969 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-german.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-german.ldf
@@ -159,7 +159,11 @@
 }
 
 \def\german@language{\language=%
-  \csname l@\if@german@oldspelling\else n\fi german\ifgerman@latesthyphen -x-latest\fi\endcsname}
+  \csname l@\if@german@oldspelling\else n\fi german\ifgerman@latesthyphen -x-latest\fi\endcsname
+  % LuaTeX
+  % \let\pattname{\if@german@oldspelling\else n\fi german\ifgerman@latesthyphen -x-latest\fi}
+  % \xpg@set@language@luatex@ii{\pattname}}
+  \if@german@oldspelling\xpg@set@language@luatex@ii{german}\else\xpg@set@language@luatex@ii{ngerman}\fi}
 
 \def\noextras@german{%
   \nogerman@shorthands%
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-greek-new.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-greek-new.ldf
deleted file mode 100644
index 1b8864cd214..00000000000
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-greek-new.ldf
+++ /dev/null
@@ -1,410 +0,0 @@
-\ProvidesFile{gloss-greek.ldf}[polyglossia: module for greek]
-\PolyglossiaSetup{greek}{
-  script=Greek,
-  scripttag=grek,
-  frenchspacing=true,
-  indentfirst=true,
-  fontsetup=true,
-  %TODO localalph={greek@alph,greek@Alph}
-}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% The code in this file was initially adapted from the antomega
-%% module for greek. Currently large parts of it derive from the 
-%% package xgreek.sty (c) Apostolos Syropoulos 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% this file imported from xgreek fixes the \lccode and \uccode of Greek letters:
-\input{xgreek-fixes.def}
-
-%TODO: set these in \define@key instead:
-\ifx\l@greek\@undefined
-  \ifx\l@polygreek\@undefined
-    \xpg@nopatterns{Greek}%
-    \adddialect\l@greek\l@nohyphenation
-  \else
-    \let\l@greek\l@polygreek
-  \fi
-\fi
-\ifx\l@monogreek\@undefined
-  \xpg@warning{No hyphenation patterns were loaded for Monotonic Greek\MessageBreak
-         I will use the patterns loaded for \string\l@greek instead}
-  \adddialect\l@monogreek\l@greek
-\fi
-\ifx\l@ancientgreek\@undefined
-  \xpg@warning{No hyphenation patterns were loaded for Ancient Greek\MessageBreak
-         I will use the patterns loaded for \string\l@greek instead}
-  \adddialect\l@ancientgreek\l@greek
-\fi
-
-%set monotonic as default
-\def\greek@variant{\l@monogreek}% monotonic
-\def\captionsgreek{\monogreekcaptions}%
-\def\dategreek{\datemonogreek}%
-
-\def\tmp@mono{mono}
-\def\tmp@monotonic{monotonic}
-\def\tmp@poly{poly}
-\def\tmp@polytonic{polytonic}
-\def\tmp@ancient{ancient}
-\def\tmp@ancientgreek{ancientgreek}
-
-\define@key{greek}{variant}[monotonic]{%
-  \def\@tmpa{#1}%
-  \ifx\@tmpa\tmp@poly\def\@tmpa{polytonic}\fi
-  \ifx\@tmpa\tmp@ancientgreek\def\@tmpa{ancient}\fi
-  \ifx\@tmpa\tmp@polytonic%
-    \def\greek@variant{\l@polygreek}%
-    \def\captionsgreek{\polygreekcaptions}%
-    \def\dategreek{\datepolygreek}%
-    \xpg@info{Option: Polytonic Greek}%
-  \else
-    \ifx\@tmpa\tmp@ancient
-      \def\greek@variant{\l@ancientgreek}%
-      \def\captionsgreek{\ancientgreekcaptions}%
-      \def\dategreek{\dateancientgreek}%
-      \xpg@info{Option: Ancient Greek}%
-    \else %monotonic
-      \def\greek@variant{\l@monogreek}% monotonic
-      \def\captionsgreek{\monogreekcaptions}%
-      \def\dategreek{\datemonogreek}%
-      \xpg@info{Option: Monotonic Greek}%
-    \fi
-  \fi}
-
-\def\greek@language{\language=\greek@variant}
-
-\newif\if@greek@numerals
-\define@key{greek}{numerals}[greek]{%
-\ifstrequal{#1}{arabic}{\@greek@numeralsfalse}{\@greek@numeralstrue}}
-
-\define@boolkey{greek}{attic}[true]{\xpg@warning{Greek option `attic' is no longer required.}}
-
-% This sets the defaults
-\setkeys{greek}{numerals}
-
-\def\monogreekcaptions{%
-   \def\refname{Αναφορές}%
-   \def\abstractname{Περίληψη}%
-   \def\bibname{Βιβλιογραφία}%
-   \def\prefacename{Πρόλογος}%
-   \def\chaptername{Κεφάλαιο}%
-   \def\appendixname{Παράρτημα}%
-   \def\contentsname{Περιεχόμενα}%
-   \def\listfigurename{Κατάλογος σχημάτων}%
-   \def\listtablename{Κατάλογος πινάκων}%
-   \def\indexname{Ευρετήριο}%
-   \def\figurename{Σχήμα}%
-   \def\tablename{Πίνακας}%
-   \def\partname{Μέρος}%
-   \def\pagename{Σελίδα}%
-   \def\seename{βλέπε}%
-   \def\alsoname{βλέπε επίσης}%
-   \def\enclname{Συνημμένα}%
-   \def\ccname{Κοινοποίηση}%
-   \def\headtoname{Προς}%
-   \def\proofname{Απόδειξη}%
-   \def\glossaryname{Γλωσσάρι}}%
-
-\def\datemonogreek{%   
-   \def\today{\number\day\space%
-      \greek@month%
-      \space\number\year}%
-   \def\greektoday{\greeknumber\day\space%
-      \greek@month%
-      \space\greeknumber\year}%
-   \def\Greektoday{\Greeknumber\day\space%
-      \greek@month%
-      \space\Greeknumber\year}%
-   \def\greek@month{\ifcase\month\or%
-      Ιανουαρίου\or
-      Φεβρουαρίου\or
-      Μαρτίου\or
-      Απριλίου\or
-      Μαΐου\or
-      Ιουνίου\or
-      Ιουλίου\or
-      Αυγούστου\or
-      Σεπτεμβρίου\or
-      Οκτωβρίου\or
-      Νοεμβρίου\or
-      Δεκεμβρίου\fi}}%
-
-\def\polygreekcaptions{%
-   \def\refname{Ἀναφορές}%
-   \def\abstractname{Περίληψη}%
-   \def\bibname{Βιβλιογραφία}%
-   \def\prefacename{Πρόλογος}%
-   \def\chaptername{Κεφάλαιο}%
-   \def\appendixname{Παράρτημα}%
-   \def\contentsname{Περιεχόμενα}%
-   \def\listfigurename{Κατάλογος σχημάτων}%
-   \def\listtablename{Κατάλογος πινάκων}%
-   \def\indexname{Εὑρετήριο}%
-   \def\figurename{Σχῆμα}%
-   \def\tablename{Πίνακας}%
-   \def\partname{Μέρος}%
-   \def\pagename{Σελίδα}%
-   \def\seename{βλέπε}%
-   \def\alsoname{βλέπε ἐπίσης}%
-   \def\enclname{Συνημμένα}%
-   \def\ccname{Κοινοποίηση}%
-   \def\headtoname{Πρὸς}%
-   \def\proofname{Ἀπόδειξη}}%
-
-\def\datepolygreek{%   
-   \def\today{\number\day\space%
-      \greek@month%
-      \space\number\year}%
-   \def\greektoday{\greeknumber\day\space%
-      \greek@month%
-      \space\greeknumber\year}%
-   \def\Greektoday{\Greeknumber\day\space%
-      \greek@month%
-      \space\Greeknumber\year}%
-   \def\greek@month{\ifcase\month\or%
-      Ἰανουαρίου\or
-      Φεβρουαρίου\or
-      Μαρτίου\or
-      Ἀπριλίου\or
-      Μαΐου\or
-      Ἰουνίου\or
-      Ἰουλίου\or
-      Αὐγούστου\or
-      Σεπτεμβρίου\or
-      Ὀκτωβρίου\or
-      Νοεμβρίου\or
-      Δεκεμβρίου\fi}}%
-
-% this is copied verbatim from xgreek.sty:      
-\def\ancientgreekcaptions{%
-  \def\prefacename{Προοίμιον}%
-  \def\refname{Αναφοραί}%
-  \def\abstractname{Περίληψις}%
-  \def\bibname{Βιβλιογραφία}%
-  \def\chaptername{Κεφάλαιον}%
-  \def\appendixname{Παράρτημα}%
-  \def\contentsname{Περιεχόμενα}%
-  \def\listfigurename{Κατάλογος σχημάτων}%
-  \def\listtablename{Κατάλογος πινάκων}%
-  \def\indexname{Εὑρετήριον}%
-  \def\figurename{Σχήμα}%
-  \def\tablename{Πίναξ}%
-  \def\partname{Μέρος}%
-  \def\enclname{Συνημμένως}%
-  \def\ccname{Κοινοποίησις}%
-  \def\headtoname{Πρὸς}%
-  \def\pagename{Σελὶς}%
-  \def\seename{ὃρα}%
-  \def\alsoname{ὃρα ὡσαύτως}%
-  \def\proofname{Ἀπόδειξις}%
-  \def\glossaryname{Γλωσσάριον}%
-  \def\refname{Ἀναφοραὶ}%
-  \def\indexname{Εὑρετήριο}%
-  \def\figurename{Σχῆμα}%
-  \def\headtoname{Πρὸς}}%
-
-\def\dateancientgreek{%
-  \def\today{\number\day\space%
-      \greek@month%
-      \space\number\year}%
-   \def\greektoday{\greeknumber\day\space%
-      \greek@month%
-      \space\greeknumber\year}%
-   \def\Greektoday{\Greeknumber\day\space%
-      \greek@month%
-      \space\Greeknumber\year}%
-   \def\greek@month{\ifcase\month\or%
-      Ἰανουαρίου\or
-      Φεβρουαρίου\or
-      Μαρτίου\or
-      Ἀπριλίου\or
-      Μαΐου\or
-      Ἰουνίου\or
-      Ἰουλίου\or
-      Αὐγούστου\or
-      Σεπτεμβρίου\or
-      Ὀκτωβρίου\or
-      Νοεμβρίου\or
-      Δεκεμβρίου\fi}}
-
-% the code for alphabetic numbers and attic numerals
-% is not copied verbatim from xgreek.sty any more
-% it has been proposed by eg9 on issue 36 of the repository
-% see https://github.com/reutenauer/polyglossia/issues/36
-\newrobustcmd\anw@print{}
-\newrobustcmd\anw@false{%
-\renewrobustcmd\anw@print{}}
-\newrobustcmd\anw@true{%
-\renewrobustcmd\anw@print{ʹ}}
-\anw@true
-
-\protected\def\greeknumber#1{\expandafter\@greeknumber\expandafter{\number#1}}
-
-\def\@greeknumber#1{%
-\ifnum#1<\@ne\space\gr@ill@value{#1}%
-\else %
-\ifnum#1<10 \gr@num@i#1%
-\else %
-\ifnum#1<100 \gr@num@ii#1%
-\else %
-\ifnum#1<\@m \gr@num@iii#1%
-\else %
-\ifnum#1<\@M \gr@num@iv#1%
-\else %
-\ifnum#1<100000 \gr@num@v#1%
-\else %
-\ifnum#1<1000000 \gr@num@vi#1%
-\else %
-\space\gr@ill@value{#1}%
-\fi %
-\fi %
-\fi %
-\fi %
-\fi %
-\fi %
-\fi %
-}
-
-\protected\def\Greeknumber#1{\expandafter\@Greeknumber\expandafter{\number#1}}
-\def\@Greeknumber#1{%
-\ifnum#1<\@ne\space\gr@ill@value{#1}%
-\else %
-\ifnum#1<10 \gr@Num@i#1%
-\else %
-\ifnum#1<100 \gr@Num@ii#1%
-\else %
-\ifnum#1<\@m\gr@Num@iii#1%
-\else %
-\ifnum#1<\@M\gr@Num@iv#1%
-\else %
-\ifnum#1<100000 \gr@Num@v#1%
-\else %
-\ifnum#1<1000000 \gr@Num@vi#1%
-\else %
-\space\gr@ill@value{#1}%
-\fi %
-\fi %
-\fi %
-\fi %
-\fi %
-\fi %
-\fi %
-}
-
-\let\greeknumeral=\greeknumber
-\let\Greeknumeral=\Greeknumber
-
-\def\gr@num@i#1{%
-\ifcase#1 \or α\or β\or γ\or δ\or ε\or Ϛ\or ζ\or η\or θ\fi %
-\ifnum#1=\z@\else\anw@true\fi\anw@print}
-
-\def\gr@num@ii#1{%
-\ifcase#1 \or ι\or κ\or λ\or μ\or ν\or ξ\or ο\or π\or ϟ\fi %
-\ifnum#1=\z@\else\anw@true\fi\gr@num@i}
-
-\def\gr@num@iii#1{%
-\ifcase#1 \or ρ\or σ\or τ\or υ\or φ\or χ\or ψ\or ω\or ϡ\fi %
-\ifnum#1=\z@\anw@false\else\anw@true\fi\gr@num@ii}
-
-\def\gr@num@iv#1{%
-\ifnum#1=\z@\else ͵\fi %
-\ifcase#1 \or α\or β\or γ\or δ\or ε\or Ϛ\or ζ\or η\or θ\fi %
-\gr@num@iii}
-
-\def\gr@num@v#1{%
-\ifnum#1=\z@\else ͵\fi %
-\ifcase#1 \or ι\or κ\or λ\or μ\or ν\or ξ\or ο\or π\or ϟ\fi %
-\gr@num@iv}
-
-\def\gr@num@vi#1{%
-͵\ifcase#1 \or ρ\or σ\or τ\or υ\or φ\or χ\or ψ\or ω\or ϡ\fi %
-\gr@num@v}%
-
-\def\gr@Num@i#1{%
-\ifcase#1 \or Α\or Β\or Γ\or Δ\or Ε\or \MakeUppercase{Ϛ}\or Ζ\or Η\or θ\fi %
-\ifnum#1=\z@\else\anw@true\fi\anw@print}
-
-\def\gr@Num@ii#1{%
-\ifcase#1 \or Ι\or Κ\or Λ\or Μ\or Ν\or Ξ\or Ο\or Π\or \MakeUppercase{ϟ}\fi %
-\ifnum#1=\z@\else\anw@true\fi\gr@Num@i}
-
-\def\gr@Num@iii#1{%
-\ifcase#1 \or Ρ\or Σ\or Τ\or Υ\or Φ\or Χ\or Ψ\or Ω\or \MakeUppercase{ϡ}\fi %
-\ifnum#1=\z@\anw@false\else\anw@true\fi\gr@Num@ii}
-
-\def\gr@Num@iv#1{%
-\ifnum#1=\z@\else ͵\fi %
-\ifcase#1 \or Α\or Β\or Γ\or Δ\or Ε\or \MakeUppercase{Ϛ}\or Ζ\or Η\or θ\fi %
-\gr@Num@iii}
-
-\def\gr@Num@v#1{%
-\ifnum#1=\z@\else ͵\fi %
-\ifcase#1 \or Ι\or Κ\or Λ\or Μ\or Ν\or Ξ\or Ο\or Π\or \MakeUppercase{ϟ}\fi %
-\gr@Num@iv}
-
-\def\gr@Num@vi#1{%
-͵ \ifcase#1 \or Ρ\or Σ\or Τ\or Υ\or Φ\or Χ\or Ψ\or Ω\or \MakeUppercase{ϡ}\fi %
-\gr@Num@v}
-
-\def\gr@ill@value#1{\xpg@warning{Illegal value (#1) for Greek numeral}[$#1$]}
-
-%%%% Attic numerals (no longer optional)
-\newcount\@attic@num
-\DeclareRobustCommand*{\@@atticnum}[1]{%
-        \@attic@num#1\relax
-        \ifnum\@attic@num<\@ne%
-          \space%
-          \xpg@warning{Illegal value (\the\@attic@num) for acrophonic Attic numeral}%
-        \else\ifnum\@attic@num>249999%
-          \space%
-	  \xpg@warning{Illegal value (\the\@attic@num) for acrophonic Attic numeral}%
-        \else
-            \@whilenum\@attic@num>49999\do{%
-               \char"10147\advance\@attic@num-50000}%
-            \@whilenum\@attic@num>9999\do{%
-               M\advance\@attic@num-\@M}%
-            \ifnum\@attic@num>4999%
-               \char"10146\advance\@attic@num-5000%
-            \fi\relax
-            \@whilenum\@attic@num>999\do{%
-               Χ\advance\@attic@num-\@m}%
-            \ifnum\@attic@num>499%
-               \char"10145\advance\@attic@num-500%
-            \fi\relax
-            \@whilenum\@attic@num>99\do{%
-               Η\advance\@attic@num-100}%
-            \ifnum\@attic@num>49%
-               \char"10144\advance\@attic@num-50%
-            \fi\relax
-            \@whilenum\@attic@num>9\do{%
-               Δ\advance\@attic@num by-10}%
-            \@whilenum\@attic@num>4\do{%
-               Π\advance\@attic@num-5}%
-            \ifcase\@attic@num\or Ι\or ΙΙ\or ΙΙΙ\or ΙΙΙΙ\fi%
-   \fi\fi}
-\def\@atticnum#1{%
-     \expandafter\@@atticnum\expandafter{\the#1}}
-\def\atticnumeral#1{%
-     \@attic@num#1\relax
-     \@atticnum{\@attic@num}}
-\let\atticnum=\atticnumeral
-
-\def\greek@numbers{%
-   \let\latin@alph\@alph%
-   \let\latin@Alph\@Alph%
-   \if@greek@numerals
-      \def\greek@alph##1{\protect\greeknumber{##1}}%
-      \def\greek@Alph##1{\protect\Greeknumber{##1}}%
-      \let\@alph\greek@alph%
-      \let\@Alph\greek@Alph%
-   \fi}
-
-\def\nogreek@numbers{%
-  \let\@alph\latin@alph%
-  \let\@Alph\latin@Alph%
-  \let\greek@alph\@undefined%
-  \let\greek@Alph\@undefined%
-  }
-
-\endinput
-
diff --git a/Master/texmf-dist/tex/latex/polyglossia/polyglossia.sty b/Master/texmf-dist/tex/latex/polyglossia/polyglossia.sty
index 08ba373330f..092b76781c1 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}[2012/08/06 v1.30MM
+\ProvidesPackage{polyglossia}[2013/05/15 v1.32.0
   Babel replacement for XeLaTeX and LuaTeX]
 \RequirePackage{etoolbox}
 \RequirePackage{makecmds}
@@ -215,14 +215,14 @@
     \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}%
+    \csdef{#1@language}{\language=\csname l@#1\endcsname\ifluatex\directlua{polyglossia.select_language('\luatexluaescapestring{\string#1}', '\the\csname l@#1\endcsname')}\fi}%
     }%
   \define@choicekey+[xpg@setup]{#1}{direction}[\val\nr]{LR,RL}[LR]%
     {\ifcase\nr\relax
         \togglefalse{#1@RL}%
       \or
         \toggletrue{#1@RL}%
-        \ifcsundef{RTL}{\RequirePackage{bidi}}{}%
+        \ifcsundef{RTL}{\ifluatex\RequirePackage{luabidi}\else\RequirePackage{bidi}\fi}{}%
     \fi}%
     {\xpg@warning{#1: Invalid value \val\space for key "direction"}}%
   \define@key[xpg@setup]{#1}{hyphenmins}[{2,3}]%
@@ -693,7 +693,7 @@
      % here we use lu@texhyphen@loaded@\the\language, the same as in babel
      \expandafter\ifcsname lu@texhyphen@loaded@\the\csname l@#1\endcsname\endcsname \else %
        \global\@namedef{lu@texhyphen@loaded@\the\language}{}%
-       \directlua{polyglossia.select_language('\luatexluaescapestring{\string#1}', '\the\language')}%
+       \directlua{polyglossia.select_language('\luatexluaescapestring{\string#1}', '\the\csname l@#1\endcsname')}%
      \fi %
    \fi % 
 }
@@ -702,7 +702,7 @@
    \ifluatex %
      \ifcsname lu@texhyphen@loaded@\the\language\endcsname \else %
        \global\@namedef{lu@texhyphen@loaded@\the\language}{}%
-       \directlua{polyglossia.select_language('\luatexluaescapestring{\string#1}', '\the\language')}%
+       \directlua{polyglossia.select_language('\luatexluaescapestring{\string#1}', '\the\csname l@#1\endcsname')}%
      \fi %
    \fi %                                          
    \xpg@initial@setup%