Merge pull request #99 from visuddhinanda/master

優化studio界面圖標

app/calendar/index1.html

@@ -448,6 +448,7 @@
         <div>月相角<span id="today_moon_angle"></span></div>
         <div>当前时间<span id="curr_time"></span></div>
         <div>现在时间<span id="now_time"></span></div>
+        <div>当前時間戳<span id="curr_time_unix"></span></div>
         <div>
             <span>精准月相（强化戒德之日）</span>
             <table id="lunar_phase_list" style="min-width: 40vw;">
@@ -539,6 +540,7 @@
             $("#angle_sun_e_moon").html(angle_trans(Math.abs(Math.PI + sun_position.azimuth - moon_position.azimuth) / Math.PI * 180));//月亮水平弧度
             $("#curr_time").html(today.toLocaleTimeString());//当前时间
             $("#now_time").html(g_now_date.toLocaleTimeString());//现在
+            $("#curr_time_unix").html(today.getTime());//時間戳
 
 
 

app/install/db_insert_sentence.php

@@ -164,7 +164,7 @@ if(($fp=fopen($dirXmlBase.$dirXml.$outputFileNameHead.".csv", "r"))!==FALSE){
 		if($wordlist[$i][3]>$iCurrPara){
 			//echo  "new paragraph<br>";
 			$iWord=0;
-			if($i>2){
+			if($i>2){//to do: 應該從第一個開始
 				//echo "上一段结束<br>";
 				if(strlen(trim($sent))>0){
 					$end = $wordlist[$i-1][16];
@@ -205,13 +205,19 @@ if(($fp=fopen($dirXmlBase.$dirXml.$outputFileNameHead.".csv", "r"))!==FALSE){
 			if($curr[5]!=""){
 				$wordcount++;
 			}
+			if($next[4]=="["){
+				$Note_Mark_1=1;
+			}
+			else if($pre[4]=="]" && $Note_Mark_1==1){
+				$Note_Mark_1=0;
+			}
 			if($next[4]=="("){
-				$Note_Mark=1;
+				$Note_Mark_2=1;
 			}
-			else if($pre[4]==")" && $Note_Mark==1){
-				$Note_Mark=0;
+			else if($pre[4]==")" && $Note_Mark_2==1){
+				$Note_Mark_2=0;
 			}
-
+			$Note_Mark=$Note_Mark_1*$Note_Mark_2;
 			if($curr[15]!="note" || mb_substr($curr[1],0,5,"UTF-8")!="gatha"){
 				if($curr[4]=="."  && !is_numeric($pre[4]) && $next[3]==$iCurrPara && $Note_Mark==0){//以.結尾且非註釋
 					if($next[4]!="("){