texlive[60079] Master/texmf-dist: cjk-ko (26jul21)

commits+karl at tug.org commits+karl at tug.org
Mon Jul 26 22:30:25 CEST 2021


Revision: 60079
          http://tug.org/svn/texlive?view=revision&revision=60079
Author:   karl
Date:     2021-07-26 22:30:24 +0200 (Mon, 26 Jul 2021)
Log Message:
-----------
cjk-ko (26jul21)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/cjk-ko/ChangeLog
    trunk/Master/texmf-dist/doc/latex/cjk-ko/README
    trunk/Master/texmf-dist/doc/latex/cjk-ko/cjk-ko-doc.pdf
    trunk/Master/texmf-dist/doc/latex/cjk-ko/cjk-ko-doc.tex
    trunk/Master/texmf-dist/tex/latex/cjk-ko/cjkutf8-josa.sty
    trunk/Master/texmf-dist/tex/latex/cjk-ko/cjkutf8-ko.sty
    trunk/Master/texmf-dist/tex/latex/cjk-ko/cjkutf8-nanummjhanja.sty

Modified: trunk/Master/texmf-dist/doc/latex/cjk-ko/ChangeLog
===================================================================
--- trunk/Master/texmf-dist/doc/latex/cjk-ko/ChangeLog	2021-07-26 20:30:11 UTC (rev 60078)
+++ trunk/Master/texmf-dist/doc/latex/cjk-ko/ChangeLog	2021-07-26 20:30:24 UTC (rev 60079)
@@ -1,3 +1,10 @@
+2021-07-26      Dohyun Kim <nomos at ktug org>
+
+	Version 2.2
+
+	* cjkutf8-josa.sty: partially support josa selection after
+	biblatex's \cite command
+
 2021-07-20      Dohyun Kim <nomos at ktug org>
 
 	Version 2.1

Modified: trunk/Master/texmf-dist/doc/latex/cjk-ko/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/cjk-ko/README	2021-07-26 20:30:11 UTC (rev 60078)
+++ trunk/Master/texmf-dist/doc/latex/cjk-ko/README	2021-07-26 20:30:24 UTC (rev 60079)
@@ -1,4 +1,4 @@
-CJK-ko package version 2.1 (2021/07/20)
+CJK-ko package version 2.2 (2021/07/26)
 =======================================
 
 This package supports typesetting of modern Korean documents with the help

Modified: trunk/Master/texmf-dist/doc/latex/cjk-ko/cjk-ko-doc.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/cjk-ko/cjk-ko-doc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/cjk-ko/cjk-ko-doc.tex	2021-07-26 20:30:11 UTC (rev 60078)
+++ trunk/Master/texmf-dist/doc/latex/cjk-ko/cjk-ko-doc.tex	2021-07-26 20:30:24 UTC (rev 60079)
@@ -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.1\quad \today}
+\date{Version 2.2\quad \today}
 \begin{document}
 \maketitle
 

Modified: trunk/Master/texmf-dist/tex/latex/cjk-ko/cjkutf8-josa.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/cjk-ko/cjkutf8-josa.sty	2021-07-26 20:30:11 UTC (rev 60078)
+++ trunk/Master/texmf-dist/tex/latex/cjk-ko/cjkutf8-josa.sty	2021-07-26 20:30:24 UTC (rev 60079)
@@ -24,25 +24,35 @@
     % redefine \@setref
     \let\CJKKO at orig@setref\@setref
     \def\@setref#1#2#3{\CJKKO at orig@setref{#1}{#2}{#3}%
-      \bgroup
       \ifx#1\relax\else
-        \ifx\protect\relax % not from kotexutf
-          \let\protect\noexpand % not from kotexutf
-          \xdef\josa at str{\expandafter#2#1}%
-        \fi
-      \fi
-      \egroup}
+        \cjkko at prepare@josa at str{\expandafter#2#1}%
+      \fi }
     % redefine \@cite at ofmt
     \let\CJKKO at orig@cite at ofmt\@cite at ofmt
     \def\@cite at ofmt#1{\CJKKO at orig@cite at ofmt{#1}%
       \bgroup
