Prechádzať zdrojové kódy

Merge remote-tracking branch 'upstream/laravel' into laravel

visuddhinanda 2 rokov pred
rodič
commit
694a3648f3
57 zmenil súbory, kde vykonal 430 pridanie a 158 odobranie
  1. 34 0
      public/app/calendar/history.html
  2. 2 1
      public/app/dict/css/style.css
  3. 1 1
      public/app/guide/guide.css
  4. 11 8
      public/app/guide/guide.js
  5. 12 9
      public/app/pcdl/head_bar.php
  6. 3 1
      public/app/public/lang/default.json
  7. 3 1
      public/app/public/lang/en.json
  8. 3 1
      public/app/public/lang/my.json
  9. 8 6
      public/app/public/lang/si.json
  10. 3 1
      public/app/public/lang/zh-cn.json
  11. 3 1
      public/app/public/lang/zh-tw.json
  12. 1 0
      public/app/studio/css/print.css
  13. 3 3
      public/app/studio/js/relation_list.js
  14. 168 18
      public/app/term/note.js
  15. 2 2
      public/app/term/popup_note.css
  16. 3 3
      public/app/term/term.css
  17. 1 5
      public/app/term/term_popup.js
  18. 0 5
      public/app/users_guide/zh-cn/grammar_my_abl1.md
  19. 0 5
      public/app/users_guide/zh-cn/grammar_my_abl2.md
  20. 0 5
      public/app/users_guide/zh-cn/grammar_my_abl3.md
  21. 7 5
      public/app/users_guide/zh-cn/grammar_my_abs.md
  22. 4 5
      public/app/users_guide/zh-cn/grammar_my_acc1.md
  23. 3 4
      public/app/users_guide/zh-cn/grammar_my_acc2.md
  24. 6 0
      public/app/users_guide/zh-cn/grammar_my_adv.md
  25. 3 0
      public/app/users_guide/zh-cn/grammar_my_api.md
  26. 9 0
      public/app/users_guide/zh-cn/grammar_my_ca.md
  27. 9 0
      public/app/users_guide/zh-cn/grammar_my_cau.md
  28. 5 0
      public/app/users_guide/zh-cn/grammar_my_coc0.md
  29. 5 0
      public/app/users_guide/zh-cn/grammar_my_coc1.md
  30. 3 2
      public/app/users_guide/zh-cn/grammar_my_coi.md
  31. 0 7
      public/app/users_guide/zh-cn/grammar_my_dat2.md
  32. 6 0
      public/app/users_guide/zh-cn/grammar_my_dat3.md
  33. 2 4
      public/app/users_guide/zh-cn/grammar_my_def.md
  34. 9 0
      public/app/users_guide/zh-cn/grammar_my_def_eva.md
  35. 6 0
      public/app/users_guide/zh-cn/grammar_my_det.md
  36. 3 0
      public/app/users_guide/zh-cn/grammar_my_eva.md
  37. 5 0
      public/app/users_guide/zh-cn/grammar_my_eyya.md
  38. 6 0
      public/app/users_guide/zh-cn/grammar_my_fut.md
  39. 6 0
      public/app/users_guide/zh-cn/grammar_my_iad.md
  40. 7 0
      public/app/users_guide/zh-cn/grammar_my_imp.md
  41. 0 7
      public/app/users_guide/zh-cn/grammar_my_inst1.md
  42. 0 10
      public/app/users_guide/zh-cn/grammar_my_inst3.md
  43. 6 0
      public/app/users_guide/zh-cn/grammar_my_inst_imp.md
  44. 0 7
      public/app/users_guide/zh-cn/grammar_my_loc2.md
  45. 5 4
      public/app/users_guide/zh-cn/grammar_my_lov.md
  46. 5 0
      public/app/users_guide/zh-cn/grammar_my_nama1.md
  47. 5 5
      public/app/users_guide/zh-cn/grammar_my_nom1.md
  48. 5 2
      public/app/users_guide/zh-cn/grammar_my_nom2.md
  49. 8 2
      public/app/users_guide/zh-cn/grammar_my_nom3.md
  50. 5 0
      public/app/users_guide/zh-cn/grammar_my_pl_fut.md
  51. 4 6
      public/app/users_guide/zh-cn/grammar_my_pos.md
  52. 7 0
      public/app/users_guide/zh-cn/grammar_my_pur.md
  53. 3 4
      public/app/users_guide/zh-cn/grammar_my_rec.md
  54. 3 4
      public/app/users_guide/zh-cn/grammar_my_soi.md
  55. 4 3
      public/app/users_guide/zh-cn/grammar_my_time.md
  56. 5 0
      public/app/users_guide/zh-cn/grammar_my_va.md
  57. 0 1
      public/app/users_guide/zh-cn/grammar_nom.md

+ 34 - 0
public/app/calendar/history.html

@@ -80,3 +80,37 @@
 		],
 	});
 </script>
+
+<h1>Idea of Theravada Tipitaka commentaries translation project(2019)</h1>
+<p>we make a plan to someone who are interested in pāli translation.
+</p>
+
+<video controls="controls" style="width: 80%;">
+    <source src="https://djt-res.fzcl.org.cn/jly/video/%E4%BA%91%E5%8F%B0/Idea%20of%20Theravada%20Tipitaka%20commentaries%20translation%20project%20%282019%29%20English%20subtitles.webm" type="video/webm" ></source>
+    Video not playing? <a href="https://djt-res.fzcl.org.cn/jly/video/%E4%BA%91%E5%8F%B0/Idea%20of%20Theravada%20Tipitaka%20commentaries%20translation%20project%20%282019%29%20English%20subtitles.webm">Download file</a> instead.
+</video>
+
+
+<h1>conference in Sri Lanka, 2020 Feb</h1>
+<p>we invite the pāli experts from Myanmar and Sri Lank,
+including tipiṭaka Sayadaw, dhammācariya, alaṅkāra Sayadaw, teachers in university.
+We introduce our project and discuss.
+</p>
+
+<h2>1. translating project of pali literature</h2>
+<video controls="controls" style="width: 80%;">
+    <source src="https://djt-res.fzcl.org.cn/jly/video/%E4%BA%91%E5%8F%B0/%E5%85%B0%E5%8D%A1%E4%BC%9A%E8%AE%AE/1%20translating%20project%20of%20pali%20literature.mp4" type="video/mp4" ></source>
+    Video not playing? <a href="https://djt-res.fzcl.org.cn/jly/video/%E4%BA%91%E5%8F%B0/%E5%85%B0%E5%8D%A1%E4%BC%9A%E8%AE%AE/1%20translating%20project%20of%20pali%20literature.mp4">Download file</a> instead.
+</video>
+
+<h2>2. How to Support the Pāḷi Education by Computer Software</h2>
+<video controls="controls" style="width: 80%;">
+    <source src="https://djt-res.fzcl.org.cn/jly/video/%E4%BA%91%E5%8F%B0/%E5%85%B0%E5%8D%A1%E4%BC%9A%E8%AE%AE/2%20How%20to%20Support%20the%20P%C4%81%E1%B8%B7i%20Education%20by%20Computer%20Software.mp4" type="video/mp4" ></source>
+    Video not playing? <a href="https://djt-res.fzcl.org.cn/jly/video/%E4%BA%91%E5%8F%B0/%E5%85%B0%E5%8D%A1%E4%BC%9A%E8%AE%AE/2%20How%20to%20Support%20the%20P%C4%81%E1%B8%B7i%20Education%20by%20Computer%20Software.mp4">Download file</a> instead.
+</video>
+
+<h2>3. pali education platform & ecological chain</h2>
+<video controls="controls" style="width: 80%;">
+    <source src="https://djt-res.fzcl.org.cn/jly/video/%E4%BA%91%E5%8F%B0/%E5%85%B0%E5%8D%A1%E4%BC%9A%E8%AE%AE/3%20pali%20education%20platform.mp4" type="video/mp4" ></source>
+    Video not playing? <a href="https://djt-res.fzcl.org.cn/jly/video/%E4%BA%91%E5%8F%B0/%E5%85%B0%E5%8D%A1%E4%BC%9A%E8%AE%AE/3%20pali%20education%20platform.mp4">Download file</a> instead.
+</video>

