summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/xetex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-02-07 23:48:16 +0000
committerKarl Berry <karl@freefriends.org>2016-02-07 23:48:16 +0000
commit24c08aee6ed9b8f99826283117e78391dab3240e (patch)
tree41385b5ee7171d0c6e1df750c137f3192b2ae368 /Master/texmf-dist/tex/xetex
parent5cf9e8777154dbdf701a759384fe3bf4757ecfca (diff)
xetexko (7feb16)
git-svn-id: svn://tug.org/texlive/trunk@39619 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/xetex')
-rw-r--r--Master/texmf-dist/tex/xetex/xetexko/xetexko-font.sty4
-rw-r--r--Master/texmf-dist/tex/xetex/xetexko/xetexko-hanging.sty8
-rw-r--r--Master/texmf-dist/tex/xetex/xetexko/xetexko-josa.sty4
-rw-r--r--Master/texmf-dist/tex/xetex/xetexko/xetexko-space.sty60
-rw-r--r--Master/texmf-dist/tex/xetex/xetexko/xetexko-vertical.sty4
-rw-r--r--Master/texmf-dist/tex/xetex/xetexko/xetexko.sty4
6 files changed, 50 insertions, 34 deletions
diff --git a/Master/texmf-dist/tex/xetex/xetexko/xetexko-font.sty b/Master/texmf-dist/tex/xetex/xetexko/xetexko-font.sty
index 557c4825442..aa178fa6ffa 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-2015 Dohyun Kim <nomos at ktug org>
+% Copyright (c) 2013-2016 Dohyun Kim <nomos at ktug org>
%
% 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/03/26 v2.12 LaTeX Font commands for XeTeX-ko]
+\ProvidesPackage{xetexko-font}[2016/02/01 v2.14 LaTeX Font commands for XeTeX-ko]
\let\xetexko@f@size\f@size
\RequirePackage{fontspec}[2014/05/25]
diff --git a/Master/texmf-dist/tex/xetex/xetexko/xetexko-hanging.sty b/Master/texmf-dist/tex/xetex/xetexko/xetexko-hanging.sty
index 1147c57da13..1d26e89ce1b 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-2015 Dohyun Kim <nomos at ktug org>
+% Copyright (c) 2013-2016 Dohyun Kim <nomos at ktug org>
%
% 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}
- [2015/01/16 v2.10 Hanging punctuations for XeTeX-ko]
+ [2016/02/01 v2.14 Hanging punctuations for XeTeX-ko]
\fi
\chardef\catcodeofATcharacter\catcode`@
@@ -84,9 +84,7 @@
}%
\def\precjkopenparen@{%
\@josa@char@to@number\@let@token\count@
- \dimen@\XeTeXglyphbounds\@ne\XeTeXcharglyph\count@
- \dimen@\dimexpr\fontcharwd\font\count@-\dimen@\relax
- \ifdim\dimen@<.5em \dimen@.5em \else\advance\dimen@.1em \fi
+ \XK@side@bearing\count@\@ne
\ifx^^^^201c\@let@token
\dimen@ii\dimen@ \advance\dimen@ii-.125em
\XKH@pre@hang\dimen@ii
diff --git a/Master/texmf-dist/tex/xetex/xetexko/xetexko-josa.sty b/Master/texmf-dist/tex/xetex/xetexko/xetexko-josa.sty
index 04ab4319fc7..63ee9594e00 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-2015 Dohyun Kim <nomos at ktug org>
+% Copyright (c) 2013-2016 Dohyun Kim <nomos at ktug org>
%
% 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}[2015/01/16 v2.10 Auto-josa for XeTeX-ko]
+ \ProvidesPackage{xetexko-josa}[2016/02/01 v2.14 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 e679182321e..07481b4c578 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-2015 Dohyun Kim <nomos at ktug org>
+% Copyright (c) 2013-2016 Dohyun Kim <nomos at ktug org>
%
% 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/06/16 v2.13 Spacings and fonts for XeTeX-ko]
+ [2016/02/01 v2.14 Spacings and fonts for XeTeX-ko]
\fi
%%% we need XeTeX > 0.997
@@ -44,14 +44,28 @@
\repeat
}
-%%% default assignments (see unicode-letters.tex)
-% CJK hanja = class 1
-% CJK openings = class 2
-% CJK closings and small kana = class 3
-% others = class 0
-\chardef \XKhanja \@ne
-\chardef \XKcjkopening \tw@
-\chardef \XKsmallkana \thr@@
+% from JW
+\ifdefined\XeTeXcharclassID\else
+ \ifdefined\xtxHanGlue
+ \let\XeTeXcharclassID\@ne
+ \let\XeTeXcharclassOP\tw@
+ \let\XeTeXcharclassCL\thr@@
+ \else
+ \newXeTeXintercharclass\XeTeXcharclassID
+ \newXeTeXintercharclass\XeTeXcharclassOP
+ \newXeTeXintercharclass\XeTeXcharclassCL
+ \let\XeTeXcharclassEX\XeTeXcharclassCL
+ \let\XeTeXcharclassIS\XeTeXcharclassCL
+ \let\XeTeXcharclassNS\XeTeXcharclassCL
+ \chardef\XeTeXcharclassCM=256 %
+ \input load-unicode-xetex-classes %
+ \fi
+\fi
+
+\let \XKhanja \XeTeXcharclassID
+\let \XKcjkopening \XeTeXcharclassOP
+\let \XKsmallkana \XeTeXcharclassCL
+
\chardef \XKlatinchar \z@
\chardef \XKboundary \@cclv
@@ -90,6 +104,7 @@
%%%
\XeTeXcharclass "2018 = \XKcjkopening % ‘
\XeTeXcharclass "201C = \XKcjkopening % “
+\XeTeXcharclass "FF62 = \XKcjkopening % 「
%%% cjk closing parentheses
\newXeTeXintercharclass \XKcjkclosing
@@ -119,6 +134,7 @@
\XeTeXcharclass "FE44 = \XKcjkclosing % 』 vert
\XeTeXcharclass "3011 = \XKcjkclosing % 】
\XeTeXcharclass "FE3C = \XKcjkclosing % 】 vert
+\XeTeXcharclass "FF63 = \XKcjkclosing % 」
%%% cjk colons
\newXeTeXintercharclass \XKcjkcolon
@@ -1254,12 +1270,17 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%% cjk openings and closings
%%% considering bounding box
+\def\XK@side@bearing#1#2{% 1: char index; 2: left=1 or right=3 -> dimen@
+ \ifdim\XeTeXglyphbounds#2\XeTeXcharglyph#1>.5em
+ \dimen@.5em
+ \else
+ \dimen@\fontcharwd\font\count@
+ \fi
+}
\def\precjkopenparen{\futurelet\@let@token\precjkopenparen@}
\def\precjkopenparen@{%
\@josa@char@to@number\@let@token\count@
- \dimen@\XeTeXglyphbounds\@ne\XeTeXcharglyph\count@
- \dimen@\dimexpr\fontcharwd\font\count@-\dimen@\relax
- \ifdim\dimen@<.5em \dimen@.5em \else\advance\dimen@.1em \fi
+ \XK@side@bearing\count@\@ne
\leavevmode
\ifx\empty\xetexkocharraise\else\raise\xetexkocharraise\fi
\hbox
@@ -1274,9 +1295,7 @@
\def\precjkcloseparen{\futurelet\@let@token\precjkcloseparen@}
\def\precjkcloseparen@{%
\@josa@char@to@number\@let@token\count@
- \dimen@\XeTeXglyphbounds\thr@@\XeTeXcharglyph\count@
- \dimen@\dimexpr\fontcharwd\font\count@-\dimen@\relax
- \ifdim\dimen@<.5em \dimen@.5em \else\advance\dimen@.1em \fi
+ \XK@side@bearing\count@\thr@@
\leavevmode
\ifx\empty\xetexkocharraise\else\raise\xetexkocharraise\fi
\hbox
@@ -1294,9 +1313,7 @@
\def\precjkfullstop{\futurelet\@let@token\precjkfullstop@}
\def\precjkfullstop@{%
\@josa@char@to@number\@let@token\count@
- \dimen@\XeTeXglyphbounds\thr@@\XeTeXcharglyph\count@
- \dimen@\dimexpr\fontcharwd\font\count@-\dimen@\relax
- \ifdim\dimen@<.5em \dimen@.5em \else\advance\dimen@.1em \fi
+ \XK@side@bearing\count@\thr@@
\leavevmode
\ifx\empty\xetexkocharraise\else\raise\xetexkocharraise\fi
\hbox
@@ -1340,11 +1357,12 @@
\def\XKquaterskip {\hskip0.25em minus 0.25em }
\def\XKhalfminusquaterskip {\hskip0.5em minus 0.25em }
\def\XKthreequaterskip {\hskip0.75em minus 0.25em }
+\def\XKinterhangulpenalty {\penalty50 }
\def\XKinterhangulbreak
- {\ifcjtypeset\else\penalty50 \fi
+ {\ifcjtypeset\else\XKinterhangulpenalty\fi
\hskip\dimexpr\xetexkointerhchar + \z@\relax \XKskipstretchshrink}
-\def\XKinterhanjabreak {\ifcjtypeset\else\penalty50 \fi \XKzeroskip}
+\def\XKinterhanjabreak {\ifcjtypeset\else\XKinterhangulpenalty\fi \XKzeroskip}
\def\XKcjklatinbreak {\ifcjtypeset\XKxkanjiskip\else\XKsmallskip\fi}
\def\XKcjklatinsmallbreak {\ifcjtypeset\XKxkanjiskip\else\XKsmallsmallskip\fi}
\def\XKhalfsmallbreak {\ifcjtypeset\XKhalfskip\else\XKsmallsmallskip\fi}
diff --git a/Master/texmf-dist/tex/xetex/xetexko/xetexko-vertical.sty b/Master/texmf-dist/tex/xetex/xetexko/xetexko-vertical.sty
index 89029056a71..df350b9b223 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-2015 Dohyun Kim <nomos at ktug org>
+% Copyright (c) 2013-2016 Dohyun Kim <nomos at ktug org>
%
% 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}
- [2015/05/28 v2.13 Vertical environment for XeTeX-ko]
+ [2016/02/01 v2.14 Vertical environment for XeTeX-ko]
\fi
% do not veticalize headline/footline
diff --git a/Master/texmf-dist/tex/xetex/xetexko/xetexko.sty b/Master/texmf-dist/tex/xetex/xetexko/xetexko.sty
index 0447c914df3..0bd2d83219d 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-2015 Dohyun Kim <nomos at ktug org>
+% Copyright (c) 2013-2016 Dohyun Kim <nomos at ktug org>
%
% 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/03/26 v2.12 Typesetting Korean with XeTeX]
+ \ProvidesPackage{xetexko}[2016/02/01 v2.14 Typesetting Korean with XeTeX]
\fi
\begingroup\expandafter\expandafter\expandafter\endgroup