summaryrefslogtreecommitdiff
path: root/language/korean
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2022-06-13 03:03:42 +0000
committerNorbert Preining <norbert@preining.info>2022-06-13 03:03:42 +0000
commitef6d63ded56fb892decaa8ab41d7deebbe670473 (patch)
tree9c8eccf2e633fcfe0ad512e5428222ce0707971e /language/korean
parent86d0c4c6729cfb43e13fb29790810c3cc2521806 (diff)
CTAN sync 202206130303
Diffstat (limited to 'language/korean')
-rw-r--r--language/korean/cjk-ko/ChangeLog8
-rw-r--r--language/korean/cjk-ko/README2
-rw-r--r--language/korean/cjk-ko/cjk-ko-doc.pdfbin173481 -> 174257 bytes
-rw-r--r--language/korean/cjk-ko/cjk-ko-doc.tex52
-rw-r--r--language/korean/cjk-ko/cjkutf8-josa.sty4
-rw-r--r--language/korean/cjk-ko/cjkutf8-ko.sty128
-rw-r--r--language/korean/cjk-ko/cjkutf8-nanummjhanja.sty4
7 files changed, 78 insertions, 120 deletions
diff --git a/language/korean/cjk-ko/ChangeLog b/language/korean/cjk-ko/ChangeLog
index 2bea4780c5..a4c4d1f5df 100644
--- a/language/korean/cjk-ko/ChangeLog
+++ b/language/korean/cjk-ko/ChangeLog
@@ -1,3 +1,11 @@
+2022-06-12 Dohyun Kim <nomos at ktug org>
+
+ Version 2.3
+
+ * cjkutf8-ko.sty: remove redefinitions of MakeUppercase and
+ MakeLowercase, being not needed with LaTeX kernel 2022/06;
+ use keyval-based option processing of LaTeX kernel 2022/06.
+
2021-07-26 Dohyun Kim <nomos at ktug org>
Version 2.2
diff --git a/language/korean/cjk-ko/README b/language/korean/cjk-ko/README
index 457094f2c4..99319a2e06 100644
--- a/language/korean/cjk-ko/README
+++ b/language/korean/cjk-ko/README
@@ -1,4 +1,4 @@
-CJK-ko package version 2.2 (2021/07/26)
+CJK-ko package version 2.3 (2022/06/12)
=======================================
This package supports typesetting of modern Korean documents with the help
diff --git a/language/korean/cjk-ko/cjk-ko-doc.pdf b/language/korean/cjk-ko/cjk-ko-doc.pdf
index 7de7a154ec..cd9f79bef0 100644
--- a/language/korean/cjk-ko/cjk-ko-doc.pdf
+++ b/language/korean/cjk-ko/cjk-ko-doc.pdf
Binary files differ
diff --git a/language/korean/cjk-ko/cjk-ko-doc.tex b/language/korean/cjk-ko/cjk-ko-doc.tex
index 53a10800af..7e621f931c 100644
--- a/language/korean/cjk-ko/cjk-ko-doc.tex
+++ b/language/korean/cjk-ko/cjk-ko-doc.tex
@@ -25,7 +25,7 @@
\title{\cjkko\ 간단 매뉴얼}
\author{Dohyun Kim \normalsize $<$\texttt{nomos at ktug org}$>$ \and
\normalsize $<$\url{http://github.com/dohyunkim/cjk-ko}$>$}
-\date{Version 2.2\quad \today}
+\date{Version 2.3\quad \today}
\begin{document}
\maketitle
@@ -135,26 +135,36 @@
\end{itemize}
\section{한글 카운터}
-\koTeX\ 패키지와 동일하다. 사용례: \cs{pagenumbering\{onum\}}
-\begin{itemize}\leftskip=1cm \labelsep=1em \itemsep=0pt plus0pt
- \def\cs#1{\texttt{\bfseries #1}}
- \item[\cs{jaso}] ㄱ ㄴ ㄷ ㄹ ㅁ ㅂ ㅅ ㅇ ㅈ ㅊ ㅋ ㅌ ㅍ ㅎ
- \item[\cs{gana}] 가 나 다 라 마 바 사 아 자 차 카 타 파 하
- \item[\cs{ojaso}] ㉠ ㉡ ㉢ ㉣ ㉤ ㉥ ㉦ ㉧ ㉨ ㉩ ㉪ ㉫ ㉬ ㉭
- \item[\cs{ogana}] ㉮ ㉯ ㉰ ㉱ ㉲ ㉳ ㉴ ㉵ ㉶ ㉷ ㉸ ㉹ ㉺ ㉻
- \item[\cs{pjaso}] ㈀ ㈁ ㈂ ㈃ ㈄ ㈅ ㈆ ㈇ ㈈ ㈉ ㈊ ㈋ ㈌ ㈍
- \item[\cs{pgana}] ㈎ ㈏ ㈐ ㈑ ㈒ ㈓ ㈔ ㈕ ㈖ ㈗ ㈘ ㈙ ㈚ ㈛
- \item[\cs{onum}] ① ② ③ ④ ⑤ ⑥ ⑦ ⑧ ⑨ ⑩ ⑪ ⑫ ⑬ ⑭ ⑮
- \item[\cs{pnum}] ⑴ ⑵ ⑶ ⑷ ⑸ ⑹ ⑺ ⑻ ⑼ ⑽ ⑾ ⑿ ⒀ ⒁ ⒂
- \item[\cs{oeng}] ⓐ ⓑ ⓒ ⓓ ⓔ ⓕ ⓖ ⓗ ⓘ ⓙ ⓚ ⓛ $\cdots$ ⓩ
- \item[\cs{peng}] ⒜ ⒝ ⒞ ⒟ ⒠ ⒡ ⒢ ⒣ ⒤ ⒥ ⒦ ⒧ $\cdots$ ⒵
- \item[\cs{hnum}] 하나 둘 셋 넷 다섯 여섯 일곱 여덟 아홉 열 열하나 $\cdots$ 스물넷
- \item[\cs{Hnum}] 첫 둘 셋 넷 다섯 여섯 일곱 여덟 아홉 열 열한 $\cdots$ 스물넷
- \item[\cs{hroman}] ⅰ ⅱ ⅲ ⅳ ⅴ ⅵ ⅶ ⅷ ⅸ ⅹ ⅺ ⅻ
- \item[\cs{hRoman}] Ⅰ Ⅱ Ⅲ Ⅳ Ⅴ Ⅵ Ⅶ Ⅷ Ⅸ Ⅹ Ⅺ Ⅻ
- \item[\cs{hNum}] 일 이 삼 사 오 육 칠 팔 구 십 십일 십이 $\cdots$ 이십사
- \item[\cs{hanjanum}] 一 二 三 四 五 六 七 八 九 十 十一 十二 $\cdots$ 二十四
-\end{itemize}
+
+\begin{table}
+ \centering
+ \def\cs#1{\texttt{\bfseries #1}}
+ \begin{tabular}{rl}\\
+ \hline
+ \cs{jaso}& ㄱ ㄴ ㄷ ㄹ ㅁ ㅂ ㅅ ㅇ ㅈ ㅊ ㅋ ㅌ ㅍ ㅎ\\
+ \cs{gana}& 가 나 다 라 마 바 사 아 자 차 카 타 파 하\\
+ \cs{ojaso}& ㉠ ㉡ ㉢ ㉣ ㉤ ㉥ ㉦ ㉧ ㉨ ㉩ ㉪ ㉫ ㉬ ㉭\\
+ \cs{ogana}& ㉮ ㉯ ㉰ ㉱ ㉲ ㉳ ㉴ ㉵ ㉶ ㉷ ㉸ ㉹ ㉺ ㉻\\
+ \cs{pjaso}& ㈀ ㈁ ㈂ ㈃ ㈄ ㈅ ㈆ ㈇ ㈈ ㈉ ㈊ ㈋ ㈌ ㈍\\
+ \cs{pgana}& ㈎ ㈏ ㈐ ㈑ ㈒ ㈓ ㈔ ㈕ ㈖ ㈗ ㈘ ㈙ ㈚ ㈛\\
+ \cs{onum}& ① ② ③ ④ ⑤ ⑥ ⑦ ⑧ ⑨ ⑩ ⑪ ⑫ ⑬ ⑭ ⑮\\
+ \cs{pnum}& ⑴ ⑵ ⑶ ⑷ ⑸ ⑹ ⑺ ⑻ ⑼ ⑽ ⑾ ⑿ ⒀ ⒁ ⒂\\
+ \cs{oeng}& ⓐ ⓑ ⓒ ⓓ ⓔ ⓕ ⓖ ⓗ ⓘ ⓙ ⓚ ⓛ $\cdots$ ⓩ\\
+ \cs{peng}& ⒜ ⒝ ⒞ ⒟ ⒠ ⒡ ⒢ ⒣ ⒤ ⒥ ⒦ ⒧ $\cdots$ ⒵\\
+ \cs{hnum}& 하나 둘 셋 넷 다섯 여섯 일곱 여덟 아홉 열 열하나 $\cdots$ 스물넷\\
+ \cs{Hnum}& 첫 둘 셋 넷 다섯 여섯 일곱 여덟 아홉 열 열한 $\cdots$ 스물넷\\
+ \cs{hroman}& ⅰ ⅱ ⅲ ⅳ ⅴ ⅵ ⅶ ⅷ ⅸ ⅹ ⅺ ⅻ\\
+ \cs{hRoman}& Ⅰ Ⅱ Ⅲ Ⅳ Ⅴ Ⅵ Ⅶ Ⅷ Ⅸ Ⅹ Ⅺ Ⅻ\\
+ \cs{hNum}& 일 이 삼 사 오 육 칠 팔 구 십 십일 십이 $\cdots$ 이십사\\
+ \cs{hanjanum}& 一 二 三 四 五 六 七 八 九 十 十一 十二 $\cdots$ 二十四\\
+ \hline
+ \end{tabular}
+ \caption{한글 카운터 목록}\label{hangulcounters}
+\end{table}
+
+\koTeX\ 패키지와 동일하다.
+표~\ref{hangulcounters}\를 참조.
+사용례: \cs{pagenumbering\{onum\}}
\section{\texttt{kotex.sty}}
다양한 \koTeX\ 패키지로의 준자동적인 연결을 담당하는 스타일 파일이다.
diff --git a/language/korean/cjk-ko/cjkutf8-josa.sty b/language/korean/cjk-ko/cjkutf8-josa.sty
index cffa6f4457..a0ed02cfed 100644
--- a/language/korean/cjk-ko/cjkutf8-josa.sty
+++ b/language/korean/cjk-ko/cjkutf8-josa.sty
@@ -1,6 +1,6 @@
% cjkutf8-josa.sty
%
-% Copyright (c) 2016-2021 Dohyun Kim <nomos at ktug org>
+% Copyright (c) 2016-2022 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}[2021/07/20 v2.1 Automatic Josa selection for cjk-ko]
+\ProvidesPackage{cjkutf8-josa}[2022/06/12 v2.3 Automatic Josa selection for cjk-ko]
\AtBeginDocument{
\ifx\use@josa\undefined\else
diff --git a/language/korean/cjk-ko/cjkutf8-ko.sty b/language/korean/cjk-ko/cjkutf8-ko.sty
index 4b8f167b9c..209b2ee1a6 100644
--- a/language/korean/cjk-ko/cjkutf8-ko.sty
+++ b/language/korean/cjk-ko/cjkutf8-ko.sty
@@ -1,6 +1,6 @@
% cjkutf8-ko.sty
%
-% Copyright (c) 2016-2021 Dohyun Kim <nomos at ktug org>
+% Copyright (c) 2016-2022 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,55 +17,45 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\NeedsTeXFormat{LaTeX2e}[2021/06/01]
-\ProvidesPackage{cjkutf8-ko}[2021/07/26 v2.2 Hangul typesetting on CJKutf8]
-
-\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}
-\endinput\fi
+\NeedsTeXFormat{LaTeX2e}[2022/06/01]
+\ProvidesPackage{cjkutf8-ko}[2022/06/12 v2.3 Hangul typesetting on CJKutf8]
\newif\if@hangul
\newif\if@hanja
\let\use@josa\empty
-\DeclareOption{hangul}{\@hangultrue}
-\DeclareOption{hanja}{\@hanjatrue\@hangultrue}
-\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
- \PassOptionsToPackage{#1}{CJKutf8}
- \else
- \def\reserved@a{mj}\def\reserved@b{gt}\def\reserved@c{#1}
- \ifx\reserved@a\reserved@c
- \edef\CJKKO@mjfont{\CJKKO@removetrailingEQ#2}
- \IfFileExists{c70\CJKKO@mjfont.fd}{}{%
- \PackageError{cjkutf8-ko}{`c70\CJKKO@mjfont.fd' does not exist}{}
- \let\CJKKO@mjfont\undefined
- }
- \else
- \ifx\reserved@b\reserved@c
- \edef\CJKKO@gtfont{\CJKKO@removetrailingEQ#2}
- \IfFileExists{c70\CJKKO@gtfont.fd}{}{%
- \PackageError{cjkutf8-ko}{`c70\CJKKO@gtfont.fd' does not exist}{}
- \let\CJKKO@gtfont\undefined
- }
- \else
- \PackageError{cjkutf8-ko}
- {Unknown hangul font type: #1}
- {Allowed font types are `mj' and `gt'}
- \fi
- \fi
- \fi
+\DeclareKeys
+{
+ hangul.code = \@hangultrue ,
+ hangul.usage = load ,
+ hanja.code = \@hanjatrue\@hangultrue ,
+ hanja.usage = load ,
+ usecjkt1font.code = \let\usecjk@@font\empty\@hangultrue ,
+ usecjkt1font.usage = load ,
+ usedotemph.code = \let\usedot@mph\empty ,
+ usedotemph.usage = load ,
+ nojosa.code = \let\use@josa\undefined ,
+ nojosa.usage = preamble ,
+ truetype.code = \let\use@cjk@cmap@\relax ,
+ truetype.usage = load ,
+ mj.code = \def\CJKKO@mjfont{#1} ,
+ mj.usage = load ,
+ gt.code = \def\CJKKO@gtfont{#1} ,
+ gt.usage = load
}
-\def\CJKKO@removetrailingEQ#1={#1}
-\ProcessOptions\relax
+\DeclareUnknownKeyHandler{\PassOptionsToPackage{#1}{CJKutf8}}
+\ProcessKeyOptions
+
+\ifdefined\CJKKO@mjfont
+ \IfFileExists{c70\CJKKO@mjfont.fd}{}{%
+ \PackageError{cjkutf8-ko}{`c70\CJKKO@mjfont.fd' does not exist}{}
+ \let\CJKKO@mjfont\undefined }
+\fi
+\ifdefined\CJKKO@gtfont
+ \IfFileExists{c70\CJKKO@gtfont.fd}{}{%
+ \PackageError{cjkutf8-ko}{`c70\CJKKO@gtfont.fd' does not exist}{}
+ \let\CJKKO@gtfont\undefined }
+\fi
\ifx\CJKKO@mjfont\undefined
\IfFileExists{c70nanummj.fd}{\def\CJKKO@mjfont{nanummj}}{
@@ -432,56 +422,6 @@
\fi % added
\fi}
-%%%%%%%%%%%%%%%%%%%%%%%%%
-% protect against lowercase
-\count@="80 \loop
- \lccode\count@=\count@
- \ifnum\count@<"DF \advance\count@\@ne \repeat
-% redefine MakeUppercase/MakeLowercase
-\DeclareRobustCommand{\MakeUppercase}[1]{{%
- % begin patch
- \count@"A0 \loop
- \ifnum\count@="B7 \else
- \begingroup
- \@tempcnta\count@ \advance\@tempcnta-"20
- \lccode`\~\count@ \lccode`\!\@tempcnta \lccode"C3="C3\relax
- \lowercase{\endgroup
- \expandafter\def\csname u8:\string^^c3\string~\endcsname{^^c3!}}%
- \fi
- \ifnum\count@<"BE \advance\count@\@ne \repeat
- % end patch
- \def\i{I}\def\j{J}%
- \def\reserved@a##1##2{\let##1##2\reserved@a}%
- \expandafter\reserved@a\@uclclist\reserved@b{\reserved@b\@gobble}%
- \let\UTF@two@octets@noexpand\@empty
- \let\UTF@three@octets@noexpand\@empty
- \let\UTF@four@octets@noexpand\@empty
- \protected@edef\reserved@a{\uppercase{#1}}%
- \reserved@a
-}}
-\DeclareRobustCommand{\MakeLowercase}[1]{{%
- % begin patch
- \count@"80 \loop
- \ifnum\count@="97 \else
- \begingroup
- \@tempcnta\count@ \advance\@tempcnta "20
- \lccode`\~\count@ \lccode`\!\@tempcnta \lccode"C3="C3\relax
- \lowercase{\endgroup
- \expandafter\def\csname u8:\string^^c3\string~\endcsname{^^c3!}}%
- \fi
- \ifnum\count@<"9E \advance\count@\@ne \repeat
- % end patch
- \def\reserved@a##1##2{\let##2##1\reserved@a}%
- \expandafter\reserved@a\@uclclist\reserved@b{\reserved@b\@gobble}%
- \let\UTF@two@octets@noexpand\@empty
- \let\UTF@three@octets@noexpand\@empty
- \let\UTF@four@octets@noexpand\@empty
- \protected@edef\reserved@a{\lowercase{#1}}%
- \reserved@a
-}}
-\protected@edef\MakeUppercase#1{\MakeUppercase{#1}}
-\protected@edef\MakeLowercase#1{\MakeLowercase{#1}}
-
%%% for fancyvrb/verbments package
\AddToHook{env/VerbatimOut/begin}{\CJK@makeInactive}
diff --git a/language/korean/cjk-ko/cjkutf8-nanummjhanja.sty b/language/korean/cjk-ko/cjkutf8-nanummjhanja.sty
index 68b763eea5..e9a86f0d27 100644
--- a/language/korean/cjk-ko/cjkutf8-nanummjhanja.sty
+++ b/language/korean/cjk-ko/cjkutf8-nanummjhanja.sty
@@ -1,6 +1,6 @@
% cjkutf8-nanummjhanja.sty
%
-% Copyright (c) 2016-2021 Dohyun Kim <nomos at ktug org>
+% Copyright (c) 2016-2022 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}
- [2021/07/26 v2.2 UHC hanja for Nanum Myeongjo]
+ [2022/06/12 v2.3 UHC hanja for Nanum Myeongjo]
\def\CJKKO@mjdefault{nanummj}
\def\CJKKO@mjhanjafamily{\def\CJK@family{uhcmj}}