From a81784d412d6e0fc42de901796568a90b32000f8 Mon Sep 17 00:00:00 2001
From: Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Date: Tue, 15 May 2012 16:04:05 +0900
Subject: [PATCH] Fix mk-rmlgbm-data.tex for ticket #28380.

---
 no_runtime/mk-rmlgbm-data.tex |  15 +++--
 src/ltj-cid-adobe-cns1.lua    | 113 ++++++++++++++++++++++++++++-------
 src/ltj-cid-adobe-gb1.lua     | 113 ++++++++++++++++++++++++++++-------
 src/ltj-cid-adobe-japan1.lua  | 134 +++++++++++++++++++++++++++++-------------
 src/ltj-cid-adobe-korea1.lua  | 102 ++++++++++++++++++++++++--------
 5 files changed, 367 insertions(+), 110 deletions(-)

diff --git a/no_runtime/mk-rmlgbm-data.tex b/no_runtime/mk-rmlgbm-data.tex
index fc0129a..363d01b 100644
--- a/no_runtime/mk-rmlgbm-data.tex
+++ b/no_runtime/mk-rmlgbm-data.tex
@@ -2,6 +2,9 @@
 \documentclass{article}
 
 \usepackage{luaotfload}
+
+\font\a=file:AdobeMingStd-Light.otf
+\font\b=file:AdobeMyungjoStd-Medium.otf
 \usepackage{luacode}
 \begin{luacode}
 -- only for debug
@@ -80,7 +83,7 @@ function mkrmlgbm(nonfilename,opfilename)
        elseif v.width == 327680 then v.width = 327680 -- 半角
        elseif v.width == 163840 then v.width = 163840 -- 1/4 角
        elseif v.width == 218234.88 then v.width = 218234.88 -- 1/3 角
-       else v.width = nil
+       elseif k>=128 then v.width = nil 
        end
 	end
 	
@@ -95,19 +98,19 @@ function mkrmlgbm(nonfilename,opfilename)
       tmpt.gpos_mark2ligature = {}
       tmpt.gpos_mark2mark = {}
       shared.otfdata.luatex.features.gpos = nil
-      shared.otfdata.luatex.features.pwid = nil
-      shared.otfdata.luatex.features.palt = nil
-      shared.otfdata.luatex.features.vkrn = nil
       for i,x in pairs(tfmdata.shared.otfdata.luatex.sequences) do
         if string.match(x.type,'gpos') then x.subtables = {} end
       end
+      -- Following features use proportional glyphs, so remove them.
+      shared.otfdata.luatex.features.gsub.pwid = nil
+      shared.otfdata.luatex.features.gsub.pkna = nil
+      shared.otfdata.luatex.features.gsub.palt = nil
     end
 
 	-- for luaotfload
-    if fontdata.pfminfo then
+	if fontdata.pfminfo then
 	  fontdata.pfminfo.os2_capheight = 0
 	end
-    --table_search(tfmdata, 'gpos', '')
 	table.tofile(opfilename, tfmdata, 'return', false, true, false)
 end
 mkrmlgbm('AdobeMingStd-Light', 'ltj-cid-adobe-cns1.lua')
