From 92df2e9ea55c660a25f0fea16c4e943fae974140 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 6 Jul 2013 21:47:04 +0000 Subject: cjk-ko (6jul13) git-svn-id: svn://tug.org/texlive/trunk@31119 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/cjk-ko/ChangeLog | 12 ++ Master/texmf-dist/doc/latex/cjk-ko/README | 145 +++++++++++---------- Master/texmf-dist/doc/latex/cjk-ko/cjk-ko-doc.pdf | Bin 145987 -> 145115 bytes Master/texmf-dist/doc/latex/cjk-ko/cjk-ko-doc.tex | 15 ++- .../texmf-dist/tex/latex/cjk-ko/cjkutf8-josa.sty | 2 +- Master/texmf-dist/tex/latex/cjk-ko/cjkutf8-ko.sty | 110 +++++++--------- .../tex/latex/cjk-ko/cjkutf8-nanummjhanja.sty | 2 +- .../texmf-dist/tex/latex/cjk-ko/kolabels-utf.sty | 2 +- Master/texmf-dist/tex/latex/cjk-ko/konames-utf.sty | 2 +- Master/texmf-dist/tex/latex/cjk-ko/kotex.sty | 2 +- 10 files changed, 148 insertions(+), 144 deletions(-) diff --git a/Master/texmf-dist/doc/latex/cjk-ko/ChangeLog b/Master/texmf-dist/doc/latex/cjk-ko/ChangeLog index decd44e770c..7358cba819f 100644 --- a/Master/texmf-dist/doc/latex/cjk-ko/ChangeLog +++ b/Master/texmf-dist/doc/latex/cjk-ko/ChangeLog @@ -1,3 +1,15 @@ +2013-07-03 Dohyun Kim + + 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. + + * cjk-ko-doc.tex: explicitly state that [usedotemph] option + declares \normalem (see the manual of ulem package). + 2013-03-23 Dohyun Kim Version 1.1 diff --git a/Master/texmf-dist/doc/latex/cjk-ko/README b/Master/texmf-dist/doc/latex/cjk-ko/README index 4dbd10f2f2d..0d36349acc6 100644 --- a/Master/texmf-dist/doc/latex/cjk-ko/README +++ b/Master/texmf-dist/doc/latex/cjk-ko/README @@ -1,57 +1,45 @@ -======================================= -CJK-ko package version 1.1 (2013/03/23) +CJK-ko package version 1.2 (2013/07/03) ======================================= This package supports typesetting modern Korean documents with the help -of LaTeX2e CJK package written by Werner Lemberg. Unlike CJK package, -however, this package supports UTF-8 input encoding only. Despite the -restriction, this package provides some enhanced features focused on -Korean typesetting culture, for instance: linebreak is allowed between -Latin and CJK characters; users can scale and/or lower CJK characters -for their need; and automatic Josa selection is implemented. +of LaTeX2e CJK package written by Werner Lemberg. Though this package +supports, unlike CJK package, only UTF-8 input encoding, it provides +some enhanced features focused on Korean typesetting culture, for +instance: linebreak is allowed between Latin and CJK characters; users +can scale and/or lower CJK characters for their need; and automatic Josa +selection is implemented. Currently this package requires nanumtype1 package as well. -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/ +Author +------ -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/ +Please report any errors or suggestions to + Dohyun Kim +or leave messages in the issue tracker at: + . License -======= +------- + +### GPL (Gnu General Public License): -GPL (Gnu General Public License) --------------------------------- 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) ------------------------------------ +### LPPL (LaTeX Project Public License): + kotex.sty konames-utf.sty kolabels-utf.sty These files are copied or modified from ko.TeX package. -Public domain -------------- +### Public domain: + cjk-ko-doc.tex README ChangeLog @@ -59,16 +47,36 @@ Public domain See each file for more details. +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/ + +### 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/ + + Loading of the package -====================== +---------------------- \usepackage{cjkutf8-ko} or + \usepackage[cjk]{kotex} -package options ---------------- +### package options [cjk] Option for kotex.sty. If this option is not given and if kotexutf.sty @@ -88,67 +96,68 @@ Enable \dotemph command. CJKfntef.sty and CJKulem.sty will be loaded as well. [usecjkt1font] -Latin characters are typeset by CJK font. Only Nanum T1 font is +Latin characters are typeset by CJK font. Only Nanum T1 font is currently available. User commands -============= - -\CJKscale - - scale font size of CJK character - - eg: \CJKscale{0.95} - - cannot be used with [usecjkt1font] option - - allowed only in the preamble - - under [hangul] option, line/word spacing and indent size are - adjusted automatically - -\lowerCJKchar - - lower CJK characters - - eg: \lowerCJKchar{0.1em} - - cannot be used with [usecjkt1font] option - - allowed only in the preamble - -\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} +------------- + + \CJKscale +- scale font size of CJK character +- eg: \CJKscale{0.95} +- cannot be used with [usecjkt1font] option +- allowed only in the preamble +- under [hangul] option, line/word spacing and indent size are + adjusted automatically + + \lowerCJKchar +- lower CJK characters +- eg: \lowerCJKchar{0.1em} +- cannot be used with [usecjkt1font] option +- allowed only in the preamble + + \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} For other commands see CJK package documents. Automatic Josa selection -======================== +------------------------ Josa commands: + \은 \는 \이 \가 \을 \를 \와 \과 \로 \으로 \라 \이라 -eg: \label{fig:aaa} ... \ref{fig:aaa}\을 +example: + + \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 Korean counters -=============== +--------------- Same as ko.TeX package: + \jaso \gana \ojaso \ogana \pjaso \pgana \onum \pnum \oeng \peng \hnum \Hnum \hroman \hRoman \hNum \hanjanum -Author -====== -Please report any errors or suggestions to Dohyun Kim - - ----END of README--- +*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 0cfc7f78dab..030fa838675 100644 Binary files a/Master/texmf-dist/doc/latex/cjk-ko/cjk-ko-doc.pdf and b/Master/texmf-dist/doc/latex/cjk-ko/cjk-ko-doc.pdf differ 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 742769ab9da..6f4cf613b85 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 @@ -1,5 +1,6 @@ -%% $Id: cjk-ko-doc.tex,v 1.10 2013/02/26 01:40:15 nomos Exp $ -%% public domain +%% cjk-ko-doc.tex +%% +%% This file is in public domain \documentclass[dvipdfmx,b5paper]{article} \usepackage{geometry} @@ -14,8 +15,9 @@ \linespread{1.3} \title{\cjkko\ 간단 매뉴얼} -\author{김도현\quad \texttt{nomos at ktug org}} -\date{Version 1.1\quad\today} +\author{Dohyun Kim \normalsize $<$\texttt{nomos at ktug org}$>$ \and + \normalsize $<$\url{http://github.com/dohyunkim/cjk-ko}$>$} +\date{Version 1.2\quad\today} \begin{document} \maketitle @@ -62,7 +64,9 @@ \item[\texttt{nojosa}] 자동조사 기능 끄기. 이 옵션을 주더라도 자동조사 명령이 에러를 내는 건 아니다. \item[\texttt{usedotemph}] \cs{dotemph} 명령 허용\\ - --- 이 옵션은 ulem 패키지도 부르므로 \uline{밑줄 긋기} 가능 + --- 이 옵션은 ulem 패키지도 부르므로 \uline{밑줄 긋기} 가능. + 단, \cs{normalem} 명령이 선언돼 있으므로 \cs{emph} 명령이 + 밑줄긋기로 동작하게 하려면 \cs{ULforem} 선언이 있어야 한다. \item[\texttt{usecjkt1font}] 영문자도 한글 글꼴---나눔폰트---로 식자. 라틴 알파벳이 거의 없는 소설책 따위에 유용할 수 있다. \end{itemize} @@ -136,7 +140,6 @@ \item GPL~--- \verb|cjkutf8-*| 파일의 라이선스는 CJK 패키지와 같을 수밖에 없다. \item LPPL~--- \verb|ko*| 파일들은 \koTeX\ 패키지에서 유래한다. - %\item \cjkko\ CVS~--- \url{http://cvs.ktug.or.kr/viewcvs/ko.TeX/cjk-ko/} \end{itemize} \begin{flushright} 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 % 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 % @@ -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 % 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 % Kangsoo Kim 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 % Kangsoo Kim 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 % Kangsoo Kim -- cgit v1.2.3