Merge branch 'master' into master

app/article/add_to_collect_dlg.js

@@ -24,10 +24,10 @@ function add_to_collect_dlg_init() {
 		html += "<div>";
 		html += "<div class='exist'>";
 		html += "</div>";
-		html += "<div class='others'>";
+		html += "<div class='others' style='max-height: 60vh;overflow: scroll;'>";
 		html += "</div>";
 		html += "<div id='add_to_collection_msg'>";
-		html += "<a href='../article/my_collect_index.php' target='_blank'>添加新的文集</a>";
+		html += "<a href='../article/my_collect_index.php' target='_blank'>"+gLocal.gui.add_to+" "+gLocal.gui.anthology+"</a>";
 		html += "</div>";
 		html += "</div>";
 		html += "<div style='display:flex;justify-content: space-between;'>";

app/article/article.js

@@ -54,6 +54,7 @@ function articel_load(id, collection_id) {
 						guide_init();						
 						note_refresh_new();
 
+
 					}
 				} catch (e) {
 					console.error(e);

app/article/index.php

@@ -205,7 +205,17 @@ span.fancytree-node{
     margin-block-end: 0.5em;
     margin-left: 7px;
 }
-
+.click_dropdown_div{
+	align-self: center;
+}
+.channel_select_button{
+	color: var(--link-color);
+	
+}
+.channel_select_button:hover{
+	text-decoration-line: underline;
+	
+}
 
 </style>
 
@@ -216,21 +226,45 @@ span.fancytree-node{
 function show_content(){
 	$("#left_pannal").toggleClass("hidden");
 	if($("#left_pannal").hasClass("hidden")){
-		$("#main_view").css("margin-left","auto");
+		$("#main_view").removeClass("main_view_narrow");
+		$(".fun_frame").removeClass("fun_frame_narrow");
+		$("#contents_div").removeClass("contents_div_narrow");
+		//$("#main_view").css("margin-left","0");
+		//$(".fun_frame").css("width","30vw");
+		//$("#contents_div").css("width","calc(70vw - 2em)");
+		$("#left_pannal_inner").css("width","unset");
 		localStorage.setItem('article_show_toc_'+_mode, 'hide');
 	}else{
-		$("#main_view").css("margin-left","270px");
+		$("#main_view").toggleClass("main_view_narrow");
+		$(".fun_frame").toggleClass("fun_frame_narrow");
+		$("#contents_div").toggleClass("contents_div_narrow");
+		//$("#main_view").css("margin-left","20vw");
+		//$(".fun_frame").css("width","20vw");
+		//$("#contents_div").css("width","calc(60vw - 2em)");
+		$("#left_pannal_inner").css("width","unset");
 		localStorage.setItem('article_show_toc_'+_mode, 'show');
 	}
 }
 function set_toc_visible(isVisible){
 	if(isVisible){
 		$("#left_pannal").removeClass("hidden");
-		$("#main_view").css("margin-left","270px");
+		$("#main_view").toggleClass("main_view_narrow");
+		//$("#main_view").css("margin-left","20vw");
+		$(".fun_frame").toggleClass("fun_frame_narrow");
+		//$(".fun_frame").css("width","20vw");
+		$("#contents_div").toggleClass("contents_div_narrow");
+		//$("#contents_div").css("width","calc(60vw - 2em)");
+		$("#left_pannal_inner").css("width","unset");
 		localStorage.setItem('article_show_toc_'+_mode, 'show');
 	}else{
 		$("#left_pannal").addClass("hidden");
-		$("#main_view").css("margin-left","auto");
+		$("#main_view").removeClass("main_view_narrow");
+		//$("#main_view").css("margin-left","0");
+		$(".fun_frame").removeClass("fun_frame_narrow");
+		//$(".fun_frame").css("width","30vw");
+		$("#contents_div").removeClass("contents_div_narrow");
+		//$("#contents_div").css("width","calc(70vw - 2em)");
+		$("#left_pannal_inner").css("width","unset");
 		localStorage.setItem('article_show_toc_'+_mode, 'hide');
 	}
 }
@@ -341,7 +375,7 @@ function set_toc_visible(isVisible){
 	</div>
 
 	<div id="contents_view">
-		<div id="contents_div">
+		<div id="contents_div" class="contents_div">
 			<div id="summary"></div>
 			<div id="contents" class="content_inner <?php echo $contentClass;?>">
 				<?php echo $_local->gui->loading; ?>...
@@ -372,7 +406,7 @@ function set_toc_visible(isVisible){
 				<div style="display:flex;justify-content: space-between;">
 					<div class="title"><?php echo $_local->gui->contributor; ?></div>
 					<div class="click_dropdown_div">
-						<div class="channel_select_button" onclick="onChannelMultiSelectStart()"><?php echo $_local->gui->select; ?></div>
+						<div class="channel_select_button" style="color: var(--link-color);" onclick="onChannelMultiSelectStart()"><?php echo $_local->gui->select.$_local->gui->space.$_local->gui->more.$_local->gui->space.$_local->gui->channel."⬇"; ?></div>
 					</div>
 				</div>
 				<div class='channel_select'>

app/article/list_article_in_collect.php

@@ -21,7 +21,7 @@ if(isset($_GET["id"])){
     }
     $output["exist"] = $exist;
 
-    $query = "SELECT id,title from collect  where owner = ? AND status <> 0 order by modify_time DESC limit 0,15";
+    $query = "SELECT id,title from collect  where owner = ? AND status <> 0 order by modify_time DESC limit 0,50";
     $others = PDO_FetchAll($query,array($_COOKIE["userid"])); 
     foreach ($others as $key => $value) {
         # remove exist record

app/article/mobile.css

@@ -13,8 +13,12 @@
 	margin-bottom: auto;
 	padding-left: 0.5em;
 }
-#contents_div {
+.contents_div {
 	padding: 0;
+	width: calc(100vw - 2em);
+}
+.contents_div_narrow{
+	width: calc(100vw - 2em);
 }
 
 #main_view {

app/article/my_article_edit.php

@@ -53,6 +53,9 @@ require_once '../studio/index_head.php';
 	height: calc(100vh - 7em - 60px);
 	
 }
+#preview_div img{
+	width: 90%;
+}
 #preview_inner{
 	background-color: var(--bg-color);
 	color: var(--main-color);

app/article/style.css

@@ -40,9 +40,17 @@
 .main_view {
 	padding: 0 1em;
 	padding-top: 7em;
-	max-width: 1280px;
-	margin-left: 270px;
+	/*max-width: 1280px;*/
+	margin-left: 0;
 	margin-right: auto;
+	transition: all 0.5s ease;
+}
+.main_view_narrow{
+	margin-left:20vw;
+}
+
+.fun_frame_narrow{
+	width:20vw;
 }
 
 #left_pannal_inner {
@@ -52,27 +60,31 @@
     padding-top: 90px;
     height: 100%;
 	/*width:300px;*/
-	overflow-x: hidden;
-	overflow-y: scroll;
+	/*overflow-x: hidden;*/
+	overflow: scroll;
 }
 
 #toc_content{
 	max-height: calc(100vh - 90px);
     width: max-content;
-	max-width:270px;
+	max-width:calc(20vw - 24px);
 	background-color: var(--bg-color);
     border-bottom: 1px solid var(--border-line-color);
 	overflow-y: unset;
+	transition: all 0.5s ease;
 }
 
 .fun_frame {
 	border-bottom: 1px solid gray;
 	margin-right: 10px;
 	margin-bottom: 10px;
+	width: 30vw
+	transition: all 0.5s ease;
 }
 .fun_frame .title {
 	padding: 6px;
 	font-weight: 700;
+	align-self: center;
 }
 .fun_frame > .content {
 	padding: 4em 6px 6px 6px;
@@ -93,10 +105,13 @@
 #contents_view {
 	display: flex;
 }
