6 files changed, 59 insertions, 9 deletions
diff --git a/Master/texmf-dist/doc/xetex/xetexko/ChangeLog b/Master/texmf-dist/doc/xetex/xetexko/ChangeLog
index 53821f55c3f..763ddd90522 100644
--- a/Master/texmf-dist/doc/xetex/xetexko/ChangeLog
+++ b/Master/texmf-dist/doc/xetex/xetexko/ChangeLog
@@ -1,3 +1,10 @@
+2015-06-16      Dohyun Kim <nomos at ktug org>
+
+	Version 2.13
+
+	* xetexko-space.sty: address issue #3 (glue after whatsit)
+	* xetexko-vertical.sty: new environment `horizontal'
+
 2015-03-26      Dohyun Kim <nomos at ktug org>
 
 	Version 2.12
diff --git a/Master/texmf-dist/doc/xetex/xetexko/README b/Master/texmf-dist/doc/xetex/xetexko/README
index 389d9ba4aec..d0725ffeddb 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.12 (2015/03/26)
+XeTeX-ko Package version 2.13 (2015/06/16)
 =========================================
 
 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 a18747c5a67..2799a45cd1e 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 e8cf4d87427..6606b819e4f 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.12\quad 2015/03/26}
+\date{Version 2.13\quad 2015/06/16}
 \maketitle
 
 \begin{quote}\small
@@ -101,6 +101,9 @@
     \item[v2.10]---
     \item 패키지 옵션 \texttt{[unfonts]}를 더는 지원하지 않는다. 이 옵션을
       사용한 기존 문서는 기본 글꼴인 나눔 트루타입으로 식자될 것이다.
+    \item[v2.13]---
+    \item \hyperref[sec:verttype]
+      {\texttt{horizontal} 환경이 추가되었다.}
   \end{itemize}
 \end{quote}
 
@@ -133,8 +136,7 @@ EUC-KR이나 CP949 입력도 지원하는데, 다음과 같은 선언이 있으�
 
 \section{\xetexko\ 부르기}\label{sec:loading}
 \xetexko\ 로드하기: \cs{usepackage\{xetexko\}} 혹은 \cs{usepackage\{kotex\}}.
-이 명령으로 fontspec 및 xunicode 패키지도 함께 불려온다.
-종전과 달리 xltxtra 패키지를 함께 부르지 않음을 주의할 것.
+이 명령으로 fontspec 및 xunicode 패키지도 함께 불러들인다.
 fontspec에 옵션을 주려면 \xetexko를 부르기 전에 fontspec을 따로 로드하면 된다.
 
 \begin{plaintex}
@@ -436,7 +438,7 @@ Noto Sans CJK, 나눔명조옛한글, 나눔바른고딕옛한글 등이 있다.
 \end{verbatim}
 \end{plaintex}
 
-\section{세로쓰기}
+\section{세로쓰기}\label{sec:verttype}
 
 세로쓰기를 위한 글꼴 지정은 다음과 같다.
 역시 고급 오픈타입 기능을 이용하는 것이므로
@@ -494,6 +496,9 @@ vertical 환경의 인자는 세로쓰기 박스의 세로 길이이다.
   \endvertical
 \end{verbatim}
 \end{plaintex}
+세로쓰기 도중에 문서의 일부를 가로쓰기하려면 horizontal 환경을 이용하라.
+horizontal 환경에는 가로쓰기 박스의 너비를 인자로 주어야 한다.
+가로쓰기 영역의 폰트 설정은 사용자의 몫이다.
 
 \section{고문헌·일본어·중국어}
 
diff --git a/Master/texmf-dist/tex/xetex/xetexko/xetexko-space.sty b/Master/texmf-dist/tex/xetex/xetexko/xetexko-space.sty
index 0290fd67ae2..e679182321e 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}
-    [2015/03/26 v2.12 Spacings and fonts for XeTeX-ko]
+    [2015/06/16 v2.13 Spacings and fonts for XeTeX-ko]
 \fi
 
 %%% we need XeTeX > 0.997
@@ -1355,7 +1355,7 @@
     \or  \XKzeroskip      %  1. hbox: especially after indent box
     \or  \XKzeroskip      %  2. vbox
     \or\or\or\or\or\or
-    \or  \XKzeroskip      %  9. whatsit
+    \or                   %  9. whatsit. see issue #3
     \or  \XKcjkmathbreak  % 10. math
     \or
     \or  \XKzeroskip      % 12. kern
diff --git a/Master/texmf-dist/tex/xetex/xetexko/xetexko-vertical.sty b/Master/texmf-dist/tex/xetex/xetexko/xetexko-vertical.sty
index 9dcc8d3d776..89029056a71 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}
-    [2015/01/16 v2.10 Vertical environment for XeTeX-ko]
+    [2015/05/28 v2.13 Vertical environment for XeTeX-ko]
 \fi
 
 % do not veticalize headline/footline
@@ -60,6 +60,9 @@
   \else
     \def\XK@vert@half@em{.5em}%
   \fi
+  \let\xk@horiz@precjkopenparen \precjkopenparen
+  \let\xk@horiz@precjkcloseparen\precjkcloseparen
+  \let\xk@horiz@precjkfullstop  \precjkfullstop
   \def\precjkopenparen {\leavevmode
     \ifx\empty\xetexkocharraise\else\raise\xetexkocharraise\fi
     \hbox
@@ -87,7 +90,7 @@
   \parindent\XK@vert@half@em \parindent2\parindent
 }
 
-\protected\long\def\vertical#1{%
+\protected\def\vertical#1{%
   \setbox\z@\vbox\bgroup
     \hsize=#1%
     \leftskip\z@
@@ -117,6 +120,41 @@
   \raise\dimen@ii\box\z@
 }
 
+% horizontal box inside vertical typesetting
+\protected\def\horizontal#1{%
+  \setbox\z@\vbox\bgroup
+    \hsize=#1%
+    \leftskip \z@
+    \rightskip\z@
+    \parindent\z@
+    \everypar {}%
+    \spaceskip     \fontdimen2\font
+              plus \fontdimen3\font
+              minus\fontdimen4\font
+    \ifdefined\xk@horiz@precjkopenparen
+      \let\precjkopenparen \xk@horiz@precjkopenparen
+      \let\precjkcloseparen\xk@horiz@precjkcloseparen
+      \let\precjkfullstop  \xk@horiz@precjkfullstop
+    \fi
+}
+\protected\def\endhorizontal{%
+  \egroup
+  \dimen@\dimexpr\ht\z@+\dp\z@\relax
+  \dimen@ii\dimexpr\wd\z@+.5ex\relax
+  \setbox\z@\hbox\bgroup
+    \wd\z@\z@\ht\z@\z@\dp\z@\z@
+    \special{x:gsave}%
+    \special{x:rotate 90}%
+    \box\z@
+    \special{x:grestore}%
+  \egroup
+  \wd\z@\dimen@
+  \ht\z@\dimen@ii
+  \dp\z@\z@
+  \fboxsep=-\fboxrule
+  \leavevmode\lower.5ex\box\z@
+}
+
 \protected\def\vertlatin#1{\leavevmode\lower0.5ex\hbox{\latinmarks #1}}
 
 \endinput