Merge branch 'master' of https://github.com/visuddhinanda/mint

app/article/index.php

@@ -53,8 +53,8 @@ require_once "../pcdl/html_head.php";
 		<span><?php echo $_local->gui->anthology; ?></span>
 	</div>
 
-	<div>
-		<span>
+	<div style="margin: auto 0;">
+		<span id="head_span">
 		<?php
 		
 		if(isset($_GET["id"])){

app/article/mobile.css

@@ -23,15 +23,23 @@
 	padding-top: 10em;
 }
 .other_tran_div > .tool_bar {
-	display: grid;
-	min-height: 3em;
 }
 .other_tran_div > .tool_bar > .tool_left {
 	width: calc(100vw - 2em - 12px);
 	max-width: 100%;
 }
 .other_tran_div > .tool_bar > .tool_right {
-	position: absolute;
 	right: 6px;
-	margin-top: 1.5em;
+	max-width: 50vw;
+}
+#head_span {
+	width: 90vw;
+	display: inline-flex;
+	justify-content: space-between;
+	margin-top: 5px;
+}
+note:hover .ref {
+	margin-left: -60vw;
+	width: 60vw;
+	max-width: 60vw;
 }

app/article/style.css

@@ -83,7 +83,6 @@
 }
 #right_pannal {
 	flex: 3;
-	max-width: 20em;
 }
 #head_bar {
 	height: unset;

app/calendar/index.html

