From df57457426845b5537abd700007124f39a069dce Mon Sep 17 00:00:00 2001
From: 6tail <6tail@6tail.cn>
Date: Mon, 12 Oct 2020 23:32:01 +0800
Subject: [PATCH] =?UTF-8?q?v1.0.21=20=E5=A2=9E=E5=8A=A0=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E8=8A=82=E6=B0=94=E5=90=8D=E3=80=81=E4=B8=8A=E4=B8=80=E6=B0=94?=
 =?UTF-8?q?=E4=BB=A4=E3=80=81=E4=B8=8B=E4=B8=80=E6=B0=94=E4=BB=A4=E3=80=81?=
 =?UTF-8?q?=E5=BD=93=E5=A4=A9=E8=8A=82=E6=B0=94=E3=80=81=E5=BD=93=E5=A4=A9?=
 =?UTF-8?q?=E8=8A=82=E4=BB=A4=E3=80=81=E5=BD=93=E5=A4=A9=E6=B0=94=E4=BB=A4?=
 =?UTF-8?q?=E7=9A=84=E6=96=B9=E6=B3=95=EF=BC=9B=E8=8A=82=E6=B0=94=E5=AF=B9?=
 =?UTF-8?q?=E8=B1=A1=E5=A2=9E=E5=8A=A0=E5=88=A4=E6=96=AD=E6=98=AF=E8=8A=82?=
 =?UTF-8?q?=E4=BB=A4=E8=BF=98=E6=98=AF=E6=B0=94=E4=BB=A4=E7=9A=84=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lunar.js     | 73 ++++++++++++++++++++++++++++++++++++++++++++--------
 package.json |  2 +-
 2 files changed, 63 insertions(+), 12 deletions(-)

diff --git a/lunar.js b/lunar.js
index 3ade010..30435b9 100644
--- a/lunar.js
+++ b/lunar.js
@@ -1034,6 +1034,22 @@
           }
           return '';
         },
+        getJieQi:function(){
+          var name = '';
+          for(var key in this._p.jieQi){
+            var d = this._p.jieQi[key];
+            if(d.getYear()==this._p.solar.getYear()&&d.getMonth()==this._p.solar.getMonth()&&d.getDay()==this._p.solar.getDay()){
+              name = key;
+              break;
+            }
+          }
+          if(Lunar.JIE_QI_APPEND===name){
+            name = Lunar.JIE_QI_FIRST;
+          }else if(Lunar.JIE_QI_PREPEND===name){
+            name = Lunar.JIE_QI_LAST;
+          }
+          return name;
+        },
         getWeek:function(){
           return this._p.weekIndex;
         },
@@ -1290,8 +1306,40 @@
         },
         getNextJie:function(){return this._getNearJieQi(true,LunarUtil.JIE);},
         getPrevJie:function(){return this._getNearJieQi(false,LunarUtil.JIE);},
+        getNextQi:function(){return this._getNearJieQi(true,LunarUtil.QI);},
+        getPrevQi:function(){return this._getNearJieQi(false,LunarUtil.QI);},
         getNextJieQi:function(){return this._getNearJieQi(true,null);},
         getPrevJieQi:function(){return this._getNearJieQi(false,null);},
+        _buildJieQi:function(name, solar){
+          var jie=false,qi=false,i,j;
+          for(i=0,j=LunarUtil.JIE.length;i<j;i++){
+            if(LunarUtil.JIE[i]===name){
+              jie=true;
+            }
+          }
+          if(!jie) {
+            for(i=0,j=LunarUtil.QI.length;i<j;i++){
+              if(LunarUtil.QI[i]===name){
+                qi = true;
+              }
+            }
+          }
+          return {
+            _p: {
+              name: name,
+              solar: solar,
+              jie: jie,
+              qi: qi
+            },
+            getName: function(){return this._p.name;},
+            getSolar: function(){return this._p.solar;},
+            setName: function(name){this._p.name=name;},
+            setSolar: function(solar){this._p.solar=solar;},
+            isJie: function(){return this._p.jie;},
+            isQi: function(){return this._p.qi;},
+            toString: function(){return this.getName();}
+          };
+        },
         _getNearJieQi:function(forward, conditions){
           var name = null;
           var near = null;
@@ -1339,16 +1387,19 @@
           if(null==near){
             return null;
           }
-          return {
-            _p: {
-              name: name,
-              solar: near
-            },
-            getName: function(){return this._p.name;},
-            getSolar: function(){return this._p.solar;},
-            setName: function(name){this._p.name=name;},
-            setSolar: function(solar){this._p.solar=solar;}
-          };
+          return this._buildJieQi(name, near);
+        },
+        getCurrentJieQi:function(){
+          var name = this.getJieQi();
+          return name.length>0 ? this._buildJieQi(name,solar) : null;
+        },
+        getCurrentJie:function(){
+          var name = this.getJie();
+          return name.length>0 ? this._buildJieQi(name,solar) : null;
+        },
+        getCurrentQi:function(){
+          var name = this.getQi();
+          return name.length>0 ? this._buildJieQi(name,solar) : null;
         },
         getEightChar:function(){
           if(!this._p.eightChar){
@@ -1375,7 +1426,7 @@
           for(i=0,j=otherFestivals.length;i<j;i++){
             s += ' ('+otherFestivals[i]+')';
           }
-          var jq = this.getJie()+this.getQi();
+          var jq = this.getJieQi();
           if(jq.length>0){
             s += ' ['+jq+']';
           }
diff --git a/package.json b/package.json
index 37926b7..112a4dc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lunar-javascript",
-  "version": "1.0.20",
+  "version": "1.0.21",
   "description": "lunar is a calendar library for Solar and Chinese Lunar.",
   "main": "index.js",
   "scripts": {