summaryrefslogtreecommitdiff
path: root/language
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-03-03 03:01:26 +0000
committerNorbert Preining <norbert@preining.info>2021-03-03 03:01:26 +0000
commit6a1383661dd7817761345a9d4ddfd9db6ba2dd1e (patch)
treedec33644ee8df10255c235853ff6ef809b223a90 /language
parent4763ec8ceefaf2b038d591b8c15d88d081aec6c9 (diff)
CTAN sync 202103030301
Diffstat (limited to 'language')
-rw-r--r--language/korean/cjk-ko/ChangeLog9
-rw-r--r--language/korean/cjk-ko/README2
-rw-r--r--language/korean/cjk-ko/cjk-ko-doc.pdfbin166434 -> 175115 bytes
-rw-r--r--language/korean/cjk-ko/cjk-ko-doc.tex2
-rw-r--r--language/korean/cjk-ko/cjkutf8-josa.sty4
-rw-r--r--language/korean/cjk-ko/cjkutf8-ko.sty71
-rw-r--r--language/korean/cjk-ko/cjkutf8-nanummjhanja.sty15
7 files changed, 46 insertions, 57 deletions
diff --git a/language/korean/cjk-ko/ChangeLog b/language/korean/cjk-ko/ChangeLog
index 995f110bab..5d82a4e2d7 100644
--- a/language/korean/cjk-ko/ChangeLog
+++ b/language/korean/cjk-ko/ChangeLog
@@ -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@name
+ to the end of \CJK@addcmap
+
2016-04-04 Dohyun Kim <nomos at ktug org>
Version 1.8
diff --git a/language/korean/cjk-ko/README b/language/korean/cjk-ko/README
index f55358523d..32f477e999 100644
--- a/language/korean/cjk-ko/README
+++ b/language/korean/cjk-ko/README
@@ -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
diff --git a/language/korean/cjk-ko/cjk-ko-doc.pdf b/language/korean/cjk-ko/cjk-ko-doc.pdf
index d4c97178ae..3bdc528832 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 23ee6cbbda..8aa5d73cac 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 1.8\quad \today}
+\date{Version 1.9\quad \today}
\begin{document}
\maketitle
diff --git a/language/korean/cjk-ko/cjkutf8-josa.sty b/language/korean/cjk-ko/cjkutf8-josa.sty
index 55e3872062..0fb6d6c35c 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 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@josa\undefined\else
diff --git a/language/korean/cjk-ko/cjkutf8-ko.sty b/language/korean/cjk-ko/cjkutf8-ko.sty
index 8d3e943638..ca7244f97a 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 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,16 +91,16 @@
\RequirePackage{CJKutf8}
-\g@addto@macro\rmfamily{\CJKfamily{\CJKKO@mjfont}}
-\g@addto@macro\sffamily{\CJKfamily{\CJKKO@gtfont}}
-\g@addto@macro\ttfamily{\CJKfamily{\CJKKO@gtfont}}
+\AddToHook{rmfamily}{\CJKfamily{\CJKKO@mjfont}}
+\AddToHook{sffamily}{\CJKfamily{\CJKKO@gtfont}}
+\AddToHook{ttfamily}{\CJKfamily{\CJKKO@gtfont}}
\AtBeginDocument{
\edef\reserved@a{\familydefault}
\edef\reserved@b{\rmdefault}
\ifx\reserved@a\reserved@b
\CJKfamily{\CJKKO@mjfont}
- \g@addto@macro\normalfont{\CJKfamily{\CJKKO@mjfont}}
+ \AddToHook{normalfont}{\CJKfamily{\CJKKO@mjfont}}
\if@hangul\ifx\usecjk@@font\undefined
\IfFileExists{t1\CJKKO@mjfont .fd}{%
\CJKKO@hangulspaceglue{t1\CJKKO@mjfont m}% space glue from hangul font
@@ -107,14 +108,13 @@
\fi\fi
\else
\CJKfamily{\CJKKO@gtfont}
- \g@addto@macro\normalfont{\CJKfamily{\CJKKO@gtfont}}
+ \AddToHook{normalfont}{\CJKfamily{\CJKKO@gtfont}}
\if@hangul\ifx\usecjk@@font\undefined
\IfFileExists{t1\CJKKO@gtfont .fd}{%
\CJKKO@hangulspaceglue{t1\CJKKO@gtfont m}% space glue from hangul font
}{}
\fi\fi
\fi
- \let\reset@font\normalfont
}
\def\CJKKO@hangulspaceglue#1{\@ifclassloaded{minimal}{}{%
@@ -194,28 +194,10 @@
\ifx\usecjk@@font\undefined
\ifx\CJK@scale\undefined\else
% redefine \CJK@empty
- \def\CJK@empty#1{%
- \@tempdimb \f@size\p@
- \@tempdimb\CJK@scale\@tempdimb %%% inserted
- \ifx\optional@arg \@empty
- \else
- \expandafter\ifx
- \csname CJK@\mandatory@arg/\f@size/\the\@tempdimb\endcsname \relax
- \@tempdimb \optional@arg\@tempdimb
- #1{Font\space shape\space `\curr@fontshape'\space
- will\space be\MessageBreak
- scaled\space to\space size\space \the\@tempdimb}%
- \expandafter
- \gdef\csname CJK@\mandatory@arg/\f@size/\the\@tempdimb\endcsname{}%
- \fi
- \fi
- \edef\external@font{%
- \mandatory@arg\CJK@plane\space at \the\@tempdimb}%
- \xdef\font@name{%
- \csname \curr@fontshape/\f@size/\CJK@plane\endcsname}%
- \expandafter\global\expandafter\let
- \csname \CJK@curr@fontshape\expandafter\endcsname
- \csname \curr@fontshape\endcsname}
+ \let\CJKKO@@empty\CJK@empty
+ \def\CJK@empty{\afterassignment\CJKKO@@empty@insert\CJKKO@@empty}
+ \def\CJKKO@@empty@insert{\@tempdimb\CJK@scale\@tempdimb}
+ % end of redefinition
\if@hangul % hangul is main language
% scale space glue
\@ifclassloaded{minimal}{}{%
@@ -370,14 +352,12 @@
\AtBeginDocument{
\ifx\usecjk@@font\undefined
\ifx\CJK@charlower\undefined\else
+ \expandafter\let
+ \expandafter\CJKKO@orig@CJKsymbol
+ \csname CJKsymbol \endcsname
\DeclareRobustCommand{\CJKsymbol}[1]{%
- \leavevmode\lower\CJK@charlower\hbox{% inserted
- \symbol{#1}%
- \ifCJK@bold@
- \hbox to \CJKboldshift{\hss\symbol{#1}}%
- \hbox to \CJKboldshift{\hss\symbol{#1}}%
- \fi
- }% inserted
+ \leavevmode\lower\CJK@charlower\hbox\bgroup
+ \CJKKO@orig@CJKsymbol{#1}\egroup
}
\fi\fi
}
@@ -413,11 +393,18 @@
%%% use pdftex's pdfgentounicode
\ifpdf
\ifx\pdfgentounicode\undefined\else
- \ifx\use@cjk@cmap@\relax\else
- \InputIfFileExists{glyphtounicode}{%
- \let\CJK@addcmap\@gobble
- \pdfgentounicode\@ne
- }{}
+ \ifx\use@cjk@cmap@\relax % truetype
+ \ifx\pdfnobuiltintounicode\undefined\else
+ \let\origin@l@CJK@addcmap\CJK@addcmap
+ \def\CJK@addcmap#1{\origin@l@CJK@addcmap{#1}%
+ \pdfnobuiltintounicode\font@name }
+ \fi
+ \else % type1
+ \IfFormatAtLeastTF{2021/05/01}{}
+ {\InputIfFileExists{glyphtounicode}
+ {\pdfgentounicode\@ne}{}
+ }
+ \let\CJK@addcmap\@gobble
\fi
\fi
\fi
diff --git a/language/korean/cjk-ko/cjkutf8-nanummjhanja.sty b/language/korean/cjk-ko/cjkutf8-nanummjhanja.sty
index f96fae70aa..f31ba8bd3d 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 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@mjdefault{nanummj}
\def\CJKKO@mjhanjafamily{\def\CJK@family{uhcmj}}
% redefine CJK@numbToHex
+\let\CJKKO@orig@numbToHex\CJK@numbToHex
\def\CJK@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@orig@numbToHex{#1}{#2}%
\ifx\CJK@family\CJKKO@mjdefault
\expandafter\CJKKO@checkhanjaplane#1\fi}