Fix merge_yi

Author: Artrajz

bert_vits2/text/tone_sandhi.py

@@ -497,7 +497,10 @@ def _neural_sandhi(self, word: str, pos: str, finals: List[str]) -> List[str]:
         # 个做量词
         elif (
             ge_idx >= 1
-            and (word[ge_idx - 1].isnumeric() or word[ge_idx - 1] in "几有两半多各整每做是")
+            and (
+                word[ge_idx - 1].isnumeric()
+                or word[ge_idx - 1] in "几有两半多各整每做是"
+            )
         ) or word == "个":
             finals[ge_idx] = finals[ge_idx][:-1] + "5"
         else:
@@ -634,9 +637,11 @@ def _merge_bu(self, seg: List[Tuple[str, str]]) -> List[Tuple[str, str]]:
     # input seg: [('听', 'v'), ('一', 'm'), ('听', 'v')]
     # output seg: [['听一听', 'v']]
     def _merge_yi(self, seg: List[Tuple[str, str]]) -> List[Tuple[str, str]]:
-        new_seg = []
+        new_seg = [] * len(seg)
         # function 1
-        for i, (word, pos) in enumerate(seg):
+        i = 0
+        while i < len(seg):
+            word, pos = seg[i]
             if (
                 i - 1 >= 0
                 and word == "一"
@@ -645,6 +650,7 @@ def _merge_yi(self, seg: List[Tuple[str, str]]) -> List[Tuple[str, str]]:
                 and seg[i - 1][1] == "v"
             ):
                 new_seg[i - 1][0] = new_seg[i - 1][0] + "一" + new_seg[i - 1][0]
+                i += 2
             else:
                 if (
                     i - 2 >= 0
@@ -655,7 +661,8 @@ def _merge_yi(self, seg: List[Tuple[str, str]]) -> List[Tuple[str, str]]:
                     continue
                 else:
                     new_seg.append([word, pos])
-        seg = new_seg
+                i += 1
+        seg = [i for i in new_seg if len(i) > 0]
         new_seg = []
         # function 2
         for i, (word, pos) in enumerate(seg):

gpt_sovits/text/tone_sandhi.py

@@ -663,28 +663,32 @@ def _merge_bu(self, seg: List[Tuple[str, str]]) -> List[Tuple[str, str]]:
     # input seg: [('听', 'v'), ('一', 'm'), ('听', 'v')]
     # output seg: [['听一听', 'v']]
     def _merge_yi(self, seg: List[Tuple[str, str]]) -> List[Tuple[str, str]]:
-        new_seg = []
+        new_seg = [] * len(seg)
         # function 1
-        for i, (word, pos) in enumerate(seg):
+        i = 0
+        while i < len(seg):
+            word, pos = seg[i]
             if (
-                i - 1 >= 0
-                and word == "一"
-                and i + 1 < len(seg)
-                and seg[i - 1][0] == seg[i + 1][0]
-                and seg[i - 1][1] == "v"
+                    i - 1 >= 0
+                    and word == "一"
+                    and i + 1 < len(seg)
+                    and seg[i - 1][0] == seg[i + 1][0]
+                    and seg[i - 1][1] == "v"
             ):
                 new_seg[i - 1][0] = new_seg[i - 1][0] + "一" + new_seg[i - 1][0]
+                i += 2
             else:
                 if (
-                    i - 2 >= 0
-                    and seg[i - 1][0] == "一"
-                    and seg[i - 2][0] == word
-                    and pos == "v"
+                        i - 2 >= 0
+                        and seg[i - 1][0] == "一"
+                        and seg[i - 2][0] == word
+                        and pos == "v"
                 ):
                     continue
                 else:
                     new_seg.append([word, pos])
-        seg = new_seg
+                i += 1
+        seg = [i for i in new_seg if len(i) > 0]
         new_seg = []
         # function 2
         for i, (word, pos) in enumerate(seg):