summaryrefslogtreecommitdiff
path: root/language/korean
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-07-21 03:00:43 +0000
committerNorbert Preining <norbert@preining.info>2021-07-21 03:00:43 +0000
commitd06b4118c72d0c81fc0760e24add55e808471dbc (patch)
treeb66ab79ad229352b74d6e1f7ed8dc2884e671737 /language/korean
parent933416e3a978851a263168f5daad76eea18de483 (diff)
CTAN sync 202107210300
Diffstat (limited to 'language/korean')
-rw-r--r--language/korean/cjk-ko/ChangeLog6
-rw-r--r--language/korean/cjk-ko/README14
-rw-r--r--language/korean/cjk-ko/cjk-ko-doc.pdfbin174977 -> 173333 bytes
-rw-r--r--language/korean/cjk-ko/cjk-ko-doc.tex14
-rw-r--r--language/korean/cjk-ko/cjkutf8-josa.sty30
-rw-r--r--language/korean/cjk-ko/cjkutf8-ko.sty2
-rw-r--r--language/korean/cjk-ko/cjkutf8-nanummjhanja.sty2
7 files changed, 53 insertions, 15 deletions
diff --git a/language/korean/cjk-ko/ChangeLog b/language/korean/cjk-ko/ChangeLog
index 94694e2603..0aaabb5e44 100644
--- a/language/korean/cjk-ko/ChangeLog
+++ b/language/korean/cjk-ko/ChangeLog
@@ -1,3 +1,9 @@
+2021-07-20 Dohyun Kim <nomos at ktug org>
+
+ Version 2.1
+
+ * cjkutf8-josa.sty: support josa selection after Hangul syllables
+
2021-07-17 Dohyun Kim <nomos at ktug org>
Version 2.0
diff --git a/language/korean/cjk-ko/README b/language/korean/cjk-ko/README
index 05a6470223..4f14c54557 100644
--- a/language/korean/cjk-ko/README
+++ b/language/korean/cjk-ko/README
@@ -1,4 +1,4 @@
-CJK-ko package version 2.0 (2021/07/17)
+CJK-ko package version 2.1 (2021/07/20)
=======================================
This package supports typesetting of modern Korean documents with the help
@@ -148,15 +148,17 @@ example:
\label{fig:aaa} ... \ref{fig:aaa}\을
\label{fig:aaa} ... \pageref{fig:aaa}\을
- \cite{hong}\을 ... \bibitem[홍길동\jong]{hong}
+ \cite{hong}\을 ... \bibitem[홍길동]{hong}
+ \cite{king}\을 ... \bibitem[King\jong]{king}
Automatic Josa selection works correctly only after
-\ref \pageref \cite commands and after ascii characters.
+\ref \pageref \cite commands and recognises only the last Ascii
+or Hangul character in the sequence.
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
+ \jung: sequence is terminated by Jungseong
+ \jong: sequence is terminated by Jongseong
+ \rieul: sequence is terminated by Jongseong Rieul
Korean counters
diff --git a/language/korean/cjk-ko/cjk-ko-doc.pdf b/language/korean/cjk-ko/cjk-ko-doc.pdf
index 1eb98bc9e3..0468e21cc0 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 163c95338d..dd96f89041 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.0\quad \today}
+\date{Version 2.1\quad \today}
\begin{document}
\maketitle
@@ -39,6 +39,8 @@
1.3 버전부터는 나눔글꼴이 아닌 다른 한글 폰트를 패키지 옵션으로 지정해서 쓸
수 있다.
+
+ 2.1 버전부터는 자동조사가 한글 다음에 올 때도 바르게 동작한다.
\end{abstract}
\tableofcontents
@@ -123,12 +125,12 @@
\cs{을} \cs{를} \cs{와} \cs{과} \cs{로} \cs{으로} \cs{라}
\cs{이라}\,를 쓸 수 있다.
\item \cs{ref} \cs{pageref} \cs{cite} 뒤에서만 정상 동작
- \item 아스키문자 뒤에서만 정상 동작
- \item 한글 뒤에는 \cs{jong} \cs{jung} \cs{rieul} 명령을
- 첨가해 바로잡을 수 있다.\par
+ \item 아스키문자와 한글 뒤에서만 정상 동작
+ \item 사용자가 \cs{jong} \cs{jung} \cs{rieul} 명령을
+ 첨가해 조사 선택을 바로잡을 수 있다.\par
\begin{itemize}
- \item[예:] \cs{cite\{hong\}}\cs{을} \ldots\\
- \hskip1.3em\ \cs{bibitem[홍길동}\cs{jong]\{hong\}}
+ \item[예:] \cs{cite\{king\}}\cs{을} \ldots\\
+ \hskip1.3em\ \cs{bibitem[King}\cs{jong]\{king\}}
\end{itemize}
\end{itemize}
diff --git a/language/korean/cjk-ko/cjkutf8-josa.sty b/language/korean/cjk-ko/cjkutf8-josa.sty
index 7623138b7f..4157b470c3 100644
--- a/language/korean/cjk-ko/cjkutf8-josa.sty
+++ b/language/korean/cjk-ko/cjkutf8-josa.sty
@@ -17,7 +17,7 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\ProvidesPackage{cjkutf8-josa}[2021/07/17 v2.0 Automatic Josa selection for cjk-ko]
+\ProvidesPackage{cjkutf8-josa}[2021/07/20 v2.1 Automatic Josa selection for cjk-ko]
\AtBeginDocument{
\ifx\use@josa\undefined\else
@@ -54,6 +54,27 @@
}}{}
}
+% support hangul syllables (0xAC00..0xD7A3)
+\def\cjkko@josa@ea{\cjkko@josa@hangul@syllableS{"EA}}
+\def\cjkko@josa@eb{\cjkko@josa@hangul@syllableS{"EB}}
+\def\cjkko@josa@ec{\cjkko@josa@hangul@syllableS{"EC}}
+\def\cjkko@josa@ed{\cjkko@josa@hangul@syllableS{"ED}}
+\def\cjkko@josa@hangul@syllableS#1#2#3{%
+ \expandafter\cjkko@josa@hangul@syllable\expandafter{%
+ \number\numexpr (#1 - 224) * 4096 + (`#2 - 128) * 64 + (`#3 - 128) - "AC00\relax }}
+\def\cjkko@josa@hangul@syllable#1{%
+ \ifnum#1<\z@ \else \ifnum#1>11171 \else
+ \expandafter\cjkko@josa@hangul@syllable@\expandafter{%
+ \number\numexpr #1 - (((#1 + 14) / 28 - 1) * 28)\relax }% we need floor, not round
+ \fi\fi
+}
+\def\cjkko@josa@hangul@syllable@#1{%
+ \ifnum#1=\z@
+ 2\else \ifnum#1=8 %
+ 1\else
+ 0\fi\fi
+}
+
%%% user commands: \jong \jung \rieul
\protected\def\jong {\let\josa@str\empty\chardef\@josa\z@ }
\protected\def\rieul{\let\josa@str\empty\chardef\@josa\@ne}
@@ -62,6 +83,13 @@
\def\makejosa#1#2{%
\bgroup
+ \begingroup
+ \let^^ea\cjkko@josa@ea
+ \let^^eb\cjkko@josa@eb
+ \let^^ec\cjkko@josa@ec
+ \let^^ed\cjkko@josa@ed
+ \let\protect\noexpand
+ \edef\x{\endgroup \def\noexpand\josa@str{\josa@str}}\x
\expandafter\make@josa\josa@str\@nil{#1}{#2}%
\egroup}
diff --git a/language/korean/cjk-ko/cjkutf8-ko.sty b/language/korean/cjk-ko/cjkutf8-ko.sty
index 155278fd2d..63b20d9d3c 100644
--- a/language/korean/cjk-ko/cjkutf8-ko.sty
+++ b/language/korean/cjk-ko/cjkutf8-ko.sty
@@ -18,7 +18,7 @@
% MA 02110-1301 USA
\NeedsTeXFormat{LaTeX2e}[2021/06/01]
-\ProvidesPackage{cjkutf8-ko}[2021/07/17 v2.0 Hangul typesetting on CJKutf8]
+\ProvidesPackage{cjkutf8-ko}[2021/07/20 v2.1 Hangul typesetting on CJKutf8]
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname eTeXversion\endcsname\relax
diff --git a/language/korean/cjk-ko/cjkutf8-nanummjhanja.sty b/language/korean/cjk-ko/cjkutf8-nanummjhanja.sty
index 4eb2121f37..40fc2c1552 100644
--- a/language/korean/cjk-ko/cjkutf8-nanummjhanja.sty
+++ b/language/korean/cjk-ko/cjkutf8-nanummjhanja.sty
@@ -18,7 +18,7 @@
% MA 02110-1301 USA
\ProvidesPackage{cjkutf8-nanummjhanja}
- [2021/07/17 v2.0 UHC hanja for Nanum Myeongjo]
+ [2021/07/20 v2.1 UHC hanja for Nanum Myeongjo]
\def\CJKKO@mjdefault{nanummj}
\def\CJKKO@mjhanjafamily{\def\CJK@family{uhcmj}}