| リビジョン | 80d52971644cff20c157314b05ee0a4c3656f510 (tree) |
|---|---|
| 日時 | 2014-11-05 18:52:47 |
| 作者 | Hironori Kitagawa <h_kitagawa2001@yaho...> |
| コミッター | Hironori Kitagawa |
vertical origin when vert or vrt2 is explicitly specified in \tfont
src/ltj-jfmglue.lua (diff) src/ltj-jfont.lua (diff)| @@ -110,7 +110,7 @@ local slow_find_char_class | ||
| 110 | 110 | do |
| 111 | 111 | local start_time_measure = ltjb.start_time_measure |
| 112 | 112 | local stop_time_measure = ltjb.stop_time_measure |
| 113 | - slow_find_char_class = function (c, m, oc,t ) | |
| 113 | + slow_find_char_class = function (c, m, oc) | |
| 114 | 114 | local cls = ltjf_find_char_class(oc, m) |
| 115 | 115 | if oc~=c and cls==0 then |
| 116 | 116 | return ltjf_find_char_class(-c, m), oc |
| @@ -820,7 +820,7 @@ end | ||
| 820 | 820 | -- calculate vadvance |
| 821 | 821 | ------------------------------------------------------------------------ |
| 822 | 822 | do |
| 823 | - local function acc_feature(table_vadv, table_vorg, subtables, ft) | |
| 823 | + local function acc_feature(table_vadv, table_vorg, subtables, ft, already_vert) | |
| 824 | 824 | for char_num,v in pairs(ft.shared.rawdata.descriptions) do |
| 825 | 825 | if v.slookups then |
| 826 | 826 | for sn, sv in pairs(v.slookups) do |
| @@ -829,7 +829,7 @@ do | ||
| 829 | 829 | table_vadv[char_num] |
| 830 | 830 | = (table_vadv[char_num] or 0) + sv[4] |
| 831 | 831 | end |
| 832 | - if sv[2]~=0 then | |
| 832 | + if sv[2]~=0 and not already_vert then | |
| 833 | 833 | table_vorg[char_num] |
| 834 | 834 | = (table_vorg[char_num] or 0) + sv[2] |
| 835 | 835 | end |
| @@ -847,8 +847,6 @@ luatexbase.add_to_callback( | ||
| 847 | 847 | local ft = font_getfont(fnum) |
| 848 | 848 | local subtables = {} |
| 849 | 849 | if ft.specification then |
| 850 | - ft.specification.features.normal.vrt2 = true | |
| 851 | - ft.specification.features.normal.vert = true | |
| 852 | 850 | for feat_name,v in pairs(ft.specification.features.normal) do |
| 853 | 851 | if v==true then |
| 854 | 852 | for _,i in pairs(ft.resources.sequences) do |
| @@ -860,7 +858,8 @@ luatexbase.add_to_callback( | ||
| 860 | 858 | end |
| 861 | 859 | end |
| 862 | 860 | end |
| 863 | - acc_feature(vadv, vorg, subtables, ft) | |
| 861 | + acc_feature(vadv, vorg, subtables, ft, | |
| 862 | + ft.specification.features.normal.vrt2 or ft.specification.features.normal.vert) | |
| 864 | 863 | for i,v in pairs(vadv) do |
| 865 | 864 | vadv[i]=vadv[i]/ft.units_per_em*fmtable.size |
| 866 | 865 | end |
Fork