From a7648b31af4e6d4462df928a8fb89b05482b637e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 6 Apr 2018 21:37:37 +0000 Subject: luatexko (6apr18) git-svn-id: svn://tug.org/texlive/trunk@47338 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/xetex/xetexko/ChangeLog | 11 ++++ Master/texmf-dist/doc/xetex/xetexko/README | 2 +- .../texmf-dist/doc/xetex/xetexko/xetexko-doc.pdf | Bin 222585 -> 222685 bytes .../texmf-dist/doc/xetex/xetexko/xetexko-doc.tex | 8 +-- .../texmf-dist/tex/xetex/xetexko/xetexko-font.sty | 8 +-- .../tex/xetex/xetexko/xetexko-hanging.sty | 4 +- .../texmf-dist/tex/xetex/xetexko/xetexko-josa.sty | 4 +- .../texmf-dist/tex/xetex/xetexko/xetexko-space.sty | 9 ++-- .../tex/xetex/xetexko/xetexko-vertical.sty | 56 ++++++++++++--------- Master/texmf-dist/tex/xetex/xetexko/xetexko.sty | 4 +- 10 files changed, 62 insertions(+), 44 deletions(-) diff --git a/Master/texmf-dist/doc/xetex/xetexko/ChangeLog b/Master/texmf-dist/doc/xetex/xetexko/ChangeLog index 17388111b46..31d9d1e8c72 100644 --- a/Master/texmf-dist/doc/xetex/xetexko/ChangeLog +++ b/Master/texmf-dist/doc/xetex/xetexko/ChangeLog @@ -1,3 +1,14 @@ +2018-04-06 Dohyun Kim + + Version 2.18 + + * step copyright year + * xetexko-space.sty: synchronize \XKskipstetchshrink with luatexko; + suppress glue stretching/shrinking under \disablehangulspacing; + \xetexkohu is now 0.05em by default + * xetexko-font.sty: use glueexpr + * xetexko-vertical.sty: minor bug fix + 2017-09-29 Dohyun Kim Version 2.17 diff --git a/Master/texmf-dist/doc/xetex/xetexko/README b/Master/texmf-dist/doc/xetex/xetexko/README index 75a85642988..9475574f137 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.17 (2017/09/29) +XeTeX-ko Package version 2.18 (2018/04/06) ========================================= 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 e9a5a855aaf..5ac111bb6d8 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 4e4f26bbefe..f58da6eefc8 100644 --- a/Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.tex +++ b/Master/texmf-dist/doc/xetex/xetexko/xetexko-doc.tex @@ -59,7 +59,7 @@ \title{\xetexko\ 간단 매뉴얼} \author{Dohyun Kim \normalsize <\texttt{nomos at ktug org}> \and \normalsize <\url{http://github.com/dohyunkim/xetexko}>} -\date{Version 2.17\quad 2017/09/29} +\date{Version 2.18\quad 2018/04/06} \maketitle \begin{quote}\small @@ -90,7 +90,7 @@ \item Variation Selector를 이용한 한자 변형 글리프 접근을 허용한다. \item[v2.7]--- \item \hyperref[sec:fontcmds] - {main/sans hangul/hanja 글꼴에는 디폴트 옵션으로 + {main/sans hangul/hanja 글꼴에는 디폴트 옵션 \texttt{Ligatures=TeX}이 주어진다.} \item \hyperref[sec:fontopts] {\cs{defaulthangulfontfeatures}와 \cs{defaulthanjafontfeatures} @@ -279,7 +279,7 @@ fontspec과 마찬가지로 각 명령의 끝에 `s'를 붙여도 된다. \begin{description}\itemsep0pt \item[hu, InterLatinCJK] 영문자와 한글 사이 간격을 지시한다. - 영문 괄호와 한글 사이 간격은 그 두 배이다. 기본값 0.06em. + 영문 괄호와 한글 사이 간격은 그 두 배이다. 기본값 0.05em. \item[interhchar, InterHangul] {\addhangulfontfeature{interhchar=0.3em} 한글 자간을} 지시한다.% \footnote{한자 자간 옵션은 제공하지 않는다. @@ -328,7 +328,7 @@ fontspec과 마찬가지로 각 명령의 끝에 `s'를 붙여도 된다. \begin{plaintex} 플레인텍에서는 다음과 같은 방법으로 제어할 수 있다. 기본값은 \LaTeX에서와 같다. \begin{verbatim} - \def\xetexkohu{0.06em } + \def\xetexkohu{0.05em } \def\xetexkointerhchar{-0.04em } \def\xetexkocharraise{-0.1ex } \def\xetexkolowerperiod{0.15ex } diff --git a/Master/texmf-dist/tex/xetex/xetexko/xetexko-font.sty b/Master/texmf-dist/tex/xetex/xetexko/xetexko-font.sty index 9c7790fc514..bd994ca0a43 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-2017 Dohyun Kim +% Copyright (c) 2013-2018 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}[2017/09/29 v2.17 LaTeX Font commands for XeTeX-ko] +\ProvidesPackage{xetexko-font}[2018/04/06 v2.18 LaTeX Font commands for XeTeX-ko] \let\xetexko@f@size\f@size \RequirePackage{fontspec}[2014/05/25] @@ -43,7 +43,7 @@ \tl_clear:N \xetexkoquoteraise \tl_clear:N \xetexkoquotewidth \tl_clear:N \xetexkocharraise - \tl_set:Nn \xetexkohu {0.06em} + \tl_set:Nn \xetexkohu {0.05em} \tl_set:Nn \xetexkopostmathskip {\dim_eval:n {\xetexkohu*2}} } \cs_new:Nn \__xtxko_add_font_opt:Nn @@ -621,7 +621,7 @@ \if@hangul \linespread{1.3888} \footnotesep=1.3888\footnotesep - \skip\footins=1.3888\skip\footins plus6pt minus3pt + \skip\footins=\glueexpr\skip\footins/72*100\relax % frenchspacing is default \frenchspacing \fi diff --git a/Master/texmf-dist/tex/xetex/xetexko/xetexko-hanging.sty b/Master/texmf-dist/tex/xetex/xetexko/xetexko-hanging.sty index f8441bcc608..f413a14a865 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-2017 Dohyun Kim +% Copyright (c) 2013-2018 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-hanging} - [2017/02/06 v2.16 Hanging punctuations for XeTeX-ko] + [2018/04/06 v2.18 Hanging punctuations for XeTeX-ko] \fi \chardef\catcodeofATcharacter\catcode`@ diff --git a/Master/texmf-dist/tex/xetex/xetexko/xetexko-josa.sty b/Master/texmf-dist/tex/xetex/xetexko/xetexko-josa.sty index 95c5574fa29..9178213f4a8 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-2017 Dohyun Kim +% Copyright (c) 2013-2018 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-josa}[2017/02/06 v2.16 Auto-josa for XeTeX-ko] + \ProvidesPackage{xetexko-josa}[2018/04/06 v2.18 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 4cc68c329c8..7e11feca9f3 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-2017 Dohyun Kim +% Copyright (c) 2013-2018 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} - [2017/02/06 v2.16 Spacings and fonts for XeTeX-ko] + [2018/04/06 v2.18 Spacings and fonts for XeTeX-ko] \fi %%% we need XeTeX > 0.997 @@ -1064,7 +1064,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % options regarding micro-spacing -\def\xetexkohu {0.06em } +\def\xetexkohu {0.05em } \def\xetexkointerhchar {} \def\xetexkolowerperiod {} \def\xetexkolowerquestion {} @@ -1323,7 +1323,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % various spaces -\def\XKskipstretchshrink {plus .0625em minus .0625ex} +\def\XKskipstretchshrink {plus .04em minus .02em} \def\XKzeroskip {\hskip\z@\XKskipstretchshrink} \def\XKsmallskip {\hskip\dimexpr (\xetexkohu + \z@) * \tw@ \relax \XKskipstretchshrink} @@ -1512,6 +1512,7 @@ } \protected\def\disablehangulspacing{% all micro-spacing is 0pt + \let\XKskipstretchshrink\relax \let\precjkopenparen \relax \let\postcjkopenparen \relax \let\precjkcloseparen\relax \let\postcjkcloseparen\relax \let\precjkfullstop \relax \let\postcjkfullstop \relax diff --git a/Master/texmf-dist/tex/xetex/xetexko/xetexko-vertical.sty b/Master/texmf-dist/tex/xetex/xetexko/xetexko-vertical.sty index bd72f32f767..f94fed2b2a9 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-2017 Dohyun Kim +% Copyright (c) 2013-2018 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-vertical} - [2017/02/06 v2.16 Vertical environment for XeTeX-ko] + [2018/04/06 v2.18 Vertical environment for XeTeX-ko] \fi % do not veticalize headline/footline @@ -63,29 +63,35 @@ \let\xk@horiz@precjkopenparen \precjkopenparen \let\xk@horiz@precjkcloseparen\precjkcloseparen \let\xk@horiz@precjkfullstop \precjkfullstop - \def\precjkopenparen {\leavevmode - \ifx\empty\xetexkocharraise\else\raise\xetexkocharraise\fi - \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 - \ifx\XKdisablecjksymbolspacing\empty\else - to\XK@vert@half@em - \fi - \bgroup}% - \def\precjkfullstop {\leavevmode - \ifx\empty\xetexkocharraise\else\raise\xetexkocharraise\fi - \hbox - \ifx\XKdisablecjksymbolspacing\empty\else - to\XK@vert@half@em - \fi - \bgroup}% + \ifx\precjkopenparen\relax\else + \def\precjkopenparen {\leavevmode + \ifx\empty\xetexkocharraise\else\raise\xetexkocharraise\fi + \hbox + \ifx\XKdisablecjksymbolspacing\empty + \bgroup + \else + to\XK@vert@half@em \bgroup \hss + \fi + }% + \fi + \ifx\precjkcloseparen\relax\else + \def\precjkcloseparen{\leavevmode + \ifx\empty\xetexkocharraise\else\raise\xetexkocharraise\fi + \hbox + \ifx\XKdisablecjksymbolspacing\empty\else + to\XK@vert@half@em + \fi + \bgroup}% + \fi + \ifx\precjkfullstop\relax\else + \def\precjkfullstop {\leavevmode + \ifx\empty\xetexkocharraise\else\raise\xetexkocharraise\fi + \hbox + \ifx\XKdisablecjksymbolspacing\empty\else + to\XK@vert@half@em + \fi + \bgroup}% + \fi \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 1684773936b..c5cceaeec00 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-2017 Dohyun Kim +% Copyright (c) 2013-2018 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}[2017/02/06 v2.16 Typesetting Korean with XeTeX] + \ProvidesPackage{xetexko}[2018/04/06 v2.18 Typesetting Korean with XeTeX] \fi \begingroup\expandafter\expandafter\expandafter\endgroup -- cgit v1.2.3