cjk-ko (8apr16)

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

4 files changed, 32 insertions, 17 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 75bbef68efa..55e38720626 100644
--- a/Master/texmf-dist/tex/latex/cjk-ko/cjkutf8-josa.sty
+++ b/Master/texmf-dist/tex/latex/cjk-ko/cjkutf8-josa.sty
@@ -1,6 +1,6 @@
 % cjkutf8-josa.sty
 %
-% Copyright (c) 2015 Dohyun Kim <nomos at ktug org>
+% Copyright (c) 2016 Dohyun Kim <nomos at ktug org>
 %
 % This program is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
 % Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
 % MA 02110-1301 USA
 
-\ProvidesPackage{cjkutf8-josa}[2015/03/20 v1.5 Automatic Josa selection for cjk-ko]
+\ProvidesPackage{cjkutf8-josa}[2016/04/04 v1.8 Automatic Josa selection for cjk-ko]
 
 \AtBeginDocument{
   \ifx\use@josa\undefined\else
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 ab91a456616..8d3e9436381 100644
--- a/Master/texmf-dist/tex/latex/cjk-ko/cjkutf8-ko.sty
+++ b/Master/texmf-dist/tex/latex/cjk-ko/cjkutf8-ko.sty
@@ -1,6 +1,6 @@
 %  cjkutf8-ko.sty
 %
-% Copyright (c) 2015 Dohyun Kim <nomos at ktug org>
+% Copyright (c) 2016 Dohyun Kim <nomos at ktug org>
 %
 % This program is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
 % Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
 % MA 02110-1301 USA
 
-\ProvidesPackage{cjkutf8-ko}[2015/07/18 v1.7 Hangul typesetting on CJKutf8]
+\ProvidesPackage{cjkutf8-ko}[2016/04/04 v1.8 Hangul typesetting on CJKutf8]
 
 \begingroup\expandafter\expandafter\expandafter\endgroup
 \expandafter\ifx\csname eTeXversion\endcsname\relax
@@ -35,10 +35,11 @@
 \DeclareOption{usecjkt1font}{\let\usecjk@@font\empty\@hangultrue}
 \DeclareOption{usedotemph}{\let\usedot@mph\empty}
 \DeclareOption{nojosa}{\let\use@josa\undefined}
+\DeclareOption{truetype}{\let\use@cjk@cmap@\relax}
 \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}{}
+    \PassOptionsToPackage{#1}{CJKutf8}
   \else
     \def\reserved@a{mj}\def\reserved@b{gt}\def\reserved@c{#1}
     \ifx\reserved@a\reserved@c
@@ -81,7 +82,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%
 % font settings
 \ifx\usecjk@@font\undefined\else
-  \RequirePackage[T1]{fontenc}
+  \PassOptionsToPackage{T1}{CJKutf8}
   \RequirePackage{textcomp}
   \IfFileExists{t1\CJKKO@mjfont.fd}{\let\rmdefault\CJKKO@mjfont}{}
   \IfFileExists{t1\CJKKO@gtfont.fd}{\let\sfdefault\CJKKO@gtfont}{}
@@ -409,13 +410,15 @@
 %\fi
 
 %%%%%%%%%%%%%%%%%%%%%%%%%
-%%% disable cmap by CJK.
-%%% instead try to use pdftex's pdfgentounicode
+%%% use pdftex's pdfgentounicode
 \ifpdf
-  \let\CJK@addcmap\@gobble
   \ifx\pdfgentounicode\undefined\else
-    \pdfgentounicode\@ne
-    \InputIfFileExists{glyphtounicode}{}{}
+    \ifx\use@cjk@cmap@\relax\else
+      \InputIfFileExists{glyphtounicode}{%
+        \let\CJK@addcmap\@gobble
+        \pdfgentounicode\@ne
+      }{}
+    \fi
   \fi
 \fi
 
@@ -428,8 +431,8 @@
 %%% still conflicts with package verbments.
 %%% so now we make utf8 characters robust.
 \count@"C2 \loop
-  \uccode\count@\z@
-  \lccode\count@\z@
+  \uccode\count@\count@
+  \lccode\count@\count@
   \begingroup
   \lccode`\~\count@
   \lowercase{\endgroup
@@ -449,5 +452,15 @@
   % and dotemph as well
   \let\dotemph\@firstofone
 }
+% protect against lowercase
+\count@"80 \loop
+  \uccode\count@\count@
+  \lccode\count@\count@
+\ifnum\count@<"BF \advance\count@\@ne \repeat
+
+%%% ignore variation selectors for korean hanja
+\DeclareUnicodeCharacter{FE00}{}
+\DeclareUnicodeCharacter{FE01}{}
+\DeclareUnicodeCharacter{FE02}{}
 
 \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 a4fbb6f2aa7..f96fae70aa8 100644
--- a/Master/texmf-dist/tex/latex/cjk-ko/cjkutf8-nanummjhanja.sty
+++ b/Master/texmf-dist/tex/latex/cjk-ko/cjkutf8-nanummjhanja.sty
@@ -1,6 +1,6 @@
 % cjkutf8-nanummjhanja.sty
 %
-% Copyright (c) 2015 Dohyun Kim <nomos at ktug org>
+% Copyright (c) 2016 Dohyun Kim <nomos at ktug org>
 %
 % This program is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 % MA 02110-1301 USA
 
 \ProvidesPackage{cjkutf8-nanummjhanja}
-  [2015/03/20 v1.5 UHC hanja for Nanum Myeongjo]
+  [2016/04/04 v1.8 UHC hanja for Nanum Myeongjo]
 
 \def\CJKKO@mjdefault{nanummj}
 \def\CJKKO@mjhanjafamily{\def\CJK@family{uhcmj}}
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 b5fda202cb0..01a486e8ae6 100644
--- a/Master/texmf-dist/tex/latex/cjk-ko/konames-utf.sty
+++ b/Master/texmf-dist/tex/latex/cjk-ko/konames-utf.sty
@@ -24,7 +24,7 @@
   \def\today{\number\year 年 \number\month 月 \number\day 日}
   \def\enclname{同封物}
   \def\ccname{寫本}% 사전에서
-  \def\headtoname{受信人}%
+  \def\headtoname{受信人:}%
   \def\seename{\을~參考}%
   \def\alsoname{\을~參考}%
   \def\contentsname{目~次}%
@@ -42,11 +42,12 @@
   \def\sectionname{節}
   \def\colorlayer{幻燈版~色相}% 사전에서
   \def\glossaryname{語~彙}% 사전에서
+  \def\proofname{證明}%
 \else
   \def\today{\number\year 년 \number\month 월 \number\day 일}
   \def\enclname{동봉물}
   \def\ccname{사본}%
-  \def\headtoname{받는이}%
+  \def\headtoname{받는이:}%
   \def\seename{\을~참고}%
   \def\alsoname{\을~함께~참고}%
   \def\contentsname{차~례}%
@@ -64,6 +65,7 @@
   \def\sectionname{절}% 단락 - subsection 소단락
   \def\colorlayer{환등판~색깔}% 사전에서
   \def\glossaryname{용어집}% 사전에서
+  \def\proofname{증명}%
 \fi
 \def\pagename{페이지}% 쪽
 \def\figurename{그림}