xetexko (21apr18)

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

6 files changed, 21 insertions, 11 deletions

diff --git a/Master/texmf-dist/doc/xetex/xetexko/ChangeLog b/Master/texmf-dist/doc/xetex/xetexko/ChangeLog
index 31d9d1e8c72..fa2389ceb06 100644
--- a/Master/texmf-dist/doc/xetex/xetexko/ChangeLog
+++ b/Master/texmf-dist/doc/xetex/xetexko/ChangeLog
@@ -1,3 +1,10 @@
+2018-04-19      Dohyun Kim <nomos at ktug org>
+
+	Version 2.19
+
+	* xetexko-space.sty: address a conflict with ulem package:
+	see http://www.ktug.org/xe/index.php?document_srl=229398
+
 2018-04-06      Dohyun Kim <nomos at ktug org>
 
 	Version 2.18
diff --git a/Master/texmf-dist/doc/xetex/xetexko/README b/Master/texmf-dist/doc/xetex/xetexko/README
index 9475574f137..31c1dcb34dc 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.18 (2018/04/06)
+XeTeX-ko Package version 2.19 (2018/04/19)
 =========================================
 
 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 5ac111bb6d8..e3c1d5fa5ad 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 f58da6eefc8..5107b061508 100644
--- a/Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.tex
+++ b/Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.tex
@@ -59,7 +59,7 @@
 \title{\xetexko\ 간단 매뉴얼}
 \author{Dohyun Kim \normalsize <\texttt{nomos at ktug org}> \and
   \normalsize <\url{http://github.com/dohyunkim/xetexko}>}
-\date{Version 2.18\quad 2018/04/06}
+\date{Version 2.19\quad 2018/04/19}
 \maketitle
 
 \begin{quote}\small
diff --git a/Master/texmf-dist/tex/xetex/xetexko/xetexko-space.sty b/Master/texmf-dist/tex/xetex/xetexko/xetexko-space.sty
index 7e11feca9f3..525878f4c15 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}
-    [2018/04/06 v2.18 Spacings and fonts for XeTeX-ko]
+    [2018/04/19 v2.19 Spacings and fonts for XeTeX-ko]
 \fi
 
 %%% we need XeTeX > 0.997
@@ -1413,10 +1413,12 @@
   \fi
 }
 
+\newtoks\XK@toks@
+
 \def\XKcjklastchar#1{%
   \let\@let@token#1\XK@save@last@char
   % and supress char orphan
-  \toks@{\XK@every@hangul{#1}}% everyhangul 가
+  \XK@toks@{\XK@every@hangul{#1}}% everyhangul 가
   \ifnum\lastpenalty=\z@ % bypass 가\\나 case
     \expandafter\XK@futurelet@let@token
   \else
@@ -1427,16 +1429,16 @@
   \ifx\par\@let@token
     \let\next\XK@nobreak@the@toks@
   \else\ifx\@sptoken\@let@token
-    \toks@\expandafter{\the\toks@\@sptoken}%
+    \XK@toks@\expandafter{\the\XK@toks@\@sptoken}%
     \let\next\XK@afterassign@let@token
   \else\ifx.\@let@token
-    \toks@\expandafter{\the\toks@ .}%
+    \XK@toks@\expandafter{\the\XK@toks@ .}%
     \let\next\XK@afterassign@let@token
   \else\ifx^^^^3002\@let@token
-    \toks@\expandafter{\the\toks@^^^^3002}%
+    \XK@toks@\expandafter{\the\XK@toks@^^^^3002}%
     \let\next\XK@afterassign@let@token
   \else\ifx^^^^ff0e\@let@token
-    \toks@\expandafter{\the\toks@^^^^ff0e}%
+    \XK@toks@\expandafter{\the\XK@toks@^^^^ff0e}%
     \let\next\XK@afterassign@let@token
   \else
     \let\next\XK@normal@the@toks@
@@ -1445,8 +1447,8 @@
 }
 \def\XK@afterassign@let@token{\afterassignment\XK@futurelet@let@token\let\@let@token= }
 \def\XK@futurelet@let@token{\futurelet\@let@token\XK@check@next@char}
-\def\XK@normal@the@toks@{\the\toks@}
-\def\XK@nobreak@the@toks@{\XK@nobreak\the\toks@}
+\def\XK@normal@the@toks@{\the\XK@toks@}
+\def\XK@nobreak@the@toks@{\XK@nobreak\the\XK@toks@}
 \def\XK@nobreak{\skip@\lastskip\unskip\unpenalty\nobreak\hskip\skip@}
 
 \def\XKbeginboundary{% empty interchartoks crashes xetex!!!
@@ -1596,6 +1598,7 @@
 %% for ulem
 \def\xetexkoulemsupport{%
   \UL@hook\expandafter{\the\UL@hook
+    \let\XK@nobreak\relax
     \ifdefined\XK@UL@@@hangulfont\else
       \let\XK@UL@@@hangulfont\XKhangulfont
       \let\XK@UL@@@hanjafont \XKhanjafont
diff --git a/Master/texmf-dist/tex/xetex/xetexko/xetexko.sty b/Master/texmf-dist/tex/xetex/xetexko/xetexko.sty
index c5cceaeec00..38a88c14044 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}[2018/04/06 v2.18 Typesetting Korean with XeTeX]
+  \ProvidesPackage{xetexko}[2018/04/19 v2.19 Typesetting Korean with XeTeX]
 \fi
 
 \begingroup\expandafter\expandafter\expandafter\endgroup