diff options
Diffstat (limited to 'macros/xetex/generic/xetexko/xetexko.sty')
-rw-r--r-- | macros/xetex/generic/xetexko/xetexko.sty | 35 |
1 files changed, 18 insertions, 17 deletions
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 |