summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-10-13 22:10:02 +0000
committerKarl Berry <karl@freefriends.org>2014-10-13 22:10:02 +0000
commit44cb8e3fdd11a1ec6f1dd29e110ba10309bc6cd1 (patch)
tree666a3352effc147618e30969bb89d02e77a3028d /Master/texmf-dist/tex
parenta81c9d1ef0b46432af068c7bb16347426eb1f7ce (diff)
luatexja (13oct14)
git-svn-id: svn://tug.org/texlive/trunk@35368 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltj-adjust.lua3
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua3
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltj-plain.sty6
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua7
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltj-stack.lua21
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty1
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty6
9 files changed, 20 insertions, 31 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty
index 6f8ad23509a..3f6b4efc9f5 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty
@@ -194,7 +194,7 @@
\bool_set_true:N \l_ltjpreset_noembed_bool
}
-\ExecuteOptions{noembed}
+\ExecuteOptions{ipaex}
\ProcessOptions*
%% KozMinPr6N の場合はjp04 feature がないので,nlck にする
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-adjust.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-adjust.lua
index 6a5a300986e..729f186f37b 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-adjust.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-adjust.lua
@@ -172,7 +172,8 @@ end
-- step 1: 行末に kern を挿入(句読点,中点用)
local function aw_step1(p, res, total)
- local x = node_tail(getlist(p)); if not x then return false end
+ local head = getlist(p)
+ local x = node_tail(head); if not x then return false end
-- x: \rightskip
x = node_prev(x); if not x then return false end
if getid(x) == id_glue and getsubtype(x) == 15 then
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua
index 9840da825bb..6b2fb95d4a5 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua
@@ -105,7 +105,7 @@ local slow_find_char_class
do
slow_find_char_class = function (c, m, oc)
local cls = ltjf_find_char_class(oc, m)
- if not c and cls==0 then
+ if cls==0 then
return ltjf_find_char_class(-c, m), oc
else
return cls, oc
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua
index 45bf490b1c5..ff0788d82bf 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua
@@ -553,6 +553,7 @@ end
------------------------------------------------------------------------
local is_ucs_in_japanese_char = ltjc.is_ucs_in_japanese_char_direct
+local font = font
-- EXT: italic correction
function append_italic()
local p = to_direct(tex.nest[tex.nest.ptr].tail)
@@ -566,7 +567,7 @@ function append_italic()
local j = font_metric_table[f]
setfield(g, 'kern', j.char_type[find_char_class(getchar(p), j)].italic)
else
- local h = font_getfont(f)
+ local h = font_getfont(f) or font.fonts[f]
if h then
setfield(g, 'kern', h.characters[getchar(p)].italic)
else
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-plain.sty b/Master/texmf-dist/tex/luatex/luatexja/ltj-plain.sty
index c958ddd0b47..933d056bb59 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-plain.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-plain.sty
@@ -14,7 +14,7 @@
\ifltj@in@latex %<*LaTeX>
\NeedsTeXFormat{LaTeX2e}
\PackageWarning{ltj-plain}{Don't load this package directly; load luatexja.sty instead.}
- \ProvidesPackage{ltj-plain}[2013/06/12]
+ \ProvidesPackage{ltj-plain}[2014/09/19]
\fi %</LaTeX>
%%------------------
@@ -23,8 +23,8 @@
%! ↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓
% LuaTeX-ja macros against plain TeX
-\def\ltj@stdmcfont{psft:Ryumin-Light}
-\def\ltj@stdgtfont{psft:GothicBBB-Medium}
+\def\ltj@stdmcfont{IPAExMincho}
+\def\ltj@stdgtfont{IPAExGothic}
\newread\ltj@@cfgread
\openin\ltj@@cfgread{luatexja.cfg}%
\ifeof\ltj@@cfgread
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua
index 14cec985159..5cdb1404ffd 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua
@@ -42,6 +42,7 @@ local is_ucs_in_japanese_char = ltjc.is_ucs_in_japanese_char_direct
local ltjf_replace_altfont = ltjf.replace_altfont
local attr_orig_char = luatexbase.attributes['ltj@origchar']
local STCK = luatexja.userid_table.STCK
+local lang_ja = token.create('ltj@japanese')[2]
------------------------------------------------------------------------
-- MAIN PROCESS STEP 1: replace fonts
@@ -56,7 +57,8 @@ do
local pc = getchar(p)
local pf = ltjf_replace_altfont(has_attr(p, attr_curjfnt) or getfont(p), pc)
setfield(p, 'font', pf); set_attr(p, attr_curjfnt, pf)
- setfield(p, 'subtype', floor(getsubtype(p)*0.5)*2)
+ setfield(p, 'lang', lang_ja)
+ -- setfield(p, 'subtype', floor(getsubtype(p)*0.5)*2)
set_attr(p, attr_orig_char, pc)
end
return p
@@ -74,8 +76,7 @@ do
wt, head = {}, p
while p do
local pfunc = suppress_hyphenate_ja_aux[getid(p)]
- if pfunc then p = pfunc(p) end
- p = node_next(p)
+ p = node_next(pfunc and pfunc(p) or p)
end
head = to_node(head)
lang.hyphenate(head)
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-stack.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-stack.lua
index 2a90fd2c89f..81fd8519cd8 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-stack.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-stack.lua
@@ -3,7 +3,7 @@
--
luatexbase.provides_module({
name = 'luatexja.stack',
- date = '2014/01/24',
+ date = '2014/09/24',
description = 'LuaTeX-ja stack system',
})
module('luatexja.stack', package.seeall)
@@ -37,8 +37,7 @@ function get_stack_level()
charprop_stack_table[i] = table.fastcopy(charprop_stack_table[i-1])
tex.setcount('ltj@@stack', i)
if gd~=0 then tex.globaldefs = gd end
- if tex.nest[tex.nest.ptr].mode == hmode or
- tex.nest[tex.nest.ptr].mode == -hmode then
+ if tex.nest[tex.nest.ptr].mode == -hmode then -- rest. hmode のみ
local g = node_new(id_whatsit, sid_user)
g.user_id=STCK; g.type=100; g.value=j; node.write(g)
end
@@ -46,21 +45,7 @@ function get_stack_level()
return i
end
--- local function table_to_str(v)
--- local s = ''
--- for i, a in pairs(v) do
--- s = s .. i .. "=" .. tostring(a) .. ', '
--- end
--- return s
--- end
--- function print_stack_table(i)
--- print('\n>>> get_stack_level:')
--- for k, v in pairs(charprop_stack_table[i]) do
--- print(" " , k, type(k), table_to_str(v));
--- end
--- end
-
-function set_stack_table(m,p)
+function set_stack_table(m, p)
local i = get_stack_level()
charprop_stack_table[i][m] = p
if luatexja.isglobal=='global' then
diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty b/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty
index b4fd007f79f..75b011c7882 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty
@@ -143,6 +143,7 @@
\newluatexattribute\ltj@yablshift % attribute for \yabaselineshift
\newluatexattribute\ltj@ykblshift % attribute for \ykbaselineshift
\newluatexattribute\jfam % index for current jfam
+\newlanguage\ltj@@japanese
\ltj@icflag=0
\ltj@origchar=0
\ltj@charclass=0
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty
index 9cd76430e11..4363948d8e4 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty
@@ -3,10 +3,10 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjdefs}[2013/06/12 Default font settings of LuaTeX-ja]
+\ProvidesPackage{lltjdefs}[2014/09/19 Default font settings of LuaTeX-ja]
-\def\ltj@stdmcfont{psft:Ryumin-Light}
-\def\ltj@stdgtfont{psft:GothicBBB-Medium}
+\def\ltj@stdmcfont{IPAExMincho}
+\def\ltj@stdgtfont{IPAExGothic}
\InputIfFileExists{luatexja.cfg}{}{}
\DeclareKanjiEncodingDefaults{}{}