summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/xetex/xetexko/ChangeLog8
-rw-r--r--Master/texmf-dist/doc/xetex/xetexko/README4
-rw-r--r--Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.pdfbin227528 -> 227251 bytes
-rw-r--r--Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.tex28
-rw-r--r--Master/texmf-dist/tex/xetex/xetexko/xetexko-font.sty261
-rw-r--r--Master/texmf-dist/tex/xetex/xetexko/xetexko-hanging.sty4
-rw-r--r--Master/texmf-dist/tex/xetex/xetexko/xetexko-josa.sty4
-rw-r--r--Master/texmf-dist/tex/xetex/xetexko/xetexko-space.sty4
-rw-r--r--Master/texmf-dist/tex/xetex/xetexko/xetexko-vertical.sty4
-rw-r--r--Master/texmf-dist/tex/xetex/xetexko/xetexko.sty4
10 files changed, 160 insertions, 161 deletions
diff --git a/Master/texmf-dist/doc/xetex/xetexko/ChangeLog b/Master/texmf-dist/doc/xetex/xetexko/ChangeLog
index 35ac10544d0..3f4fe3a16c8 100644
--- a/Master/texmf-dist/doc/xetex/xetexko/ChangeLog
+++ b/Master/texmf-dist/doc/xetex/xetexko/ChangeLog
@@ -1,3 +1,11 @@
+2020-02-17 Dohyun Kim <nomos at ktug org>
+
+ Version 2.23
+
+ * xetexko-font.sty: unbatang/undotum as default hangul fonts;
+ suppress bx font warnings and make \bfseries work again;
+ use latex's newly introduced \@{rm,sf,tt,default}familyhook
+
2019-12-01 Dohyun Kim <nomos at ktug org>
Version 2.22
diff --git a/Master/texmf-dist/doc/xetex/xetexko/README b/Master/texmf-dist/doc/xetex/xetexko/README
index 808ba7b8a7a..4b9931cf3e7 100644
--- a/Master/texmf-dist/doc/xetex/xetexko/README
+++ b/Master/texmf-dist/doc/xetex/xetexko/README
@@ -1,4 +1,4 @@
-XeTeX-ko Package version 2.22 (2019/12/01)
+XeTeX-ko Package version 2.23 (2020/02/17)
=========================================
XeTeX-ko is a macro package for Xe(La)TeX which supports typesetting
@@ -75,7 +75,7 @@ spacing.
Load Hanja captions. Also adjusts spacing as [hangul] option does.
Note that [unfonts] option is removed starting with v2.10, and so
-Nanum TrueType will be used when no Hangul/Hanja font is declared.
+Un TrueType will be used when no Hangul/Hanja font is declared.
Hangul Font Commands
diff --git a/Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.pdf b/Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.pdf
index bf1e522d371..a84c7279191 100644
--- a/Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.pdf
+++ b/Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.tex b/Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.tex
index 8584e0e36a8..4fd17522348 100644
--- a/Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.tex
+++ b/Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.tex
@@ -65,7 +65,7 @@
\title{\xetexko\ 간단 매뉴얼}
\author{Dohyun Kim \normalsize <\texttt{nomos at ktug org}> \and
\normalsize <\url{http://github.com/dohyunkim/xetexko}>}
-\date{Version 2.22\quad 2019/12/01}
+\date{Version 2.23\quad 2020/02/17}
\maketitle
\begin{quote}\small
@@ -101,16 +101,16 @@
\item \hyperref[sec:fontopts]
{\cs{defaulthangulfontfeatures}와 \cs{defaulthanjafontfeatures}
명령이 생겼다.}
- \item[v2.9]---
- \item \hyperref[sec:fontcmds]
- {영문폰트에 한글·한자 자형이 없고 한글·한자 폰트도 따로 지시하지 않았다면
- 나눔 트루타입을 한글·한자 글꼴의 기본값으로 사용한다.}
\item[v2.10]---
\item 패키지 옵션 \texttt{[unfonts]}를 더는 지원하지 않는다. 이 옵션을
- 사용한 기존 문서는 기본 글꼴인 나눔 트루타입으로 식자될 것이다.
+ 사용한 기존 문서는 기본 글꼴인 은글꼴 트루타입으로 식자될 것이다.
\item[v2.13]---
\item \hyperref[sec:verttype]
{\texttt{horizontal} 환경이 추가되었다.}
+ \item[v2.23]---
+ \item \hyperref[sec:fontcmds]
+ {디폴트 한글 폰트가 나눔글꼴에서 은글꼴로 변경되었다.}
+
\end{itemize}
\end{quote}
@@ -143,7 +143,7 @@ EUC-KR이나 CP949 입력도 지원하는데, 다음과 같은 선언이 있으
\section{\xetexko\ 부르기}\label{sec:loading}
\xetexko\ 로드하기: \cs{usepackage\{xetexko\}} 혹은 \cs{usepackage\{kotex\}}.
-이 명령으로 fontspec 및 xunicode 패키지도 함께 불러들인다.
+이 명령으로 fontspec 패키지도 함께 불러들인다.
fontspec에 옵션을 주려면 \xetexko를 부르기 전에 fontspec을 따로 로드하면 된다.
\begin{plaintex}
@@ -152,10 +152,10 @@ fontspec에 옵션을 주려면 \xetexko를 부르기 전에 fontspec을 따로
패키지 옵션:
\begin{description}\hangulquotes
-\item[ hangul ] `제1장' `표' `차례' 등 한글 표제를 이용한다.
+\item[ hangul ] `제~1~장' `표' `차례' 등 한글 표제를 이용한다.
절 제목 이하에는 한글 표제가 붙지 않고 숫자로만 표현된다.
한글이 주된 언어라고 인식하여 줄간격 조정도 수행한다.
-\item[ hanja ] `第1章' `表' `目次' 등 한자 표제를 이용한다.
+\item[ hanja ] `第~1~章' `表' `目次' 등 한자 표제를 이용한다.
절 제목 이하에는 한자 표제가 붙지 않고 숫자로만 표현된다.
한글이 주된 언어라고 인식하여 줄간격 조정도 수행한다.
\end{description}
@@ -179,9 +179,8 @@ main/sans hangul/hanja 폰트에는 따로 \verb|Ligatures=TeX| 옵션을 지시
한글폰트를 따로 지정하지 않으면 영문폰트가 한글에도 사용된다.
한자폰트를 따로 지정하지 않으면 한글폰트가 한자에도 적용된다.
\LaTeX 에서는 영문폰트에 한글·한자 글리프가 없고 한글·한자 폰트도 따로
-지시하지 않았다면 \hemph{나눔 트루타입을 한글·한자 글꼴의 기본값}으로
-사용한다.\footnote{나눔 글꼴을 찾을 수 없다면 바탕/돋움 글꼴을 이용하고
- 그마저도 없다면 한글·한자가 식자되지 않을 뿐, 에러를 발생시키지는 않는다.}
+지시하지 않았다면 \hemph{은바탕/은돋움 트루타입}을 한글·한자 글꼴의 기본값으로
+사용한다.
\begin{plaintex}
플레인텍이라면 다음처럼 한다.
@@ -418,7 +417,10 @@ CJK 구두점의 폭을 0.5em으로 강제설정하는 것을 방지한다.
폰트가 이런 기능을 제공해야만 가능한 일이다.\footnote{%
이런 기능을 제공하는 폰트로는 윈도즈~8에 번들된 맑은고딕이
있으며 공개폰트로는 은바탕, 함초롬~LVT, Source Han Sans (본고딕),
-Noto Sans CJK, 나눔명조옛한글, 나눔바른고딕옛한글 등이 있다.}
+Source Han Serif (본명조), Noto Sans CJK, Noto Serif CJK,
+나눔명조옛한글, 나눔바른고딕옛한글, KoPubWorld 바탕, KoPubWorld 돋움 등이 있다.
+또한 \textsf{\char"1112\char"119E\char"11AB글}에 번들된 함초롬 글꼴에도
+최근 옛한글 지원이 추가되었다.}
\begin{figure}
\begin{example}
diff --git a/Master/texmf-dist/tex/xetex/xetexko/xetexko-font.sty b/Master/texmf-dist/tex/xetex/xetexko/xetexko-font.sty
index d03ae1a18b2..42c0913587e 100644
--- a/Master/texmf-dist/tex/xetex/xetexko/xetexko-font.sty
+++ b/Master/texmf-dist/tex/xetex/xetexko/xetexko-font.sty
@@ -1,6 +1,6 @@
% xetexko-font.sty
%
-% Copyright (c) 2013-2019 Dohyun Kim <nomos at ktug org>
+% Copyright (c) 2013-2020 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
@@ -10,11 +10,10 @@
% and version 1.3c or later is part of all distributions of LaTeX
% version 2006/05/20 or later.
-\ProvidesPackage{xetexko-font}[2019/12/01 v2.22 LaTeX Font commands for XeTeX-ko]
+\NeedsTeXFormat{LaTeX2e}[2020/02/02]
+\ProvidesPackage{xetexko-font}[2020/02/17 v2.23 LaTeX Font commands for XeTeX-ko]
-\let\xetexko@f@size\f@size
-\RequirePackage{fontspec}[2018/07/30]
-\let\f@size\xetexko@f@size
+\RequirePackage{fontspec}[2020/02/03]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%% for old hangul rendering
@@ -133,52 +132,92 @@
\XK@storecjkfont
}
}
+ \cs_if_eq:NNTF \rmdefault #2
+ {
+ \cs_set_eq:NN \XK@default@korean@font \XK@rm@korean@font
+ }
+ {
+ \cs_if_eq:NNTF \sfdefault #2
+ {
+ \cs_set_eq:NN \XK@default@korean@font \XK@sf@korean@font
+ }
+ {
+ \cs_set_eq:NN \XK@default@korean@font \XK@tt@korean@font
+ }
+ }
}
}
}
+% suppress bx font warnings
+\cs_new_nopar:Npn \l_xetexko_pacify_bfseries {
+ \tl_map_inline:nn { \mddefault \bfdefault }
+ {
+ \cs_if_exist:cF { \g_fontspec_encoding_tl/\l_fontspec_family_tl/##1/\updefault }
+ {
+ \cs_set_eq:cc
+ { \g_fontspec_encoding_tl/\l_fontspec_family_tl/##1/\updefault }
+ { \g_fontspec_encoding_tl/\l_fontspec_family_tl/##1/\shapedefault }
+ }
+ }
+ \tl_map_inline:nn { \shapedefault \updefault \itdefault \sldefault }
+ {
+ \cs_if_exist:cF { \g_fontspec_encoding_tl/\l_fontspec_family_tl/bx/##1 }
+ {
+ \cs_set_eq:cc
+ { \g_fontspec_encoding_tl/\l_fontspec_family_tl/bx/##1 }
+ { \g_fontspec_encoding_tl/\l_fontspec_family_tl/\bfdefault/##1 }
+ }
+ }
+}
%%%%%%%%%%%%%%%%%%%%
% user font commands
\DeclareDocumentCommand \setmainhangulfont { O{} m O{} }
{
- \__xtxko_hangul_assign_font_opts:n {#1,#3}
- \setfontfamily \kormainfont [\l_xtxko_rem_tl] {#2}
+ \__xtxko_hangul_assign_font_opts:n {Ligatures=TeX,#1,#3}
+ \setfontfamily \kormainfont {#2} [\l_xtxko_rem_tl]
+ \l_xetexko_pacify_bfseries
\tl_put_right:NV \kormainfont \l_xtxko_font_opts_tl
\__xtxko_def_XKhan__fonts:nnn \XKhangulfont \rmdefault \kormainfont
\ignorespaces
}
\DeclareDocumentCommand \setsanshangulfont { O{} m O{} }
{
- \__xtxko_hangul_assign_font_opts:n {#1,#3}
- \setfontfamily \korsansfont [\l_xtxko_rem_tl] {#2}
+ \__xtxko_hangul_assign_font_opts:n {Ligatures=TeX,#1,#3}
+ \setfontfamily \korsansfont {#2} [\l_xtxko_rem_tl]
+ \l_xetexko_pacify_bfseries
\tl_put_right:NV \korsansfont \l_xtxko_font_opts_tl
\__xtxko_def_XKhan__fonts:nnn \XKhangulfont \sfdefault \korsansfont
\ignorespaces
}
\DeclareDocumentCommand \setmonohangulfont { O{} m O{} }
{
- \setfontfamily \kormonofont [#1,#3] {#2}
+ \setfontfamily \kormonofont {#2} [#1,#3]
+ \l_xetexko_pacify_bfseries
\__xtxko_def_XKhan__fonts:nnn \XKhangulfont \ttdefault \kormonofont
\ignorespaces
}
\DeclareDocumentCommand \setmainhanjafont { O{} m O{} }
{
- \__xtxko_hanja_assign_font_opts:n {#1,#3}
- \setfontfamily \hnjmainfont [\l_xtxko_rem_tl] {#2}
+ \__xtxko_hanja_assign_font_opts:n {Ligatures=TeX,#1,#3}
+ \setfontfamily \hnjmainfont {#2} [\l_xtxko_rem_tl]
+ \l_xetexko_pacify_bfseries
\tl_put_right:NV \hnjmainfont \l_xtxko_font_opts_tl
\__xtxko_def_XKhan__fonts:nnn \XKhanjafont \rmdefault \hnjmainfont
\ignorespaces
}
\DeclareDocumentCommand \setsanshanjafont { O{} m O{} }
{
- \__xtxko_hanja_assign_font_opts:n {#1,#3}
- \setfontfamily \hnjsansfont [\l_xtxko_rem_tl] {#2}
+ \__xtxko_hanja_assign_font_opts:n {Ligatures=TeX,#1,#3}
+ \setfontfamily \hnjsansfont {#2} [\l_xtxko_rem_tl]
+ \l_xetexko_pacify_bfseries
\tl_put_right:NV \hnjsansfont \l_xtxko_font_opts_tl
\__xtxko_def_XKhan__fonts:nnn \XKhanjafont \sfdefault \hnjsansfont
\ignorespaces
}
\DeclareDocumentCommand \setmonohanjafont { O{} m O{} }
{
- \setfontfamily \hnjmonofont [#1,#3] {#2}
+ \setfontfamily \hnjmonofont {#2} [#1,#3]
+ \l_xetexko_pacify_bfseries
\__xtxko_def_XKhan__fonts:nnn \XKhanjafont \ttdefault \hnjmonofont
\ignorespaces
}
@@ -186,7 +225,8 @@
\DeclareDocumentCommand \adhochangulfont { O{} m O{} }
{
\__xtxko_hangul_assign_font_opts:n {#1,#3}
- \setfontfamily \XK@adhoc@hangul@font [\l_xtxko_rem_tl] {#2}
+ \setfontfamily \XK@adhoc@hangul@font {#2} [\l_xtxko_rem_tl]
+ \l_xetexko_pacify_bfseries
\tl_put_right:NV \XK@adhoc@hangul@font \l_xtxko_font_opts_tl
\cs_set_nopar:Npn \XKhangulfont
{
@@ -201,7 +241,8 @@
\DeclareDocumentCommand \adhochanjafont { O{} m O{} }
{
\__xtxko_hanja_assign_font_opts:n {#1,#3}
- \setfontfamily \XK@adhoc@hanja@font [\l_xtxko_rem_tl] {#2}
+ \setfontfamily \XK@adhoc@hanja@font {#2} [\l_xtxko_rem_tl]
+ \l_xetexko_pacify_bfseries
\tl_put_right:NV \XK@adhoc@hanja@font \l_xtxko_font_opts_tl
\cs_set_nopar:Npn \XKhanjafont
{
@@ -217,7 +258,8 @@
\DeclareDocumentCommand \newhangulfontfamily { m O{} m O{} }
{
\__xtxko_hangul_assign_font_opts:n {#2,#4}
- \exp_args:Nc \setfontfamily { XK@newfont@family \token_to_str:N #1 } [\l_xtxko_rem_tl] {#3}
+ \exp_args:Nc \setfontfamily { XK@newfont@family \token_to_str:N #1 } {#3} [\l_xtxko_rem_tl]
+ \l_xetexko_pacify_bfseries
\tl_put_right:cV { XK@newfont@family \token_to_str:N #1 } \l_xtxko_font_opts_tl
\DeclareRobustCommand #1
{
@@ -233,7 +275,8 @@
\DeclareDocumentCommand \newhanjafontfamily { m O{} m O{} }
{
\__xtxko_hanja_assign_font_opts:n {#2,#4}
- \exp_args:Nc \setfontfamily { XK@newfont@family \token_to_str:N #1 } [\l_xtxko_rem_tl] {#3}
+ \exp_args:Nc \setfontfamily { XK@newfont@family \token_to_str:N #1 } {#3} [\l_xtxko_rem_tl]
+ \l_xetexko_pacify_bfseries
\tl_put_right:cV { XK@newfont@family \token_to_str:N #1 } \l_xtxko_font_opts_tl
\DeclareRobustCommand #1
{
@@ -249,7 +292,7 @@
\DeclareDocumentCommand \newhangulfontface { m O{} m O{} }
{
\__xtxko_hangul_assign_font_opts:n {#2,#4}
- \exp_args:Nc \newfontface { XK@newfont@family \token_to_str:N #1 } [\l_xtxko_rem_tl] {#3}
+ \exp_args:Nc \setfontface { XK@newfont@family \token_to_str:N #1 } {#3} [\l_xtxko_rem_tl]
\tl_put_right:cV { XK@newfont@family \token_to_str:N #1 } \l_xtxko_font_opts_tl
\DeclareRobustCommand #1
{
@@ -265,7 +308,7 @@
\DeclareDocumentCommand \newhanjafontface { m O{} m O{} }
{
\__xtxko_hanja_assign_font_opts:n {#2,#4}
- \exp_args:Nc \newfontface { XK@newfont@family \token_to_str:N #1 } [\l_xtxko_rem_tl] {#3}
+ \exp_args:Nc \setfontface { XK@newfont@family \token_to_str:N #1 } {#3} [\l_xtxko_rem_tl]
\tl_put_right:cV { XK@newfont@family \token_to_str:N #1 } \l_xtxko_font_opts_tl
\DeclareRobustCommand #1
{
@@ -279,13 +322,34 @@
}
}
%% add{hangul,hanja}fontfeature[s]
+\cs_set_nopar:Npn \xetexkopacifybfseries {
+ \tl_map_inline:nn { \mddefault \bfdefault }
+ {
+ \cs_if_exist:cF { \f@encoding/\f@family/##1/\updefault }
+ {
+ \cs_gset_eq:cc
+ { \f@encoding/\f@family/##1/\updefault }
+ { \f@encoding/\f@family/##1/\shapedefault }
+ }
+ }
+ \tl_map_inline:nn { \shapedefault \updefault \itdefault \sldefault }
+ {
+ \cs_if_exist:cF { \f@encoding/\f@family/bx/##1 }
+ {
+ \cs_gset_eq:cc
+ { \f@encoding/\f@family/bx/##1 }
+ { \f@encoding/\f@family/\bfdefault/##1 }
+ }
+ }
+}
\DeclareDocumentCommand \addhangulfontfeature { m }
{
\group_begin:
- \XKhangulfont
+ \fontseries\mddefault\fontshape\shapedefault \XKhangulfont
\tl_clear:N \l_xtxko_font_opts_tl
\keys_set_known:nxN { xtxko-font } {#1} \l_xtxko_rem_tl
\addfontfeature {\l_xtxko_rem_tl}
+ \xetexkopacifybfseries
\use:x
{
\group_end:
@@ -303,10 +367,11 @@
\DeclareDocumentCommand \addhanjafontfeature { m }
{
\group_begin:
- \XKhanjafont
+ \fontseries\mddefault\fontshape\shapedefault \XKhanjafont
\tl_clear:N \l_xtxko_font_opts_tl
\keys_set_known:nxN { xtxko-font } {#1} \l_xtxko_rem_tl
\addfontfeature {\l_xtxko_rem_tl}
+ \xetexkopacifybfseries
\use:x
{
\group_end:
@@ -321,12 +386,7 @@
\ignorespaces
}
\cs_set_eq:NN \addhanjafontfeatures \addhanjafontfeature
-%% default font features
-\defaultfontfeatures
- [
- \kormainfont, \korsansfont, \hnjmainfont, \hnjsansfont,
- ]
- {Ligatures=TeX}
+%% default hangul font features
\DeclareDocumentCommand \defaulthangulfontfeatures { t+ o m } % o is ignored
{
\IfBooleanTF {#1}
@@ -355,6 +415,7 @@
\DeclareDocumentCommand \setmathhangulfont { O{} m O{} }
{
\fontspec_set_family:Nnn \xetexko@math@hangul@family {#1,#3} {#2}
+ \l_xetexko_pacify_bfseries
}
%%%%%%%%%%%%%%%%%%%%
%% xetexkofontregime
@@ -374,39 +435,6 @@
\use:c { #2marks }
\keys_set:nn { xtxko-char } { #1,#3 }
}
-%% fontspec 2018
-\RenewDocumentCommand \setmainfont { O{} m O{} }
- {
- \__fontspec_main_setmainfont:nn {#1,#3} {#2}
- \cs_set_protected_nopar:Npx \rmfamily
- {
- \exp_not:V \rmfamily
- \exp_not:N \XK@rm@korean@font
- }
- \ignorespaces
- }
-\RenewDocumentCommand \setsansfont { O{} m O{} }
- {
- \__fontspec_main_setsansfont:nn {#1,#3} {#2}
- \cs_set_protected_nopar:Npx \sffamily
- {
- \exp_not:V \sffamily
- \exp_not:N \XK@sf@korean@font
- }
- \ignorespaces
- }
-\RenewDocumentCommand \setmonofont { O{} m O{} }
- {
- \__fontspec_main_setmonofont:nn {#1,#3} {#2}
- \cs_set_protected_nopar:Npx \ttfamily
- {
- \exp_not:V \ttfamily
- \exp_not:N \XK@tt@korean@font
- \exp_not:N \disablehangulspacing
- }
- \ignorespaces
- }
-\cs_set_eq:NN \setromanfont \setmainfont
\ExplSyntaxOff
%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -476,103 +504,64 @@
\XK@storecjkfont
}%
\fi
+ \disablehangulspacing
}
-\protected\edef\rmfamily{\unexpanded\expandafter{\rmfamily\XK@rm@korean@font}}
-\protected\edef\sffamily{\unexpanded\expandafter{\sffamily\XK@sf@korean@font}}
-\protected\edef\ttfamily{\unexpanded\expandafter{\ttfamily
- \XK@tt@korean@font\disablehangulspacing
-}}
+% using latex 2020's font family hooks
+\edef\@rmfamilyhook{\unexpanded\expandafter{\@rmfamilyhook \XK@rm@korean@font}}
+\edef\@sffamilyhook{\unexpanded\expandafter{\@sffamilyhook \XK@sf@korean@font}}
+\edef\@ttfamilyhook{\unexpanded\expandafter{\@ttfamilyhook \XK@tt@korean@font}}
+\edef\@defaultfamilyhook{\unexpanded\expandafter{\@defaultfamilyhook
+ \XK@default@korean@font }}
+\let\XK@default@korean@font\relax
+
\edef\verbatim@font{\unexpanded\expandafter{\verbatim@font
\disablehangulspacingandlinebreak
\let\XKstoreprevfont\XKlatinfont
}}
% for default font loading
-\def\XKiffontisaccessible#1#2#3{%
- \begingroup
- \suppressfontnotfounderror\@ne
- \font\x="#1" at 10pt
- \expandafter
- \endgroup
- \ifx\x\nullfont #3\else #2\fi
-}
-\def\XKiffonthasunichar#1#2#3#4{%
- \begingroup #1\expandafter\endgroup
+\def\XKiffontfamilyhasunichar#1#2#3#4{%
+ \begingroup \fontfamily{#1}\selectfont\expandafter\endgroup
\iffontchar\font"#2\relax #3\else #4\fi
}
\AtBeginDocument{%
%%%%%%%%%%%%%%%%%%%%%%%%%%
- % default main hangul: nanummyeongjo, batang if absent
+ % default main hangul: unbatang
\ifdefined\kormainfont\else
- \XKiffonthasunichar{\fontfamily\rmdefault\selectfont}{AC00}
+ \XKiffontfamilyhasunichar{\rmdefault}{AC00}
{\let\kormainfont\relax}
- {\XKiffontisaccessible{NanumMyeongjoExtraBold}
- {\setmainhangulfont{NanumMyeongjo}[Renderer=OpenType,BoldFont=*ExtraBold]}
- {\XKiffontisaccessible{NanumMyeongjo}
- {\setmainhangulfont{NanumMyeongjo}[Renderer=OpenType]}
- {\XKiffontisaccessible{Batang}
- {\setmainhangulfont{Batang}[AutoFakeBold]}
- {\let\kormainfont\relax}%
- }%
- }%
+ {\IfFontExistsTF{UnBatang.ttf}
+ {\setmainhangulfont{UnBatang.ttf}[BoldFont=UnBatangBold.ttf]}
+ {\let\kormainfont\relax}%
}%
\fi
- % default main hanja: nanumgothic, batang if absent
- \ifdefined\hnjmainfont\else
- \XKiffonthasunichar{\kormainfont}{4E00}
- {\let\hnjmainfont\kormainfont}
- {\XKiffontisaccessible{NanumGothic}
- {\setmainhanjafont{NanumGothic}[Renderer=OpenType]}
- {\XKiffontisaccessible{Batang}
- {\setmainhanjafont{Batang}[AutoFakeBold]}
- {\let\hnjmainfont\kormainfont}%
- }%
- }%
- \fi
- % default sans hangul: nanumgothic, dotum if absent
+ \ifdefined\hnjmainfont\else \let\hnjmainfont\kormainfont \fi
+
+ % default sans hangul: undotum
\ifdefined\korsansfont\else
- \XKiffonthasunichar{\fontfamily\sfdefault\selectfont}{AC00}
+ \XKiffontfamilyhasunichar{\sfdefault}{AC00}
{\let\korsansfont\relax}
- {\XKiffontisaccessible{NanumGothic}
- {\setsanshangulfont{NanumGothic}[Renderer=OpenType]}
- {\XKiffontisaccessible{Dotum}
- {\setsanshangulfont{Dotum}[AutoFakeBold]}
- {\let\korsansfont\relax}%
- }%
- }%
- \fi
- % default sans hanja: nanumgothic, dotum if absent
- \ifdefined\hnjsansfont\else
- \XKiffonthasunichar{\korsansfont}{4E00}
- {\let\hnjsansfont\korsansfont}
- {\XKiffontisaccessible{NanumGothic}
- {\setsanshanjafont{NanumGothic}[Renderer=OpenType]}
- {\XKiffontisaccessible{Dotum}
- {\setsanshanjafont{Dotum}[AutoFakeBold]}
- {\let\hnjsansfont\korsansfont}%
- }%
+ {\IfFontExistsTF{UnDotum.ttf}
+ {\setsanshangulfont{UnDotum.ttf}[BoldFont=UnDotumBold.ttf]}
+ {\let\korsansfont\relax}%
}%
\fi
+ \ifdefined\hnjsansfont\else \let\hnjsansfont\korsansfont \fi
+
\ifdefined\kormonofont\else \let\kormonofont\korsansfont \fi
\ifdefined\hnjmonofont\else \let\hnjmonofont\kormonofont \fi
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% reset hangul font and normalfont
-\expandafter\ifx\familydefault\rmdefault
- \XK@rm@korean@font
- \protected\edef\normalfont{\unexpanded\expandafter{\normalfont
- \XK@rm@korean@font}}
-\else \expandafter\ifx\familydefault\sfdefault
- \XK@sf@korean@font
- \protected\edef\normalfont{\unexpanded\expandafter{\normalfont
- \XK@sf@korean@font}}
-\else
- \XK@tt@korean@font
- \protected\edef\normalfont{\unexpanded\expandafter{\normalfont
- \XK@tt@korean@font}}
-\fi\fi
-\let\reset@font\normalfont
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ % reset hangul font and normalfont
+ \expandafter\ifx\familydefault\sfdefault
+ \let\XK@default@korean@font\XK@sf@korean@font
+ \else \expandafter\ifx\familydefault\ttdefault
+ \let\XK@default@korean@font\XK@tt@korean@font
+ \else
+ \let\XK@default@korean@font\XK@rm@korean@font
+ \fi\fi
+ \XK@default@korean@font
%%%%%%%%%%%%%%%%%%%%%
% hangul in math mode
\begingroup
diff --git a/Master/texmf-dist/tex/xetex/xetexko/xetexko-hanging.sty b/Master/texmf-dist/tex/xetex/xetexko/xetexko-hanging.sty
index 57cd41f35c4..a96761370f1 100644
--- a/Master/texmf-dist/tex/xetex/xetexko/xetexko-hanging.sty
+++ b/Master/texmf-dist/tex/xetex/xetexko/xetexko-hanging.sty
@@ -1,6 +1,6 @@
% xetexko-hanging.sty
%
-% Copyright (c) 2013-2019 Dohyun Kim <nomos at ktug org>
+% Copyright (c) 2013-2020 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
@@ -13,7 +13,7 @@
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname ProvidesPackage\endcsname\relax\else
\ProvidesPackage{xetexko-hanging}
- [2019/12/01 v2.22 Hanging punctuations for XeTeX-ko]
+ [2020/02/17 v2.23 Hanging punctuations for XeTeX-ko]
\fi
\chardef\catcodeofATcharacter\catcode`@
diff --git a/Master/texmf-dist/tex/xetex/xetexko/xetexko-josa.sty b/Master/texmf-dist/tex/xetex/xetexko/xetexko-josa.sty
index 90b6246eed7..bcdc1aaaf89 100644
--- a/Master/texmf-dist/tex/xetex/xetexko/xetexko-josa.sty
+++ b/Master/texmf-dist/tex/xetex/xetexko/xetexko-josa.sty
@@ -1,6 +1,6 @@
% xetexko-josa.sty
%
-% Copyright (c) 2013-2019 Dohyun Kim <nomos at ktug org>
+% Copyright (c) 2013-2020 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
@@ -12,7 +12,7 @@
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname ProvidesPackage\endcsname\relax\else
- \ProvidesPackage{xetexko-josa}[2019/12/01 v2.22 Auto-josa for XeTeX-ko]
+ \ProvidesPackage{xetexko-josa}[2020/02/17 v2.23 Auto-josa for XeTeX-ko]
\fi
\unless\ifcsname @tempcnta\endcsname
diff --git a/Master/texmf-dist/tex/xetex/xetexko/xetexko-space.sty b/Master/texmf-dist/tex/xetex/xetexko/xetexko-space.sty
index c671d67495f..61e27c81335 100644
--- a/Master/texmf-dist/tex/xetex/xetexko/xetexko-space.sty
+++ b/Master/texmf-dist/tex/xetex/xetexko/xetexko-space.sty
@@ -1,6 +1,6 @@
% xetexko-space.sty
%
-% Copyright (c) 2013-2019 Dohyun Kim <nomos at ktug org>
+% Copyright (c) 2013-2020 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
@@ -13,7 +13,7 @@
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname ProvidesPackage\endcsname\relax\else
\ProvidesPackage{xetexko-space}
- [2019/12/01 v2.22 Spacings and fonts for XeTeX-ko]
+ [2020/02/17 v2.23 Spacings and fonts for XeTeX-ko]
\fi
%%% we need XeTeX > 0.997
diff --git a/Master/texmf-dist/tex/xetex/xetexko/xetexko-vertical.sty b/Master/texmf-dist/tex/xetex/xetexko/xetexko-vertical.sty
index b1c3e703c65..801a238b101 100644
--- a/Master/texmf-dist/tex/xetex/xetexko/xetexko-vertical.sty
+++ b/Master/texmf-dist/tex/xetex/xetexko/xetexko-vertical.sty
@@ -1,6 +1,6 @@
% xetexko-vertical.sty
%
-% Copyright (c) 2013-2019 Dohyun Kim <nomos at ktug org>
+% Copyright (c) 2013-2020 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
@@ -13,7 +13,7 @@
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname ProvidesPackage\endcsname\relax\else
\ProvidesPackage{xetexko-vertical}
- [2019/12/01 v2.22 Vertical environment for XeTeX-ko]
+ [2020/02/17 v2.23 Vertical environment for XeTeX-ko]
\fi
% do not veticalize headline/footline
diff --git a/Master/texmf-dist/tex/xetex/xetexko/xetexko.sty b/Master/texmf-dist/tex/xetex/xetexko/xetexko.sty
index acc6104603a..a958782e0e8 100644
--- a/Master/texmf-dist/tex/xetex/xetexko/xetexko.sty
+++ b/Master/texmf-dist/tex/xetex/xetexko/xetexko.sty
@@ -1,6 +1,6 @@
% xetexko.sty
%
-% Copyright (c) 2013-2019 Dohyun Kim <nomos at ktug org>
+% Copyright (c) 2013-2020 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
@@ -12,7 +12,7 @@
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname ProvidesPackage\endcsname\relax\else
- \ProvidesPackage{xetexko}[2019/12/01 v2.22 Typesetting Korean with XeTeX]
+ \ProvidesPackage{xetexko}[2020/02/17 v2.23 Typesetting Korean with XeTeX]
\fi
\begingroup\expandafter\expandafter\expandafter\endgroup
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-16 05:11:17 +0000