cjk-ko (6jul13)

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

6 files changed, 50 insertions, 70 deletions

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 83cbae2f264..ab84e0daf32 100644
--- a/Master/texmf-dist/tex/latex/cjk-ko/cjkutf8-josa.sty
+++ b/Master/texmf-dist/tex/latex/cjk-ko/cjkutf8-josa.sty
@@ -1,4 +1,4 @@
-% $Id: cjkutf8-josa.sty,v 1.1 2013/02/27 06:42:16 nomos Exp $
+% cjkutf8-josa.sty
 %
 % Copyright (c) 2013 Dohyun Kim <nomos at ktug org>
 %
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 ea6844c5e99..4aa112bb661 100644
--- a/Master/texmf-dist/tex/latex/cjk-ko/cjkutf8-ko.sty
+++ b/Master/texmf-dist/tex/latex/cjk-ko/cjkutf8-ko.sty
@@ -1,4 +1,4 @@
-% $Id: cjkutf8-ko.sty,v 1.14 2013/03/07 04:53:32 nomos Exp $
+%  cjkutf8-ko.sty
 %
 % Copyright (c) 2013 Dohyun Kim <nomos at ktug org>
 %
@@ -17,9 +17,15 @@
 % Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
 % MA 02110-1301 USA
 
-\ProvidesPackage{cjkutf8-ko}[2013/02/23 v1.0 Hangul typesetting on CJKutf8]
+\ProvidesPackage{cjkutf8-ko}[2013/07/03 v1.2 Hangul typesetting on CJKutf8]
 
 \ifx\eTeXversion\relax \let\eTeXversion\undefined \fi
+\ifx\eTeXversion\undefined
+  \PackageError{cjkutf8-ko}
+    {e-TeX engine is required}
+    {Please update your TeX system to the latest distribution}
+\fi
+
 \newif\if@hangul
 \newif\if@hanja
 \let\use@josa\empty
@@ -38,9 +44,6 @@
   \RequirePackage{textcomp}
   \def\rmdefault{nanummj}
   \def\sfdefault{nanumgt}
-  \ifx\eTeXversion\undefined % TW T1 is broken
-    \g@addto@macro\ttfamily{\fontencoding{OT1}\selectfont}
-  \fi
 \fi
 
 \RequirePackage{CJKutf8}
@@ -81,12 +84,6 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%
 %%% dotemph
