From c266a6c654046449cd5fe43094cbd0eafd37fc4e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 19 Jul 2015 21:37:46 +0000 Subject: cjk-ko (19jul15) git-svn-id: svn://tug.org/texlive/trunk@37899 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/cjk-ko/cjkutf8-ko.sty | 53 +++++++++++++++------- Master/texmf-dist/tex/latex/cjk-ko/konames-utf.sty | 7 ++- 2 files changed, 42 insertions(+), 18 deletions(-) (limited to 'Master/texmf-dist/tex/latex/cjk-ko') 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 be56758191e..ab91a456616 100644 --- a/Master/texmf-dist/tex/latex/cjk-ko/cjkutf8-ko.sty +++ b/Master/texmf-dist/tex/latex/cjk-ko/cjkutf8-ko.sty @@ -17,14 +17,14 @@ % Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, % MA 02110-1301 USA -\ProvidesPackage{cjkutf8-ko}[2015/04/19 v1.6 Hangul typesetting on CJKutf8] +\ProvidesPackage{cjkutf8-ko}[2015/07/18 v1.7 Hangul typesetting on CJKutf8] -\ifx\eTeXversion\relax \let\eTeXversion\undefined \fi -\ifx\eTeXversion\undefined +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname eTeXversion\endcsname\relax \PackageError{cjkutf8-ko} {e-TeX engine is required} {Please update your TeX system to the latest distribution} -\fi +\endinput\fi \newif\if@hangul \newif\if@hanja @@ -65,8 +65,18 @@ \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 +\ifx\CJKKO@mjfont\undefined + \IfFileExists{c70nanummj.fd}{\def\CJKKO@mjfont{nanummj}}{ + \def\CJKKO@mjfont{mj} + \ifx\usedot@mph\undefined\else + \def\dotemphraise{1ex} + \def\dotemphchar{\Unicode{"02}{"D9}} + \fi + } +\fi +\ifx\CJKKO@gtfont\undefined + \IfFileExists{c70nanumgt.fd}{\def\CJKKO@gtfont{nanumgt}}{\def\CJKKO@gtfont{mj}} +\fi %%%%%%%%%%%%%%%%%%%%%%%%% % font settings @@ -130,16 +140,11 @@ \addto@hook\UL@hook{\let\CJKglue\HangulGlue} \RequirePackage{CJKfntef} \normalem % users should declare \ULforem to enable underlining for \emph - \def\dotemphraise{0.2em} - \def\dotemphchar{\bfseries\Unicode{"02}{"D9}} + \ifx\dotemphraise\undefined \def\dotemphraise{0.5ex}\fi + \ifx\dotemphchar\undefined \def\dotemphchar{\bfseries\Unicode{"02}{"D9}}\fi % user command: dotemph \DeclareRobustCommand*\dotemph{% \CJKunderanysymbol{-\dotemphraise}{\dotemphchar}} - \AtBeginDocument{ - \@ifpackageloaded{hyperref}{\g@addto@macro\pdfstringdefPreHook{% - \let\dotemph\@firstofone - }}{} - } \fi %%%%%%%%%%%%%%%%%%%%%%%%% @@ -212,7 +217,7 @@ \csname \curr@fontshape\endcsname} \if@hangul % hangul is main language % scale space glue - \@ifpackageloaded{minimal}{}{% + \@ifclassloaded{minimal}{}{% \bgroup \@for\reserved@a:=,\small,\footnotesize,\large,\Large,\LARGE\do{% \fontdimen2\font=\CJK@scale\fontdimen2\font @@ -404,13 +409,13 @@ %\fi %%%%%%%%%%%%%%%%%%%%%%%%% -%%% disable cmap by CJK, which sometimes behaves insalely +%%% disable cmap by CJK. %%% instead try to use pdftex's pdfgentounicode \ifpdf \let\CJK@addcmap\@gobble \ifx\pdfgentounicode\undefined\else - \pdfgentounicode=1 - \input glyphtounicode + \pdfgentounicode\@ne + \InputIfFileExists{glyphtounicode}{}{} \fi \fi @@ -430,5 +435,19 @@ \lowercase{\endgroup \protected\edef~{\unexpanded\expandafter{~}}} \ifnum\count@<"F4 \advance\count@\@ne \repeat +% then we have to care about hyperref bookmarks. +\ifx\pdfstringdefPreHook\undefined + \let\pdfstringdefPreHook\empty +\fi +\g@addto@macro\pdfstringdefPreHook{% + \count@"C2 \loop + \begingroup + \lccode`\~\count@ + \lowercase{\endgroup + \edef~{\unexpanded\expandafter{~}}}% + \ifnum\count@<"F4 \advance\count@\@ne \repeat + % and dotemph as well + \let\dotemph\@firstofone +} \endinput 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 f8b149bdd85..b5fda202cb0 100644 --- a/Master/texmf-dist/tex/latex/cjk-ko/konames-utf.sty +++ b/Master/texmf-dist/tex/latex/cjk-ko/konames-utf.sty @@ -13,7 +13,12 @@ % version 2006/05/20 or later. % -\ProvidesPackage{konames-utf}[2015/02/20 v1.5 UTF-8 Hangul captions] +\ProvidesPackage{konames-utf}[2015/07/06 v1.7 UTF-8 Hangul captions] + +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname if@hanja\endcsname\relax + \expandafter\newif\csname if@hanja\endcsname +\fi \if@hanja \def\today{\number\year 年 \number\month 月 \number\day 日} -- cgit v1.2.3