summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/xetex/xetexko/xetexko-font.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/xetex/xetexko/xetexko-font.sty')
-rw-r--r--Master/texmf-dist/tex/xetex/xetexko/xetexko-font.sty20
1 files changed, 13 insertions, 7 deletions
diff --git a/Master/texmf-dist/tex/xetex/xetexko/xetexko-font.sty b/Master/texmf-dist/tex/xetex/xetexko/xetexko-font.sty
index 42ab8f008b3..a2fa766a87b 100644
--- a/Master/texmf-dist/tex/xetex/xetexko/xetexko-font.sty
+++ b/Master/texmf-dist/tex/xetex/xetexko/xetexko-font.sty
@@ -10,7 +10,7 @@
% and version 1.3c or later is part of all distributions of LaTeX
% version 2006/05/20 or later.
-\ProvidesPackage{xetexko-font}[2014/01/15 v2.4 Font commands for XeTeX-ko]
+\ProvidesPackage{xetexko-font}[2014/02/02 v2.4 Font commands for XeTeX-ko]
\RequirePackage{fontspec}
\RequirePackage{xkeyval}
@@ -317,13 +317,19 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%
% font switching for latex
-\let\XKstoreprevfont\relax
-\def\XK@storeltnfont{\ifcase\XKcurrentfont\let\XKltnprevfont\f@family\fi}
-\def\XK@storecjkfont{\let\XKcjkprevfont\f@family}
-\def\XKlatinfont{%
- \ifx\f@family\XKcjkprevfont \let\f@family\XKltnprevfont \fi
- \chardef\XKcurrentfont\z@\selectfont
+\def\XKstoreprevfont{\ifx\f@family\XKcjkprevfont\let\f@family\XKltnprevfont\fi}
+\def\XK@storeltnfont{\ifx\f@family\XKcjkprevfont\else\let\XKltnprevfont\f@family\fi}
+\def\XK@storecjkfont{%
+ \let\XKcjkprevfont\f@family
+ \edef\XKplaincjkprevfont{\the\font}%
}
+\edef\XKlatinfont{\unexpanded\expandafter{\XKstoreprevfont
+ \chardef\XKcurrentfont\z@
+ \edef\XK@plain@curr@font{\the\font}%
+ \ifx\XK@plain@curr@font\XKplaincjkprevfont
+ \selectfont
+ \fi
+}}
\def\XK@rm@korean@font{%
\def\XKhangulfont{%