More CJK detect

src/libse/Common/TextLengthCalculator/CalcCJK.cs

@@ -64,7 +64,7 @@ namespace Nikse.SubtitleEdit.Core.Common.TextLengthCalculator
                     else if (ChineseFullWidthPunctuations.Contains(ch) ||
                              LanguageAutoDetect.JapaneseLetters.Contains(ch) ||
                              LanguageAutoDetect.KoreanLetters.Contains(ch) ||
-                    IsCjk(ch))
+                             IsCjk(ch))
                     {
                         count++;
                     }
@@ -82,14 +82,17 @@ namespace Nikse.SubtitleEdit.Core.Common.TextLengthCalculator
         public const string JapaneseHalfWidthCharacters = "｡｢｣､･ｦｧｨｩｪｫｬｭｮｯｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ";
         public const string ChineseFullWidthPunctuations = "，。、：；？！…“”—‘’（）【】「」『』〔〕《》〈〉";
 
-        public static readonly Regex CjkCharRegex = new Regex(@"\p{IsCJKUnifiedIdeographs}", RegexOptions.Compiled);
+        public static readonly Regex CjkCharRegex = new Regex(@"\p{IsHangulJamo}|" +
+                                                              @"\p{IsCJKRadicalsSupplement}|" +
+                                                              @"\p{IsCJKSymbolsandPunctuation}|" +
+                                                              @"\p{IsEnclosedCJKLettersandMonths}|" +
+                                                              @"\p{IsCJKCompatibility}|" +
+                                                              @"\p{IsCJKUnifiedIdeographsExtensionA}|" +
+                                                              @"\p{IsCJKUnifiedIdeographs}|" +
+                                                              @"\p{IsHangulSyllables}|" +
+                                                              @"\p{IsCJKCompatibilityForms}", RegexOptions.Compiled);
         public static bool IsCjk(char c)
         {
-            if (c == '。' || c == '，')
-            {
-                return true;
-            }
-
             return CjkCharRegex.IsMatch(c.ToString());
         }
     }