summaryrefslogtreecommitdiff
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
parentb6574e6c71befc9e13ec7be5107ebc9104256269 (diff)
xetexko (19jan15)
git-svn-id: svn://tug.org/texlive/trunk@36097 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/xetex/xetexko/ChangeLog13
-rw-r--r--Master/texmf-dist/doc/xetex/xetexko/README7
-rw-r--r--Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.pdfbin197642 -> 198351 bytes
-rw-r--r--Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.tex35
-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
10 files changed, 187 insertions, 140 deletions
diff --git a/Master/texmf-dist/doc/xetex/xetexko/ChangeLog b/Master/texmf-dist/doc/xetex/xetexko/ChangeLog
index d8da5d7a530..2b50f350949 100644
--- a/Master/texmf-dist/doc/xetex/xetexko/ChangeLog
+++ b/Master/texmf-dist/doc/xetex/xetexko/ChangeLog
@@ -1,3 +1,16 @@
+2015-01-18 Dohyun Kim <nomos at ktug org>
+
+ Version 2.11
+
+ * xetexko-space.sty: fix a bug regarding xoblivoir and ulem
+
+2015-01-16 Dohyun Kim <nomos at ktug org>
+
+ Version 2.10
+
+ * xetexko.sty, xetexko-font.sty: package option [unfonts] is removed
+ * *.sty: minor fixes and updated copyright year
+
2014-08-04 Dohyun Kim <nomos at ktug org>
Version 2.9
diff --git a/Master/texmf-dist/doc/xetex/xetexko/README b/Master/texmf-dist/doc/xetex/xetexko/README
index 3582ae0f0b3..68b43a5abb7 100644
--- a/Master/texmf-dist/doc/xetex/xetexko/README
+++ b/Master/texmf-dist/doc/xetex/xetexko/README
@@ -1,4 +1,4 @@
-XeTeX-ko Package version 2.9 (2014/08/04)
+XeTeX-ko Package version 2.11 (2015/01/18)
=========================================
XeTeX-ko is a macro package for Xe(La)TeX which supports typesetting
@@ -74,9 +74,8 @@ spacing.
[hanja]
Load Hanja captions. Also adjusts spacing as [hangul] option does.
- [unfonts]
-Load font setting predefined for Un TrueType fonts available at
-http://kldp.net/projects/unfonts/.
+Note that [unfonts] option is removed starting with v2.10, and so
+Nanum TrueType will be used when no Hangul/Hanja font is declared.
Hangul Font Commands
diff --git a/Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.pdf b/Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.pdf
index 0fba5658bfa..fb031f65a66 100644
--- a/Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.pdf
+++ b/Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.tex b/Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.tex
index 576c7c9ad66..d74da26e6f4 100644
--- a/Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.tex
+++ b/Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.tex
@@ -10,10 +10,11 @@
\setmainhangulfont{KoPubBatang_Pro Light.otf}[
BoldFont=KoPubBatang_Pro Bold.otf,
]
-\setsanshangulfont{Source Han Sans}[
+\setsanshangulfont{Source Han Sans K}[
+ CharRaise=-0.1ex, % BASE?
Script=Hangul, Language=Korean,
UprightFont=* Normal,
- BoldFont=* Bold Bold ] % <-----
+]
\usepackage{xetexko-hanging, hologo, xcolor, ulem}
\usepackage[bookmarksnumbered,hidelinks]{hyperref}
@@ -57,7 +58,7 @@
\title{\xetexko\ 간단 매뉴얼}
\author{Dohyun Kim \normalsize <\texttt{nomos at ktug org}> \and
\normalsize <\url{http://github.com/dohyunkim/xetexko}>}
-\date{Version 2.9\quad 2014/08/04}
+\date{Version 2.11\quad 2015/01/18}
\maketitle
\begin{quote}\small
@@ -68,8 +69,6 @@
\item[v2.0]---
\item \hyperref[sec:loading]
{플레인텍에서 xetexko.tex이 아니라 xetexko.sty를 불러야 한다.}
- \item \hyperref[sec:loading]
- {\texttt{[unfonts]} 옵션이 없으면 은글꼴을 자동으로 부르지 않는다.}
\item \hyperref[sec:symbolfont]
{CJK 기호문자를 \hparen{한자가 아니라} 한글 글꼴에서 찾는 것이
기본값이 되었다.}
@@ -78,7 +77,7 @@
추가했다.}
\item[v2.2]---
\item \hyperref[sec:fontopts]
- {글꼴 옵션 \texttt{charraise}를 추가했다.}
+ {글꼴 옵션 \texttt{CharRaise}를 추가했다.}
\item \hyperref[sec:fontcmds]
{\cs{fallbackhanjafont} 명령을 인식한다.}
\item \hyperref[sec:etccmds]
@@ -99,6 +98,9 @@
\item \hyperref[sec:fontcmds]
{영문폰트에 한글·한자 자형이 없고 한글·한자 폰트도 따로 지시하지 않았다면
나눔 트루타입을 한글·한자 글꼴의 기본값으로 사용한다.}
+ \item[v2.10]---
+ \item 패키지 옵션 \texttt{[unfonts]}를 더는 지원하지 않는다. 이 옵션을
+ 사용한 기존 문서는 기본 글꼴인 나눔 트루타입으로 식자될 것이다.
\end{itemize}
\end{quote}
@@ -147,8 +149,6 @@ fontspec에 옵션을 주려면 \xetexko를 부르기 전에 fontspec을 따로
\item[ hanja ] `第1章' `表' `目次' 등 한자 표제를 이용한다.
절 제목 이하에는 한자 표제가 붙지 않고 숫자로만 표현된다.
한글이 주된 언어라고 인식하여 줄간격 조정도 수행한다.
-\item[ unfonts ] 은글꼴을 불러온다. \hemph{이 옵션이 없으면
- 사용자가 한글 글꼴을 지정해야} 할 수 있다.
\end{description}
@@ -203,7 +203,7 @@ main/sans hangul/hanja 폰트에는 따로 \verb|Ligatures=TeX| 옵션을 지시
fontspec 패키지의 \verb+\newfontfamily+ \verb+\newfontface+ 명령에 해당한다.
\begin{verbatim}
- \addhangulfontfeature{Color=FF0000,interhchar=-.1em}
+ \addhangulfontfeature{Color=FF0000,InterHangul=-.1em}
\addhanjafontfeature {Color=00FF00}
\end{verbatim}
fontspec의 \verb+\addfontfeature+ 명령을 구현한 것이다.
@@ -269,7 +269,7 @@ fontspec과 마찬가지로 각 명령의 끝에 `s'를 붙여도 된다.
\dotemph{고정폭 글꼴을 제외한} 한글·한자 글꼴 명령에 미세 간격 옵션을
쓸 수 있다.
\begin{verbatim}
- \setsanshangulfont{NanumGothic}[interhchar=-.04em]
+ \setsanshangulfont{NanumGothic}[InterHangul=-.04em]
\end{verbatim}
이 때 나눔고딕 글꼴에만 한글 마이너스 자간이 작동한다.
허용되는 옵션은 다음과 같으며 기본값은 다른 언급이 없는 한 모두 0pt이다.
@@ -348,10 +348,10 @@ fontspec과 마찬가지로 각 명령의 끝에 `s'를 붙여도 된다.
\LaTeX 에서는 한글·한자 글꼴의 기본 옵션을 지정할 수 있다.
\begin{verbatim}
- \defaulthangulfontfeatures {hu=.1em, interhchar=-.1em}
- \defaulthangulfontfeatures+{hu=.1em, interhchar=-.1em}
- \defaulthanjafontfeatures {hu=.1em}
- \defaulthanjafontfeatures +{hu=.1em}
+ \defaulthangulfontfeatures {InterLatinCJK=.1em, InterHangul=-.1em}
+ \defaulthangulfontfeatures+{InterLatinCJK=.1em, InterHangul=-.1em}
+ \defaulthanjafontfeatures {InterLatinCJK=.1em}
+ \defaulthanjafontfeatures +{InterLatinCJK=.1em}
\end{verbatim}
fontspec 패키지의 \cs{defaultfontfeatures}에 상응하는 것이지만,
오직 이 절에서 언급한 옵션들만 인식하며 나머지는 무시된다는 점을 유의하라.
@@ -405,8 +405,9 @@ CJK 구두점의 폭을 0.5em으로 강제설정하는 것을 방지한다.
옛한글을 사용하기 위해선 \verb|Script=Hangul| 옵션을 주는 것으로 족하다.
옛한글 식자는 고급 오픈타입 기능을 이용하므로
폰트가 이런 기능을 제공해야만 가능한 일이다.\footnote{%
-\today\ 현재, 이런 기능을 제공하는 폰트로는 윈도즈~8에 번들된 맑은고딕이
-있으며 공개폰트로는 은바탕과 함초롬~LVT 글꼴이 있다.}
+이런 기능을 제공하는 폰트로는 윈도즈~8에 번들된 맑은고딕이
+있으며 공개폰트로는 은바탕, 함초롬~LVT, Source Han Sans (본고딕),
+Noto Sans CJK 등이 있다.}
\begin{figure}
\begin{example}
@@ -481,7 +482,7 @@ vertical 환경의 인자는 세로쓰기 박스의 세로 길이이다.
\end{verbatim}
혹시 세로로 식자되지 않는 라틴문자 부분이 있다면
베이스라인이 한글과 어울리지 않을 수 있다. 이를 교정하려면
-\verb|charraise| 옵션을 한글 폰트에 준다.\footnote{%
+\verb|CharRaise| 옵션을 한글 폰트에 준다.\footnote{%
이 방법이 여의치 않으면 라틴문자 부분을 \cs{vertlatin} 명령으로 감쌀 수도
있는데, 이때 인자가 박스로 처리되어 그 안에서 줄바꿈이 일어나지 않는다.}
\medbreak
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}