-      \let\protect\noexpand % not from kotexutf
       \let\@safe at activesfalse\@empty % babel ?
       \def\hyper@@link[##1]##2##3##4{##4}%
       \def\beamer at sort##1##2{}%
       \def\hyperlink##1##2{##2}% for beamer: not from kotexutf
-      \xdef\josa at str{#1}%
+      \cjkko at prepare@josa at str{#1}%
       \egroup}
+    % partially support biblatex's \cite
+    \@ifpackageloaded{biblatex}{%
+      \renewrobustcmd*{\blx at imc@printfield}[2][]{%
+      \blx at imc@iffieldundef{#2}
+        {\blx at nounit}
+        {\blx at getformat\blx at theformat{ffd}{#1}{#2}%
+         \ifdefvoid\blx at theformat
+           {\blx at nounit}
+           {\blx at begunit
+            \edef\currentfield{#2}%
+            \expandafter\expandafter
+            \expandafter\blx at theformat
+            \expandafter\expandafter
+            \expandafter{\csname abx at field@#2\endcsname}%
+                    \cjkko at prepare@josa at str{\csname abx at field@#2\endcsname}%
+            \blx at endunit}}}}{}
   \fi
   \@ifpackageloaded{hyperref}{\g at addto@macro\pdfstringdefPreHook{%
       \let\jong\relax
@@ -75,6 +85,19 @@
     0\fi\fi
 }
 
+\def\cjkko at prepare@josa at str#1{%
+  \ifx\protect\relax
+    \begingroup
+      \let^^ea\cjkko at josa@ea
+      \let^^eb\cjkko at josa@eb
+      \let^^ec\cjkko at josa@ec
+      \let^^ed\cjkko at josa@ed
+      \let\protect\noexpand
+      \xdef\josa at str{#1}%
+    \endgroup
+  \fi
+}
+
 %%% user commands: \jong \jung \rieul
 \protected\def\jong {\let\josa at str\empty\chardef\@josa\z@ }
 \protected\def\rieul{\let\josa at str\empty\chardef\@josa\@ne}
@@ -81,22 +104,25 @@
 \protected\def\jung {\let\josa at str\empty\chardef\@josa\tw@}
 \jung
 
-\def\makejosa#1#2{%
+\def\cjkko at josa@str at end{cjkko at josa@str at end}
+
+\def\makejosa{%
   \bgroup
-  \begingroup
-    \let^^ea\cjkko at josa@ea
-    \let^^eb\cjkko at josa@eb
-    \let^^ec\cjkko at josa@ec
-    \let^^ed\cjkko at josa@ed
-    \let\protect\noexpand
-    \edef\x{\endgroup \def\noexpand\josa at str{\josa at str}}\x
-  \expandafter\make at josa\josa at str\@nil{#1}{#2}%
-  \egroup}
+  \expandafter\make at josa\josa at str\cjkko at josa@str at end
+  \expandafter\egroup
+  \expandafter\count@\number\@josa\relax
+  \jung
+  \make@@@josa
+}
 
+\begingroup
+\catcode`a=11 \global\let\cjkko at cat@letter=a\relax
+\catcode`0=12 \global\let\cjkko at cat@other=0\relax
+\endgroup
+
 \def\make at josa{\afterassignment\make@@josa\let\@let at token= }
 \def\make@@josa{%
-  \ifx\@let at token\@nil
-    \expandafter\make@@@josa
+  \ifx\@let at token\cjkko at josa@str at end
   \else
     \ifx\@let at token 1\rieul\else
     \ifx\@let at token 3\jong \else
@@ -110,50 +136,82 @@
     \ifx\@let at token L\rieul\else
     \ifx\@let at token M\jong \else
     \ifx\@let at token N\jong \else
-    \ifx\@let at token\jong \jong \else
-    \ifx\@let at token\rieul\rieul\else
-      \jung
-    \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
+    \ifcat\noexpand\@let at token\cjkko at cat@other \jung\else
+    \ifcat\noexpand\@let at token\cjkko at cat@letter\jung\else
+    \ifx\@let at token ^^c2\jung \else
+    \ifx\@let at token ^^c3\jung \else
+    \ifx\@let at token\jong \jong\else
+    \ifx\@let at token\jung \jung\else
+    \ifx\@let at token\rieul\rieul
+    \fi\fi\fi\fi\fi \fi\fi\fi\fi\fi \fi\fi\fi\fi\fi \fi\fi\fi\fi
     \expandafter\make at josa
   \fi}
 
-\def\make@@@josa#1#2{%
-  \ifcase\@josa #2% jong
-  \or \ifx\empty#1\empty\else#2\fi % rieul
-  \else #1% jung
-  \fi}
+\def\make@@@josa{%
+  \ifcase\count@
+    \expandafter\@secondoftwo
+  \or
+    \expandafter\make@@@@josa
+  \else
+    \expandafter\@firstoftwo
+  \fi
+}
+\def\make@@@@josa#1{%
+  \ifx\empty#1\empty
+    \expandafter\@gobble
+  \else
+    \expandafter\@firstofone
+  \fi
+}
 
 \def\error at josa{\PackageError{cjkutf8-josa}{Undefined Control Sequence}{}}
+\def\makejosa at ga@i{\makejosa{가}{이}}
+\def\makejosa at wa@gwa{\makejosa{와}{과}}
+\def\makejosa at neun@eun{\makejosa{는}{은}}
+\def\makejosa at ra@ira{\makejosa{라}{이라}}
+\def\makejosa at empty@eu at ro{\makejosa{}{으}로}
+\def\makejosa at reul@eul{\makejosa{를}{을}}
+\def\makejosa at empty@eu{\makejosa{}{으}}
+\def\makejosa at relax@i{\makejosa\relax{이}}
 
 \DeclareRobustCommand*\^^ea[2]{%
-  \ifx#1^^b0\ifx#2^^80\makejosa{가}{이}\else\error at josa\fi % \가
-  \else\ifx#1^^b3\ifx#2^^bc\makejosa{와}{과}\else\error at josa\fi % \과
-  \else\error at josa\fi\fi}
+  \ifx#1^^b0\ifx#2^^80\let\do at makejosa\makejosa at ga@i % \가
+    \else\let\do at makejosa\error at josa \fi
+  \else\ifx#1^^b3\ifx#2^^bc\let\do at makejosa\makejosa at wa@gwa % \과
+    \else\let\do at makejosa\error at josa \fi
+  \else\let\do at makejosa\error at josa \fi\fi
+  \do at makejosa}
 \DeclareRobustCommand*\^^eb[2]{%
-  \ifx#1^^8a\ifx#2^^94\makejosa{는}{은}\else\error at josa\fi % \는
-  \else\ifx#1^^9d\ifx#2^^bc\makejosa{라}{이라}\else\error at josa\fi % \라
-  \else\ifx#1^^a1\ifx#2^^9c\makejosa{}{으}로\else\error at josa\fi % \로
-  \else\ifx#1^^a5\ifx#2^^bc\makejosa{를}{을}\else\error at josa\fi % \를
-  \else\error at josa\fi\fi\fi\fi}
+  \ifx#1^^8a\ifx#2^^94\let\do at makejosa\makejosa at neun@eun % \는
+    \else\let\do at makejosa\error at josa \fi
+  \else\ifx#1^^9d\ifx#2^^bc\let\do at makejosa\makejosa at ra@ira % \라
+    \else\let\do at makejosa\error at josa \fi
+  \else\ifx#1^^a1\ifx#2^^9c\let\do at makejosa\makejosa at empty@eu at ro % \로
+    \else\let\do at makejosa\error at josa \fi
+  \else\ifx#1^^a5\ifx#2^^bc\let\do at makejosa\makejosa at reul@eul % \를
+    \else\let\do at makejosa\error at josa \fi
+  \else\let\do at makejosa\error at josa \fi\fi\fi\fi
+  \do at makejosa}
 \DeclareRobustCommand*\^^ec[2]{%
   \let\reserved at a#1\let\reserved at b#2%
   \futurelet\@let at token\@josa at begin@ec}
 \def\@josa at begin@ec{%
-  \ifx\reserved at a^^99%
-    \ifx\reserved at b^^80\makejosa{와}{과}\else\error at josa\fi % \와
-  \else\ifx\reserved at a^^9c%
-    \ifx\reserved at b^^bc\makejosa{}{으}\else\error at josa\fi % \으로
+  \ifx\reserved at a^^99\ifx\reserved at b^^80\let\do at makejosa\makejosa at wa@gwa % \와
+    \else\let\do at makejosa\error at josa \fi
+  \else\ifx\reserved at a^^9c\ifx\reserved at b^^bc\let\do at makejosa\makejosa at empty@eu % \으로
+    \else\let\do at makejosa\error at josa \fi
   \else\ifx\reserved at a^^9d%
-    \ifx\reserved at b^^80\makejosa{는}{은}% \은
-    \else\ifx\reserved at b^^84\makejosa{를}{을}% \을
+    \ifx\reserved at b^^80\let\do at makejosa\makejosa at neun@eun % \은
+    \else\ifx\reserved at b^^84\let\do at makejosa\makejosa at reul@eul % \을
     \else\ifx\reserved at b^^b4%
-      \ifx\@let at token^^ea\makejosa\relax{이}% \이라
-      \else\ifx\@let at token^^eb\makejosa\relax{이}% \이라
-      \else\ifx\@let at token^^ec\makejosa\relax{이}% \이라
-      \else\ifx\@let at token^^ed\makejosa\relax{이}% \이라
-      \else\makejosa{가}{이}% \이
+      \ifx\@let at token^^ea\let\do at makejosa\makejosa at relax@i % \이라
+      \else\ifx\@let at token^^eb\let\do at makejosa\makejosa at relax@i % \이라
+      \else\ifx\@let at token^^ec\let\do at makejosa\makejosa at relax@i % \이라
+      \else\ifx\@let at token^^ed\let\do at makejosa\makejosa at relax@i % \이라
+      \else\let\do at makejosa\makejosa at ga@i % \이
       \fi\fi\fi\fi
-    \else\error at josa \fi\fi\fi
-  \else\error at josa \fi\fi\fi}
+    \else\let\do at makejosa\error at josa \fi\fi\fi
+  \else\let\do at makejosa\error at josa \fi\fi\fi
+  \do at makejosa}
 
 \endinput

Modified: trunk/Master/texmf-dist/tex/latex/cjk-ko/cjkutf8-ko.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/cjk-ko/cjkutf8-ko.sty	2021-07-26 20:30:11 UTC (rev 60078)
+++ trunk/Master/texmf-dist/tex/latex/cjk-ko/cjkutf8-ko.sty	2021-07-26 20:30:24 UTC (rev 60079)
@@ -18,7 +18,7 @@
 % MA 02110-1301 USA
 
 \NeedsTeXFormat{LaTeX2e}[2021/06/01]
-\ProvidesPackage{cjkutf8-ko}[2021/07/20 v2.1 Hangul typesetting on CJKutf8]
+\ProvidesPackage{cjkutf8-ko}[2021/07/26 v2.2 Hangul typesetting on CJKutf8]
 
 \begingroup\expandafter\expandafter\expandafter\endgroup
 \expandafter\ifx\csname eTeXversion\endcsname\relax

Modified: trunk/Master/texmf-dist/tex/latex/cjk-ko/cjkutf8-nanummjhanja.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/cjk-ko/cjkutf8-nanummjhanja.sty	2021-07-26 20:30:11 UTC (rev 60078)
+++ trunk/Master/texmf-dist/tex/latex/cjk-ko/cjkutf8-nanummjhanja.sty	2021-07-26 20:30:24 UTC (rev 60079)
@@ -18,7 +18,7 @@
 % MA 02110-1301 USA
 
 \ProvidesPackage{cjkutf8-nanummjhanja}
-  [2021/07/20 v2.1 UHC hanja for Nanum Myeongjo]
+  [2021/07/26 v2.2 UHC hanja for Nanum Myeongjo]
 
 \def\CJKKO at mjdefault{nanummj}
 \def\CJKKO at mjhanjafamily{\def\CJK at family{uhcmj}}



More information about the tex-live-commits mailing list.