texlive[58092] branches/branch2020.0/Master/texmf-dist: cjk-ko

commits+karl at tug.org commits+karl at tug.org
Thu Mar 4 00:15:02 CET 2021


Revision: 58092
          http://tug.org/svn/texlive?view=revision&revision=58092
Author:   karl
Date:     2021-03-04 00:15:02 +0100 (Thu, 04 Mar 2021)
Log Message:
-----------
cjk-ko (3mar21) (branch)

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

Modified: branches/branch2020.0/Master/texmf-dist/doc/latex/cjk-ko/ChangeLog
===================================================================
--- branches/branch2020.0/Master/texmf-dist/doc/latex/cjk-ko/ChangeLog	2021-03-03 23:14:41 UTC (rev 58091)
+++ branches/branch2020.0/Master/texmf-dist/doc/latex/cjk-ko/ChangeLog	2021-03-03 23:15:02 UTC (rev 58092)
@@ -1,3 +1,12 @@
+2021-03-01      Dohyun Kim <nomos at ktug org>
+
+	Version 1.9
+
+	* cjkutf8-ko.sty: use latex's font family hooks
+	* cjkutf8-ko.sty: do not load glyphtounicode.tex when
+	fmtversion >= 2021/05/01; add \pdfnobuiltintounicode\font at name
+	to the end of \CJK at addcmap
+
 2016-04-04      Dohyun Kim <nomos at ktug org>
 
 	Version 1.8

Modified: branches/branch2020.0/Master/texmf-dist/doc/latex/cjk-ko/README
===================================================================
--- branches/branch2020.0/Master/texmf-dist/doc/latex/cjk-ko/README	2021-03-03 23:14:41 UTC (rev 58091)
+++ branches/branch2020.0/Master/texmf-dist/doc/latex/cjk-ko/README	2021-03-03 23:15:02 UTC (rev 58092)
@@ -1,4 +1,4 @@
-CJK-ko package version 1.8 (2016/04/04)
+CJK-ko package version 1.9 (2021/03/01)
 =======================================
 
 This package supports typesetting of modern Korean documents with the help

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

Modified: branches/branch2020.0/Master/texmf-dist/doc/latex/cjk-ko/cjk-ko-doc.tex
===================================================================
--- branches/branch2020.0/Master/texmf-dist/doc/latex/cjk-ko/cjk-ko-doc.tex	2021-03-03 23:14:41 UTC (rev 58091)
+++ branches/branch2020.0/Master/texmf-dist/doc/latex/cjk-ko/cjk-ko-doc.tex	2021-03-03 23:15:02 UTC (rev 58092)
@@ -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 1.8\quad \today}
+\date{Version 1.9\quad \today}
 \begin{document}
 \maketitle
 

Modified: branches/branch2020.0/Master/texmf-dist/tex/latex/cjk-ko/cjkutf8-josa.sty
===================================================================
--- branches/branch2020.0/Master/texmf-dist/tex/latex/cjk-ko/cjkutf8-josa.sty	2021-03-03 23:14:41 UTC (rev 58091)
+++ branches/branch2020.0/Master/texmf-dist/tex/latex/cjk-ko/cjkutf8-josa.sty	2021-03-03 23:15:02 UTC (rev 58092)
@@ -1,6 +1,6 @@
 % cjkutf8-josa.sty
 %
