polyglossia (16jul15)

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

10 files changed, 115 insertions, 225 deletions

diff --git a/Master/texmf-dist/doc/latex/polyglossia/README b/Master/texmf-dist/doc/latex/polyglossia/README
index 709b75ea4ea..352fe69a3da 100644
--- a/Master/texmf-dist/doc/latex/polyglossia/README
+++ b/Master/texmf-dist/doc/latex/polyglossia/README
@@ -1,7 +1,7 @@
 
    ¦----------------------------------------------¦
    ¦                                              ¦
-   ¦       THE POLYGLOSSIA PACKAGE v1.40.0        ¦
+   ¦       THE POLYGLOSSIA PACKAGE v1.40.1        ¦
    ¦                                              ¦
    ¦     Modern multilingual typesetting          ¦
    ¦        with XeLaTeX and LuaLaTeX             ¦
@@ -10,7 +10,7 @@
 
 This package provides an alternative to Babel for users of XeLaTeX and LuaLaTeX
 (with a few languages incompletely supported for the latter). This version
-includes support for 74 different languages.
+includes support for 75 different languages.
 
 Polyglossia makes it possible to automate the following tasks:
 
diff --git a/Master/texmf-dist/doc/latex/polyglossia/example-arabic.pdf b/Master/texmf-dist/doc/latex/polyglossia/example-arabic.pdf
index 0e90404798c..1a3ac54f3a0 100644
--- a/Master/texmf-dist/doc/latex/polyglossia/example-arabic.pdf
+++ b/Master/texmf-dist/doc/latex/polyglossia/example-arabic.pdf
diff --git a/Master/texmf-dist/doc/latex/polyglossia/example-korean.pdf b/Master/texmf-dist/doc/latex/polyglossia/example-korean.pdf
index 6ac4bc217a4..2e1266f7bfa 100644
--- a/Master/texmf-dist/doc/latex/polyglossia/example-korean.pdf
+++ b/Master/texmf-dist/doc/latex/polyglossia/example-korean.pdf
diff --git a/Master/texmf-dist/doc/latex/polyglossia/example-thai.pdf b/Master/texmf-dist/doc/latex/polyglossia/example-thai.pdf
index f4ccf6d89d7..fd6668ef0ae 100644
--- a/Master/texmf-dist/doc/latex/polyglossia/example-thai.pdf
+++ b/Master/texmf-dist/doc/latex/polyglossia/example-thai.pdf
diff --git a/Master/texmf-dist/doc/latex/polyglossia/examples.pdf b/Master/texmf-dist/doc/latex/polyglossia/examples.pdf
index 84fc6463e21..7d6459a536c 100644
--- a/Master/texmf-dist/doc/latex/polyglossia/examples.pdf
+++ b/Master/texmf-dist/doc/latex/polyglossia/examples.pdf
diff --git a/Master/texmf-dist/doc/latex/polyglossia/polyglossia.pdf b/Master/texmf-dist/doc/latex/polyglossia/polyglossia.pdf
index bacf8758313..44b437374ed 100644
--- a/Master/texmf-dist/doc/latex/polyglossia/polyglossia.pdf
+++ b/Master/texmf-dist/doc/latex/polyglossia/polyglossia.pdf
diff --git a/Master/texmf-dist/doc/latex/polyglossia/polyglossia.tex b/Master/texmf-dist/doc/latex/polyglossia/polyglossia.tex
index 420ba205c05..0ec7045b697 100644
--- a/Master/texmf-dist/doc/latex/polyglossia/polyglossia.tex
+++ b/Master/texmf-dist/doc/latex/polyglossia/polyglossia.tex
@@ -169,95 +169,24 @@ that are explained in section \ref{specific} below.
 
 \begin{table}[h]\centering
 \label{tab:lang}
