Merge pull request #606 from bhikkhu-kosalla-china/master

气泡优化

app/article/article.js

@@ -49,8 +49,10 @@ function articel_load(id, collection_id) {
 						result.content = result.content.replace(/[A-z]*.wikipali.org/g,WWW_DOMAIN_NAME);
 
 						$("#contents").html(note_init(result.content,"",result.owner,result.lang));
-						note_refresh_new();
+						//处理<code>标签作为气泡注释
+						popup_init();
 						guide_init();
+						note_refresh_new();
 					}
 				} catch (e) {
 					console.error(e);

app/article/index.php

@@ -343,7 +343,7 @@ function set_toc_visible(isVisible){
 	<div id="contents_view">
 		<div id="contents_div">
 			<div id="summary"></div>
-			<div id="contents" class="<?php echo $contentClass;?>">
+			<div id="contents" class="content_inner <?php echo $contentClass;?>">
 				<?php echo $_local->gui->loading; ?>...
 			</div>
 			<div id="contents_foot">

app/dict/grm_abbr.php

@@ -1,356 +1,360 @@
 <?php 
 
 define("GRM_ABBR",[
+	["dictid"=>1,"abbr"=>"indecl．","replace"=>"ind"],
+	["dictid"=>3,"abbr"=>"[adj．]","replace"=>"adj"],
+	["dictid"=>3,"abbr"=>"[adj.]","replace"=>"adj"],
+	["dictid"=>3,"abbr"=>"[adv．]","replace"=>"adv"],
+	["dictid"=>3,"abbr"=>"[adv.]","replace"=>"adv"],
+	["dictid"=>3,"abbr"=>"[ind．]","replace"=>"ind"],
+	["dictid"=>3,"abbr"=>"[ind.]","replace"=>"ind"],
+	["dictid"=>6,"abbr"=>"denom.","replace"=>"denom"],
+	["dictid"=>6,"abbr"=>"denom．","replace"=>"denom"],
+	["dictid"=>32,"abbr"=>"denom.","replace"=>"denom"],
+	["dictid"=>1,"abbr"=>"imper.","replace"=>"imp"],
+	["dictid"=>1,"abbr"=>"imper．","replace"=>"imp"],
+	["dictid"=>8,"abbr"=>"imper．","replace"=>"imp"],
+	["dictid"=>3,"abbr"=>"imper.","replace"=>"imp"],
+	["dictid"=>6,"abbr"=>"imper.","replace"=>"imp"],
+	["dictid"=>6,"abbr"=>"imper．","replace"=>"imp"],
+	["dictid"=>18,"abbr"=>"imper.","replace"=>"imp"],
+	["dictid"=>32,"abbr"=>"imper.","replace"=>"imp"],
+	["dictid"=>1,"abbr"=>"instr．","replace"=>"inst"],
+	["dictid"=>8,"abbr"=>"instr．","replace"=>"inst"],
+	["dictid"=>3,"abbr"=>"instr．","replace"=>"inst"],
+	["dictid"=>3,"abbr"=>"instr.","replace"=>"inst"],
+	["dictid"=>6,"abbr"=>"Instr.","replace"=>"inst"],
+	["dictid"=>6,"abbr"=>"Instr．","replace"=>"inst"],
+	["dictid"=>15,"abbr"=>"Instr．","replace"=>"inst"],
+	["dictid"=>18,"abbr"=>"instr．","replace"=>"inst"],
+	["dictid"=>32,"abbr"=>"instr.","replace"=>"inst"],
+	["dictid"=>32,"abbr"=>"ppr-a.","replace"=>"prp"],
+	["dictid"=>32,"abbr"=>"ppr-p.","replace"=>"prp"],
 	["dictid"=>2,"abbr"=>"（bya）","replace"=>"ind"],
+	["dictid"=>2,"abbr"=>"（kri）","replace"=>"verb"],
+	["dictid"=>35,"abbr"=>"（kri）","replace"=>"verb"],
 	["dictid"=>2,"abbr"=>"（thī）","replace"=>"f"],
 	["dictid"=>2,"abbr"=>"（thī，","replace"=>"f"],
 	["dictid"=>2,"abbr"=>"，thī）","replace"=>"f"],
-	["dictid"=>2,"abbr"=>"（pu）","replace"=>"m"],
-	["dictid"=>2,"abbr"=>"（pu，","replace"=>"m"],
+	["dictid"=>19,"abbr"=>"caus．","replace"=>"caus"],
+	["dictid"=>1,"abbr"=>"caus.","replace"=>"caus"],
+	["dictid"=>1,"abbr"=>"caus．","replace"=>"caus"],
+	["dictid"=>1,"abbr"=>"caus．","replace"=>"caus"],
+	["dictid"=>8,"abbr"=>"caus．","replace"=>"caus"],
+	["dictid"=>3,"abbr"=>"caus.","replace"=>"caus"],
+	["dictid"=>15,"abbr"=>"Caus．","replace"=>"caus"],
+	["dictid"=>18,"abbr"=>"caus.","replace"=>"caus"],
+	["dictid"=>32,"abbr"=>"caus.","replace"=>"caus"],
+	["dictid"=>6,"abbr"=>"cond.","replace"=>"cond"],
+	["dictid"=>32,"abbr"=>"fp-a.","replace"=>"prp"],
+	["dictid"=>3,"abbr"=>"ind．]","replace"=>"ind"],
+	["dictid"=>1,"abbr"=>"inst．","replace"=>"inst"],
+	["dictid"=>8,"abbr"=>"inst．","replace"=>"inst"],
+	["dictid"=>3,"abbr"=>"inst．","replace"=>"inst"],
+	["dictid"=>3,"abbr"=>"inst.","replace"=>"inst"],
+	["dictid"=>15,"abbr"=>"Inst．","replace"=>"inst"],
+	["dictid"=>18,"abbr"=>"inst．","replace"=>"inst"],
+	["dictid"=>32,"abbr"=>"inst.","replace"=>"inst"],
+	["dictid"=>3,"abbr"=>"pr.p.","replace"=>"prp"],
+	["dictid"=>19,"abbr"=>"pref．","replace"=>"pref"],
+	["dictid"=>1,"abbr"=>"pref．","replace"=>"pref"],
+	["dictid"=>8,"abbr"=>"pref．","replace"=>"pref"],
+	["dictid"=>6,"abbr"=>"pres.","replace"=>"pres"],
+	["dictid"=>19,"abbr"=>"pron．","replace"=>"pron"],
+	["dictid"=>1,"abbr"=>"pron．","replace"=>"pron"],
+	["dictid"=>8,"abbr"=>"pron．","replace"=>"pron"],
+	["dictid"=>6,"abbr"=>"pron.","replace"=>"pron"],
+	["dictid"=>32,"abbr"=>"pron.","replace"=>"pron"],
+	["dictid"=>15,"abbr"=>"Vism．","replace"=>"vism"],
+	["dictid"=>3,"abbr"=>"（m．）","replace"=>"m"],
+	["dictid"=>15,"abbr"=>"（m．)","replace"=>"m"],
 	["dictid"=>2,"abbr"=>"（na）","replace"=>"nt"],
+	["dictid"=>35,"abbr"=>"（na）","replace"=>"nt"],
 	["dictid"=>2,"abbr"=>"（na，","replace"=>"nt"],
-	["dictid"=>2,"abbr"=>"，na）","replace"=>"nt"],
-	["dictid"=>2,"abbr"=>"（ti）","replace"=>"ti"],
-	["dictid"=>2,"abbr"=>"（kri）","replace"=>"verb"],
+	["dictid"=>35,"abbr"=>"（na，","replace"=>"nt"],
 	["dictid"=>35,"abbr"=>"（pa）","replace"=>"m"],
+	["dictid"=>2,"abbr"=>"（pu）","replace"=>"m"],
+	["dictid"=>2,"abbr"=>"（pu，","replace"=>"m"],
 	["dictid"=>35,"abbr"=>"（pu，","replace"=>"m"],
-	["dictid"=>35,"abbr"=>"（na）","replace"=>"nt"],
-	["dictid"=>35,"abbr"=>"（na，","replace"=>"nt"],
-	["dictid"=>35,"abbr"=>"，na）","replace"=>"nt"],
+	["dictid"=>2,"abbr"=>"（ti）","replace"=>"ti"],
 	["dictid"=>35,"abbr"=>"（ti）","replace"=>"ti"],
-	["dictid"=>35,"abbr"=>"（kri）","replace"=>"verb"],
-	["dictid"=>35,"abbr"=>"（i）","replace"=>"f"],
-	["dictid"=>4,"abbr"=>"【字首】","replace"=>"pref"],
-	["dictid"=>4,"abbr"=>"【过】","replace"=>"aor"],
+	["dictid"=>2,"abbr"=>"，na）","replace"=>"nt"],
+	["dictid"=>35,"abbr"=>"，na）","replace"=>"nt"],
+	["dictid"=>3,"abbr"=>"[a．]","replace"=>"adj"],
+	["dictid"=>3,"abbr"=>"[a.]","replace"=>"adj"],
+	["dictid"=>3,"abbr"=>"[f．]","replace"=>"f"],
+	["dictid"=>3,"abbr"=>"[f.]","replace"=>"f"],
+	["dictid"=>3,"abbr"=>"[m．]","replace"=>"m"],
+	["dictid"=>3,"abbr"=>"[m.]","replace"=>"m"],
+	["dictid"=>3,"abbr"=>"[n．]","replace"=>"nt"],
+	["dictid"=>3,"abbr"=>"[n.]","replace"=>"nt"],
 	["dictid"=>4,"abbr"=>"【过分】","replace"=>"pp"],
-	["dictid"=>4,"abbr"=>"【现分】","replace"=>"prp"],
-	["dictid"=>4,"abbr"=>"【独】","replace"=>"abs"],
-	["dictid"=>4,"abbr"=>"【潜】","replace"=>"opt"],
-	["dictid"=>4,"abbr"=>"【不】","replace"=>"ind"],
-	["dictid"=>4,"abbr"=>"【形】","replace"=>"adj"],
-	["dictid"=>4,"abbr"=>"【三】","replace"=>"ti"],
-	["dictid"=>4,"abbr"=>"【阳】","replace"=>"m"],
-	["dictid"=>4,"abbr"=>"【中】","replace"=>"nt"],
-	["dictid"=>4,"abbr"=>"【阴】","replace"=>"f"],
-	["dictid"=>4,"abbr"=>"【副】","replace"=>"adv"],
-	["dictid"=>4,"abbr"=>"【祈】","replace"=>"opt"],
-	["dictid"=>4,"abbr"=>"【合】","replace"=>"incomp"],
-	["dictid"=>4,"abbr"=>"【无】","replace"=>"ind"],
-	["dictid"=>4,"abbr"=>"（梵","replace"=>"bsk"],
-	["dictid"=>6,"abbr"=>"【字首】","replace"=>"pref"],
-	["dictid"=>6,"abbr"=>"【过】","replace"=>"aor"],
 	["dictid"=>6,"abbr"=>"【过分】","replace"=>"pp"],
+	["dictid"=>4,"abbr"=>"【现分】","replace"=>"prp"],
 	["dictid"=>6,"abbr"=>"【现分】","replace"=>"prp"],
-	["dictid"=>6,"abbr"=>"【独】","replace"=>"abs"],
-	["dictid"=>6,"abbr"=>"【潜】","replace"=>"opt"],
-	["dictid"=>6,"abbr"=>"【不】","replace"=>"ind"],
-	["dictid"=>6,"abbr"=>"【形】","replace"=>"adj"],
-	["dictid"=>6,"abbr"=>"【三】","replace"=>"ti"],
-	["dictid"=>6,"abbr"=>"【阳】","replace"=>"m"],
-	["dictid"=>6,"abbr"=>"【中】","replace"=>"nt"],
-	["dictid"=>6,"abbr"=>"【阴】","replace"=>"f"],
-	["dictid"=>6,"abbr"=>"【副】","replace"=>"adv"],
-	["dictid"=>6,"abbr"=>"【祈】","replace"=>"opt"],
-	["dictid"=>6,"abbr"=>"【合】","replace"=>"incomp"],
-	["dictid"=>6,"abbr"=>"【无】","replace"=>"ind"],
-	["dictid"=>6,"abbr"=>"（梵","replace"=>"bsk"],
-	["dictid"=>6,"abbr"=>"cond.","replace"=>"cond"],
-	["dictid"=>6,"abbr"=>"pres.","replace"=>"pres"],
-	["dictid"=>6,"abbr"=>"fut.","replace"=>"fut"],
-	["dictid"=>6,"abbr"=>"fut.","replace"=>"fut"],
-	["dictid"=>19,"abbr"=>"pron．","replace"=>"pron"],
-	["dictid"=>19,"abbr"=>"pref．","replace"=>"pref"],
+	["dictid"=>4,"abbr"=>"【字首】","replace"=>"pref"],
+	["dictid"=>6,"abbr"=>"【字首】","replace"=>"pref"],
+	["dictid"=>1,"abbr"=>"abl．","replace"=>"abl"],
+	["dictid"=>8,"abbr"=>"abl．","replace"=>"abl"],
+	["dictid"=>3,"abbr"=>"abl．","replace"=>"abl"],
+	["dictid"=>3,"abbr"=>"abl.","replace"=>"abl"],
+	["dictid"=>6,"abbr"=>"Abl.","replace"=>"abl"],
+	["dictid"=>6,"abbr"=>"Abl．","replace"=>"abl"],
+	["dictid"=>15,"abbr"=>"Abl．","replace"=>"abl"],
+	["dictid"=>18,"abbr"=>"abl．","replace"=>"abl"],
+	["dictid"=>32,"abbr"=>"abl.","replace"=>"abl"],
+	["dictid"=>1,"abbr"=>"acc．","replace"=>"acc"],
+	["dictid"=>8,"abbr"=>"acc．","replace"=>"acc"],
+	["dictid"=>3,"abbr"=>"acc．","replace"=>"acc"],
+	["dictid"=>3,"abbr"=>"acc.","replace"=>"acc"],
+	["dictid"=>6,"abbr"=>"Acc.","replace"=>"acc"],
+	["dictid"=>6,"abbr"=>"Acc．","replace"=>"acc"],
+	["dictid"=>15,"abbr"=>"Acc．","replace"=>"acc"],
+	["dictid"=>18,"abbr"=>"acc．","replace"=>"acc"],
+	["dictid"=>32,"abbr"=>"acc.","replace"=>"acc"],
+	["dictid"=>15,"abbr"=>"adj．","replace"=>"adj"],
+	["dictid"=>1,"abbr"=>"adv．","replace"=>"adv"],
+	["dictid"=>8,"abbr"=>"adv．","replace"=>"adv"],
+	["dictid"=>6,"abbr"=>"adv.","replace"=>"adv"],
+	["dictid"=>6,"abbr"=>"adv．","replace"=>"adv"],
+	["dictid"=>15,"abbr"=>"adv．","replace"=>"adv"],
+	["dictid"=>18,"abbr"=>"adv．","replace"=>"adv"],
+	["dictid"=>32,"abbr"=>"adv.","replace"=>"adv"],
 	["dictid"=>19,"abbr"=>"aor．","replace"=>"aor"],
-	["dictid"=>19,"abbr"=>"caus．","replace"=>"caus"],
+	["dictid"=>1,"abbr"=>"aor．","replace"=>"aor"],
+	["dictid"=>8,"abbr"=>"aor．","replace"=>"aor"],
+	["dictid"=>3,"abbr"=>"aor．","replace"=>"aor"],
+	["dictid"=>3,"abbr"=>"aor.","replace"=>"aor"],
+	["dictid"=>6,"abbr"=>"aor.","replace"=>"aor"],
+	["dictid"=>6,"abbr"=>"aor．","replace"=>"aor"],
+	["dictid"=>15,"abbr"=>"aor．","replace"=>"aor"],
+	["dictid"=>18,"abbr"=>"aor．","replace"=>"aor"],
+	["dictid"=>32,"abbr"=>"aor.","replace"=>"aor"],
+	["dictid"=>1,"abbr"=>"BSk．","replace"=>"bsk"],
+	["dictid"=>1,"abbr"=>"Bsk．","replace"=>"bsk"],
+	["dictid"=>8,"abbr"=>"BSk．","replace"=>"bsk"],
+	["dictid"=>8,"abbr"=>"Bsk．","replace"=>"bsk"],
+	["dictid"=>18,"abbr"=>"BSk．","replace"=>"bsk"],
+	["dictid"=>18,"abbr"=>"Bsk．","replace"=>"bsk"],
+	["dictid"=>1,"abbr"=>"dat．","replace"=>"dat"],
+	["dictid"=>8,"abbr"=>"dat．","replace"=>"dat"],
+	["dictid"=>3,"abbr"=>"dat．","replace"=>"dat"],
+	["dictid"=>3,"abbr"=>"dat.","replace"=>"dat"],
+	["dictid"=>6,"abbr"=>"Dat.","replace"=>"dat"],
+	["dictid"=>6,"abbr"=>"Dat．","replace"=>"dat"],
+	["dictid"=>15,"abbr"=>"Dat．","replace"=>"dat"],
+	["dictid"=>18,"abbr"=>"dat．","replace"=>"dat"],
+	["dictid"=>32,"abbr"=>"dat.","replace"=>"dat"],
+	["dictid"=>6,"abbr"=>"fpp.","replace"=>"fpp"],
+	["dictid"=>6,"abbr"=>"fpp．","replace"=>"fpp"],
+	["dictid"=>32,"abbr"=>"fpp.","replace"=>"fpp"],
+	["dictid"=>6,"abbr"=>"fut.","replace"=>"fut"],
+	["dictid"=>1,"abbr"=>"fut.","replace"=>"fut"],
+	["dictid"=>19,"abbr"=>"fut.","replace"=>"fut"],
+	["dictid"=>18,"abbr"=>"fut.","replace"=>"fut"],
+	["dictid"=>1,"abbr"=>"fut．","replace"=>"fut"],
+	["dictid"=>6,"abbr"=>"Fut．","replace"=>"fut"],
+	["dictid"=>8,"abbr"=>"fut．","replace"=>"fut"],
+	["dictid"=>18,"abbr"=>"fut．","replace"=>"fut"],
 	["dictid"=>19,"abbr"=>"fut．","replace"=>"fut"],
+	["dictid"=>1,"abbr"=>"gen．","replace"=>"gen"],
+	["dictid"=>8,"abbr"=>"gen．","replace"=>"gen"],
+	["dictid"=>3,"abbr"=>"gen．","replace"=>"gen"],
+	["dictid"=>3,"abbr"=>"gen.","replace"=>"gen"],
+	["dictid"=>6,"abbr"=>"Gen.","replace"=>"gen"],
+	["dictid"=>6,"abbr"=>"Gen．","replace"=>"gen"],
+	["dictid"=>15,"abbr"=>"Gen．","replace"=>"gen"],
+	["dictid"=>18,"abbr"=>"gen．","replace"=>"gen"],
+	["dictid"=>32,"abbr"=>"gen.","replace"=>"gen"],
+	["dictid"=>1,"abbr"=>"ger．","replace"=>"abs"],
+	["dictid"=>8,"abbr"=>"ger．","replace"=>"abs"],
+	["dictid"=>3,"abbr"=>"ger．","replace"=>"abs"],
+	["dictid"=>3,"abbr"=>"ger.","replace"=>"abs"],
+	["dictid"=>6,"abbr"=>"Ger.","replace"=>"abs"],
+	["dictid"=>6,"abbr"=>"Ger．","replace"=>"abs"],
+	["dictid"=>15,"abbr"=>"Ger．","replace"=>"abs"],
+	["dictid"=>18,"abbr"=>"ger．","replace"=>"abs"],
+	["dictid"=>32,"abbr"=>"ger.","replace"=>"abs"],
 	["dictid"=>19,"abbr"=>"grd．","replace"=>"fpp"],
+	["dictid"=>1,"abbr"=>"grd．","replace"=>"fpp"],
+	["dictid"=>8,"abbr"=>"grd．","replace"=>"fpp"],
+	["dictid"=>8,"abbr"=>"grd．","replace"=>"fpp"],
+	["dictid"=>3,"abbr"=>"grd.","replace"=>"fpp"],
+	["dictid"=>6,"abbr"=>"grd.","replace"=>"fpp"],
+	["dictid"=>6,"abbr"=>"grd．","replace"=>"fpp"],
+	["dictid"=>18,"abbr"=>"grd.","replace"=>"fpp"],
+	["dictid"=>32,"abbr"=>"grd.","replace"=>"fpp"],
+	["dictid"=>1,"abbr"=>"grd.","replace"=>"fpp"],
+	["dictid"=>1,"abbr"=>"grd．","replace"=>"fpp"],
+	["dictid"=>6,"abbr"=>"imp.","replace"=>"imp"],
+	["dictid"=>6,"abbr"=>"imp．","replace"=>"imp"],
+	["dictid"=>1,"abbr"=>"loc．","replace"=>"loc"],
+	["dictid"=>8,"abbr"=>"loc．","replace"=>"loc"],
+	["dictid"=>3,"abbr"=>"loc．","replace"=>"loc"],
+	["dictid"=>3,"abbr"=>"loc.","replace"=>"loc"],
+	["dictid"=>6,"abbr"=>"Loc.","replace"=>"loc"],
+	["dictid"=>6,"abbr"=>"Loc．","replace"=>"loc"],
+	["dictid"=>15,"abbr"=>"Loc．","replace"=>"loc"],
+	["dictid"=>18,"abbr"=>"loc．","replace"=>"loc"],
+	["dictid"=>32,"abbr"=>"loc.","replace"=>"loc"],
+	["dictid"=>1,"abbr"=>"nom．","replace"=>"nom"],
+	["dictid"=>8,"abbr"=>"nom．","replace"=>"nom"],
+	["dictid"=>3,"abbr"=>"nom．","replace"=>"nom"],
+	["dictid"=>3,"abbr"=>"nom.","replace"=>"nom"],
+	["dictid"=>6,"abbr"=>"Nom.","replace"=>"nom"],
+	["dictid"=>6,"abbr"=>"Nom．","replace"=>"nom"],
+	["dictid"=>15,"abbr"=>"Nom．","replace"=>"nom"],
+	["dictid"=>18,"abbr"=>"nom．","replace"=>"nom"],
+	["dictid"=>32,"abbr"=>"nom.","replace"=>"nom"],
+	["dictid"=>1,"abbr"=>"num．","replace"=>"num"],
+	["dictid"=>1,"abbr"=>"num.","replace"=>"num"],
+	["dictid"=>8,"abbr"=>"num．","replace"=>"num"],
+	["dictid"=>1,"abbr"=>"opt．","replace"=>"opt"],
+	["dictid"=>8,"abbr"=>"opt．","replace"=>"opt"],
+	["dictid"=>3,"abbr"=>"opt．","replace"=>"opt"],
+	["dictid"=>3,"abbr"=>"opt.","replace"=>"opt"],
+	["dictid"=>6,"abbr"=>"opt.","replace"=>"opt"],
+	["dictid"=>6,"abbr"=>"opt．","replace"=>"opt"],
+	["dictid"=>15,"abbr"=>"opt．","replace"=>"opt"],
+	["dictid"=>18,"abbr"=>"opt．","replace"=>"opt"],
+	["dictid"=>32,"abbr"=>"opt.","replace"=>"opt"],
 	["dictid"=>1,"abbr"=>"ppr．","replace"=>"prp"],
 	["dictid"=>8,"abbr"=>"ppr．","replace"=>"prp"],
 	["dictid"=>10,"abbr"=>"ppr．","replace"=>"prp"],
 	["dictid"=>18,"abbr"=>"ppr．","replace"=>"prp"],
 	["dictid"=>19,"abbr"=>"ppr．","replace"=>"prp"],
-	["dictid"=>1,"abbr"=>"caus.","replace"=>"caus"],
-	["dictid"=>1,"abbr"=>"imper.","replace"=>"imp"],
 	["dictid"=>1,"abbr"=>"ppr.","replace"=>"prp"],
-	["dictid"=>1,"abbr"=>"pp.","replace"=>"pp"],
-	["dictid"=>1,"abbr"=>"grd.","replace"=>"fpp"],
-	["dictid"=>1,"abbr"=>"pron．","replace"=>"pron"],
-	["dictid"=>1,"abbr"=>"pref．","replace"=>"pref"],
-	["dictid"=>1,"abbr"=>"grd．","replace"=>"fpp"],
-	["dictid"=>1,"abbr"=>"caus．","replace"=>"caus"],
-	["dictid"=>1,"abbr"=>"fut.","replace"=>"fut"],
-	["dictid"=>1,"abbr"=>"num．","replace"=>"num"],
-	["dictid"=>1,"abbr"=>"num.","replace"=>"num"],
-	["dictid"=>1,"abbr"=>"fut．","replace"=>"fut"],
-	["dictid"=>1,"abbr"=>"imper．","replace"=>"imp"],	
-	["dictid"=>1,"abbr"=>"caus．","replace"=>"caus"],
-	["dictid"=>1,"abbr"=>"BSk．","replace"=>"bsk"],	
-	["dictid"=>1,"abbr"=>"indecl．","replace"=>"ind"],	
-	["dictid"=>1,"abbr"=>"Bsk．","replace"=>"bsk"],
-	["dictid"=>1,"abbr"=>"aor．","replace"=>"aor"],
-	["dictid"=>1,"abbr"=>"ger．","replace"=>"abs"],
-	["dictid"=>1,"abbr"=>"nom．","replace"=>"nom"],
-	["dictid"=>1,"abbr"=>"acc．","replace"=>"acc"],
-	["dictid"=>1,"abbr"=>"voc．","replace"=>"voc"],
-	["dictid"=>1,"abbr"=>"abl．","replace"=>"abl"],
-	["dictid"=>1,"abbr"=>"instr．","replace"=>"inst"],
-	["dictid"=>1,"abbr"=>"inst．","replace"=>"inst"],
-	["dictid"=>1,"abbr"=>"dat．","replace"=>"dat"],
-	["dictid"=>1,"abbr"=>"gen．","replace"=>"gen"],
-	["dictid"=>1,"abbr"=>"loc．","replace"=>"loc"],
-	["dictid"=>1,"abbr"=>"opt．","replace"=>"opt"],
-	["dictid"=>1,"abbr"=>"adv．","replace"=>"adv"],
-	["dictid"=>1,"abbr"=>"grd．","replace"=>"fpp"],
-	["dictid"=>1,"abbr"=>"Sk．","replace"=>"sk"],
-	["dictid"=>1,"abbr"=>"cf．","replace"=>"cf"],
-	["dictid"=>1,"abbr"=>"pp．","replace"=>"pp"],
-	["dictid"=>1,"abbr"=>"pl．","replace"=>"pl"],
-	["dictid"=>1,"abbr"=>"sg．","replace"=>"sg"],
-	["dictid"=>1,"abbr"=>"m．","replace"=>"m"],
-	["dictid"=>1,"abbr"=>"f．","replace"=>"f"],
-	["dictid"=>1,"abbr"=>"n．","replace"=>"nt"],
-	["dictid"=>1,"abbr"=>"：a．","replace"=>"adj"],
-	["dictid"=>8,"abbr"=>"pron．","replace"=>"pron"],
-	["dictid"=>8,"abbr"=>"pref．","replace"=>"pref"],
-	["dictid"=>8,"abbr"=>"grd．","replace"=>"fpp"],	
-	["dictid"=>8,"abbr"=>"imper．","replace"=>"imp"],	
-	["dictid"=>8,"abbr"=>"caus．","replace"=>"caus"],
-	["dictid"=>8,"abbr"=>"fut．","replace"=>"fut"],
-	["dictid"=>8,"abbr"=>"BSk．","replace"=>"bsk"],
-	["dictid"=>8,"abbr"=>"Bsk．","replace"=>"bsk"],
-	["dictid"=>8,"abbr"=>"aor．","replace"=>"aor"],
-	["dictid"=>8,"abbr"=>"ger．","replace"=>"abs"],
-	["dictid"=>8,"abbr"=>"nom．","replace"=>"nom"],
-	["dictid"=>8,"abbr"=>"num．","replace"=>"num"],
-	["dictid"=>8,"abbr"=>"acc．","replace"=>"acc"],
-	["dictid"=>8,"abbr"=>"voc．","replace"=>"voc"],
-	["dictid"=>8,"abbr"=>"abl．","replace"=>"abl"],
-	["dictid"=>8,"abbr"=>"instr．","replace"=>"inst"],
-	["dictid"=>8,"abbr"=>"inst．","replace"=>"inst"],
-	["dictid"=>8,"abbr"=>"dat．","replace"=>"dat"],
-	["dictid"=>8,"abbr"=>"gen．","replace"=>"gen"],
-	["dictid"=>8,"abbr"=>"loc．","replace"=>"loc"],
-	["dictid"=>8,"abbr"=>"opt．","replace"=>"opt"],
-	["dictid"=>8,"abbr"=>"adv．","replace"=>"adv"],
-	["dictid"=>8,"abbr"=>"grd．","replace"=>"fpp"],
-	["dictid"=>8,"abbr"=>"Sk．","replace"=>"sk"],
-	["dictid"=>8,"abbr"=>"cf．","replace"=>"cf"],
-	["dictid"=>8,"abbr"=>"pp．","replace"=>"pp"],
-	["dictid"=>8,"abbr"=>"pl．","replace"=>"pl"],
-	["dictid"=>8,"abbr"=>"sg．","replace"=>"sg"],
-	["dictid"=>8,"abbr"=>"m．","replace"=>"m"],
-	["dictid"=>8,"abbr"=>"f．","replace"=>"f"],
-	["dictid"=>8,"abbr"=>"n．","replace"=>"nt"],
-	["dictid"=>8,"abbr"=>"：a．","replace"=>"adj"],
-	["dictid"=>3,"abbr"=>"caus.","replace"=>"caus"],
-	["dictid"=>3,"abbr"=>"imper.","replace"=>"imp"],
 	["dictid"=>3,"abbr"=>"ppr.","replace"=>"prp"],
-	["dictid"=>3,"abbr"=>"pp.","replace"=>"pp"],
-	["dictid"=>3,"abbr"=>"grd.","replace"=>"fpp"],
-	["dictid"=>3,"abbr"=>"pr.p.","replace"=>"prp"],
-	["dictid"=>3,"abbr"=>"aor．","replace"=>"aor"],
-	["dictid"=>3,"abbr"=>"ger．","replace"=>"abs"],
-	["dictid"=>3,"abbr"=>"nom．","replace"=>"nom"],
-	["dictid"=>3,"abbr"=>"acc．","replace"=>"acc"],
-	["dictid"=>3,"abbr"=>"voc．","replace"=>"voc"],
-	["dictid"=>3,"abbr"=>"abl．","replace"=>"abl"],
-	["dictid"=>3,"abbr"=>"instr．","replace"=>"inst"],
-	["dictid"=>3,"abbr"=>"inst．","replace"=>"inst"],
-	["dictid"=>3,"abbr"=>"dat．","replace"=>"dat"],
-	["dictid"=>3,"abbr"=>"gen．","replace"=>"gen"],
-	["dictid"=>3,"abbr"=>"loc．","replace"=>"loc"],
-	["dictid"=>3,"abbr"=>"opt．","replace"=>"opt"],
-	["dictid"=>3,"abbr"=>"[adv．]","replace"=>"adv"],
-	["dictid"=>3,"abbr"=>"ind．]","replace"=>"ind"],
-	["dictid"=>3,"abbr"=>"[ind．]","replace"=>"ind"],
-	["dictid"=>3,"abbr"=>"cf．","replace"=>"cf"],
-	["dictid"=>3,"abbr"=>"pl．","replace"=>"pl"],
-	["dictid"=>3,"abbr"=>"sg．","replace"=>"sg"],
-	["dictid"=>3,"abbr"=>"pp．","replace"=>"pp"],
-	["dictid"=>3,"abbr"=>"[adj．]","replace"=>"adj"],
-	["dictid"=>3,"abbr"=>"[m．]","replace"=>"m"],
-	["dictid"=>3,"abbr"=>"（m．）","replace"=>"m"],
-	["dictid"=>3,"abbr"=>"[f．]","replace"=>"f"],
-	["dictid"=>3,"abbr"=>"[n．]","replace"=>"nt"],
-	["dictid"=>3,"abbr"=>"[a．]","replace"=>"adj"],
-	["dictid"=>3,"abbr"=>"aor.","replace"=>"aor"],
-	["dictid"=>3,"abbr"=>"ger.","replace"=>"abs"],
-	["dictid"=>3,"abbr"=>"nom.","replace"=>"nom"],
-	["dictid"=>3,"abbr"=>"acc.","replace"=>"acc"],
-	["dictid"=>3,"abbr"=>"voc.","replace"=>"voc"],
-	["dictid"=>3,"abbr"=>"abl.","replace"=>"abl"],
-	["dictid"=>3,"abbr"=>"instr.","replace"=>"inst"],
-	["dictid"=>3,"abbr"=>"inst.","replace"=>"inst"],
-	["dictid"=>3,"abbr"=>"dat.","replace"=>"dat"],
-	["dictid"=>3,"abbr"=>"gen.","replace"=>"gen"],
-	["dictid"=>3,"abbr"=>"loc.","replace"=>"loc"],
-	["dictid"=>3,"abbr"=>"opt.","replace"=>"opt"],
-	["dictid"=>3,"abbr"=>"[adv.]","replace"=>"adv"],
-	["dictid"=>3,"abbr"=>"[ind.]","replace"=>"ind"],
-	["dictid"=>3,"abbr"=>"cf.","replace"=>"cf"],
-	["dictid"=>3,"abbr"=>"pl.","replace"=>"pl"],
-	["dictid"=>3,"abbr"=>"sg.","replace"=>"sg"],
-	["dictid"=>3,"abbr"=>"pp.","replace"=>"pp"],
-	["dictid"=>3,"abbr"=>"[adj.]","replace"=>"adj"],
-	["dictid"=>3,"abbr"=>"[m.]","replace"=>"m"],
-	["dictid"=>3,"abbr"=>"m．","replace"=>"m"],
-	["dictid"=>3,"abbr"=>"[f.]","replace"=>"f"],
-	["dictid"=>3,"abbr"=>"[n.]","replace"=>"nt"],
-	["dictid"=>3,"abbr"=>"f．","replace"=>"f"],
-	["dictid"=>3,"abbr"=>"[a.]","replace"=>"adj"],
-	["dictid"=>6,"abbr"=>"imper.","replace"=>"imp"],
-	["dictid"=>6,"abbr"=>"denom.","replace"=>"denom"],
-	["dictid"=>6,"abbr"=>"pron.","replace"=>"pron"],
-	["dictid"=>6,"abbr"=>"prp.","replace"=>"prp"],
-	["dictid"=>6,"abbr"=>"imp.","replace"=>"imp"],
 	["dictid"=>6,"abbr"=>"ppr.","replace"=>"prp"],
-	["dictid"=>6,"abbr"=>"aor.","replace"=>"aor"],
-	["dictid"=>6,"abbr"=>"Ger.","replace"=>"abs"],
+	["dictid"=>6,"abbr"=>"ppr．","replace"=>"prp"],
+	["dictid"=>18,"abbr"=>"ppr.","replace"=>"prp"],
+	["dictid"=>32,"abbr"=>"ppr.","replace"=>"prp"],
+	["dictid"=>6,"abbr"=>"prp.","replace"=>"prp"],
 	["dictid"=>6,"abbr"=>"prp.","replace"=>"prp"],
-	["dictid"=>6,"abbr"=>"grd.","replace"=>"fpp"],
-	["dictid"=>6,"abbr"=>"fpp.","replace"=>"fpp"],
-	["dictid"=>6,"abbr"=>"Nom.","replace"=>"nom"],
-	["dictid"=>6,"abbr"=>"Acc.","replace"=>"acc"],
-	["dictid"=>6,"abbr"=>"Voc.","replace"=>"voc"],
-	["dictid"=>6,"abbr"=>"Abl.","replace"=>"abl"],
-	["dictid"=>6,"abbr"=>"Instr.","replace"=>"inst"],
-	["dictid"=>6,"abbr"=>"Dat.","replace"=>"dat"],
-	["dictid"=>6,"abbr"=>"Gen.","replace"=>"gen"],
-	["dictid"=>6,"abbr"=>"Loc.","replace"=>"loc"],
-	["dictid"=>6,"abbr"=>"opt.","replace"=>"opt"],
-	["dictid"=>6,"abbr"=>"adv.","replace"=>"adv"],
-	["dictid"=>6,"abbr"=>"1p.","replace"=>"1p"],
-	["dictid"=>6,"abbr"=>"2p.","replace"=>"2p"],
-	["dictid"=>6,"abbr"=>"3p.","replace"=>"3p"],
-	["dictid"=>6,"abbr"=>"cf.","replace"=>"cf"],
-	["dictid"=>6,"abbr"=>"pl.","replace"=>"pl"],
-	["dictid"=>6,"abbr"=>"sg.","replace"=>"sg"],
-	["dictid"=>6,"abbr"=>"pr.","replace"=>"pr"],
-	["dictid"=>6,"abbr"=>"pp.","replace"=>"pp"],
-	["dictid"=>6,"abbr"=>"m.","replace"=>"m"],
-	["dictid"=>6,"abbr"=>"f.","replace"=>"f"],
-	["dictid"=>6,"abbr"=>"n.","replace"=>"nt"],
-	["dictid"=>6,"abbr"=>"子音","replace"=>"consonant"],
-	["dictid"=>6,"abbr"=>"imper．","replace"=>"imp"],
-	["dictid"=>6,"abbr"=>"denom．","replace"=>"denom"],
 	["dictid"=>6,"abbr"=>"prp．","replace"=>"prp"],
-	["dictid"=>6,"abbr"=>"imp．","replace"=>"imp"],
-	["dictid"=>6,"abbr"=>"ppr．","replace"=>"prp"],
-	["dictid"=>6,"abbr"=>"aor．","replace"=>"aor"],
-	["dictid"=>6,"abbr"=>"Ger．","replace"=>"abs"],
 	["dictid"=>6,"abbr"=>"prp．","replace"=>"prp"],
-	["dictid"=>6,"abbr"=>"grd．","replace"=>"fpp"],
-	["dictid"=>6,"abbr"=>"fpp．","replace"=>"fpp"],
-	["dictid"=>6,"abbr"=>"Nom．","replace"=>"nom"],
-	["dictid"=>6,"abbr"=>"Acc．","replace"=>"acc"],
+	["dictid"=>32,"abbr"=>"prp.","replace"=>"prp"],
+	["dictid"=>15,"abbr"=>"Vin．","replace"=>"vinaya"],
+	["dictid"=>1,"abbr"=>"voc．","replace"=>"voc"],
+	["dictid"=>8,"abbr"=>"voc．","replace"=>"voc"],
+	["dictid"=>3,"abbr"=>"voc．","replace"=>"voc"],
+	["dictid"=>3,"abbr"=>"voc.","replace"=>"voc"],
+	["dictid"=>6,"abbr"=>"Voc.","replace"=>"voc"],
 	["dictid"=>6,"abbr"=>"Voc．","replace"=>"voc"],
-	["dictid"=>6,"abbr"=>"Abl．","replace"=>"abl"],
-	["dictid"=>6,"abbr"=>"Instr．","replace"=>"inst"],
-	["dictid"=>6,"abbr"=>"Dat．","replace"=>"dat"],
-	["dictid"=>6,"abbr"=>"Gen．","replace"=>"gen"],
-	["dictid"=>6,"abbr"=>"Loc．","replace"=>"loc"],
-	["dictid"=>6,"abbr"=>"opt．","replace"=>"opt"],
-	["dictid"=>6,"abbr"=>"adv．","replace"=>"adv"],
+	["dictid"=>15,"abbr"=>"Voc．","replace"=>"voc"],
+	["dictid"=>18,"abbr"=>"voc．","replace"=>"voc"],
+	["dictid"=>32,"abbr"=>"voc.","replace"=>"voc"],
+	["dictid"=>35,"abbr"=>"（i）","replace"=>"f"],
+	["dictid"=>1,"abbr"=>"：a．","replace"=>"adj"],
+	["dictid"=>8,"abbr"=>"：a．","replace"=>"adj"],
+	["dictid"=>18,"abbr"=>"：a．","replace"=>"adj"],
+	["dictid"=>4,"abbr"=>"【不】","replace"=>"ind"],
+	["dictid"=>6,"abbr"=>"【不】","replace"=>"ind"],
+	["dictid"=>4,"abbr"=>"【独】","replace"=>"abs"],
+	["dictid"=>6,"abbr"=>"【独】","replace"=>"abs"],
+	["dictid"=>4,"abbr"=>"【副】","replace"=>"adv"],
+	["dictid"=>6,"abbr"=>"【副】","replace"=>"adv"],
+	["dictid"=>4,"abbr"=>"【过】","replace"=>"aor"],
+	["dictid"=>6,"abbr"=>"【过】","replace"=>"aor"],
+	["dictid"=>4,"abbr"=>"【合】","replace"=>"incomp"],
+	["dictid"=>6,"abbr"=>"【合】","replace"=>"incomp"],
+	["dictid"=>4,"abbr"=>"【祈】","replace"=>"opt"],
+	["dictid"=>6,"abbr"=>"【祈】","replace"=>"opt"],
+	["dictid"=>4,"abbr"=>"【潜】","replace"=>"opt"],
+	["dictid"=>6,"abbr"=>"【潜】","replace"=>"opt"],
+	["dictid"=>4,"abbr"=>"【三】","replace"=>"ti"],
+	["dictid"=>6,"abbr"=>"【三】","replace"=>"ti"],
+	["dictid"=>4,"abbr"=>"【无】","replace"=>"ind"],
+	["dictid"=>6,"abbr"=>"【无】","replace"=>"ind"],
+	["dictid"=>4,"abbr"=>"【形】","replace"=>"adj"],
+	["dictid"=>6,"abbr"=>"【形】","replace"=>"adj"],
+	["dictid"=>4,"abbr"=>"【阳】","replace"=>"m"],
+	["dictid"=>6,"abbr"=>"【阳】","replace"=>"m"],
+	["dictid"=>4,"abbr"=>"【阴】","replace"=>"f"],
+	["dictid"=>6,"abbr"=>"【阴】","replace"=>"f"],
+	["dictid"=>4,"abbr"=>"【中】","replace"=>"nt"],
+	["dictid"=>6,"abbr"=>"【中】","replace"=>"nt"],
+	["dictid"=>6,"abbr"=>"1p.","replace"=>"1p"],
 	["dictid"=>6,"abbr"=>"1p．","replace"=>"1p"],
+	["dictid"=>32,"abbr"=>"1p.","replace"=>"1p"],
+	["dictid"=>6,"abbr"=>"2p.","replace"=>"2p"],
 	["dictid"=>6,"abbr"=>"2p．","replace"=>"2p"],
+	["dictid"=>32,"abbr"=>"2p.","replace"=>"2p"],
+	["dictid"=>6,"abbr"=>"3p.","replace"=>"3p"],
 	["dictid"=>6,"abbr"=>"3p．","replace"=>"3p"],
+	["dictid"=>32,"abbr"=>"3p.","replace"=>"3p"],
+	["dictid"=>1,"abbr"=>"cf．","replace"=>"cf"],
+	["dictid"=>8,"abbr"=>"cf．","replace"=>"cf"],
+	["dictid"=>3,"abbr"=>"cf．","replace"=>"cf"],
+	["dictid"=>3,"abbr"=>"cf.","replace"=>"cf"],
+	["dictid"=>6,"abbr"=>"cf.","replace"=>"cf"],
 	["dictid"=>6,"abbr"=>"cf．","replace"=>"cf"],
-	["dictid"=>6,"abbr"=>"pl．","replace"=>"pl"],
-	["dictid"=>6,"abbr"=>"sg．","replace"=>"sg"],
-	["dictid"=>6,"abbr"=>"pr．","replace"=>"pr"],
-	["dictid"=>6,"abbr"=>"pp．","replace"=>"pp"],
-	["dictid"=>6,"abbr"=>"m．","replace"=>"m"],
-	["dictid"=>6,"abbr"=>"f．","replace"=>"f"],
-	["dictid"=>6,"abbr"=>"n．","replace"=>"nt"],
-	["dictid"=>15,"abbr"=>"Caus．","replace"=>"caus"],
-	["dictid"=>15,"abbr"=>"Vism．","replace"=>"vism"],
-	["dictid"=>15,"abbr"=>"Vin．","replace"=>"vinaya"],
-	["dictid"=>15,"abbr"=>"aor．","replace"=>"aor"],
-	["dictid"=>15,"abbr"=>"Ger．","replace"=>"abs"],
-	["dictid"=>15,"abbr"=>"Nom．","replace"=>"nom"],
-	["dictid"=>15,"abbr"=>"Acc．","replace"=>"acc"],
-	["dictid"=>15,"abbr"=>"Voc．","replace"=>"voc"],
-	["dictid"=>15,"abbr"=>"Abl．","replace"=>"abl"],
-	["dictid"=>15,"abbr"=>"Instr．","replace"=>"inst"],
-	["dictid"=>15,"abbr"=>"Inst．","replace"=>"inst"],
-	["dictid"=>15,"abbr"=>"Dat．","replace"=>"dat"],
-	["dictid"=>15,"abbr"=>"Gen．","replace"=>"gen"],
-	["dictid"=>15,"abbr"=>"Loc．","replace"=>"loc"],
-	["dictid"=>15,"abbr"=>"opt．","replace"=>"opt"],
-	["dictid"=>15,"abbr"=>"adv．","replace"=>"adv"],
-	["dictid"=>15,"abbr"=>"Sk．","replace"=>"sk"],
 	["dictid"=>15,"abbr"=>"cf．","replace"=>"cf"],
-	["dictid"=>15,"abbr"=>"pl．","replace"=>"pl"],
-	["dictid"=>15,"abbr"=>"sg．","replace"=>"sg"],
-	["dictid"=>15,"abbr"=>"pp．","replace"=>"pp"],
-	["dictid"=>15,"abbr"=>"（m．)","replace"=>"m"],
-	["dictid"=>15,"abbr"=>"f．","replace"=>"f"],
+	["dictid"=>18,"abbr"=>"cf．","replace"=>"cf"],
+	["dictid"=>32,"abbr"=>"cf.","replace"=>"cf"],
 	["dictid"=>15,"abbr"=>"nt．","replace"=>"nt"],
 	["dictid"=>15,"abbr"=>"nt.","replace"=>"nt"],
-	["dictid"=>15,"abbr"=>"adj．","replace"=>"adj"],
-	["dictid"=>18,"abbr"=>"caus.","replace"=>"caus"],
-	["dictid"=>18,"abbr"=>"imper.","replace"=>"imp"],
-	["dictid"=>18,"abbr"=>"ppr.","replace"=>"prp"],
+	["dictid"=>32,"abbr"=>"nt.","replace"=>"nt"],
+	["dictid"=>1,"abbr"=>"pl．","replace"=>"pl"],
+	["dictid"=>8,"abbr"=>"pl．","replace"=>"pl"],
+	["dictid"=>3,"abbr"=>"pl．","replace"=>"pl"],
+	["dictid"=>6,"abbr"=>"pl．","replace"=>"pl"],
+	["dictid"=>15,"abbr"=>"pl．","replace"=>"pl"],
+	["dictid"=>18,"abbr"=>"pl．","replace"=>"pl"],
+	["dictid"=>3,"abbr"=>"pl.","replace"=>"pl"],
+	["dictid"=>6,"abbr"=>"pl.","replace"=>"pl"],
+	["dictid"=>18,"abbr"=>"pl.","replace"=>"pl"],
+	["dictid"=>32,"abbr"=>"pl.","replace"=>"pl"],
+	["dictid"=>1,"abbr"=>"pp.","replace"=>"pp"],
+	["dictid"=>1,"abbr"=>"pp．","replace"=>"pp"],
+	["dictid"=>8,"abbr"=>"pp．","replace"=>"pp"],
+	["dictid"=>3,"abbr"=>"pp.","replace"=>"pp"],
+	["dictid"=>3,"abbr"=>"pp．","replace"=>"pp"],
+	["dictid"=>3,"abbr"=>"pp.","replace"=>"pp"],
+	["dictid"=>6,"abbr"=>"pp.","replace"=>"pp"],
+	["dictid"=>6,"abbr"=>"pp．","replace"=>"pp"],
+	["dictid"=>15,"abbr"=>"pp．","replace"=>"pp"],
 	["dictid"=>18,"abbr"=>"pp.","replace"=>"pp"],
-	["dictid"=>18,"abbr"=>"grd.","replace"=>"fpp"],
-	["dictid"=>18,"abbr"=>"BSk．","replace"=>"bsk"],	
-	["dictid"=>18,"abbr"=>"Bsk．","replace"=>"bsk"],	
-	["dictid"=>18,"abbr"=>"aor．","replace"=>"aor"],
-	["dictid"=>18,"abbr"=>"ger．","replace"=>"abs"],
-	["dictid"=>18,"abbr"=>"nom．","replace"=>"nom"],
-	["dictid"=>18,"abbr"=>"acc．","replace"=>"acc"],
-	["dictid"=>18,"abbr"=>"voc．","replace"=>"voc"],
-	["dictid"=>18,"abbr"=>"abl．","replace"=>"abl"],
-	["dictid"=>18,"abbr"=>"instr．","replace"=>"inst"],
-	["dictid"=>18,"abbr"=>"inst．","replace"=>"inst"],
-	["dictid"=>18,"abbr"=>"dat．","replace"=>"dat"],
-	["dictid"=>18,"abbr"=>"gen．","replace"=>"gen"],
-	["dictid"=>18,"abbr"=>"loc．","replace"=>"loc"],
-	["dictid"=>18,"abbr"=>"opt．","replace"=>"opt"],
-	["dictid"=>18,"abbr"=>"adv．","replace"=>"adv"],
-	["dictid"=>18,"abbr"=>"Sk．","replace"=>"sk"],
-	["dictid"=>18,"abbr"=>"cf．","replace"=>"cf"],
 	["dictid"=>18,"abbr"=>"pp．","replace"=>"pp"],
-	["dictid"=>18,"abbr"=>"pl．","replace"=>"pl"],
+	["dictid"=>32,"abbr"=>"pp.","replace"=>"pp"],
+	["dictid"=>6,"abbr"=>"pr.","replace"=>"pr"],
+	["dictid"=>6,"abbr"=>"pr．","replace"=>"pr"],
+	["dictid"=>1,"abbr"=>"sg．","replace"=>"sg"],
+	["dictid"=>8,"abbr"=>"sg．","replace"=>"sg"],
+	["dictid"=>3,"abbr"=>"sg．","replace"=>"sg"],
+	["dictid"=>3,"abbr"=>"sg.","replace"=>"sg"],
+	["dictid"=>6,"abbr"=>"sg.","replace"=>"sg"],
+	["dictid"=>6,"abbr"=>"sg．","replace"=>"sg"],
+	["dictid"=>15,"abbr"=>"sg．","replace"=>"sg"],
 	["dictid"=>18,"abbr"=>"sg．","replace"=>"sg"],
-	["dictid"=>18,"abbr"=>"m．","replace"=>"m"],
-	["dictid"=>18,"abbr"=>"f．","replace"=>"f"],
-	["dictid"=>18,"abbr"=>"n．","replace"=>"nt"],
-	["dictid"=>18,"abbr"=>"：a．","replace"=>"adj"],
-	["dictid"=>32,"abbr"=>"imper.","replace"=>"imp"],
-	["dictid"=>32,"abbr"=>"denom.","replace"=>"denom"],
-	["dictid"=>32,"abbr"=>"caus.","replace"=>"caus"],
-	["dictid"=>32,"abbr"=>"prp.","replace"=>"prp"],
-	["dictid"=>32,"abbr"=>"ppr.","replace"=>"prp"],
-	["dictid"=>32,"abbr"=>"ppr-a.","replace"=>"prp"],
-	["dictid"=>32,"abbr"=>"ppr-p.","replace"=>"prp"],
-	["dictid"=>32,"abbr"=>"fp-a.","replace"=>"prp"],
-	["dictid"=>32,"abbr"=>"grd.","replace"=>"fpp"],
-	["dictid"=>32,"abbr"=>"fpp.","replace"=>"fpp"],
-	["dictid"=>32,"abbr"=>"aor.","replace"=>"aor"],
-	["dictid"=>32,"abbr"=>"ger.","replace"=>"abs"],
-	["dictid"=>32,"abbr"=>"nom.","replace"=>"nom"],
-	["dictid"=>32,"abbr"=>"acc.","replace"=>"acc"],
-	["dictid"=>32,"abbr"=>"voc.","replace"=>"voc"],
-	["dictid"=>32,"abbr"=>"abl.","replace"=>"abl"],
-	["dictid"=>32,"abbr"=>"instr.","replace"=>"inst"],
-	["dictid"=>32,"abbr"=>"pron.","replace"=>"pron"],
-	["dictid"=>32,"abbr"=>"inst.","replace"=>"inst"],
-	["dictid"=>32,"abbr"=>"dat.","replace"=>"dat"],
-	["dictid"=>32,"abbr"=>"gen.","replace"=>"gen"],
-	["dictid"=>32,"abbr"=>"loc.","replace"=>"loc"],
-	["dictid"=>32,"abbr"=>"opt.","replace"=>"opt"],
-	["dictid"=>32,"abbr"=>"adv.","replace"=>"adv"],
-	["dictid"=>32,"abbr"=>"cf.","replace"=>"cf"],
-	["dictid"=>32,"abbr"=>"pl.","replace"=>"pl"],
 	["dictid"=>32,"abbr"=>"sg.","replace"=>"sg"],
-	["dictid"=>32,"abbr"=>"pp.","replace"=>"pp"],
-	["dictid"=>32,"abbr"=>"1p.","replace"=>"1p"],
-	["dictid"=>32,"abbr"=>"2p.","replace"=>"2p"],
-	["dictid"=>32,"abbr"=>"3p.","replace"=>"3p"],
-	["dictid"=>32,"abbr"=>"m.","replace"=>"m"],
+	["dictid"=>1,"abbr"=>"Sk．","replace"=>"sk"],
+	["dictid"=>8,"abbr"=>"Sk．","replace"=>"sk"],
+	["dictid"=>15,"abbr"=>"Sk．","replace"=>"sk"],
+	["dictid"=>18,"abbr"=>"Sk．","replace"=>"sk"],
+	["dictid"=>4,"abbr"=>"（梵","replace"=>"bsk"],
+	["dictid"=>6,"abbr"=>"（梵","replace"=>"bsk"],
+	["dictid"=>32,"abbr"=>"a.","replace"=>"adj"],
+	["dictid"=>1,"abbr"=>"f．","replace"=>"f"],
+	["dictid"=>8,"abbr"=>"f．","replace"=>"f"],
+	["dictid"=>3,"abbr"=>"f．","replace"=>"f"],
+	["dictid"=>6,"abbr"=>"f.","replace"=>"f"],
+	["dictid"=>6,"abbr"=>"f．","replace"=>"f"],
+	["dictid"=>15,"abbr"=>"f．","replace"=>"f"],
+	["dictid"=>18,"abbr"=>"f．","replace"=>"f"],
 	["dictid"=>32,"abbr"=>"f.","replace"=>"f"],
-	["dictid"=>32,"abbr"=>"nt.","replace"=>"nt"],
-	["dictid"=>32,"abbr"=>"子音","replace"=>"consonant"],
-	["dictid"=>32,"abbr"=>"a.","replace"=>"adj"]
+	["dictid"=>1,"abbr"=>"m．","replace"=>"m"],
+	["dictid"=>8,"abbr"=>"m．","replace"=>"m"],
+	["dictid"=>3,"abbr"=>"m．","replace"=>"m"],
+	["dictid"=>6,"abbr"=>"m.","replace"=>"m"],
+	["dictid"=>6,"abbr"=>"m．","replace"=>"m"],
+	["dictid"=>18,"abbr"=>"m．","replace"=>"m"],
+	["dictid"=>32,"abbr"=>"m.","replace"=>"m"],
+	["dictid"=>1,"abbr"=>"n．","replace"=>"nt"],
+	["dictid"=>8,"abbr"=>"n．","replace"=>"nt"],
+	["dictid"=>6,"abbr"=>"n.","replace"=>"nt"],
+	["dictid"=>6,"abbr"=>"n．","replace"=>"nt"],
+	["dictid"=>18,"abbr"=>"n．","replace"=>"nt"],
+	["dictid"=>6,"abbr"=>"子音","replace"=>"consonant"],
+	["dictid"=>32,"abbr"=>"子音","replace"=>"consonant"]	
 	]);

app/term/popup_note.css

@@ -1,4 +1,4 @@
-.tran_sent code ,.sent_tran  code {
+.tran_sent code ,.sent_tran ,.content_inner  code {
 	position: relative;
 	display: inline-block;
 	width: auto;
@@ -49,6 +49,7 @@ code ol {
 	box-shadow: 0px 3px 13px 0px var(--shadow-color);
 	color: var(--main-color);
 	z-index: 200;
+	font-family: "Noto Sans", "Noto Sans SC", "Noto Sans TC", Arial, Verdana;
 }
 
 .popup_contence:after {

app/users_guide/zh-cn/grammar_consonant.md

@@ -1,2 +1,9 @@
 # 辅音
-又名子音
+又名子音。
+
+子音语尾语基，即在**词典源型**中的结尾为以下几种情况：
+* -ant
+* -ar
+* -as
+* -in
+* -an

app/users_guide/zh-cn/grammar_f.md

@@ -4,4 +4,6 @@
 |-|-|-|
 |巴利|thī|itthi<br>itthiliṅga<br>thīliṅga|
 |汉|阴|阴性|
-|英|f.|Feminine|
+|英|f.|Feminine|
+
+注：如果在词条中出现，则该词条为**名词**

app/users_guide/zh-cn/grammar_m.md

@@ -4,4 +4,6 @@
 |-|-|-|
 |巴利|pu|puma<br>pumaliṅga<br>pulliṅga|
 |汉|阳|阳性|
-|英|m.|masculine|
+|英|m.|masculine|
+
+注：如果在词条中出现，则该词条为**名词**

app/users_guide/zh-cn/grammar_nt.md

@@ -4,4 +4,6 @@
 |-|-|-|
 |巴利|na|napuṃsaka<br>napuṃsakaliṅga|
 |汉|中|中性|
-|英|nt.<br>n.|Neutral|
+|英|nt.<br>n.|Neutral|
+
+注：如果在词条中出现，则该词条为**名词**