cjk-ko (6dec13)

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

9 files changed, 241 insertions, 168 deletions

diff --git a/Master/texmf-dist/doc/latex/cjk-ko/ChangeLog b/Master/texmf-dist/doc/latex/cjk-ko/ChangeLog
index 7358cba819f..51f0cbca1a9 100644
--- a/Master/texmf-dist/doc/latex/cjk-ko/ChangeLog
+++ b/Master/texmf-dist/doc/latex/cjk-ko/ChangeLog
@@ -1,11 +1,25 @@
+2013-12-06      Dohyun Kim <nomos at ktug org>
+
+	Version 1.3
+
+	* cjkutf8-ko.sty:
+		- new package options for cjk font setting, mj=<font> and
+		gt=<font>
+		- allow italic correction after CJK char
+		- move char definition of U+00B7 to AtBeginDocument
+
+	* cjkutf8-josa.sty:
+		- fix a bug regarding in-line \jong \jung \rieul
+
 2013-07-03      Dohyun Kim <nomos at ktug org>
 
 	Version 1.2
 
-	* cjkutf8-ko.sty: there was a clash with \makeindex of memoir
-	class as reported by Juho Lee;
-	move caption setting to AtBeginDocument;
-	codes for non-eTeX engines are removed.
+	* cjkutf8-ko.sty:
+		- there was a clash with \makeindex of memoir class as reported
+		by Juho Lee
+		- move caption setting to AtBeginDocument
+		- codes for non-eTeX engines are removed
 
 	* cjk-ko-doc.tex: explicitly state that [usedotemph] option
 	declares \normalem (see the manual of ulem package).
diff --git a/Master/texmf-dist/doc/latex/cjk-ko/README b/Master/texmf-dist/doc/latex/cjk-ko/README
index 0d36349acc6..9ee0e2fa0ca 100644
--- a/Master/texmf-dist/doc/latex/cjk-ko/README
+++ b/Master/texmf-dist/doc/latex/cjk-ko/README
@@ -1,4 +1,4 @@
-CJK-ko package version 1.2 (2013/07/03)
+CJK-ko package version 1.3 (2013/12/06)
 =======================================
 
 This package supports typesetting modern Korean documents with the help
@@ -16,9 +16,9 @@ Author
 ------
 
 Please report any errors or suggestions to
-	Dohyun Kim <nomos at ktug org>
+    Dohyun Kim <nomos at ktug org>
 or leave messages in the issue tracker at:
-	<http://github.com/dohyunkim/cjk-ko>.
+    <http://github.com/dohyunkim/cjk-ko>.
 
 
 License
@@ -26,23 +26,23 @@ License
 
 ### GPL (Gnu General Public License):
 
-	cjkutf8-ko.sty
-	cjkutf8-josa.sty
-	cjkutf8-nanummjhanja.sty
+    cjkutf8-ko.sty
+    cjkutf8-josa.sty
+    cjkutf8-nanummjhanja.sty
 These files are derivatives of CJK package or written by the author.
 
 ### LPPL (LaTeX Project Public License):
 
-	kotex.sty
-	konames-utf.sty
-	kolabels-utf.sty
+    kotex.sty
+    konames-utf.sty
+    kolabels-utf.sty
 These files are copied or modified from ko.TeX package.
 
 ### Public domain:
 
-	cjk-ko-doc.tex
-	README
-	ChangeLog
+    cjk-ko-doc.tex
+    README
+    ChangeLog
 
 See each file for more details.
 
@@ -52,58 +52,61 @@ Files
 
 ### TeXinputs
 
-	cjkutf8-ko.sty			-> tex/latex/cjk-ko/
-	cjkutf8-josa.sty		-> tex/latex/cjk-ko/
-	cjkutf8-nanummjhanja.sty	-> tex/latex/cjk-ko/
-	kotex.sty			-> tex/latex/cjk-ko/
-	kolabels-utf.sty		-> tex/latex/cjk-ko/
-	konames-utf.sty			-> tex/latex/cjk-ko/
+    cjkutf8-ko.sty           -> tex/latex/cjk-ko/
+    cjkutf8-josa.sty         -> tex/latex/cjk-ko/
+    cjkutf8-nanummjhanja.sty -> tex/latex/cjk-ko/
+    kotex.sty                -> tex/latex/cjk-ko/
+    kolabels-utf.sty         -> tex/latex/cjk-ko/
+    konames-utf.sty          -> tex/latex/cjk-ko/
 
 ### Documents
 
-	cjk-ko-doc.tex			-> doc/latex/cjk-ko/
-	cjk-ko-doc.pdf			-> doc/latex/cjk-ko/
-	README				-> doc/latex/cjk-ko/
-	ChangeLog			-> doc/latex/cjk-ko/
+    cjk-ko-doc.tex           -> doc/latex/cjk-ko/
+    cjk-ko-doc.pdf           -> doc/latex/cjk-ko/
+    README                   -> doc/latex/cjk-ko/
+    ChangeLog                -> doc/latex/cjk-ko/
 
 
 Loading of the package
 ----------------------
 
