7 files changed, 34 insertions, 27 deletions
diff --git a/Master/texmf-dist/doc/xetex/xetexko/ChangeLog b/Master/texmf-dist/doc/xetex/xetexko/ChangeLog
index e0797371d48..1a2f0ec4faa 100644
--- a/Master/texmf-dist/doc/xetex/xetexko/ChangeLog
+++ b/Master/texmf-dist/doc/xetex/xetexko/ChangeLog
@@ -1,3 +1,12 @@
+2013-12-14      Dohyun Kim <nomos at ktug org>
+
+	Version 2.3
+
+	* xetexko-space.sty xetexko.sty: previous release introduced a bug
+	related to ulem package, reported by Insung Cho.
+	* xetexko-space.sty: font-switching had sometimes been confused by
+	everyhangul/everyhanja.
+
 2013-12-06      Dohyun Kim <nomos at ktug org>
 
 	Version 2.2
diff --git a/Master/texmf-dist/doc/xetex/xetexko/README b/Master/texmf-dist/doc/xetex/xetexko/README
index fa5b1067e5f..ae8c54ab03a 100644
--- a/Master/texmf-dist/doc/xetex/xetexko/README
+++ b/Master/texmf-dist/doc/xetex/xetexko/README
@@ -1,5 +1,5 @@
 
-XeTeX-ko Package version 2.2 (2013/12/06)
+XeTeX-ko Package version 2.3 (2013/12/14)
 =========================================
 
 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 d15e0d938e6..a8de4f2a323 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 09eed9fcb6f..91ed2e48ca9 100644
--- a/Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.tex
+++ b/Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.tex
@@ -50,7 +50,7 @@
 \title{\xetexko\ 간단 매뉴얼}
 \author{Dohyun Kim \normalsize <\texttt{nomos at ktug org}> \and
   \normalsize <\url{http://github.com/dohyunkim/xetexko}>}
-\date{Version 2.2\quad\today}
+\date{Version 2.3\quad\today}
 \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 882da1e7262..9c428b6f7d9 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}[2013/12/06 v2.2 Font commands for XeTeX-ko]
+\ProvidesPackage{xetexko-font}[2013/12/14 v2.3 Font commands for XeTeX-ko]
 
 \RequirePackage{fontspec}
 \RequirePackage{xkeyval}
@@ -366,6 +366,8 @@
   \linespread{1.3888}
   \footnotesep=1.3888\footnotesep
   \skip\footins=1.3888\skip\footins plus6pt minus3pt
+  % frenchspacing is default
+  \frenchspacing
 \fi
 
 \endinput
diff --git a/Master/texmf-dist/tex/xetex/xetexko/xetexko-space.sty b/Master/texmf-dist/tex/xetex/xetexko/xetexko-space.sty
index b4dd7a2558a..2689acfd90f 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}
-    [2013/11/28 v2.2 Spacings and fonts for XeTeX-ko]
+    [2013/12/14 v2.3 Spacings and fonts for XeTeX-ko]
 \fi
 
 %%% we need XeTeX > 0.997
@@ -1424,17 +1424,17 @@
 %%% everyhangul/everyhanja
 %%%  request from karnes at 2013.11.18
 \def\everyhanja#1{%
-  \def\XK@every@hanja##1{#1}%
+  \def\XK@every@hanja##1{#1\chardef\XKcurrentfont\z@}%
   \let\XKcjkcharboxstart\empty
   \let\XKcjkcharboxstop\empty % conflict w. everyhanja
 }
-\everyhanja{#1}
+\def\XK@every@hanja#1{#1}
 \def\everyhangul#1{%
-  \def\XK@every@hangul##1{#1}%
+  \def\XK@every@hangul##1{#1\chardef\XKcurrentfont\z@}%
   \let\XKcjkcharboxstart\empty
   \let\XKcjkcharboxstop\empty % conflict w. everyhangul
 }
-\everyhangul{#1}
+\def\XK@every@hangul#1{#1}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% for autojosa, get last chars
@@ -1594,7 +1594,7 @@
   \let\XKzeroskip         \relax
   \let\XKnobreak          \relax
   \let\XKafterboundaryskip\relax
-  \let\XKcjklastchar      \relax
+  \def\XKcjklastchar##1{\let\@let@token##1\XK@save@last@char\XK@every@hangul{##1}}%
   \disablehangulspacing
 }
 
@@ -1645,19 +1645,18 @@
 
 %%%%%%%%%%%
 %% for ulem
-\ifcsname selectfont\endcsname
-  \let\xetexkoulemsupport\relax
-\else
-  \def\xetexkoulemsupport{%
-    \UL@hook\expandafter{\the\UL@hook
-      \let\ulem@XK@hangulfont\XK@hangulfont
-      \let\ulem@XK@hanjafont\XK@hanjafont
-      \def\XK@hangulfont{\ulem@XK@hangulfont
-        \aftergroup\aftergroup\aftergroup\ulem@XK@hangulfont}%
-      \def\XK@hanjafont{\ulem@XK@hanjafont
-        \aftergroup\aftergroup\aftergroup\ulem@XK@hanjafont}%
-  }}
-\fi
+\def\xetexkoulemsupport{%
+  \UL@hook\expandafter{\the\UL@hook
+    \let\XK@UL@@@hangulfont\XKhangulfont
+    \let\XK@UL@@@hanjafont \XKhanjafont
+    \def\XKhangulfont{\XK@UL@@@hangulfont
+      \aftergroup\aftergroup\aftergroup\XK@UL@@@hangulfont
+    }%
+    \def\XKhanjafont{\XK@UL@@@hanjafont
+      \aftergroup\aftergroup\aftergroup\XK@UL@@@hanjafont
+    }%
+  }%
+}
 
 %%%%%%%%%%
 %% dotemph
@@ -1690,9 +1689,6 @@
 %%% declare to use interchartoken
 \XeTeXinterchartokenstate\@ne
 
-%%% frenchspacing is default
-\frenchspacing
-
 \def\hellipsis{^^^^2026\kern-.1ex^^^^2026}
 
 \endinput
diff --git a/Master/texmf-dist/tex/xetex/xetexko/xetexko.sty b/Master/texmf-dist/tex/xetex/xetexko/xetexko.sty
index 8b55e7fab44..94c8140a999 100644
--- a/Master/texmf-dist/tex/xetex/xetexko/xetexko.sty
+++ b/Master/texmf-dist/tex/xetex/xetexko/xetexko.sty
@@ -42,7 +42,7 @@
   \expandafter\endinput
 \fi
 
-\ProvidesPackage{xetexko}[2013/11/26 v2.2 Typesetting Korean with XeLaTeX]
+\ProvidesPackage{xetexko}[2013/12/14 v2.3 Typesetting Korean with XeLaTeX]
 
 \newif\if@hangul
 \newif\if@hanja
@@ -62,7 +62,7 @@
 
 \AtBeginDocument{
   % for ulem package
-  % \ifcsname UL@hook\endcsname \xetexkoulemsupport \fi
+  \ifcsname UL@hook\endcsname \xetexkoulemsupport \fi
   % for hyperref package
   \@ifpackageloaded{hyperref}{\pdfstringdefDisableCommands{%
       \let\dotemph\@firstofone