-%albanian
-%amharic
-%\TX{arabic}
-%armenian
-%asturian
-%bahasai
-%bahasam
-%basque
-%\TX{bengali}
-%brazil[ian]
-%breton
-%bulgarian
-%\TX{catalan}
-%coptic
-%croatian
-%czech
-%danish
-%divehi
-%\TX{dutch}
-%\TX{english}
-%\TX{esperanto}
-%estonian
-%\TX{farsi}
-%finnish
-%french
-%galician
-%\TX{german}
-%\TX{greek}
-%\TX{hebrew}
-%\TX{hindi}
-%icelandic
-%interlingua
-%irish
-%italian
-%\TX{lao}
-%latin
-%latvian
-%lithuanian
-%\TX{lsorbian}
-%\TX{magyar}
-%malayalam
-%marathi
-%norsk
-%nynorsk
-%occitan
-%polish
-%portuges
-%romanian
-%\TX{russian}
-%samin
-%\TX{sanskrit}
-%scottish
-%\TX{serbian}
-%slovak
-%slovenian
-%spanish
-%swedish
-%\TX{syriac}
-%tamil
-%telugu
-%\TX{thai}
-%turkish
-%turkmen
-%ukrainian
-%urdu
-%\TX{usorbian}
-%vietnamese
-%welsh
-%%%%% private note: the following table was automatically generated with "maketabular.pl 5 < above_input"
-% Note above from François.  Note from self: the table was then
-% painstakingly edited by hand because I failed to see the note above :-P -- Arthur
+% Produced with tools/insert-language-list.rb -- AR, 2015-07-14
 \begin{tabular}{lllll}
 \hline
-albanian     & czech          & \TX{hindi}    & norsk        & spanish        \\
-amharic      & danish         & icelandic     & nynorsk      & swedish        \\
-\TX{arabic}  & divehi         & interlingua   & occitan      & \TX{syriac}    \\
-armenian     & \TX{dutch}     & irish         & piedmontese  & tamil          \\
-asturian     & \TX{english}   & \TX{italian}  & polish       & telugu         \\
-bahasai      & \TX{esperanto} & kannada       & portuges     & tibetan        \\
-bahasam      & estonian       & \TX{lao}      & romanian     & \TX{thai}      \\
-basque       & \TX{farsi}     & \TX{latin}    & romansh      & turkish        \\
-\TX{bengali} & finnish        & latvian       & \TX{russian} & turkmen        \\
-brazil[ian]  & french         & lithuanian    & samin        & \TX{ukrainian} \\
-breton       & friulan        & \TX{lsorbian} & \TX{sanskrit}& urdu           \\
-bulgarian    & galician       & \TX{magyar}   & scottish     & \TX{usorbian}  \\
-\TX{catalan} & \TX{german}    & malayalam     & \TX{serbian} & vietnamese     \\
-coptic       & \TX{greek}     & marathi       & slovak       & welsh          \\
-croatian     & \TX{hebrew}    & nko           & slovenian    &                \\
-\hline
+albanian       & czech          & \TX{hindi}     & nko            & slovenian     \\
+amharic        & danish         & icelandic      & norsk          & spanish       \\
+\TX{arabic}    & divehi         & interlingua    & nynorsk        & swedish       \\
+armenian       & \TX{dutch}     & irish          & occitan        & \TX{syriac}   \\
+asturian       & \TX{english}   & \TX{italian}   & piedmontese    & tamil         \\
+bahasai        & \TX{esperanto} & kannada        & polish         & telugu        \\
+bahasam        & estonian       & korean         & portuges       & \TX{thai}     \\
+basque         & \TX{farsi}     & \TX{lao}       & romanian       & tibetan       \\
+\TX{bengali}   & finnish        & \TX{latin}     & romansh        & turkish       \\
+brazil[ian]    & french         & latvian        & \TX{russian}   & turkmen       \\
+breton         & friulan        & lithuanian     & samin          & \TX{ukrainian}\\
+bulgarian      & galician       & \TX{lsorbian}  & \TX{sanskrit}  & urdu          \\
+\TX{catalan}   & \TX{german}    & \TX{magyar}    & scottish       & \TX{usorbian} \\
+coptic         & \TX{greek}     & malayalam      & \TX{serbian}   & vietnamese    \\
+croatian       & \TX{hebrew}    & marathi        & slovak         & welsh         \\\hline
 \end{tabular}
 \caption{Languages currently supported in \pkg{polyglossia}}
 \end{table}
diff --git a/Master/texmf-dist/source/latex/polyglossia/polyglossia.dtx b/Master/texmf-dist/source/latex/polyglossia/polyglossia.dtx
index 8f69cc2aa9b..4c43c9aa3fe 100644
--- a/Master/texmf-dist/source/latex/polyglossia/polyglossia.dtx
+++ b/Master/texmf-dist/source/latex/polyglossia/polyglossia.dtx
@@ -11,7 +11,7 @@
 
    ¦----------------------------------------------¦
    ¦                                              ¦
-   ¦       THE POLYGLOSSIA PACKAGE v1.40.0        ¦
+   ¦       THE POLYGLOSSIA PACKAGE v1.40.1        ¦
    ¦                                              ¦
    ¦     Modern multilingual typesetting          ¦
    ¦        with XeLaTeX and LuaLaTeX             ¦