-	\usepackage{cjkutf8-ko}
+    \usepackage{cjkutf8-ko}
 or
 
-	\usepackage[cjk]{kotex}
+    \usepackage[cjk]{kotex}
 
 
 ### package options
 
-	[cjk]
+    [cjk]
 Option for kotex.sty.  If this option is not given and if kotexutf.sty
 does exist, kotexutf package will be loaded instead.
 
-	[hangul]
+    [hangul]
 Load Hangul captions. line/word spacing is adjusted as well.
 
-	[hanja]
+    [hanja]
 Load Hanja captions. same as [hangul] option for line/word spacing.
 
-	[nojosa]
+    [nojosa]
 Disable automatic Josa selection
 
-	[usedotemph]
+    [usedotemph]
 Enable \dotemph command. CJKfntef.sty and CJKulem.sty will be loaded
 as well.
 
-	[usecjkt1font]
+    [usecjkt1font]
 Latin characters are typeset by CJK font. Only Nanum T1 font is
 currently available.
 
+    [mj=<font>], [gt=<font>]
+Declare Myeongjo and Gothic fonts respectively. `c70<font>.fd` should
+be existant.
 
 User commands
 -------------
 
-	\CJKscale
+    \CJKscale
 - scale font size of CJK character
 - eg: \CJKscale{0.95}
 - cannot be used with [usecjkt1font] option
@@ -111,20 +114,20 @@ User commands
 - under [hangul] option, line/word spacing and indent size are
   adjusted automatically
 
-	\lowerCJKchar
+    \lowerCJKchar
 - lower CJK characters
 - eg: \lowerCJKchar{0.1em}
 - cannot be used with [usecjkt1font] option
 - allowed only in the preamble
 
-	\dotemph
+    \dotemph
 - emphasize Hangul or Hanja by putting dot above
 - eg: \dotemph{드러냄표}
 - available only when [usedotemph] option is given
 - users can redefine these commands:
 
-	\def\dotemphchar{\Unicode{"02}{"D9}}
-	\def\dotemphraise{0.2em}
+    \def\dotemphchar{\Unicode{"02}{"D9}}
+    \def\dotemphraise{0.2em}
 
 For other commands see CJK package documents.
 
@@ -134,21 +137,21 @@ Automatic Josa selection
 
 Josa commands:
 
-	\은 \는 \이 \가 \을 \를 \와 \과 \로 \으로 \라 \이라
+    \은 \는 \이 \가 \을 \를 \와 \과 \로 \으로 \라 \이라
 
 example:
 
-	\label{fig:aaa} ... \ref{fig:aaa}\을
-	\label{fig:aaa} ... \pageref{fig:aaa}\을
-	\cite{hong}\을 ... \bibitem[홍길동\jong]{hong}
+    \label{fig:aaa} ... \ref{fig:aaa}\을
+    \label{fig:aaa} ... \pageref{fig:aaa}\을
+    \cite{hong}\을 ... \bibitem[홍길동\jong]{hong}
 
 Automatic Josa selection works correctly only after
 \ref \pageref \cite commands and after ascii characters.
 For other cases these commands are available:
 
-	\jung:  keyword is terminated by Jungseong
-	\jong:  keyword is terminated by Jongseong
-	\rieul: keyword is terminated by Jongseong Rieul
+    \jung:  keyword is terminated by Jungseong
+    \jong:  keyword is terminated by Jongseong
+    \rieul: keyword is terminated by Jongseong Rieul
 
 
 Korean counters
@@ -156,8 +159,8 @@ Korean counters
 
 Same as ko.TeX package:
 
-	\jaso \gana \ojaso \ogana \pjaso \pgana \onum \pnum \oeng \peng
-	\hnum \Hnum \hroman \hRoman \hNum \hanjanum
+    \jaso \gana \ojaso \ogana \pjaso \pgana \onum \pnum \oeng \peng
+    \hnum \Hnum \hroman \hRoman \hNum \hanjanum
 
 
 *END of README*
