From bb21a0a517e9d45e2bdf71294e35b52ab51778de Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Thu, 28 May 2009 00:54:45 +0900
Subject: [PATCH] update jinmeiyou and tweak formatting

---
 anki/stats.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/anki/stats.py b/anki/stats.py
index 3a5632d51..1071c3da0 100644
--- a/anki/stats.py
+++ b/anki/stats.py
@@ -540,12 +540,14 @@ and facts.modelId in %s
                sum([c[1] for c in counts]) +
                # total joyo
                "<li>%s</li>" % self.kanjiCountStr(
-            u'Jouyou',sum([c[1] for c in counts[1:8]]),
+            u'Old Jouyou',sum([c[1] for c in counts[1:8]]),
             sum([c[2] for c in counts[1:8]])) +
-               # total jinmei
-               "<li>%s</li>" % self.kanjiCountStr(*counts[8]) +
                # total new joyo
+               "<li>%s</li>" % self.kanjiCountStr(*counts[8]) +
+               # total jinmei (reg)
                "<li>%s</li>" % self.kanjiCountStr(*counts[9]) +
+               # total jinmei (var)
+               "<li>%s</li>" % self.kanjiCountStr(*counts[10]) +
                # total non-joyo
                "<li>%s</li>" % self.kanjiCountStr(*counts[0]))
 
