summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/xetex
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
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')
-rw-r--r--Master/texmf-dist/tex/xetex/xetexko/xetexko-font.sty152
-rw-r--r--Master/texmf-dist/tex/xetex/xetexko/xetexko-hanging.sty11
-rw-r--r--Master/texmf-dist/tex/xetex/xetexko/xetexko-josa.sty2
-rw-r--r--Master/texmf-dist/tex/xetex/xetexko/xetexko-space.sty80
-rw-r--r--Master/texmf-dist/tex/xetex/xetexko/xetexko-vertical.sty22
-rw-r--r--Master/texmf-dist/tex/xetex/xetexko/xetexko.sty5
6 files changed, 153 insertions, 119 deletions
diff --git a/Master/texmf-dist/tex/xetex/xetexko/xetexko-font.sty b/Master/texmf-dist/tex/xetex/xetexko/xetexko-font.sty
index 0e12c811e06..c7e116a4ee9 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/08/04 v2.9 LaTeX Font commands for XeTeX-ko]
+\ProvidesPackage{xetexko-font}[2015/01/16 v2.10 LaTeX Font commands for XeTeX-ko]
\let\xetexko@f@size\f@size
\RequirePackage{fontspec}[2014/05/25]
@@ -385,43 +385,6 @@
\ExplSyntaxOff
%%%%%%%%%%%%%%%%%%%%%%%%%%
-% set unfonts if [unfonts]
-\if@unfonts
- %% 한글폰트 지정하기 :
- \setmainhangulfont
- [ ExternalLocation,
- Mapping=tex-text,
- BoldFont=UnBatangBold,
- ItalicFont=UnBatang, ItalicFeatures={FakeSlant=0.17},
- SlantedFont=UnBatang, SlantedFeatures={FakeSlant=0.17},
- BoldItalicFont=UnBatangBold, BoldItalicFeatures={FakeSlant=0.17},
- BoldSlantedFont=UnBatangBold, BoldSlantedFeatures={FakeSlant=0.17},
- interhchar=-0.045em,
- lowerperiod=0.1em ]
- {UnBatang}
- \setsanshangulfont
- [ ExternalLocation,
- Mapping=tex-text,
- BoldFont=UnDotumBold,
- ItalicFont=UnDotum, ItalicFeatures={FakeSlant=0.17},
- SlantedFont=UnDotum, SlantedFeatures={FakeSlant=0.17},
- BoldItalicFont=UnDotumBold, BoldItalicFeatures={FakeSlant=0.17},
- BoldSlantedFont=UnDotumBold, BoldSlantedFeatures={FakeSlant=0.17},
- lowerperiod=0.1em ]
- {UnDotum}
- \setmonohangulfont
- [ ExternalLocation,
- Scale=1.05,
- BoldFont=UnTaza, BoldFeatures={FakeBold=2},
- ItalicFont=UnTaza, ItalicFeatures={FakeSlant=0.17},
- SlantedFont=UnTaza, SlantedFeatures={FakeSlant=0.17},
- BoldItalicFont=UnTaza, BoldItalicFeatures={FakeBold=2,FakeSlant=0.17},
- BoldSlantedFont=UnTaza, BoldSlantedFeatures={FakeBold=2,FakeSlant=0.17}]
- {UnTaza}
- \let\hnjmonofont\korsansfont
-\fi
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%
% font switching for latex
\def\XKstoreprevfont{%
\ifx\f@family\XKcjkprevfont\let\f@family\XKltnprevfont\fi
@@ -442,40 +405,52 @@
}}
\def\XK@rm@korean@font{%
- \def\XKhangulfont{%
- \XK@storeltnfont
- \chardef\XKcurrentfont\@ne\kormainfont
- \XK@storecjkfont
- }%
- \def\XKhanjafont {%
- \XK@storeltnfont
- \chardef\XKcurrentfont\tw@\hnjmainfont
- \XK@storecjkfont
- }%
+ \ifx\XKhangulfont\relax\else
+ \def\XKhangulfont{%
+ \XK@storeltnfont
+ \chardef\XKcurrentfont\@ne\kormainfont
+ \XK@storecjkfont
+ }%
+ \fi
+ \ifx\XKhanjafont\relax\else
+ \def\XKhanjafont {%
+ \XK@storeltnfont
+ \chardef\XKcurrentfont\tw@\hnjmainfont
+ \XK@storecjkfont
+ }%
+ \fi
}
\def\XK@sf@korean@font{%
- \def\XKhangulfont{%
- \XK@storeltnfont
- \chardef\XKcurrentfont\@ne\korsansfont
- \XK@storecjkfont
- }%
- \def\XKhanjafont {%
- \XK@storeltnfont
- \chardef\XKcurrentfont\tw@\hnjsansfont
- \XK@storecjkfont
- }%
+ \ifx\XKhangulfont\relax\else
+ \def\XKhangulfont{%
+ \XK@storeltnfont
+ \chardef\XKcurrentfont\@ne\korsansfont
+ \XK@storecjkfont
+ }%
+ \fi
+ \ifx\XKhanjafont\relax\else
+ \def\XKhanjafont {%
+ \XK@storeltnfont
+ \chardef\XKcurrentfont\tw@\hnjsansfont
+ \XK@storecjkfont
+ }%
+ \fi
}
\def\XK@tt@korean@font{%
- \def\XKhangulfont{%
- \XK@storeltnfont
- \chardef\XKcurrentfont\@ne\kormonofont
- \XK@storecjkfont
- }%
- \def\XKhanjafont {%
- \XK@storeltnfont
- \chardef\XKcurrentfont\tw@\hnjmonofont
- \XK@storecjkfont
- }%
+ \ifx\XKhangulfont\relax\else
+ \def\XKhangulfont{%
+ \XK@storeltnfont
+ \chardef\XKcurrentfont\@ne\kormonofont
+ \XK@storecjkfont
+ }%
+ \fi
+ \ifx\XKhanjafont\relax\else
+ \def\XKhanjafont {%
+ \XK@storeltnfont
+ \chardef\XKcurrentfont\tw@\hnjmonofont
+ \XK@storecjkfont
+ }%
+ \fi
}
\edef\rmfamily{\unexpanded\expandafter{\rmfamily\XK@rm@korean@font}}
@@ -488,21 +463,6 @@
\let\XKstoreprevfont\XKlatinfont
}}
-\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
-
% for default font loading
\def\XKiffontisaccessible#1#2#3{%
\begingroup
@@ -524,9 +484,9 @@
\XKiffonthasunichar{\fontfamily\rmdefault\selectfont}{AC00}
{\let\kormainfont\relax}
{\XKiffontisaccessible{NanumMyeongjoExtraBold}
- {\setmainhangulfont{NanumMyeongjo}[BoldFont=*ExtraBold]}
+ {\setmainhangulfont{NanumMyeongjo}[Renderer=OpenType,BoldFont=*ExtraBold]}
{\XKiffontisaccessible{NanumMyeongjo}
- {\setmainhangulfont{NanumMyeongjo}}
+ {\setmainhangulfont{NanumMyeongjo}[Renderer=OpenType]}
{\XKiffontisaccessible{Batang}
{\setmainhangulfont{Batang}[AutoFakeBold]}
{\let\kormainfont\relax}%
@@ -539,7 +499,7 @@
\XKiffonthasunichar{\kormainfont}{4E00}
{\let\hnjmainfont\kormainfont}
{\XKiffontisaccessible{NanumGothic}
- {\setmainhanjafont{NanumGothic}}
+ {\setmainhanjafont{NanumGothic}[Renderer=OpenType]}
{\XKiffontisaccessible{Batang}
{\setmainhanjafont{Batang}[AutoFakeBold]}
{\let\hnjmainfont\kormainfont}%
@@ -551,7 +511,7 @@
\XKiffonthasunichar{\fontfamily\sfdefault\selectfont}{AC00}
{\let\korsansfont\relax}
{\XKiffontisaccessible{NanumGothic}
- {\setsanshangulfont{NanumGothic}}
+ {\setsanshangulfont{NanumGothic}[Renderer=OpenType]}
{\XKiffontisaccessible{Dotum}
{\setsanshangulfont{Dotum}[AutoFakeBold]}
{\let\korsansfont\relax}%
@@ -563,7 +523,7 @@
\XKiffonthasunichar{\korsansfont}{4E00}
{\let\hnjsansfont\korsansfont}
{\XKiffontisaccessible{NanumGothic}
- {\setsanshanjafont{NanumGothic}}
+ {\setsanshanjafont{NanumGothic}[Renderer=OpenType]}
{\XKiffontisaccessible{Dotum}
{\setsanshanjafont{Dotum}[AutoFakeBold]}
{\let\hnjsansfont\korsansfont}%
@@ -572,6 +532,22 @@
\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
%%%%%%%%%%%%%%%%%%%%%
% 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 993dcc241fd..f4e10166d77 100644
--- a/Master/texmf-dist/tex/xetex/xetexko/xetexko-hanging.sty
+++ b/Master/texmf-dist/tex/xetex/xetexko/xetexko-hanging.sty
@@ -13,7 +13,7 @@
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname ProvidesPackage\endcsname\relax\else
\ProvidesPackage{xetexko-hanging}
- [2014/06/17 v2.7 Hanging punctuations for XeTeX-ko]
+ [2015/01/16 v2.10 Hanging punctuations for XeTeX-ko]
\fi
\chardef\catcodeofATcharacter\catcode`@
@@ -92,7 +92,14 @@
\XKH@pre@hang\dimen@ii
\else\ifx^^^^2018\@let@token \XKH@pre@hang\dimen@
\fi\fi
- \leavevmode\hbox to\dimen@\bgroup\hss
+ \leavevmode
+ \ifx\empty\xetexkocharraise\else\raise\xetexkocharraise\fi
+ \hbox
+ \ifx\XKdisablecjksymbolspacing\empty
+ \bgroup
+ \else
+ to\dimen@\bgroup\hss
+ \fi
\XeTeXinterchartoks\XKboundary\XKcjkopening = {\empty}%
}%
\def\postcjkcloseparen{%
diff --git a/Master/texmf-dist/tex/xetex/xetexko/xetexko-josa.sty b/Master/texmf-dist/tex/xetex/xetexko/xetexko-josa.sty
index 2208e6b9f15..f76dc07e47d 100644
--- a/Master/texmf-dist/tex/xetex/xetexko/xetexko-josa.sty
+++ b/Master/texmf-dist/tex/xetex/xetexko/xetexko-josa.sty
@@ -12,7 +12,7 @@
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname ProvidesPackage\endcsname\relax\else
- \ProvidesPackage{xetexko-josa}[2014/06/17 v2.7 Auto-josa for XeTeX-ko]
+ \ProvidesPackage{xetexko-josa}[2015/01/16 v2.10 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 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
}%
}
diff --git a/Master/texmf-dist/tex/xetex/xetexko/xetexko-vertical.sty b/Master/texmf-dist/tex/xetex/xetexko/xetexko-vertical.sty
index 2d94aec0744..e94773db65e 100644
--- a/Master/texmf-dist/tex/xetex/xetexko/xetexko-vertical.sty
+++ b/Master/texmf-dist/tex/xetex/xetexko/xetexko-vertical.sty
@@ -13,7 +13,7 @@
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname ProvidesPackage\endcsname\relax\else
\ProvidesPackage{xetexko-vertical}
- [2014/06/17 v2.7 Vertical environment for XeTeX-ko]
+ [2015/01/16 v2.10 Vertical environment for XeTeX-ko]
\fi
% do not veticalize headline/footline
@@ -62,13 +62,27 @@
\fi
\def\precjkopenparen {\leavevmode
\ifx\empty\xetexkocharraise\else\raise\xetexkocharraise\fi
- \hbox to\XK@vert@half@em\bgroup\hss}%
+ \hbox
+ \ifx\XKdisablecjksymbolspacing\empty
+ \bgroup
+ \else
+ to\XK@vert@half@em \bgroup \hss
+ \fi
+ }%
\def\precjkcloseparen{\leavevmode
\ifx\empty\xetexkocharraise\else\raise\xetexkocharraise\fi
- \hbox to\XK@vert@half@em\bgroup}%
+ \hbox
+ \ifx\XKdisablecjksymbolspacing\empty\else
+ to\XK@vert@half@em
+ \fi
+ \bgroup}%
\def\precjkfullstop {\leavevmode
\ifx\empty\xetexkocharraise\else\raise\xetexkocharraise\fi
- \hbox to\XK@vert@half@em\bgroup}%
+ \hbox
+ \ifx\XKdisablecjksymbolspacing\empty\else
+ to\XK@vert@half@em
+ \fi
+ \bgroup}%
\spaceskip\XK@vert@half@em plus\XK@vert@half@em\relax
\parindent\XK@vert@half@em \parindent2\parindent
}
diff --git a/Master/texmf-dist/tex/xetex/xetexko/xetexko.sty b/Master/texmf-dist/tex/xetex/xetexko/xetexko.sty
index 80e061cbc97..28d9e099c17 100644
--- a/Master/texmf-dist/tex/xetex/xetexko/xetexko.sty
+++ b/Master/texmf-dist/tex/xetex/xetexko/xetexko.sty
@@ -12,7 +12,7 @@
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname ProvidesPackage\endcsname\relax\else
- \ProvidesPackage{xetexko}[2014/06/17 v2.7 Typesetting Korean with XeTeX]
+ \ProvidesPackage{xetexko}[2015/01/16 v2.10 Typesetting Korean with XeTeX]
\fi
\begingroup\expandafter\expandafter\expandafter\endgroup
@@ -49,10 +49,9 @@
\newif\if@hangul
\newif\if@hanja
-\newif\if@unfonts
\DeclareOption{hangul}{\@hangultrue}
\DeclareOption{hanja}{\@hangultrue\@hanjatrue}
-\DeclareOption{unfonts}{\@unfontstrue}
+\DeclareOption{unfonts}{}
\ProcessOptions\relax
\RequirePackage{xetexko-space}