From 6973e20e83544bed3652e7b57886f39a8ab60e23 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 24 Mar 2019 21:11:42 +0000 Subject: luatexko (24mar19) git-svn-id: svn://tug.org/texlive/trunk@50570 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/luatex/luatexko/luatexko-core.sty | 16 +++++---------- .../tex/luatex/luatexko/luatexko-normalize.lua | 6 +++--- .../tex/luatex/luatexko/luatexko-uhc2utf8.lua | 6 +++--- Master/texmf-dist/tex/luatex/luatexko/luatexko.lua | 24 +++++++++++++--------- Master/texmf-dist/tex/luatex/luatexko/luatexko.sty | 4 ++-- 5 files changed, 27 insertions(+), 29 deletions(-) (limited to 'Master/texmf-dist/tex/luatex/luatexko') 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 +% Copyright (c) 2013-2019 Dohyun Kim % Soojin Nam % % 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 +-- Copyright (c) 2013-2019 Dohyun Kim -- Soojin Nam -- -- 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 +-- Copyright (c) 2013-2019 Dohyun Kim -- Soojin Nam -- -- 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 +-- Copyright (c) 2013-2019 Dohyun Kim -- Soojin Nam -- -- 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 +% Copyright (c) 2013-2019 Dohyun Kim % Soojin Nam % % 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 -- cgit v1.2.3