+ 2 - 1
public/app/dict/css/style.css

@@ -99,7 +99,7 @@ body {
 	display: none;
     background-color: var(--tool-bg-color);
     box-shadow: 0 0 10px var(--border-shadow);
-    color: var(--tool-color);	
+    color: var(--tool-color);
 }
 
 
@@ -258,6 +258,7 @@ input[type="submit"] {
 }
 #main_result {
 	flex: 7;
+    width: 100%;
 }
 #right_bar {
 	flex: 3;

+ 1 - 1
public/app/guide/guide.css

@@ -27,7 +27,7 @@ guide ol {
 }
 .guide_contence {
 	/*border-top: 7px;*/
-	position: fixed;
+	position: absolute;
 	border: 1px solid var(--border-line-color);
 	border-radius: 5px;
 	top: 100%;

+ 11 - 8
public/app/guide/guide.js

@@ -19,16 +19,19 @@ function guide_init() {
 	});
 
 	$("guide").mouseenter(function (event) {
-		let mouse_x=event.clientX
-		let mouse_y=event.clientY
-	if ($(this).offset().left < $(document.body).width() / 2) {//左边
-		$(this).children(".guide_contence").first().css("left",(mouse_x-20)+"px")
-		$(this).children(".guide_contence").first().css("top",mouse_y+"px")
-		$(this).children(".guide_contence").first().css("max-width",($(document.body).width()-mouse_x-20)+"px")
+		let mouse_x=event.pageX
+		let mouse_y=event.pageY
+		$(this).children(".guide_contence").first().css("top","15px")
+        $(this).children(".guide_contence").first().css("width","max-content")
+        //if ($(this).offset().left < $(document.body).width() / 2) {//左边
+    if (mouse_x < ($(document.body).width() / 2)) {//左边
+    		$(this).children(".guide_contence").first().css("left","-10px")
+            $(this).children(".guide_contence").first().css("max-width",("calc(100vw - "+mouse_x+"px - 20px"))
 	} else {//右边
-		$(this).children(".guide_contence").first().css("right",($(document.body).width()-mouse_x-20)+"px")
-		$(this).children(".guide_contence").first().css("top",mouse_y+"px")
+		//$(this).children(".guide_contence").first().css("right",($(document.body).width()-mouse_x-20)+"px")
+		//$(this).children(".guide_contence").first().css("top",mouse_y+"px")
 		$(this).children(".guide_contence").first().css("max-width",(mouse_x-20)+"px")
+        $(this).children(".guide_contence").first().css("right","-10px")
 	}
 	if ($(this).children(".guide_contence").first().html().length > 0) {
 			return;

+ 12 - 9
public/app/pcdl/head_bar.php

@@ -27,7 +27,7 @@
 	nav a:link,
 	nav a:visited {
 		color: unset;
-		
+
 	}
 
 	header ul,
@@ -479,8 +479,8 @@ switch($_COOKIE['language']){
 				<span class="goto-platform"> ▸ <?php echo $_local->gui->studio; ?></span></a>
 		</div>
 	</div>
-    <?php 
-        $host = $_SERVER ['HTTP_HOST']; 
+    <?php
+        $host = $_SERVER ['HTTP_HOST'];
         if(stripos('staging',$host)>0){
             echo "<span style='backgroud-color:red;color:white;padding:0.5em;font-size:120%;' title='本服务器仅仅作为功能测试之用,所有用户数据均不保留。'>测试服务器</span>";
         }
@@ -488,7 +488,7 @@ switch($_COOKIE['language']){
 	<input type="checkbox" id="nav-toggle" class="nav-toggle">
 	<nav>
 		<ul>
-			<li class="nav_link" id="nav_community"><a href="../community/"><?php echo "最新"; ?></a></li>
+			<li class="nav_link" id="nav_community"><a href="../community/"><?php echo $_local->gui->latest;; ?></a></li>
 			<li class="nav_link" id="nav_palicanon"><a href="../palicanon/"><?php echo $_local->gui->pali_canon; ?></a></li>
 			<li class="nav_link" id="nav_course"><a href="../course/"><?php echo $_local->gui->lesson; ?></a></li>
 			<li class="nav_link" id="nav_dict"><a href="../dict/"><?php echo $_local->gui->dictionary; ?></a></li>
@@ -522,7 +522,7 @@ switch($_COOKIE['language']){
 						</li>
 						<li>
 							<a href="../calendar/history.html" target="_blank">
-								<div class="nav_link"><?php echo $_local->gui->history; ?></div>
+								<div class="nav_link"><?php echo $_local->gui->dev_history; ?></div>
 							</a>
 						</li>
 						<li>
@@ -532,15 +532,18 @@ switch($_COOKIE['language']){
 						</li>
 					</ul>
 			</li>
-			<li class="nav_link nav-mobile"><a href="../calendar/">
+			<li class="nav_link nav-mobile"><a href="../calendar/index.html">
 					<?php echo $_local->gui->buddhist_calendar; ?>
 				</a></li>
 			<li class="nav_link nav-mobile"><a href="../tools/unicode.html">
 					<?php echo $_local->gui->code_convert; ?>
 				</a></li>
-			<li class="nav_link nav-mobile"><a href="../statistics/">
-					<?php echo $_local->gui->corpus_statistics; ?>
+			<li class="nav_link nav-mobile"><a href="../calendar/history.html">
+					<?php echo $_local->gui->dev_history; ?>
 				</a></li>
+            <li class="nav_link nav-mobile"><a href="../statistics/">
+                <?php echo $_local->gui->corpus_statistics; ?>
+            </a></li>
 			<li class="nav_link nav-mobile"><a href="../tools/kammavaca.html">
 			<?php echo "作持语"; ?>
 		</a></li>
@@ -566,4 +569,4 @@ switch($_COOKIE['language']){
 	</label>
 
 </header>
-<!--new tool bar end -->
+<!--new tool bar end -->

+ 3 - 1
public/app/public/lang/default.json

@@ -664,6 +664,8 @@
 		"show_this_para_only": "show this paragraph only",
 		"original_text":"original text",
 		"white_space": "&nbsp;",
+		"latest": "latest",
+		"dev_history": "development history",
 		"": ""
 	},
 	"grammastr": [
@@ -2081,4 +2083,4 @@
 		"100": "open reader",
 		"101": "open studio"
 	}
-}
+}

+ 3 - 1
public/app/public/lang/en.json

@@ -663,6 +663,8 @@
 		"show_this_para_only": "show this paragraph only",
 		"original_text":"original text",
 		"white_space": "&nbsp;",
+		"latest": "latest",
+		"dev_history": "development history",
 		"": ""
 	},
 	"grammastr": [
@@ -2264,4 +2266,4 @@
 		"100": "open reader",
 		"101": "open studio"
 	}
-}
+}

+ 3 - 1
public/app/public/lang/my.json

@@ -645,6 +645,8 @@
 		"show_this_para_only": "show this paragraph only",
 		"original_text":"original text",
 		"white_space": "&nbsp;",
+		"latest": "latest",
+		"dev_history": "development history",
 		"": ""
 	},
 	"grammastr": [
@@ -2054,4 +2056,4 @@
 		"100": "open reader",
 		"101": "open studio"
 	}
-}
+}

