summaryrefslogtreecommitdiff
path: root/macros/xetex
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2024-03-02 03:04:21 +0000
committerNorbert Preining <norbert@preining.info>2024-03-02 03:04:21 +0000
commitb7323fe884f378851ee661babaa5bd644271f348 (patch)
tree8891732393826e5c5893d00fa39cf9a5eb0a3a90 /macros/xetex
parent19a826b6e3a0d2ea6bbd1bf733a8e590463275ed (diff)
CTAN sync 202403020304
Diffstat (limited to 'macros/xetex')
-rw-r--r--macros/xetex/generic/xetexko/ChangeLog6
-rw-r--r--macros/xetex/generic/xetexko/README2
-rw-r--r--macros/xetex/generic/xetexko/xetexko-doc.pdfbin260256 -> 257123 bytes
-rw-r--r--macros/xetex/generic/xetexko/xetexko-doc.tex8
-rw-r--r--macros/xetex/generic/xetexko/xetexko.sty35
5 files changed, 27 insertions, 24 deletions
diff --git a/macros/xetex/generic/xetexko/ChangeLog b/macros/xetex/generic/xetexko/ChangeLog
index 7d5e352c58..b3e1634cea 100644
--- a/macros/xetex/generic/xetexko/ChangeLog
+++ b/macros/xetex/generic/xetexko/ChangeLog
@@ -1,3 +1,9 @@
+2024-03-01 Dohyun Kim <nomos at ktug org>
+
+ Version 4.3
+
+ * use e-type instead of x-type in EXPL code
+
2022-11-01 Dohyun Kim <nomos at ktug org>
Version 4.2
diff --git a/macros/xetex/generic/xetexko/README b/macros/xetex/generic/xetexko/README
index 5d40215866..9e3648e152 100644
--- a/macros/xetex/generic/xetexko/README
+++ b/macros/xetex/generic/xetexko/README
@@ -1,4 +1,4 @@
-XeTeX-ko Package version 4.2 (2022/11/01)
+XeTeX-ko Package version 4.3 (2024/03/01)
=========================================
XeTeX-ko is a macro package for Xe(La)TeX which supports typesetting
diff --git a/macros/xetex/generic/xetexko/xetexko-doc.pdf b/macros/xetex/generic/xetexko/xetexko-doc.pdf
index 8b93d9d9f1..0c4e8d795f 100644
--- a/macros/xetex/generic/xetexko/xetexko-doc.pdf
+++ b/macros/xetex/generic/xetexko/xetexko-doc.pdf
Binary files differ
diff --git a/macros/xetex/generic/xetexko/xetexko-doc.tex b/macros/xetex/generic/xetexko/xetexko-doc.tex
index 8e71d2514e..8eed817907 100644
--- a/macros/xetex/generic/xetexko/xetexko-doc.tex
+++ b/macros/xetex/generic/xetexko/xetexko-doc.tex
@@ -74,7 +74,7 @@
\title{\xetexko\ 간단 매뉴얼}
\author{Dohyun Kim \normalsize <\texttt{nomos at ktug org}> \and
\normalsize <\url{http://github.com/dohyunkim/xetexko}>}
-\date{Version 4.2\quad 2022/11/01}
+\date{Version 4.3\quad 2024/03/01}
\maketitle
\begin{quote}\small
@@ -152,7 +152,7 @@ main/sans hangul/hanja 폰트에는 따로 \verb|Ligatures=TeX| 옵션을 지시
\bigskip
-※ \vernote{3.1} 및 \vernote{3.4}부터 플레인텍에 주요 변경사항이 있다:
+※ \vernote{3.4}부터 플레인텍에 주요 변경사항이 있다:
\begin{plaintex}
플레인텍에서도 기본값으로 은바탕을 한글에 사용한다. 한글폰트를 지시하는 방법은 다음과 같다.
\begin{verbatim}
@@ -160,16 +160,12 @@ main/sans hangul/hanja 폰트에는 따로 \verb|Ligatures=TeX| 옵션을 지시
\hangulfont="[UnBatang]:mapping=tex-text" at 10pt
\hanjafont ="Naver Dictionary:mapping=tex-text" at 10pt
\end{verbatim}
- \sout{그런데 3.1 버전부터는 이렇게 하면 문서 중간에 영문글꼴을 바꾸더라도
- \cs{hangulfont} 선언시의 영문글꼴이 계속 적용되도록 바뀌었다.}
또한 다음과 같은 새로운 명령을 제공한다.
\begin{verbatim}
\sethangulfont\untaza ="[UnTaza.ttf]" at 10pt
\sethanjafont \undotum="[UnDotum.ttf]" at 10pt
\expandafter\def\expandafter\tt\expandafter{\tt\untaza\undotum}
\end{verbatim}
- \sout{이 경우 \cs{untaza}, \cs{undotum} 명령에 \cs{set...font} 실행시의 현재폰트 명령이
- 자동으로 포함된다. 뒤에서 설명할 글꼴옵션이 포함되는 것과 같은 개념이다.}
그리하여 예의 \cs{tt} 명령으로 이제 한글, 한자, 영문 글꼴을 동시에 바꿀 수 있게 된다.
\end{plaintex}
diff --git a/macros/xetex/generic/xetexko/xetexko.sty b/macros/xetex/generic/xetexko/xetexko.sty
index eb2861d7c4..982c05c117 100644
--- a/macros/xetex/generic/xetexko/xetexko.sty
+++ b/macros/xetex/generic/xetexko/xetexko.sty
@@ -1,6 +1,6 @@
% xetexko.sty
%
-% Copyright (c) 2013-2022 Dohyun Kim <nomos at ktug org>
+% Copyright (c) 2013-2024 Dohyun Kim <nomos at ktug org>
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
@@ -15,8 +15,8 @@
\catcode`@=11
\ifdefined\ProvidesPackage
- \NeedsTeXFormat{LaTeX2e}[2021/06/01]
- \ProvidesPackage{xetexko}[2022/11/01 v4.2 typesetting Korean with XeTeX]
+ \NeedsTeXFormat{LaTeX2e}[2021/11/15]
+ \ProvidesPackage{xetexko}[2024/03/01 v4.3 typesetting Korean with XeTeX]
\else
\ifdefined\@tempcnta\else \newcount\@tempcnta \fi
\ifdefined\@sptoken \else
@@ -1137,7 +1137,7 @@
\or \unkern\unkern \XeKo@latincjk % SY AO
\or \unkern\unkern % AA AO
\or \unkern\unkern % AO AO
- \or \unkern\unkern % AC AO
+ \or \unkern\unkern \inhibitglue % AC AO
\or \unkern\unkern % AP AO
\or \unkern\unkern % AM AO
\or \unkern\unkern % AH AO
@@ -2107,7 +2107,7 @@
\cs_new:Nn \__xtxko_assign_font_opts:n
{
\tl_clear:N \l_xtxko_font_opts_tl
- \keys_set_known:nxN { xtxko-font } {#1} \l_xtxko_rest_opts_tl
+ \keys_set_known:neN { xtxko-font } {#1} \l_xtxko_rest_opts_tl
}
\DeclareDocumentCommand \setmainhangulfont { O{} m O{} }
{
@@ -2175,7 +2175,7 @@
\fontencoding \g_fontspec_encoding_tl
\exp_args:Nc \fontfamily { xetexko_user_family_ \cs_to_str:N #1 } \XeKo@selectfont
}
- \cs_set_nopar:cpx { xetexko_user_option_ \cs_to_str:N #1 }
+ \cs_set_nopar:cpe { xetexko_user_option_ \cs_to_str:N #1 }
{
\exp_not:o { \l_xtxko_font_opts_tl }
}
@@ -2200,7 +2200,7 @@
\fontencoding \g_fontspec_encoding_tl
\fontfamily \xetexkohangulfontfamily \XeKo@selectfont
}
- \cs_set_nopar:Npx \xetexkohanguloption
+ \cs_set_nopar:Npe \xetexkohanguloption
{
\exp_not:o { \l_xtxko_font_opts_tl }
}
@@ -2213,9 +2213,9 @@
\group_begin:
\fontseries\seriesdefault\fontshape\shapedefault \xetexkohangulfont
\cs_set_eq:NN \l_xtxko_font_opts_tl \xetexkohanguloption
- \keys_set_known:nxN { xtxko-font } { #1 } \l_xtxko_rest_opts_tl
+ \keys_set_known:neN { xtxko-font } { #1 } \l_xtxko_rest_opts_tl
\addfontfeature { \l_xtxko_rest_opts_tl }
- \use:x
+ \use:e
{
\group_end:
\exp_not:N \cs_set_nopar:Npn \exp_not:N \xetexkohangulfont
@@ -2299,7 +2299,7 @@
\fontencoding \g_fontspec_encoding_tl
\exp_args:Nc \fontfamily { xetexko_user_family_ \cs_to_str:N #1 } \XeKo@selectfont
}
- \cs_set_nopar:cpx { xetexko_user_option_ \cs_to_str:N #1 }
+ \cs_set_nopar:cpe { xetexko_user_option_ \cs_to_str:N #1 }
{
\exp_not:o { \l_xtxko_font_opts_tl }
}
@@ -2324,7 +2324,7 @@
\fontencoding \g_fontspec_encoding_tl
\fontfamily \xetexkohanjafontfamily \XeKo@selectfont
}
- \cs_set_nopar:Npx \xetexkohanjaoption
+ \cs_set_nopar:Npe \xetexkohanjaoption
{
\exp_not:o { \l_xtxko_font_opts_tl }
}
@@ -2337,9 +2337,9 @@
\group_begin:
\fontseries\seriesdefault\fontshape\shapedefault \xetexkohanjafont
\cs_set_eq:NN \l_xtxko_font_opts_tl \xetexkohanjaoption
- \keys_set_known:nxN { xtxko-font } { #1 } \l_xtxko_rest_opts_tl
+ \keys_set_known:neN { xtxko-font } { #1 } \l_xtxko_rest_opts_tl
\addfontfeature { \l_xtxko_rest_opts_tl }
- \use:x
+ \use:e
{
\group_end:
\exp_not:N \cs_set_nopar:Npn \exp_not:N \xetexkohanjafont
@@ -2462,8 +2462,10 @@
\ifdefined\XeKo@hanja@font\else
\let\XeKo@hanja@font \XeKo@hangul@font
\fi
- \@ifpackageloaded{ulem}{\xetexkoulemsupport}{}
- \@ifpackageloaded{hyperref}{\pdfstringdefDisableCommands{%
+ }
+
+\AddToHook{package/ulem/after}{\xetexkoulemsupport}
+\AddToHook{package/hyperref/after}{\pdfstringdefDisableCommands{%
\let\hangulalphs\relax
\let\hangulnums\relax
\let\hangulparens\relax
@@ -2532,8 +2534,7 @@
\def\라{라}%
\def\으{으}%
\def\로{로}%
- \def\hellipsis{...}}}{}
- }
+ \def\hellipsis{...}}}
\newif\if@hangul
\newif\if@hanja