diff options
author | Karl Berry <karl@freefriends.org> | 2016-05-15 22:11:39 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-05-15 22:11:39 +0000 |
commit | a95642771b5b92f47491360fc9844cd171f71cde (patch) | |
tree | a7d17dcae09e30a9e7267c0b0ecd4cc5bbec91fd /Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua | |
parent | 48121dcc91b2cbbccc5bbfbb1cc9c60ca2a695b2 (diff) |
luatexja (15may16)
git-svn-id: svn://tug.org/texlive/trunk@41164 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua')
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua | 46 |
1 files changed, 29 insertions, 17 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua index 87635b95aae..207d0e0058f 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua @@ -269,6 +269,7 @@ do '\\endcsname=\\relax') return end + if not f then return end update_jfm_cache(j, f.size) local ad = identifiers[fn].parameters local sz = metrics[j].size_cache[f.size] @@ -659,6 +660,18 @@ do end ------------------------------------------------------------------------ +-- VERT VARIANT TABLE +------------------------------------------------------------------------ +local vert_form_table = { + [0x2013]=0xFE32, [0x2014]=0xFE31, [0x2025]=0xFE30, + [0xFF08]=0xFE35, [0xFF09]=0xFE36, [0xFF5B]=0xFE37, [0xFF5D]=0xFE38, + [0x3014]=0xFE39, [0x3015]=0xFE3A, [0x3010]=0xFE3B, [0x3011]=0xFE3C, + [0x300A]=0xFE3D, [0x300B]=0xFE3E, [0x3008]=0xFE3F, [0x3009]=0xFE40, + [0x300C]=0xFE41, [0x300D]=0xFE42, [0x300E]=0xFE43, [0x300F]=0xFE44, + [0xFF3B]=0xFE47, [0xFF3D]=0xFE48, [0xFF3F]=0xFE33, +} + +------------------------------------------------------------------------ -- 追加のフォント情報 ------------------------------------------------------------------------ font_extra_info = {} @@ -682,7 +695,7 @@ do end local sort = table.sort - local function add_fl_table(dest, glyphs, unitable, asc_des, units) + local function add_fl_table(dest, glyphs, unitable, asc_des, units, id) local glyphmin, glyphmax = glyphs.glyphmin, glyphs.glyphmax if glyphmax < 0 then return dest end local tg = glyphs.glyphs @@ -707,9 +720,20 @@ do end end end + -- vertical form + local gi = unitable[gv.name] + if gi then + if unitable[gv.name .. '.vert'] then + dest = dest or {}; dest[gi] = dest[gi] or {}; + dest[gi].vform = unitable[gv.name .. '.vert'] + elseif id.characters[gi] and vert_form_table[gi] then + dest = dest or {}; dest[gi] = dest[gi] or {}; + dest[gi].vform = vert_form_table[gi] + end + end -- vertical metric local vw, tsb, vk = glyph_vmetric(gv) - local gi = unitable[i] + local gi = unitable[gv.name] if gi and vw and vw~=asc_des then -- We do not use tsidebearing, since (1) fontloader does not read VORG table -- and (2) 'tsidebearing' doea not appear in the returned table by fontloader.fields. @@ -757,7 +781,7 @@ do end end dest = add_fl_table(dest, fl, unicodes, - fl.ascent + fl.descent, fl.units_per_em) + fl.ascent + fl.descent, fl.units_per_em, id) end if fl.subfonts then for _,v in pairs(fl.subfonts) do @@ -770,7 +794,7 @@ do end for _,v in pairs(fl.subfonts) do dest = add_fl_table(dest, v, unicodes, - fl.ascent + fl.descent, fl.units_per_em) + fl.ascent + fl.descent, fl.units_per_em, id) end end if dest then dest.unicodes = unicodes end @@ -796,7 +820,7 @@ end -- do - local cache_ver = 9 + local cache_ver = 11 local checksum = file.checksum local function prepare_extra_data_base(id) @@ -994,15 +1018,3 @@ do end end ------------------------------------------------------------------------- --- VERT VARIANT TABLE ------------------------------------------------------------------------- -vert_form_table = { - [0x2013]=0xFE32, [0x2014]=0xFE31, [0x2025]=0xFE30, - [0xFF08]=0xFE35, [0xFF09]=0xFE36, [0xFF5B]=0xFE37, [0xFF5D]=0xFE38, - [0x3014]=0xFE39, [0x3015]=0xFE3A, [0x3010]=0xFE3B, [0x3011]=0xFE3C, - [0x300A]=0xFE3D, [0x300B]=0xFE3E, [0x3008]=0xFE3F, [0x3009]=0xFE40, - [0x300C]=0xFE41, [0x300D]=0xFE42, [0x300E]=0xFE43, [0x300F]=0xFE44, - [0xFF3B]=0xFE47, [0xFF3D]=0xFE48, [0xFF3F]=0xFE33, -} -setmetatable(vert_form_table, {__index=function(t,k) return k end}); |