cjk-ko (6jul13)

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

4 files changed, 98 insertions, 74 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 <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.
+
+	* cjk-ko-doc.tex: explicitly state that [usedotemph] option
+	declares \normalem (see the manual of ulem package).
+
 2013-03-23      Dohyun Kim <nomos at ktug org>
 
 	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 <nomos at ktug org>
+or leave messages in the issue tracker at:
+	<http://github.com/dohyunkim/cjk-ko>.
 
 
 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 <nomos at ktug org>
-
-
----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
--- 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 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}