-% CJKfntef.sty requires e-TeX
-\ifx\ifcsname\undefined
-  \expandafter\let
-  \csname ifcsname\expandafter\endcsname
-  \csname iffalse\endcsname
-\fi
 % Users can redefine \dotemphchar and \dotemphraise
 \ifx\usedot@mph\undefined
   \def\dotemph{\PackageError{cjkutf8-ko}
@@ -97,8 +94,7 @@
   \RequirePackage{ulem}[2000/05/26]
   \addto@hook\UL@hook{\let\CJKglue\HangulGlue}
   \RequirePackage{CJKfntef}
-  \ifx\usecjk@@font\undefined\normalem\else % currently tex writer T1 is broken
-  \ifx\eTeXversion\undefined\else\normalem\fi\fi
+  \normalem % users should declare \ULforem to enable underlining for \emph
   \def\dotemphraise{0.2em}
   \def\dotemphchar{\bfseries\Unicode{"02}{"D9}}
   % user command: dotemph
@@ -217,53 +213,29 @@
 \sfcode96=998 % `
 \sfcode102=998 % oms {
 \sfcode123=998 % t1 {
-\ifx\eTeXversion\undefined
-  \def\CJK@testLastCJK{%
-    \global\CJK@false
-    \ifnum\lastkern=\@ne
-      \global \CJK@true
-    %%% inserted
-    \else
-      \ifhmode
-      \ifnum\lastkern=\tw@\else
-      \ifnum\lastskip=\z@ % last node is not space (?)
-      \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}%
-	\fi
-	\ifCJK@ \global\CJK@false
-	\else \CJKglue % this char is not closing cjk
-	\fi
-      \fi\fi\fi\fi\fi
-    %%% end of inserted
-    \fi}
-\else
-  \def\CJK@testLastCJK{%
-    \global\CJK@false
-    \ifnum\lastkern=\@ne
-      \global \CJK@true
-    %%% inserted
-    \else
-      \ifhmode
-      \ifnum\lastkern=\tw@\else
-      \ifnum\lastskip=\z@ % last node is not space (?)
-      \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}%
-	\fi
-	\ifCJK@
-	  \global\CJK@false
-	\else % this char is not closing cjk
-	  \ifnum\lastnodetype=10 \CJKpostmathglue % after math-off
-	  \else \CJKglue
-	  \fi
-	\fi
-      \fi\fi\fi\fi\fi
-    %%% end of inserted
-    \fi}
-\fi
+\def\CJK@testLastCJK{%
+  \global\CJK@false
+  \ifnum\lastkern=\@ne
+    \global \CJK@true
+  %%% inserted
+  \else
+    \ifhmode
+    \ifnum\lastkern=\tw@\else
+    \ifnum\lastskip=\z@ % last node is not space (?)
+    \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}%
+      \fi
+      \ifCJK@
+	\global\CJK@false
+      \else % this char is not closing cjk
+	\ifnum\lastnodetype=10 \CJKpostmathglue % after math-off
+	\else \CJKglue \fi
+      \fi
+    \fi\fi\fi\fi\fi
+  %%% end of inserted
+  \fi}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%
 % half-width puncts
@@ -349,9 +321,7 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%
 %%% nanummj has no hanja : texlive only
-\ifx\eTeXversion\undefined\else
-  \RequirePackage{cjkutf8-nanummjhanja}
-\fi
+\RequirePackage{cjkutf8-nanummjhanja}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%
 %%% auto-josa, light version
@@ -361,8 +331,7 @@
 % hangul captions, labels, and spacing
 \RequirePackage{kolabels-utf}
 \if@hangul
-  \RequirePackage{konames-utf}
-  \ifx\eTeXversion\undefined \mathsurround=0.25ex \fi
+  \AtBeginDocument{\RequirePackage{konames-utf}}
   \linespread{1.3888}
   \footnotesep=1.3888\footnotesep
   \skip\footins=1.3888\skip\footins plus6pt minus3pt
@@ -385,4 +354,15 @@
   \fi
 \fi
 
+%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% \makeindex in memoir class clashed with this package.
+%%% 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
+  }}}
+}{}
+
 \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 d6256610fe0..dd43bd5813c 100644
--- a/Master/texmf-dist/tex/latex/cjk-ko/cjkutf8-nanummjhanja.sty
+++ b/Master/texmf-dist/tex/latex/cjk-ko/cjkutf8-nanummjhanja.sty
@@ -1,4 +1,4 @@
-% $Id: cjkutf8-nanummjhanja.sty,v 1.1 2013/02/27 06:42:16 nomos Exp $
+% cjkutf8-nanummjhanja.sty
 %
 % Copyright (c) 2013 Dohyun Kim <nomos at ktug org>
 %
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 4a057c61863..df7e215380f 100644
--- a/Master/texmf-dist/tex/latex/cjk-ko/kolabels-utf.sty
+++ b/Master/texmf-dist/tex/latex/cjk-ko/kolabels-utf.sty
@@ -1,4 +1,4 @@
-% This is file `kolabels-utf.sty'
+% kolabels-utf.sty
 %
 % Copyright (C) 2009-2013 Koaunghi Un <koaunghi at kornet net>
 %			  Kangsoo Kim <karnes at ktug or kr>
diff --git a/Master/texmf-dist/tex/latex/cjk-ko/konames-utf.sty b/Master/texmf-dist/tex/latex/cjk-ko/konames-utf.sty
index 41164bc3791..c6ce8ca3514 100644
--- a/Master/texmf-dist/tex/latex/cjk-ko/konames-utf.sty
+++ b/Master/texmf-dist/tex/latex/cjk-ko/konames-utf.sty
@@ -1,4 +1,4 @@
-% file `konames-utf.sty`
+% konames-utf.sty
 %
 % Copyright (C) 2007-2013 Koaunghi Un <koaunghi at kornet net>
 %                         Kangsoo Kim <karnes at ktug or kr>
diff --git a/Master/texmf-dist/tex/latex/cjk-ko/kotex.sty b/Master/texmf-dist/tex/latex/cjk-ko/kotex.sty
index c6d37042c22..20d263f811b 100644
--- a/Master/texmf-dist/tex/latex/cjk-ko/kotex.sty
+++ b/Master/texmf-dist/tex/latex/cjk-ko/kotex.sty
@@ -1,4 +1,4 @@
-% $Id: kotex.sty,v 1.3 2013/02/22 10:23:16 nomos Exp $
+% kotex.sty
 %
 % (C) Copyright 2007-2013 Koaunghi Un <koaunghi at kornet net>
 %                         Kangsoo Kim <karnes at ktug or kr>