diff options
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexko/luatexko-core.sty')
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexko/luatexko-core.sty | 63 |
1 files changed, 30 insertions, 33 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexko/luatexko-core.sty b/Master/texmf-dist/tex/luatex/luatexko/luatexko-core.sty index bff0ddebdcc..6984b79d460 100644 --- a/Master/texmf-dist/tex/luatex/luatexko/luatexko-core.sty +++ b/Master/texmf-dist/tex/luatex/luatexko/luatexko-core.sty @@ -14,8 +14,8 @@ \input luaotfload.sty \catcode`@ = 11 \else - \ProvidesPackage{luatexko-core}[2013/05/19 v1.1 Typesetting Korean with LuaTeX] - \RequirePackage{luaotfload} + \ProvidesPackage{luatexko-core}[2013/07/03 v1.2 Typesetting Korean with LuaTeX] + \RequirePackage{luaotfload}[2013/05/23] \fi %% attributes @@ -95,13 +95,19 @@ \vrule width\z@ height.88em depth\z@\relax #1}% \setbox\tw@\hbox{% ruby \ifdefined\rubyfont \rubyfont \fi - \expandafter\dimen@\pdffontsize\the\font - \dimen@\rubysize\dimen@ \ifcsname selectfont\endcsname + \expandafter\dimen@\pdffontsize\font + \dimen@\rubysize\dimen@ \fontsize\dimen@\dimen@\selectfont \else \ifdefined\rubyfont \else - \resizecurrentfont{\the\dimen@}% + \luatexko@resize@font\font\resized@font\font\rubysize + \ifdefined\hangul@font + \luatexko@resize@font\hangulfont{}\hangul@font\rubysize + \fi + \ifdefined\hanja@font + \luatexko@resize@font\hanjafont{}\hanja@font\rubysize + \fi \fi \fi #2}\ht\tw@\z@\dp\tw@\z@ \directlua{% @@ -114,23 +120,15 @@ \ifcsname selectfont\endcsname\else % font resize under plain tex - % ex: \resizecurrentfont{9pt} - \def\resizecurrentfont#1{% - \edef\curr@font@name{\directlua{ - local f = font.current() - f = f and fonts.hashes.identifiers[f] - f = f and f.properties and f.properties.name - if not f then - f = "\fontname\font" - f = string.gsub(f," at .+","") - end - if f then - tex.sprint(f) - else - error("cannot get current font name") - end - }}% - \font\resized@font={\curr@font@name} at #1\resized@font} + \def\luatexko@resize@font#1#2#3#4{% + \expandafter\dimen@\pdffontsize#3\relax + \edef\luatexko@tmp@fontname{% + \directlua{ + local f = [===[\fontname#3]===] + f = string.gsub(f," at .+","") + tex.sprint(f) }}% + #1#2=\luatexko@tmp@fontname\space at #4\dimen@ + #2} \fi %% vertical typesetting @@ -147,7 +145,6 @@ \setbox\z@\vbox\bgroup \hsize#1\relax \luatexko@vertical - \parindent\z@ \everypar{}% \leftskip\z@ \rightskip\z@ } @@ -223,9 +220,9 @@ \let\luatexko@hanja@selectfont\relax \check@hangul@family \ifdefined\hangul@font \hangul@font \fi - \expandafter\endgroup - \directlua{ luatexko.cjkfontidtmp = font.current() }% - \hangfntattr\directlua{ tex.sprint(luatexko.cjkfontidtmp) }\relax + \expandafter\expandafter\expandafter + \endgroup + \expandafter\hangfntattr\luatexfontid\font\relax } \def\luatexko@hanja@selectfont{% \begingroup @@ -233,9 +230,9 @@ \let\luatexko@hanja@selectfont\relax \check@hanja@family \ifdefined\hanja@font \hanja@font \fi - \expandafter\endgroup - \directlua{ luatexko.cjkfontidtmp = font.current() }% - \hanjfntattr\directlua{ tex.sprint(luatexko.cjkfontidtmp) }\relax + \expandafter\expandafter\expandafter + \endgroup + \expandafter\hanjfntattr\luatexfontid\font\relax \ifnum\cjtypesetattr>\z@\luatexkolatinspaceskip\fi } \let\check@hangul@family\relax @@ -250,17 +247,17 @@ \def\setmathhangulblock#1#2{% \count@="#1 \loop - \luatexUmathcode\count@ = 7 \symmathhangul \count@ + \Umathcode\count@ = 7 \symmathhangul \count@ \ifnum\count@<"#2 \advance\count@\@ne \repeat} +\def\setmathhangulfont#1#{\setmathhangul@font@} \ifdefined\ProvidesPackage - \let\setmathhangulfont\@gobble + \let\setmathhangul@font@\@gobble \else % for plain; see luatexko.sty for latex \newfam\symmathhangul - \def\setmathhangulfont#1#{\setmathhangulfont@} - \def\setmathhangulfont@#1{% + \def\setmathhangul@font@#1{% \font\tenhangul = "#1" at 10pt \font\sevenhangul = "#1" at 7pt \font\fivehangul = "#1" at 5pt |