@@ -20,7 +20,7 @@
 
 This package provides an alternative to Babel for users of XeLaTeX and LuaLaTeX
 (with a few languages incompletely supported for the latter). This version
-includes support for 74 different languages.
+includes support for 75 different languages.
 
 Polyglossia makes it possible to automate the following tasks:
 
@@ -370,95 +370,24 @@ http://github.com/reutenauer/polyglossia/issues
 % 
 % \begin{table}[h]\centering
 % \label{tab:lang}
-% ^^Aalbanian
-% ^^Aamharic
-% ^^A\TX{arabic}
-% ^^Aarmenian
-% ^^Aasturian
-% ^^Abahasai
-% ^^Abahasam
-% ^^Abasque
-% ^^A\TX{bengali}
-% ^^Abrazil[ian]
-% ^^Abreton
-% ^^Abulgarian
-% ^^A\TX{catalan}
-% ^^Acoptic
-% ^^Acroatian
-% ^^Aczech
-% ^^Adanish
-% ^^Adivehi
-% ^^A\TX{dutch}
-% ^^A\TX{english}
-% ^^A\TX{esperanto}
-% ^^Aestonian
-% ^^A\TX{farsi}
-% ^^Afinnish
-% ^^Afrench
-% ^^Agalician
-% ^^A\TX{german}
-% ^^A\TX{greek}
-% ^^A\TX{hebrew}
-% ^^A\TX{hindi}
-% ^^Aicelandic
-% ^^Ainterlingua
-% ^^Airish
-% ^^Aitalian
-% ^^A\TX{lao}
-% ^^Alatin
-% ^^Alatvian
-% ^^Alithuanian
-% ^^A\TX{lsorbian}
-% ^^A\TX{magyar}
-% ^^Amalayalam
-% ^^Amarathi
-% ^^Anorsk
-% ^^Anynorsk
-% ^^Aoccitan
-% ^^Apolish
-% ^^Aportuges
-% ^^Aromanian
-% ^^A\TX{russian}
-% ^^Asamin
-% ^^A\TX{sanskrit}
-% ^^Ascottish
-% ^^A\TX{serbian}
-% ^^Aslovak
-% ^^Aslovenian
-% ^^Aspanish
-% ^^Aswedish
-% ^^A\TX{syriac}
-% ^^Atamil
-% ^^Atelugu
-% ^^A\TX{thai}
-% ^^Aturkish
-% ^^Aturkmen
-% ^^Aukrainian
-% ^^Aurdu
-% ^^A\TX{usorbian}
-% ^^Avietnamese
-% ^^Awelsh
-% ^^A private note: the following table was automatically generated with "maketabular.pl 5 < above_input"
-% ^^A Note above from François.  Note from self: the table was then
-% ^^A painstakingly edited by hand because I failed to see the note above :-P -- Arthur
+% ^^A Produced with tools/insert-language-list.rb -- AR, 2015-07-14
 % \begin{tabular}{lllll}
 % \hline