diff --git a/Master/texmf-dist/doc/latex/cjk-ko/cjk-ko-doc.pdf b/Master/texmf-dist/doc/latex/cjk-ko/cjk-ko-doc.pdf
index 030fa838675..d1182726a04 100644
--- a/Master/texmf-dist/doc/latex/cjk-ko/cjk-ko-doc.pdf
+++ b/Master/texmf-dist/doc/latex/cjk-ko/cjk-ko-doc.pdf
diff --git a/Master/texmf-dist/doc/latex/cjk-ko/cjk-ko-doc.tex b/Master/texmf-dist/doc/latex/cjk-ko/cjk-ko-doc.tex
index 6f4cf613b85..3c33dd1e36c 100644
--- a/Master/texmf-dist/doc/latex/cjk-ko/cjk-ko-doc.tex
+++ b/Master/texmf-dist/doc/latex/cjk-ko/cjk-ko-doc.tex
@@ -17,7 +17,7 @@
 \title{\cjkko\ 간단 매뉴얼}
 \author{Dohyun Kim \normalsize $<$\texttt{nomos at ktug org}$>$ \and
   \normalsize $<$\url{http://github.com/dohyunkim/cjk-ko}$>$}
-\date{Version 1.2\quad\today}
+\date{Version 1.3\quad\today}
 \begin{document}
 \maketitle
 
@@ -28,6 +28,9 @@
   수정했다. 특히 \TeX\ Live 버전에서는 나눔글꼴을 트루타입 대신 Type1
   글꼴---물론 subfont들이다---로 변환해 넣음으로써 다양한 DVI 툴을 이용할 수
   있게 했다.
+
+  1.3 버전부터는 나눔글꼴이 아닌 다른 한글 폰트를 패키지 옵션으로 지정해서 쓸
+  수 있다.
 \end{abstract}
 
 \section{Introduction}
@@ -35,12 +38,12 @@
     \item CJK 패키지의 \texttt{UTF8} 환경 이용
     \item 복잡한 환경 지시 없이 \texttt{kotex}만 부르면 바로 한글 가능
       \begin{itemize}
-	\item[] \hskip2cm \fbox{\vtop{\hsize=.5\textwidth\baselineskip=1.1em
-	    \cs{begin\{document\}}\par
-	    \cs{begin\{CJK\}\{UTF8\}\{mj\}}\par
-	    \leavevmode\llap{No More $\rightarrow$\quad}\quad $\cdots$\par
-	    \cs{end\{CJK\}}\par
-	    \cs{end\{document\}}}}
+        \item[] \hskip2cm \fbox{\vtop{\hsize=.5\textwidth\baselineskip=1.1em
+            \cs{begin\{document\}}\par
+            \cs{begin\{CJK\}\{UTF8\}\{mj\}}\par
+            \leavevmode\llap{불필요 $\rightarrow$\quad}\quad $\cdots$\par
+            \cs{end\{CJK\}}\par
+            \cs{end\{document\}}}}
       \end{itemize}
     \item 한글 문서에 최적화된 줄바꿈 기능~--- 예: 괄호 앞뒤, 수식 뒤
     \item 영문자와 한글의 조화 추구~--- 예: 한글 글자 크기 조정 허용
@@ -55,20 +58,24 @@
       \medskip
     \item[패키지 옵션]:
       \begin{itemize}
-	\item[\texttt{cjk}] \TeX\ Live에선 이 옵션이 없으면 kotexutf\,가
-	  로드된다. 단, \verb|kotexutf.sty| 파일을 찾을 수 없다면
-	  이 옵션이 없더라도 \cjkko\ 패키지를 부른다.
-	\item[\texttt{hangul}] 한글 캡션, 줄 간격, 단어 간격, frenchspacing
-	  등의 조정이 이루어진다. 문서의 주된 언어가 한글이라고 선언하는 옵션
-	\item[\texttt{hanja}] \verb|[hangul]| $+$ 한자 캡션
-	\item[\texttt{nojosa}] 자동조사 기능 끄기. 이 옵션을 주더라도
-	  자동조사 명령이 에러를 내는 건 아니다.
-	\item[\texttt{usedotemph}] \cs{dotemph} 명령 허용\\
-	  --- 이 옵션은 ulem 패키지도 부르므로 \uline{밑줄 긋기} 가능.
-	  단, \cs{normalem} 명령이 선언돼 있으므로 \cs{emph} 명령이
-	  밑줄긋기로 동작하게 하려면 \cs{ULforem} 선언이 있어야 한다.
-	\item[\texttt{usecjkt1font}] 영문자도 한글 글꼴---나눔폰트---로 식자.
-	   라틴 알파벳이 거의 없는 소설책 따위에 유용할 수 있다.
+        \item[\texttt{cjk}] \TeX\ Live에선 이 옵션이 없으면 kotexutf\,가
+          로드된다. 단, \verb|kotexutf.sty| 파일을 찾을 수 없다면
+          이 옵션이 없더라도 \cjkko\ 패키지를 부른다.
+        \item[\texttt{hangul}] 한글 캡션, 줄 간격, 단어 간격, frenchspacing
+          등의 조정이 이루어진다. 문서의 주된 언어가 한글이라고 선언하는 옵션
+        \item[\texttt{hanja}] \verb|[hangul]| $+$ 한자 캡션
+        \item[\texttt{nojosa}] 자동조사 기능 끄기. 이 옵션을 주더라도
+          자동조사 명령이 에러를 내는 건 아니다.
+        \item[\texttt{usedotemph}] \cs{dotemph} 명령 허용\\
+          --- 이 옵션은 ulem 패키지도 부르므로 \uline{밑줄 긋기} 가능.
+          단, \cs{normalem} 명령이 선언돼 있으므로 \cs{emph} 명령이
+          밑줄긋기로 동작하게 하려면 \cs{ULforem} 선언이 있어야 한다.
+        \item[\texttt{usecjkt1font}] 영문자도 한글 글꼴로 식자.
+           라틴 알파벳이 거의 없는 소설책 따위에 유용할 수 있다.
+        \item[\texttt{mj=<font>}] CJK 명조 글꼴을 지정한다. 예컨대
+          \verb|[mj=utbt]|.
+        \item[\texttt{gt=<font>}] CJK 고딕 글꼴을 지정한다. ttfamily에도
+          이 글꼴이 쓰인다.
       \end{itemize}
   \end{description}
 
@@ -76,24 +83,24 @@
   \begin{description}
     \item[\cs{CJKscale}] 한글만 글자크기 조정
       \begin{itemize}\leftskip-1cm
-	\item 예: \cs{CJKscale\{0.95\}}
-	\item \verb|[usecjkt1font]| 옵션과는 같이 쓸 수 없다.
-	\item \verb|[hangul]| 옵션 아래서는 단어 간격, 줄 간격,
-	  들여쓰기 크기도 자동 조정
-	\item 전처리부에서만 쓸 수 있다.
+        \item 예: \cs{CJKscale\{0.95\}}
+        \item \verb|[usecjkt1font]| 옵션과는 같이 쓸 수 없다.
+        \item \verb|[hangul]| 옵션 아래서는 단어 간격, 줄 간격,
+          들여쓰기 크기도 자동 조정
+        \item 전처리부에서만 쓸 수 있다.
       \end{itemize}
     \item[\cs{lowerCJKchar}] 한글만 아래로 끌어내려 식자
       \begin{itemize}\leftskip-1cm
-	\item 예: \cs{lowerCJKchar\{-0.07em\} \% 끌어올려 식자}
-	\item \verb|[usecjkt1font]| 옵션과는 같이 쓸 수 없다.
-	\item 전처리부에서만 쓸 수 있다.
+        \item 예: \cs{lowerCJKchar\{-0.07em\} \% 끌어올려 식자}
+        \item \verb|[usecjkt1font]| 옵션과는 같이 쓸 수 없다.
+        \item 전처리부에서만 쓸 수 있다.
       \end{itemize}
     \item[\cs{dotemph}] \dotemph{드러냄표}
       \begin{itemize}\leftskip-1cm
-	\item 예: \cs{dotemph\{드러냄표\}}
-	\item \verb|[usedotemph]| 옵션 아래에서만 쓸 수 있다.
-	\item \koTeX 과 마찬가지로 \cs{dotemphraise} \cs{dotemphchar} 명령
-	  재정의 가능
+        \item 예: \cs{dotemph\{드러냄표\}}
+        \item \verb|[usedotemph]| 옵션 아래에서만 쓸 수 있다.
+        \item \koTeX 과 마찬가지로 \cs{dotemphraise} \cs{dotemphchar} 명령
+          재정의 가능
       \end{itemize}
     \item[기타] 사용자 명령은 CJK 패키지 문서를 참조
   \end{description}
@@ -108,8 +115,8 @@
     \item 한글 뒤에는 \cs{jong} \cs{jung} \cs{rieul} 명령을
       첨가해 바로잡을 수 있다.\par
       \begin{itemize}
-	\item[예:] \cs{cite\{hong\}}\cs{을} \ldots\\
-		   \hskip1.3em\ \cs{bibitem[홍길동}\cs{jong]\{hong\}}
+        \item[예:] \cs{cite\{hong\}}\cs{을} \ldots\\
+                   \hskip1.3em\ \cs{bibitem[홍길동}\cs{jong]\{hong\}}
       \end{itemize}
   \end{itemize}
 
@@ -140,11 +147,8 @@
   \item GPL~--- \verb|cjkutf8-*| 파일의 라이선스는 CJK 패키지와
     같을 수밖에 없다.
   \item LPPL~--- \verb|ko*| 파일들은 \koTeX\ 패키지에서 유래한다.
-\end{itemize}
-
-\begin{flushright}
-  \fboxsep=-\fboxrule
+  \hfill \fboxsep=-\fboxrule
   \fbox{\vbox to1em{\hbox to1em{\hss}\vss}}
-\end{flushright}
+\end{itemize}
 
 \end{document}
diff --git a/Master/texmf-dist/tex/latex/cjk-ko/cjkutf8-josa.sty b/Master/texmf-dist/tex/latex/cjk-ko/cjkutf8-josa.sty
index ab84e0daf32..617a3b8589d 100644
--- a/Master/texmf-dist/tex/latex/cjk-ko/cjkutf8-josa.sty
+++ b/Master/texmf-dist/tex/latex/cjk-ko/cjkutf8-josa.sty
@@ -17,7 +17,7 @@
 % Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
 % MA 02110-1301 USA
 
-\ProvidesPackage{cjkutf8-josa}[2013/02/23 v1.0 Auto-Josa for CJKutf8]
+\ProvidesPackage{cjkutf8-josa}[2013/12/06 v1.3 Automatic Josa selection for cjk-ko]
 
 \AtBeginDocument{
   \ifx\use@josa\undefined\else
@@ -26,10 +26,10 @@
     \def\@setref#1#2#3{\CJKKO@orig@setref{#1}{#2}{#3}%
       \bgroup
       \ifx#1\relax\else
-	\ifx\protect\relax % not from kotexutf
-	  \let\protect\noexpand % not from kotexutf
-	  \xdef\josa@str{\expandafter#2#1}%
-	\fi
+        \ifx\protect\relax % not from kotexutf
+          \let\protect\noexpand % not from kotexutf
+          \xdef\josa@str{\expandafter#2#1}%
+        \fi
       \fi
       \egroup}
     % redefine \@cite@ofmt
@@ -54,18 +54,14 @@
   }}{}
 }
 
-\let\josa@str\empty
-
 %%% user commands: \jong \jung \rieul
-\DeclareRobustCommand*\jong {\chardef\@josa\z@}
-\DeclareRobustCommand*\rieul{\chardef\@josa\@ne}
-\DeclareRobustCommand*\jung {\chardef\@josa\tw@}
+\protected\def\jong {\let\josa@str\empty\chardef\@josa\z@ }
+\protected\def\rieul{\let\josa@str\empty\chardef\@josa\@ne}
+\protected\def\jung {\let\josa@str\empty\chardef\@josa\tw@}
 \jung
 
 \def\makejosa#1#2{%
   \bgroup
-  % \jong etc in \josa@str is now unprotected
-  \def\jong{\chardef\@josa\z@}\def\rieul{\chardef\@josa\@ne}%
   \expandafter\make@josa\josa@str\@nil{#1}{#2}%
   \egroup}
 
@@ -86,8 +82,9 @@
     \ifx\@let@token L\rieul\else
     \ifx\@let@token M\jong \else
     \ifx\@let@token N\jong \else
-    \ifx\@let@token\jong \jong\else
-    \ifx\@let@token\rieul\rieul
+    \ifx\@let@token\jong \jong \else
+    \ifx\@let@token\rieul\rieul\else
+      \jung
     \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
     \expandafter\make@josa
   \fi}
