Update sourcehantocl.py

Author: GuiWonder

Diff for: main/sourcehantocl.py

@@ -11,7 +11,7 @@
 	otfccdump += '2'
 	otfccbuild += '2'
 
-fontver='1.000'
+fontver='1.001'
 fontid='AAF'
 
 def build_glyph_codes():
@@ -57,6 +57,29 @@ def ckfile(f):
 		elif os.path.isfile(f.strip("'")):
 			return f.strip("'")
 	return f
+	
+def setpun(pzh, loczh):
+	pg=getgname(pzh)
+	zhp=list()
+	for tb in loczh:
+		if len(font['GSUB']['lookups'][tb]['subtables'][0])>200:
+			for subtable in font['GSUB']['lookups'][tb]['subtables']:
+				for j, t in list(subtable.items()):
+					for p1 in pzh:
+						cod=str(ord(p1))
+						if cod in font['cmap']:
+							g=font['cmap'][cod]
+							if g==j:
+								zhp.append((cod, t))
+								print('处理', p1)
+		else:
+			a=gettbs(tb, pg, False)
+			if len(a)>0:
+				for itm in a:
+					gettrch(itm[0], itm[1])
+	for punzh in zhp:
+		font['cmap'][punzh[0]]=punzh[1]
+
 def creattmp(mch, pun, simp):
 	print('获取本地化列表...')
 	loc=set()
@@ -77,20 +100,20 @@ def creattmp(mch, pun, simp):
 				elif lang.split('_')[-1].strip()=='ZHH':
 					loczhhk.update(set(font['GSUB']['features'][fs]))
 
-	#exch='侾倜兎剪叟呀咎咠唹嚳墁奜媺嬴孼宬岈巓幃幰廋微徵恝惆惘搜撐於旅旣晧晷曁杓栲桯梏檉毒氓汋汒沿淤湔溲滾漰潛潤澔瀆瀛灼煎煢爟牘牙牚犢獌珵珹琱甿瘦瞎瞬砑稠稧穿窖竇箭篠簉糙糱絳綢緯繭續罔羸肓腴膄臝臾舛舜舞船艘芒茫萸蒯蕣虻蚌蜩蟃衮袞裒裯襁覿訝訹誥讀豹負賙贏贖趼輞迓邙郜鄰鉛鋥鎉鏹閼降隙雕靠颼馰騪驎驘鬋魍鮵鴉鵠鵩鵰麗麟黷匾喝櫝殺浧釁䐁丫夢拄晩覈覉遑隍聖'
+	#exch='侾倜兎剪叟呀咎咠唹嚳墁奜媺嬴孼宬岈巓幃幰廋微徵恝惆惘搜撐於旅旣晧晷曁杓栲桯梏檉毒氓汋汒沿淤湔溲滾漰潛潤澔瀆瀛灼煎煢爟牘牙牚犢獌珵珹琱甿瘦瞎瞬砑稠稧穿窖竇箭篠簉糙糱絳綢緯繭續罔羸肓腴膄臝臾舛舜舞船艘芒茫萸蒯蕣虻蚌蜩蟃衮袞裒裯襁覿訝訹誥讀豹負賙贏贖趼輞迓邙郜鄰鉛鋥鎉鏹閼降隙雕靠颼馰騪驎驘鬋魍鮵鴉鵠鵩鵰麗麟黷匾喝櫝殺浧釁䐁丫夢拄晩覈覉遑隍'
 	#exgl=getgname(exch)
 	pen='"\'—‘’‚“”„‼⁇⁈⁉⸺⸻'
 	pzhs='·’‘”“•≤≥≮≯！：；？'+pen
 	pzht='·’‘”“•、。，．'+pen
 	sip=str()
