10 files changed, 45 insertions, 54 deletions
diff --git a/Master/texmf-dist/doc/xetex/xetexko/ChangeLog b/Master/texmf-dist/doc/xetex/xetexko/ChangeLog
index 90e93667a8b..8ab147ca71c 100644
--- a/Master/texmf-dist/doc/xetex/xetexko/ChangeLog
+++ b/Master/texmf-dist/doc/xetex/xetexko/ChangeLog
@@ -1,3 +1,10 @@
+2016-04-04      Dohyun Kim <nomos at ktug org>
+
+	Version 2.15
+
+	* xetexko-space.sty: update for xetex 0.99994 or later
+	* xetexko-Josa.sty: fix automatic selection of josa
+
 2016-02-01      Dohyun Kim <nomos at ktug org>
 
 	Version 2.14
diff --git a/Master/texmf-dist/doc/xetex/xetexko/README b/Master/texmf-dist/doc/xetex/xetexko/README
index 477c701c59b..fdf581c72e0 100644
--- a/Master/texmf-dist/doc/xetex/xetexko/README
+++ b/Master/texmf-dist/doc/xetex/xetexko/README
@@ -1,4 +1,4 @@
-XeTeX-ko Package version 2.14 (2016/02/01)
+XeTeX-ko Package version 2.15 (2016/04/04)
 =========================================
 
 XeTeX-ko is a macro package for Xe(La)TeX which supports typesetting