+ 8 - 6
public/app/public/lang/si.json

@@ -115,7 +115,7 @@
 		"h": "(h)",
 		"half": "අර්ධය",
 		"heading": "නම",
-		"heading": "මාතෘකාව",
+		"heading1": "මාතෘකාව",
 		"heading_1": "මාතෘකාව 1",
 		"heading_2": "මාතෘකාව 2",
 		"heading_3": "මාතෘකාව 3",
@@ -189,7 +189,7 @@
 		"months": "&nbsp;මාසා(නි) ",
 		"more": "more",
 		"my_book": "&nbsp;මගේ පොත් ",
-		"my_book": "අමතර පොත් ",
+		"my_book1": "අමතර පොත් ",
 		"my_dictionary": "මගේ ශබ්දකෝෂය",
 		"my_document": "මගේ ලිපිගොනු ",
 		"my_loc": "අත‍්තස‍්මිං",
@@ -211,7 +211,7 @@
 		"noon_time": "මජ්ඣන්හික",
 		"normal": "සාමන්‍යය",
 		"note": "නෝට්ටුව ",
-		"note": "සටහන",
+		"note1": "සටහන",
 		"now_time": "පච්චුප්පන්න",
 		"num_k": "K",
 		"num_m": "M",
@@ -254,7 +254,7 @@
 		"recycle_bin": "Recycle Bin",
 		"ref_dict": "Dictionary",
 		"refresh": "සතප්පනවා",
-		"refresh": "නැවත ප්‍රාණවත් කිරීම ",
+		"refresh1": "නැවත ප්‍රාණවත් කිරීම ",
 		"relation": "අත්‍ථ‍යොජනා",
 		"remove": "අයින්කරනවා",
 		"removeword": "Slur Factor Removed",
@@ -317,7 +317,7 @@
 		"totally": "Totally ",
 		"tran_workload": "whole passage translate ",
 		"translate": "පෙරැළිය ",
-		"translate": "පරිවර්තනය ",
+		"translate2": "පරිවර්තනය ",
 		"translate_convert": "පරිවර්තනය පෙරළිම",
 		"translate1": "Translated By ",
 		"translation": "පරිවර්තනය ",
@@ -668,6 +668,8 @@
 		"show_this_para_only": "show this paragraph only",
 		"original_text":"original text",
 		"white_space": "&nbsp;",
+		"latest": "latest",
+		"dev_history": "development history",
 		"": ""
 	},
 	"grammastr": [
@@ -1965,4 +1967,4 @@
 		"100": "open reader",
 		"101": "open studio"
 	}
-}
+}

+ 3 - 1
public/app/public/lang/zh-cn.json

@@ -666,6 +666,8 @@
 		"show_this_para_only": "仅显示此段",
 		"original_text":"原文",
 		"white_space": "",
+		"latest": "最新",
+		"dev_history": "开发历史",
 		"": ""
 	},
 	"grammastr": [
@@ -2251,4 +2253,4 @@
 		"100": "打开阅读器",
 		"101": "打开工作室"
 	}
-}
+}

+ 3 - 1
public/app/public/lang/zh-tw.json

@@ -665,6 +665,8 @@
 		"show_this_para_only": "僅顯示此段",
 		"original_text":"原文",
 		"white_space": "",
+		"latest": "最新",
+		"dev_history": "開發歷史",
 		"": ""
 	},
 	"grammastr": [
@@ -2246,4 +2248,4 @@
 		"100": "打開閱讀器",
 		"101": "打開工作室"
 	}
-}
+}

+ 1 - 0
public/app/studio/css/print.css

