summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex/luatexja
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-07-01 22:05:28 +0000
committerKarl Berry <karl@freefriends.org>2016-07-01 22:05:28 +0000
commitaf864fc6811880ec8d533d5f5b3fc5ba3e792f62 (patch)
tree51f513dbf7e95f46cbb5570c05a281636de7c321 /Master/texmf-dist/tex/luatex/luatexja
parent6616e5bc017760ac8018e9133944b54a62ac7169 (diff)
luatexja (1jul16)
git-svn-id: svn://tug.org/texlive/trunk@41600 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja')
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua6
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty102
2 files changed, 56 insertions, 52 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua
index 34472a261c2..2f7ab6399f7 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua
@@ -395,7 +395,10 @@ local function calc_np_aux_glyph_common(lp, acc_flag)
return true, lp
end
end
-local calc_np_auxtable = {
+local calc_np_auxtable
+do
+local dir_tate = luatexja.dir_table.dir_tate
+calc_np_auxtable = {
[id_glyph] = calc_np_aux_glyph_common,
[id_hlist] = function(lp)
local op, flag
@@ -501,6 +504,7 @@ local calc_np_auxtable = {
return false, node_next(lp)
end,
}
+end
calc_np_auxtable[id_rule] = calc_np_auxtable.box_like
calc_np_auxtable[15] = calc_np_auxtable.box_like
calc_np_auxtable[id_ins] = calc_np_auxtable.skip
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty
index 1b95d95a4c5..8c70c993e6b 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty
@@ -725,56 +725,56 @@
%%%% patch \@text@composite because of {y,t}albaselineshift
-%% \pltx@isletter from plfonts.dtx
-\def\pltx@mark{\pltx@mark@}
-\let\pltx@scanstop\relax
-\long\def\pltx@cond#1\fi{%
- #1\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi}
-\long\def\pltx@isletter#1{%
- \expandafter\pltx@isletter@i\romannumeral-`0#1\pltx@scanstop}
-\long\def\pltx@isletter@i#1\pltx@scanstop{%
- \pltx@cond\ifx\pltx@mark#1\pltx@mark\fi{\@firstoftwo}%
- {\pltx@isletter@ii\pltx@scanstop#1\pltx@scanstop{}#1\pltx@mark}}
-\long\def\pltx@isletter@ii#1\pltx@scanstop#{%
- \pltx@cond\ifx\pltx@mark#1\pltx@mark\fi%
- {\pltx@isletter@iii}{\pltx@isletter@iv}}
-\long\def\pltx@isletter@iii#1\pltx@mark{\@secondoftwo}
-\long\def\pltx@isletter@iv#1#2#3\pltx@mark{%
- \pltx@cond\ifx\pltx@mark#3\pltx@mark\fi{%
- \pltx@cond{\ifnum0\ifcat A\noexpand#21\fi\ifcat=\noexpand#21\fi>\z@}\fi
- {\@firstoftwo}{\@secondoftwo}%
- }{\@secondoftwo}}
-
-\def\@text@composite@x#1#2{%
- \ifx#1\relax
- #2%
- \else\pltx@isletter{#1}{#1}{%
- \begingroup
- \setbox\z@\hbox\bgroup%
- \ltj@yablshift\z@ \ltj@tablshift\z@
- #1%
- \@tempcntb\directlua{luatexja.pltx_composite_last_node_char()}%)
- \xdef\pltx@composite@temp{\noexpand\@tempcntb=\the\@tempcntb\relax}%
- \aftergroup\pltx@composite@temp
- \egroup
- \ifnum\ltjgetparameter{direction}=3 %
- \@tempdima=\ltj@tablshift sp\else\@tempdima=\ltj@yablshift sp\fi
- \ifnum\@tempcntb<\z@\@tempcnta\z@\else
- \@tempcnta=\ltjgetparameter{jacharrange}{\ltjgetparameter{chartorange}{\@tempcntb}}\relax
- \ifnum\@tempcnta=\z@\@tempdima\z@\fi
- \fi
- \ifnum\@tempcnta>\z@
- \ifodd\ltjgetparameter{alxspmode}{\@tempcntb}\else\leavevmode\hbox{}\fi
- \begingroup\mathsurround\z@$%
- \hbox{\lower\@tempdima\box\z@}
- $\endgroup%
- \ifnum\ltjgetparameter{alxspmode}{\@tempcntb}<2\hbox{}\fi
- \else
- \ifdim\@tempdima=\z@{\ltj@yablshift\z@ \ltj@tablshift\z@#1}%
- \else\lower\@tempdima\box\z@\fi
- \fi
- \endgroup}%
- \fi
-}
+% %% \pltx@isletter from plfonts.dtx
+% \def\pltx@mark{\pltx@mark@}
+% \let\pltx@scanstop\relax
+% \long\def\pltx@cond#1\fi{%
+% #1\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi}
+% \long\def\pltx@isletter#1{%
+% \expandafter\pltx@isletter@i#1\pltx@scanstop}
+% \long\def\pltx@isletter@i#1\pltx@scanstop{%
+% \pltx@cond\ifx\pltx@mark#1\pltx@mark\fi{\@firstoftwo}%
+% {\pltx@isletter@ii\pltx@scanstop#1\pltx@scanstop{}#1\pltx@mark}}
+% \long\def\pltx@isletter@ii#1\pltx@scanstop#{%
+% \pltx@cond\ifx\pltx@mark#1\pltx@mark\fi%
+% {\pltx@isletter@iii}{\pltx@isletter@iv}}
+% \long\def\pltx@isletter@iii#1\pltx@mark{\@secondoftwo}
+% \long\def\pltx@isletter@iv#1#2#3\pltx@mark{%
+% \pltx@cond\ifx\pltx@mark#3\pltx@mark\fi{%
+% \pltx@cond{\ifnum0\ifcat A\noexpand#21\fi\ifcat=\noexpand#21\fi>\z@}\fi
+% {\@firstoftwo}{\@secondoftwo}%
+% }{\@secondoftwo}}
+%
+% \def\@text@composite@x#1#2{%
+% \ifx#1\relax
+% #2%
+% \else\pltx@isletter{#1}{#1}{%
+% \begingroup
+% \setbox\z@\hbox\bgroup%
+% \ltj@yablshift\z@ \ltj@tablshift\z@
+% #1%
+% \@tempcntb\directlua{luatexja.pltx_composite_last_node_char()}%)
+% \xdef\pltx@composite@temp{\noexpand\@tempcntb=\the\@tempcntb\relax}%
+% \aftergroup\pltx@composite@temp
+% \egroup
+% \ifnum\ltjgetparameter{direction}=3 %
+% \@tempdima=\ltj@tablshift sp\else\@tempdima=\ltj@yablshift sp\fi
+% \ifnum\@tempcntb<\z@\@tempcnta\z@\else
+% \@tempcnta=\ltjgetparameter{jacharrange}{\ltjgetparameter{chartorange}{\@tempcntb}}\relax
+% \ifnum\@tempcnta=\z@\@tempdima\z@\fi
+% \fi
+% \ifnum\@tempcnta>\z@
+% \ifodd\ltjgetparameter{alxspmode}{\@tempcntb}\else\leavevmode\hbox{}\fi
+% \begingroup\mathsurround\z@$%
+% \hbox{\lower\@tempdima\box\z@}
+% $\endgroup%
+% \ifnum\ltjgetparameter{alxspmode}{\@tempcntb}<2\hbox{}\fi
+% \else
+% \ifdim\@tempdima=\z@{\ltj@yablshift\z@ \ltj@tablshift\z@#1}%
+% \else\lower\@tempdima\box\z@\fi
+% \fi
+% \endgroup}%
+% \fi
+% }
\endinput