fixes conflict

Author: SivanLaai

README.md

@@ -12,14 +12,9 @@
 - ![visitors](https://visitor-badge.laobi.icu/badge?page_id=SivanLaai/rime-pure)
 
 ## 包含输入方案
-<<<<<<< HEAD
  - [🍀️四叶草拼音九宫格](https://github.com/SivanLaai/rime-pure)（**同文最新版本因为修改了选择栏的逻辑，所以导致不能正常的选字，要使用这个方案建议使用同文3.2.0，[点击查看问题原因](https://github.com/osfans/trime/issues/524)**）
- - [极点五笔](https://github.com/KyleBing/rime-wubi86-jidian)
-=======
- - [四叶草拼音九宫格](https://github.com/SivanLaai/rime-pure) 
  - [四叶草地球拼音](https://github.com/SivanLaai/rime-pure/tree/master/schemes/Clover%E5%9B%9B%E5%8F%B6%E8%8D%89%E5%9C%B0%E7%90%83%E6%8B%BC%E9%9F%B3) 
- - [极点五笔](https://github.com/KyleBing/rime-wubi86-jidian) 
->>>>>>> 6b0f6ce91106b15c493322beb0bd93014502c988
+ - [极点五笔](https://github.com/KyleBing/rime-wubi86-jidian)
  - [小鹤双拼](https://www.flypy.com/index.html)
  - [🍀️四叶草简体拼音](https://github.com/fkxxyz/rime-cloverpinyin)
  - 大写数字
@@ -118,11 +113,10 @@
 
 ## 更新历史
 
-<<<<<<< HEAD
 #### 2021-10-14
 
  - 1.同步更新同文官方支持的剪切板功能，可以查看剪切板和最近表情包历史，使用更为灵活的符号菜单。
-=======
+
 #### 2021-09-01
 
  - 1.前前后后、零零碎碎一共花了十来天地时间完成基于四叶草词库的地球拼音输入方案。

src/GenerateCloverData.py

@@ -32,7 +32,7 @@ def fixes_spell():
     new_path = './Clover四叶草拼音new'
     if not os.path.exists(new_path):
         os.mkdir(f'{new_path}')
-    
+
     exists_file = list()
     for file_now in os.listdir(path):
         curr_path = os.path.join(path, file_now)
@@ -267,14 +267,9 @@ def generatePinyins(keyword, pinyinStyle=PinyinStyle.TONE_POLYPHONE_WITH_PHRASE)
     #pinyinList = pinyin(keyword, style=Style.NORMAL, heteronym=True)
     pinyins = list()
     try:
-<<<<<<< HEAD
-        pinyinList = getPinyin(keyword)
-        #print(pinyinList)
-=======
         pinyinList = pdb.getPinyin(keyword, pinyinStyle)
         #print(pinyinList)
         pinyinList = getSinglePinyins(keyword, pinyinList)
->>>>>>> 6b0f6ce91106b15c493322beb0bd93014502c988
         currPinyin = list()
         firstPinyin = 1
         for curr_index in range(len(pinyinList[0])):
@@ -289,7 +284,7 @@ def generatePinyins(keyword, pinyinStyle=PinyinStyle.TONE_POLYPHONE_WITH_PHRASE)
 def fixesBigDictErrorsWithMultiplePinyin():
     path = './Clover四叶草拼音'
     new_path = './Clover四叶草拼音new'
-    
+
     if not os.path.exists(new_path):
         os.mkdir(f'{new_path}')
     for file_now in os.listdir(path):
@@ -328,7 +323,7 @@ def fixesBigDictErrorsWithMultiplePinyin():
 def generateCloverPinyins():
     path = './Clover四叶草拼音'
     new_path = './Clover四叶草拼音new'
-    
+
     if not os.path.exists(new_path):
         os.mkdir(f'{new_path}')
     for file_now in os.listdir(path):
@@ -344,10 +339,6 @@ def generateCloverPinyins():
             elif "\t" in line:
                 keyword = line.split('\t')[0]
                 pinyin_old = line.split('\t')[1].strip()
-<<<<<<< HEAD
-                print([pinyin_old])
-                pinyin_list = generatePinyins(keyword)
-=======
                 count_str = line.split('\t')[-1].strip().replace(" ", '').replace("?", '')
                 keyPinyinDict = dict()
                 for key in keyword:
@@ -360,7 +351,6 @@ def generateCloverPinyins():
                         keyPinyinDict[key][plainPinyins[i]] = weights[i]
                 #print([pinyin_old])
                 pinyin_list = generatePinyins(keyword, pinyinStyle=PinyinStyle.PLAIN_POLYPHONE_WITH_PHRASE)
->>>>>>> 6b0f6ce91106b15c493322beb0bd93014502c988
                 #print(pinyin_list)
                 if len(pinyin_list) == 0:
                     new_file.write(line)
@@ -380,15 +370,6 @@ def generateCloverPinyins():
                         ratio = []
                         pinyin = " ".join(pinyin).split(" ")
                         currPinyin = " ".join(pinyin)
-<<<<<<< HEAD
-                        newLine = line.replace(pinyin_old, currPinyin)
-                        #if currPinyin == pinyin_old:
-                        if newLine == line:
-                            print([currPinyin])
-                            print()
-                        new_file.write(newLine)
-                        new_file.flush()
-=======
                         for i in range(len(pinyin)):
                             if keyword[i] not in pdb.homographWeightDict:
                                 pass
@@ -409,7 +390,6 @@ def generateCloverPinyins():
                     newLine = line.replace(pinyin_old, maxPinyin)
                     new_file.write(newLine)
                     new_file.flush()
->>>>>>> 6b0f6ce91106b15c493322beb0bd93014502c988
             else:
                 new_file.write(line)
                 new_file.flush()
@@ -493,16 +473,10 @@ def generateTerraPinyins():
         new_file.close()
 if __name__ == "__main__":
     #generateNewBaseDict()
-<<<<<<< HEAD
-    pinyins = generatePinyins("的话")
-    print(pinyins)
-    #fixesBigDictErrors()
-=======
     pinyins = generatePinyins("小君")
     print(pinyins)
     currPinyin = " ".join(pinyins[0])
     pinyin = pdb.formatMarkPinyin(currPinyin)
     print(pinyin)
     generateTerraBasePinyins()
     #generateCloverPinyins()
->>>>>>> 6b0f6ce91106b15c493322beb0bd93014502c988