summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/xetex/xetexko/xetexko-space.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-01-19 23:43:56 +0000
committerKarl Berry <karl@freefriends.org>2015-01-19 23:43:56 +0000
commit926f2c34911c1cb78939e8f1047aaf14e1bb9d2e (patch)
tree9d2db387a5a8520c3ee785454fe62ac96394ff58 /Master/texmf-dist/tex/xetex/xetexko/xetexko-space.sty
parentb6574e6c71befc9e13ec7be5107ebc9104256269 (diff)
xetexko (19jan15)
git-svn-id: svn://tug.org/texlive/trunk@36097 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/xetex/xetexko/xetexko-space.sty')
-rw-r--r--Master/texmf-dist/tex/xetex/xetexko/xetexko-space.sty80
1 files changed, 59 insertions, 21 deletions
diff --git a/Master/texmf-dist/tex/xetex/xetexko/xetexko-space.sty b/Master/texmf-dist/tex/xetex/xetexko/xetexko-space.sty
index 640785485da..c4cb0fd33ff 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/07/27 v2.8 Spacings and fonts for XeTeX-ko]
+ [2015/01/18 v2.11 Spacings and fonts for XeTeX-ko]
\fi
%%% we need XeTeX > 0.997
@@ -1262,7 +1262,12 @@
\ifdim\dimen@<.5em \dimen@.5em \else\advance\dimen@.1em \fi
\leavevmode
\ifx\empty\xetexkocharraise\else\raise\xetexkocharraise\fi
- \hbox to\dimen@\bgroup\hss
+ \hbox
+ \ifx\XKdisablecjksymbolspacing\empty
+ \bgroup
+ \else % default: half
+ to\dimen@ \bgroup\hss
+ \fi
\XeTeXinterchartoks\XKboundary\XKcjkopening = {\empty}}
\def\postcjkopenparen{\egroup}
@@ -1274,9 +1279,17 @@
\ifdim\dimen@<.5em \dimen@.5em \else\advance\dimen@.1em \fi
\leavevmode
\ifx\empty\xetexkocharraise\else\raise\xetexkocharraise\fi
- \hbox to\dimen@\bgroup
+ \hbox
+ \ifx\XKdisablecjksymbolspacing\empty\else % default: half
+ to\dimen@
+ \fi
+ \bgroup
\XeTeXinterchartoks\XKboundary\XKcjkclosing = {\empty}}
-\def\postcjkcloseparen{\hss\egroup}
+\def\postcjkcloseparen{%
+ \ifx\XKdisablecjksymbolspacing\empty\else % default: half
+ \hss
+ \fi
+ \egroup}
\def\precjkfullstop{\futurelet\@let@token\precjkfullstop@}
\def\precjkfullstop@{%
@@ -1286,14 +1299,32 @@
\ifdim\dimen@<.5em \dimen@.5em \else\advance\dimen@.1em \fi
\leavevmode
\ifx\empty\xetexkocharraise\else\raise\xetexkocharraise\fi
- \hbox to\dimen@\bgroup
+ \hbox
+ \ifx\XKdisablecjksymbolspacing\empty\else % default: half
+ to\dimen@
+ \fi
+ \bgroup
\XeTeXinterchartoks\XKboundary\XKcjkfullstop = {\empty}}
-\def\postcjkfullstop{\hss\egroup}
+\def\postcjkfullstop{%
+ \ifx\XKdisablecjksymbolspacing\empty\else % default: half
+ \hss
+ \fi
+ \egroup}
\def\precjkcolon {\leavevmode
\ifx\empty\xetexkocharraise\else\raise\xetexkocharraise\fi
- \hbox to 0.5em\bgroup\hss}
-\def\postcjkcolon{\hss\egroup}
+ \hbox
+ \ifx\XKdisablecjksymbolspacing\empty
+ \bgroup
+ \else % default: half
+ to 0.5em\bgroup\hss
+ \fi
+}
+\def\postcjkcolon{%
+ \ifx\XKdisablecjksymbolspacing\empty\else % default: half
+ \hss
+ \fi
+ \egroup}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% various spaces
@@ -1368,6 +1399,8 @@
\iffontchar\font`#1\else
\ifdefined\fallbackhanjafont
\chardef\XK@use@fallback@font\@ne
+ \expandafter\let\expandafter\XK@fallback@plain@font@temp\the\font
+ \let\XK@fallback@latex@family@temp\f@family % redundant for plain
\fallbackhanjafont
\fi
\fi
@@ -1378,7 +1411,10 @@
% fallbackhanjafont for, say, HanaMinB
\XK@fallback@hanja@font@family{#1}%
\XK@every@hanja{#1}% everyhanja
- \ifcase\XK@use@fallback@font\else\relax\fi
+ \ifcase\XK@use@fallback@font\else
+ \XK@fallback@plain@font@temp
+ \let\f@family\XK@fallback@latex@family@temp
+ \fi
}
\def\XKcjklastchar#1{%
@@ -1476,14 +1512,14 @@
}
\protected\def\disablecjksymbolspacing{% for natural width of 。「」 etc
+ \let\XKdisablecjksymbolspacing\empty
+}
+
+\protected\def\disablehangulspacing{% all micro-spacing is 0pt
\let\precjkopenparen \relax \let\postcjkopenparen \relax
\let\precjkcloseparen\relax \let\postcjkcloseparen\relax
\let\precjkfullstop \relax \let\postcjkfullstop \relax
\let\precjkcolon \relax \let\postcjkcolon \relax
-}
-
-\protected\def\disablehangulspacing{% all micro-spacing is 0pt
- \disablecjksymbolspacing
\let\XKopeningquotestart \relax \let\XKopeningquotestop \relax
\let\XKclosingquotestart \relax \let\XKclosingquotestop \relax
\let\XKperiodboxstart \relax \let\XKperiodboxstop \relax
@@ -1563,14 +1599,16 @@
%% for ulem
\def\xetexkoulemsupport{%
\UL@hook\expandafter{\the\UL@hook
- \let\XK@UL@@@hangulfont\XKhangulfont
- \let\XK@UL@@@hanjafont \XKhanjafont
- \def\XKhangulfont{\XK@UL@@@hangulfont
- \aftergroup\aftergroup\aftergroup\XK@UL@@@hangulfont
- }%
- \def\XKhanjafont{\XK@UL@@@hanjafont
- \aftergroup\aftergroup\aftergroup\XK@UL@@@hanjafont
- }%
+ \ifdefined\XK@UL@@@hangulfont\else
+ \let\XK@UL@@@hangulfont\XKhangulfont
+ \let\XK@UL@@@hanjafont \XKhanjafont
+ \def\XKhangulfont{\XK@UL@@@hangulfont
+ \aftergroup\aftergroup\aftergroup\XK@UL@@@hangulfont
+ }%
+ \def\XKhanjafont{\XK@UL@@@hanjafont
+ \aftergroup\aftergroup\aftergroup\XK@UL@@@hanjafont
+ }%
+ \fi
}%
}