summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-03-24 21:11:42 +0000
committerKarl Berry <karl@freefriends.org>2019-03-24 21:11:42 +0000
commit6973e20e83544bed3652e7b57886f39a8ab60e23 (patch)
tree7341837e048471bbcb11d6468cb50c69258e4fe0
parent9f82b32a5ded5452366c9994f59fac1b2e45ab57 (diff)
luatexko (24mar19)
git-svn-id: svn://tug.org/texlive/trunk@50570 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/luatex/luatexko/ChangeLog9
-rw-r--r--Master/texmf-dist/doc/luatex/luatexko/README2
-rw-r--r--Master/texmf-dist/doc/luatex/luatexko/luatexko-doc.pdfbin230807 -> 232572 bytes
-rw-r--r--Master/texmf-dist/doc/luatex/luatexko/luatexko-doc.tex25
-rw-r--r--Master/texmf-dist/tex/luatex/luatexko/luatexko-core.sty16
-rw-r--r--Master/texmf-dist/tex/luatex/luatexko/luatexko-normalize.lua6
-rw-r--r--Master/texmf-dist/tex/luatex/luatexko/luatexko-uhc2utf8.lua6
-rw-r--r--Master/texmf-dist/tex/luatex/luatexko/luatexko.lua24
-rw-r--r--Master/texmf-dist/tex/luatex/luatexko/luatexko.sty4
9 files changed, 51 insertions, 41 deletions
diff --git a/Master/texmf-dist/doc/luatex/luatexko/ChangeLog b/Master/texmf-dist/doc/luatex/luatexko/ChangeLog
index dc5b4b8adec..25586c3b0a9 100644
--- a/Master/texmf-dist/doc/luatex/luatexko/ChangeLog
+++ b/Master/texmf-dist/doc/luatex/luatexko/ChangeLog
@@ -1,3 +1,12 @@
+2019-03-24 Dohyun Kim <nomos at ktug org>
+
+ Version 1.23
+
+ * luatexko.lua: change post-linebreak callback from
+ 'post_linebreak_filter' to 'hpack_filter' with groupcode restriction.
+ * luatex-core.sty: remove '\pdffontsize' and replace it with a
+ more suitable equivalent.
+
2018-11-09 Dohyun Kim <nomos at ktug org>
Version 1.22
diff --git a/Master/texmf-dist/doc/luatex/luatexko/README b/Master/texmf-dist/doc/luatex/luatexko/README
index 9cf0fd18642..828e5ed1268 100644
--- a/Master/texmf-dist/doc/luatex/luatexko/README
+++ b/Master/texmf-dist/doc/luatex/luatexko/README
@@ -1,4 +1,4 @@
-LuaTeX-ko Package version 1.22 (2018/11/09)
+LuaTeX-ko Package version 1.23 (2019/03/24)
===========================================
This is a Lua(La)TeX macro package that supports typesetting Korean
diff --git a/Master/texmf-dist/doc/luatex/luatexko/luatexko-doc.pdf b/Master/texmf-dist/doc/luatex/luatexko/luatexko-doc.pdf
index 6eec933da27..07df87b0014 100644
--- a/Master/texmf-dist/doc/luatex/luatexko/luatexko-doc.pdf
+++ b/Master/texmf-dist/doc/luatex/luatexko/luatexko-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/luatex/luatexko/luatexko-doc.tex b/Master/texmf-dist/doc/luatex/luatexko/luatexko-doc.tex
index 9834ce88cab..1685f6d28bd 100644
--- a/Master/texmf-dist/doc/luatex/luatexko/luatexko-doc.tex
+++ b/Master/texmf-dist/doc/luatex/luatexko/luatexko-doc.tex
@@ -17,6 +17,7 @@
AutoFakeSlant,
Script=Hangul,
Language=Korean,
+ LocalForms=On,
UprightFont=* Light,
BoldFont=* Bold,
InterLatinCJK=.125em,
@@ -55,14 +56,16 @@
\def\hemph#1{\textsf{\bfseries #1}}
\def\cs#1{\texttt{\textbackslash\detokenize{#1}}}
\def\ldots{$\dots$}
+\registerpunctuations{`-}
\widowpenalty10000 \clubpenalty10000
+\automatichyphenmode=1 % for emdash in tl2019 pretest
\begin{document}
\title{\luatexko\ 간단 매뉴얼}
\author{Dohyun Kim \normalsize |<nomos at ktug org>| \and
Soojin Nam \normalsize |<jsunam at gmail com>| \and
\normalsize <\url{http://github.com/dohyunkim/luatexko}>}
-\date{Version 1.22\quad 2018/11/09}
+\date{Version 1.23\quad 2019/03/24}
\maketitle
\begin{quote}\small
@@ -142,7 +145,7 @@ CP949 인코딩에 관해서는 제\ref{sec:uhcencoding}절 참조.
\end{verbatim}
\cs{adhochangulfont} \cs{adhochanjafont} \cs{addhocfallbackfont}는
마지막 줄 명령들의 다른 이름들이다.
-첫 두 줄의 명령들, 즉 main/sans hangul/hanja/fallback 글꼴에는
+첫 두 줄, 즉 main/sans hangul/hanja/fallback 글꼴에는
|Ligatures=TeX| 옵션이 자동으로 주어진다.
\begin{itemize}\item[]
플레인텍에서 한글 글꼴 설정은 영문 글꼴 지정하는 방식과 거의 같다.
@@ -445,15 +448,15 @@ ulem 패키지가 \luatexko와 궁합이 잘 맞지 않아{\small (줄바꿈에
명령을 따로 제공한다. 플레인텍에서도 쓸 수 있다.
\bigskip
-\halign{\qquad#\hfil&\quad$\Rightarrow$\quad#\hfil\cr
-\cs{uline{밑줄을 그을 수 있다}}&\uline{밑줄을 그을 수 있다}\cr
-\cs{sout{취소선을 그을 수 있다}}&\sout{취소선을 그을 수 있다}\cr
-\cs{uuline{밑줄을 두 줄 긋는다}}&\uuline{밑줄을 두 줄 긋는다}\cr
-\cs{xout{빗금으로 취소할 수 있다}}&\xout{빗금으로 취소할 수 있다}\cr
-\cs{uwave{물결표로 밑줄을 삼는다}}&\uwave{물결표로 밑줄을 삼는다}\cr
-\cs{dashuline{대시로 밑줄을 삼는다}}&\dashuline{대시로 밑줄을 삼는다}\cr
-\cs{dotuline{밑줄을 점선으로 긋는다}}&\dotuline{밑줄을 점선으로 긋는다}\cr
-}
+\begin{tabular}{l@{\quad$\Rightarrow$\quad}l}
+\cs{uline{밑줄을 그을 수 있다}}&\uline{밑줄을 그을 수 있다}\\
+\cs{sout{취소선을 그을 수 있다}}&\sout{취소선을 그을 수 있다}\\
+\cs{uuline{밑줄을 두 줄 긋는다}}&\uuline{밑줄을 두 줄 긋는다}\\
+\cs{xout{빗금으로 취소할 수 있다}}&\xout{빗금으로 취소할 수 있다}\\
+\cs{uwave{물결표로 밑줄을 삼는다}}&\uwave{물결표로 밑줄을 삼는다}\\
+\cs{dashuline{대시로 밑줄을 삼는다}}&\dashuline{대시로 밑줄을 삼는다}\\
+\cs{dotuline{밑줄을 점선으로 긋는다}}&\dotuline{밑줄을 점선으로 긋는다}\\
+\end{tabular}
\bigskip
관련하여 다음 설정을 할 수 있다.
diff --git a/Master/texmf-dist/tex/luatex/luatexko/luatexko-core.sty b/Master/texmf-dist/tex/luatex/luatexko/luatexko-core.sty
index 59a485e7574..5572bc4ff06 100644
--- a/Master/texmf-dist/tex/luatex/luatexko/luatexko-core.sty
+++ b/Master/texmf-dist/tex/luatex/luatexko/luatexko-core.sty
@@ -1,6 +1,6 @@
% luatexko-core.sty
%
-% Copyright (c) 2013-2018 Dohyun Kim <nomos at ktug org>
+% Copyright (c) 2013-2019 Dohyun Kim <nomos at ktug org>
% Soojin Nam <jsunam at gmail com>
%
% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
\ifcsname ifpdf\endcsname\else \input ifpdf.sty \fi
\catcode`@ = 11
\else
- \ProvidesPackage{luatexko-core}[2018/11/09 v1.22 Typesetting Korean with LuaTeX]
+ \ProvidesPackage{luatexko-core}[2019/03/24 v1.23 Typesetting Korean with LuaTeX]
\RequirePackage{luaotfload}[2016/04/21]
\RequirePackage{ifpdf}
\fi
@@ -31,12 +31,7 @@
\let\scantextokens\luatexscantextokens
\let\luaescapestring\luatexluaescapestring
\fi
-\ifdefined\pdffontsize\else % luatex 0.87
- \ifpdf
- \def\pdffontsize{\pdffeedback fontsize}
- \else
- \def\pdffontsize{\the\fontdimen6 }
- \fi
+\ifdefined\pdfliteral\else % luatex 0.87
\protected\def\pdfliteral{\pdfextension literal}
\fi
@@ -136,8 +131,7 @@
\setbox\tw@\hbox{% ruby
\ifdefined\rubyfont \rubyfont \fi
\ifcsname selectfont\endcsname % latex
- \expandafter\dimen@\pdffontsize\font
- \dimen@\rubysize\dimen@
+ \dimen@\dimexpr\rubysize em\relax
\fontsize\dimen@\dimen@\selectfont
\else % plain
\luatexko@resize@font\font\resized@font\font\rubysize
@@ -166,7 +160,7 @@
\def\luatexko@resize@font#1#2#3#4{%
\begingroup
\edef\x@{\noexpand\rem@vesizepart\fontname#3\detokenize{ at}\noexpand\end}%
- \edef\y@{\endgroup#1\noexpand#2 \x@\space at#4\dimexpr\pdffontsize#3\relax}%
+ \edef\y@{\endgroup#1\noexpand#2 \x@\space at#4\dimexpr\fontdimen6 #3\relax}%
\y@#2}
\fi
diff --git a/Master/texmf-dist/tex/luatex/luatexko/luatexko-normalize.lua b/Master/texmf-dist/tex/luatex/luatexko/luatexko-normalize.lua
index 039d81bb0cb..b791a2497ff 100644
--- a/Master/texmf-dist/tex/luatex/luatexko/luatexko-normalize.lua
+++ b/Master/texmf-dist/tex/luatex/luatexko/luatexko-normalize.lua
@@ -1,6 +1,6 @@
-- luatexko-normalize.lua
--
--- Copyright (c) 2013-2018 Dohyun Kim <nomos at ktug org>
+-- Copyright (c) 2013-2019 Dohyun Kim <nomos at ktug org>
-- Soojin Nam <jsunam at gmail com>
--
-- This work may be distributed and/or modified under the
@@ -13,8 +13,8 @@
luatexbase.provides_module({
name = "luatexko-normalize",
- version = "1.19",
- date = "2018/04/06",
+ version = "1.23",
+ date = "2019/03/24",
author = "Dohyun Kim, Soojin Nam",
description = "Hangul normalization",
license = "LPPL v1.3+",
diff --git a/Master/texmf-dist/tex/luatex/luatexko/luatexko-uhc2utf8.lua b/Master/texmf-dist/tex/luatex/luatexko/luatexko-uhc2utf8.lua
index c6eb4f13842..70150f346ea 100644
--- a/Master/texmf-dist/tex/luatex/luatexko/luatexko-uhc2utf8.lua
+++ b/Master/texmf-dist/tex/luatex/luatexko/luatexko-uhc2utf8.lua
@@ -1,6 +1,6 @@
-- luatexko-uhc2utf8.lua
--
--- Copyright (c) 2013-2018 Dohyun Kim <nomos at ktug org>
+-- Copyright (c) 2013-2019 Dohyun Kim <nomos at ktug org>
-- Soojin Nam <jsunam at gmail com>
--
-- This work may be distributed and/or modified under the
@@ -13,8 +13,8 @@
luatexbase.provides_module({
name = "luatexko-uhc2utf8",
- version = "1.19",
- date = "2018/04/06",
+ version = "1.23",
+ date = "2019/03/24",
author = "Dohyun Kim, Soojin Nam",
description = "UHC (CP949) input encoding",
license = "LPPL v1.3+",
diff --git a/Master/texmf-dist/tex/luatex/luatexko/luatexko.lua b/Master/texmf-dist/tex/luatex/luatexko/luatexko.lua
index f7bc8eef39f..ce98b315257 100644
--- a/Master/texmf-dist/tex/luatex/luatexko/luatexko.lua
+++ b/Master/texmf-dist/tex/luatex/luatexko/luatexko.lua
@@ -1,6 +1,6 @@
-- luatexko.lua
--
--- Copyright (c) 2013-2018 Dohyun Kim <nomos at ktug org>
+-- Copyright (c) 2013-2019 Dohyun Kim <nomos at ktug org>
-- Soojin Nam <jsunam at gmail com>
--
-- This work may be distributed and/or modified under the
@@ -13,8 +13,8 @@
luatexbase.provides_module {
name = 'luatexko',
- date = '2018/11/09',
- version = '1.22',
+ date = '2019/03/24',
+ version = '1.23',
description = 'Korean linebreaking and font-switching',
author = 'Dohyun Kim, Soojin Nam',
license = 'LPPL v1.3+',
@@ -1866,6 +1866,7 @@ local function after_linebreak_underline(head,glueorder,glueset,gluesign,ulstart
head = draw_underline(head,curr,glueset,gluesign,glueorder,ubox,start)
ulstart[attr] = nil
end
+ d_unset_attribute(curr,luakoulineattr)
end
end
end
@@ -1893,13 +1894,16 @@ add_to_callback('vpack_filter', function(head)
return d_tonode(head)
end, 'luatexko.vpack_filter')
-add_to_callback("post_linebreak_filter", function(head)
- head = d_todirect(head)
- if texcount["luakodotemphcnt"]>0 then head = after_linebreak_dotemph(head) end
- if texcount["luakorubyattrcnt"]>0 then after_linebreak_ruby(head) end
- if texcount["luakoulineboxcnt"]>0 then head = after_linebreak_underline(head) end
- return d_tonode(head)
-end, 'luatexko.post_linebreak_filter')
+add_to_callback('hpack_filter', function(head, groupcode)
+ if groupcode == "align_set" then
+ head = d_todirect(head)
+ if texcount["luakodotemphcnt"]>0 then head = after_linebreak_dotemph(head) end
+ if texcount["luakorubyattrcnt"]>0 then after_linebreak_ruby(head) end
+ if texcount["luakoulineboxcnt"]>0 then head = after_linebreak_underline(head) end
+ head = d_tonode(head)
+ end
+ return head
+end, 'luatexko.hpack_filter.postlinebreak')
------------------------------------
diff --git a/Master/texmf-dist/tex/luatex/luatexko/luatexko.sty b/Master/texmf-dist/tex/luatex/luatexko/luatexko.sty
index b4595612eab..e229b58fbfc 100644
--- a/Master/texmf-dist/tex/luatex/luatexko/luatexko.sty
+++ b/Master/texmf-dist/tex/luatex/luatexko/luatexko.sty
@@ -1,6 +1,6 @@
% luatexko.sty
%
-% Copyright (c) 2013-2018 Dohyun Kim <nomos at ktug org>
+% Copyright (c) 2013-2019 Dohyun Kim <nomos at ktug org>
% Soojin Nam <jsunam at gmail com>
%
% This work may be distributed and/or modified under the
@@ -23,7 +23,7 @@
\expandafter\endinput
\fi
-\ProvidesPackage{luatexko}[2018/11/09 v1.22 Typesetting Korean with LuaLaTeX]
+\ProvidesPackage{luatexko}[2019/03/24 v1.23 Typesetting Korean with LuaLaTeX]
\ifdefined\adjustspacing\else % luatex < 0.87
\let\adjustspacing\pdfadjustspacing