6 files changed, 26 insertions, 16 deletions
diff --git a/Master/texmf-dist/doc/xetex/xetexko/ChangeLog b/Master/texmf-dist/doc/xetex/xetexko/ChangeLog
index a5d5b28d038..a3d6346c4d1 100644
--- a/Master/texmf-dist/doc/xetex/xetexko/ChangeLog
+++ b/Master/texmf-dist/doc/xetex/xetexko/ChangeLog
@@ -1,3 +1,11 @@
+2021-08-09      Dohyun Kim <nomos at ktug org>
+
+	Version 3.9
+
+	* Substitution with hangul/hanja fonts will now occur only when
+	\ifx\f@encoding\UTFencname is true. On plain TeX this is normally true
+	as both are undefined.
+
 2021-07-13      Dohyun Kim <nomos at ktug org>
 
 	Version 3.8
diff --git a/Master/texmf-dist/doc/xetex/xetexko/README b/Master/texmf-dist/doc/xetex/xetexko/README
index 49586a7504a..96462d8263d 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 3.8 (2021/07/13)
+XeTeX-ko Package version 3.9 (2021/08/09)
 =========================================
 
 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 0fe8a65b1f9..229db6ab1f6 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 92ff99343f3..921c95634fb 100644
--- a/Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.tex
+++ b/Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.tex
@@ -74,7 +74,7 @@
 \title{\xetexko\ 간단 매뉴얼}
 \author{Dohyun Kim \normalsize <\texttt{nomos at ktug org}> \and
   \normalsize <\url{http://github.com/dohyunkim/xetexko}>}
-\date{Version 3.8\quad 2021/07/13}
+\date{Version 3.9\quad 2021/08/09}
 \maketitle
 
 \begin{quote}\small
diff --git a/Master/texmf-dist/tex/xetex/xetexko/hanja_hangul.tab b/Master/texmf-dist/tex/xetex/xetexko/hanja_hangul.tab
index 157b71bdaed..19883a617e0 100644
--- a/Master/texmf-dist/tex/xetex/xetexko/hanja_hangul.tab
+++ b/Master/texmf-dist/tex/xetex/xetexko/hanja_hangul.tab
@@ -337,7 +337,7 @@
 51340
 50864
 50521
-48516
+52404
 51216
 54616
 54596
diff --git a/Master/texmf-dist/tex/xetex/xetexko/xetexko.sty b/Master/texmf-dist/tex/xetex/xetexko/xetexko.sty
index d2410a29f08..aff19c67a1c 100644
--- a/Master/texmf-dist/tex/xetex/xetexko/xetexko.sty
+++ b/Master/texmf-dist/tex/xetex/xetexko/xetexko.sty
@@ -16,7 +16,7 @@
 
 \ifdefined\ProvidesPackage
   \NeedsTeXFormat{LaTeX2e}[2021/06/01]
-  \ProvidesPackage{xetexko}[2021/07/13 v3.8 typesetting Korean with XeTeX]
+  \ProvidesPackage{xetexko}[2021/08/09 v3.9 typesetting Korean with XeTeX]
 \else
   \ifdefined\@tempcnta\else \newcount\@tempcnta \fi
   \ifdefined\@sptoken \else
@@ -142,16 +142,13 @@
 % 결락기호
 \XeTeXcharclass "25A1=\XeTeXcharclassID % □
 % some KS symbols
-\XeTeXcharclass "2030=\XeTeXcharclassSY % ‰
 \XeTeXcharclass "2032=\XeTeXcharclassSY % ′
 \XeTeXcharclass "2033=\XeTeXcharclassSY % ″
 \XeTeXcharclass "203B=\XeTeXcharclassSY % ※
 \XeTeXcharclass "2103=\XeTeXcharclassSY % ℃
 \XeTeXcharclass "2109=\XeTeXcharclassSY % ℉
 \XeTeXcharclass "2113=\XeTeXcharclassSY % ℓ
-\XeTeXcharclass "2116=\XeTeXcharclassSY % №
 \XeTeXcharclass "2121=\XeTeXcharclassSY % ℡
-\XeTeXcharclass "2122=\XeTeXcharclassSY % ™
 \count@="2160 \loop % Ⅰ..Ⅹ
   \XeTeXcharclass\count@=\XeTeXcharclassSY
   \ifnum\count@<"2169 \advance\count@\@ne \repeat
@@ -230,6 +227,7 @@
 \XeTeXcharclass "266A = \XeTeXcharclassSY % ♪
 \XeTeXcharclass "266C = \XeTeXcharclassSY % ♬
 \XeTeXcharclass "266D = \XeTeXcharclassSY % ♭
+\XeTeXcharclass "3000 = \XeTeXcharclassSY % 　
 \XeTeXcharclass "3013 = \XeTeXcharclassSY % 〓
 \count@="3200 \loop % ㈀..㈞
   \XeTeXcharclass\count@=\XeTeXcharclassSY
@@ -469,9 +467,11 @@
     \expandafter\let\expandafter\XeKo@latin@font\the\font
   \fi\fi
   \ifdefined\XeKo@hangul@font
-    \XeKo@reset@options
-    \XeKo@hangul@font
-    \expandafter\let\expandafter\XeKo@raw@hangul@font\the\font
+    \ifx\f@encoding\UTFencname
+      \XeKo@reset@options
+      \XeKo@hangul@font
+      \expandafter\let\expandafter\XeKo@raw@hangul@font\the\font
+    \fi
   \fi
   }
 \def\XeKo@font@CJK{%
@@ -480,9 +480,11 @@
     \expandafter\let\expandafter\XeKo@latin@font\the\font
   \fi\fi
   \ifdefined\XeKo@hanja@font
-    \XeKo@reset@options
-    \XeKo@hanja@font
-    \expandafter\let\expandafter\XeKo@raw@hanja@font\the\font
+    \ifx\f@encoding\UTFencname
+      \XeKo@reset@options
+      \XeKo@hanja@font
+      \expandafter\let\expandafter\XeKo@raw@hanja@font\the\font
+    \fi
   \fi
   }
 \def\XeKo@font@Latin{%
@@ -2494,9 +2496,6 @@
     \def\으{으}%
     \def\로{로}%
     \def\hellipsis{...}}}{}
-  \if@hangul
-    \RequirePackage{konames-utf}
-  \fi
   }
 
 \newif\if@hangul
@@ -2507,6 +2506,9 @@
 \ProcessOptions\relax
 
 \RequirePackage{kolabels-utf}
+\if@hangul
+  \RequirePackage{konames-utf}
+\fi
 
 \protected\def\hellipsis{^^^^2026^^^^2026}