@@ -609,6 +611,7 @@ and facts.modelId in %s
         (u'Grade 5', u'圧易移因営永衛液益演往応恩仮価可河過賀解快格確額刊幹慣眼基寄規技義逆久旧居許境興均禁句群経潔件券検険減現限個故護効厚構耕講鉱混査再妻採災際在罪財桜雑賛酸師志支枝資飼似示識質舎謝授修術述準序承招証常情条状織職制勢性政精製税績責接設絶舌銭祖素総像増造則測属損態貸退団断築張提程敵適統導銅徳独任燃能破判版犯比肥非備俵評貧婦富布武復複仏編弁保墓報豊暴貿防務夢迷綿輸余預容率略留領'),
         (u'Grade 6', u'異遺域宇映延沿我灰拡閣革割株巻干看簡危揮机貴疑吸供胸郷勤筋敬系警劇激穴憲権絹厳源呼己誤后孝皇紅鋼降刻穀骨困砂座済裁策冊蚕姿私至視詞誌磁射捨尺若樹収宗就衆従縦縮熟純処署諸除傷将障城蒸針仁垂推寸盛聖誠宣専泉洗染善創奏層操窓装臓蔵存尊宅担探誕暖段値宙忠著庁潮頂賃痛展党糖討届難乳認納脳派俳拝背肺班晩否批秘腹奮並閉陛片補暮宝訪亡忘棒枚幕密盟模訳優郵幼欲翌乱卵覧裏律臨朗論'),
         (u'JuniorHS', u'亜哀握扱依偉威尉慰為維緯違井壱逸稲芋姻陰隠韻渦浦影詠鋭疫悦謁越閲宴援炎煙猿縁鉛汚凹奥押欧殴翁沖憶乙卸穏佳嫁寡暇架禍稼箇華菓蚊雅餓介塊壊怪悔懐戒拐皆劾慨概涯該垣嚇核殻獲穫較郭隔岳掛潟喝括渇滑褐轄且刈乾冠勘勧喚堪寛患憾換敢棺款歓汗環甘監緩缶肝艦貫還鑑閑陥含頑企奇岐幾忌既棋棄祈軌輝飢騎鬼偽儀宜戯擬欺犠菊吉喫詰却脚虐丘及朽窮糾巨拒拠虚距享凶叫峡恐恭挟況狂狭矯脅響驚仰凝暁斤琴緊菌襟謹吟駆愚虞偶遇隅屈掘靴繰桑勲薫傾刑啓契恵慶憩掲携渓継茎蛍鶏迎鯨撃傑倹兼剣圏堅嫌懸献肩謙賢軒遣顕幻弦玄孤弧枯誇雇顧鼓互呉娯御悟碁侯坑孔巧恒慌抗拘控攻更江洪溝甲硬稿絞綱肯荒衡貢購郊酵項香剛拷豪克酷獄腰込墾婚恨懇昆紺魂佐唆詐鎖債催宰彩栽歳砕斎載剤咲崎削搾索錯撮擦傘惨桟暫伺刺嗣施旨祉紫肢脂諮賜雌侍慈滋璽軸執湿漆疾芝赦斜煮遮蛇邪勺爵酌釈寂朱殊狩珠趣儒寿需囚愁秀臭舟襲酬醜充柔汁渋獣銃叔淑粛塾俊瞬准循旬殉潤盾巡遵庶緒叙徐償匠升召奨宵尚床彰抄掌昇晶沼渉焦症硝礁祥称粧紹肖衝訟詔詳鐘丈冗剰壌嬢浄畳譲醸錠嘱飾殖触辱伸侵唇娠寝審慎振浸紳薪診辛震刃尋甚尽迅陣酢吹帥炊睡粋衰遂酔錘随髄崇枢据杉澄瀬畝是姓征牲誓請逝斉隻惜斥析籍跡拙摂窃仙占扇栓潜旋繊薦践遷銑鮮漸禅繕塑措疎礎租粗訴阻僧双喪壮捜掃挿曹槽燥荘葬藻遭霜騒憎贈促即俗賊堕妥惰駄耐怠替泰滞胎袋逮滝卓択拓沢濯託濁諾但奪脱棚丹嘆淡端胆鍛壇弾恥痴稚致遅畜蓄逐秩窒嫡抽衷鋳駐弔彫徴懲挑眺聴脹超跳勅朕沈珍鎮陳津墜塚漬坪釣亭偵貞呈堤帝廷抵締艇訂逓邸泥摘滴哲徹撤迭添殿吐塗斗渡途奴怒倒凍唐塔悼搭桃棟盗痘筒到謄踏逃透陶騰闘洞胴峠匿督篤凸突屯豚曇鈍縄軟尼弐如尿妊忍寧猫粘悩濃把覇婆廃排杯輩培媒賠陪伯拍泊舶薄迫漠爆縛肌鉢髪伐罰抜閥伴帆搬畔繁般藩販範煩頒盤蛮卑妃彼扉披泌疲碑罷被避尾微匹姫漂描苗浜賓頻敏瓶怖扶敷普浮符腐膚譜賦赴附侮舞封伏幅覆払沸噴墳憤紛雰丙併塀幣弊柄壁癖偏遍舗捕穂募慕簿倣俸奉峰崩抱泡砲縫胞芳褒邦飽乏傍剖坊妨帽忙房某冒紡肪膨謀僕墨撲朴没堀奔翻凡盆摩磨魔麻埋膜又抹繭慢漫魅岬妙眠矛霧婿娘銘滅免茂妄猛盲網耗黙戻紋匁厄躍柳愉癒諭唯幽悠憂猶裕誘雄融与誉庸揚揺擁溶窯謡踊抑翼羅裸頼雷絡酪欄濫吏履痢離硫粒隆竜慮虜了僚寮涼猟療糧陵倫厘隣塁涙累励鈴隷零霊麗齢暦劣烈裂廉恋錬炉露廊楼浪漏郎賄惑枠湾腕'),
