Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-11-22 11:12:36 +01:00
Code Issues Projects Releases Wiki Activity

Minor fix for CJK line length - thx Leon :)

Browse Source 
Related to #5711 + https://github.com/SubtitleEdit/subtitleedit/discussions/5711#discussioncomment-2040649
This commit is contained in:
niksedk 2022-01-25 08:15:54 +01:00
parent a65c42e346
commit 3831416791
2 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/libse/Common/TextLengthCalculator/CalcCJK.cs
View File

@ -46,6 +46,10 @@ namespace Nikse.SubtitleEdit.Core.Common.TextLengthCalculator
{
htmlTagOn = true;
}
else if (JapaneseHalfWidthCharacters.Contains(ch))
{
count += 0.5m;
}
else if (!char.IsControl(ch) &&
ch != zeroWidthSpace &&
ch != zeroWidthNoBreakSpace &&
@ -57,16 +61,9 @@ namespace Nikse.SubtitleEdit.Core.Common.TextLengthCalculator
ch != '\u202D' &&
ch != '\u202E')
{
if (IsChinese(ch))
if (IsCjk(ch))
{
if (JapaneseHalfWidthCharacters.Contains(ch))
{
count += 0.5m;
}
else
{
count++;
}
count++;
}
else
{
@ -82,8 +79,13 @@ namespace Nikse.SubtitleEdit.Core.Common.TextLengthCalculator
public const string JapaneseHalfWidthCharacters = "｡｢｣､･ｦｧｨｩｪｫｬｭｮｯｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ";
public static readonly Regex CjkCharRegex = new Regex(@"\p{IsCJKUnifiedIdeographs}", RegexOptions.Compiled);
public static bool IsChinese(char c)
public static bool IsCjk(char c)
{
if (c == '。' || c == '，')
{
return true;
}
return CjkCharRegex.IsMatch(c.ToString());
}
}

17
src/libse/Common/TextLengthCalculator/CalcCJKNoSpace.cs
View File

@ -44,6 +44,10 @@
{
htmlTagOn = true;
}
else if (CalcCjk.JapaneseHalfWidthCharacters.Contains(ch))
{
count += 0.5m;
}
else if (!char.IsControl(ch) &&
ch != ' ' &&
ch != zeroWidthSpace &&
@ -56,16 +60,9 @@
ch != '\u202D' &&
ch != '\u202E')
{
if (CalcCjk.IsChinese(ch))
if (CalcCjk.IsCjk(ch))
{
if (CalcCjk.JapaneseHalfWidthCharacters.Contains(ch))
{
count += 0.5m;
}
else
{
count++;
}
count++;
}
else
{
@ -73,7 +70,7 @@
}
}
}
return count;
}
}