-% Copyright (c) 2016 Dohyun Kim <nomos at ktug org>
+% Copyright (c) 2016-2021 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}[2016/04/04 v1.8 Automatic Josa selection for cjk-ko]
+\ProvidesPackage{cjkutf8-josa}[2021/03/01 v1.9 Automatic Josa selection for cjk-ko]
 
 \AtBeginDocument{
   \ifx\use at josa\undefined\else

Modified: branches/branch2020.0/Master/texmf-dist/tex/latex/cjk-ko/cjkutf8-ko.sty
===================================================================
--- branches/branch2020.0/Master/texmf-dist/tex/latex/cjk-ko/cjkutf8-ko.sty	2021-03-03 23:14:41 UTC (rev 58091)
+++ branches/branch2020.0/Master/texmf-dist/tex/latex/cjk-ko/cjkutf8-ko.sty	2021-03-03 23:15:02 UTC (rev 58092)
@@ -1,6 +1,6 @@
 %  cjkutf8-ko.sty
 %
-% Copyright (c) 2016 Dohyun Kim <nomos at ktug org>
+% Copyright (c) 2016-2021 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,8 @@
 % Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
 % MA 02110-1301 USA
 
-\ProvidesPackage{cjkutf8-ko}[2016/04/04 v1.8 Hangul typesetting on CJKutf8]
+\NeedsTeXFormat{LaTeX2e}[2020/10/01]
+\ProvidesPackage{cjkutf8-ko}[2021/03/01 v1.9 Hangul typesetting on CJKutf8]
 
 \begingroup\expandafter\expandafter\expandafter\endgroup
 \expandafter\ifx\csname eTeXversion\endcsname\relax
@@ -90,9 +91,9 @@
 
 \RequirePackage{CJKutf8}
 
-\g at addto@macro\rmfamily{\CJKfamily{\CJKKO at mjfont}}
-\g at addto@macro\sffamily{\CJKfamily{\CJKKO at gtfont}}
-\g at addto@macro\ttfamily{\CJKfamily{\CJKKO at gtfont}}
+\AddToHook{rmfamily}{\CJKfamily{\CJKKO at mjfont}}
+\AddToHook{sffamily}{\CJKfamily{\CJKKO at gtfont}}
+\AddToHook{ttfamily}{\CJKfamily{\CJKKO at gtfont}}
 
 \AtBeginDocument{
   \edef\reserved at a{\familydefault}
@@ -99,7 +100,7 @@
   \edef\reserved at b{\rmdefault}
   \ifx\reserved at a\reserved at b
     \CJKfamily{\CJKKO at mjfont}
-    \g at addto@macro\normalfont{\CJKfamily{\CJKKO at mjfont}}
+    \AddToHook{normalfont}{\CJKfamily{\CJKKO at mjfont}}
     \if at hangul\ifx\usecjk@@font\undefined
       \IfFileExists{t1\CJKKO at mjfont .fd}{%
         \CJKKO at hangulspaceglue{t1\CJKKO at mjfont m}% space glue from hangul font
@@ -107,7 +108,7 @@
     \fi\fi
   \else
     \CJKfamily{\CJKKO at gtfont}
-    \g at addto@macro\normalfont{\CJKfamily{\CJKKO at gtfont}}
+    \AddToHook{normalfont}{\CJKfamily{\CJKKO at gtfont}}
     \if at hangul\ifx\usecjk@@font\undefined
       \IfFileExists{t1\CJKKO at gtfont .fd}{%
         \CJKKO at hangulspaceglue{t1\CJKKO at gtfont m}% space glue from hangul font
@@ -114,7 +115,6 @@
       }{}
     \fi\fi
   \fi
-  \let\reset at font\normalfont
 }
 
 \def\CJKKO at hangulspaceglue#1{\@ifclassloaded{minimal}{}{%
@@ -194,28 +194,10 @@
   \ifx\usecjk@@font\undefined
   \ifx\CJK at scale\undefined\else
     % redefine \CJK at empty
-    \def\CJK at empty#1{%
-      \@tempdimb \f at size\p@
-      \@tempdimb\CJK at scale\@tempdimb %%% inserted
-      \ifx\optional at arg \@empty
-      \else
-        \expandafter\ifx
-         \csname CJK@\mandatory at arg/\f at size/\the\@tempdimb\endcsname \relax
-          \@tempdimb \optional at arg\@tempdimb
-          #1{Font\space shape\space `\curr at fontshape'\space
-             will\space be\MessageBreak
-             scaled\space to\space size\space \the\@tempdimb}%
-          \expandafter
-          \gdef\csname CJK@\mandatory at arg/\f at size/\the\@tempdimb\endcsname{}%
-        \fi
-      \fi
-      \edef\external at font{%
-        \mandatory at arg\CJK at plane\space at \the\@tempdimb}%
-      \xdef\font at name{%
-        \csname \curr at fontshape/\f at size/\CJK at plane\endcsname}%
-      \expandafter\global\expandafter\let
-       \csname \CJK at curr@fontshape\expandafter\endcsname
-        \csname \curr at fontshape\endcsname}
+    \let\CJKKO@@empty\CJK at empty
+    \def\CJK at empty{\afterassignment\CJKKO@@empty at insert\CJKKO@@empty}
+    \def\CJKKO@@empty at insert{\@tempdimb\CJK at scale\@tempdimb}
+    % end of redefinition
     \if at hangul % hangul is main language
       % scale space glue
       \@ifclassloaded{minimal}{}{%
@@ -370,14 +352,12 @@
 \AtBeginDocument{
   \ifx\usecjk@@font\undefined
   \ifx\CJK at charlower\undefined\else
+    \expandafter\let
+    \expandafter\CJKKO at orig@CJKsymbol
+    \csname CJKsymbol \endcsname
     \DeclareRobustCommand{\CJKsymbol}[1]{%
-      \leavevmode\lower\CJK at charlower\hbox{% inserted
-        \symbol{#1}%
-        \ifCJK at bold@
-          \hbox to \CJKboldshift{\hss\symbol{#1}}%
-          \hbox to \CJKboldshift{\hss\symbol{#1}}%
-        \fi
-      }% inserted
+      \leavevmode\lower\CJK at charlower\hbox\bgroup
+        \CJKKO at orig@CJKsymbol{#1}\egroup
     }
   \fi\fi
 }
@@ -413,11 +393,18 @@
 %%% use pdftex's pdfgentounicode
 \ifpdf
   \ifx\pdfgentounicode\undefined\else
-    \ifx\use at cjk@cmap@\relax\else
-      \InputIfFileExists{glyphtounicode}{%
-        \let\CJK at addcmap\@gobble
-        \pdfgentounicode\@ne
-      }{}
+    \ifx\use at cjk@cmap@\relax % truetype
+      \ifx\pdfnobuiltintounicode\undefined\else
+        \let\origin at l@CJK at addcmap\CJK at addcmap
+        \def\CJK at addcmap#1{\origin at l@CJK at addcmap{#1}%
+          \pdfnobuiltintounicode\font at name }
+      \fi
+    \else % type1
+      \IfFormatAtLeastTF{2021/05/01}{}
+        {\InputIfFileExists{glyphtounicode}
+          {\pdfgentounicode\@ne}{}
+        }
+      \let\CJK at addcmap\@gobble
     \fi
   \fi
 \fi

Modified: branches/branch2020.0/Master/texmf-dist/tex/latex/cjk-ko/cjkutf8-nanummjhanja.sty
===================================================================
--- branches/branch2020.0/Master/texmf-dist/tex/latex/cjk-ko/cjkutf8-nanummjhanja.sty	2021-03-03 23:14:41 UTC (rev 58091)
+++ branches/branch2020.0/Master/texmf-dist/tex/latex/cjk-ko/cjkutf8-nanummjhanja.sty	2021-03-03 23:15:02 UTC (rev 58092)
@@ -1,6 +1,6 @@
 % cjkutf8-nanummjhanja.sty
 %
-% Copyright (c) 2016 Dohyun Kim <nomos at ktug org>
+% Copyright (c) 2016-2021 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,22 +18,15 @@
 % MA 02110-1301 USA
 
 \ProvidesPackage{cjkutf8-nanummjhanja}
-  [2016/04/04 v1.8 UHC hanja for Nanum Myeongjo]
+  [2021/03/01 v1.9 UHC hanja for Nanum Myeongjo]
 
 \def\CJKKO at mjdefault{nanummj}
 \def\CJKKO at mjhanjafamily{\def\CJK at family{uhcmj}}
 
 % redefine CJK at numbToHex
+\let\CJKKO at orig@numbToHex\CJK at numbToHex
 \def\CJK at numbToHex#1#2{%
-  {\count\z@ #2\relax
-   \count\tw@ \count\z@
-   \divide\count\z@ \sixt@@n
-   \count@ \count\z@
-   \multiply\count@ \sixt@@n
-   \advance\count\tw@ -\count@
-   \xdef#1{%
-     \hexnumber@{\count\z@}\hexnumber@{\count\tw@}}}%
-  % inserted
+  \CJKKO at orig@numbToHex{#1}{#2}%
   \ifx\CJK at family\CJKKO at mjdefault
     \expandafter\CJKKO at checkhanjaplane#1\fi}
 



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