-% albanian     & czech          & \TX{hindi}    & norsk        & spanish        \\
-% amharic      & danish         & icelandic     & nynorsk      & swedish        \\
-% \TX{arabic}  & divehi         & interlingua   & occitan      & \TX{syriac}    \\
-% armenian     & \TX{dutch}     & irish         & piedmontese  & tamil          \\
-% asturian     & \TX{english}   & \TX{italian}  & polish       & telugu         \\
-% bahasai      & \TX{esperanto} & kannada       & portuges     & tibetan        \\
-% bahasam      & estonian       & \TX{lao}      & romanian     & \TX{thai}      \\
-% basque       & \TX{farsi}     & \TX{latin}    & romansh      & turkish        \\
-% \TX{bengali} & finnish        & latvian       & \TX{russian} & turkmen        \\
-% brazil[ian]  & french         & lithuanian    & samin        & \TX{ukrainian} \\
-% breton       & friulan        & \TX{lsorbian} & \TX{sanskrit}& urdu           \\
-% bulgarian    & galician       & \TX{magyar}   & scottish     & \TX{usorbian}  \\
-% \TX{catalan} & \TX{german}    & malayalam     & \TX{serbian} & vietnamese     \\
-% coptic       & \TX{greek}     & marathi       & slovak       & welsh          \\
-% croatian     & \TX{hebrew}    & nko           & slovenian    &                \\
-% \hline
+% albanian       & czech          & \TX{hindi}     & nko            & slovenian     \\
+% amharic        & danish         & icelandic      & norsk          & spanish       \\
+% \TX{arabic}    & divehi         & interlingua    & nynorsk        & swedish       \\
+% armenian       & \TX{dutch}     & irish          & occitan        & \TX{syriac}   \\
+% asturian       & \TX{english}   & \TX{italian}   & piedmontese    & tamil         \\
+% bahasai        & \TX{esperanto} & kannada        & polish         & telugu        \\
+% bahasam        & estonian       & korean         & portuges       & \TX{thai}     \\
+% basque         & \TX{farsi}     & \TX{lao}       & romanian       & tibetan       \\
+% \TX{bengali}   & finnish        & \TX{latin}     & romansh        & turkish       \\
+% brazil[ian]    & french         & latvian        & \TX{russian}   & turkmen       \\
+% breton         & friulan        & lithuanian     & samin          & \TX{ukrainian}\\
+% bulgarian      & galician       & \TX{lsorbian}  & \TX{sanskrit}  & urdu          \\
+% \TX{catalan}   & \TX{german}    & \TX{magyar}    & scottish       & \TX{usorbian} \\
+% coptic         & \TX{greek}     & malayalam      & \TX{serbian}   & vietnamese    \\
+% croatian       & \TX{hebrew}    & marathi        & slovak         & welsh         \\\hline
 % \end{tabular}
 % \caption{Languages currently supported in \pkg{polyglossia}}
 % \end{table}
@@ -4618,8 +4547,35 @@ and may look very wrong.}
     \def\today{\the\year 년 \the\month 월 \the\day 일}%
 }
 
+\def\koreanAlph#1{\expandafter\@koreanAlph\csname c@#1\endcsname}
+\def\@koreanAlph#1{%
+    \ifcase#1\or 가\or 나\or 다\or 라\or 마\or 바\or 사\or 아\or 자\or
+    차\or 카\or 타\or 파\or 하\else\xpg@ill@value{#1}{@koreanAlph}\fi
+}
+
+\def\koreanalph#1{\expandafter\@koreanalph\csname c@#1\endcsname}
+\def\@koreanalph#1{%
+    \ifcase#1\or ㄱ\or ㄴ\or ㄷ\or ㄹ\or ㅁ\or ㅂ\or ㅅ\or ㅇ\or ㅈ\or
+    ㅊ\or ㅋ\or ㅌ\or ㅍ\or ㅎ\else\xpg@ill@value{#1}{@koreanalph}\fi
+}
+
+\def\korean@numbers{%
+    \let\@orig@alph\@alph
+    \let\@orig@Alph\@Alph
+    \let\@alph\@koreanalph
+    \let\@Alph\@koreanAlph
+}
+\def\nokorean@numbers{%
+    \let\@alph\@orig@alph
+    \let\@Alph\@orig@Alph
+}
+\let\nokorean@globalnumbers\nokorean@numbers
+
 \ifluatex