-#contents_div {
-	flex: 7;
+.contents_div {
+	/*flex: 7;*/
 	padding: 0 1em 0 30px;
-	width: 70vw;
+	width: calc(70vw - 2em);
+}
+.contents_div_narrow{
+	width: calc(60vw - 2em);
 }
 #contents {
 	min-height: 400px;
@@ -105,8 +120,8 @@
 	white-space: normal;
 }
 #right_pannal {
-	flex: 3;
-	max-width: 270px;
+	/*flex: 3;*/
+	/*max-width: 270px;*/
 }
 #head_bar {
 	height: unset;
@@ -166,8 +181,12 @@
 .userinfo_channal:hover {
 	display: block;
 }
-img {
+.sent_tran img{
 	width: 40%;
+	max-width: 40%;
+}
+img {
+	width: 90%;
 	/*max-width: 40%;*/
 }
 

app/dict/css/style.css

@@ -11,6 +11,8 @@ body {
 	padding: 0.6em 1em 0.1em 1em;
 	background-color: var(--tool-bg-color1);
 	border-bottom: none;
+	/*position: fixed;*/
+    width: 100%;
 }
 
 .search_fixed {
@@ -128,6 +130,8 @@ body {
 .pre_serach_block {
 	border-bottom: 1px solid var(--shadow-color);
 	padding: 5px 0;
+	height: 60vh;
+    overflow: scroll;
 }
 
 .pre_serach_block_title {
@@ -205,9 +209,12 @@ input[type="submit"] {
 }
 
 #pre_search_result {
-	background-color: var(--bg-color);
+	background-color: silver;
 	z-index: 50;
 	display: none;
+	max-width: 1024px;
+	position: fixed;
+	color:black;
 }
 
 #dt_title {
@@ -273,7 +280,7 @@ input[type="submit"] {
 #word_parts {
 }
 #search_info {
-	display: flex;
+	/*display: flex;*/
 	justify-content: space-between;
 }
 #part_mean {
@@ -317,8 +324,8 @@ textarea {
 }
 
 #dict_ref_search_input {
-	margin-left: 0.5em;
-	max-width: 500px;
+	/*margin-left: 0.5em;*/
+	/*max-width: 500px;*/
 	font-size: 130%;
 	font-weight: 500;
 	padding: 0.3em 0.6em;

app/dict/dict_lookup.php

@@ -205,7 +205,7 @@ $right_word_list = "";
 
 
 		echo "<div id='search_summary'>";
-		echo "查询{$word} 共{$count_return}条 ";
+		echo "{$_local->gui->find_about}{$word} {$_local->gui->total}<b>{$count_return}</b>{$_local->gui->result} ";
 		if(count($base_list)>0){
 			echo "找到可能的拼写： ";
 			foreach ($base_list as $key => $value) {

app/dict/grm_abbr.php

@@ -1,333 +1,406 @@
 <?php 
 
 define("GRM_ABBR",[
+	["dictid"=>32,"abbr"=>"語基","replace"=>"base"],
+	["dictid"=>32,"abbr"=>"语基","replace"=>"base"],
+	["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"=>18,"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"=>"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"=>19,"abbr"=>"aor．","replace"=>"aor"],
-	["dictid"=>19,"abbr"=>"caus．","replace"=>"caus"],
-	["dictid"=>19,"abbr"=>"fut．","replace"=>"fut"],
-	["dictid"=>19,"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"=>4,"abbr"=>"【字首】","replace"=>"pref"],
+	["dictid"=>6,"abbr"=>"【字首】","replace"=>"pref"],
 	["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"=>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"=>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"=>"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"=>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"=>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"=>18,"abbr"=>"BSk．","replace"=>"bsk"],
+	["dictid"=>18,"abbr"=>"Bsk．","replace"=>"bsk"],
+	["dictid"=>1,"abbr"=>"dat．","replace"=>"dat"],
 	["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"=>"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"=>"[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"=>"[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"=>"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"=>"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"=>1,"abbr"=>"grd．","replace"=>"fpp"],
+	["dictid"=>3,"abbr"=>"grd．","replace"=>"fpp"],
+	["dictid"=>6,"abbr"=>"grd．","replace"=>"fpp"],
+	["dictid"=>8,"abbr"=>"grd．","replace"=>"fpp"],
+	["dictid"=>18,"abbr"=>"grd．","replace"=>"fpp"],
+	["dictid"=>19,"abbr"=>"grd．","replace"=>"fpp"],
+	["dictid"=>32,"abbr"=>"grd．","replace"=>"fpp"],
+	["dictid"=>1,"abbr"=>"grd.","replace"=>"fpp"],
+	["dictid"=>3,"abbr"=>"grd.","replace"=>"fpp"],
+	["dictid"=>6,"abbr"=>"grd.","replace"=>"fpp"],
+	["dictid"=>8,"abbr"=>"grd.","replace"=>"fpp"],
+	["dictid"=>18,"abbr"=>"grd.","replace"=>"fpp"],
+	["dictid"=>19,"abbr"=>"grd.","replace"=>"fpp"],
+	["dictid"=>32,"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"=>"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"=>"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"=>"ppr.","replace"=>"prp"],
+	["dictid"=>3,"abbr"=>"ppr.","replace"=>"prp"],
+	["dictid"=>6,"abbr"=>"ppr.","replace"=>"prp"],
 	["dictid"=>6,"abbr"=>"ppr．","replace"=>"prp"],
-	["dictid"=>6,"abbr"=>"aor．","replace"=>"aor"],
-	["dictid"=>6,"abbr"=>"Ger．","replace"=>"abs"],
+	["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"=>"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"=>"prp．","replace"=>"prp"],
+	["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"=>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"=>"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"=>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"=>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"=>3,"abbr"=>"pl.","replace"=>"pl"],
+	["dictid"=>6,"abbr"=>"pl.","replace"=>"pl"],
+	["dictid"=>18,"abbr"=>"pl.","replace"=>"pl"],
 	["dictid"=>32,"abbr"=>"pl.","replace"=>"pl"],
-	["dictid"=>32,"abbr"=>"sg.","replace"=>"sg"],
+	["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"=>"pp．","replace"=>"pp"],
 	["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"=>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"=>32,"abbr"=>"sg.","replace"=>"sg"],
+	["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"=>1,"abbr"=>" a.","replace"=>"adj"],
+	["dictid"=>1,"abbr"=>" a．","replace"=>"adj"],
+	["dictid"=>3,"abbr"=>" a.","replace"=>"adj"],
+	["dictid"=>3,"abbr"=>" a．","replace"=>"adj"],
+	["dictid"=>8,"abbr"=>" a.","replace"=>"adj"],
+	["dictid"=>8,"abbr"=>" a．","replace"=>"adj"],
+	["dictid"=>6,"abbr"=>" a.","replace"=>"adj"],
+	["dictid"=>6,"abbr"=>" a．","replace"=>"adj"],
+	["dictid"=>15,"abbr"=>" a.","replace"=>"adj"],
+	["dictid"=>15,"abbr"=>" a．","replace"=>"adj"],
+	["dictid"=>18,"abbr"=>" a.","replace"=>"adj"],
+	["dictid"=>18,"abbr"=>" a．","replace"=>"adj"],
+	["dictid"=>19,"abbr"=>" a.","replace"=>"adj"],
+	["dictid"=>19,"abbr"=>" a．","replace"=>"adj"],
+	["dictid"=>32,"abbr"=>" a.","replace"=>"adj"],
+	["dictid"=>32,"abbr"=>" a．","replace"=>"adj"],
+	["dictid"=>1,"abbr"=>"f．","replace"=>"f"],
+	["dictid"=>3,"abbr"=>"f．","replace"=>"f"],
+	["dictid"=>8,"abbr"=>"f．","replace"=>"f"],
+	["dictid"=>6,"abbr"=>"f．","replace"=>"f"],
+	["dictid"=>15,"abbr"=>"f．","replace"=>"f"],
+	["dictid"=>18,"abbr"=>"f．","replace"=>"f"],
+	["dictid"=>19,"abbr"=>"f．","replace"=>"f"],
+	["dictid"=>1,"abbr"=>"f.","replace"=>"f"],
+	["dictid"=>3,"abbr"=>"f.","replace"=>"f"],
+	["dictid"=>6,"abbr"=>"f.","replace"=>"f"],
+	["dictid"=>8,"abbr"=>"f.","replace"=>"f"],
+	["dictid"=>15,"abbr"=>"f.","replace"=>"f"],
+	["dictid"=>18,"abbr"=>"f.","replace"=>"f"],
+	["dictid"=>19,"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"=>3,"abbr"=>"m．","replace"=>"m"],
+	["dictid"=>6,"abbr"=>"m．","replace"=>"m"],
+	["dictid"=>8,"abbr"=>"m．","replace"=>"m"],
+	["dictid"=>10,"abbr"=>"m．","replace"=>"m"],
+	["dictid"=>18,"abbr"=>"m．","replace"=>"m"],
+	["dictid"=>19,"abbr"=>"m．","replace"=>"m"],
+	["dictid"=>32,"abbr"=>"m．","replace"=>"m"],
+	["dictid"=>1,"abbr"=>"m.","replace"=>"m"],
+	["dictid"=>3,"abbr"=>"m.","replace"=>"m"],
+	["dictid"=>6,"abbr"=>"m.","replace"=>"m"],
+	["dictid"=>8,"abbr"=>"m.","replace"=>"m"],
+	["dictid"=>10,"abbr"=>"m.","replace"=>"m"],
+	["dictid"=>18,"abbr"=>"m.","replace"=>"m"],
+	["dictid"=>19,"abbr"=>"m.","replace"=>"m"],
+	["dictid"=>32,"abbr"=>"m.","replace"=>"m"],
+	["dictid"=>1,"abbr"=>"n．","replace"=>"nt"],
+	["dictid"=>6,"abbr"=>"n．","replace"=>"nt"],
+	["dictid"=>8,"abbr"=>"n．","replace"=>"nt"],
+	["dictid"=>10,"abbr"=>"n．","replace"=>"nt"],
+	["dictid"=>18,"abbr"=>"n．","replace"=>"nt"],
+	["dictid"=>19,"abbr"=>"n．","replace"=>"nt"],
+	["dictid"=>1,"abbr"=>"n.","replace"=>"nt"],
+	["dictid"=>6,"abbr"=>"n.","replace"=>"nt"],
+	["dictid"=>8,"abbr"=>"n.","replace"=>"nt"],
+	["dictid"=>10,"abbr"=>"n.","replace"=>"nt"],
+	["dictid"=>18,"abbr"=>"n.","replace"=>"nt"],
+	["dictid"=>19,"abbr"=>"n.","replace"=>"nt"],
+	["dictid"=>6,"abbr"=>"子音","replace"=>"consonant"],
+	["dictid"=>32,"abbr"=>"子音","replace"=>"consonant"]	
 	]);

app/dict/index.php

@@ -45,16 +45,14 @@ guide.grammar_tag:hover {
 				</span>
 				</button>
 			</div>
-			<div >
-				<guide gid="dict_search_input"></guide>
-			</div>
 			<div style="flex:6;">
-				<div>
-					<div>
+				<div style="display:flex;">
+					<div style="align-self: center;">
+						<guide gid="dict_search_input"></guide>
+					</div>
+					<div style="width:90%;">
 						<input id="dict_ref_search_input" type="text" autocomplete="off" placeholder="<?php echo $_local->gui->dict_searching_placehold; ?> " onkeyup="dict_input_keyup(event,this)" style="" onfocus="dict_input_onfocus()" />
 					</div>
-					<div id="result_msg"></div>
-					<div id="manual_split"></div>
 				</div>
 
 				<div id="pre_search_result" >
@@ -70,6 +68,7 @@ guide.grammar_tag:hover {
 					</div>
 				</div>
 			</div>
+
 			<span style="display:flex;">
 			<!--
 				<button id="trubo_split" onclick="trubo_split()" >
@@ -80,6 +79,8 @@ guide.grammar_tag:hover {
 			</span>
 			<div></div>
 		</div>
+		<div id="manual_split"></div>
+		<div id="result_msg"></div>
 		<div style="display:block;z-index: 5;text-align:center;">
 
 		</div>
@@ -125,7 +126,7 @@ guide.grammar_tag:hover {
 		</button>
 	</div>
 
-	<div>
+	<div style="position: fixed;max-height: calc(100vh - 89px - 3.6em);width:100vw;overflow: scroll;">
 		<div id="main_view" class='section_inner' >
 			<div id='dict_list_shell' style="display:none" onclick='setNaviVisibility()'>
 				<div id='dict_list' class='dict_list_off'></div>

app/fts/example.php

@@ -33,8 +33,8 @@
     }
     ?>
     <form method="post" action="<?php echo $_SERVER['PHP_SELF'];?>">
-      Name: <input type="text" name="q" value="<?php echo $q ?>">
-      <input type="submit">
+      Text: <input type="text" name="q" value="<?php echo $q ?>">
+      <input type="submit" value="Query">
     </form>
     <?php
     require_once '../path.php';
@@ -55,8 +55,8 @@
                      full_text_search_weighted_unaccent,
                      websearch_to_tsquery('pali_unaccent', '$q'))
                  AS rank,
-                 ts_headline('simple', content,
-                              websearch_to_tsquery('simple', '$q'),
+                 ts_headline('pali', content,
+                              websearch_to_tsquery('pali', '$q'),
                               'StartSel = <span>, StopSel = </span>')
                  AS highlight,
                  *

app/guide/guide.css

@@ -29,9 +29,9 @@ guide ol {
 	border: 1px solid var(--border-line-color);
 	border-radius: 5px;
 	top: 100%;
-	width: max-content;
+	/*width: max-content;
 	min-width: min-content;
-	max-width: max(25vw, 100%);
+	max-width: min(80vw,20em);*/
 	min-height: 15em;
 	padding: 10px;
 	background-color: var(--drop-bg-color);

app/guide/guide.js

@@ -5,11 +5,11 @@ function guide_init() {
 				$(this).css("background", "unset");
 			}
 			if ($(this).offset().left < $(document.body).width() / 2) {
-				$(this).append('<div  class="guide_contence left" style="left: -5px;"></div>');
-				//$(".guide_contence:after").css("left", "0");
+				$(this).append('<div  class="guide_contence left" style="right: max('+($(this).offset().left+$(this).width()+30-$(document.body).width())+'px,-20em);left: -5px;"></div>');
+				//$(this).after().css("left", +($(this).offset().left-$(this).parent().offset().left)+"px");
 			} else {
-				$(this).append('<div  class="guide_contence right" style="right: -5px;"></div>');
-				//$(".guide_contence:after").css("right", "0");
+				$(this).append('<div  class="guide_contence right" style="left: '+($(this).parent().offset().left-$(this).offset().left)+'px;right:-5px"></div>');
+				//$(this).after().css("right", ($(this).parent().offset().left+$(this).parent().width()+13-$(this).offset().left-$(this).width())+"px");
 			}
 			$(this).attr("init", "1");
 		}

app/pcdl/css/style.css

@@ -3089,6 +3089,7 @@ th {
 	color: #b5b5b5;
 	position: absolute;
 	width: 100%;
+	margin-top: calc(100vh - 89px - 3.6em);
 }
 
 #search_div {

app/public/lang/default.json

@@ -654,6 +654,7 @@
 		"error_net_parsererror": "parser error",
 		"caus": "caus.",
 		"pass": "pass.",
+		"space": " ",
 		"": ""
 	},
 	"grammastr": [

app/public/lang/en.json

@@ -653,6 +653,7 @@
 		"error_net_parsererror": "parser error",
 		"caus": "caus.",
 		"pass": "pass.",
+		"space": " ",
 		"": ""
 	},
 	"grammastr": [

app/public/lang/my.json

@@ -653,6 +653,7 @@
 		"error_net_parsererror": "parser error",
 		"caus": "caus.",
 		"pass": "pass.",
+		"space": " ",
 		"": ""
 	},
 	"grammastr": [

app/public/lang/si.json

@@ -658,6 +658,7 @@
 		"error_net_parsererror": "parser error",
 		"caus": "caus.",
 		"pass": "pass.",
+		"space": " ",
 		"": ""
 	},
 	"grammastr": [

app/public/lang/zh-cn.json

@@ -656,6 +656,7 @@
 		"error_net_parsererror": "数据解析错误",
 		"caus": "使役",
 		"pass": "被动",
+		"space": "",
 		"": ""
 	},
 	"grammastr": [

app/public/lang/zh-tw.json

@@ -655,6 +655,7 @@
 		"error_net_parsererror": "數據解析錯誤",
 		"caus": "使役",
 		"pass": "被動",
+		"space": "",
 		"": ""
 	},
 	"grammastr": [

app/reader/right_tool_bar.php

@@ -6,7 +6,7 @@
 	display: none;
 }
 .main_view_right_float_min {
-	margin-right: calc(30vw - 0.6em);
+	margin-right: calc(30vw - 1.6em);
 }
 .main_view_right_float_max {
 	margin-right: 50%;
@@ -75,7 +75,7 @@
 
 			echo "<span class='icon_btn btn_focus'  ";
 			echo " title='{$_local->gui->show} {$_local->gui->edit}'>";
-			echo $_local->gui->edit;
+			echo $_local->gui->translate;
 			echo "</span>";
 		}
 ?>

app/studio/css/color_day.css

@@ -1,5 +1,8 @@
 :root {
+	--bg-color: #ffffff;
     --main-color: #1E1E1E;
+	--main-color1: #626262;
+	--main-color1: #626262;
     --detail-color: #626262;
     --tool-title-color: #1B1C1C;
     --tool-color: #FFFFFF;

app/studio/css/style.css

@@ -4898,3 +4898,14 @@ note {
 	object-fit: cover;
 	background-size: contain;
 }
+
+#word_note_pop_content th{
+	border: 1px solid #000000;
+    font-size: 100%;
+	border-spacing: 0
+}
+#word_note_pop_content td{
+	border: 1px solid #000000;
+    font-size: 80%;
+	border-spacing: 0
+}

app/studio/editor.php

@@ -669,17 +669,17 @@ foreach($plugin_list as $info){
 		<div id="modifywin" style="">
 			<div>
 				<ul id="id_select_modyfy_type" class="common-tab">
-					<li id="detail_li" class="common-tab_li_act" onclick="select_modyfy_type('modify_detaile','detail_li')"><?php echo $_local->gui->detaile;?></li>
-					<li id="mark_li" class="common-tab_li" onclick="select_modyfy_type('modify_bookmark','mark_li')"><?php echo $_local->gui->mark;?></li>
-					<li id="note_li" class="common-tab_li" onclick="select_modyfy_type('modify_note','note_li')"><?php echo $_local->gui->note;?></li>
-					<li id="spell_li" class="common-tab_li" onclick="select_modyfy_type('modify_spell','spell_li')"><?php echo $_local->gui->source;?></li>
+					<li id="detail_li" class="common-tab_li_act" onclick="select_modyfy_type('modify_detaile','detail_li')"><?php echo "📝".$_local->gui->detaile;?></li>
+					<li id="mark_li" class="common-tab_li" onclick="select_modyfy_type('modify_bookmark','mark_li')"><?php echo "🔖".$_local->gui->mark;?></li>
+					<li id="note_li" class="common-tab_li" onclick="select_modyfy_type('modify_note','note_li')"><?php echo "📇".$_local->gui->note;?></li>
+					<li id="spell_li" class="common-tab_li" onclick="select_modyfy_type('modify_spell','spell_li')"><?php echo "🐛";//.$_local->gui->source?></li>
 					
 				</ul>
 			</div>
 			<div id="modify_detaile">
 				<!-- 意思 -->
 				<div class="edit_detail_p">
-					<guide gid="studio_general_meaning"></guide>
+					<guide gid="studio_general_meaning">⑤</guide>
 					<span class="edit_detail_span"><?php echo $_local->gui->meaning;?>：</span>
 					<input type="text" id="input_meaning" class="input_bar" value="" name="in_meaning">
 					<div class="case_dropdown">
@@ -692,7 +692,7 @@ foreach($plugin_list as $info){
 				</div>
 				<!-- 拆分 -->
 				<div class="edit_detail_p">
-					<guide gid="studio_break_down"></guide>
+					<guide gid="studio_break_down">②</guide>
 					<span class="edit_detail_span"><?php echo $_local->gui->part;?>：</span>
 					<input type="text" id="input_org" class="input_bar" value="" name="in_org" onkeydown="match_key(this)" onkeyup="unicode_key(this) " onchange="input_org_change()">
 					<div class="case_dropdown">
@@ -706,14 +706,14 @@ foreach($plugin_list as $info){
 				<!-- 拆分意思 -->
 
 				<div class="edit_detail_p" >
-					<guide gid="studio_part_meaning"></guide>
+					<guide gid="studio_part_meaning">④</guide>
 					<span class="edit_detail_span"><?php echo $_local->gui->partmeaning;?>：</span>
 					<div id="input_org_select" class="input_bar" style="width:80%; display:inline-flex;"></div>
 					<input type="text" id="input_om" class="input_bar" value="" name="in_om" onblur="input_org_switch('input_om','input_org_select')">
 				</div>
 				<!-- 格位 -->
 				<div class="edit_detail_p">
-					<guide gid="grammar_abbr"></guide>
+					<guide gid="grammar_abbr">③</guide>
 					<span class="edit_detail_span"><?php echo $_local->gui->gramma;?>：</span>
 					<p><input type="text" id="input_case" value="" name="in_case" onblur="input_org_switch('input_case','input_select_case')" ></p>
 					<div id="input_select_case" class="input_bar" style="width:80%; display:inline-flex;">
@@ -738,7 +738,7 @@ foreach($plugin_list as $info){
 				</div>
 				<!-- 语基 -->
 				<div class="edit_detail_p">
-					<guide gid="studio_parent"></guide>
+					<guide gid="studio_parent">①</guide>
 				<script>
 
 				</script>
@@ -760,13 +760,13 @@ foreach($plugin_list as $info){
 				<!-- 词源 -->
 				<div id="edit_detail_prt_prt" class="edit_detail_p" style="display:none;">
 					<span style="display:flex;">
-						<guide gid="studio_parent2"></guide>
+						<guide gid="studio_parent2">🧬</guide>
 						<div class="case_dropdown" style="padding-left: 0.5em;width: 6em;display: flex;">
-							<span style="padding-right: 4px;">┕</span>
+							<span style="padding-right: 4px;"></span>
 							<span id="parent_grammar" style="display: inline-block;min-width: 2em;border-radius: 4px;padding: 0 4px;background-color: #8484843d;"></span>
 							<input type="hidden" id="input_parent_grammar" />
 							<div id="word_mdf_prt_prt_grammar_dropdown" style="margin-top: 22px;" class="case_dropdown-content">
-								<a onclick="edit_parent_grammar_changed('')"><?php echo $_local->gui->empty; ?></a>
+								<a onclick="edit_parent_grammar_changed('')"><?php echo "🗑".$_local->gui->empty; ?></a>
 								<a onclick="edit_parent_grammar_changed('.pp.')"><?php echo $_local->gui->pp; ?></a>
 								<a onclick="edit_parent_grammar_changed('.prp.')"><?php echo $_local->gui->prp; ?></a>				
 								<a onclick="edit_parent_grammar_changed('.fpp.')"><?php echo $_local->gui->fpp; ?></a>
@@ -784,9 +784,9 @@ foreach($plugin_list as $info){
 						</div>
 					</span>
 					<div>
-						<?php echo $_local->gui->relation; ?>
+						<?php echo "⛓".$_local->gui->relation; ?>
 						<imput type="hidden" id="id_relation_text" value="" />
-						<button onclick="rela_add_word()">+</button>
+						<button onclick="rela_add_word()">➕</button>
 						<div id="relation_div">
 						</div>
 					</div>

app/studio/index.php

@@ -34,6 +34,7 @@ else{
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<link type="text/css" rel="stylesheet" href="css/style.css"/>
 	<link type="text/css" rel="stylesheet" href="css/color_day.css" id="colorchange" />
+	<link type="text/css" rel="stylesheet" href="../pcdl/css/color_day.css" id="colorchange" />
 	<title><?php echo $_local->gui->pcd_studio; ?></title>
 	<script language="javascript" src="js/common.js"></script>
 	<script language="javascript" src="js/index_mydoc.js"></script>

app/studio/js/common.js

@@ -248,6 +248,7 @@ function setSbs(mode) {
 			updateWordParBlockInnerAll();
 		}
 	}
+	refreshNoteNumber()//切换逐句后刷新note编号
 }
 
 //显示段对译模式

app/studio/js/dictionary.js

@@ -1254,6 +1254,7 @@ function menu_file_tools_empty(opt){
 			setNodeText(xDocWords[iword],"org","?");
 			setNodeText(xDocWords[iword],"om","?");
 			setNodeText(xDocWords[iword],"case","?");
+			setNodeText(xDocWords[iword],"parent","?");
 			setNodeText(xDocWords[iword],"bmc","");
 			setNodeText(xDocWords[iword],"bmt","");
 			setNodeText(xDocWords[iword],"note","");

app/studio/js/editor.js

@@ -1823,6 +1823,7 @@ function menu_file_tools_empty(opt) {
 			setNodeText(xDocWords[iword], "org", "?");
 			setNodeText(xDocWords[iword], "om", "?");
 			setNodeText(xDocWords[iword], "case", "?");
+			setNodeText(xDocWords[iword], "parent","?");
 			setNodeText(xDocWords[iword], "bmc", "");
 			setNodeText(xDocWords[iword], "bmt", "");
 			setNodeText(xDocWords[iword], "note", "");
@@ -2882,6 +2883,7 @@ function modifyCancel() {
 	document.getElementById("debug").style.display = "-webkit-flex";
 	document.getElementById("debug").style.display = "-moz-flex";
 	document.getElementById("debug").style.display = "-webkit-flex";
+	refreshNoteNumber();
 }
 
 //获取某词的段落索引
@@ -3268,18 +3270,18 @@ function showModifyWin(sWordId) {
 			"<button class=' apply_to' id='apply_to_this' onclick=\"modifyApply('" +
 			sWordId +
 			"',true)\"  title='Save and Favorite'>";
-		tApply += gLocal.gui.to_user_dictionary;
+		tApply += "💾&🌐";//gLocal.gui.to_user_dictionary+
 		tApply += "</button>";
 
 		tApply +=
 			"<button class=' apply_to' id='apply_to_this' onclick=\"modifyApply('" +
 			sWordId +
 			"',false)\"  title='Save Draft'>";
-		tApply += gLocal.gui.save;
+		tApply += "💾";//gLocal.gui.save+
 		tApply += "</button>";
 
 		tApply += "<button class=' apply_to' onclick=\"modifyCancel()\">";
-		tApply += gLocal.gui.cancel;
+		tApply += "❌";//gLocal.gui.cancel+
 		tApply += "</button>";
 		tApply += "</div>";
 		eApply.innerHTML = tApply;

app/studio/js/render.js

@@ -1226,7 +1226,7 @@ function render_sent_tool_bar(elementBlock, begin) {
 	output += "</div>";
 	output += "<guide gid='sent_func' style='margin:unset;'></guide>";
 	output += "</span>";
-	output += "<span style='flex: 3;'><guide gid='sent_trans' style='margin:unset;'></guide></span>";
+	output += "<span style='flex: 3;'><guide gid='sent_trans' style='margin-left:100%;'></guide></span>";
 	output += "</div>";
 	return output;
 }
@@ -1566,7 +1566,7 @@ function renderWordParBlockInner(elementBlock) {
 				output += "</div>";
 				output += "<guide gid='sent_func' style='margin:unset;'></guide>";
 				output += "</span>";
-				output += "<span style='flex: 3;'><guide gid='sent_trans' style='margin:unset;'></guide></span>";
+				output += "<span style='flex: 3;'><guide gid='sent_trans' style='margin-left:100%;'></guide></span>";
 				output += "</div>";
 
 				output += "<div class='sent_wbw'>";
@@ -2204,9 +2204,9 @@ function renderWordHeadInner(element) {
 	output += "</span>";
 	output += "</a>";
 	if (wNote.length > 0) {
-		output += '<span id="wnote_root_' + wid + '"><wnh wid="' + wid + '">[1]</wnh></span>';
+		output += '<span id="wnote_root_' + wid + '" onclick="show_pop_note(\'' + wid + '\')"><wnh wid="' + wid + '">[1]</wnh></span>';
 	} else {
-		output += '<span id="wnote_root_' + wid + '"></span>';
+		output += '<span id="wnote_root_' + wid + '" onclick="show_pop_note(\'' + wid + '\')"></span>';
 	}
 	var newMsg = msg_word_msg_num(wid);
 	if (newMsg > 0) {
@@ -4387,7 +4387,7 @@ function refreshNoteNumber() {
 	$("wnh").each(function (index, element) {
 		let id = $(this).attr("wid");
 		//$(this).html("<a href='#word_note_"+id+"'  name=\"word_note_root_"+id+"\">"+(index+1)+"</a>");
-		$(this).html("<span onclick=\"show_pop_note('" + id + "')\">" + (index + 1) + "</span>");
+		$(this).html("<span>" + (index + 1) + "</span>");
 	});
 
 	$("wnc").each(function (index, element) {

app/studio/js/xml.js

@@ -599,7 +599,7 @@ function modifyApply(sWordId, update_user_dict) {
 	}
 	refreshBookMark();
 	user_wbw_commit();
-
+	refreshNoteNumber();
 	//上传到用户字典
 	if (update_user_dict) {
 		upload_to_my_dict();

app/term/popup_note.css

@@ -1,4 +1,4 @@
-.tran_sent code ,.sent_tran , .content_inner  code {
+.tran_sent code ,.sent_tran code ,.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/term/term_edit_dlg.js

@@ -117,14 +117,35 @@ function term_edit_dlg_render(word = "") {
 
 	output += "<fieldset>";
 	output += "<legend>" + gLocal.gui.channel + "</legend>";
+
+	let currChannel=null;
+	if(typeof word.channel == "undefined" && typeof word.channal != "undefined"){
+		word.channel = word.channal;
+	}
+	for (const iterator of _my_channal) {
+		if(iterator.id==word.channel){
+			currChannel = iterator;
+		}
+	}
+
 	output += "<select id='term_edit_form_channal' name='channal'>";
-	output += "<option value=''>通用于所有版本</option>";
-	word.channel = word.channal;
+	if(currChannel !== null){
+		if(currChannel.owner == getCookie("user_uid")){
+			//是自己的
+			output += "<option value=''>通用于所有版本</option>";
+			
+		}
+		output += "<option value='"+currChannel.id+"'>仅用于"+currChannel.name+"</option>";
+	}else{
+		output += "<option value=''>通用于所有版本</option>";
+	}
+	/*
 	for (const iterator of _my_channal) {
 		if(word.channel=="" || (word.channel!="" && iterator.id==word.channel)){
-		output += "<option value='"+iterator.id+"'>仅用于"+iterator.name+"</option>";
+			output += "<option value='"+iterator.id+"'>仅用于"+iterator.name+"</option>";
 		}
 	}
+	*/
 	output += "</select>";
 	output += "</fieldset>";
 

app/term/term_get.php

@@ -89,7 +89,12 @@ if (isset($_POST["words"])) {
             $userinfo = new UserInfo();
             foreach ($fetch as $key => $value) {
 				# code...
-				if($value["owner"]==$_COOKIE["userid"]){
+				if(isset($_COOKIE["userid"])){
+					$currUserUid = $_COOKIE["userid"];
+				}else{
+					$currUserUid = "";
+				}
+				if($value["owner"]==$currUserUid){
 					$fetch[$key]["readonly"]=false;
 				}
 				else{

app/term/term_post.php

@@ -6,6 +6,7 @@ require_once "../config.php";
 require_once "../public/_pdo.php";
 require_once '../public/function.php';
 require_once "../redis/function.php";
+require_once "../channal/function.php";
 
 $redis = redis_connect();
 
@@ -26,19 +27,34 @@ PDO_Connect("" . _FILE_DB_TERM_);
 if ($_POST["id"] != "") {
 	#更新
 	#先查询是否有权限
-	$query = "SELECT id from term where guid= ? and owner = ? ";
+	#是否这个术语的作者
+	$query = "SELECT id,channal,owner from term where guid= ? ";
 	$stmt = $PDO->prepare($query);
-	$stmt->execute(array($_POST["id"],$_COOKIE["userid"]));
+	$stmt->execute(array($_POST["id"]));
 	if ($stmt) {
 		$Fetch = $stmt->fetch(PDO::FETCH_ASSOC);
-		if(!$Fetch){
+		if($Fetch){
+			if($Fetch['owner']!=$_COOKIE["userid"]){
+				#不是这个术语的作者，查是否是channel的有编辑权限者	
+				$channelInfo = new Channal($redis);
+				$channelPower = $channelInfo->getPower($Fetch['channal']);
+				if($channelPower<20){
+					$respond['status'] = 1;
+					$respond['message'] = "no power";
+					echo json_encode($respond, JSON_UNESCAPED_UNICODE);
+					exit;						
+				}
+			}
+			
+		
+		}else{
 			$respond['status'] = 1;
-			$respond['message'] = "no power";
+			$respond['message'] = "no word";
 			echo json_encode($respond, JSON_UNESCAPED_UNICODE);
-			exit;			
+			exit;				
 		}
 	}
-    $query = "UPDATE term SET meaning= ? ,other_meaning = ? , tag= ? ,channal = ? ,  language = ? , note = ? , receive_time= ?, modify_time= ?   where guid= ? and owner = ? ";
+    $query = "UPDATE term SET meaning= ? ,other_meaning = ? , tag= ? ,channal = ? ,  language = ? , note = ? , receive_time= ?, modify_time= ?   where guid= ? ";
 	$stmt = @PDO_Execute($query, 
 						array($_POST["mean"],
         					  $_POST["mean2"],
@@ -49,7 +65,6 @@ if ($_POST["id"] != "") {
         					  mTime(),
         					  mTime(),
         					  $_POST["id"],
-        					  $_COOKIE["userid"],
     ));
     if (!$stmt || ($stmt && $stmt->errorCode() != 0)) {
         $error = PDO_ErrorInfo();

app/users_guide/zh-cn/grammar_abbr.md

@@ -1,21 +1,15 @@
-## 基本操作
-
--   通过下拉菜单选择填入语法信息
--   首先选定类型——带外框的，比如：动词
--   然后选择后续的内容，比如：三 单 现
--   以上涉及的**语法缩略语**可以参照下面的表格
--   调整**语法信息**和**虚词公式**，列举这个词可能的含义
-
-## 连读词拆分
-
-连读词拆分使用教程 （暂缺）
-
-## 复合词拆分
-
-复合词拆分使用教程（文本暂缺）
-
--   [YouTube](https://youtu.be/iN1t0Rq9aKk "按住Ctrl键点开")
--   [优酷](https://v.youku.com/v_show/id_XNDgwOTg4NDQ4MA==.html "按住Ctrl键点开")
--   [百度网盘](https://pan.baidu.com/s/1nXZG2GQkkkfblNnshDuS_w "按住Ctrl键点开") 提取码：pali
-
-## [巴利语法缩略语表](https://visuddhinanda.gitbook.io/pali-handbook/can-kao-shou-ce/grammar-abbr)
+## 语法信息（第3步）
+- 通过查询**词典源型**可以初步确定部分内容
+- 之后查询**语尾**可以穷举所有可能的**套餐**
+- 如果如法确定唯一的**套餐**，则需要[综合分析]()来进行筛查
+
+|查询内容|查询结果|第1格|第2格|第3格|第4格|
+|-|-|-|-|-|-|
+|词典<br>源型|阳 中 阴|名|阳/中/阴|——|——|
+|语尾|——|——|取交集|单<br>复|主 宾 具 目的<br>源 属 处 呼|
+|-|-|-|-|-|-|
+|词典<br>源型|三性|三性|——|——|——|
+|语尾|——|——|阳/中/阴|单<br>复|主 宾 具 目的<br>源 属 处 呼|
+|-|-|-|-|-|-|
+|词典<br>源型|无信息|动|——|——|——|
+|语尾|——|——|人称|单<br>复|现 将 过<br>命令 潜 条件|

app/users_guide/zh-cn/grammar_abs.md

@@ -3,5 +3,5 @@
 |语种|缩写|全称|
 |-|-|-|
 |巴利|——||
-|汉|**绝对**<br>**连续**|绝对体<br>连续<br>不变分词|
+|汉|**绝对**<br>**连续**|绝对体<br>连续体<br>独立体<br>不变分词|
 |英|**abs.**<br>**ger.**|absolutive<br>gerund|

app/users_guide/zh-cn/grammar_adj.md

@@ -2,13 +2,8 @@
 
 |语种|缩写|全称|
 |-|-|-|
-|巴利||Kālātipatti|
-|汉|过|过去式|
-|英|aor.|aorist|
+|巴利|||
+|汉|形|形容词|
+|英|adj.|adjective|
 
-* 中文：形容词
-* 巴利术语：无
-* 缩写：adj.
-* 英文：adjective
-
-巴利传统语法中不存在形容词，而是统统归属于**三性词**
+巴利传统语法中常使用**三性词**来代表形容词在内的词

app/users_guide/zh-cn/grammar_base.md

@@ -0,0 +1,3 @@
+# 词典源型
+即词典中实际出现的，能够找到其原本含义的拼写
+对应的类似内容有**语基**，**语干**，**词干**，**词基**，**原型**等。

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

@@ -1,7 +1,11 @@
 # 阴性
+- 如果在查**词典源型**时出现，则代表该**词**的语法信息中应选择**名词**&**阴性**
+- 如果在查**语尾**时出现，则代表该**语尾**有应用在**阴性词**中的可能性
 
 |语种|缩写|全称|
 |-|-|-|
-|巴利|thī|itthi<br>itthiliṅga<br>thīliṅga|
-|汉|阴|阴性|
-|英|f.|Feminine|
+|巴利|**thī**|itthi<br>itthiliṅga<br>thīliṅga|
+|汉|**阴**|**阴性**|
+|英|**f.**|Feminine|
+
+**名词**、**三性词**所具有的属性之一，谓语动词和不变词不具有性

app/users_guide/zh-cn/grammar_m.md

@@ -1,7 +1,11 @@
 # 阳性
+- 如果在查**词典源型**时出现，则代表该**词**的语法信息中应选择**名词**&**阳性**
+- 如果在查**语尾**时出现，则代表该**语尾**有应用在**阳性词**中的可能性
 
 |语种|缩写|全称|
 |-|-|-|
-|巴利|pu|puma<br>pumaliṅga<br>pulliṅga|
-|汉|阳|阳性|
-|英|m.|masculine|
+|巴利|**pu**|puma<br>pumaliṅga<br>pulliṅga|
+|汉|**阳**|**阳性**|
+|英|**m.**|masculine|
+
+**名词**、**三性词**所具有的属性之一，谓语动词和不变词不具有性

app/users_guide/zh-cn/grammar_nt.md

@@ -1,7 +1,11 @@
 # 中性
+- 如果在查**词典源型**时出现，则代表该**词**的语法信息中应选择**名词**&**中性**
+- 如果在查**语尾**时出现，则代表该**语尾**有应用在**中性词**中的可能性
 
 |语种|缩写|全称|
 |-|-|-|
-|巴利|na|napuṃsaka<br>napuṃsakaliṅga|
-|汉|中|中性|
-|英|nt.<br>n.|Neutral|
+|巴利|**na**|napuṃsaka<br>napuṃsakaliṅga|
+|汉|**中**|**中性**|
+|英|**nt.**<br>**n.**|Neutral|
+
+**名词**、**三性词**所具有的属性之一，谓语动词和不变词不具有性

app/users_guide/zh-cn/grammar_pl.md

@@ -1,7 +1,10 @@
 # 复数
 
-缩写： pl.
-pāḷi：bahuvacana
-
 > Bahūnamatthānaṃ vacanaṃ bahuvacanaṃ.
 > 表达“有多个”含义的用语，为复数。
+
+|语种|缩写|全称|
+|-|-|-|
+|巴利|**bahu**|bahuvacana|
+|汉|**复**|**复数**|
+|英|**pl.**<br>**p.**|plural|

app/users_guide/zh-cn/grammar_pp.md

@@ -1,4 +1,8 @@
 ## 过去分词
+表达**过去**动作含义的**三性词**/形容词，已……的，
+>例句：这是一杯**已煮过的**牛奶。
+
+常用后缀：-ta, -na
 
 |语种|缩写|全称|
 |-|-|-|

app/users_guide/zh-cn/grammar_prp.md

@@ -1,7 +1,9 @@
 ## 现在分词
 
+- 有两种
+
 |语种|缩写|全称|
 |-|-|-|
-|巴利|——|——|
+|巴利|——|mānanta|
 |汉|**现分**|现在分词|
 |英|**prp.**<br>**pr.p.**<br>**ppr.**|Present Participle<br>|

app/users_guide/zh-cn/grammar_sg.md

@@ -1,6 +1,10 @@
 # 单数
-pāḷi：ekavacana
-```
-ekassatthassa vacanaṃ ekavacanaṃ.——“Saddanītippakaraṇaṃ”
-表示“一个”含义的用语，为单数。——《论语法》
-```
+
+>ekassatthassa vacanaṃ ekavacanaṃ.——“Saddanītippakaraṇaṃ”
+>表示“一个”含义的用语，为单数。——《论语法》
+
+|语种|缩写|全称|
+|-|-|-|
+|巴利|**eka**|ekavacana|
+|汉|**单**|**单数**|
+|英|**sg.**<br>**s.**|singular|

app/users_guide/zh-cn/grammar_ti.md

@@ -1,7 +1,8 @@
 # 三性词
+这种词没有固定的性，即可能是阳性，也可能是中性，也可能是阴性；它的性会跟随它修饰的词而变化。
+包含内容：形容词、[动词分词](https://visuddhinanda.gitbook.io/pali-handbook/verbal/participle)、代词、数词
 
-* 包含内容：形容词、分词、代词、数词
-* 巴利术语：
-  * tiliṅga
-* 缩写：
-  * ti
+|语种|缩写|全称|
+|-|-|-|
+|巴利|ti|tiliṅga|
+|汉|**三性**|三性词<br>形容词|

app/users_guide/zh-cn/studio_break_down.md

@@ -1,15 +1,9 @@
-## 拆分信息
-巴利语拆分是从词源入手进行语义解析的重要手段。
+## 拆分信息（第2步）
+- 简单拆分：**词典源型**+[语尾]
+>通过查询**词典源型**的拆分方法，可以探索到更复杂的拆分方式，用户可以根据自己的意愿，决定把单词拆解到什么样的复杂度。
+- 如果用加号“**+**”分隔每个组分，机器会自动识别并查询相应的组分
+>如果用“**-**”分隔则没有相应的效果。
 
-用户可以根据自己的意愿决定把单词拆到什么程度。
+巴利语拆分是从词源入手进行语义解析的重要手段，
 
-如果用加号“+”分隔每个组分，机器会自动识别并查询相应的组分。
-
-如果是连读词（sandhi）是可以进行进一步拆解和分别分析的。
-
-如果不清楚如何拆分，有几种渠道可供选择：
-- 点词查询
-  - 点击某个单词，点开右上角的<svg id="icon_dict" viewBox="0 0 32 32" style='fill:#6baaff;height: 10px; width: 15px;'><g transform="translate(-4 -4)"><path class="a" d="M24.4,2,17.9,7.85v14.3l6.5-5.85V2M8.15,5.9A12.09,12.09,0,0,0,1,7.85V26.908a.7.7,0,0,0,.65.65c.13,0,.195-.091.325-.091A15.85,15.85,0,0,1,8.15,26.05,12.09,12.09,0,0,1,15.3,28a15.659,15.659,0,0,1,7.15-1.95,13.241,13.241,0,0,1,6.175,1.378.565.565,0,0,0,.325.039.7.7,0,0,0,.65-.65V7.85A8.867,8.867,0,0,0,27,6.55V24.1a15.106,15.106,0,0,0-4.55-.65A15.659,15.659,0,0,0,15.3,25.4V7.85A12.09,12.09,0,0,0,8.15,5.9Z" transform="translate(5 4)"></path></g></svg>中会显示词典查询结果。
-  - 很多长词在巴缅词典（共三本）中能找到拆分结果
-- **强力拆分**功能
-- 询问老师
+[更多内容](https://visuddhinanda.gitbook.io/wikipali-help-zh-hans/v/master/wbw/edit_win)

app/users_guide/zh-cn/studio_general_meaning.md

@@ -1,15 +1,11 @@
-## 整体意思与虚词公式
-在这里输入的含义，会被系统自动根据**语法信息**来套用**虚词公式**；
-### 点词查询
-- 点击某个单词
-- 点开右上角的<svg id="icon_dict" viewBox="0 0 32 32" style='fill:#6baaff;height: 15px; width: 15px;'><g transform="translate(-4 -4)"><path class="a" d="M24.4,2,17.9,7.85v14.3l6.5-5.85V2M8.15,5.9A12.09,12.09,0,0,0,1,7.85V26.908a.7.7,0,0,0,.65.65c.13,0,.195-.091.325-.091A15.85,15.85,0,0,1,8.15,26.05,12.09,12.09,0,0,1,15.3,28a15.659,15.659,0,0,1,7.15-1.95,13.241,13.241,0,0,1,6.175,1.378.565.565,0,0,0,.325.039.7.7,0,0,0,.65-.65V7.85A8.867,8.867,0,0,0,27,6.55V24.1a15.106,15.106,0,0,0-4.55-.65A15.659,15.659,0,0,0,15.3,25.4V7.85A12.09,12.09,0,0,0,8.15,5.9Z" transform="translate(5 4)"></path></g></svg>中
-- 右侧边栏会显示词典查询结果
+## 整体意思与虚词公式（第5步）
+在这里输入的含义，会被系统自动根据**语法信息**来套用**虚词公式**，因此不建议大家填入带有格位虚词的含义，而是通过虚词选择公式来进行。
 
-在本行末端的<span><svg viewBox='0 0 24 24' id='ic_more' style='fill:#6baaff;height: 15px; width: 15px;'><path d='M22 3H7c-.69 0-1.23.35-1.59.88L0 12l5.41 8.11c.36.53.97.89 1.66.89H22c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zM9 13.5c-.83 0-1.5-.67-1.5-1.5s.67-1.5 1.5-1.5 1.5.67 1.5 1.5-.67 1.5-1.5 1.5zm5 0c-.83 0-1.5-.67-1.5-1.5s.67-1.5 1.5-1.5 1.5.67 1.5 1.5-.67 1.5-1.5 1.5zm5 0c-.83 0-1.5-.67-1.5-1.5s.67-1.5 1.5-1.5 1.5.67 1.5 1.5-.67 1.5-1.5 1.5z'></path></svg></span>可以显示系统匹配的含义列表，通过点选实现快捷输入
+范例：
 
-
-註：
-- 此处的设计是针对**信达雅**三大翻译指标中的**达**，即优先追求含义表达的明确性
-- 对于词源学我们设计了**拆分方式**与**拆分含义**
-- 文学优美性我们提供了**整体译文**
-- **虚词公式**可能会有遗漏，如有补充，欢迎通过此[链接](https://github.com/iapt-platform/mint/issues/20)给我们留言。
+|pāli|不兼容的写法|兼容的写法|
+|-|-|-|
+|pabbajit**ena**|被出家人|出家人<br>[被]出家人|
+|anāthapiṇḍika**ssa**|给孤独长者的|给孤独长者<br>给孤独长者[的]|
+  
+[更多内容](https://visuddhinanda.gitbook.io/wikipali-help-zh-hans/v/master/wbw/edit_win)

app/users_guide/zh-cn/studio_parent.md

@@ -1,18 +1,11 @@
-## 词典原型
-此处为该处词语在查词时应该查询的拼写，通常是：
-- 动词去掉变位后，加上ti
-  - 如：karoma的原型写为karo(ti)
-- 名词、三性词去掉变格
-  - cittena的原型为citta
-
-正确输入词典原型，会在个人单词本中加入原型数据，利用该原型数据可以对其他变化词给出相对准确的含义。
-- 例如：cittena的**词典原型**中输入了citta，当以后遇到cittehi，cittāni会优先给出个人单词本中citta的数据。
-
-但如果是复合词拆分之后的组件，可以写衍生词的原型
-- karonta的原型为karo(ti)
-
-
-註：
-- 针对多层级变化衍生的关系，比如从词根到词干，动词到分词，分词到变格；我们不建议在此处进行多层级拆解
-- 我们设计了另一个强大的工具来实现**词源学探索的终极解决方案**——wordmap
-- 该wordmap工具在离线版的试验中可用，线上版有待恢复和重新设计
+## 词典原型（第1步）
+此处为该处词语在查词时，词典中能够找到数据且符合语法变化的拼写，常用方法有：
+- 去尾查询法
+  - 从拼写的最后一个字母开始删除，找到相似度高且被很多词典收录的拼写
+- 去尾加尾查询法
+  - 动词去掉变位尾后，加上ti
+  - 如：karo**ma**的原型写为karoti
+- 社区词典查询法
+  - 当上述两种方法无法查到时，则查看社区词典是否有数据
+
+[更多内容](https://visuddhinanda.gitbook.io/wikipali-help-zh-hans/v/master/wbw/edit_win)

app/users_guide/zh-cn/studio_part_meaning.md

@@ -1,24 +1,6 @@
-## 拆分含义
+## 拆分含义（第4步）
 此处的设计是针对**信达雅**三大翻译指标中的**信**，即学术严谨性，可以通过拆分和拆分含义，实现词源学的探索。
 
-在**拆分方式**中用加号“+”将巴利拼写分隔之后，系统会根据每个组分的拼写进行自动查询
+在**拆分方式**中用加号+将巴利拼写分隔之后，系统会根据每个组分的拼写进行自动查询
 
-查询结果的第一个会显示，其他结果在下拉菜单中
-
-点击<svg viewBox="0 0 24 24" id="ic_vertical_align_top" style='fill:#6baaff;height: 12px; width: 20px;'><path d="M8 11h3v10h2V11h3l-4-4-4 4zM4 3v2h16V3H4z"></path></svg>按钮可以将未 **[括起来]** 的部分覆盖到 **整体含义** 来实现快捷输入
-
-如果对译文不满意，可以点击<svg viewBox="0 0 24 24" id="ic_mode_edit" style='fill:#6baaff;height: 12px; width: 20px;'><path d="M3 17.25V21h3.75L17.81 9.94l-3.75-3.75L3 17.25zM20.71 7.04a.996.996 0 0 0 0-1.41l-2.34-2.34a.996.996 0 0 0-1.41 0l-1.83 1.83 3.75 3.75 1.83-1.83z"></path></svg>按钮来手动修改译文
-- 注意保证**拆分含义**的“+”和**拆分方式**中的“+”数量保持一致
-- 如果**拆分含义**的“+”数量小于**拆分方式**中的“+”，那么系统将自动填充 **↓↓** 来提示用户查看此处的下拉菜单
-- 如果**拆分含义**的“+”数量大于**拆分方式**中的“+”，那么系统将自动把最后两个组分含义合并
-  
-## 个人单词本
-拆分方式和拆分含义在进入[单词本](./setting.php?item=userdict)的时候，会在基础单词数据块的基础上，增加和拆分数目相同的单词数据块
-
-- 内容会被简化为拼写+含义，语法类型代码为**待定组分**
-- 比如：attha+saṃhita 义+已携带，会增加2条单词数据到[单词本](./setting.php?item=userdict)
-
-| 拼写    | 含义   | 类型     |
-| ------- | ------ | -------- |
-| attha   | 义     | 待定组分 |
-| saṃhita | 已携带 | 待定组分 |
+[更多内容](https://visuddhinanda.gitbook.io/wikipali-help-zh-hans/v/master/wbw/edit_win)