@@ -63,6 +63,7 @@
 
 .translate_sent {
 	page-break-before: avoid;
+    margin-top: 1em;
 }
 .sent_wbw_trans {
 	page-break-inside: avoid;

+ 3 - 3
public/app/studio/js/relation_list.js

@@ -1433,7 +1433,7 @@ var list_relation=[
     {
         "id": "DEF",
         "case": "",
-        "note": "特征限定<br>当…",
+        "note": "时间/条件状语 ➡ 动词<br>当…",
         "sys_name": "Sadda Pan Goun",
         "author": "Ven. Pandita Pariyatti Faculty ITBMU",
         "editor": "Bhikkhu Kosalla sy1987",
@@ -1514,7 +1514,7 @@ var list_relation=[
     {
         "id": "ADV",
         "case": "",
-        "note": "副词",
+        "note": "副词/前生动词 ➡ 动词/后生动词",
         "sys_name": "Sadda Pan Goun",
         "author": "Ven. Pandita Pariyatti Faculty ITBMU",
         "editor": "Bhikkhu Kosalla sy1987",
@@ -1691,4 +1691,4 @@ var list_relation=[
         "editor": "Bhikkhu Kosalla sy1987",
         "language": "default"
     }
-];
+];

+ 168 - 18
public/app/term/note.js

@@ -1408,8 +1408,13 @@ function myEndingTooltip(inStr){
         },
         {
             id:"my_nom2",
+            name:"တည်း",
+            tooltip:'就是,表示强调',
+        },
+        {
+            id:"my_nama1",
             name:"ကား",
-            tooltip:'主格/主语',
+            tooltip:'位于名词、代词、成分助词之后,起强调和对比的作用',
         },
         {
             id:"my_nom3",
@@ -1427,78 +1432,113 @@ function myEndingTooltip(inStr){
             tooltip:'宾格/趋向',
         },
         {
-            id:"my_inst1",
+            id:"my_inst_imp",
+            name:"အစွမ်းဖြင့်",
+            tooltip:'vasena',
+        },
+        {
+            id:"my_inst_imp",
+            name:"အစွမ်းအားဖြင့်",
+            tooltip:'vasena',
+        },
+        {
+            id:"my_imp",
             name:"ဖြင့်",
             tooltip:'具格/用',
         },
         {
-            id:"my_inst2",
+            id:"my_soi",
             name:"နှင့်",
             tooltip:'具格/与',
         },
         {
-            id:"my_inst2",
+            id:"my_soi",
             name:"နှင့်",
             tooltip:'具格/与',
         },
         {
-            id:"my_inst3",
+            id:"my_cau",
             name:"ကြောင့်",
             tooltip:'具格/凭借;从格/原因',
         },
         {
-            id:"my_inst3",
+            id:"my_cau",
             name:"ကြောင်း",
             tooltip:'具格/凭借;从格/原因',
         },
         {
-            id:"my_dat1",
+            id:"my_dat3",
+            name:"အကျိုးငှာ",
+            tooltip:'atthāya和atthaṃ',
+        },
+        {
+            id:"my_rec",
             name:"အား",
             tooltip:'目的格/对象(间接宾语),对……来说',
         },
         {
-            id:"my_dat2",
+            id:"my_pur",
             name:"ငှာ",
             tooltip:'目的格/表示目的,为了……',
         },
         {
-            id:"my_dat2",
+            id:"my_pur",
+            name:"ဖို့",
+            tooltip:'目的格/表示目的,为了……',
+        },
+        {
+            id:"my_pur",
+            name:"ငှါ",
+            tooltip:'目的格/表示目的,为了……',
+        },
+        {
+            id:"my_pur",
             name:"အတွက်",
             tooltip:'目的格/表示目的,为了……',
         },
         {
-            id:"my_abl1",
+            id:"my_det",
             name:"မှ",
             tooltip:'从格/表示来源,从……',
         },
         {
-            id:"my_abl2",
+            id:"my_coc1",
             name:"အောက်",
             tooltip:'从格/表达比较,比……多',
         },
         {
-            id:"my_abl3",
+            id:"my_coc0",
             name:"ထက်",
             tooltip:'从格/表达比较,比……少',
         },
         {
-            id:"my_gen1",
+            id:"my_pos",
             name:"၏",
             tooltip:'属格/的',
         },
         {
-            id:"my_gen2",
+            id:"my_coi",
             name:"တွင်",
             tooltip:'属格/表达范围,……中的',
         },
         {
-            id:"my_loc1",
+            id:"my_coi",
+            name:"အနက်",
+            tooltip:'属格/表达范围,……中的',
+        },
+        {
+            id:"my_coi",
+            name:"ထဲမှ",
+            tooltip:'属格/表达范围,……中的',
+        },
+        {
+            id:"my_lov",
             name:"၌",
             tooltip:'处格/处(范围)',
         },
         {
             id:"my_loc2",
-            name:"ကြောင့်",
+            name:"အဖို့၌",
             tooltip:'处格/表达动机,因……,旨在……',
         },
         {
@@ -1537,15 +1577,20 @@ function myEndingTooltip(inStr){
             tooltip:'时间的整数',
         },
         {
-            id:"my_length",
+            id:"my_time",
             name:"တိုင်တိုင်",
             tooltip:'距离,长度的整数',
         },
         {
-            id:"my_length",
+            id:"my_time",
             name:"တိုင်အောင်",
             tooltip:'距离,长度的整数',
         },
+        {
+            id:"my_def",
+            name:"စဉ်",
+            tooltip:'同时发生的时间状语(当……的时候)',
+        },
         {
             id:"my_def",
             name:"နေစဉ်",
@@ -1556,6 +1601,111 @@ function myEndingTooltip(inStr){
             name:"လျက်",
             tooltip:'同时发生的时间状语(当……的时候)',
         },
+        {
+            id:"my_def_eva",
+            name:"မှသာ",
+            tooltip:'只有……才……',
+        },
+        {
+            id:"my_def_eva",
+            name:"မှသာလျှင်",
+            tooltip:'只有……才……',
+        },
+        {
+            id:"my_eva",
+            name:"သာလျှင်",
+            tooltip:'就,只是',
+        },
+        {
+            id:"my_eva",
+            name:"ပင်",
+            tooltip:'就,只是',
+        },
+        {
+            id:"my_eva",
+            name:"ပင်လျှင်",
+            tooltip:'就,只是',
+        },
+        {
+            id:"my_def",
+            name:"လျှင်",
+            tooltip:'同时发生的时间状语(当……的时候)',
+        },
+        {
+            id:"my_def",
+            name:"သော်",
+            tooltip:'同时发生的时间状语(当……的时候)',
+        },
+        {
+            id:"my_api",
+            name:"လည်း",
+            tooltip:'也',
+        },
+        {
+            id:"my_api",
+            name:"ပါ",
+            tooltip:'也',
+        },
+        {
+            id:"my_iad",
+            name:"သော",
+            tooltip:'的(同类修饰)',
+        },
+        {
+            id:"my_pl_fut",
+            name:"ကုန်လတ္တံ့",
+            tooltip:'复数将来式',
+        },
+        {
+            id:"my_fut",
+            name:"လတ္တံ့",
+            tooltip:'将来式',
+        },
+        {
+            id:"my_va",
+            name:"သော်၎င်း",
+            tooltip:'或',
+        },
+        {
+            id:"my_ca",
+            name:"လည်းကောင်း",
+            tooltip:'和',
+        },
+        {
+            id:"my_ca",
+            name:"၎င်း",
+            tooltip:'和',
+        },
+        {
+            id:"my_ca",
+            name:"ရယ်",
+            tooltip:'和',
+        },
+        {
+            id:"my_ca",
+            name:"လည်း",
+            tooltip:'和',
+        },
+        {
+            id:"my_eyya",
+            name:"ကောင်း",
+            tooltip:'也许',
+        },
+        {
+            id:"my_adv",
+            name:"စွာ",
+            tooltip:'副词',
+        },
+        {
+            id:"my_num1",
+            name:"လုံး",
+            tooltip:'整体性',
+        },
+        {
+            id:"my_num1",
+            name:"စလုံး",
+            tooltip:'整体性',
+        },
     ];
 
     for (const iterator of myEnding) {

+ 2 - 2
public/app/term/popup_note.css

@@ -35,7 +35,7 @@ code ol {
 	top: 180%;
 	width: max-content;
 	min-width: 18em;
-	max-width: max(25vw, 100%);
+	max-width: 50vw;
 	min-height: 15em;
 	padding: 10px;
 	background-color: var(--drop-bg-color);
@@ -104,4 +104,4 @@ code ol {
 .guide_contence{
     min-width: 20em;
     max-width: 100%;
-}
+}

+ 3 - 3
public/app/term/term.css

@@ -489,8 +489,8 @@ note:hover .add_new {
 	min-height: 1em;
 	transition: all 0.2s ease;
 	display: none;
-	max-height: 50vh;
-	overflow: scroll;
+	/*max-height: 50vh;*/
+	/*overflow: scroll;*/
 	margin-top: 2em;
 }
 .tool_bar {
@@ -913,7 +913,7 @@ w:hover {
 	flex: 5;
 	display: flex;
 	flex-direction: column;
-	max-width: 50%;
+	/*max-width: 50%;*/
 }
 
 /*段落模式*/

+ 1 - 5
public/app/term/term_popup.js

@@ -27,11 +27,7 @@ function term_popup_init() {
   });
 
   $(".term_link").mouseenter(function (event) {
-	let mouse_x=event.clientX - 20
-	let mouse_y=event.clientY
-	$(this).children(".guide_contence").first().css("left",mouse_x+"px")
-	$(this).children(".guide_contence").first().css("top",mouse_y+"px")
-if ($(this).children(".guide_contence").first().html().length > 0) {
+    if ($(this).children(".guide_contence").first().html().length > 0) {
       return;
     }
     let gid = $(this).attr("gid");

+ 0 - 5
public/app/users_guide/zh-cn/grammar_my_abl1.md

@@ -1,5 +0,0 @@
-# 缅文语尾
-
-|格位|含义|翻译建议|关系|
-|-|-|-|-|
-|[来**源**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/abl.html)|表达来源|从……|[**来源** ➡ 动词<br>DET](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/abl/abl-det.html)|

+ 0 - 5
public/app/users_guide/zh-cn/grammar_my_abl2.md

@@ -1,5 +0,0 @@
-# 缅文语尾
-
-|格位|含义|翻译建议|关系|
-|-|-|-|-|
-|[来**源**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/abl.html)|表达**比较**|比……多|[**参照** ➡ 比较级<br>COC](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/abl/abl-coc.html)|

+ 0 - 5
public/app/users_guide/zh-cn/grammar_my_abl3.md

@@ -1,5 +0,0 @@
-# 缅文语尾
-
-|格位|含义|翻译建议|关系|
-|-|-|-|-|
-|[来**源**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/abl.html)|表达**比较**|比……少|[**参照** ➡ 比较级<br>COC](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/abl/abl-coc.html)|

+ 7 - 5
public/app/users_guide/zh-cn/grammar_my_abs.md

@@ -1,8 +1,10 @@
-# 缅文语尾
+# 缅文语尾(多种可能)
 
 
-|格位|含义|翻译建议|关系|
+|语法特征|含义|翻译建议|关系|
 |-|-|-|-|
-|[**连续**体](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/abl.html)|表达先发生的动作|……完之后|[**前生动词** ➡ 后生动词<br>ADV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/abl/abl-coc.html)|
-|[动名词](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/verbal/pp.html)|表达先发生的动作|……完之后|[**前生动词** ➡ 后生动词<br>ADV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/abl/abl-coc.html)|
-|[过去分词](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/verbal/pp.html)|表达先发生的动作|……完之后|[**前生动词** ➡ 后生动词<br>ADV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/abl/abl-coc.html)|
+|[**连续**体](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/abl.html)|表达先发生的动作|……完之后|[前生**动词** ➡ 后生**动词**<br>ADV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/abl/abl-coc.html)|
+|[动名词](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/verbal/pp.html)|表达先发生的动作|……完之后|[前生**动词** ➡ 后生**动词**<br>ADV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/abl/abl-coc.html)|
+|[过去分词](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/verbal/pp.html)|表达先发生的动作|……完之后|[前生**动词** ➡ 后生**动词**<br>ADV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/abl/abl-coc.html)|
+|[现在分词](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/verbal/prp.html)|特例:表达先发生的动作|……完之后|[前生**动词** ➡ 后生**动词**<br>ADV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/abl/abl-coc.html)|
+|[不变词iti](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/other/iti.html)|引用|引号|[引号 ➡ 引号外<br>QUM](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/other/iti.html)|

+ 4 - 5
public/app/users_guide/zh-cn/grammar_my_acc1.md

@@ -1,8 +1,6 @@
-# 缅文语尾
+# 表示宾语
 
-- 宾语
-
-|格位|含义|翻译建议|关系|
+|语法特征|含义|翻译建议|关系|
 |-|-|-|-|
 |[**宾**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/acc.html)|表达**受动者**|把……|[受动者 ➡ 动词<br>IOV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/acc/acc-iov.html)|
 |[**宾**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/acc.html)|表达主动语态的**双宾语**|使**A**变成B|[受动者·主 ➡ 动词<br>DIO-P](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/acc/acc-dio.html#dio-p)|
@@ -10,4 +8,5 @@
 |[**主**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/nom.html)|表达**被动**语态**双宾语**|**A**被弄成B|[被动者·主 ➡ 被动动词<br>DAO-P](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/nom/nom-dao.html)|
 |[**主**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/nom.html)|表达**被动**语态**双宾语**|A被弄成**B**|[被动者·次 ➡ 被动动词<br>DAO-P](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/nom/nom-dao.html)|
 |[**主**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/nom.html)|表达**被动者**|被……|[被动者 ➡ 被动动词<br>AOV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/nom/nom-aov.html)|
-|[**属**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/nom.html)|表达**被动者**|……的|[受动者 ➡ 动词<br>IOV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/gen/gen-iov.html)|
+|[**属**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/nom.html)|表达**被动者**|……的|[受动者 ➡ 动词<br>IOV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/gen/gen-iov.html)|
+|[**具**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/inst.html)|表达**使役宾语**/**发动主语**|……|[使役宾语/发动主语 ➡ 使役动词<br>IOV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/verb/cau_verb.html)|

+ 3 - 4
public/app/users_guide/zh-cn/grammar_my_acc2.md

@@ -1,8 +1,7 @@
-# 缅文语尾
+# 表示副词
 
-- 修饰动词,起到副词作用
-
-|格位|含义|翻译建议|关系|
+|语法特征|含义|翻译建议|关系|
 |-|-|-|-|
 |[**宾**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/acc.html)|用于修饰动词|……地|[副词 ➡ 动词<br>ADV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/acc/acc-adv.html)|
 |副词|用于修饰动词|……地|[副词 ➡ 动词<br>ADV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/acc/acc-adv.html)|
+|[**宾**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/acc.html)|表达**受动者**|把……|[受动者 ➡ 动词<br>IOV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/acc/acc-iov.html)|

+ 6 - 0
public/app/users_guide/zh-cn/grammar_my_adv.md

@@ -0,0 +1,6 @@
+# 表示副词
+*kiriyāvisesana*
+
+|语法特征|含义|翻译建议|关系|
+|-|-|-|-|
+|不变词|表达修饰动词的**副词**关系|……地……|[副词<br>ADV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/acc/acc-adv.html)|

+ 3 - 0
public/app/users_guide/zh-cn/grammar_my_api.md

@@ -0,0 +1,3 @@
+# 表示也
+
+巴利词api的一种情况,表示:也。

+ 9 - 0
public/app/users_guide/zh-cn/grammar_my_ca.md

@@ -0,0 +1,9 @@
+# 表示并列
+
+|巴利|含义|翻译建议|
+|-|-|-|
+|……ceva……ca句式|表达**并列关系**|既……又……<br>not only…… but also……|
+|……ca……ca句式|表达**并列关系**|……和……<br>……and……|
+|……api……api|表达**并列关系**|……也是……也是<br>……as well as……|
+|……iti……iti|表达**并列关系**|……、……、<br>……, ……,|
+|……vā……vā|表达**并列关系**|不管……还是……<br>no matter …… or ……|

+ 9 - 0
public/app/users_guide/zh-cn/grammar_my_cau.md

@@ -0,0 +1,9 @@
+# 表示原因状语
+
+|语法特征|含义|翻译建议|关系|
+|-|-|-|-|
+|[**具**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/instr.html)|表达**因果**关系|根据……|[原因 ➡ 动词<br>CAU](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/instr/instr-cau.html)|
+|[来**源**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/cau.html)|表达**因果**关系|由于……|[原因 ➡ 动词<br>CAU](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/abl/abl-cau.html)|
+|[**处**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/loc.html)|表达**动机/理由**关系|旨在……<br>因为|[动机 ➡ 动词<br>MOT](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/loc/loc-mot.html)|
+|[引号**iti**](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/other/iti.html#%E5%8E%9F%E5%9B%A0%E7%8A%B6%E8%AF%ADcausative-particle)|表达**因果**关系|因为……|[原因 ➡ 动词<br>CAU](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/other/iti.html#%E5%8E%9F%E5%9B%A0%E7%8A%B6%E8%AF%ADcausative-particle)|
+|[**连续**体](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/verb/ger.html#%E4%BE%8B%E5%8F%A53)|表达**因果**关系|基于……|[原因 ➡ 动词<br>CAU](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/verb/ger.html)|

+ 5 - 0
public/app/users_guide/zh-cn/grammar_my_coc0.md

@@ -0,0 +1,5 @@
+# 表示比较
+
+|语法特征|含义|翻译建议|关系|
+|-|-|-|-|
+|[来**源**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/abl.html)|表达**比较**|比……少|[**参照** ➡ **形容词**比较级<br>COC](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/abl/abl-coc.html)|

+ 5 - 0
public/app/users_guide/zh-cn/grammar_my_coc1.md

@@ -0,0 +1,5 @@
+# 表示比较
+
+|语法特征|含义|翻译建议|关系|
+|-|-|-|-|
+|[来**源**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/abl.html)|表达**比较**|比……多|[**参照** ➡ **形容词**比较级<br>COC](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/abl/abl-coc.html)|

+ 3 - 2
public/app/users_guide/zh-cn/grammar_my_gen2.md → public/app/users_guide/zh-cn/grammar_my_coi.md

@@ -1,7 +1,8 @@
-# 缅文语尾
+# 表示包含关系
 
-|格位|含义|翻译建议|关系|
+|语法特征|含义|翻译建议|关系|
 |-|-|-|-|
 |[**处**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/loc.html)|表达**范围**|……中的|[集合 ➡ 元素<br>COI](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/loc/loc-coi.html)|
 |[**处**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/loc.html)|表达**范围**|……中的|[整体 ➡ 局部<br>COI](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/loc/loc-whp.html)|
 |[**属**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/gen.html)|表达**范围**|……中的|[集合 ➡ 元素<br>COI](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/gen/gen-coi.html)|
+|[来**源**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/abl.html)|表达**范围**|……中的|[集合 ➡ 元素<br>COI](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/abl/abl-coi.html)|

+ 0 - 7
public/app/users_guide/zh-cn/grammar_my_dat2.md

@@ -1,7 +0,0 @@
-# 缅文语尾
-
-## 目的
-
-|格位|含义|翻译建议|关系|
-|-|-|-|-|
-|[**目的**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/dat.html)|表达**动作的目的**<br>相当于英语“for”|为了……|[目的 ➡ 动词<br>REC](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/dat/dat-rec.html)|

+ 6 - 0
public/app/users_guide/zh-cn/grammar_my_dat3.md

@@ -0,0 +1,6 @@
+# 表示目的状语
+
+|语法特征|含义|翻译建议|关系|
+|-|-|-|-|
+|atthāya<br>attha的[**目的**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/dat.html)|表达**目的状语**<br>相当于英语“for the purpose of”|出于……的目的|[目的 ➡ 动词<br>PUR]()|
+|atthaṃ<br>attha的[**宾**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/acc.html)|作副词,表达**目的状语**<br>相当于英语“for the purpose of”|出于……的目的|[目的 ➡ 动词<br>ADV]()|

+ 2 - 4
public/app/users_guide/zh-cn/grammar_my_def.md

@@ -1,10 +1,8 @@
-# 缅文语尾
-
-## 时间状语从句
+# 表示时间状语从句
 
 用分词或普通名词引导从句
 
-|格位|含义|翻译建议|关系|
+|语法特征|含义|翻译建议|关系|
 |-|-|-|-|
 |[**主**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/nom.html)|表达**目标动词发生的时间**|当……时|[分词 ➡ 动词<br>DEF](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/advance-relation/20_nouns.html)|
 |[**属**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/gen.html)|表达**目标动词发生的时间**|当……时|[分词 ➡ 动词<br>DEF](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/verb/abs_clause.html)|

+ 9 - 0
public/app/users_guide/zh-cn/grammar_my_def_eva.md

@@ -0,0 +1,9 @@
+# 表示条件句
+
+用分词或普通动名词引导从句,是**时间状语从句**和eva的结合。
+
+|语法特征|含义|翻译建议|关系|
+|-|-|-|-|
+|[**主**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/nom.html)|表达**必要条件**|只有……才……|[分词 ➡ 动词<br>DEF](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/advance-relation/20_nouns.html)|
+|[**属**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/gen.html)|表达**必要条件**|只有……才……|[分词 ➡ 动词<br>DEF](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/verb/abs_clause.html)|
+|[**处**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/loc.html)|表达**必要条件**|只有……才……|[分词 ➡ 动词<br>DEF](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/verb/abs_clause.html)|

+ 6 - 0
public/app/users_guide/zh-cn/grammar_my_det.md

@@ -0,0 +1,6 @@
+# 表示来源
+
+|语法特征|含义|翻译建议|关系|
+|-|-|-|-|
+|[来**源**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/abl.html)|表达来源|从……|[**来源** ➡ 动词<br>DET](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/abl/abl-det.html)|
+|[来**源**格与paṭṭhāya连用](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/abl.html)|表达起始点|从……开始|[**来源** ➡ 动词<br>DET](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/abl/abl-det.html)|

+ 3 - 0
public/app/users_guide/zh-cn/grammar_my_eva.md

@@ -0,0 +1,3 @@
+# 表示强调
+
+巴利词eva的一种情况,表示:只、就。强调紧挨着eva的前面的词。

+ 5 - 0
public/app/users_guide/zh-cn/grammar_my_eyya.md

@@ -0,0 +1,5 @@
+# 表示并列关系——“或”
+
+|巴利|含义|翻译建议|
+|-|-|-|
+|……vā……vā句式|表达**可能**|也许……也许……|

+ 6 - 0
public/app/users_guide/zh-cn/grammar_my_fut.md

@@ -0,0 +1,6 @@
+# 表示将来式
+
+
+|语法特征|含义|翻译建议|关系|
+|-|-|-|-|
+|动词将来式|将来可能发生的动作|将……,会……,能……|

+ 6 - 0
public/app/users_guide/zh-cn/grammar_my_iad.md

@@ -0,0 +1,6 @@
+# 表示同类修饰关系
+*tulyādhikaraṇavisesana*
+
+|语法特征|含义|翻译建议|关系|
+|-|-|-|-|
+|修饰词和被修饰词的**性数格**一致|表达**同类修饰**关系|……的……|[同类修饰<br>IAD](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/other/iad.html)|

+ 7 - 0
public/app/users_guide/zh-cn/grammar_my_imp.md

@@ -0,0 +1,7 @@
+# 表达方式状语
+
+|语法特征|含义|翻译建议|关系|
+|-|-|-|-|
+|[**具**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/instr.html)|表达**方式**|用……,以……,通过……<br>by…,through…|[方式 ➡ 动词<br>IMP](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/instr/instr-imp.html)|
+|[来**源**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/abl.html)|表达**方式**|作为……,用……,以……,通过……<br>as…|[方式 ➡ 动词<br>IMP](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/instr/instr-imp.html)|
+|[**属**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/gen.html)|表达**方式**|具有……,用……(充满)|[方式 ➡ 动词<br>IMP](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/instr/instr-imp.html)|

+ 0 - 7
public/app/users_guide/zh-cn/grammar_my_inst1.md

@@ -1,7 +0,0 @@
-# 缅文语尾
-## 方式karaṇa
-
-|格位|含义|翻译建议|关系|
-|-|-|-|-|
-|[**具**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/instr.html)|表达**方式**|用……,以……,通过……|[方式 ➡ 动词<br>IMP](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/instr/instr-imp.html)|
-|[来**源**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/abl.html)|表达**方式**|用……,以……,通过……|[方式 ➡ 动词<br>IMP](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/instr/instr-imp.html)|

+ 0 - 10
public/app/users_guide/zh-cn/grammar_my_inst3.md

@@ -1,10 +0,0 @@
-# 缅文语尾
-
-表示原因,有以下可能:
-
-|可能的情况|翻译建议|
-|-|-|
-|[工**具**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/instr/instr-cau.html)|根据……|
-|[来**源**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/abl/abl-cau.html)|由于……|
-|[引号**iti**](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/other/iti.html#%E5%8E%9F%E5%9B%A0%E7%8A%B6%E8%AF%ADcausative-particle)|因为……|
-|[**连续**体](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/verb/ger.html#%E4%BE%8B%E5%8F%A53)|基于……|

+ 6 - 0
public/app/users_guide/zh-cn/grammar_my_inst_imp.md

@@ -0,0 +1,6 @@
+# 注释书中的方式状语
+
+|语法特征|含义|翻译建议|关系|
+|-|-|-|-|
+|vasena<br>vasa的[**具**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/instr.html)|表达**方式**|用……,以……方式,通过……<br>by way of……|[方式 ➡ 动词<br>IMP](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/instr/instr-imp.html)|
+|[来**源**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/abl.html)|表达**方式**|作为……,用……,以……,通过……<br>as…|[方式 ➡ 动词<br>IMP](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/instr/instr-imp.html)|

+ 0 - 7
public/app/users_guide/zh-cn/grammar_my_loc2.md

@@ -1,7 +0,0 @@
-# 缅文语尾
-
-- 处格/表达动机,因……,旨在……
-
-|格位|含义|翻译建议|关系|
-|-|-|-|-|
-|[**处**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/loc.html)|表达**动机/理由**关系|旨在……<br>因为|[动机 ➡ 动词<br>LOV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/loc/loc-mot.html)|

+ 5 - 4
public/app/users_guide/zh-cn/grammar_my_loc1.md → public/app/users_guide/zh-cn/grammar_my_lov.md

@@ -1,7 +1,8 @@
-# 缅文语尾
+# 表示时空背景
 
-|格位|含义|翻译建议|关系|
+|语法特征|含义|翻译建议|关系|
 |-|-|-|-|
 |[**处**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/loc.html)|表达**时空背景**关系|在……时<br>在……处|[时空 ➡ 动词<br>LOV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/loc/loc-lov.html)|
-|[宾**格**](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/acc.html#%E8%BF%9B%E9%98%B6%E7%94%A8%E6%B3%95)|表达**时空背景**关系|在……时<br>在……处|[时空 ➡ 动词<br>LOV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/loc/loc-lov.html)|
-|[不变]()|表达**时空背景**关系|在……时<br>在……处|[时空 ➡ 动词<br>LOV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/loc/loc-lov.html)|
+|[**宾**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/acc.html#%E8%BF%9B%E9%98%B6%E7%94%A8%E6%B3%95)|表达**时空背景**关系|在……时<br>在……处|[时空 ➡ 动词<br>LOV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/loc/loc-lov.html)|
+|[不变]()|表达**时空背景**关系|在……时<br>在……处|[时空 ➡ 动词<br>LOV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/loc/loc-lov.html)|
+|[**目的**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/acc.html#%E8%BF%9B%E9%98%B6%E7%94%A8%E6%B3%95)|表达**行动所趋向的地点**|旨在……|[时空 ➡ 动词<br>LOV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/loc/loc-lov.html)|

+ 5 - 0
public/app/users_guide/zh-cn/grammar_my_nama1.md

@@ -0,0 +1,5 @@
+# 表达强调和对比
+
+|位置|含义|翻译建议|
+|-|-|-|
+|位于名词、代词、成分助词之后|表达**强调和对比的作用**|就是<br>just|

+ 5 - 5
public/app/users_guide/zh-cn/grammar_my_nom1.md

@@ -1,9 +1,9 @@
-# 缅文语尾
+# 表示主语
 
-## 主语
-
-|格位|含义|翻译建议|关系|
+|语法特征|含义|翻译建议|关系|
 |-|-|-|-|
 |[**主**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/acc.html)|表达**施动者**|——|[施动者 ➡ 动词<br>ASV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/nom/nom-asv.html)|
 |[工**具**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/nom.html)|表达**施动者**|被……|[施动者 ➡ 被动动词<br>ISV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/instr/instr-isv.html)|
-|[**属**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/nom.html)|表达**施动者**|……的|[施动者 ➡ 动词<br>ISV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/gen/gen-isv.html)|
+|[**属**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/gen.html)|表达**施动者**|……的|[施动者 ➡ 动词<br>ISV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/gen/gen-isv.html)|
+|[**属**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/gen.html)|在时间状语从句中表达**施动者**|——|[施动者 ➡ 动词<br>ASV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/gen/gen-isv.html)|
+|[**处**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/lov.html)|在时间状语从句中表达**施动者**|——|[施动者 ➡ 动词<br>ASV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/gen/gen-isv.html)|

+ 5 - 2
public/app/users_guide/zh-cn/grammar_my_nom2.md

@@ -1,3 +1,6 @@
-# 缅文语尾
+# 表示表语
 
-- 主格/主语
+|语法特征|含义|翻译建议|关系|
+|-|-|-|-|
+|[**主**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/acc.html)|表达**强调**表语|就是……|[主 ➡ **表**<br>NIO](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/nom/nom-nio.html)|
+|[数词eka](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/acc.html)|位于含数字“一”的数量词之后,表示限定于某个范围|一起,一并|[副词 ➡ 动词<br>ADV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/nom/nom-nio.html)|

+ 8 - 2
public/app/users_guide/zh-cn/grammar_my_nom3.md

@@ -1,3 +1,9 @@
-# 缅文语尾
+# 表示主语
 
-- 主格/主语
+|语法特征|含义|翻译建议|关系|
+|-|-|-|-|
+|[**主**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/acc.html)|表达**施动者**|——|[施动者 ➡ 动词<br>ASV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/nom/nom-asv.html)|
+|[工**具**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/nom.html)|表达**施动者**|被……|[施动者 ➡ 被动动词<br>ISV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/instr/instr-isv.html)|
+|[**属**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/gen.html)|表达**施动者**|……的|[施动者 ➡ 动词<br>ISV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/gen/gen-isv.html)|
+|[**属**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/gen.html)|在时间状语从句中表达**施动者**|——|[施动者 ➡ 动词<br>ASV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/gen/gen-isv.html)|
+|[**处**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/lov.html)|在时间状语从句中表达**施动者**|——|[施动者 ➡ 动词<br>ASV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/gen/gen-isv.html)|

+ 5 - 0
public/app/users_guide/zh-cn/grammar_my_pl_fut.md

@@ -0,0 +1,5 @@
+# 表示复数将来式
+
+|语法特征|含义|翻译建议|关系|
+|-|-|-|-|
+|动词将来式|将来可能发生的动作|将……,会……,能……|

+ 4 - 6
public/app/users_guide/zh-cn/grammar_my_gen1.md → public/app/users_guide/zh-cn/grammar_my_pos.md

@@ -1,9 +1,7 @@
-# 缅文语尾
+# 缅文语尾(多种可能)
 
-- 名词:属格/表达从属,……的
-- 句子结尾:放在首要动词之后
-
-|格位|含义|翻译建议|关系|
+|语法特征|含义|翻译建议|关系|
 |-|-|-|-|
+|动词现在式|正……|——|标识首要动词|
+|动词过去式|……了|——|标识首要动词|
 |[**属**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/gen.html)|表达**从属关系**|……的|[所有者 ➡ 所属物<br>POS](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/gen/gen-pos.html)|
-|——|表达句子结尾:放在首要动词之后|——|——|

+ 7 - 0
public/app/users_guide/zh-cn/grammar_my_pur.md

@@ -0,0 +1,7 @@
+# 表示目的状语
+
+|语法特征|含义|翻译建议|关系|
+|-|-|-|-|
+|[**目的**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/dat.html)|表达**动作的目的**<br>相当于英语“for”|为了……|[目的 ➡ 动词<br>PUR](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/dat/dat-pur.html)|
+|[**不定**体](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/dat.html)|表达**目的的动作**<br>相当于英语“to do”|用来……|[目的 ➡ 动词<br>PUR](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/verb/inf.html)|
+|[atthaṃ]()|表达**目的状语**<br>相当于英语“to do”|用来……|[目的 ➡ 动词<br>PUR](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/verb/inf.html)|

+ 3 - 4
public/app/users_guide/zh-cn/grammar_my_dat1.md → public/app/users_guide/zh-cn/grammar_my_rec.md

@@ -1,6 +1,5 @@
-# 缅文语尾
-## 目标对象
+# 表示动作目标
 
-|格位|含义|翻译建议|关系|
+|语法特征|含义|翻译建议|关系|
 |-|-|-|-|
-|[**目的**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/dat.html)|表达**动作的目标对象**<br>相当于英语“to”|向……,对……来说|[接受者 ➡ 动词<br>REC](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/dat/dat-rec.html)|
+|[**目的**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/dat.html)|表达**动作的目标对象**<br>相当于英语“to”|向……,对……来说|[接受者 ➡ 动词<br>REC](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/dat/dat-rec.html)|

+ 3 - 4
public/app/users_guide/zh-cn/grammar_my_inst2.md → public/app/users_guide/zh-cn/grammar_my_soi.md

@@ -1,8 +1,7 @@
-# 缅文语尾
-## 伴随关系
+# 表示伴随关系
 sahādiyoga 或 sahatthayoga
 
-|格位|含义|翻译建议|关系|
+|语法特征|含义|翻译建议|关系|
 |-|-|-|-|
 |[**具**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/instr.html)|表达**连带**关系(有连词)|跟……一起,与……一起|[伴随 ➡ 连词<br>SOE](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/instr/instr-soe.html)|
-|[**具**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/instr.html)|表达**连带**关系(无连词)|跟……,与……|[伴随 ➡ 动词<br>SOI](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/instr/instr-soi.html)|
+|[**具**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/instr.html)|表达**连带**关系(无连词)|跟……,与……|[伴随 ➡ 动词<br>SOI](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/instr/instr-soi.html)|

+ 4 - 3
public/app/users_guide/zh-cn/grammar_my_time.md

@@ -1,8 +1,9 @@
-# 缅文语尾
+# 表示**段时间**
 
-表示持续一段时间
+表示持续一段时间、一段距离、一段长度
 
-|格位|含义|翻译建议|关系|
+|语法特征|含义|翻译建议|关系|
 |-|-|-|-|
 |[**宾**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/acc.html)|表达**持续**一段时间/空间|经过……|[时空连续性<br>STC](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/acc/acc-stc.html)|
 |副词|表达**持续**一段时间/空间|经过……|[时空连续性<br>STC](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/acc/acc-stc.html)|
+|[来**源**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/abl.html)|与yāva连用,表达**持续**一段时间/空间|直到……|[时空连续性<br>STC](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/acc/acc-stc.html)|

+ 5 - 0
public/app/users_guide/zh-cn/grammar_my_va.md

@@ -0,0 +1,5 @@
+# 表示并列关系——“或”
+
+|巴利|含义|翻译建议|
+|-|-|-|
+|……vā……vā句式|表达**并列关系**|……或……<br>……or……|

+ 0 - 1
public/app/users_guide/zh-cn/grammar_nom.md

@@ -5,4 +5,3 @@
 |巴利|sa|Paccatta-vacana\(常见于注释书\)<br>paṭhamā-vibhatti\(常见于语法书\)|
 |汉|**主**|主格<br>体格<br>第一变格|
 |英|**nom.**|nominative case|
-