-        (u'Jinmeiyou', u'阿葵茜渥旭梓絢綾鮎杏伊惟亥郁磯允胤卯丑叡瑛苑於伽嘉茄霞魁凱馨叶樺茅侃莞巌嬉毅稀誼鞠橘亨匡喬尭桐欣欽芹衿玖矩栗袈圭慧桂絃胡伍吾梧瑚鯉倖宏弘昂晃浩紘鴻嵯瑳裟哉冴朔笹皐燦獅爾蒔汐偲紗洲峻竣舜駿淳醇曙渚恕庄捷昌梢菖蕉丞穣晋榛秦翠瑞嵩雛碩惣綜聡蒼黛鯛鷹啄琢只辰巽檀智猪暢蝶槻蔦椿紬悌汀禎杜寅酉惇敦凪捺楠乃之巴萩肇鳩隼斐緋柊彦彪彬芙楓蕗碧甫輔朋萌鳳鵬睦槙柾亦麿巳稔椋孟也耶靖佑宥柚祐邑楊耀蓉遥蘭李琉亮凌稜諒遼琳麟伶嶺怜玲蓮禄倭亘侑勁奎崚彗昴晏晨晟暉栞椰毬洸洵滉漱澪燎燿瑶皓眸笙綺綸翔脩茉莉菫詢諄赳迪頌颯黎凜熙'),
-        (u'New Jouyou', u'挨宛闇椅畏萎茨咽淫臼唄餌怨艶旺岡臆俺苛牙崖蓋骸顎葛鎌瓦韓玩伎畿亀僅巾錦駒串窟熊稽詣隙桁拳鍵舷股虎乞喉梗頃痕沙挫塞采阪埼柵拶斬鹿叱嫉腫呪蹴哨拭尻芯腎須裾凄醒戚脊煎羨腺詮膳曽狙遡爽痩捉袖遜汰唾堆戴誰旦綻酎諜捗椎潰爪鶴諦溺填貼妬賭藤憧瞳栃頓奈那謎鍋匂虹捻罵剥箸斑氾汎眉膝肘媛阜蔽蔑蜂貌頬勃昧枕蜜冥麺餅冶弥湧妖沃嵐藍梨璃侶瞭瑠呂弄麓脇丼傲刹喩嗅嘲彙恣惧慄憬憚拉摯曖鬱璧瘍箋籠緻羞聘訃諧貪踪辣')
+        (u'New Jouyou', u'挨宛闇椅畏萎茨咽淫臼唄餌怨艶旺岡臆俺苛牙崖蓋骸顎葛鎌瓦韓玩伎畿亀僅巾錦駒串窟熊稽詣隙桁拳鍵舷股虎乞喉梗頃痕沙挫塞采阪埼柵拶斬鹿叱嫉腫呪蹴哨拭尻芯腎須裾凄醒戚脊煎羨腺詮膳曽狙遡爽痩捉袖遜汰唾堆戴誰旦綻酎諜捗椎潰爪鶴諦溺填貼妬賭藤憧瞳栃頓奈那謎鍋匂虹捻罵剥箸斑氾汎眉膝肘媛阜蔽蔑蜂貌頬勃昧枕蜜冥麺餅冶弥湧妖沃嵐藍梨璃侶瞭瑠呂弄麓脇丼傲刹喩嗅嘲彙恣惧慄憬憚拉摯曖鬱璧瘍箋籠緻羞聘訃諧貪踪辣'),
+        (u'Jinmeiyou (reg)', u'丑丞串乃之乎也云亘亙 些亦亥亨亮仔伊伎伍伽 佃佑伶侃侑俄俠俣俐侶 倭俺俱倦倖偲僅傭儲允 兎兜其冥冴冶凄凌凜凛 凧凪凰凱函刹劉劫勁勃勾匂勿匡廿卜卯卿厨厩 叉叡叢叶只吾吞吻呂哉 哨啄唄哩喬喧喰喋嘩嘉 嘗噌噂圃圭坐尭堯坦埼 埴堆堰堺堵塙塞塡壕壬 夷奄奈奎套妖娃姪姥娩媛嬉孟宏宋宛宕宥寅寓 寵尖尤屑岡峨峻崖崚嵐 嵯嵩嶺巌巖已巳巴巷巽 巾帖幌幡庄庇庚庵廟廻 弘弛弥彌彗彦彪彬徠忽 怜恢恰恕悌惟惚悉惇惹惺惣慧憧憐戊或戚戟戴 托按拶拭挨拳捉挺挽掬 捲捷捺捻捧掠揃摑摺撒 撰撞播撫擢孜敦斑斐斡 斧斯於旦旭旺昂昊昏昌 昧昴晏晃晄晒晋晟晦晨智暉暢曖曙曝曳曽曾朋 朔杏杖杜李杭杵枕杷枇 柑柴柵柿柘柊栃柏柾柚 桧檜栞桔桂桁栖桐栗梧 梗梓梢梛梯桶梶椛梨梁 椅棲椎椋椀楯楚楕椿楠楓椰楢楊榎樺榊榛槙槇 槍槌樫槻樟樋橘樽橙檎 檀櫂櫛櫓欣欽歎此殆毅 毘毬汀汝汐汎汲沙汰沌 沓沫洸洲洵洛浩浬淵淳 渚渚淀淋渥湘湊湛湧溢滉溜漱漕漣澪濡瀕灘灸 灼烏焰焚煌煎煤煉熙熊 燕燎燦燭燿爪爽爾牒牙 牟牡牽犀狼猪猪獅玖玩 珂珈珊珀玲琢琢琉瑛琥 琶琵琳瑚瑞瑶瑳瑠璃瓜瓢瓦甥甫畏畠畢畿疋疏 瘦皐皓眉眸睦瞳瞥瞭矩 砦砥砧硯碓碗碩碧磐磯 祇祢禰祐祐禄祿禎禎禱 禽禾秦秤稀稔稟稜稽穣 穰穿窄窟窪窺竣竪竺竿笈笹笙笠筈筑箕箔箸篇 篠簞簾籾粥粟糊紘紗紐絃紬絆絢綺綜綴緋綾綸 縞徽繫繡纂纏羚羨翔翠 耀而耶耽聡肇肋肘肴胤 胡脇脩腔腎膏膳臆臥臼 舜舷舵艶芥芹芯芭芙芦 苑茄苔苺茅茉茨茸茜莞 荻莫莉菅菫菖萄菩萌萠 萊菱葦葛葵萱葺萩董葡 蓋蓑蒔蒐蒼蒲蒙蓉蓮蔭 蔣蔦蓬蔓蕎蕨蕉蕃蕪蔽薙蕾蕗藁薩藤藍蘇蘭虎 虹蜂蜜蝦蝶螺蟬蟹蠟衿 袖袈袴裡裾裟裳襖訊訣 註詣詢詮詫誼諏諄誰諒 謂諺諦謎讃豹貌貰貼賑 赳跨蹄蹟蹴輔輯輿轟辰 辻迂迄辿迪迦這逞逗逢 遥遙遁遡遜遼邑那祁郁 鄭酉酎醇醐醒醍醬采釉 釘釜釧鋒鋸錦錐錆錫鍋鍵鍬鎧鎌閃閏閤闇阜阪 阿陀隈隙隼雀雁雛雫霞 靖鞄鞍鞘鞠鞭韓頁頃須 頌頓頗頰顚颯餅饗馨馴 馳駕駒駿驍魁魯鮎鯉鯛鰯鱒鱗鳩鳶鳳鴨鴻鵜鵬鶴鷗鷲鷺鷹鹿麒麓麟麿黎黛鼎亀'),
+        (u'Jinmeiyou (var)', u'亞惡爲逸衞谒緣應櫻奧橫溫價祸海壞懷樂渴卷陷寬漢氣祈器僞戲虛峽狹響曉勤謹勳薰惠揭鷄藝擊縣儉劍險圈檢顯驗嚴廣恆黃國黑穀碎雜祉視兒濕社者煮壽收臭從澁獸縱祝暑署緖諸敍將祥涉燒獎條狀乘淨剩疊孃讓釀神眞寢愼盡粹醉穗瀨齊靜攝節專戰纖禪祖壯爭莊搜巢裝僧層騷增憎藏贈臟卽帶滯單嘆團彈晝鑄節廳徵聽懲鎭轉傳都燈盜稻德突難拜賣梅髮拔繁晚卑祕碑賓敏侮福拂佛勉步墨飜每默藥與搖樣謠來賴覽欄龍虜綠淚壘類曆歷練鍊郞朗廊錄亙巖彌渚猪琢祐祿禎穰凛堯晄曾檜槇禰萠遙')
         ]