• R/O
  • HTTP
  • SSH
  • HTTPS

luatexja: Commit

ソースコードの管理場所


Commit MetaInfo

Revision5732f2cafd59081b3ebdad197be711d11f2fc009 (tree)
Time2013-07-05 06:09:37
AuthorHironori Kitagawa <h_kitagawa2001@yaho...>
CommiterHironori Kitagawa

Log Message

Forgot to change fonts.ids -> fonts.hashes.identifiers

Change Summary

Incremental Difference

--- a/src/ltj-otf.lua
+++ b/src/ltj-otf.lua
@@ -70,7 +70,7 @@ end
7070
7171 local function cid(key)
7272 if key==0 then return append_jglyph(char) end
73- local curjfnt = fonts.ids[tex.attribute[attr_curjfnt]]
73+ local curjfnt = fonts.hashes.identifiers[tex.attribute[attr_curjfnt]]
7474 if not curjfnt.cidinfo or
7575 curjfnt.cidinfo.ordering ~= "Japan1" and
7676 curjfnt.cidinfo.ordering ~= "GB1" and
@@ -135,9 +135,9 @@ luatexbase.add_to_callback('pre_linebreak_filter',
135135 -- これらの文字指定は,和文フォント定義ごとに,それぞれのフォントの
136136 -- CID <-> グリフ 対応状況による変換テーブルが用意される.
137137
138--- フォント読み込み時に,CID
138+-- 和文フォント読み込み時に,CID -> unicode 対応をとっておく.
139139 local function cid_to_char(fmtable, fn)
140- local fi = fonts.ids[fn]
140+ local fi = fonts.hashes.identifiers[fn]
141141 if fi.cidinfo and fi.cidinfo.ordering == "Japan1" then
142142 fmtable.cid_char_type = {}
143143 for i, v in pairs(fmtable.chars) do
--- a/src/ltj-rmlgbm.lua
+++ b/src/ltj-rmlgbm.lua
@@ -319,7 +319,7 @@ local function mk_rml(name, size, id)
319319 fontdata.name = specification.name .. size .. var; cachedata.name = fontdata.name
320320 fontdata.fullname = specification.name .. var; cachedata.fullname = fontdata.fullname
321321 fontdata.psname = specification.name; cachedata.psname = fontdata.psname
322- fonts.ids[id] = cachedata
322+ fonts.hashes.identifiers[id] = cachedata
323323
324324 return fontdata
325325 end
--- a/test/valign.lua
+++ b/test/valign.lua
@@ -29,7 +29,8 @@ local function print_scaled(s)
2929 return out
3030 end
3131 local function set_valign(fmtable, fn)
32- local fi = fonts.ids[fn]
32+ local fi = fonts.hashes.identifiers[fn]
33+ if not fi.ascender then fi = fi.parameters end
3334 local mt = fmtable.char_type[0]
3435 local ma = mt.height / (mt.height + mt.depth) * (fi.ascender + fi.descender)
3536 fmtable.down_offset = round(fi.ascender - ma)
Show on old repository browser