summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/xetex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-02-03 23:48:17 +0000
committerKarl Berry <karl@freefriends.org>2014-02-03 23:48:17 +0000
commit8ad58f29ed0930ae433d45971bbd0362555bd26d (patch)
tree70a3c3f8dbc28ad00df51b27022c6d63eaa6198d /Master/texmf-dist/tex/xetex
parent94921319f96b6ef37f21921d2354d3f5a93cff40 (diff)
xetexko (3feb14)
git-svn-id: svn://tug.org/texlive/trunk@32863 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/xetex')
-rw-r--r--Master/texmf-dist/tex/xetex/xetexko/xetexko-font.sty20
-rw-r--r--Master/texmf-dist/tex/xetex/xetexko/xetexko-space.sty6
2 files changed, 17 insertions, 9 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{%
diff --git a/Master/texmf-dist/tex/xetex/xetexko/xetexko-space.sty b/Master/texmf-dist/tex/xetex/xetexko/xetexko-space.sty
index e22452eb462..6760f2550bf 100644
--- a/Master/texmf-dist/tex/xetex/xetexko/xetexko-space.sty
+++ b/Master/texmf-dist/tex/xetex/xetexko/xetexko-space.sty
@@ -13,7 +13,7 @@
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname ProvidesPackage\endcsname\relax\else
\ProvidesPackage{xetexko-space}
- [2014/01/15 v2.4 Spacings and fonts for XeTeX-ko]
+ [2014/02/02 v2.4 Spacings and fonts for XeTeX-ko]
\fi
%%% we need XeTeX > 0.997
@@ -1618,6 +1618,7 @@
\else
\def\dotemphchar{\bf \char95 }
\fi
+\newbox\XKdotemphbox
\protected\def\dotemph#1{%
\leavevmode
@@ -1626,6 +1627,7 @@
\let\XKhanjalastchar\XKcjklastchar
\let\XKcjkcharboxstart\relax
\let\XKcjkcharboxstop\relax
+ \setbox\XKdotemphbox\hbox{\dotemphchar}%
#1\relax
\endgroup
}
@@ -1634,7 +1636,7 @@
\def\dot@@@emph#1{%
\setbox\z@\hbox{\XK@fallback@hanja@font@family{#1}#1}%
- \setbox\tw@\hbox to\wd\z@{\hss\dotemphchar\hss}\ht\tw@\z@\dp\tw@\z@
+ \setbox\tw@\hbox to\wd\z@{\hss\copy\XKdotemphbox\hss}\ht\tw@\z@\dp\tw@\z@
\rlap{\raise\dotemphraise\box\tw@}\box\z@
}