diff --git a/Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.pdf b/Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.pdf
index 04e0ba3646f..386a9a053d6 100644
--- a/Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.pdf
+++ b/Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.pdf
diff --git a/Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.tex b/Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.tex
index 53be9709bee..19da907800a 100644
--- a/Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.tex
+++ b/Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.tex
@@ -58,7 +58,7 @@
 \title{\xetexko\ 간단 매뉴얼}
 \author{Dohyun Kim \normalsize <\texttt{nomos at ktug org}> \and
   \normalsize <\url{http://github.com/dohyunkim/xetexko}>}
-\date{Version 2.14\quad 2016/02/01}
+\date{Version 2.15\quad 2016/04/04}
 \maketitle
 
 \begin{quote}\small
diff --git a/Master/texmf-dist/tex/xetex/xetexko/xetexko-font.sty b/Master/texmf-dist/tex/xetex/xetexko/xetexko-font.sty
index aa178fa6ffa..7cb5ea7e3e0 100644
--- a/Master/texmf-dist/tex/xetex/xetexko/xetexko-font.sty
+++ b/Master/texmf-dist/tex/xetex/xetexko/xetexko-font.sty
@@ -10,7 +10,7 @@
 % and version 1.3c or later is part of all distributions of LaTeX
 % version 2006/05/20 or later.
 
-\ProvidesPackage{xetexko-font}[2016/02/01 v2.14 LaTeX Font commands for XeTeX-ko]
+\ProvidesPackage{xetexko-font}[2016/04/04 v2.15 LaTeX Font commands for XeTeX-ko]
 
 \let\xetexko@f@size\f@size
 \RequirePackage{fontspec}[2014/05/25]
diff --git a/Master/texmf-dist/tex/xetex/xetexko/xetexko-hanging.sty b/Master/texmf-dist/tex/xetex/xetexko/xetexko-hanging.sty
index 1d26e89ce1b..0bb995731b7 100644
--- a/Master/texmf-dist/tex/xetex/xetexko/xetexko-hanging.sty
+++ b/Master/texmf-dist/tex/xetex/xetexko/xetexko-hanging.sty
@@ -13,7 +13,7 @@
 \begingroup\expandafter\expandafter\expandafter\endgroup
 \expandafter\ifx\csname ProvidesPackage\endcsname\relax\else
   \ProvidesPackage{xetexko-hanging}
-    [2016/02/01 v2.14 Hanging punctuations for XeTeX-ko]
+    [2016/04/04 v2.15 Hanging punctuations for XeTeX-ko]
 \fi
 
 \chardef\catcodeofATcharacter\catcode`@
diff --git a/Master/texmf-dist/tex/xetex/xetexko/xetexko-josa.sty b/Master/texmf-dist/tex/xetex/xetexko/xetexko-josa.sty
index 63ee9594e00..77ea1f92857 100644
--- a/Master/texmf-dist/tex/xetex/xetexko/xetexko-josa.sty
+++ b/Master/texmf-dist/tex/xetex/xetexko/xetexko-josa.sty
@@ -12,7 +12,7 @@
 
 \begingroup\expandafter\expandafter\expandafter\endgroup
 \expandafter\ifx\csname ProvidesPackage\endcsname\relax\else
-  \ProvidesPackage{xetexko-josa}[2016/02/01 v2.14 Auto-josa for XeTeX-ko]
+  \ProvidesPackage{xetexko-josa}[2016/04/04 v2.15 Auto-josa for XeTeX-ko]
 \fi
 
 \unless\ifcsname @tempcnta\endcsname
@@ -207,8 +207,14 @@
 \def\로{\makejosa{}{으}로}
 \def\라{\makejosa{라}{이라}}
 \def\makejosa@I{%
-  \ifx\dhucs@next라%
+  \ifcat\dhucs@next\dhucs@cat@twelve
+    \expandafter\expandafter\expandafter\count@\expandafter
+    \strip@characternum@meaning@prefix\meaning\dhucs@next\end
+    \ifnum 0\ifnum\count@>"ABFF \ifnum\count@<"D7A4 1\fi\fi>\z@
       \makejosa\relax{이}%
+    \else
+      \makejosa{가}{이}%
+    \fi
   \else
     \makejosa{가}{이}%
   \fi
diff --git a/Master/texmf-dist/tex/xetex/xetexko/xetexko-space.sty b/Master/texmf-dist/tex/xetex/xetexko/xetexko-space.sty
index 07481b4c578..557012116f8 100644
--- a/Master/texmf-dist/tex/xetex/xetexko/xetexko-space.sty
+++ b/Master/texmf-dist/tex/xetex/xetexko/xetexko-space.sty
@@ -13,7 +13,7 @@
 \begingroup\expandafter\expandafter\expandafter\endgroup
 \expandafter\ifx\csname ProvidesPackage\endcsname\relax\else
   \ProvidesPackage{xetexko-space}
-    [2016/02/01 v2.14 Spacings and fonts for XeTeX-ko]
+    [2016/04/04 v2.15 Spacings and fonts for XeTeX-ko]
 \fi
 
 %%% we need XeTeX > 0.997
@@ -44,6 +44,14 @@
   \repeat
 }
 
+% xetex 0.99994 extended char class limit.
+\ifdim\the\XeTeXversion\XeTeXrevision pt<0.99994pt
+  \let\XeTeXcharclassIgnore\@cclvi
+  \let\XKboundary\@cclv
+\else
+  \chardef\XeTeXcharclassIgnore=4096
+  \chardef\XKboundary=4095
+\fi
 % from JW
 \ifdefined\XeTeXcharclassID\else
   \ifdefined\xtxHanGlue
@@ -54,22 +62,30 @@
     \newXeTeXintercharclass\XeTeXcharclassID
     \newXeTeXintercharclass\XeTeXcharclassOP
     \newXeTeXintercharclass\XeTeXcharclassCL
-    \let\XeTeXcharclassEX\XeTeXcharclassCL
-    \let\XeTeXcharclassIS\XeTeXcharclassCL
-    \let\XeTeXcharclassNS\XeTeXcharclassCL
-    \chardef\XeTeXcharclassCM=256 %
+    \global\let\XeTeXcharclassCJ\XeTeXcharclassID
+    \global\let\XeTeXcharclassEX\XeTeXcharclassCL
+    \global\let\XeTeXcharclassIS\XeTeXcharclassCL
+    \global\let\XeTeXcharclassNS\XeTeXcharclassCL
+    \global\let\XeTeXcharclassCM\XeTeXcharclassIgnore
     \input load-unicode-xetex-classes %
   \fi
 \fi
 
 \let     \XKhanja         \XeTeXcharclassID
 \let     \XKcjkopening    \XeTeXcharclassOP
-\let     \XKsmallkana     \XeTeXcharclassCL
+\let     \XKcjkclosing    \XeTeXcharclassCL
+\let     \XKlatinchar     \z@
+
+\XeTeXcharclass "2018 = \XKcjkopening    % ‘
+\XeTeXcharclass "201C = \XKcjkopening    % “
 
-\chardef \XKlatinchar     \z@
-\chardef \XKboundary      \@cclv
+\XeTeXcharclass "2019 = \XKcjkclosing    % ’
+\XeTeXcharclass "201D = \XKcjkclosing    % ”
+
+\XeTeXcharclass "25A1 = \XKhanja         % □
 
 %%% small kana (something has changed)
+\newXeTeXintercharclass \XKsmallkana
 \XeTeXcharclass "3041 = \XKsmallkana
 \XeTeXcharclass "3043 = \XKsmallkana
 \XeTeXcharclass "3045 = \XKsmallkana
@@ -98,44 +114,6 @@
 \XK@assign@char@class{"31F0}{"31FF}\XKsmallkana
 \XK@assign@char@class{"FF67}{"FF70}\XKsmallkana
 
-%%%
-\XeTeXcharclass "25A1 = \XKhanja         % □
-
-%%%
-\XeTeXcharclass "2018 = \XKcjkopening    % ‘
-\XeTeXcharclass "201C = \XKcjkopening    % “
-\XeTeXcharclass "FF62 = \XKcjkopening    % ｢
-
-%%% cjk closing parentheses
-\newXeTeXintercharclass \XKcjkclosing
-\XeTeXcharclass "2019 = \XKcjkclosing    % ’
-\XeTeXcharclass "201D = \XKcjkclosing    % ”
-\XeTeXcharclass "3001 = \XKcjkclosing    % 、
-\XeTeXcharclass "FE11 = \XKcjkclosing    % 、 vert
-\XeTeXcharclass "FF0C = \XKcjkclosing    % ，
-\XeTeXcharclass "FE10 = \XKcjkclosing    % ， vert
-\XeTeXcharclass "2019 = \XKcjkclosing    % ’
-\XeTeXcharclass "201D = \XKcjkclosing    % ”
-\XeTeXcharclass "FF09 = \XKcjkclosing    % ）
-\XeTeXcharclass "FE36 = \XKcjkclosing    % ） vert
-\XeTeXcharclass "3015 = \XKcjkclosing    % 〕
-\XeTeXcharclass "FE3A = \XKcjkclosing    % 〕 vert
-\XeTeXcharclass "FF3D = \XKcjkclosing    % ］
-\XeTeXcharclass "FE48 = \XKcjkclosing    % ］ vert
-\XeTeXcharclass "FF5D = \XKcjkclosing    % ｝
-\XeTeXcharclass "FE38 = \XKcjkclosing    % ｝ vert
-\XeTeXcharclass "3009 = \XKcjkclosing    % 〉
-\XeTeXcharclass "FE40 = \XKcjkclosing    % 〉 vert
-\XeTeXcharclass "300B = \XKcjkclosing    % 》
-\XeTeXcharclass "FE3E = \XKcjkclosing    % 》 vert
-\XeTeXcharclass "300D = \XKcjkclosing    % 」
-\XeTeXcharclass "FE42 = \XKcjkclosing    % 」 vert
-\XeTeXcharclass "300F = \XKcjkclosing    % 』
-\XeTeXcharclass "FE44 = \XKcjkclosing    % 』 vert
-\XeTeXcharclass "3011 = \XKcjkclosing    % 】
-\XeTeXcharclass "FE3C = \XKcjkclosing    % 】 vert
-\XeTeXcharclass "FF63 = \XKcjkclosing    % ｣
-
 %%% cjk colons
 \newXeTeXintercharclass \XKcjkcolon
 \XeTeXcharclass "00B7 = \XKcjkcolon % ·
diff --git a/Master/texmf-dist/tex/xetex/xetexko/xetexko-vertical.sty b/Master/texmf-dist/tex/xetex/xetexko/xetexko-vertical.sty
index df350b9b223..3632fa4f63a 100644
--- a/Master/texmf-dist/tex/xetex/xetexko/xetexko-vertical.sty
+++ b/Master/texmf-dist/tex/xetex/xetexko/xetexko-vertical.sty
@@ -13,7 +13,7 @@
 \begingroup\expandafter\expandafter\expandafter\endgroup
 \expandafter\ifx\csname ProvidesPackage\endcsname\relax\else
   \ProvidesPackage{xetexko-vertical}
-    [2016/02/01 v2.14 Vertical environment for XeTeX-ko]
+    [2016/04/04 v2.15 Vertical environment for XeTeX-ko]
 \fi
 
 % do not veticalize headline/footline
diff --git a/Master/texmf-dist/tex/xetex/xetexko/xetexko.sty b/Master/texmf-dist/tex/xetex/xetexko/xetexko.sty
index 0bd2d83219d..be095526186 100644
--- a/Master/texmf-dist/tex/xetex/xetexko/xetexko.sty
+++ b/Master/texmf-dist/tex/xetex/xetexko/xetexko.sty
@@ -12,7 +12,7 @@
 
 \begingroup\expandafter\expandafter\expandafter\endgroup
 \expandafter\ifx\csname ProvidesPackage\endcsname\relax\else
-  \ProvidesPackage{xetexko}[2016/02/01 v2.14 Typesetting Korean with XeTeX]
+  \ProvidesPackage{xetexko}[2016/04/04 v2.15 Typesetting Korean with XeTeX]
 \fi
 
 \begingroup\expandafter\expandafter\expandafter\endgroup