summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/xetex/xetexko/ChangeLog12
-rw-r--r--Master/texmf-dist/doc/xetex/xetexko/README2
-rw-r--r--Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.pdfbin230268 -> 195509 bytes
-rw-r--r--Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.tex84
-rw-r--r--Master/texmf-dist/tex/xetex/xetexko/xetexko-font.sty94
-rw-r--r--Master/texmf-dist/tex/xetex/xetexko/xetexko-josa.sty6
-rw-r--r--Master/texmf-dist/tex/xetex/xetexko/xetexko-space.sty11
-rw-r--r--Master/texmf-dist/tex/xetex/xetexko/xetexko-vertical.sty34
-rw-r--r--Master/texmf-dist/tex/xetex/xetexko/xetexko.sty11
9 files changed, 159 insertions, 95 deletions
diff --git a/Master/texmf-dist/doc/xetex/xetexko/ChangeLog b/Master/texmf-dist/doc/xetex/xetexko/ChangeLog
index d09b5ab1a82..6dab58fb20c 100644
--- a/Master/texmf-dist/doc/xetex/xetexko/ChangeLog
+++ b/Master/texmf-dist/doc/xetex/xetexko/ChangeLog
@@ -1,3 +1,15 @@
+2014-07-27 Dohyun Kim <nomos at ktug org>
+
+ Version 2.8
+
+ * xetexko-space.sty: adapt to recent update of unicode-letters.tex.
+ Hangul syllables were of catcode 12 traditionally, and this is deeply
+ interwined with Automatic Josa Selection. So, recent change of
+ unicode-letters.tex, assigning catcode 11 to Hangul, is hereby
+ reverted.
+ * xetexko-font.sty: allow font option only once, as per future release
+ of fontspec
+
2014-06-17 Dohyun Kim <nomos at ktug org>
Version 2.7
diff --git a/Master/texmf-dist/doc/xetex/xetexko/README b/Master/texmf-dist/doc/xetex/xetexko/README
index ca94ae72fe1..b73669f5e16 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.7 (2014/06/17)
+XeTeX-ko Package version 2.8 (2014/07/27)
=========================================
XeTeX-ko is a macro package for Xe(La)TeX which supports typesetting
diff --git a/Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.pdf b/Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.pdf
index 7892e0bb1f3..9d4f9261f3c 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 1d7d43fe4a3..41f90a86d2d 100644
--- a/Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.tex
+++ b/Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.tex
@@ -10,11 +10,12 @@
\setmainhangulfont{KoPubBatang_Pro Light.otf}[
BoldFont=KoPubBatang_Pro Bold.otf,
]
-\setsanshangulfont{KoPubDotum_Pro Medium.otf}[
- BoldFont=KoPubDotum_Pro Bold.otf,
-]
+\setsanshangulfont{Source Han Sans}[
+ Script=Hangul, Language=Korean,
+ UprightFont=* Normal,
+ BoldFont=* Bold Bold ] % <-----
\usepackage{xetexko-hanging, hologo, xcolor, ulem}
-\usepackage[bookmarksnumbered]{hyperref}
+\usepackage[bookmarksnumbered,hidelinks]{hyperref}
\edef\verbatim{\unexpanded\expandafter{\verbatim
\linespread{1.1}\selectfont }}
@@ -28,14 +29,15 @@
\def\grayhrule{{\color{white!80!black}\hrule height2pt}}
\def\grayvrule{{\color{white!80!black}\vrule width 2pt}}
\newenvironment{plaintex}
- {\setbox0=\vbox\bgroup\hsize=\dimexpr\textwidth-12pt\relax\kern10pt\par\small
+ {\setbox0=\vbox\bgroup\hsize=\dimexpr\textwidth-12pt\relax
+ \hrule width0pt\kern5pt\par\small
\noindent}
- {\par\vskip-\lastskip\kern10pt\egroup \par\medskip\par
- \dimen0=\dimexpr\pagegoal-\pagetotal-1ex\relax
+ {\par \vskip-\lastskip\kern5pt\hrule width0pt\egroup \par\medskip\par
+ \dimen0=\dimexpr\pagegoal-\pagetotal\relax
+ \ifdim\dimen0<2\baselineskip\relax \dimen0\maxdimen \fi
\ifdim\ht0<\dimen0
\hbox{\grayvrule\kern10pt\box0}%
\else
- \lineskip=0pt \splittopskip=10pt
\setbox2=\vsplit0 to\dimen0
\ifvoid2 \else\hbox{\grayvrule\kern10pt\box2}\fi
\ifvoid0 \else\hbox{\grayvrule\kern10pt\box0}\fi
@@ -54,7 +56,7 @@
\title{\xetexko\ 간단 매뉴얼}
\author{Dohyun Kim \normalsize <\texttt{nomos at ktug org}> \and
\normalsize <\url{http://github.com/dohyunkim/xetexko}>}
-\date{Version 2.7\quad 2014/06/17}
+\date{Version 2.8\quad 2014/07/27}
\maketitle
\begin{quote}\small
@@ -63,25 +65,35 @@
\begin{itemize}\itemsep=0pt\linespread{1.3}\selectfont
\item[v2.0]---
- \item 플레인텍에서 xetexko.tex이 아니라 xetexko.sty를 불러야 한다.
- \item \verb+[unfonts]+ 옵션이 없으면 은글꼴을 자동으로 부르지 않는다.
- \item CJK 기호문자를 \hparen{한자가 아니라} 한글 글꼴에서 찾는 것이
- 기본값이 되었다.
- \item \verb|interpunctskern| 글꼴 옵션을 없애고 \verb|quoteraise|를
- 추가했다.
+ \item \hyperref[sec:loading]
+ {플레인텍에서 xetexko.tex이 아니라 xetexko.sty를 불러야 한다.}
+ \item \hyperref[sec:loading]
+ {\texttt{[unfonts]} 옵션이 없으면 은글꼴을 자동으로 부르지 않는다.}
+ \item \hyperref[sec:symbolfont]
+ {CJK 기호문자를 \hparen{한자가 아니라} 한글 글꼴에서 찾는 것이
+ 기본값이 되었다.}
+ \item \hyperref[sec:fontopts]
+ {\texttt{interpunctskern} 글꼴 옵션을 없애고 \texttt{quoteraise}를
+ 추가했다.}
\item[v2.2]---
- \item 글꼴 옵션 \verb|charraise|를 추가했다.
- \item \cs{fallbackhanjafont} 명령을 인식한다.
- \item \cs{everyhangul}, \cs{everyhanja} 명령이 추가되었다.
- \item 하이픈 문자를 \hparen{직전 글꼴이 아니라} 라틴 글꼴에서 찾는
- 것이 기본값이 되었다.
+ \item \hyperref[sec:fontopts]
+ {글꼴 옵션 \texttt{charraise}를 추가했다.}
+ \item \hyperref[sec:fontcmds]
+ {\cs{fallbackhanjafont} 명령을 인식한다.}
+ \item \hyperref[sec:etccmds]
+ {\cs{everyhangul}, \cs{everyhanja} 명령이 추가되었다.}
+ \item \hyperref[sec:symbolfont]
+ {하이픈 문자를 \hparen{직전 글꼴이 아니라} 라틴 글꼴에서 찾는
+ 것이 기본값이 되었다.}
\item[v2.4]---
\item Variation Selector를 이용한 한자 변형 글리프 접근을 허용한다.
\item[v2.7]---
- \item main/sans hangul/hanja 글꼴에는 디폴트 옵션으로
- \verb|Ligatures=TeX|이 주어진다.
- \item \cs{defaulthangulfontfeatures} 및 \cs{defaulthanjafontfeatures}
- 명령이 추가되었다.
+ \item \hyperref[sec:fontcmds]
+ {main/sans hangul/hanja 글꼴에는 디폴트 옵션으로
+ \texttt{Ligatures=TeX}이 주어진다.}
+ \item \hyperref[sec:fontopts]
+ {\cs{defaulthangulfontfeatures}와 \cs{defaulthanjafontfeatures}
+ 명령이 생겼다.}
\end{itemize}
\end{quote}
@@ -112,14 +124,14 @@ EUC-KR이나 CP949 입력도 지원하는데, 다음과 같은 선언이 있으
한글 사이 자간이나 영문자와 한글 사이 간격 따위의 \xetexko 가 제공하는
기능을 포기해야 할 것이다.
-\section{\xetexko\ 부르기}
+\section{\xetexko\ 부르기}\label{sec:loading}
\xetexko\ 로드하기: \cs{usepackage\{xetexko\}} 혹은 \cs{usepackage\{kotex\}}.
이 명령으로 fontspec 및 xunicode 패키지도 함께 불려온다.
종전과 달리 xltxtra 패키지를 함께 부르지 않음을 주의할 것.
fontspec에 옵션을 주려면 \xetexko를 부르기 전에 fontspec을 따로 로드하면 된다.
\begin{plaintex}
-플레인텍이라면 \verb|\input xetexko.sty|.
+플레인텍이라면 \verb|\input xetexko.sty| 혹은 \verb|\input kotex.sty|.
\end{plaintex}
패키지 옵션:
@@ -135,7 +147,7 @@ fontspec에 옵션을 주려면 \xetexko를 부르기 전에 fontspec을 따로
\end{description}
-\section{글꼴 명령}
+\section{글꼴 명령}\label{sec:fontcmds}
\begin{verbatim}
\setmainfont {Linux Libertine}
\setmainhangulfont{NanumMyeongjo}
@@ -197,7 +209,7 @@ fontspec과 마찬가지로 각 명령의 끝에 `s'를 붙여도 된다.
상태이기 때문이다.}
-\section{기호 글꼴 명령}
+\section{기호 글꼴 명령}\label{sec:symbolfont}
라틴 문자나 CJK 기호를 어떤 폰트로 식자할 것인가를 사용자가 지정할 수 있다.
\begin{verbatim}
\xetexkofontregime{hangul}[quotes=latin, puncts=prevfont]
@@ -245,7 +257,7 @@ fontspec과 마찬가지로 각 명령의 끝에 `s'를 붙여도 된다.
\end{verbatim}
\end{plaintex}
-\section{간격 조정 옵션}
+\section{간격 조정 옵션}\label{sec:fontopts}
\dotemph{고정폭 글꼴을 제외한} 한글·한자 글꼴 명령에 미세 간격 옵션을
쓸 수 있다.
\begin{verbatim}
@@ -337,7 +349,7 @@ fontspec 패키지의 \cs{defaultfontfeatures}에 상응하는 것이지만,
오직 이 절에서 언급한 옵션들만 인식하며 나머지는 무시된다는 점을 유의하라.
-\section{그밖의 명령들}
+\section{그밖의 명령들}\label{sec:etccmds}
\begin{description}
\item[\cs{everyhangul}, \cs{everyhanja}]
한글 또는 한자에 대해 글자마다 지시한 명령을 수행한다. 예컨대
@@ -390,9 +402,7 @@ CJK 구두점의 폭을 0.5em으로 강제설정하는 것을 방지한다.
\begin{figure}
\begin{example}
- \hangulfontspec{HCR Dotum LVT}[Script=Hangul]
- \hanjabyhangulfont%\parindent1em
- \obeylines\leftskip10em
+ \sffamily \obeylines\leftskip10em
뎨 가ᄂᆞᆫ 뎌 각시 본 듯도 ᄒᆞᆫ뎌이고.
天텬上상白ᄇᆡᆨ玉옥京경을 엇디ᄒᆞ야 離니別별ᄒᆞ고
ᄒᆡ 다 져믄 날의 눌을 보라 가시ᄂᆞᆫ고
@@ -437,9 +447,9 @@ vertical 환경의 인자는 세로쓰기 박스의 세로 길이이다.
\begin{figure}
\begin{example}
\hfil\begin{vertical}{16em}
- \hangulfontspec{AdobeMyungjoStd-Medium.otf}[Vertical=RotatedGlyphs]
- \hangulmarks \hanjabyhangulfont \parindent-1em\leftskip1em
-\noindent 님의 침묵 {\small(The Silent Beloved)}
+ \sffamily\addhangulfontfeatures{Vertical=RotatedGlyphs,CharRaise=.5ex}
+ \hanjabyhangulfont \parindent-1em\leftskip1em
+ \noindent 님의 침묵 (The Silent Beloved)
\smallbreak
\hfil\hfil 한 용 운\hfil
\bigbreak
@@ -488,7 +498,7 @@ Tchinese도 제공하는데 중국어 번체 글꼴을 사용한다면 이 환
\begin{figure}
\begin{example}\linespread{1.3}
- \hanjafontspec{STFangsong}\chinese
+ \sffamily\chinese
子曰：「學而時習之，不亦說乎？有朋自遠方來，不亦樂乎？人不知而不慍，不亦君子乎？」
有子曰：「其爲人也孝弟，而好犯上者，鮮矣！不好犯上，而好作亂者，未之有也！君子務本，本立而道生；孝弟也者，其爲仁之本與？」
diff --git a/Master/texmf-dist/tex/xetex/xetexko/xetexko-font.sty b/Master/texmf-dist/tex/xetex/xetexko/xetexko-font.sty
index bdca890d47a..1bc55c448c7 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/06/17 v2.7 LaTeX Font commands for XeTeX-ko]
+\ProvidesPackage{xetexko-font}[2014/07/27 v2.8 LaTeX Font commands for XeTeX-ko]
\let\xetexko@f@size\f@size
\RequirePackage{fontspec}[2014/05/25]
@@ -107,50 +107,72 @@
\tl_set_eq:NN \l_xtxko_font_opts_tl \l_xtxko_hanja_font_opts_init_tl
\keys_set_known:nxN { xtxko-font } {#1} \l_xtxko_rem_tl
}
+\cs_new:Nn \__xtxko_pass_args:nnn
+ {
+ \IfNoValueTF {#2}
+ { \__xtxko_post_args:w {#1} {#3} }
+ { #1 {#2} {#3} }
+ }
+\NewDocumentCommand \__xtxko_post_args:w { m m O{} }
+ { #1 {#3} {#2} }
%%%%%%%%%%%%%%%%%%%%
% user font commands
-\DeclareDocumentCommand \setmainhangulfont { O{} m O{} }
+\DeclareDocumentCommand \setmainhangulfont { o m }
+ { \__xtxko_pass_args:nnn \__xtxko_setmainhangulfont:nn {#1} {#2} }
+\cs_new:Nn \__xtxko_setmainhangulfont:nn
{
- \__xtxko_hangul_assign_font_opts:n {#1,#3}
+ \__xtxko_hangul_assign_font_opts:n {#1}
\newfontfamily \kormainfont [\l_xtxko_rem_tl] {#2}
\tl_put_right:NV \kormainfont \l_xtxko_font_opts_tl
\ignorespaces
}
-\DeclareDocumentCommand \setsanshangulfont { O{} m O{} }
+\DeclareDocumentCommand \setsanshangulfont { o m }
+ { \__xtxko_pass_args:nnn \__xtxko_setsanshangulfont:nn {#1} {#2} }
+\cs_new:Nn \__xtxko_setsanshangulfont:nn
{
- \__xtxko_hangul_assign_font_opts:n {#1,#3}
+ \__xtxko_hangul_assign_font_opts:n {#1}
\newfontfamily \korsansfont [\l_xtxko_rem_tl] {#2}
\tl_put_right:NV \korsansfont \l_xtxko_font_opts_tl
\ignorespaces
}
-\DeclareDocumentCommand \setmonohangulfont { O{} m O{} }
+\DeclareDocumentCommand \setmonohangulfont { o m }
+ { \__xtxko_pass_args:nnn \__xtxko_setmonohangulfont:nn {#1} {#2} }
+\cs_new:Nn \__xtxko_setmonohangulfont:nn
{
- \newfontfamily \kormonofont [#1,#3] {#2}
+ \newfontfamily \kormonofont [#1] {#2}
\ignorespaces
}
-\DeclareDocumentCommand \setmainhanjafont { O{} m O{} }
+\DeclareDocumentCommand \setmainhanjafont { o m }
+ { \__xtxko_pass_args:nnn \__xtxko_setmainhanjafont:nn {#1} {#2} }
+\cs_new:Nn \__xtxko_setmainhanjafont:nn
{
- \__xtxko_hanja_assign_font_opts:n {#1,#3}
+ \__xtxko_hanja_assign_font_opts:n {#1}
\newfontfamily \hnjmainfont [\l_xtxko_rem_tl] {#2}
\tl_put_right:NV \hnjmainfont \l_xtxko_font_opts_tl
\ignorespaces
}
-\DeclareDocumentCommand \setsanshanjafont { O{} m O{} }
+\DeclareDocumentCommand \setsanshanjafont { o m }
+ { \__xtxko_pass_args:nnn \__xtxko_setsanshanjafont:nn {#1} {#2} }
+\cs_new:Nn \__xtxko_setsanshanjafont:nn
{
- \__xtxko_hanja_assign_font_opts:n {#1,#3}
+ \__xtxko_hanja_assign_font_opts:n {#1}
\newfontfamily \hnjsansfont [\l_xtxko_rem_tl] {#2}
\tl_put_right:NV \hnjsansfont \l_xtxko_font_opts_tl
\ignorespaces
}
-\DeclareDocumentCommand \setmonohanjafont { O{} m O{} }
+\DeclareDocumentCommand \setmonohanjafont { o m }
+ { \__xtxko_pass_args:nnn \__xtxko_setmonohanjafont:nn {#1} {#2} }
+\cs_new:Nn \__xtxko_setmonohanjafont:nn
{
- \newfontfamily \hnjmonofont [#1,#3] {#2}
+ \newfontfamily \hnjmonofont [#1] {#2}
\ignorespaces
}
%% {hangul,hanja}fontspec = adhoc{hangul,hanja}font
-\DeclareDocumentCommand \adhochangulfont { O{} m O{} }
+\DeclareDocumentCommand \adhochangulfont { o m }
+ { \__xtxko_pass_args:nnn \__xtxko_adhochangulfont:nn {#1} {#2} }
+\cs_new:Nn \__xtxko_adhochangulfont:nn
{
- \__xtxko_hangul_assign_font_opts:n {#1,#3}
+ \__xtxko_hangul_assign_font_opts:n {#1}
\newfontfamily \XK@adhoc@hangul@font [\l_xtxko_rem_tl] {#2}
\tl_put_right:NV \XK@adhoc@hangul@font \l_xtxko_font_opts_tl
\tl_set:Nn \XKhangulfont
@@ -163,9 +185,11 @@
\ignorespaces
}
\cs_set_eq:NN \hangulfontspec \adhochangulfont
-\DeclareDocumentCommand \adhochanjafont { O{} m O{} }
+\DeclareDocumentCommand \adhochanjafont { o m }
+ { \__xtxko_pass_args:nnn \__xtxko_adhochanjafont:nn {#1} {#2} }
+\cs_new:Nn \__xtxko_adhochanjafont:nn
{
- \__xtxko_hanja_assign_font_opts:n {#1,#3}
+ \__xtxko_hanja_assign_font_opts:n {#1}
\newfontfamily \XK@adhoc@hanja@font [\l_xtxko_rem_tl] {#2}
\tl_put_right:NV \XK@adhoc@hanja@font \l_xtxko_font_opts_tl
\tl_set:Nn \XKhanjafont
@@ -179,9 +203,11 @@
}
\cs_set_eq:NN \hanjafontspec \adhochanjafont
%% new{hangul,hanja}font{family,face}
-\DeclareDocumentCommand \newhangulfontfamily { m O{} m O{} }
+\DeclareDocumentCommand \newhangulfontfamily { m o m }
+ { \__xtxko_pass_args:nnn { \__xtxko_newhangulfontfamily:Nnn #1 } {#2} {#3} }
+\cs_new:Nn \__xtxko_newhangulfontfamily:Nnn
{
- \__xtxko_hangul_assign_font_opts:n {#2,#4}
+ \__xtxko_hangul_assign_font_opts:n {#2}
\exp_args:Nc \newfontfamily { XK@newfont@family \token_to_str:N #1 }
[\l_xtxko_rem_tl] {#3}
\tl_put_right:cV { XK@newfont@family \token_to_str:N #1 }
@@ -197,9 +223,11 @@
}
}
}
-\DeclareDocumentCommand \newhanjafontfamily { m O{} m O{} }
+\DeclareDocumentCommand \newhanjafontfamily { m o m }
+ { \__xtxko_pass_args:nnn { \__xtxko_newhanjafontfamily:Nnn #1 } {#2} {#3} }
+\cs_new:Nn \__xtxko_newhanjafontfamily:Nnn
{
- \__xtxko_hanja_assign_font_opts:n {#2,#4}
+ \__xtxko_hanja_assign_font_opts:n {#2}
\exp_args:Nc \newfontfamily { XK@newfont@family \token_to_str:N #1 }
[\l_xtxko_rem_tl] {#3}
\tl_put_right:cV { XK@newfont@family \token_to_str:N #1 }
@@ -215,9 +243,11 @@
}
}
}
-\DeclareDocumentCommand \newhangulfontface { m O{} m O{} }
+\DeclareDocumentCommand \newhangulfontface { m o m }
+ { \__xtxko_pass_args:nnn { \__xtxko_newhangulfontface:Nnn #1 } {#2} {#3} }
+\cs_new:Nn \__xtxko_newhangulfontface:Nnn
{
- \__xtxko_hangul_assign_font_opts:n {#2,#4}
+ \__xtxko_hangul_assign_font_opts:n {#2}
\exp_args:Nc \newfontface { XK@newfont@family \token_to_str:N #1 }
[\l_xtxko_rem_tl] {#3}
\tl_put_right:cV { XK@newfont@family \token_to_str:N #1 }
@@ -233,9 +263,11 @@
}
}
}
-\DeclareDocumentCommand \newhanjafontface { m O{} m O{} }
+\DeclareDocumentCommand \newhanjafontface { m o m }
+ { \__xtxko_pass_args:nnn { \__xtxko_newhanjafontface:Nnn #1 } {#2} {#3} }
+\cs_new:Nn \__xtxko_newhanjafontface:Nnn
{
- \__xtxko_hanja_assign_font_opts:n {#2,#4}
+ \__xtxko_hanja_assign_font_opts:n {#2}
\exp_args:Nc \newfontface { XK@newfont@family \token_to_str:N #1 }
[\l_xtxko_rem_tl] {#3}
\tl_put_right:cV { XK@newfont@family \token_to_str:N #1 }
@@ -325,9 +357,11 @@
\tl_set_eq:NN \l_xtxko_hanja_font_opts_init_tl \l_xtxko_font_opts_tl
}
%% math hangul font
-\DeclareDocumentCommand \setmathhangulfont { O{} m O{} }
+\DeclareDocumentCommand \setmathhangulfont { o m }
+ { \__xtxko_pass_args:nnn \__xtxko_setmathhangulfont:nn {#1} {#2} }
+\cs_new:Nn \__xtxko_setmathhangulfont:nn
{
- \fontspec_set_family:Nnn \xetexko@math@hangul@family {#1,#3} {#2}
+ \fontspec_set_family:Nnn \xetexko@math@hangul@family {#1} {#2}
}
%%%%%%%%%%%%%%%%%%%%
%% xetexkofontregime
@@ -342,10 +376,12 @@
hyphens .code:n = \use:c { #1hyphens } ,
cjksymbols .code:n = \use:c { #1cjksymbols } ,
}
-\DeclareDocumentCommand \xetexkofontregime { O{} m O{} }
+\DeclareDocumentCommand \xetexkofontregime { o m }
+ { \__xtxko_pass_args:nnn \__xtxko_xetexkofontregime:nn {#1} {#2} }
+\cs_new:Nn \__xtxko_xetexkofontregime:nn
{
\use:c { #2marks }
- \keys_set:nn { xtxko-char } { #1, #3 }
+ \keys_set:nn { xtxko-char } { #1 }
}
\ExplSyntaxOff
diff --git a/Master/texmf-dist/tex/xetex/xetexko/xetexko-josa.sty b/Master/texmf-dist/tex/xetex/xetexko/xetexko-josa.sty
index 160c7df8308..2208e6b9f15 100644
--- a/Master/texmf-dist/tex/xetex/xetexko/xetexko-josa.sty
+++ b/Master/texmf-dist/tex/xetex/xetexko/xetexko-josa.sty
@@ -15,8 +15,10 @@
\ProvidesPackage{xetexko-josa}[2014/06/17 v2.7 Auto-josa for XeTeX-ko]
\fi
-\unless\ifcsname @tempcnta\endcsname\newcount\@tempcnta\fi
-\unless\ifcsname @tempcntb\endcsname\newcount\@tempcntb\fi
+\unless\ifcsname @tempcnta\endcsname
+ \alloc@0\count\countdef\insc@unt\@tempcnta\fi
+\unless\ifcsname @tempcntb\endcsname
+ \alloc@0\count\countdef\insc@unt\@tempcntb\fi
%%% user commands
\protected\def\jong {\global\let\XK@last@char=0}
diff --git a/Master/texmf-dist/tex/xetex/xetexko/xetexko-space.sty b/Master/texmf-dist/tex/xetex/xetexko/xetexko-space.sty
index 9b62734ee61..640785485da 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/06/17 v2.7 Spacings and fonts for XeTeX-ko]
+ [2014/07/27 v2.8 Spacings and fonts for XeTeX-ko]
\fi
%%% we need XeTeX > 0.997
@@ -289,7 +289,12 @@
%%% hangul syllables
\newXeTeXintercharclass \XKhangulsyllable
-\XK@assign@char@class{"AC00}{"D7A3}\XKhangulsyllable
+\count@="AC00
+\loop
+ \catcode\count@ = 12 % revert recent change of unicode-letters.tex
+ \XeTeXcharclass\count@ = \XKhangulsyllable
+ \ifnum\count@<"D7A3 \advance\count@\@ne
+\repeat
% treat compatibility jamo as hangul syllable
\XK@assign@char@class{"3131}{"318E}\XKhangulsyllable
% leading consonants jamo as well
@@ -1602,6 +1607,6 @@
%%% declare to use interchartoken
\XeTeXinterchartokenstate\@ne
-\def\hellipsis{^^^^2026\kern-.1ex^^^^2026}
+\def\hellipsis{^^^^2026^^^^2026}
\endinput
diff --git a/Master/texmf-dist/tex/xetex/xetexko/xetexko-vertical.sty b/Master/texmf-dist/tex/xetex/xetexko/xetexko-vertical.sty
index 1ac187205c0..2d94aec0744 100644
--- a/Master/texmf-dist/tex/xetex/xetexko/xetexko-vertical.sty
+++ b/Master/texmf-dist/tex/xetex/xetexko/xetexko-vertical.sty
@@ -16,12 +16,17 @@
[2014/06/17 v2.7 Vertical environment for XeTeX-ko]
\fi
-\unless\ifcsname @tempdima\endcsname\newdimen\@tempdima\fi
-\unless\ifcsname @tempdimb\endcsname\newdimen\@tempdimb\fi
-\unless\ifcsname @tempdimc\endcsname\newdimen\@tempdimc\fi
-
% do not veticalize headline/footline
-\ifdefined\ProvidesPackage % for latex
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname selectfont\endcsname\relax % plain
+ \protected\def\verticaltypesetting{%
+ \dimen@\hsize\hsize\vsize\vsize\dimen@
+ \edef\plainoutput{\unexpanded{\dimen@\hsize\hsize\vsize\vsize\dimen@}%
+ \unexpanded\expandafter{\plainoutput}}%
+ \def\pagebody{\setbox\z@\vbox to\hsize{\boxmaxdepth=\maxdepth
+ \pagecontents}\xetexko@rotatebox\z@\box\z@}%
+ \maxdepth\z@ \XK@vertical@spacing}
+\else % latex
\protected\def\verticaltypesetting{%
\AtBeginDocument{\XK@vertical@spacing}%
\maxdepth\z@
@@ -33,14 +38,6 @@
\unexpanded\expandafter{\@outputpage}}%
}
\@onlypreamble\verticaltypesetting
-\else % for plain
- \protected\def\verticaltypesetting{%
- \dimen@\hsize\hsize\vsize\vsize\dimen@
- \edef\plainoutput{\unexpanded{\dimen@\hsize\hsize\vsize\vsize\dimen@}%
- \unexpanded\expandafter{\plainoutput}}%
- \def\pagebody{\setbox\z@\vbox to\hsize{\boxmaxdepth=\maxdepth
- \pagecontents}\xetexko@rotatebox\z@\box\z@}%
- \maxdepth\z@ \XK@vertical@spacing}
\fi
\def\xetexko@rotatebox#1{%
@@ -88,11 +85,10 @@
\protected\def\endvertical{%
\egroup
- \@tempdima\wd\z@
- \@tempdimb\ht\z@
- \@tempdimc\dp\z@
+ \dimen@\dimexpr\ht\z@+\dp\z@\relax
+ \dimen@ii\dimexpr\wd\z@-\dp\z@\relax
\setbox\z@\hbox{%
- \kern\dimexpr\@tempdimb+0.5em\relax
+ \kern\dimexpr\ht\z@+0.5em\relax
\wd\z@\z@
\ht\z@\z@
\dp\z@\z@
@@ -100,11 +96,11 @@
\special{x:rotate -90}%
\box\z@
\special{x:grestore}}%
- \wd\z@\dimexpr\@tempdimb+\@tempdimc\relax
+ \wd\z@\dimen@
\ht\z@\z@
\dp\z@\z@
\leavevmode
- \raise\dimexpr\@tempdima-\@tempdimc\relax\box\z@
+ \raise\dimen@ii\box\z@
}
\protected\def\vertlatin#1{\leavevmode\lower0.5ex\hbox{\latinmarks #1}}
diff --git a/Master/texmf-dist/tex/xetex/xetexko/xetexko.sty b/Master/texmf-dist/tex/xetex/xetexko/xetexko.sty
index d50d7d31906..80e061cbc97 100644
--- a/Master/texmf-dist/tex/xetex/xetexko/xetexko.sty
+++ b/Master/texmf-dist/tex/xetex/xetexko/xetexko.sty
@@ -10,8 +10,13 @@
% and version 1.3c or later is part of all distributions of LaTeX
% version 2006/05/20 or later.
-\ifx\ProvidesPackage\relax \let\ProvidesPackage\undefined \fi
-\ifx\ProvidesPackage\undefined
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname ProvidesPackage\endcsname\relax\else
+ \ProvidesPackage{xetexko}[2014/06/17 v2.7 Typesetting Korean with XeTeX]
+\fi
+
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname selectfont\endcsname\relax
\chardef\catcodeofATcharacter\catcode`@
\catcode`\@ = 11
@@ -42,8 +47,6 @@
\expandafter\endinput
\fi
-\ProvidesPackage{xetexko}[2014/06/17 v2.7 Typesetting Korean with XeLaTeX]
-
\newif\if@hangul
\newif\if@hanja
\newif\if@unfonts
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-08 08:52:47 +0000