diff --git a/Master/texmf-dist/tex/latex/cjk-ko/cjkutf8-ko.sty b/Master/texmf-dist/tex/latex/cjk-ko/cjkutf8-ko.sty
index 4aa112bb661..67f8cef50fd 100644
--- a/Master/texmf-dist/tex/latex/cjk-ko/cjkutf8-ko.sty
+++ b/Master/texmf-dist/tex/latex/cjk-ko/cjkutf8-ko.sty
@@ -17,7 +17,7 @@
 % Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
 % MA 02110-1301 USA
 
-\ProvidesPackage{cjkutf8-ko}[2013/07/03 v1.2 Hangul typesetting on CJKutf8]
+\ProvidesPackage{cjkutf8-ko}[2013/11/28 v1.3 Hangul typesetting on CJKutf8]
 
 \ifx\eTeXversion\relax \let\eTeXversion\undefined \fi
 \ifx\eTeXversion\undefined
@@ -35,37 +35,72 @@
 \DeclareOption{usecjkt1font}{\let\usecjk@@font\empty\@hangultrue}
 \DeclareOption{usedotemph}{\let\usedot@mph\empty}
 \DeclareOption{nojosa}{\let\use@josa\undefined}
+\DeclareOption*{\expandafter\CJKKO@userfont@option\CurrentOption=\end}
+\def\CJKKO@userfont@option#1=#2\end{%
+  \ifx\empty#2\empty
+    \PackageError{cjkutf8-ko}{Option not used: #1}{}
+  \else
+    \def\reserved@a{mj}\def\reserved@b{gt}\def\reserved@c{#1}
+    \ifx\reserved@a\reserved@c
+      \edef\CJKKO@mjfont{\CJKKO@removetrailingEQ#2}
+      \IfFileExists{c70\CJKKO@mjfont.fd}{}{%
+        \PackageError{cjkutf8-ko}{`c70\CJKKO@mjfont.fd' does not exist}{}
+        \let\CJKKO@mjfont\undefined
+      }
+    \else
+      \ifx\reserved@b\reserved@c
+        \edef\CJKKO@gtfont{\CJKKO@removetrailingEQ#2}
+        \IfFileExists{c70\CJKKO@gtfont.fd}{}{%
+          \PackageError{cjkutf8-ko}{`c70\CJKKO@gtfont.fd' does not exist}{}
+          \let\CJKKO@gtfont\undefined
+        }
+      \else
+        \PackageError{cjkutf8-ko}
+          {Unknown hangul font type: #1}
+          {Allowed font types are `mj' and `gt'}
+      \fi
+    \fi
+  \fi
+}
+\def\CJKKO@removetrailingEQ#1={#1}
 \ProcessOptions\relax
 
+\ifx\CJKKO@mjfont\undefined \def\CJKKO@mjfont{nanummj}\fi
+\ifx\CJKKO@gtfont\undefined \def\CJKKO@gtfont{nanumgt}\fi
+
 %%%%%%%%%%%%%%%%%%%%%%%%%
 % font settings
 \ifx\usecjk@@font\undefined\else
   \RequirePackage[T1]{fontenc}
   \RequirePackage{textcomp}
-  \def\rmdefault{nanummj}
-  \def\sfdefault{nanumgt}
+  \IfFileExists{t1\CJKKO@mjfont.fd}{\let\rmdefault\CJKKO@mjfont}{}
+  \IfFileExists{t1\CJKKO@gtfont.fd}{\let\sfdefault\CJKKO@gtfont}{}
 \fi
 
 \RequirePackage{CJKutf8}
 
-\g@addto@macro\rmfamily{\CJKfamily{nanummj}}
-\g@addto@macro\sffamily{\CJKfamily{nanumgt}}
-\g@addto@macro\ttfamily{\CJKfamily{nanumgt}}
+\g@addto@macro\rmfamily{\CJKfamily{\CJKKO@mjfont}}
+\g@addto@macro\sffamily{\CJKfamily{\CJKKO@gtfont}}
+\g@addto@macro\ttfamily{\CJKfamily{\CJKKO@gtfont}}
 
 \AtBeginDocument{
   \edef\reserved@a{\familydefault}
   \edef\reserved@b{\rmdefault}
   \ifx\reserved@a\reserved@b
-    \CJKfamily{nanummj}
-    \g@addto@macro\normalfont{\CJKfamily{nanummj}}
+    \CJKfamily{\CJKKO@mjfont}
+    \g@addto@macro\normalfont{\CJKfamily{\CJKKO@mjfont}}
     \if@hangul\ifx\usecjk@@font\undefined
-      \CJKKO@hangulspaceglue{t1nanummjm}% get space glue from hangul font
+      \IfFileExists{t1\CJKKO@mjfont m}{%
+        \CJKKO@hangulspaceglue{t1\CJKKO@mjfont m}% space glue from hangul font
+      }{}
     \fi\fi
   \else
-    \CJKfamily{nanumgt}
-    \g@addto@macro\normalfont{\CJKfamily{nanumgt}}
+    \CJKfamily{\CJKKO@gtfont}
+    \g@addto@macro\normalfont{\CJKfamily{\CJKKO@gtfont}}
     \if@hangul\ifx\usecjk@@font\undefined
-      \CJKKO@hangulspaceglue{t1nanumgtm}% get space glue from hangul font
+      \IfFileExists{t1\CJKKO@gtfont m}{%
+        \CJKKO@hangulspaceglue{t1\CJKKO@gtfont m}% space glue from hangul font
+      }{}
     \fi\fi
   \fi
   \let\reset@font\normalfont
@@ -102,7 +137,7 @@
     \CJKunderanysymbol{-\dotemphraise}{\dotemphchar}}
   \AtBeginDocument{
     \@ifpackageloaded{hyperref}{\g@addto@macro\pdfstringdefPreHook{%
-	\let\dotemph\@firstofone
+        \let\dotemph\@firstofone
     }}{}
   }
 \fi
@@ -114,10 +149,29 @@
 \def\CJKglue{\HangulPenalty\HangulGlue}
 \def\CJKpostmathglue{\HangulPenalty\hskip.25ex plus.1ex minus.05ex }
 \CJKspace
-\CJK@envStart{}{UTF8}{nanummj}
+\CJK@envStart{}{UTF8}{\CJKKO@mjfont}
 \makeatletter
 
 %%%%%%%%%%%%%%%%%%%%%%%%%
+% italic correction after cjk
+\edef\maybe@ic@{%
+  \unexpanded{%
+    \let\CJKKO@wasCJK\undefined
+    \ifnum\lastkern=\@ne
+      \unkern\unkern
+      \let\CJKKO@wasCJK\empty
+    \fi
+  }%
+  \unexpanded\expandafter{\maybe@ic@
+    \ifx\CJKKO@wasCJK\empty
+      \CJK@CJK
+      \CJKKO@check@next@tok@
+      \let\CJKKO@wasCJK\undefined
+    \fi
+  }%
+}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%
 %%% CJKscale: scale CJK char size
 \def\CJKscale#1{%
   \ifx\usecjk@@font\undefined
@@ -139,32 +193,32 @@
       \@tempdimb\CJK@scale\@tempdimb %%% inserted
       \ifx\optional@arg \@empty
       \else
-	\expandafter\ifx
-	 \csname CJK@\mandatory@arg/\f@size/\the\@tempdimb\endcsname \relax
-	  \@tempdimb \optional@arg\@tempdimb
-	  #1{Font\space shape\space `\curr@fontshape'\space
-	     will\space be\MessageBreak
-	     scaled\space to\space size\space \the\@tempdimb}%
-	  \expandafter
-	   \gdef\csname CJK@\mandatory@arg/\f@size/\the\@tempdimb\endcsname{}%
-	\fi
+        \expandafter\ifx
+         \csname CJK@\mandatory@arg/\f@size/\the\@tempdimb\endcsname \relax
+          \@tempdimb \optional@arg\@tempdimb
+          #1{Font\space shape\space `\curr@fontshape'\space
+             will\space be\MessageBreak
+             scaled\space to\space size\space \the\@tempdimb}%
+          \expandafter
+          \gdef\csname CJK@\mandatory@arg/\f@size/\the\@tempdimb\endcsname{}%
+        \fi
       \fi
       \edef\external@font{%
-	\mandatory@arg\CJK@plane\space at \the\@tempdimb}%
+        \mandatory@arg\CJK@plane\space at \the\@tempdimb}%
       \xdef\font@name{%
-	\csname \curr@fontshape/\f@size/\CJK@plane\endcsname}%
+        \csname \curr@fontshape/\f@size/\CJK@plane\endcsname}%
       \expandafter\global\expandafter\let
        \csname \CJK@curr@fontshape\expandafter\endcsname
-	\csname \curr@fontshape\endcsname}
+        \csname \curr@fontshape\endcsname}
     \if@hangul % hangul is main language
       % scale space glue
       \bgroup
       \@for\reserved@a:=,\small,\footnotesize,\large,\Large,\LARGE\do{%
-	\reserved@a
-	\fontdimen2\font=\CJK@scale\fontdimen2\font
-	\fontdimen3\font=\CJK@scale\fontdimen3\font
-	\fontdimen4\font=\CJK@scale\fontdimen4\font
-	\fontdimen7\font=\CJK@scale\fontdimen7\font}
+        \reserved@a
+        \fontdimen2\font=\CJK@scale\fontdimen2\font
+        \fontdimen3\font=\CJK@scale\fontdimen3\font
+        \fontdimen4\font=\CJK@scale\fontdimen4\font
+        \fontdimen7\font=\CJK@scale\fontdimen7\font}
       \egroup
       % scale parindent, footnotesep, footins
       \parindent\CJK@scale\parindent
