xetexko (8aug18)

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

5 files changed, 15 insertions, 9 deletions

diff --git a/Master/texmf-dist/doc/xetex/xetexko/ChangeLog b/Master/texmf-dist/doc/xetex/xetexko/ChangeLog
index b0812fba97c..239b61d1416 100644
--- a/Master/texmf-dist/doc/xetex/xetexko/ChangeLog
+++ b/Master/texmf-dist/doc/xetex/xetexko/ChangeLog
@@ -1,3 +1,9 @@
+2018-08-08      Dohyun Kim <nomos at ktug org>
+
+	Version 2.21
+
+	* xetexko-font.sty: protect \{rm,sf,tt}family
+
 2018-08-02      Dohyun Kim <nomos at ktug org>
 
 	Version 2.20
diff --git a/Master/texmf-dist/doc/xetex/xetexko/README b/Master/texmf-dist/doc/xetex/xetexko/README
index 1a9458f1d24..d50dbd36764 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.20 (2018/08/02)
+XeTeX-ko Package version 2.21 (2018/08/08)
 =========================================
 
 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 7d5bcbe929e..408ce290b7b 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 c713d1a0a35..46fd76a4f91 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.20\quad 2018/08/02}
+\date{Version 2.21\quad 2018/08/08}
 \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 5862d538f50..82274859919 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}[2018/08/02 v2.20 LaTeX Font commands for XeTeX-ko]
+\ProvidesPackage{xetexko-font}[2018/08/08 v2.21 LaTeX Font commands for XeTeX-ko]
 
 \let\xetexko@f@size\f@size
 \RequirePackage{fontspec}[2018/07/30]
@@ -382,19 +382,19 @@
 \RenewDocumentCommand \setmainfont { O{} m O{} }
   {
     \__fontspec_main_setmainfont:nn {#1,#3} {#2}
-    \edef\rmfamily{\unexpanded\expandafter{\rmfamily\XK@rm@korean@font}}
+    \protected\edef\rmfamily{\unexpanded\expandafter{\rmfamily\XK@rm@korean@font}}
     \ignorespaces
   }
 \RenewDocumentCommand \setsansfont { O{} m O{} }
   {
     \__fontspec_main_setsansfont:nn {#1,#3} {#2}
-    \edef\sffamily{\unexpanded\expandafter{\sffamily\XK@sf@korean@font}}
+    \protected\edef\sffamily{\unexpanded\expandafter{\sffamily\XK@sf@korean@font}}
     \ignorespaces
   }
 \RenewDocumentCommand \setmonofont { O{} m O{} }
   {
     \__fontspec_main_setmonofont:nn {#1,#3} {#2}
-    \edef\ttfamily{\unexpanded\expandafter{\ttfamily\XK@tt@korean@font
+    \protected\edef\ttfamily{\unexpanded\expandafter{\ttfamily\XK@tt@korean@font
       \disablehangulspacing}}
     \ignorespaces
   }
@@ -470,9 +470,9 @@
   \fi
 }
 
-\edef\rmfamily{\unexpanded\expandafter{\rmfamily\XK@rm@korean@font}}
-\edef\sffamily{\unexpanded\expandafter{\sffamily\XK@sf@korean@font}}
-\edef\ttfamily{\unexpanded\expandafter{\ttfamily
+\protected\edef\rmfamily{\unexpanded\expandafter{\rmfamily\XK@rm@korean@font}}
+\protected\edef\sffamily{\unexpanded\expandafter{\sffamily\XK@sf@korean@font}}
+\protected\edef\ttfamily{\unexpanded\expandafter{\ttfamily
   \XK@tt@korean@font\disablehangulspacing
 }}
 \edef\verbatim@font{\unexpanded\expandafter{\verbatim@font