From 4a56770b3b932b512c21adb07c84d34889d67a39 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 5 Jul 2013 23:55:33 +0000 Subject: xetexko (4jul13) git-svn-id: svn://tug.org/texlive/trunk@31108 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/xetex/xetexko/xetexko-font.sty | 2 +- .../tex/xetex/xetexko/xetexko-hanging.sty | 2 +- .../texmf-dist/tex/xetex/xetexko/xetexko-josa.sty | 2 +- .../texmf-dist/tex/xetex/xetexko/xetexko-space.sty | 15 ++++++--- .../tex/xetex/xetexko/xetexko-vertical.sty | 38 +++++++++++++--------- Master/texmf-dist/tex/xetex/xetexko/xetexko.sty | 6 ++-- 6 files changed, 40 insertions(+), 25 deletions(-) (limited to 'Master/texmf-dist/tex/xetex/xetexko') diff --git a/Master/texmf-dist/tex/xetex/xetexko/xetexko-font.sty b/Master/texmf-dist/tex/xetex/xetexko/xetexko-font.sty index 8264204e362..892b2cfcef0 100644 --- a/Master/texmf-dist/tex/xetex/xetexko/xetexko-font.sty +++ b/Master/texmf-dist/tex/xetex/xetexko/xetexko-font.sty @@ -1,4 +1,4 @@ -% $Id: xetexko-font.sty,v 1.29 2012/10/27 10:55:09 nomos Exp $ +% xetexko-font.sty % % Copyright (c) 2013 Dohyun Kim % diff --git a/Master/texmf-dist/tex/xetex/xetexko/xetexko-hanging.sty b/Master/texmf-dist/tex/xetex/xetexko/xetexko-hanging.sty index e0cce2114d5..bb7338bdd04 100644 --- a/Master/texmf-dist/tex/xetex/xetexko/xetexko-hanging.sty +++ b/Master/texmf-dist/tex/xetex/xetexko/xetexko-hanging.sty @@ -1,4 +1,4 @@ -% $Id: xetexko-hanging.sty,v 1.9 2012/12/06 04:56:05 nomos Exp $ +% xetexko-hanging.sty % % Copyright (c) 2013 Dohyun Kim % diff --git a/Master/texmf-dist/tex/xetex/xetexko/xetexko-josa.sty b/Master/texmf-dist/tex/xetex/xetexko/xetexko-josa.sty index 6d8bb6ffe95..23894a196a5 100644 --- a/Master/texmf-dist/tex/xetex/xetexko/xetexko-josa.sty +++ b/Master/texmf-dist/tex/xetex/xetexko/xetexko-josa.sty @@ -1,4 +1,4 @@ -% $Id: xetexko-josa.sty,v 1.11 2011/03/14 03:47:59 nomos Exp $ +% xetexko-josa.sty % % Copyright (c) 2013 Dohyun Kim % diff --git a/Master/texmf-dist/tex/xetex/xetexko/xetexko-space.sty b/Master/texmf-dist/tex/xetex/xetexko/xetexko-space.sty index d0978bde015..795f04fea34 100644 --- a/Master/texmf-dist/tex/xetex/xetexko/xetexko-space.sty +++ b/Master/texmf-dist/tex/xetex/xetexko/xetexko-space.sty @@ -1,4 +1,4 @@ -% $Id: xetexko-space.sty,v 1.29 2012/10/27 10:55:09 nomos Exp $ +% xetexko-space.sty % % Copyright (c) 2013 Dohyun Kim % @@ -13,7 +13,7 @@ \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname ProvidesPackage\endcsname\relax\else \ProvidesPackage{xetexko-space} - [2013/03/27 v2.0 Spacings and fonts for XeTeX-ko] + [2013/07/03 v2.1 Spacings and fonts for XeTeX-ko] \fi %%% we need XeTeX > 0.997 @@ -1484,7 +1484,14 @@ % etc commands \let\enablejamoautojosa\relax % enabled already +\protected\def\disablejamoautojosa{% newly added by v2.1 + \XeTeXinterchartoks\XKhangulsyllable\XKhanguljungjong = {}% + \XeTeXinterchartoks\XKhangulchosong \XKhanguljungjong = {}% + \XeTeXinterchartoks\XKhanguljungjong\XKhanguljungjong = {}% +} + \protected\def\disableautojosa{% + \disablejamoautojosa \let\XKbeginboundary\relax \let\XKendboundary\relax \let\XKlastchar\relax @@ -1578,7 +1585,7 @@ \def\setmathhangulblock#1#2{% \count@ "#1 \loop - \XeTeXmathcode\count@ = 7 \symmathhangul \count@ + \Umathcode\count@ = 7 \symmathhangul \count@ \ifnum\count@<"#2 \advance\count@\@ne \repeat} @@ -1628,6 +1635,6 @@ %%% frenchspacing is default \frenchspacing -\def\hellipsis{^^^^2026^^^^2026} +\def\hellipsis{^^^^2026\kern-.1ex^^^^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 0e82f313a23..fb816cfcfd2 100644 --- a/Master/texmf-dist/tex/xetex/xetexko/xetexko-vertical.sty +++ b/Master/texmf-dist/tex/xetex/xetexko/xetexko-vertical.sty @@ -1,4 +1,4 @@ -% $Id: xetexko-vertical.sty,v 1.12 2012/12/13 09:13:00 nomos Exp $ +% xetexko-vertical.sty % % Copyright (c) 2013 Dohyun Kim % @@ -13,27 +13,35 @@ \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname ProvidesPackage\endcsname\relax\else \ProvidesPackage{xetexko-vertical} - [2013/03/27 v2.0 Vertical environment for XeTeX-ko] + [2013/07/03 v2.1 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 -\unless\ifcsname AtBeginDocument\endcsname\def\AtBeginDocument#1{#1}\fi -\unless\ifcsname @onlypreamble\endcsname\def\@onlypreamble#1{}\fi % do not veticalize headline/footline -\protected\def\verticaltypesetting{% - \AtBeginDocument{\XK@vertical@spacing}% - \maxdepth\z@ - \dimen@\textwidth - \textwidth\textheight - \textheight\dimen@ - \edef\@outputpage{% - \unexpanded{\xetexko@rotatebox\@outputbox\textwidth\textheight}% - \unexpanded\expandafter{\@outputpage}}% -} -\@onlypreamble\verticaltypesetting +\ifdefined\ProvidesPackage % for latex + \protected\def\verticaltypesetting{% + \AtBeginDocument{\XK@vertical@spacing}% + \maxdepth\z@ + \dimen@\textwidth + \textwidth\textheight + \textheight\dimen@ + \edef\@outputpage{% + \unexpanded{\xetexko@rotatebox\@outputbox\textwidth\textheight}% + \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{% \ifvbox#1\count@\@ne\else\count@\z@\fi diff --git a/Master/texmf-dist/tex/xetex/xetexko/xetexko.sty b/Master/texmf-dist/tex/xetex/xetexko/xetexko.sty index 5787c502425..dbd9fdc87ab 100644 --- a/Master/texmf-dist/tex/xetex/xetexko/xetexko.sty +++ b/Master/texmf-dist/tex/xetex/xetexko/xetexko.sty @@ -1,4 +1,4 @@ -% $Id: xetexko.sty,v 1.7 2012/10/27 10:04:19 nomos Exp $ +% xetexko.sty % % Copyright (c) 2013 Dohyun Kim % @@ -42,7 +42,7 @@ \expandafter\endinput \fi -\ProvidesPackage{xetexko}[2013/03/27 v2.0 Typesetting Korean with XeLaTeX] +\ProvidesPackage{xetexko}[2013/07/03 v2.1 Typesetting Korean with XeLaTeX] \newif\if@hangul \newif\if@hanja @@ -58,7 +58,7 @@ \RequirePackage{xetexko-vertical} \RequirePackage{kolabels-utf} -\if@hangul \RequirePackage{konames-utf} \fi +\if@hangul\AtBeginDocument{\RequirePackage{konames-utf}}\fi \AtBeginDocument{ % for ulem package -- cgit v1.2.3