@@ -225,13 +279,13 @@
     \ifnum\lastpenalty=\z@ % last node is not penalty (?)
     \ifnum\spacefactor=998 \else % last char is not opening ascii
       \ifx\CJK@plane\undefined\else
-	\CJK@testPostPunct{\CJK@@@enc}{\CJK@plane}{\CJK@gtemp}%
+        \CJK@testPostPunct{\CJK@@@enc}{\CJK@plane}{\CJK@gtemp}%
       \fi
       \ifCJK@
-	\global\CJK@false
+        \global\CJK@false
       \else % this char is not closing cjk
-	\ifnum\lastnodetype=10 \CJKpostmathglue % after math-off
-	\else \CJKglue \fi
+        \ifnum\lastnodetype=10 \CJKpostmathglue % after math-off
+        \else \CJKglue \fi
       \fi
     \fi\fi\fi\fi\fi
   %%% end of inserted
@@ -285,8 +339,10 @@
   \fi}
 \def\CJKKO@opening@punct#1{\leavevmode\hbox to.5em{\hss\CJKsymbol{#1}}}
 \def\CJKKO@normal@punct#1{\leavevmode\hbox to.5em{\CJKsymbol{#1}\hss}}
-\DeclareUnicodeCharacter{00B7}
+\AtBeginDocument{
+  \DeclareUnicodeCharacter{00B7}
   {\leavevmode\kern.25em \Unicode{0}{"B7}\hskip.25em\relax}
+}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%
 %%% lowercjkchar: eg, \lowercjkchar{-0.1em}
@@ -309,11 +365,11 @@
   \ifx\CJK@charlower\undefined\else
     \DeclareRobustCommand{\CJKsymbol}[1]{%
       \leavevmode\lower\CJK@charlower\hbox{% inserted
-	\symbol{#1}%
-	\ifCJK@bold@
-	  \hbox to \CJKboldshift{\hss\symbol{#1}}%
-	  \hbox to \CJKboldshift{\hss\symbol{#1}}%
-	\fi
+        \symbol{#1}%
+        \ifCJK@bold@
+          \hbox to \CJKboldshift{\hss\symbol{#1}}%
+          \hbox to \CJKboldshift{\hss\symbol{#1}}%
+        \fi
       }% inserted
     }
   \fi\fi
@@ -321,7 +377,10 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%
 %%% nanummj has no hanja : texlive only
-\RequirePackage{cjkutf8-nanummjhanja}
+\def\CJKKO@mjdefault{nanummj}
+\ifx\CJKKO@mjfont\CJKKO@mjdefault
+  \RequirePackage{cjkutf8-nanummjhanja}
+\fi
 
 %%%%%%%%%%%%%%%%%%%%%%%%%
 %%% auto-josa, light version
@@ -359,10 +418,6 @@
 %%% cause:  memoir appempts to write index entries to a file
 %%% at the end of document without protecting active characters.
 %%% spotted by Juho Lee. thanks to him.
-\@ifclassloaded{memoir}{
-  \AtEndDocument{\edef\@sanitize{\unexpanded\expandafter{\@sanitize
-    \let\protect\string
-  }}}
-}{}
+\AtEndDocument{\CJK@makeInactive}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/cjk-ko/cjkutf8-nanummjhanja.sty b/Master/texmf-dist/tex/latex/cjk-ko/cjkutf8-nanummjhanja.sty
index dd43bd5813c..39cc4217ca5 100644
--- a/Master/texmf-dist/tex/latex/cjk-ko/cjkutf8-nanummjhanja.sty
+++ b/Master/texmf-dist/tex/latex/cjk-ko/cjkutf8-nanummjhanja.sty
@@ -18,9 +18,9 @@
 % MA 02110-1301 USA
 
 \ProvidesPackage{cjkutf8-nanummjhanja}
-  [2013/02/23 v1.0 UHC hanja for Nanum Myeongjo]
+  [2013/10/07 v1.3 UHC hanja for Nanum Myeongjo]
 
-\def\CJKKO@mjfamily{nanummj}
+\def\CJKKO@mjdefault{nanummj}
 \def\CJKKO@mjhanjafamily{\def\CJK@family{uhcmj}}
 
 % redefine CJK@numbToHex
@@ -34,25 +34,25 @@
    \xdef#1{%
      \hexnumber@{\count\z@}\hexnumber@{\count\tw@}}}%
   % inserted
-  \ifx\CJK@family\CJKKO@mjfamily
+  \ifx\CJK@family\CJKKO@mjdefault
     \expandafter\CJKKO@checkhanjaplane#1\fi}
 
 \def\CJKKO@checkhanjaplane#1#2{%
   \begingroup
   \count@\ifx#1A10\else
-	 \ifx#1B11\else
-	 \ifx#1C12\else
-	 \ifx#1D13\else
-	 \ifx#1E14\else
-	 \ifx#1F15\else
-	 #1\fi\fi\fi\fi\fi\fi
+         \ifx#1B11\else
+         \ifx#1C12\else
+         \ifx#1D13\else
+         \ifx#1E14\else
+         \ifx#1F15\else
+         #1\fi\fi\fi\fi\fi\fi
   \@tempcnta\ifx#2A10\else
-	    \ifx#2B11\else
-	    \ifx#2C12\else
-	    \ifx#2D13\else
-	    \ifx#2E14\else
-	    \ifx#2F15\else
-	    #2\fi\fi\fi\fi\fi\fi
+            \ifx#2B11\else
+            \ifx#2C12\else
+            \ifx#2D13\else
+            \ifx#2E14\else
+            \ifx#2F15\else
+            #2\fi\fi\fi\fi\fi\fi
   \multiply\count@\sixt@@n \advance\count@\@tempcnta
   \ifnum\count@>"4D \ifnum\count@<"A0 \aftergroup\CJKKO@mjhanjafamily \else
   \ifnum\count@>"F8 \ifnum\count@<"FB \aftergroup\CJKKO@mjhanjafamily
diff --git a/Master/texmf-dist/tex/latex/cjk-ko/kolabels-utf.sty b/Master/texmf-dist/tex/latex/cjk-ko/kolabels-utf.sty
index df7e215380f..38edfc6c3d7 100644
--- a/Master/texmf-dist/tex/latex/cjk-ko/kolabels-utf.sty
+++ b/Master/texmf-dist/tex/latex/cjk-ko/kolabels-utf.sty
@@ -1,8 +1,8 @@
 % kolabels-utf.sty
 %
 % Copyright (C) 2009-2013 Koaunghi Un <koaunghi at kornet net>
-%			  Kangsoo Kim <karnes at ktug or kr>
-%			  Dohyun Kim  <nomos at ktug org>
+%                         Kangsoo Kim <karnes at ktug or kr>
+%                         Dohyun Kim  <nomos at ktug org>
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
diff --git a/Master/texmf-dist/tex/latex/cjk-ko/kotex.sty b/Master/texmf-dist/tex/latex/cjk-ko/kotex.sty
index 20d263f811b..f9f190e767e 100644
--- a/Master/texmf-dist/tex/latex/cjk-ko/kotex.sty
+++ b/Master/texmf-dist/tex/latex/cjk-ko/kotex.sty
@@ -45,9 +45,9 @@
       \PassOptionsToPackage{\CurrentOption}{kotex-euc}
     \else
       \ifx\@ko@cjk\undefined
-	\PassOptionsToPackage{\CurrentOption}{kotexutf}
+        \PassOptionsToPackage{\CurrentOption}{kotexutf}
       \else
-	\PassOptionsToPackage{\CurrentOption}{cjkutf8-ko}
+        \PassOptionsToPackage{\CurrentOption}{cjkutf8-ko}
       \fi
     \fi
   \fi}