-	sipch='将蒋残浅践与写泻惮禅箪蝉恋峦蛮変挛栾滦弯湾径茎弥称滞画'
-	krd='丈乖乳交伴使侮侵便偉偏偠健偰傑僊僧僭免全公关具兼再冒冓冬凞刃分判券削割劘勇勉勝勤包化半卑博卻厖叉及史吏吸呈咬咲唐唳唾啄啓喓喞喫嘆嘲噓器嚚嚮圍坪堙堞塀塌塘塚墜墨壄壿复夔契奓妥姬姿娜娵婦媛媾嫌宵寐寒寧尊尋導尨屣層峯巡巨巽帽幣平庭廉廊廐廟廠延廷建廻弊弱彩徘忍忭急悔情愉慧慨憊憎懲⼾房所扇扈扉扱抱拐拒拳挺捨捩掃採揃揲援搆搔搨摩摯敏敷⽂斐斧斲旃昀晴暑暖曌曙曜更朕朗杖松柊栓校栴梅梗梛梢榻構槩槪欄次泡派浮海浸消渚港湧湮溝滋滕滬漢潔澘濦濯灞灰炷煙煮燏燿爨爵⽗爺牀牂牒⽛狀狡猪猶班琢瑞環璵甄甦甩畇畔癒癤盆益矩砲硝硬碑碟磨社祈祉祐祖祝神祢祥禍禎福禫程稱穀穢⽳突窙竄筵節簿籐籾粉精糖紋納級紛終絞絣綮総編緩練縛縢縫縵繁繩纛缾署⽻翁翌習翔翠翦翩翫翻翼耀者耕耗聡肇肖肩肺胞脈腱臭⾇艇花苒苣菔菜菟著蓮蓴蔑薄藤蘭虁虐虔虜虞蚊蚤蛀蝇蝙螽蟒蠨衂衆術衛褊褐覃視覯訟註評認誕誤誹請諏諞諭諮諸謁謄謙講謹譖豁貧貨賆資賊賓購贈距踛躍躸較輸轄迅迎近返迪迫迬迭述迷追退送逃逆透逐途通逝逞速造逢連逮週進逸遂遇遊運遍過道達違遘遠遣適遭遮遵遷選遺遼避邃還那邦邨都鄕采釜鉒鉼銎鋆鍵鎌鎖鏖门陬隆隊隣隻雇雙難雪雰霔靖静⾮靡靭靴鞭響頌頑頒頻類顧⾷飢飯飼飽飾養餓館駁駩騰驟骪鬅鬣鬮魔鮗鮫鱍鱏鶐鶹鶾鶿⿇麿黛鼂鼇鼈鼬⿐齹⿔龝廊朗𰻞衋䕡倂搤濊癢膋諲豃趿軶輧込鯞'
-	trd='㈾㊩㊮㕙㗴㙇㙈㧻㨘㫵㯳㵆㵟㵪㵵㶏㹃㻇㻐㻗㻴䁓䃺䄲䅮䅼䈑䉠䜘䡱䤑䤵䥲䱻䱽䶉丸倯偺傂傦傴僈儆儚兂兓兝凐凭剎医匽匾區唬啝啿喒喼嘔嘬噆噳嚂堪塭塺墈壬夢婓婔尠屄岈岋岤峑幭弒弢归恐恬恮愖愝慪憩憼懱懵戡拰摠摳撮撯擎擏攠斟昊昞昶朂柭栃栐梤椕椹樞樧檶歁歅歋歐毆汆汛汵沉沷洖洰浧浻淭淲湛滘漒漚潖澂澞澬濸瀎灖牄犘獊瑏璁璥甂甌甍甚甝眾瞂瞘矏砑硂硹硿碪碰磃磘磡礣笌籴糂糌緰聰肏舋舔芔虥蚐蚜蟼蠛衊貙賃赹軠輙鈓銏銩鋷鍖鍤鎐鎦鎩鏂阠馤驄驅驔驖驚鸆麫黀黂黮鼢鼦鼩齖齱殺㖗㘚㮇㴲䒳䮐任偛偡傯刏勘啗嗖埾堔壏嶇嶵嶶弅恁憌拄掐掭掰掽揕揝搋摋擨敺斳枒栥棎榗榹檓檨淊溦溾漫璺睃穨篫篬簅籈籕羀羒脋臽蛧蛩蜭蝆蝨螥螩螶蟌贀贉跫踸軀邳鄋鄮鄸鄹醙醧醩醫銋錎閷閻闉陷鞏韈馛駏骺鬾鬿魀魊鰻鱋鱴鵀鵇鷖鷗麱黇黢黫䁥䓟䔽䕕䕡噶嵁暱楶櫙欿毉潜瑿蠀蠮醰黳釁佢僋冹卼厞叡啟塣壾奜悜戺揙楄檌溞瀩眅睙砨碥稨耛耩聖蛂蜧蝹螔覤覹觓豃豟豱豽貾贙趿踂軡軧軶鄑銇錓鎉鎪鏏陫頛馧驈驨鯞鯦鯫鵚鶣齴氯椂睩'
+	sipch='将蒋残浅践与写泻惮禅箪蝉恋峦蛮変挛栾滦弯湾径茎弥称滞画遥瑶'
+	krd='丈乖乳交伴使侮侵便偉偏偠健偰傑僊僧僭免全公关具兼再冒冓冬凞刃分判券削割劘勇勉勝勤包化半卑博卻厖叉及史吏吸呈咬咲唐唳唾啄啓喓喞喫嘆嘲噓器嚚嚮圍坪堙堞塀塌塘塚墜墨壄壿复夔契奓妥姬姿娜娵婦媛媾嫌宵寐寒寧尊尋導尨屣層峯巡巨巽帽幣平庭廉廊廐廟廠延廷建廻弊弱彩徘忍忭急悔情愉慧慨憊憎懲⼾房所扇扈扉扱抱拐拒拳挺捨捩掃採揃揲援搆搔搨摩摯敏敷⽂斐斧斲旃昀晴暑暖曌曙曜更朕朗杖松柊栓校栴梅梗梛梢榻構槩槪欄次泡派浮海浸消渚港湧湮溝滋滕滬漢潔澘濦濯灞灰炷煙煮燏燿爨爵⽗爺牀牂牒⽛狀狡猪猶班琢瑞環璵甄甦甩畇畔癒癤盆益矩砲硝硬碑碟磨社祈祉祐祖祝神祢祥禍禎福禫程稱穀穢⽳突窙竄筵節簿籐籾粉精糖紋納級紛終絞絣綮総編緩練縛縢縫縵繁繩纛缾署⽻翁翌習翔翠翦翩翫翻翼耀者耕耗聡肇肖肩肺胞脈腱臭⾇艇花苒苣菔菜菟著蓮蓴蔑薄藤蘭虁虐虔虜虞蚊蚤蛀蝇蝙螽蟒蠨衂衆術衛褊褐覃視覯訟註評認誕誤誹請諏諞諭諮諸謁謄謙講謹譖豁貧貨賆資賊賓購贈距踛躍躸較輸轄迅迎近返迪迫迬迭述迷追退送逃逆透逐途通逝逞速造逢連逮週進逸遂遇遊運遍過道達違遘遠遣適遭遮遵遷選遺遼避邃還那邦邨都鄕采釜鉒鉼銎鋆鍵鎌鎖鏖门陬隆隊隣隻雇雙難雪雰霔靖静⾮靡靭靴鞭響頌頑頒頻類顧⾷飢飯飼飽飾養餓館駁駩騰驟骪鬅鬣鬮魔鮗鮫鱍鱏鶐鶹鶾鶿⿇麿黛鼂鼇鼈鼬⿐齹⿔龝廊朗𰻞衋䕡倂搤濊癢膋諲豃趿軶輧込鯞聖'
+	trd='㈾㊩㊮㕙㗴㙇㙈㧻㨘㫵㯳㵆㵟㵪㵵㶏㹃㻇㻐㻗㻴䁓䃺䄲䅮䅼䈑䉠䜘䡱䤑䤵䥲䱻䱽䶉丸倯偺傂傦傴僈儆儚兂兓兝凐凭剎医匽匾區唬啝啿喒喼嘔嘬噆噳嚂堪塭塺墈壬夢婓婔尠屄岈岋岤峑幭弒弢归恐恬恮愖愝慪憩憼懱懵戡拰摠摳撮撯擎擏攠斟昊昞昶朂柭栃栐梤椕椹樞樧檶歁歅歋歐毆汆汛汵沉沷洖洰浧浻淭淲湛滘漒漚潖澂澞澬濸瀎灖牄犘獊瑏璁璥甂甌甍甚甝眾瞂瞘矏砑硂硹硿碪碰磃磘磡礣笌籴糂糌緰聰肏舋舔芔虥蚐蚜蟼蠛衊貙賃赹軠輙鈓銏銩鋷鍖鍤鎐鎦鎩鏂阠馤驄驅驔驖驚鸆麫黀黂黮鼢鼦鼩齖齱殺㖗㘚㮇㴲䒳䮐任偛偡傯刏勘啗嗖埾堔壏嶇嶵嶶弅恁憌拄掐掭掰掽揕揝搋摋擨敺斳枒栥棎榗榹檓檨淊溦溾漫璺睃穨篫篬簅籈籕羀羒脋臽蛧蛩蜭蝆蝨螥螩螶蟌贀贉跫踸軀邳鄋鄮鄸鄹醙醧醩醫銋錎閷閻闉陷鞏韈馛駏骺鬾鬿魀魊鰻鱋鱴鵀鵇鷖鷗麱黇黢黫䁥䓟䔽䕕䕡噶嵁暱楶櫙欿毉潜瑿蠀蠮醰黳釁佢僋冹卼厞叡啟塣壾奜悜戺揙楄檌溞瀩眅睙砨碥稨耛耩蛂蜧蝹螔覤覹觓豃豟豱豽貾贙趿踂軡軧軶鄑銇錓鎉鎪鏏陫頛馧驈驨鯞鯦鯫鵚鶣齴氯椂睩䔄熎䬙蘨蘣蘳嫹擙鐭'
 	trhkd='䭯䭰䭲䮖䴴䶜倡偈傮僣儥劊勂厭唱嗂嘈噲嚕堨壓尳峼嵑嶆嶱巀幵异彉徟徻愒愮愲慒憯懀懨揭撗擖擫敹昌暍曶曷曹替朁會朅栠桀椙楬榣榤槽樇檜檠櫓櫜櫝歇毼氌沓涾淍淐渠渴滍漕潃澮濌猒猖猣猲獚獦獪琩璯皾睭瞺矌碉碣磔磭磷穔穬穭筶篎粈粣粼糟糨糮羯聽菖葛薈藒蚩蝎蝬螖螬蟝蠍蠶蠽贕赻踏蹧蹸輵轕鄶鋯錔錩錭鍻鎥鑥閶陻鞜鞨韘韥飺饜馜馝馞馡馣馥騆騔魘魯鯧鰽鱠鶡黶齃齔喝㭼䂿儈厴堎惾抇擼朘稄糔羧耴薨踜靨黈鼭潛噆噶嶜甭甮唦挱鷬'
 	if pun=='2':
-		sip+=pzhs
+		setpun(pzhs, loczhs)
 	if pun=='3':
-		trd+=pzht
+		setpun(pzht, loczht)
 	if simp=='2':
 		sip+=sipch