diff --git a/src/ltj-cid-adobe-cns1.lua b/src/ltj-cid-adobe-cns1.lua
index 15ce22b..1734816 100644
--- a/src/ltj-cid-adobe-cns1.lua
+++ b/src/ltj-cid-adobe-cns1.lua
@@ -6,126 +6,167 @@ return {
  characters={
   [32]={
    index=1,
+   width=164495.36,
   },
   [33]={
    index=2,
+   width=227409.92,
   },
   [34]={
    index=3,
+   width=265420.8,
   },
   [35]={
    index=4,
+   width=484311.04,
   },
   [36]={
    index=5,
+   width=330301.44,
   },
   [37]={
    index=6,
+   width=496762.88,
   },
   [38]={
    index=7,
+   width=540672,
   },
   [39]={
    index=8,
+   width=184156.16,
   },
   [40]={
    index=9,
+   width=192020.48,
   },
   [41]={
    index=10,
+   width=192675.84,
   },
   [42]={
    index=11,
+   width=323747.84,
   },
   [43]={
    index=12,
+   width=406323.2,
   },
   [44]={
    index=13,
+   width=164495.36,
   },
   [45]={
    index=14,
+   width=244449.28,
   },
   [46]={
    index=15,
+   width=165150.72,
   },
   [47]={
    index=16,
+   width=202506.24,
   },
   [48]={
    index=17,
+   width=329646.08,
   },
   [49]={
    index=18,
+   width=329646.08,
   },
   [50]={
    index=19,
+   width=329646.08,
   },
   [51]={
    index=20,
+   width=329646.08,
   },
   [52]={
    index=21,
+   width=330301.44,
   },
   [53]={
    index=22,
+   width=329646.08,
   },
   [54]={
    index=23,
+   width=328990.72,
   },
   [55]={
    index=24,
+   width=329646.08,
   },
   [56]={
    index=25,
+   width=329646.08,
   },
   [57]={
    index=26,
+   width=330301.44,
   },
   [58]={
    index=27,
+   width=164495.36,
   },
   [59]={
    index=28,
+   width=164495.36,
   },
   [60]={
    index=29,
+   width=406978.56,
   },
   [61]={
    index=30,
+   width=406978.56,
   },
   [62]={
    index=31,
+   width=406978.56,
   },
   [63]={
    index=32,
+   width=265420.8,
   },
   [64]={
    index=33,
+   width=682885.12,
   },
   [65]={
    index=34,
+   width=490864.64,
   },
   [66]={
    index=35,
+   width=441057.28,
   },
   [67]={
    index=36,
+   width=444989.44,
   },
   [68]={
    index=37,
+   width=444989.44,
   },
   [69]={
    index=38,
+   width=448921.6,
   },
   [70]={
    index=39,
+   width=439746.56,
   },
   [71]={
    index=40,
+   width=483655.68,
   },
   [72]={
    index=41,
+   width=482344.96,
   },
   [73]={
    index=42,
@@ -133,72 +174,95 @@ return {
   },
   [74]={
    index=43,
+   width=323747.84,
   },
   [75]={
    index=44,
+   width=477757.44,
   },
   [76]={
    index=45,
+   width=456130.56,
   },
   [77]={
    index=46,
+   width=590479.36,
   },
   [78]={
    index=47,
+   width=471859.2,
   },
   [79]={
    index=48,
+   width=491520,
   },
   [80]={
    index=49,
+   width=441712.64,
   },
   [81]={
    index=50,
+   width=488898.56,
   },
   [82]={
    index=51,
+   width=440401.92,
   },
   [83]={
    index=52,
+   width=410910.72,
   },
   [84]={
    index=53,
+   width=503971.84,
   },
   [85]={
    index=54,
+   width=463339.52,
   },
   [86]={
    index=55,
+   width=509214.72,
   },
   [87]={
    index=56,
+   width=581304.32,
   },
   [88]={
    index=57,
+   width=464650.24,
   },
   [89]={
    index=58,
+   width=469237.76,
   },
   [90]={
    index=59,
+   width=403701.76,
   },
   [91]={
    index=60,
+   width=182845.44,
   },
   [92]={
    index=61,
+   width=202506.24,
   },
   [93]={
    index=62,
+   width=181534.72,
   },
   [94]={
    index=63,
+   width=230686.72,
   },
   [95]={
    index=64,
+   width=376832,
   },
   [96]={
    index=65,
+   width=192675.84,
   },
   [97]={
    index=66,
@@ -206,90 +270,119 @@ return {
   },
   [98]={
    index=67,
+   width=334888.96,
   },
   [99]={
    index=68,
+   width=328990.72,
   },
   [100]={
    index=69,
+   width=359792.64,
   },
   [101]={
    index=70,
+   width=323747.84,
   },
   [102]={
    index=71,
+   width=233308.16,
   },
   [103]={
    index=72,
+   width=338165.76,
   },
   [104]={
    index=73,
+   width=360448,
   },
   [105]={
    index=74,
+   width=210370.56,
   },
   [106]={
    index=75,
+   width=210370.56,
   },
   [107]={
    index=76,
+   width=334233.6,
   },
   [108]={
    index=77,
+   width=207749.12,
   },
   [109]={
    index=78,
+   width=483655.68,
   },
   [110]={
    index=79,
+   width=349306.88,
   },
   [111]={
    index=80,
+   width=350617.6,
   },
   [112]={
    index=81,
+   width=357171.2,
   },
   [113]={
    index=82,
+   width=349306.88,
   },
   [114]={
    index=83,
+   width=246415.36,
   },
   [115]={
    index=84,
+   width=290324.48,
   },
   [116]={
    index=85,
+   width=236584.96,
   },
   [117]={
    index=86,
+   width=346685.44,
   },
   [118]={
    index=87,
+   width=344719.36,
   },
   [119]={
    index=88,
+   width=486277.12,
   },
   [120]={
    index=89,
+   width=349962.24,
   },
   [121]={
    index=90,
+   width=377487.36,
   },
   [122]={
    index=91,
+   width=287703.04,
   },
   [123]={
    index=92,
+   width=292945.92,
   },
   [124]={
    index=93,
+   width=171704.32,
   },
   [125]={
    index=94,
+   width=292290.56,
   },
   [126]={
    index=95,
+   width=309329.92,
   },
   [162]={
    index=262,
@@ -58890,26 +58983,6 @@ return {
         dflt=true,
        },
       },
-      pwid={
-       cyrl={
-        dflt=true,
-       },
-       dflt={
-        dflt=true,
-       },
-       grek={
-        dflt=true,
-       },
-       hani={
-        dflt=true,
-       },
-       kana={
-        dflt=true,
-       },
-       latn={
-        dflt=true,
-       },
-      },
       trep={
        ["*"]={
         ["*"]=true,
diff --git a/src/ltj-cid-adobe-gb1.lua b/src/ltj-cid-adobe-gb1.lua
index ee00b5e..acd4499 100644
--- a/src/ltj-cid-adobe-gb1.lua
+++ b/src/ltj-cid-adobe-gb1.lua
@@ -6,183 +6,243 @@ return {
  characters={
   [32]={
    index=1,
+   width=135659.52,
   },
   [33]={
    index=2,
+   width=176947.2,
   },
   [34]={
    index=3,
+   width=224133.12,
   },
   [35]={
    index=4,
+   width=306053.12,
   },
   [36]={
    index=5,
+   width=302776.32,
   },
   [37]={
    index=6,
+   width=522321.92,
   },
   [38]={
    index=7,
+   width=465305.6,
   },
   [39]={
    index=8,
+   width=156631.04,
   },
   [40]={
    index=9,
+   width=245104.64,
   },
   [41]={
    index=10,
+   width=245104.64,
   },
   [42]={
    index=11,
+   width=277217.28,
   },
   [43]={
    index=12,
+   width=396492.8,
   },
   [44]={
    index=13,
+   width=155975.68,
   },
   [45]={
    index=14,
+   width=245760,
   },
   [46]={
    index=15,
+   width=155975.68,
   },
   [47]={
    index=16,
+   width=218890.24,
   },
   [48]={
    index=17,
+   width=302776.32,
   },
   [49]={
    index=18,
+   width=302776.32,
   },
   [50]={
    index=19,
+   width=302776.32,
   },
   [51]={
    index=20,
+   width=302776.32,
   },
   [52]={
    index=21,
+   width=302776.32,
   },
   [53]={
    index=22,
+   width=302776.32,
   },
   [54]={
    index=23,
+   width=302776.32,
   },
   [55]={
    index=24,
+   width=302776.32,
   },
   [56]={
    index=25,
+   width=302776.32,
   },
   [57]={
    index=26,
+   width=302776.32,
   },
   [58]={
    index=27,
+   width=155975.68,
   },
   [59]={
    index=28,
+   width=155975.68,
   },
   [60]={
    index=29,
+   width=396492.8,
   },
   [61]={
    index=30,
+   width=396492.8,
   },
   [62]={
    index=31,
+   width=396492.8,
   },
   [63]={
    index=32,
+   width=225443.84,
   },
   [64]={
    index=33,
+   width=490209.28,
   },
   [65]={
    index=34,
+   width=448266.24,
   },
   [66]={
    index=35,
+   width=367001.6,
   },
   [67]={
    index=36,
+   width=455475.2,
   },
   [68]={
    index=37,
+   width=484311.04,
   },
   [69]={
    index=38,
+   width=368967.68,
   },
   [70]={
    index=39,
+   width=334888.96,
   },
   [71]={
    index=40,
+   width=477757.44,
   },
   [72]={
    index=41,
+   width=519700.48,
   },
   [73]={
    index=42,
+   width=208404.48,
   },
   [74]={
    index=43,
+   width=204472.32,
   },
   [75]={
    index=44,
+   width=436469.76,
   },
   [76]={
    index=45,
+   width=344719.36,
   },
   [77]={
    index=46,
+   width=587202.56,
   },
   [78]={
    index=47,
+   width=496762.88,
   },
   [79]={
    index=48,
+   width=505937.92,
   },
   [80]={
    index=49,
+   width=356515.84,
   },
   [81]={
    index=50,
+   width=505937.92,
   },
   [82]={
    index=51,
+   width=411566.08,
   },
   [83]={
    index=52,
+   width=304742.4,
   },
   [84]={
    index=53,
+   width=397803.52,
   },
   [85]={
    index=54,
+   width=493486.08,
   },
   [86]={
    index=55,
+   width=465960.96,
   },
   [87]={
    index=56,
+   width=637009.92,
   },
   [88]={
    index=57,
+   width=424017.92,
   },
   [89]={
    index=58,
+   width=406323.2,
   },
   [90]={
    index=59,
+   width=397803.52,
   },
   [91]={
    index=60,
+   width=245104.64,
   },
   [92]={
    index=61,
@@ -190,9 +250,11 @@ return {
   },
   [93]={
    index=62,
+   width=245104.64,
   },
   [94]={
    index=63,
+   width=397148.16,
   },
   [95]={
    index=64,
@@ -200,96 +262,127 @@ return {
   },
   [96]={
    index=65,
+   width=156631.04,
   },
   [97]={
    index=66,
+   width=273285.12,
   },
   [98]={
    index=67,
+   width=329646.08,
   },
   [99]={
    index=68,
+   width=279838.72,
   },
   [100]={
    index=69,
+   width=346685.44,
   },
   [101]={
    index=70,
+   width=271974.4,
   },
   [102]={
    index=71,
+   width=173015.04,
   },
   [103]={
    index=72,
+   width=290979.84,
   },
   [104]={
    index=73,
+   width=339476.48,
   },
   [105]={
    index=74,
+   width=157941.76,
   },
   [106]={
    index=75,
+   width=150732.8,
   },
   [107]={
    index=76,
+   width=324403.2,
   },
   [108]={
    index=77,
+   width=149422.08,
   },
   [109]={
    index=78,
+   width=519700.48,
   },
   [110]={
    index=79,
+   width=345374.72,
   },
   [111]={
    index=80,
+   width=343408.64,
   },
   [112]={
    index=81,
+   width=343408.64,
   },
   [113]={
    index=82,
+   width=330301.44,
   },
   [114]={
    index=83,
+   width=221511.68,
   },
   [115]={
    index=84,
+   width=220200.96,
   },
   [116]={
    index=85,
+   width=181534.72,
   },
   [117]={
    index=86,
+   width=338821.12,
   },
   [118]={
    index=87,
+   width=294912,
   },
   [119]={
    index=88,
+   width=427294.72,
   },
   [120]={
    index=89,
+   width=305397.76,
   },
   [121]={
    index=90,
+   width=296222.72,
   },
   [122]={
    index=91,
+   width=266731.52,
   },
   [123]={
    index=92,
+   width=242483.2,
   },
   [124]={
    index=93,
+   width=169082.88,
   },
   [125]={
    index=94,
+   width=242483.2,
   },
   [126]={
    index=95,
+   width=396492.8,
   },
   [164]={
    index=167,
@@ -92788,26 +92881,6 @@ return {
         dflt=true,
        },
       },
-      pwid={
-       cyrl={
-        dflt=true,
-       },
-       dflt={
-        dflt=true,
-       },
-       grek={
-        dflt=true,
-       },
-       hani={
-        dflt=true,
-       },
-       kana={
-        dflt=true,
-       },
-       latn={
-        dflt=true,
-       },
-      },
       trad={
        cyrl={
         dflt=true,
diff --git a/src/ltj-cid-adobe-japan1.lua b/src/ltj-cid-adobe-japan1.lua
index 2d46194..f39c9e2 100644
--- a/src/ltj-cid-adobe-japan1.lua
+++ b/src/ltj-cid-adobe-japan1.lua
@@ -6,192 +6,255 @@ return {
  characters={
   [32]={
    index=1,
+   width=182190.08,
   },
   [33]={
    index=2,
+   width=195952.64,
   },
   [34]={
    index=3,
+   width=231342.08,
   },
   [35]={
    index=4,
+   width=402391.04,
   },
   [36]={
    index=5,
+   width=402391.04,
   },
   [37]={
    index=6,
+   width=472514.56,
   },
   [38]={
    index=7,
+   width=481689.6,
   },
   [39]={
    index=8,
+   width=141557.76,
   },
   [40]={
    index=9,
+   width=211681.28,
   },
   [41]={
    index=10,
+   width=211681.28,
   },
   [42]={
    index=11,
+   width=294256.64,
   },
   [43]={
    index=12,
+   width=346685.44,
   },
   [44]={
    index=13,
+   width=143523.84,
   },
   [45]={
    index=14,
+   width=200540.16,
   },
   [46]={
    index=15,
+   width=143523.84,
   },
   [47]={
    index=16,
+   width=296878.08,
   },
   [48]={
    index=17,
+   width=402391.04,
   },
   [49]={
    index=18,
+   width=402391.04,
   },
   [50]={
    index=19,
+   width=402391.04,
   },
   [51]={
    index=20,
+   width=402391.04,
   },
   [52]={
    index=21,
+   width=402391.04,
   },
   [53]={
    index=22,
+   width=402391.04,
   },
   [54]={
    index=23,
+   width=402391.04,
   },
   [55]={
    index=24,
+   width=402391.04,
   },
   [56]={
    index=25,
+   width=402391.04,
   },
   [57]={
    index=26,
+   width=402391.04,
   },
   [58]={
    index=27,
+   width=143523.84,
   },
   [59]={
    index=28,
+   width=143523.84,
   },
   [60]={
    index=29,
+   width=346685.44,
   },
   [61]={
    index=30,
+   width=346685.44,
   },
   [62]={
    index=31,
+   width=346685.44,
   },
   [63]={
    index=32,
+   width=318504.96,
   },
   [64]={
    index=33,
+   width=487587.84,
   },
   [65]={
    index=34,
+   width=423362.56,
   },
   [66]={
    index=35,
+   width=395837.44,
   },
   [67]={
    index=36,
+   width=404357.12,
   },
   [68]={
    index=37,
+   width=446300.16,
   },
   [69]={
    index=38,
+   width=371589.12,
   },
   [70]={
    index=39,
+   width=351928.32,
   },
   [71]={
    index=40,
+   width=424017.92,
   },
   [72]={
    index=41,
+   width=483655.68,
   },
   [73]={
    index=42,
+   width=209715.2,
   },
   [74]={
    index=43,
+   width=283770.88,
   },
   [75]={
    index=44,
+   width=417464.32,
   },
   [76]={
    index=45,
+   width=370933.76,
   },
   [77]={
    index=46,
+   width=592445.44,
   },
   [78]={
    index=47,
+   width=465305.6,
   },
   [79]={
    index=48,
+   width=469237.76,
   },
   [80]={
    index=49,
+   width=396492.8,
   },
   [81]={
    index=50,
+   width=469237.76,
   },
   [82]={
    index=51,
+   width=408289.28,
   },
   [83]={
    index=52,
+   width=338821.12,
   },
   [84]={
    index=53,
+   width=393871.36,
   },
   [85]={
    index=54,
+   width=452198.4,
   },
   [86]={
    index=55,
+   width=437780.48,
   },
   [87]={
    index=56,
+   width=648806.4,
   },
   [88]={
    index=57,
+   width=446300.16,
   },
   [89]={
    index=58,
+   width=415498.24,
   },
   [90]={
    index=59,
+   width=378798.08,
   },
   [91]={
    index=60,
+   width=207093.76,
   },
   [92]={
    index=97,
+   width=296878.08,
   },
   [93]={
    index=62,
+   width=207093.76,
   },
   [94]={
    index=63,
+   width=346685.44,
   },
   [95]={
    index=64,
@@ -199,96 +262,127 @@ return {
   },
   [96]={
    index=65,
+   width=253624.32,
   },
   [97]={
    index=66,
+   width=333578.24,
   },
   [98]={
    index=67,
+   width=370933.76,
   },
   [99]={
    index=68,
+   width=313262.08,
   },
   [100]={
    index=69,
+   width=370278.4,
   },
   [101]={
    index=70,
+   width=329646.08,
   },
   [102]={
    index=71,
+   width=220856.32,
   },
   [103]={
    index=72,
+   width=359792.64,
   },
   [104]={
    index=73,
+   width=380108.8,
   },
   [105]={
    index=74,
+   width=180224,
   },
   [106]={
    index=75,
+   width=174325.76,
   },
   [107]={
    index=76,
+   width=356515.84,
   },
   [108]={
    index=77,
+   width=180879.36,
   },
   [109]={
    index=78,
+   width=559677.44,
   },
   [110]={
    index=79,
+   width=379453.44,
   },
   [111]={
    index=80,
+   width=360448,
   },
   [112]={
    index=81,
+   width=378798.08,
   },
   [113]={
    index=82,
+   width=370933.76,
   },
   [114]={
    index=83,
+   width=268697.6,
   },
   [115]={
    index=84,
+   width=290979.84,
   },
   [116]={
    index=85,
+   width=222822.4,
   },
   [117]={
    index=86,
+   width=376832,
   },
   [118]={
    index=87,
+   width=335544.32,
   },
   [119]={
    index=88,
+   width=498073.6,
   },
   [120]={
    index=89,
+   width=329646.08,
   },
   [121]={
    index=90,
+   width=346685.44,
   },
   [122]={
    index=91,
+   width=296878.08,
   },
   [123]={
    index=92,
+   width=213647.36,
   },
   [124]={
    index=99,
+   width=249036.8,
   },
   [125]={
    index=94,
+   width=213647.36,
   },
   [126]={
    index=100,
+   width=346685.44,
   },
   [161]={
    index=101,
@@ -77806,46 +77900,6 @@ return {
         dflt=true,
        },
       },
-      pkna={
-       cyrl={
-        dflt=true,
-       },
-       dflt={
-        dflt=true,
-       },
-       grek={
-        dflt=true,
-       },
-       hani={
-        dflt=true,
-       },
-       kana={
-        dflt=true,
-       },
-       latn={
-        dflt=true,
-       },
-      },
-      pwid={
-       cyrl={
-        dflt=true,
-       },
-       dflt={
-        dflt=true,
-       },
-       grek={
-        dflt=true,
-       },
-       hani={
-        dflt=true,
-       },
-       kana={
-        dflt=true,
-       },
-       latn={
-        dflt=true,
-       },
-      },
       qwid={
        cyrl={
         dflt=true,
diff --git a/src/ltj-cid-adobe-korea1.lua b/src/ltj-cid-adobe-korea1.lua
index 213c52d..115a272 100644
--- a/src/ltj-cid-adobe-korea1.lua
+++ b/src/ltj-cid-adobe-korea1.lua
@@ -10,21 +10,27 @@ return {
   },
   [33]={
    index=2,
+   width=272629.76,
   },
   [34]={
    index=3,
+   width=272629.76,
   },
   [35]={
    index=4,
+   width=545914.88,
   },
   [36]={
    index=5,
+   width=409600,
   },
   [37]={
    index=6,
+   width=600309.76,
   },
   [38]={
    index=7,
+   width=545914.88,
   },
   [39]={
    index=8,
@@ -44,48 +50,63 @@ return {
   },
   [43]={
    index=12,
+   width=545914.88,
   },
   [44]={
    index=13,
+   width=190709.76,
   },
   [45]={
    index=14,
+   width=545914.88,
   },
   [46]={
    index=15,
+   width=190709.76,
   },
   [47]={
    index=16,
+   width=245760,
   },
   [48]={
    index=17,
+   width=409600,
   },
   [49]={
    index=18,
+   width=409600,
   },
   [50]={
    index=19,
+   width=409600,
   },
   [51]={
    index=20,
+   width=409600,
   },
   [52]={
    index=21,
+   width=409600,
   },
   [53]={
    index=22,
+   width=409600,
   },
   [54]={
    index=23,
+   width=409600,
   },
   [55]={
    index=24,
+   width=409600,
   },
   [56]={
    index=25,
+   width=409600,
   },
   [57]={
    index=26,
+   width=409600,
   },
   [58]={
    index=27,
@@ -97,12 +118,15 @@ return {
   },
   [60]={
    index=29,
+   width=545914.88,
   },
   [61]={
    index=30,
+   width=545914.88,
   },
   [62]={
    index=31,
+   width=600309.76,
   },
   [63]={
    index=32,
@@ -113,30 +137,39 @@ return {
   },
   [65]={
    index=34,
+   width=518389.76,
   },
   [66]={
    index=35,
+   width=463994.88,
   },
   [67]={
    index=36,
+   width=463994.88,
   },
   [68]={
    index=37,
+   width=491520,
   },
   [69]={
    index=38,
+   width=463994.88,
   },
   [70]={
    index=39,
+   width=436469.76,
   },
   [71]={
    index=40,
+   width=491520,
   },
   [72]={
    index=41,
+   width=518389.76,
   },
   [73]={
    index=42,
+   width=245760,
   },
   [74]={
    index=43,
@@ -144,51 +177,66 @@ return {
   },
   [75]={
    index=44,
+   width=518389.76,
   },
   [76]={
    index=45,
+   width=436469.76,
   },
   [77]={
    index=46,
+   width=600309.76,
   },
   [78]={
    index=47,
+   width=518389.76,
   },
   [79]={
    index=48,
+   width=491520,
   },
   [80]={
    index=49,
+   width=436469.76,
   },
   [81]={
    index=50,
+   width=491520,
   },
   [82]={
    index=51,
+   width=463994.88,
   },
   [83]={
    index=52,
+   width=436469.76,
   },
   [84]={
    index=53,
+   width=518389.76,
   },
   [85]={
    index=54,
+   width=518389.76,
   },
   [86]={
    index=55,
+   width=491520,
   },
   [87]={
    index=56,
   },
   [88]={
    index=57,
+   width=463994.88,
   },
   [89]={
    index=58,
+   width=463994.88,
   },
   [90]={
    index=59,
+   width=436469.76,
   },
   [91]={
    index=60,
@@ -196,6 +244,7 @@ return {
   },
   [92]={
    index=61,
+   width=245760,
   },
   [93]={
    index=62,
@@ -215,30 +264,39 @@ return {
   },
   [97]={
    index=66,
+   width=354549.76,
   },
   [98]={
    index=67,
+   width=382074.88,
   },
   [99]={
    index=68,
+   width=354549.76,
   },
   [100]={
    index=69,
+   width=382074.88,
   },
   [101]={
    index=70,
+   width=382074.88,
   },
   [102]={
    index=71,
+   width=245760,
   },
   [103]={
    index=72,
+   width=382074.88,
   },
   [104]={
    index=73,
+   width=382074.88,
   },
   [105]={
    index=74,
+   width=190709.76,
   },
   [106]={
    index=75,
@@ -246,48 +304,63 @@ return {
   },
   [107]={
    index=76,
+   width=382074.88,
   },
   [108]={
    index=77,
+   width=190709.76,
   },
   [109]={
    index=78,
+   width=573440,
   },
   [110]={
    index=79,
+   width=382074.88,
   },
   [111]={
    index=80,
+   width=382074.88,
   },
   [112]={
    index=81,
+   width=382074.88,
   },
   [113]={
    index=82,
+   width=382074.88,
   },
   [114]={
    index=83,
+   width=300154.88,
   },
   [115]={
    index=84,
+   width=354549.76,
   },
   [116]={
    index=85,
+   width=245760,
   },
   [117]={
    index=86,
+   width=382074.88,
   },
   [118]={
    index=87,
+   width=382074.88,
   },
   [119]={
    index=88,
+   width=545914.88,
   },
   [120]={
    index=89,
+   width=409600,
   },
   [121]={
    index=90,
+   width=409600,
   },
   [122]={
    index=91,
@@ -295,15 +368,19 @@ return {
   },
   [123]={
    index=92,
+   width=382074.88,
   },
   [124]={
    index=93,
+   width=382074.88,
   },
   [125]={
    index=94,
+   width=382074.88,
   },
   [126]={
    index=95,
+   width=491520,
   },
   [161]={
    index=208,
@@ -56497,7 +56574,7 @@ return {
   space=218234.88,
   space_shrink=72744.96,
   space_stretch=109117.44,
-  x_height=0,
+  x_height=313262.08,
  },
  psname="",
  script="dflt",
@@ -56661,29 +56738,6 @@ return {
         dflt=true,
        },
       },
-      pwid={
-       cyrl={
-        dflt=true,
-       },
-       dflt={
-        dflt=true,
-       },
-       grek={
-        dflt=true,
-       },
-       hang={
-        dflt=true,
-       },
-       hani={
-        dflt=true,
-       },
-       kana={
-        dflt=true,
-       },
-       latn={
-        dflt=true,
-       },
-      },
       sinf={
        cyrl={
         dflt=true,
-- 
2.11.0