+\newluatexattribute\xpg@attr@korean
 \directlua{
+local glyph_id = node.id("glyph")
+local attr_korean = luatexbase.attributes["xpg@attr@korean"]
 local nobreak_after = {
     [0x28] = true, [0x3C] = true, [0x5B] = true, [0x60] = true, [0x7B] = true,
     [0x2018] = true, [0x201C] = true, [0x3008] = true, [0x300A] = true,
@@ -4681,9 +4637,9 @@ end
 local korean_break = function (head)
     local curr = head
     while curr do
-        if curr.id == 37 then
+        if curr.id == glyph_id and node.has_attribute(curr, attr_korean) then
             local next = curr.next
-            if next and next.id == 37 then
+            if next and next.id == glyph_id then
                 local c, n = curr.char, next.char
                 if (is_cjk(c) or is_cjk(n)) and not nobreak_before[n] and not nobreak_after[c] then
                     head, curr = insert_penalty_glue(head, curr)
@@ -4698,7 +4654,7 @@ local reorder_tm = function (head)
     local tone
     local curr = node.tail(head)
     while curr do
-        if curr.id == 37 then
+        if curr.id == glyph_id and node.has_attribute(curr, attr_korean) then
             local c, wd = curr.char, curr.width 
             if (c == 0x302E or c == 0x302F) and wd and wd > 0 then
                 tone = curr
@@ -4713,23 +4669,9 @@ local reorder_tm = function (head)
     end
     return head
 end
-local loaded 
-polyglossia.add_korean_break = function ()
-    if not loaded then
-        luatexbase.add_to_callback ("pre_linebreak_filter", reorder_tm, "polyglossia.reorder_korean_tm", 1)
-        luatexbase.add_to_callback ("pre_linebreak_filter", korean_break, "polyglossia.korean_break", 1)
-        luatexbase.add_to_callback ("hpack_filter", reorder_tm, "polyglossia.reorder_korean_tm", 1)
-        loaded = true
-    end
-end
-polyglossia.remove_korean_break = function ()
-    if loaded then
-        luatexbase.remove_from_callback ("hpack_filter", "polyglossia.reorder_korean_tm")
-        luatexbase.remove_from_callback ("pre_linebreak_filter", "polyglossia.korean_break")
-        luatexbase.remove_from_callback ("pre_linebreak_filter", "polyglossia.reorder_korean_tm")
-        loaded = false
-    end
-end
+luatexbase.add_to_callback ("pre_linebreak_filter", reorder_tm, "polyglossia.reorder_korean_tm", 1)
+luatexbase.add_to_callback ("pre_linebreak_filter", korean_break, "polyglossia.korean_break", 1)
+luatexbase.add_to_callback ("hpack_filter", reorder_tm, "polyglossia.reorder_korean_tm", 1)
 }
 \fi
 
@@ -4737,7 +4679,7 @@ end
     \ifxetex
         \XeTeXlinebreaklocale ""
     \else
-        \directlua{polyglossia.remove_korean_break()}%
+        \unsetluatexattribute\xpg@attr@korean
     \fi
     \ifdefined\xpg@orig@baselinestretch \xpg@orig@baselinestretch \fi
     \ifdefined\xpg@orig@footnotesep     \xpg@orig@footnotesep     \fi
@@ -4749,7 +4691,7 @@ end
         \XeTeXlinebreakpenalty 50
         \XeTeXlinebreakskip 0pt plus.1em minus .04em
     \else
-        \directlua{polyglossia.add_korean_break()}%
+        \xpg@attr@korean=1
     \fi
 }
 
@@ -8608,7 +8550,7 @@ polyglossia.enable_hyphenation = enable_hyphenation
 
    ¦----------------------------------------------¦
    ¦                                              ¦
-   ¦       THE POLYGLOSSIA PACKAGE v1.40.0        ¦
+   ¦       THE POLYGLOSSIA PACKAGE v1.40.1        ¦
    ¦                                              ¦
    ¦     Modern multilingual typesetting          ¦
    ¦        with XeLaTeX and LuaLaTeX             ¦
@@ -8617,7 +8559,7 @@ polyglossia.enable_hyphenation = enable_hyphenation
 
 This package provides an alternative to Babel for users of XeLaTeX and LuaLaTeX
 (with a few languages incompletely supported for the latter). This version
-includes support for 74 different languages.
+includes support for 75 different languages.
 
 Polyglossia makes it possible to automate the following tasks:
 
@@ -8645,6 +8587,12 @@ Hum, sorry, wishful thinking.  Please report any bugs, problems or requests on:
 http://github.com/reutenauer/polyglossia/issues
 %</../README>
 %<*Changelog>
