Merge pull request #3 from iapt-platform/laravel

pr 支持 修改，删除

README.md

@@ -24,7 +24,7 @@
 目录遵从Laravel目录设置。有以下几点差别
 
 - public/ 包含旧版php程序的全部文件
-- public/tmp 旧版资源文件夹 对于旧版到新版的迁移。**应该将旧版 /tmp 拷贝到 /public**
+- public/tmp 旧版资源文件夹，含有sqlite数据文件 对于旧版到新版的迁移。**应该将旧版 /tmp 拷贝到 /public**
 - v1 旧版数据迁移任务脚本
 - deploy 运维代码 
 
@@ -55,15 +55,20 @@ create database iapt
 `\q` 退出psql
 
 #### PHP 8
+编辑 php.ini 文件，打开pgsql和sqlite的PDO扩展，以及fileinfo
+```
+extension=pdo_pgsql
+extension=pdo_sqlite
+extension=fileinfo
+```
 
 #### Redis
+最新版的Redis不支持Windows平台，可以安装第三方修改的[Windows版Redis5.0](https://github.com/tporadowski/redis)
 
 #### composer
 
 #### npm
 
-#### yarn
-
 
 ### Fork
 
@@ -229,7 +234,7 @@ sudo cp ./public/app/fts/pali.syn /usr/share/postgresql/14/tsearch_data/
 - ./public/app/fts/pali.stop
 - ./public/app/fts/pali.syn
 
-到你的 shardir
+到你的 shardir/tsearch_data 目录下
 
 
 ### application encryption key
@@ -281,7 +286,7 @@ cd ./v1/scripts
 
 运行时间较长。本地开发环境大约4小时。
 
-
+如果不想等待，可以导入其他人已经部署好的postgresql数据库
 
 ### 运行dev server
 

deploy/scripts/handbooks.sh

@@ -0,0 +1,48 @@
+#!/bin/bash
+
+set -e
+
+
+if [ $# -ne 1 ]
+then
+	echo "Usage: $0 FOLDER"
+	exit 1
+fi
+
+
+function build_book(){
+    local target=$HOME/tmp/$2/$3
+    local dist=$1/public/$2/$3
+    if [ ! -d $target ]
+    then
+        git clone -b $3 "https://github.com/iapt-platform/$2.git" $target
+    fi
+    cd $target
+    git pull
+    if [ -d $dist ]
+    then
+        rm -r $dist
+    fi
+    mkdir -p $dist
+    $HOME/.local/bin/mdbook build --dest-dir $dist
+    echo "done($dist)."
+}
+
+declare -a languages=(
+    "zh-Hans"
+)
+
+declare -a books=(
+    "pali-handbook"
+    "help"
+)
+
+for b in "${books[@]}"
+do
+    for l in "${languages[@]}"
+    do
+        build_book $1 $b $l
+    done
+done
+
+exit 0

public/app/article/article.js

@@ -486,7 +486,7 @@ function reader_draw_para_menu() {
 		let html = "<a name='para_" + strPara + "'></a>";
 		html += "<div class='case_dropdown-content para_menu'>";
 		if (typeof _view != "undefined" && _view != "para") {
-			html += "<a onclick=\"junp_to_para('" + _book + "','" + strPara + "')\">仅显示此段</a>";
+			html += "<a onclick=\"junp_to_para('" + _book + "','" + strPara + "')\">" + gLocal.gui.show_this_para_only + "</a>";
 		}
 		html += "<a onclick=\"edit_wbw('" + _book + "','" + strPara + "')\">" + gLocal.gui.edit_now + "</a>";
 		html += "<a  onclick='goto_nissaya(" + _book + "," + strPara + ")'>" + gLocal.gui.show_nissaya + "</a>";

public/app/palicanon/style.css

@@ -340,7 +340,7 @@ li.level_1.selected {
 }
 #left-bar{
     flex: 2;
-	width: 300px;
+	width: 20vw;
     background-color: var(--box-bg-color2);
 	position: fixed;
 }
@@ -438,7 +438,7 @@ button.active {
     justify-content: space-between;
 }
 .chapter_list ul li>.main>.right{
-    width:100%;
+    width:calc(100% - 100px);
 }
 .chapter_tag {
     width: 475px;
@@ -569,7 +569,8 @@ span.channel {
 
 #course_head_bar{
 	flex:6;
-	padding:0 10px 10px 315px;
+	padding:0 10px 10px 20vw;
+	width: 80vw;
 }
 
 #bread-crumbs{

public/app/public/charcode/converter_tai_tham.js

@@ -57,6 +57,7 @@ var char_roman_to_tai = [
 	{ id: "kko", value: "ᨠᩮ᩠ᨠᩣ" },
 	{ id: "kro", value: "ᨠᩮ᩠ᩕᩣ" },
 	{ id: "mbo", value: "ᨾᩮ᩠ᨻᩣ" },
+	{ id: "llo", value: "ᩃᩮ᩠ᩃᩣ" },
 	{ id: "mmo", value: "ᨾᩮᩜᩣ" },
 	{ id: "mpo", value: "ᨾᩮ᩠ᨷᩣ" },
 	{ id: "ndo", value: "ᨶᩮᩣ᩠ᨴ" },
@@ -105,6 +106,7 @@ var char_roman_to_tai = [
 	{ id: "kke", value: "ᨠᩮ᩠ᨠ" },
 	{ id: "ṅke", value: "ᩘᨠᩮ" },//  ᩘᩮ᩠ᨠ
 	{ id: "mme", value: "ᨾᩮᩜ" },
+	{ id: "lle", value: "ᩃᩮ᩠ᩃ" },
 	{ id: "nne", value: "ᨶᩮ᩠ᨶ" },
 	{ id: "ññe", value: "ᨬᩮ᩠ᨬ" },
 	{ id: "ṇṇe", value: "ᨱᩮ᩠ᨱ" },

public/app/public/charcode/coverter_my.js

@@ -5,6 +5,29 @@ var char_roman_to_myn = [
 	{ id: "ddho", value: "ဒ္ဓေါ" },
 	{ id: "ddhā", value: "ဒ္ဓါ" },
 
+	{ id: "ndho", value: "န္ဓော" },//
+	{ id: "ndo", value: "န္ဒော" },//
+	{ id: "ndā", value: "န္ဒာ" }, //
+	{ id: "ndhā", value: "န္ဓာ" }, //
+	
+	{ id: "kho", value: "ခေါ" },//
+	{ id: "khā", value: "ခါ" }, //
+	{ id: "kkho", value: "က္ခော" }, //
+	{ id: "kkhā", value: "က္ခာ" }, //
+	{ id: "go", value: "ဂေါ" },//
+	{ id: "ṅo", value: "ငေါ" },//
+	{ id: "dho", value: "ဓေါ" },//
+	{ id: "do", value: "ဒေါ" },//
+	{ id: "po", value: "ပေါ" },//
+	{ id: "vo", value: "ဝေါ" },//
+	{ id: "gā", value: "ဂါ" }, //
+	{ id: "ṅā", value: "ငါ" }, //
+	{ id: "dā", value: "ဒါ" }, //
+	{ id: "dhā", value: "ဓါ" }, //
+	{ id: "pā", value: "ပါ" }, //
+	{ id: "vā", value: "ဝါ" }, //
+	{ id: "dvā", value: "ဒွါ" }, //
+
 	//{ id: "ppho", value: "ပ္ဖေါ" },
 	//{ id: "pphā", value: "ပ္ဖါ" },
 
@@ -88,21 +111,18 @@ var char_roman_to_myn = [
 	{ id: "o", value: "ဩ" },
 	{ id: "်္အ", value: "" },
 	{ id: "္အ", value: "" },
-	{ id: "ခော", value: "ခေါ" },
-	{ id: "ခာ", value: "ခါ" }, //kh
-	{ id: "က္ခေါ", value: "က္ခော" }, //kkho
-	{ id: "က္ခါ", value: "က္ခာ" }, //kkhā
-	{ id: "ဂော", value: "ဂေါ" },
-	{ id: "ငော", value: "ငေါ" },
-	{ id: "ဒော", value: "ဒေါ" },
-	{ id: "ပော", value: "ပေါ" },
-	{ id: "ဝော", value: "ဝေါ" },//vo
-	{ id: "ဂာ", value: "ဂါ" }, //gā
-	{ id: "ငာ", value: "ငါ" }, //ṅā
-	{ id: "ဒာ", value: "ဒါ" }, //dā
-	{ id: "ပာ", value: "ပါ" }, //pā
-	{ id: "ဝာ", value: "ဝါ" }, //vā
-	{ id: "ဒွာ", value: "ဒွါ" }, //dvā
+//新增数字
+	{ id: "1", value: "၁" },
+	{ id: "2", value: "၂" },
+	{ id: "3", value: "၃" },
+	{ id: "4", value: "၄" },
+	{ id: "5", value: "၅" },
+	{ id: "6", value: "၆" },
+	{ id: "7", value: "၇" },
+	{ id: "8", value: "၈" },
+	{ id: "9", value: "၉" },
+	{ id: "0", value: "၀" },
+
 	
 ];
 
@@ -148,6 +168,7 @@ var char_myn_to_roman_1 = [
 	{ id: "ဃ", value: "gha" },
 	{ id: "ဆ", value: "cha" },
 	{ id: "ဈ", value: "jha" },
+	{ id: "စျ", value: "jha" },
 	{ id: "ည", value: "ñña" },
 	{ id: "ဌ", value: "ṭha" },
 	{ id: "ဎ", value: "ḍha" },

public/app/public/charcode/myanmar.js

@@ -5,6 +5,29 @@ var char_roman_to_myn = [
 	{ id: "ddho", value: "ဒ္ဓေါ" },
 	{ id: "ddhā", value: "ဒ္ဓါ" },
 
+	{ id: "ndho", value: "န္ဓော" },//
+	{ id: "ndo", value: "န္ဒော" },//
+	{ id: "ndā", value: "န္ဒာ" }, //
+	{ id: "ndhā", value: "န္ဓာ" }, //
+	
+	{ id: "kho", value: "ခေါ" },//
+	{ id: "khā", value: "ခါ" }, //
+	{ id: "kkho", value: "က္ခော" }, //
+	{ id: "kkhā", value: "က္ခာ" }, //
+	{ id: "go", value: "ဂေါ" },//
+	{ id: "ṅo", value: "ငေါ" },//
+	{ id: "dho", value: "ဓေါ" },//
+	{ id: "do", value: "ဒေါ" },//
+	{ id: "po", value: "ပေါ" },//
+	{ id: "vo", value: "ဝေါ" },//
+	{ id: "gā", value: "ဂါ" }, //
+	{ id: "ṅā", value: "ငါ" }, //
+	{ id: "dā", value: "ဒါ" }, //
+	{ id: "dhā", value: "ဓါ" }, //
+	{ id: "pā", value: "ပါ" }, //
+	{ id: "vā", value: "ဝါ" }, //
+	{ id: "dvā", value: "ဒွါ" }, //
+
 	//{ id: "ppho", value: "ပ္ဖေါ" },
 	//{ id: "pphā", value: "ပ္ဖါ" },
 
@@ -88,31 +111,30 @@ var char_roman_to_myn = [
 	{ id: "o", value: "ဩ" },
 	{ id: "်္အ", value: "" },
 	{ id: "္အ", value: "" },
-	{ id: "ခော", value: "ခေါ" },
-	{ id: "ခာ", value: "ခါ" }, //kh
-	{ id: "က္ခေါ", value: "က္ခော" }, //kkho
-	{ id: "က္ခါ", value: "က္ခာ" }, //kkhā
-	{ id: "ဂော", value: "ဂေါ" },
-	{ id: "ငော", value: "ငေါ" },
-	{ id: "ဒော", value: "ဒေါ" },
-	{ id: "ပော", value: "ပေါ" },
-	{ id: "ဝော", value: "ဝေါ" },//vo
-	{ id: "ဂာ", value: "ဂါ" }, //gā
-	{ id: "ငာ", value: "ငါ" }, //ṅā
-	{ id: "ဒာ", value: "ဒါ" }, //dā
-	{ id: "ပာ", value: "ပါ" }, //pā
-	{ id: "ဝာ", value: "ဝါ" }, //vā
-	{ id: "ဒွာ", value: "ဒွါ" }, //dvā
-	
+//新增数字
+	{ id: "1", value: "၁" },
+	{ id: "2", value: "၂" },
+	{ id: "3", value: "၃" },
+	{ id: "4", value: "၄" },
+	{ id: "5", value: "၅" },
+	{ id: "6", value: "၆" },
+	{ id: "7", value: "၇" },
+	{ id: "8", value: "၈" },
+	{ id: "9", value: "၉" },
+	{ id: "0", value: "၀" },
+
 ];
 
 var char_myn_to_roman_1 = [
 	{ id: "ႁႏၵ", value: "ndra" }, //後加
+//	{ id: "ဇ္ဈ", value: "jjha" }, //後加
+//	{ id: "ဇ္စျ", value: "jjha" }, //後加
 
 	{ id: "ခ္", value: "kh" },
 	{ id: "ဃ္", value: "gh" },
 	{ id: "ဆ္", value: "ch" },
 	{ id: "ဈ္", value: "jh" },
+	{ id: "စျ္", value: "jh" },
 	{ id: "ည္", value: "ññ" },
 	{ id: "ဌ္", value: "ṭh" },
 	{ id: "ဎ္", value: "ḍh" },
@@ -148,6 +170,7 @@ var char_myn_to_roman_1 = [
 	{ id: "ဃ", value: "gha" },
 	{ id: "ဆ", value: "cha" },
 	{ id: "ဈ", value: "jha" },
+	{ id: "စျ", value: "jha" },
 	{ id: "ည", value: "ñña" },
 	{ id: "ဌ", value: "ṭha" },
 	{ id: "ဎ", value: "ḍha" },

public/app/public/charcode/tai_tham.js

@@ -57,6 +57,7 @@ var char_roman_to_tai = [
 	{ id: "kro", value: "ᨠᩮ᩠ᩕᩣ" },
 	{ id: "mbo", value: "ᨾᩮ᩠ᨻᩣ" },
 	{ id: "mmo", value: "ᨾᩮᩜᩣ" },
+	{ id: "llo", value: "ᩃᩮ᩠ᩃᩣ" },
 	{ id: "mpo", value: "ᨾᩮ᩠ᨷᩣ" },
 	{ id: "ndo", value: "ᨶᩮᩣ᩠ᨴ" },
 	{ id: "nno", value: "ᨶᩮᩣ᩠ᨶ" },
@@ -106,6 +107,7 @@ var char_roman_to_tai = [
 	{ id: "kke", value: "ᨠᩮ᩠ᨠ" },
 	{ id: "ṅke", value: "ᩘᨠᩮ" },//  ᩘᩮ᩠ᨠ
 	{ id: "mme", value: "ᨾᩮᩜ" },
+	{ id: "lle", value: "ᩃᩮ᩠ᩃ" },
 	{ id: "nne", value: "ᨶᩮ᩠ᨶ" },
 	{ id: "ññe", value: "ᨬᩮ᩠ᨬ" },
 	{ id: "ṇṇe", value: "ᨱᩮ᩠ᨱ" },

public/app/public/lang/default.json

@@ -53,7 +53,7 @@
 		"content": "Content",
 		"contents": "Table of Content",
 		"copy": "copy",
-		"copy_to_clipboard": "copy the link to clipboard",
+		"copy_to_clipboard": "copy the sent No. to clipboard",
 		"creat_a_new_file_by_yourself": "Creat a new file by yourself",
 		"created": "Created",
 		"current": "Current",
@@ -661,6 +661,7 @@
 		"my_read": "recent",
 		"master_copy": "pāli",
 		"nissaya": "nissaya",
+		"show_this_para_only": "show this paragraph only",
 		"original_text":"original text",
 		"": ""
 	},

public/app/public/lang/en.json

@@ -53,7 +53,7 @@
 		"content": "Content",
 		"contents": "Table of Content",
 		"copy": "copy",
-		"copy_to_clipboard": "copy the link to clipboard",
+		"copy_to_clipboard": "copy the sent No. to clipboard",
 		"creat_a_new_file_by_yourself": "Creat a new file by yourself",
 		"created": "Created",
 		"current": "Current",
@@ -660,6 +660,7 @@
 		"my_read": "recent",
 		"master_copy": "pāli",
 		"nissaya": "nissaya",
+		"show_this_para_only": "show this paragraph only",
 		"original_text":"original text",
 		"": ""
 	},

public/app/public/lang/my.json

@@ -48,6 +48,7 @@
 		"content": "Content",
 		"contents": "Contents",
 		"copy": "copy",
+		"copy_to_clipboard": "copy the sent No. to clipboard",
 		"creat_a_new_file_by_yourself": "Creat a new file by yourself",
 		"created": "Created",
 		"current": "လက်ရှိ",
@@ -641,6 +642,7 @@
 		"my_read": "recent",
 		"master_copy": "ပါလိ",
 		"nissaya": "နိဿယ",
+		"show_this_para_only": "show this paragraph only",
 		"original_text":"original text",
 		"": ""
 	},

public/app/public/lang/si.json

@@ -53,7 +53,7 @@
 		"content": "පටුන",
 		"contents": "අන්තර්ගතය",
 		"copy": "copy",
-		"copy_to_clipboard": "copy the link to clipboard",
+		"copy_to_clipboard": "copy the sent No. to clipboard",
 		"creat_a_new_file_by_yourself": "ඔබ කැමති පරදි නව ගොනුව සාදන්න",
 		"created": "සාදන ලදි",
 		"current": "අලුත්ම",
@@ -665,6 +665,7 @@
 		"my_read": "recent",
 		"master_copy": "පාලි",
 		"nissaya": "සන‍්න‍ය",
+		"show_this_para_only": "show this paragraph only",
 		"original_text":"original text",
 		"": ""
 	},

public/app/public/lang/zh-cn.json

@@ -53,7 +53,7 @@
 		"content": "目录",
 		"contents": "目录",
 		"copy": "复制",
-		"copy_to_clipboard": "复制句子链接到剪切板",
+		"copy_to_clipboard": "复制句子编号",
 		"creat_a_new_file_by_yourself": "创建自定义文档",
 		"created": "创建",
 		"current": "当前",
@@ -663,6 +663,7 @@
 		"my_read": "我的阅读",
 		"master_copy": "巴利底本",
 		"nissaya": "依词释",
+		"show_this_para_only": "仅显示此段",
 		"original_text":"原文",
 		"": ""
 	},

public/app/public/lang/zh-tw.json

@@ -53,7 +53,7 @@
 		"content": "目錄",
 		"contents": "目錄",
 		"copy": "複製",
-		"copy_to_clipboard": "複製句子連結到剪下闆",
+		"copy_to_clipboard": "複製句子編號",
 		"creat_a_new_file_by_yourself": "新建自定檔案",
 		"created": "建立",
 		"current": "當前",
@@ -662,6 +662,7 @@
 		"my_read": "我的閱讀",
 		"master_copy": "巴利底本",
 		"nissaya": "依詞釋",
+		"show_this_para_only": "僅顯示此段",
 		"original_text":"原文",
 		"": ""
 	},

public/app/studio/svg/icon.svg

@@ -949,8 +949,9 @@
 <path d="M519.314286 32.914286c157.013333 0 299.739429 75.093333 389.510095 194.901333l87.917714-52.370286s19.846095-9.898667 19.846095 13.312v346.940953s0 30.915048-23.259428 19.797333c-19.456-9.264762-230.64381-130.340571-297.106286-168.569905-36.473905-16.432762-4.437333-29.744762-4.437333-29.744762l105.179428-62.707809a357.180952 357.180952 0 1 0 14.628572 430.226286l105.618286 74.410666a485.814857 485.814857 0 0 1-397.897143 206.604191c-268.629333 0-486.4-217.770667-486.4-486.4C32.914286 250.684952 250.684952 32.914286 519.314286 32.914286z" p-id="6640"></path>
 </symbol>
 
-<symbol fill="currentColor" class="bi bi-graph-up" viewBox="0 0 16 16" id="graph-up" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" d="M0 0h1v15h15v1H0V0zm10 3.5a.5.5 0 01.5-.5h4a.5.5 0 01.5.5v4a.5.5 0 01-1 0V4.9l-3.613 4.417a.5.5 0 01-.74.037L7.06 6.767l-3.656 5.027a.5.5 0 01-.808-.588l4-5.5a.5.5 0 01.758-.06l2.609 2.61L13.445 4H10.5a.5.5 0 01-.5-.5z"/>
+<symbol class="bi bi-graph-up" viewBox="0 0 512 512" id="graph-up" xmlns="http://www.w3.org/2000/svg">
+	<path d="M480 496H48a32 32 0 01-32-32V32a16 16 0 0132 0v432h432a16 16 0 010 32z"/>
+	<path d="M156 432h-40a36 36 0 01-36-36V244a36 36 0 0136-36h40a36 36 0 0136 36v152a36 36 0 01-36 36zM300 432h-40a36 36 0 01-36-36V196a36 36 0 0136-36h40a36 36 0 0136 36v200a36 36 0 01-36 36zM443.64 432h-40a36 36 0 01-36-36V132a36 36 0 0136-36h40a36 36 0 0136 36v264a36 36 0 01-36 36z"/>
 </symbol>
 
 </svg>

public/app/term/note.js

@@ -704,6 +704,18 @@ function note_json_html(in_json) {
 		"','" +
 		in_json.end +
 		"')\">" +
+		gLocal.gui.copy_to_clipboard +
+		"</a>";
+	output +=
+		"<a onclick=\"copy_to_clipboard('"+ window.location.href +"#sent_" +
+		in_json.book +
+		"_" +
+		in_json.para +
+		"_" +
+		in_json.begin +
+		"_" +
+		in_json.end + 
+		"')\" >" +
 		gLocal.gui.copy_link +
 		"</a>";
 	output += "<a onclick='copy_text(this)'>" + gLocal.gui.copy + "“" + gLocal.gui.pāli + "”</a>";
@@ -1224,7 +1236,10 @@ function render_one_sent_tran_a(iterator, diff = false) {
 		html += iterator.editor_name.nickname;
 	}
 	html += "</span>";
-	html += '<span class="date">' + getPassDataTime(iterator.update_time) + "</span>";
+	html += '<span class="date" title="' +
+	getFullDataTime(iterator.update_time) +
+	'">' + getPassDataTime(iterator.update_time) + "</span>";
+	html += '<span class="date" >' + getPassDataTime(iterator.update_time) + "</span>";
 	html += "</div>";
 	html += "<div class='preview'>" + tranText + "</div>";
 	html += "</div>";
@@ -1283,8 +1298,10 @@ function render_one_sent_tran_a(iterator, diff = false) {
 
 	html += '<div class="info">';
 	if (iterator.id != "") {
-		html += '<span class="date"> ' + getPassDataTime(iterator.update_time) + "</span>";
-	}
+		html += '<span class="date" title="' +
+		getFullDataTime(iterator.update_time) +
+		'">' + getPassDataTime(iterator.update_time) + "</span>";
+}
 	if (iterator.id != "") {
 		html += '<span class="name">' + iterator.editor_name.nickname + "</span>";
 	}
@@ -1306,6 +1323,9 @@ function render_one_sent_tran_a(iterator, diff = false) {
 		html += "</span>";
 	}
 
+	html += "</div>"; //end of info
+
+	html += "</div>"; //end of foot bar
 	html += '<ul class="tag_list">';
 	html += "<li class='pr' onclick=\"note_pr_show('" + iterator.channal + "','" + sid + "')\">";	
 	if (iterator.pr_all && parseInt(iterator.pr_all) > 0) {
@@ -1313,9 +1333,6 @@ function render_one_sent_tran_a(iterator, diff = false) {
 	}
 	html += "</li>";
 	html += "</ul>";
-	html += "</div>"; //end of info
-
-	html += "</div>"; //end of foot bar
 
 	html += "</div>";
 	html += "</div>";
@@ -1499,6 +1516,11 @@ function myEndingTooltip(inStr){
             name:"နေစဉ်",
             tooltip:'同时发生的时间状语(当……的时候)',
         },
+        {
+            id:"my_def",
+            name:"လျက်",
+            tooltip:'同时发生的时间状语(当……的时候)',
+        },
     ];
 
     for (const iterator of myEnding) {

public/app/term/term.css

@@ -681,7 +681,7 @@ pw {
 	text-transform:capitalize;
 }
 .compact .body > .head_bar {
-	display: flex;
+	/*display: flex;*/
 }
 .compact .body > .head_bar > .date {
 	display: none;
@@ -755,6 +755,10 @@ pw {
 .translation>.sent_tran_inner:hover>.tool_bar > .right {
     display: block;
 }
+.nissaya>.sent_tran_inner:hover>.tool_bar > .right {
+    display: block;
+}
+
 
 .sent_tran.commentary>.sent_tran_inner{
     padding-top: 2.2em;
@@ -787,6 +791,7 @@ pw {
 .compact .foot_bar {
 	display: none;
 }
+
 .edit_mode {
 	background-color: #fafafa;
 }
@@ -1167,7 +1172,7 @@ ul {
 .nsy_word>.meaning{
     display:inline;
     font-weight: 400;
-
+	white-space: pre-wrap;
 }
 .nsy_word>.org>strong {
     font-weight:900;

public/app/users_guide/zh-cn/grammar_my_acc2.md

@@ -1,3 +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)|

public/app/users_guide/zh-cn/grammar_my_dat1.md

@@ -1,3 +1,6 @@
 # 缅文语尾
+## 目标对象
 
-- 目的格/表达动作对象(间接宾语)，向……，对……来说
+|格位|含义|翻译建议|关系|
+|-|-|-|-|
+|[**目的**格](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)|

public/app/users_guide/zh-cn/grammar_my_dat2.md

@@ -1,3 +1,7 @@
 # 缅文语尾
 
-- 目的格/表达目的，为了……
+## 目的
+
+|格位|含义|翻译建议|关系|
+|-|-|-|-|
+|[**目的**格](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)|

public/app/users_guide/zh-cn/grammar_my_def.md

@@ -0,0 +1,12 @@
+# 缅文语尾
+
+## 时间状语从句
+
+用分词或普通名词引导从句
+
+|格位|含义|翻译建议|关系|
+|-|-|-|-|
+|[**主**格](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)|
+

public/app/users_guide/zh-cn/grammar_my_gen1.md

@@ -1,4 +1,9 @@
 # 缅文语尾
 
 - 名词：属格/表达从属，……的
-- 句子结尾：放在首要动词之后
+- 句子结尾：放在首要动词之后
+
+|格位|含义|翻译建议|关系|
+|-|-|-|-|
+|[**属**格](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)|
+|——|表达句子结尾：放在首要动词之后|——|——|

public/app/users_guide/zh-cn/grammar_my_gen2.md

@@ -1,4 +1,7 @@
 # 缅文语尾
 
-- 处格/表达范围，……处
-- 属格/表达范围，……中的
+|格位|含义|翻译建议|关系|
+|-|-|-|-|
+|[**处**格](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)|

public/app/users_guide/zh-cn/grammar_my_inst2.md

@@ -1,4 +1,7 @@
 # 缅文语尾
-## sahādiyoga伴随
-
-- 具格/表达连带，跟……，与……
+## 伴随关系
+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)|

public/app/users_guide/zh-cn/grammar_my_loc1.md

@@ -1,3 +1,5 @@
 # 缅文语尾
 
-- 处格/处(范围)
+|格位|含义|翻译建议|关系|
+|-|-|-|-|
+|[**处**格](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)|

public/app/users_guide/zh-cn/grammar_my_loc2.md

@@ -1,3 +1,7 @@
 # 缅文语尾
 
-- 处格/表达动机，因……，旨在……
+- 处格/表达动机，因……，旨在……
+
+|格位|含义|翻译建议|关系|
+|-|-|-|-|
+|[**处**格](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)|