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.sty152
1 files changed, 64 insertions, 88 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