@@ -428,46 +428,47 @@
 				re_loc: "relocation",
 			};
 			var pali_month_name = [
-				{ id: "1", value: "jeṭṭha", season: "gimhāna", season_icon: "☀" }, //5.X-四-十五-心
-				{ id: "2", value: "asāḷha", season: "gimhāna", season_icon: "☀" }, //6.X-五-十五、十六-箕、斗
-				{ id: "3", value: "sāvana", season: "vassāna", season_icon: "☔" }, //7.X-六-十五-女
-				{ id: "4", value: "poṭṭhapāda", season: "vassāna", season_icon: "☔" }, //8.x-七-十五、十六-室、壁
-				{ id: "5", value: "assajuja", season: "vassāna", season_icon: "☔" }, //9.X-八-十五-樓
-				{ id: "6", value: "kattika", season: "vassāna", season_icon: "☔" }, //10.X-九-十五-昂
-				{ id: "7", value: "māgasira", season: "hemanta", season_icon: "❄" }, //11.X-十-十五-觜
-				{ id: "8", value: "phussa", season: "hemanta", season_icon: "❄" }, //12.X-十一-十五-鬼
-				{ id: "9", value: "māgha", season: "hemanta", season_icon: "❄" }, //1.X-十二-十五-星
-				{ id: "10", value: "phagguna", season: "hemanta", season_icon: "❄" }, //2.X-正月-十四、十五-張、異
-				{ id: "11", value: "citta", season: "gimhāna", season_icon: "☀" }, //3.X-二月-十五-角
-				{ id: "12", value: "vesākha", season: "gimhāna", season_icon: "☀" }, //4.X-三月-十五-氐
+				{ id: "5", position: 0, value: "assajuja", season: "vassāna", season_icon: "☔" }, //9.X-八-十五-樓
+				{ id: "6", position: 1.25, value: "kattika", season: "vassāna", season_icon: "☔" }, //10.X-九-十五-昂
+				{ id: "7", position: 3.5, value: "māgasira", season: "hemanta", season_icon: "❄" }, //11.X-十-十五-觜
+				{ id: "8", position: 5.75, value: "phussa", season: "hemanta", season_icon: "❄" }, //12.X-十一-十五-鬼
+				{ id: "9", position: 8, value: "māgha", season: "hemanta", season_icon: "❄" }, //1.X-十二-十五-星
+				{ id: "10", position: 10, value: "phagguna", season: "hemanta", season_icon: "❄" }, //2.X-正月-十四、十五-張、異
+				{ id: "11", position: 12.25, value: "citta", season: "gimhāna", season_icon: "☀" }, //3.X-二月-十五-角
+				{ id: "12", position: 14.5, value: "vesākha", season: "gimhāna", season_icon: "☀" }, //4.X-三月-十五-氐
+				{ id: "1", position: 16.75, value: "jeṭṭha", season: "gimhāna", season_icon: "☀" }, //5.X-四-十五-心
+				{ id: "2", position: 18.75, value: "asāḷha", season: "gimhāna", season_icon: "☀" }, //6.X-五-十五、十六-箕、斗
+				{ id: "3", position: 21, value: "sāvana", season: "vassāna", season_icon: "☔" }, //7.X-六-十五-女
+				{ id: "4", position: 23.5, value: "poṭṭhapāda", season: "vassāna", season_icon: "☔" }, //8.x-七-十五、十六-室、壁
+				{ id: "5", position: 26, value: "assajuja", season: "vassāna", season_icon: "☔" }, //9.X-八-十五-樓
 			];
 			var pali_nakkhatta_name = [
-				{ id: "0", value: "assayuja", name_zh: "娄宿" },
+				{ id: "0", value: "assayuja", name_zh: "娄宿" },//V3
 				{ id: "1", value: "bharaṇī", name_zh: "胃宿" },
-				{ id: "2", value: "Kattikā", name_zh: "昂宿" },
+				{ id: "2", value: "Kattikā", name_zh: "昂宿" },//V4
 				{ id: "3", value: "rohiṇī", name_zh: "毕宿" },
-				{ id: "4", value: "magasira", name_zh: "觜宿" },
+				{ id: "4", value: "magasira", name_zh: "觜宿" },//H1
 				{ id: "5", value: "Addā", name_zh: "参宿" },
 				{ id: "6", value: "punabbasu", name_zh: "井宿" },
-				{ id: "7", value: "phussa", name_zh: "鬼宿" },
+				{ id: "7", value: "phussa", name_zh: "鬼宿" },//H2
 				{ id: "8", value: "Asilesā", name_zh: "柳宿" },
-				{ id: "9", value: "maghā", name_zh: "星宿" },
-				{ id: "10", value: "pubbaphagguṇī", name_zh: "张宿" },
-				{ id: "11", value: "uttaraphagguṇī", name_zh: "翼宿" },
+				{ id: "9", value: "maghā", name_zh: "星宿" },//H3
+				{ id: "10", value: "pubbaphagguṇī", name_zh: "张宿" },//H4
+				{ id: "11", value: "uttaraphagguṇī", name_zh: "翼宿" },//H4
 				{ id: "12", value: "hattha", name_zh: "轸宿" },
-				{ id: "13", value: "cittā", name_zh: "角宿" },
+				{ id: "13", value: "cittā", name_zh: "角宿" },//G1
 				{ id: "14", value: "sāti", name_zh: "亢宿" },
-				{ id: "15", value: "visākhā", name_zh: "氐宿" },
+				{ id: "15", value: "visākhā", name_zh: "氐宿" },//G2
 				{ id: "16", value: "anurādhā", name_zh: "房宿" },
-				{ id: "17", value: "jeṭṭha", name_zh: "心宿" },
+				{ id: "17", value: "jeṭṭha", name_zh: "心宿" },//G3
 				{ id: "18", value: "mūlā", name_zh: "尾宿" },
-				{ id: "19", value: "pubbāsāḷha", name_zh: "箕宿" },
-				{ id: "20", value: "uttarāsāḷha", name_zh: "斗宿" },
-				{ id: "21", value: "savaṇa", name_zh: "女宿" },
+				{ id: "19", value: "pubbāsāḷha", name_zh: "箕宿" },//G4
+				{ id: "20", value: "uttarāsāḷha", name_zh: "斗宿" },//G4
+				{ id: "21", value: "savaṇa", name_zh: "女宿" },//V1
 				{ id: "22", value: "dhaniṭṭhā", name_zh: "虚宿" },
 				{ id: "23", value: "satabhisaja", name_zh: "危宿" },
-				{ id: "24", value: "pubbabhaddapadā", name_zh: "室宿" },
-				{ id: "25", value: "uttarabhaddapadā", name_zh: "壁宿" },
+				{ id: "24", value: "pubbabhaddapadā", name_zh: "室宿" },//V2
+				{ id: "25", value: "uttarabhaddapadā", name_zh: "壁宿" },//V2
 				{ id: "26", value: "revatī", name_zh: "奎宿" },
 			];
 			var horoscope_name = [
@@ -630,14 +631,25 @@ function show_time() {
 			//根据;
 			function get_station_name(data_time) {
 				//获取星象信息
+				var x_m=0;
 				let solar_num = 0;
 				let lunar_num = 0;
+				let result = new Object();
 				solar_num = get_position(data_time).solar_station;
 				solar_num = Math.floor(solar_num);
 				lunar_num = get_position(data_time).lunar_station;
+				for(x_m in pali_month_name){
+					if(lunar_num>pali_month_name[x_m].position && lunar_num<pali_month_name[Number(x_m)+1].position){
+						result.month_name=pali_month_name[x_m]
+						break;
+					} else if(lunar_num<1.25 || lunar_num>=26){
+						result.month_name=pali_month_name[0]
+						break;
+					}
+					
+				}
 				lunar_num = Math.floor(lunar_num);
 
-				let result = new Object();
 				result.solar = horoscope_name[solar_num]; //黄道十二宫星象名称
 				result.lunar = pali_nakkhatta_name[lunar_num]; //27星宿月站名称
 				return result;
@@ -790,7 +802,7 @@ function angle_trans(angle,type) {
 					date.setTime(today.getTime() + i * 3600 * 24 * 1000);
 					let info_obj = new Object();
 					info_obj.id = "dawn" + i;
-					info_obj.title = localString[g_language].twilight_time;
+					info_obj.title = "🌆"+localString[g_language].twilight_time;
 					info_obj.start = SunCalc.getTimes(
 						date,
 						g_coordinate_this.AT,
@@ -801,7 +813,7 @@ function angle_trans(angle,type) {
 
 					info_obj = new Object();
 					info_obj.id = "noon" + i;
-					info_obj.title = localString[g_language].noon_time;
+					info_obj.title = "🌞"+localString[g_language].noon_time;
 					info_obj.start = SunCalc.getTimes(
 						date,
 						g_coordinate_this.AT,
@@ -812,7 +824,7 @@ function angle_trans(angle,type) {
 					g_event_list_arr.push(info_obj);
 					info_obj = new Object();
 					info_obj.id = "sunset" + i;
-					info_obj.title = localString[g_language].sun_set;
+					info_obj.title = "🌇"+localString[g_language].sun_set;
 					info_obj.start = SunCalc.getTimes(
 						date,
 						g_coordinate_this.AT,
@@ -852,7 +864,13 @@ function angle_trans(angle,type) {
 				for (i_full in full_list) {
 					info_obj = new Object();
 					info_obj.id = "full_moon" + i_full;
-					info_obj.title = "🌕" + get_station_name(full_list[i_full]).lunar.value;
+					info_obj.title = "🌕@" + get_station_name(full_list[i_full]).lunar.value + "🌟";
+					info_obj.start = full_list[i_full];
+					g_event_list_arr.push(info_obj);
+
+					info_obj = new Object();
+					info_obj.id = "month" + i_full;
+					info_obj.title =get_station_name(full_list[i_full]).month_name.value+localString[g_language].month;
 					info_obj.start = full_list[i_full];
 					g_event_list_arr.push(info_obj);
 				}

app/commit/commit.js

@@ -50,8 +50,8 @@ function commit_render_channel_select() {
 		html += "<div>请选择译文来源";
 		html += "</div>";
 	}
-	html += "<div>==></div>";
-	html += "<div>目标译文:";
+	html += "<div>➡目标译文:</div>";
+	html += "<div>";
 	html += "<select id='dest_channel' onchange='dest_change(this)'>";
 	if (typeof _commit_data.dest == "undefined") {
 		let lastDest = localStorage.getItem("commit_src_" + _commit_data.src);
@@ -89,7 +89,7 @@ function commit_render_channel_select() {
 	html += "<div id='commit_preview'>";
 	if (typeof _commit_data.express != "undefined" && _commit_data.express == true) {
 		if (typeof _commit_data.sent != "undefined" && _commit_data.sent.length != 0) {
-			html += "<button onclick='commit_pull()'>推送</button>";
+			html += "<button onclick='commit_pull()'>✔</button>";
 		} else {
 			html += "没有句子数据";
 		}

app/lang/lang.php

@@ -104,7 +104,7 @@
 
 	.disable {
 		color: var(--new-tool-content-disabled);
-		cursor: default;
+		cursor: not-allowed;
 	}
 
 	/*

app/pcdl/css/style.css

@@ -2694,11 +2694,12 @@ th {
 	background-color: #555;
 	color: #fff;
 	text-align: center;
-	padding: 5px 0;
+	padding: 5px;
 	border-radius: 6px;
 	z-index: 1;
 	opacity: 0;
 	transition: all 0.6s;
+	white-space: nowrap;
 }
 
 .tooltip:hover .tooltiptext {

app/pcdl/head_bar.php

@@ -336,7 +336,7 @@
 
 	.disable {
 		color: var(--new-tool-content-disabled);
-		cursor: default;
+		cursor: not-allowed;
 	}
 
 	@media screen and (min-width: 840px) {

app/public/lang/default.json

@@ -625,6 +625,7 @@
 		"months_ago": "months ago",
 		"year_ago": "year ago",
 		"years_ago": "years ago",
+		"similar": "similar",
 		"": ""
 	},
 	"grammastr": [

app/public/lang/en.json

@@ -624,6 +624,7 @@
 		"months_ago": " months ago",
 		"year_ago": " year ago",
 		"years_ago": " years ago",
+		"similar": "similar",
 		"": ""
 	},
 	"grammastr": [

app/public/lang/my.json

@@ -624,6 +624,7 @@
 		"months_ago": " months ago",
 		"year_ago": " year ago",
 		"years_ago": " years ago",
+		"similar": "similar",
 		"": ""
 	},
 	"grammastr": [

app/public/lang/si.json

@@ -629,6 +629,7 @@
 		"months_ago": " months ago",
 		"year_ago": " year ago",
 		"years_ago": " years ago",
+		"similar": "similar",
 		"": ""
 	},
 	"grammastr": [

app/public/lang/zh-cn.json

@@ -328,7 +328,7 @@
 		"to_user_dictionary": "保存并添加到单词本",
 		"user_id": "账号",
 		"userdict": "单词本",
-		"vannana": "注疏",
+		"vannana": "注释书",
 		"view": "可见",
 		"vikala": "不适当的时间",
 		"vocabulary": "词汇总量：",
@@ -387,7 +387,7 @@
 		"add_folder": "新建文件夹",
 		"add_to_folder": "放入文件夹",
 		"rename": "重命名",
-		"collaborate": "协作文档",
+		"collaborate": "协作",
 		"help": "帮助",
 		"function_introduce": "Wikipāḷi功能介绍",
 		"vedio_link": "视频链接",
@@ -627,6 +627,7 @@
 		"months_ago": "月前",
 		"year_ago": "年前",
 		"years_ago": "年前",
+		"similar": "相似",
 		"": ""
 	},
 	"grammastr": [

app/public/lang/zh-tw.json

@@ -387,7 +387,7 @@
 		"add_folder": "新建資料夾",
 		"add_to_folder": "加入資料夾",
 		"rename": "重新命名",
-		"collaborate": "協作檔案",
+		"collaborate": "協作",
 		"help": "幫助",
 		"function_introduce": "Wikipāḷi功能介紹",
 		"vedio_link": "視訊連結",
@@ -626,6 +626,7 @@
 		"months_ago": "月前",
 		"year_ago": "年前",
 		"years_ago": "年前",
+		"similar": "相似",
 		"": ""
 	},
 	"grammastr": [

app/reader/reader.js

@@ -204,7 +204,10 @@ function reader_get_path() {
 					$(this).html(newLocal);
 				}
 			});
+			var bookTitle = $("chapter").first().html();
 			let suttaTitle = $("chapter").last().html();
+			
+			$("#pali_pedia").html(bookTitle);
 			$("#article_title").html(suttaTitle);
 			$("#page_title").text(suttaTitle);
 			if (_reader_view == "chapter") {

app/reader/right_tool_bar.php

@@ -6,8 +6,8 @@
 	height: calc(100% - 7.3em);
 	top: 7.3em;
 	left: 100%;
-	width: 30em;
-	min-width: 20em;
+	width: calc(30vw - 0.6em);
+	min-width: 20vw;
 	color: var(--btn-color);
 	background-color: var(--tool-bg-color);
 	z-index: 20;
@@ -27,7 +27,7 @@
 }
 
 .right_float_min #right_float_pannal {
-	left: calc(100% - 30em);
+	left: calc(100% - 30vw + 0.6em);
 }
 #right_float_pannal > #tool_bar {
 	/*position: absolute;*/
@@ -44,7 +44,7 @@
 	display: none;
 }
 .main_view_right_float_min {
-	margin-right: 29em;
+	margin-right: calc(30vw - 0.6em);
 }
 .main_view_right_float_max {
 	margin-right: 50%;

app/reader/style.css

@@ -118,7 +118,7 @@
 .active a {
 	color: var(--btn-hover-color);
 }
-chapter {
+note:hover chapter {
 	display: inline-block;
 }
 

app/share/share.php

@@ -97,7 +97,7 @@ input[type="text"], input[type="input"], input[type="password"], textarea{
 			</span>
 			-->
 			<span style="max-width:200px;">
-			<input id="search_user" type="input" name="" placeholder="输入用户名或组名" onkeyup="username_search_keyup(event,this)" />
+			<input id="search_user" type="input" name="" placeholder="🔍输入用户名或组名" onkeyup="username_search_keyup(event,this)" />
 			</span>
 
 			</div>
@@ -108,8 +108,8 @@ input[type="text"], input[type="input"], input[type="password"], textarea{
 				</div>
 				<div id="coop_new_tools">
 					<select id="coop_new_power">
-						<option value="10">查看者</option>
-						<option value="20">编辑者</option>
+						<option value="10">👁‍🗨查看者</option>
+						<option value="20">📝编辑者</option>
 					</select>
 					<button onclick="add_coop()">添加</button>
 					<button onclick="cancel_coop()">取消</button>

app/term/note.js

@@ -553,7 +553,7 @@ function note_json_html(in_json) {
 	output += "begin='" + in_json.begin + "' ";
 	output += "end='" + in_json.end + "' ";
 	output += " >";
-	output += "<span class='' onclick='add_new_tran_button_click(this)'>＋" + gLocal.gui.add_tran + "</span>";
+	output += "<span class='' onclick='add_new_tran_button_click(this)' title='"+gLocal.gui.add_tran+"'>➕</span>";
 	output += "<div class='tran_text_tool_bar'>";
 	output += "</div>";
 	output += "</span>";
@@ -563,14 +563,14 @@ function note_json_html(in_json) {
 	output += "<span class='more_tran icon_expand'></span>";
 	//其他译文工具条
 	output += "<span class='other_bar'  >";
-	output += "<span class='other_tran_span' >" + gLocal.gui.other + gLocal.gui.translation + "</span>";
+	output += "<span class='other_tran_span' title='" + gLocal.gui.other + gLocal.gui.translation + "'>🧲"+gLocal.gui.translation+"</span>";
 	output += "<span class='other_tran_num'></span>";
 	output += "</span>";
 	output += "<span class='separate_line'></span>";
 
 	//手工义注
 	output += "<span class='other_bar'  >";
-	output += "<span class='other_tran_span commentray' >commentray</span>";
+	output += "<span class='other_tran_span commentray' title='📔" + gLocal.gui.vannana + "'>🪔"+gLocal.gui.commentary+"</span>";
 	output += "<span class='other_tran_num'></span>";
 	output += "</span>";
 	output += "<span class='separate_line'></span>";
@@ -581,11 +581,12 @@ function note_json_html(in_json) {
 		output +=
 			"<span class='similar_sent_span' onclick=\"note_show_pali_sim('" +
 			in_json.pali_sent_id +
-			"')\">" +
+			"')\" title='" +
 			gLocal.gui.similar_sentences +
-			"</span>";
+			"'>🧬"+gLocal.gui.similar+"</span>";
 		output += "<span class='similar_sent_num'>" + in_json.sim + "</span>";
 		output += "</span>";
+		output += "<span class='separate_line'></span>";
 	}
 
 	//第三个按钮 相似句结束
@@ -868,10 +869,10 @@ function render_one_sent_tran_a(iterator) {
 
 	html += '<div class="info">';
 	if (iterator.id != "") {
-		html += '<span class="name">' + iterator.editor_name.nickname + "</span>";
+		html += '<span class="date"> ' + getPassDataTime(iterator.update_time) + "</span>";
 	}
 	if (iterator.id != "") {
-		html += '<span class="date"> ' + getPassDataTime(iterator.update_time) + "</span>";
+		html += '<span class="name">' + iterator.editor_name.nickname + "</span>";
 	}
 	if (iterator.id != "") {
 		html += '<span class="channel">' + gLocal.gui.updated + " @" + iterator.channalinfo.name + "</span>";
@@ -1158,7 +1159,7 @@ function set_more_button_display() {
 			//$(this).hide();
 			$(this)
 				.find(".other_tran_span")
-				.html(gLocal.gui.no + gLocal.gui.other + gLocal.gui.translation);
+				.addClass("disable");//gLocal.gui.no + gLocal.gui.other + gLocal.gui.translation
 			//$(this).find(".more_tran").hide();
 		}
 	});

app/term/term.css

@@ -296,10 +296,19 @@ note .ref {
 	white-space: nowrap;
 	overflow-x: scroll;
 	max-width: 100%;
-	white-space: pre-wrap;
+	white-space: nowrap;
+	position: absolute;
+	right: 1em;
 }
 note:hover .ref {
 	/*border-top: solid 1px var(--border-line-color);*/
+	position: absolute;
+	margin-left: -45vw;
+	width: 45vw;
+	max-width: 45vw;
+	overflow: hidden;
+	white-space: nowrap;
+	overflow-x: scroll;
 }
 
 .progress_bar_done {
@@ -403,6 +412,7 @@ note:hover .add_new {
 	border-radius: 0 0 4px 4px;
 	cursor: pointer;
 	justify-content: space-between;
+	line-height: 1.5em;
 }
 .other_tran_div > .tool_bar > .tool_left {
 	white-space: nowrap;
@@ -568,6 +578,7 @@ pw {
 }
 .sent_tran .left_bar > .face {
 	display: block;
+	margin: auto 0.5em auto auto;
 }
 .compact .left_bar > .face {
 	display: none;
@@ -600,6 +611,8 @@ pw {
 }
 .head_bar > .info > .name {
 	font-weight: 700;
+	white-space: nowrap;
+	margin-right: 0.5em;
 }
 .head_bar > .info > .date {
 	font-size: 0.8em;
@@ -702,3 +715,9 @@ li.active {
 .body > .head_bar > .loading {
 	color: gray;
 }
+.tooltip {
+	display: inline-flex;
+}
+.disable {
+	cursor: not-allowed;
+}

dicttext/rich/concise.csv

@@ -519,9 +519,7 @@
 599,addhuva,.adj:base.,,,unstable$impermanent.,,,,1,100,7,concise,en
 578,addhā,.n:base.,.m.,,1. path$2. time,,,,1,100,5,concise,en
 579,addhā,.ind.,,,indeed$certainly,,,,1,100,5,concise,en
-588,addhāna,.n:base.,.nt.,," a long path time  or journey$highroad.
-
-",,,,1,100,7,concise,en
+588,addhāna,.n:base.,.nt.,," a long path time  or journey$highroad.",,,,1,100,7,concise,en
 589,addhānamagga,.n:base.,.m.,,a long path$high road.,,,,1,100,12,concise,en
 600,addi,.n:base.,.m.,,mountain.,,,,1,100,4,concise,en
 601,addita,.adj:base.,.pp.,,afflicted$oppressed with.,,,,1,100,6,concise,en
@@ -853,9 +851,7 @@
 1067,akkhitta,.adj:base.,,,not despised or thrown away.,,,,1,100,8,concise,en
 1066,akkhitārā,.n:base.,.f.,,pupil of the eye.,,,,1,100,9,concise,en
 1068,akkhobha,.adj:base.,,,imperturbable.,,,,1,100,8,concise,en
-1069,akkhobhinī,.n:base.,.f.,," 1. a number consisting of 42 ciphers$2. an army of 109350 soldiers  65 610 horses  21870 elephants and 21 870 war chariots.
-
-",,,,1,100,10,concise,en
+1069,akkhobhinī,.n:base.,.f.,," 1. a number consisting of 42 ciphers$2. an army of 109350 soldiers  65 610 horses  21870 elephants and 21 870 war chariots.",,,,1,100,10,concise,en
 1070,akkhohinī,.n:base.,.f.,,a high numeral with 43 cyphers.,,,,1,100,9,concise,en
 1055,akkhāsi,.v.,.aor.,akkhāt,announced$told$declared.,,,,1,100,7,concise,en
 1057,akkhāta,.adj:base.,.pp.,akkhāti,announced$told$declared.,,,,1,100,7,concise,en
@@ -10593,9 +10589,7 @@
 11263,pabhavitvā,.v.ind.,.abs.,pabhavat,having flowed down$having originated.,,,,1,100,10,concise,en
 11236,pabhaṅgu,.adj:base.,,,brittle$frail$perishable.,,,,1,100,8,concise,en
 11237,pabhaṅgura,.adj:base.,,,brittle$frail$perishable.,,,,1,100,10,concise,en
-11238,pabhaṅkara,.n:base.,.m.,," one who makes light$one who light up$light-bringer$i.e. the sun.
-
-",,,,1,100,10,concise,en
+11238,pabhaṅkara,.n:base.,.m.,," one who makes light$one who light up$light-bringer$i.e. the sun.",,,,1,100,10,concise,en
 11264,pabheda,.n:base.,.m.,,variety$cleavage.,,,,1,100,7,concise,en
 11265,pabhedana,.n:base.,.nt.,,dividing$breaking up,,,,1,100,9,concise,en
 11266,pabhedana,.adj:base.,,,destructive,,,,1,100,9,concise,en
@@ -17010,9 +17004,7 @@
 17627,taca,.n:base.,.m.,,skin$bark$hide.,,,,1,100,4,concise,en
 17628,tacagandha,.n:base.,.m.,,the scent of bark.,,,,1,100,10,concise,en
 17630,tacapariyosāna,.adj:base.,,,limited by skin.,,,,1,100,14,concise,en
-17629,tacapañcaka,.n:base.,.nt.,,the five constituents ending with taca,"viz. kesā， lomā， nakhā， dantā， taco.
-
-",,,1,100,11,concise,en
+17629,tacapañcaka,.n:base.,.nt.,,the five constituents ending with taca,"viz. kesā， lomā， nakhā， dantā， taco.",,,1,100,11,concise,en
 17631,taccha,.adj:base.,,,true$real$,,,,1,100,6,concise,en
 17632,taccha,.n:base.,.nt.,,the truth,,,,1,100,6,concise,en
 17633,tacchaka,.n:base.,.m.,,a carpenter$chipper of wood.,,,,1,100,8,concise,en