From e8ddf7b57dfc0030b4405af4545b3ace5e69056c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 26 Mar 2015 21:53:08 +0000 Subject: xetexko (26mar15) git-svn-id: svn://tug.org/texlive/trunk@36638 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/xetex/xetexko/ChangeLog | 8 +++++ Master/texmf-dist/doc/xetex/xetexko/README | 2 +- .../texmf-dist/doc/xetex/xetexko/xetexko-doc.pdf | Bin 198351 -> 198543 bytes .../texmf-dist/doc/xetex/xetexko/xetexko-doc.tex | 4 +-- .../texmf-dist/tex/xetex/xetexko/xetexko-font.sty | 36 +++++++++++++++++++-- .../tex/xetex/xetexko/xetexko-hanging.sty | 2 +- .../texmf-dist/tex/xetex/xetexko/xetexko-josa.sty | 2 +- .../texmf-dist/tex/xetex/xetexko/xetexko-space.sty | 16 ++++----- .../tex/xetex/xetexko/xetexko-vertical.sty | 2 +- Master/texmf-dist/tex/xetex/xetexko/xetexko.sty | 5 ++- 10 files changed, 58 insertions(+), 19 deletions(-) diff --git a/Master/texmf-dist/doc/xetex/xetexko/ChangeLog b/Master/texmf-dist/doc/xetex/xetexko/ChangeLog index 2b50f350949..53821f55c3f 100644 --- a/Master/texmf-dist/doc/xetex/xetexko/ChangeLog +++ b/Master/texmf-dist/doc/xetex/xetexko/ChangeLog @@ -1,3 +1,11 @@ +2015-03-26 Dohyun Kim + + Version 2.12 + + * xetexko-space.sty: assign catcode 12 to Hangul Jamo + * xetexko.sty, xetexko-space.sty, xetexko-font.sty: fix bug #2 + regarding amsart.cls. + 2015-01-18 Dohyun Kim Version 2.11 diff --git a/Master/texmf-dist/doc/xetex/xetexko/README b/Master/texmf-dist/doc/xetex/xetexko/README index 68b43a5abb7..389d9ba4aec 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.11 (2015/01/18) +XeTeX-ko Package version 2.12 (2015/03/26) ========================================= 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 fb031f65a66..a18747c5a67 100644 Binary files a/Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.pdf and b/Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.pdf differ diff --git a/Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.tex b/Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.tex index d74da26e6f4..e8cf4d87427 100644 --- a/Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.tex +++ b/Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.tex @@ -58,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.11\quad 2015/01/18} +\date{Version 2.12\quad 2015/03/26} \maketitle \begin{quote}\small @@ -407,7 +407,7 @@ CJK 구두점의 폭을 0.5em으로 강제설정하는 것을 방지한다. 폰트가 이런 기능을 제공해야만 가능한 일이다.\footnote{% 이런 기능을 제공하는 폰트로는 윈도즈~8에 번들된 맑은고딕이 있으며 공개폰트로는 은바탕, 함초롬~LVT, Source Han Sans (본고딕), -Noto Sans CJK 등이 있다.} +Noto Sans CJK, 나눔명조옛한글, 나눔바른고딕옛한글 등이 있다.} \begin{figure} \begin{example} diff --git a/Master/texmf-dist/tex/xetex/xetexko/xetexko-font.sty b/Master/texmf-dist/tex/xetex/xetexko/xetexko-font.sty index c7e116a4ee9..557c4825442 100644 --- a/Master/texmf-dist/tex/xetex/xetexko/xetexko-font.sty +++ b/Master/texmf-dist/tex/xetex/xetexko/xetexko-font.sty @@ -1,6 +1,6 @@ % xetexko-font.sty % -% Copyright (c) 2013-2014 Dohyun Kim +% Copyright (c) 2013-2015 Dohyun Kim % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3c @@ -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}[2015/01/16 v2.10 LaTeX Font commands for XeTeX-ko] +\ProvidesPackage{xetexko-font}[2015/03/26 v2.12 LaTeX Font commands for XeTeX-ko] \let\xetexko@f@size\f@size \RequirePackage{fontspec}[2014/05/25] @@ -114,6 +114,32 @@ } \NewDocumentCommand \__xtxko_post_args:w { m m O{} } { #1 {#3} {#2} } +\cs_new:Nn \__xtxko_def_XKhan__fonts:nnn + { + \tl_if_eq:NNF #1 \relax + { + \tl_if_eq:ccT \familydefault #2 + { + \tl_if_eq:NNTF \XKhangulfont #1 + { + \tl_set:Nn #1 + { + \XK@storeltnfont + \chardef\XKcurrentfont \c_one #3 + \XK@storecjkfont + } + } + { + \tl_set:Nn #1 + { + \XK@storeltnfont + \chardef\XKcurrentfont \c_two #3 + \XK@storecjkfont + } + } + } + } + } %%%%%%%%%%%%%%%%%%%% % user font commands \DeclareDocumentCommand \setmainhangulfont { o m } @@ -123,6 +149,7 @@ \__xtxko_hangul_assign_font_opts:n {#1} \newfontfamily \kormainfont [\l_xtxko_rem_tl] {#2} \tl_put_right:NV \kormainfont \l_xtxko_font_opts_tl + \__xtxko_def_XKhan__fonts:nnn \XKhangulfont \rmdefault \kormainfont \ignorespaces } \DeclareDocumentCommand \setsanshangulfont { o m } @@ -132,6 +159,7 @@ \__xtxko_hangul_assign_font_opts:n {#1} \newfontfamily \korsansfont [\l_xtxko_rem_tl] {#2} \tl_put_right:NV \korsansfont \l_xtxko_font_opts_tl + \__xtxko_def_XKhan__fonts:nnn \XKhangulfont \sfdefault \korsansfont \ignorespaces } \DeclareDocumentCommand \setmonohangulfont { o m } @@ -139,6 +167,7 @@ \cs_new:Nn \__xtxko_setmonohangulfont:nn { \newfontfamily \kormonofont [#1] {#2} + \__xtxko_def_XKhan__fonts:nnn \XKhangulfont \ttdefault \kormonofont \ignorespaces } \DeclareDocumentCommand \setmainhanjafont { o m } @@ -148,6 +177,7 @@ \__xtxko_hanja_assign_font_opts:n {#1} \newfontfamily \hnjmainfont [\l_xtxko_rem_tl] {#2} \tl_put_right:NV \hnjmainfont \l_xtxko_font_opts_tl + \__xtxko_def_XKhan__fonts:nnn \XKhanjafont \rmdefault \hnjmainfont \ignorespaces } \DeclareDocumentCommand \setsanshanjafont { o m } @@ -157,6 +187,7 @@ \__xtxko_hanja_assign_font_opts:n {#1} \newfontfamily \hnjsansfont [\l_xtxko_rem_tl] {#2} \tl_put_right:NV \hnjsansfont \l_xtxko_font_opts_tl + \__xtxko_def_XKhan__fonts:nnn \XKhanjafont \sfdefault \hnjsansfont \ignorespaces } \DeclareDocumentCommand \setmonohanjafont { o m } @@ -164,6 +195,7 @@ \cs_new:Nn \__xtxko_setmonohanjafont:nn { \newfontfamily \hnjmonofont [#1] {#2} + \__xtxko_def_XKhan__fonts:nnn \XKhanjafont \ttdefault \hnjmonofont \ignorespaces } %% {hangul,hanja}fontspec = adhoc{hangul,hanja}font diff --git a/Master/texmf-dist/tex/xetex/xetexko/xetexko-hanging.sty b/Master/texmf-dist/tex/xetex/xetexko/xetexko-hanging.sty index f4e10166d77..1147c57da13 100644 --- a/Master/texmf-dist/tex/xetex/xetexko/xetexko-hanging.sty +++ b/Master/texmf-dist/tex/xetex/xetexko/xetexko-hanging.sty @@ -1,6 +1,6 @@ % xetexko-hanging.sty % -% Copyright (c) 2013-2014 Dohyun Kim +% Copyright (c) 2013-2015 Dohyun Kim % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3c diff --git a/Master/texmf-dist/tex/xetex/xetexko/xetexko-josa.sty b/Master/texmf-dist/tex/xetex/xetexko/xetexko-josa.sty index f76dc07e47d..04ab4319fc7 100644 --- a/Master/texmf-dist/tex/xetex/xetexko/xetexko-josa.sty +++ b/Master/texmf-dist/tex/xetex/xetexko/xetexko-josa.sty @@ -1,6 +1,6 @@ % xetexko-josa.sty % -% Copyright (c) 2013-2014 Dohyun Kim +% Copyright (c) 2013-2015 Dohyun Kim % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3c diff --git a/Master/texmf-dist/tex/xetex/xetexko/xetexko-space.sty b/Master/texmf-dist/tex/xetex/xetexko/xetexko-space.sty index c4cb0fd33ff..0290fd67ae2 100644 --- a/Master/texmf-dist/tex/xetex/xetexko/xetexko-space.sty +++ b/Master/texmf-dist/tex/xetex/xetexko/xetexko-space.sty @@ -1,6 +1,6 @@ % xetexko-space.sty % -% Copyright (c) 2013-2014 Dohyun Kim +% Copyright (c) 2013-2015 Dohyun Kim % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3c @@ -13,7 +13,7 @@ \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname ProvidesPackage\endcsname\relax\else \ProvidesPackage{xetexko-space} - [2015/01/18 v2.11 Spacings and fonts for XeTeX-ko] + [2015/03/26 v2.12 Spacings and fonts for XeTeX-ko] \fi %%% we need XeTeX > 0.997 @@ -36,6 +36,9 @@ \def\XK@assign@char@class#1#2#3{% \count@=#1\relax \loop + \ifx #3\XKhangulsyllable + \catcode\count@ = 12 % revert recent change of unicode-letters.tex + \fi \XeTeXcharclass\count@ = #3\relax \ifnum\count@<#2\relax \advance\count@\@ne \repeat @@ -289,12 +292,7 @@ %%% hangul syllables \newXeTeXintercharclass \XKhangulsyllable -\count@="AC00 -\loop - \catcode\count@ = 12 % revert recent change of unicode-letters.tex - \XeTeXcharclass\count@ = \XKhangulsyllable - \ifnum\count@<"D7A3 \advance\count@\@ne -\repeat +\XK@assign@char@class{"AC00}{"D7A3}\XKhangulsyllable % treat compatibility jamo as hangul syllable \XK@assign@char@class{"3131}{"318E}\XKhangulsyllable % leading consonants jamo as well @@ -1006,6 +1004,8 @@ \def\XK@storeprevfont{\edef\XKprevfont{\the\font}} \let\XKstoreprevfont\XKlatinfont \chardef\XKcurrentfont\z@ \XK@storeprevfont +% bug #2 : http://www.ktug.org/xe/index.php?document_srl=203582 +\let\hangfnt\relax \def\hanifnt{\hangfnt} \protected\def\latincjksymbols {\def\XKmaybehanjafont{\XKlatinfont}} \protected\def\hangulcjksymbols {\def\XKmaybehanjafont{\XKhangulfont}} diff --git a/Master/texmf-dist/tex/xetex/xetexko/xetexko-vertical.sty b/Master/texmf-dist/tex/xetex/xetexko/xetexko-vertical.sty index e94773db65e..9dcc8d3d776 100644 --- a/Master/texmf-dist/tex/xetex/xetexko/xetexko-vertical.sty +++ b/Master/texmf-dist/tex/xetex/xetexko/xetexko-vertical.sty @@ -1,6 +1,6 @@ % xetexko-vertical.sty % -% Copyright (c) 2013-2014 Dohyun Kim +% Copyright (c) 2013-2015 Dohyun Kim % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3c diff --git a/Master/texmf-dist/tex/xetex/xetexko/xetexko.sty b/Master/texmf-dist/tex/xetex/xetexko/xetexko.sty index 28d9e099c17..0447c914df3 100644 --- a/Master/texmf-dist/tex/xetex/xetexko/xetexko.sty +++ b/Master/texmf-dist/tex/xetex/xetexko/xetexko.sty @@ -1,6 +1,6 @@ % xetexko.sty % -% Copyright (c) 2013-2014 Dohyun Kim +% Copyright (c) 2013-2015 Dohyun Kim % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3c @@ -12,7 +12,7 @@ \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname ProvidesPackage\endcsname\relax\else - \ProvidesPackage{xetexko}[2015/01/16 v2.10 Typesetting Korean with XeTeX] + \ProvidesPackage{xetexko}[2015/03/26 v2.12 Typesetting Korean with XeTeX] \fi \begingroup\expandafter\expandafter\expandafter\endgroup @@ -28,7 +28,6 @@ \def\hangulfont{\font\hangfnt} \def\hanjafont {\font\hanifnt} %\hangulfont="[UnBatang]:mapping=tex-text" at 10pt - \let\hangfnt\relax \def\hanifnt{\hangfnt} %%% 수식 한글 \newfam\symmathhangul \def\setmathhangulfont#1#{\setmathhangulfont@} -- cgit v1.2.3