+1.40.1 (14-07-2015)
+  * Bugfix for Korean, by Kim Dohyun (pull request #103)
+
+1.40.0 (07-07-2015)
+  * gloss-korean.ldf contributed by Kim Dohyun (pull request #102)
+
 1.33.7 (04-07-2015)
   * Release to CTAN, no code change
 
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-korean.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-korean.ldf
index 46dc702150c..8f28d8bd2cf 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-korean.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-korean.ldf
@@ -46,8 +46,35 @@
     \def\today{\the\year 년 \the\month 월 \the\day 일}%
 }
 
+\def\koreanAlph#1{\expandafter\@koreanAlph\csname c@#1\endcsname}
+\def\@koreanAlph#1{%
+    \ifcase#1\or 가\or 나\or 다\or 라\or 마\or 바\or 사\or 아\or 자\or
+    차\or 카\or 타\or 파\or 하\else\xpg@ill@value{#1}{@koreanAlph}\fi
+}
+
+\def\koreanalph#1{\expandafter\@koreanalph\csname c@#1\endcsname}
+\def\@koreanalph#1{%
+    \ifcase#1\or ㄱ\or ㄴ\or ㄷ\or ㄹ\or ㅁ\or ㅂ\or ㅅ\or ㅇ\or ㅈ\or
+    ㅊ\or ㅋ\or ㅌ\or ㅍ\or ㅎ\else\xpg@ill@value{#1}{@koreanalph}\fi
+}
+
+\def\korean@numbers{%
+    \let\@orig@alph\@alph
+    \let\@orig@Alph\@Alph
+    \let\@alph\@koreanalph
+    \let\@Alph\@koreanAlph
+}
+\def\nokorean@numbers{%
+    \let\@alph\@orig@alph
+    \let\@Alph\@orig@Alph
+}
+\let\nokorean@globalnumbers\nokorean@numbers
+
 \ifluatex
+\newluatexattribute\xpg@attr@korean
 \directlua{
+local glyph_id = node.id("glyph")
+local attr_korean = luatexbase.attributes["xpg@attr@korean"]
 local nobreak_after = {
     [0x28] = true, [0x3C] = true, [0x5B] = true, [0x60] = true, [0x7B] = true,
     [0x2018] = true, [0x201C] = true, [0x3008] = true, [0x300A] = true,
@@ -109,9 +136,9 @@ end
 local korean_break = function (head)
     local curr = head
     while curr do
-        if curr.id == 37 then
+        if curr.id == glyph_id and node.has_attribute(curr, attr_korean) then
             local next = curr.next
-            if next and next.id == 37 then
+            if next and next.id == glyph_id then
                 local c, n = curr.char, next.char
                 if (is_cjk(c) or is_cjk(n)) and not nobreak_before[n] and not nobreak_after[c] then
                     head, curr = insert_penalty_glue(head, curr)
@@ -126,7 +153,7 @@ local reorder_tm = function (head)
     local tone
     local curr = node.tail(head)
     while curr do
-        if curr.id == 37 then
+        if curr.id == glyph_id and node.has_attribute(curr, attr_korean) then
             local c, wd = curr.char, curr.width 
             if (c == 0x302E or c == 0x302F) and wd and wd > 0 then
                 tone = curr
@@ -141,23 +168,9 @@ local reorder_tm = function (head)
     end
     return head
 end
-local loaded 
-polyglossia.add_korean_break = function ()
-    if not loaded then
-        luatexbase.add_to_callback ("pre_linebreak_filter", reorder_tm, "polyglossia.reorder_korean_tm", 1)
-        luatexbase.add_to_callback ("pre_linebreak_filter", korean_break, "polyglossia.korean_break", 1)
-        luatexbase.add_to_callback ("hpack_filter", reorder_tm, "polyglossia.reorder_korean_tm", 1)
-        loaded = true
-    end
-end
-polyglossia.remove_korean_break = function ()
-    if loaded then
-        luatexbase.remove_from_callback ("hpack_filter", "polyglossia.reorder_korean_tm")
-        luatexbase.remove_from_callback ("pre_linebreak_filter", "polyglossia.korean_break")
-        luatexbase.remove_from_callback ("pre_linebreak_filter", "polyglossia.reorder_korean_tm")
-        loaded = false
-    end
-end
+luatexbase.add_to_callback ("pre_linebreak_filter", reorder_tm, "polyglossia.reorder_korean_tm", 1)
+luatexbase.add_to_callback ("pre_linebreak_filter", korean_break, "polyglossia.korean_break", 1)
+luatexbase.add_to_callback ("hpack_filter", reorder_tm, "polyglossia.reorder_korean_tm", 1)
 }
 \fi
 
@@ -165,7 +178,7 @@ end
     \ifxetex
         \XeTeXlinebreaklocale ""
     \else
-        \directlua{polyglossia.remove_korean_break()}%
+        \unsetluatexattribute\xpg@attr@korean
     \fi
     \ifdefined\xpg@orig@baselinestretch \xpg@orig@baselinestretch \fi
     \ifdefined\xpg@orig@footnotesep     \xpg@orig@footnotesep     \fi
@@ -177,7 +190,7 @@ end
         \XeTeXlinebreakpenalty 50
         \XeTeXlinebreakskip 0pt plus.1em minus .04em
     \else
-        \directlua{polyglossia.add_korean_break()}%
+        \xpg@attr@korean=1
     \fi
 }
 
diff --git a/Master/texmf-dist/tex/latex/polyglossia/polyglossia.sty b/Master/texmf-dist/tex/latex/polyglossia/polyglossia.sty
index 35d83883633..57101f4adf6 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}[2015/07/07 v1.40.0
+\ProvidesPackage{polyglossia}[2015/07/14 v1.40.1
   Alternative to Babel for XeLaTeX and LuaLaTeX]
 \RequirePackage{etoolbox}
 \RequirePackage{makecmds}