summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-11-03 22:27:20 +0000
committerKarl Berry <karl@freefriends.org>2015-11-03 22:27:20 +0000
commitbab84ae64aecc934ad3b02c1003e4eabe387e813 (patch)
tree232802f7122f779a8a4d365ec805de0adbe652d3 /Master/texmf-dist/tex
parent14c29b37fc08cd01cf10e7c7816e28734950cd92 (diff)
luatexja (3nov15)
git-svn-id: svn://tug.org/texlive/trunk@38771 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua6
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty4
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/luatexja.sty4
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-unicode-math.sty54
4 files changed, 48 insertions, 20 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua
index b334ed46426..a4f2ff2003a 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua
@@ -140,6 +140,7 @@ do
local node_traverse = node.traverse
local STCK = luatexja.userid_table.STCK
local IHB = luatexja.userid_table.IHB
+ local sid_local = node.subtype('local_par')
local function test_list(h, lv)
if not h then
@@ -149,14 +150,15 @@ do
local w
for p in node_traverse(h) do
if p.id==id_whatsit then
- if p.subtype==sid_user then
+ local ps = p.subtype
+ if ps==sid_user then
local uid= p.user_id
if uid==DIR then
flag = 1; w = w or p -- found
elseif not(uid==IHB or uid==STCK) then
flag = 0; break -- error
end
- else
+ elseif ps~=sid_local then
flag = 0; break
end
else
diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty b/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty
index d55c37578e7..dc51b7a3a39 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty
@@ -65,7 +65,7 @@
\expandafter\let\csname ifltj@in@latex\expandafter\endcsname
\csname iftrue\endcsname
\NeedsTeXFormat{LaTeX2e}
- \ProvidesPackage{luatexja-core}[2015/10/12 Core of LuaTeX-ja]
+ \ProvidesPackage{luatexja-core}[2015/11/03 Core of LuaTeX-ja]
\fi %</LaTeX>
%% Load prerequisite packages.
@@ -232,7 +232,7 @@
t[\the\ltj@zh@inner] = function() setdimen('ltj@zh', ltjf.get_zh()) end
}
\protected\def\zw{\luafunction\ltj@zw@inner\ltj@zw}
- \protected\def\zh{\luafuntcion\ltj@zh@inner\ltj@zh}
+ \protected\def\zh{\luafunction\ltj@zh@inner\ltj@zh}
\else
\protected\def\zw{\directlua{tex.setdimen('ltj@zw', luatexja.jfont.get_zw())}\ltj@zw}
\protected\def\zh{\directlua{tex.setdimen('ltj@zh', luatexja.jfont.get_zh())}\ltj@zh}
diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty
index 80437db7fde..2e55d5c22eb 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty
@@ -34,7 +34,7 @@
\expandafter\let\csname ifltj@in@latex\expandafter\endcsname
\csname iftrue\endcsname
\NeedsTeXFormat{LaTeX2e}
- \ProvidesPackage{luatexja}[2015/10/12 Japanese Typesetting with LuaTeX]
+ \ProvidesPackage{luatexja}[2015/11/03 Japanese Typesetting with Lua(La))TeX]
\fi %</LaTeX>
\directlua{require('ltj-unicode-ccfix.lua')}% catcode of ideographs
@@ -42,7 +42,7 @@
%% Load all sub-packages.
\ifltj@in@latex %<*LaTeX>
%% \RequirePackage{expl3} needed if the version of l3kernel is v6111
- \RequirePackage{luatexja-core} [2015/10/12]
+ \RequirePackage{luatexja-core} [2015/11/03]
\RequirePackage{luatexja-compat}[2013/05/14]
\else %<*!LaTeX>
\input luatexja-core.sty %
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-unicode-math.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-unicode-math.sty
index 0b6e5563733..db9361abd1b 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-unicode-math.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-unicode-math.sty
@@ -3,28 +3,38 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjp-unicode-math}[2015/08/27 Patch to unicode-math for LuaTeX-ja]
+\ProvidesPackage{lltjp-unicode-math}[2015/10/28 Patch to unicode-math for LuaTeX-ja]
\RequirePackage{unicode-math,luatexja}
\ExplSyntaxOn
\group_begin:
- \tl_set:Nn \l_tmpa_tl { um_cs_set_eq_active_char:Nw }
- \cs_if_exist:cT { __um_cs_set_eq_active_char:Nw } {
- \tl_set:Nn \l_tmpa_tl { __um_cs_set_eq_active_char:Nw }
- \cs_gset:Npn \use@mathgroup #1 #2
- {
- \mode_if_math:T % <- not sure if this is really necessary since we've just checked for mmode and raised an error if not!
+ \bool_new:N \lltjp_um_patch_mathgroup_bool
+\@ifpackagelater{unicode-math}{2015/09/24}{%
+%%%%%%%% 2015/09/24 0.8c
+ \bool_set_true:N \lltjp_um_patch_mathgroup_bool
+ \cs_gset:Nn \__um_define_math_chars: {
+ \group_begin:
+ \cs_set:Npn \__um_sym:nnn ##1##2##3
{
- \math@bgroup
- \cs_if_eq:cNF {M@\f@encoding} #1 {#1}
- \__um_switchto_literal:
- \ltj@tempcnta=#2 \expandafter\ltj@@mathJapaneseFonts\string#1\relax%
- \ifin@ \jfam #2 \relax \else \mathgroup #2 \relax \fi
- \math@egroup
+ \tl_if_in:nnT
+ { \mathord \mathalpha \mathbin \mathrel \mathpunct \mathop \mathfence }
+ {##3}
+ {
+ \exp_last_unbraced:NNx \cs_gset_eq:NN ##2 { \Ucharcat ##1 ~ 12 ~ }
+ \ltjsetmathletter{ ##1 }
+ }
}
- }
+ \__um_input_math_symbol_table:
+ \group_end:
+ }
+}{
+ \cs_if_exist:cTF { __um_cs_set_eq_active_char:Nw } {
+ \tl_set:Nn \l_tmpa_tl { __um_cs_set_eq_active_char:Nw }
+ \bool_set_true:N \lltjp_um_patch_mathgroup_bool
+ }{
+ \tl_set:Nn \l_tmpa_tl { um_cs_set_eq_active_char:Nw }
}
\cs_gset:cpn { \tl_use:N \l_tmpa_tl } #1 = "#2 \q_nil {%"
\group_begin:
@@ -38,6 +48,22 @@
\ltjsetmathletter{ \int_from_hexadecimal:n {#2} }
\group_end:
}
+}
+
+\bool_if:NT \lltjp_um_patch_mathgroup_bool {
+ \cs_gset:Npn \use@mathgroup #1 #2
+ {
+ \mode_if_math:T % <- not sure if this is really necessary since we've just checked for mmode and raised an error if not!
+ {
+ \math@bgroup
+ \cs_if_eq:cNF {M@\f@encoding} #1 {#1}
+ \__um_switchto_literal:
+ \ltj@tempcnta=#2 \expandafter\ltj@@mathJapaneseFonts\string#1\relax%
+ \ifin@ \jfam #2 \relax \else \mathgroup #2 \relax \fi
+ \math@egroup
+ }
+ }
+}
\group_end:
\ExplSyntaxOff