diff --git a/TTS/tts/utils/japanese/__init__.py b/TTS/tts/utils/japanese/__init__.py index 0ce7a99d..30d963e8 100644 --- a/TTS/tts/utils/japanese/__init__.py +++ b/TTS/tts/utils/japanese/__init__.py @@ -1 +1 @@ -from .text import japanese_text2phone \ No newline at end of file +from .text import japanese_text2phone diff --git a/TTS/tts/utils/japanese/text.py b/TTS/tts/utils/japanese/text.py index 4c8936ac..3a705352 100644 --- a/TTS/tts/utils/japanese/text.py +++ b/TTS/tts/utils/japanese/text.py @@ -3,7 +3,6 @@ import re import MeCab -from typing import List, Tuple _CONVRULES = [ # Conversion of 2 letters @@ -364,7 +363,7 @@ def text2kata(text: str) -> str: else: if word in _SYMBOL_TOKENS: res.append(word) - elif word == 'っ' or word == 'ッ': + elif word in ('っ', 'ッ'): res.append('ッ') elif word in _NO_YOMI_TOKENS: pass @@ -377,4 +376,4 @@ def japanese_text2phone(text: str) -> str: """ res = text2kata(text) res = kata2phoneme(res) - return res.replace(' ', '') \ No newline at end of file + return res.replace(' ', '') diff --git a/TTS/tts/utils/japanese/text_test.py b/TTS/tts/utils/japanese/text_test.py index 7a04925a..d3ade826 100644 --- a/TTS/tts/utils/japanese/text_test.py +++ b/TTS/tts/utils/japanese/text_test.py @@ -19,4 +19,4 @@ class TestText(unittest.TestCase): self.assertEqual(japanese_text2phone(text), phone) if __name__ == '__main__': - unittest.main() \ No newline at end of file + unittest.main() diff --git a/TTS/tts/utils/text/__init__.py b/TTS/tts/utils/text/__init__.py index 9b63e7f1..d7423102 100644 --- a/TTS/tts/utils/text/__init__.py +++ b/TTS/tts/utils/text/__init__.py @@ -39,7 +39,8 @@ def text2phone(text, language): if language == "zh-CN": ph = chinese_text_to_phonemes(text) return ph - elif language == "ja-jp": + + if language == "ja-jp": from TTS.tts.utils.japanese import japanese_text2phone ph = japanese_text2phone(text) return ph