diff --git a/LanguageBaseEnglish.xml b/LanguageBaseEnglish.xml index a48156c95..201703d07 100644 --- a/LanguageBaseEnglish.xml +++ b/LanguageBaseEnglish.xml @@ -2545,8 +2545,8 @@ can edit in same subtitle file (collaboration) Count all except space CJK 1, Latin 0.5 CJK 1, Latin 0.5, space 0 - Ignore Arabic diacritics - Ignore Arabic diacritics/space + Include composition characters + Include composition characters, not space No space or punctuation ()[]-:;,.!? No space or punctuation, cps only Music symbol diff --git a/src/libse/Common/Settings.cs b/src/libse/Common/Settings.cs index 1ef638875..3f3638d38 100644 --- a/src/libse/Common/Settings.cs +++ b/src/libse/Common/Settings.cs @@ -1920,7 +1920,7 @@ $HorzAlign = Center SubtitleMaximumDisplayMilliseconds = 7007, SubtitleMinimumDisplayMilliseconds = 1000, SubtitleMaximumWordsPerMinute = 240, - CpsLineLengthStrategy = typeof(CalcIgnoreArabicDiacritics).Name, + CpsLineLengthStrategy = typeof(CalcAll).Name, MinimumMillisecondsBetweenLines = 83, // 2 frames for 23.976 fps videos DialogStyle = DialogType.DashBothLinesWithSpace, ContinuationStyle = ContinuationStyle.NoneLeadingTrailingEllipsis, diff --git a/src/libse/Common/TextLengthCalculator/CalcAll.cs b/src/libse/Common/TextLengthCalculator/CalcAll.cs index e0bfd28dc..a2cfa45d3 100644 --- a/src/libse/Common/TextLengthCalculator/CalcAll.cs +++ b/src/libse/Common/TextLengthCalculator/CalcAll.cs @@ -5,7 +5,7 @@ namespace Nikse.SubtitleEdit.Core.Common.TextLengthCalculator public class CalcAll : ICalcLength { /// - /// Calculate length of all text including space (tags are not counted). + /// Calculate length of all text including space but excluding composition characters (tags are not counted). /// public decimal CountCharacters(string text, bool forCps) { diff --git a/src/libse/Common/TextLengthCalculator/CalcFactory.cs b/src/libse/Common/TextLengthCalculator/CalcFactory.cs index fb84345f9..de4ec9fff 100644 --- a/src/libse/Common/TextLengthCalculator/CalcFactory.cs +++ b/src/libse/Common/TextLengthCalculator/CalcFactory.cs @@ -12,8 +12,8 @@ namespace Nikse.SubtitleEdit.Core.Common.TextLengthCalculator new CalcNoSpace(), new CalcCjk(), new CalcCjkNoSpace(), - new CalcIgnoreArabicDiacritics(), - new CalcIgnoreArabicDiacriticsNoSpace(), + new CalcIncludeCompositionCharacters(), + new CalcIncludeCompositionCharactersNotSpace(), new CalcNoSpaceOrPunctuation(), new CalcNoSpaceOrPunctuationCpsOnly(), }; diff --git a/src/libse/Common/TextLengthCalculator/CalcIgnoreThaiCompositeCharacters.cs b/src/libse/Common/TextLengthCalculator/CalcIncludeCompositionCharacters.cs similarity index 72% rename from src/libse/Common/TextLengthCalculator/CalcIgnoreThaiCompositeCharacters.cs rename to src/libse/Common/TextLengthCalculator/CalcIncludeCompositionCharacters.cs index df5375daa..067692ee0 100644 --- a/src/libse/Common/TextLengthCalculator/CalcIgnoreThaiCompositeCharacters.cs +++ b/src/libse/Common/TextLengthCalculator/CalcIncludeCompositionCharacters.cs @@ -2,12 +2,10 @@ namespace Nikse.SubtitleEdit.Core.Common.TextLengthCalculator { - public class CalcIgnoreThaiCompositeCharacters : ICalcLength + public class CalcIncludeCompositionCharacters : ICalcLength { /// - /// Calculate all text excluding Thai composite characters (tags are not counted). - /// Netflix rule: 35 characters per line (excluding all composite characters, i.e. tone marks, top and bottom vowels are not counted. - /// See https://partnerhelp.netflixstudios.com/hc/en-us/articles/220448308-Thai-Timed-Text-Style-Guide + /// Calculate all text including composition characters (tags are not counted). /// public decimal CountCharacters(string text, bool forCps) { @@ -31,14 +29,15 @@ namespace Nikse.SubtitleEdit.Core.Common.TextLengthCalculator ch != '\u202B' && ch != '\u202C' && ch != '\u202D' && - ch != '\u202E') + ch != '\u202E' && + !(ch >= '\u064B' && ch <= '\u0653')) { length++; } } else { - length++; + length += element.Length; } } diff --git a/src/libse/Common/TextLengthCalculator/CalcIncludeCompositionCharactersNotSpace.cs b/src/libse/Common/TextLengthCalculator/CalcIncludeCompositionCharactersNotSpace.cs new file mode 100644 index 000000000..08b82ad7a --- /dev/null +++ b/src/libse/Common/TextLengthCalculator/CalcIncludeCompositionCharactersNotSpace.cs @@ -0,0 +1,48 @@ +using System.Globalization; + +namespace Nikse.SubtitleEdit.Core.Common.TextLengthCalculator +{ + public class CalcIncludeCompositionCharactersNotSpace : ICalcLength + { + /// + /// Calculate all text including composition characters but not space (tags are not counted). + /// + public decimal CountCharacters(string text, bool forCps) + { + var s = HtmlUtil.RemoveHtmlTags(text, true); + + const char zeroWidthSpace = '\u200B'; + const char zeroWidthNoBreakSpace = '\uFEFF'; + var length = 0; + for (var en = StringInfo.GetTextElementEnumerator(s); en.MoveNext();) + { + var element = en.GetTextElement(); + if (element.Length == 1) + { + var ch = element[0]; + if (!char.IsControl(ch) && + ch != ' ' && + ch != zeroWidthSpace && + ch != zeroWidthNoBreakSpace && + ch != '\u200E' && + ch != '\u200F' && + ch != '\u202A' && + ch != '\u202B' && + ch != '\u202C' && + ch != '\u202D' && + ch != '\u202E' && + !(ch >= '\u064B' && ch <= '\u0653')) + { + length++; + } + } + else + { + length += element.Length; + } + } + + return length; + } + } +} diff --git a/src/libse/NetflixQualityCheck/NetflixCheckMaxCps.cs b/src/libse/NetflixQualityCheck/NetflixCheckMaxCps.cs index 2dcbfcadb..ee014c4e5 100644 --- a/src/libse/NetflixQualityCheck/NetflixCheckMaxCps.cs +++ b/src/libse/NetflixQualityCheck/NetflixCheckMaxCps.cs @@ -29,11 +29,6 @@ namespace Nikse.SubtitleEdit.Core.NetflixQualityCheck calc = CalcFactory.MakeCalculator(nameof(CalcCjk)); } - if (controller.Language == "ar") - { - calc = CalcFactory.MakeCalculator(nameof(CalcIgnoreArabicDiacritics)); - } - var charactersPerSeconds = Utilities.GetCharactersPerSecond(jp, calc); if (charactersPerSeconds > charactersPerSecond && !p.StartTime.IsMaxTime) { diff --git a/src/ui/Languages/ar-EG.xml b/src/ui/Languages/ar-EG.xml index 6ec90a5f6..fc7a3ce3b 100644 --- a/src/ui/Languages/ar-EG.xml +++ b/src/ui/Languages/ar-EG.xml @@ -2521,8 +2521,6 @@ ames.xml) عد كل شيء باستثناء الفضاء CJK 1، اللاتينية 0.5 CJK 1، اللاتينية 0.5، المسافة 0 - تجاهل علامات التشكيل العربية - تجاهل علامات التشكيل/المسافة العربية بدون مسافة أو علامات ترقيم ()[]-:;,.!؟ لا يوجد مسافة أو علامات الترقيم، CPS فقط رمز الموسيقى diff --git a/src/ui/Languages/bg-BG.xml b/src/ui/Languages/bg-BG.xml index 3caf958cd..162776f08 100644 --- a/src/ui/Languages/bg-BG.xml +++ b/src/ui/Languages/bg-BG.xml @@ -2546,8 +2546,6 @@ https://github.com/SubtitleEdit/subtitleedit Преброяване на всички, без интервалите CJK 1, латински 0,5 CJK 1, латински 0,5, интервал 0 - Игнорирай Арабските диакритични символи - Игнорирай Арабските диакритични символи/интервал Без интервал или препинателни знаци ()[]-:;,.!? Без интервал или препинателни знаци, само cps Замяна с музикален символ: diff --git a/src/ui/Languages/da-DK.xml b/src/ui/Languages/da-DK.xml index 976d4983e..bdef01667 100644 --- a/src/ui/Languages/da-DK.xml +++ b/src/ui/Languages/da-DK.xml @@ -2535,8 +2535,6 @@ kan redigere i samme undertekst fil (fælles online projekt) Tæl alle undtagen mellemrum CJK 1, latin 0,5 CJK 1, latin 0,5, mellemrum 0 - Ignorer arabiske diakritiske tegn - Ignorer arabiske diakritiske tegn/mellemrum Intet mellemrum eller tegnsætning ()[]-:;,.!? Ingen mellemrum eller tegnsætning, kun cps Musik symbol diff --git a/src/ui/Languages/de-DE.xml b/src/ui/Languages/de-DE.xml index fa0882d9b..a5274073c 100644 --- a/src/ui/Languages/de-DE.xml +++ b/src/ui/Languages/de-DE.xml @@ -2563,8 +2563,6 @@ Wir nutzen den dem Bild innewohnenden Rhythmus. Zählen Sie alle außer Leerzeichen CJK 1, Latein 0,5 CJK 1, Latein 0,5, Leerzeichen 0 - Ignorieren Sie arabische diakritische Zeichen - Ignorieren Sie arabische diakritische Zeichen/Leerzeichen Kein Leerzeichen oder Satzzeichen ()[]-:;,.!? Kein Leerzeichen oder Satzzeichen, nur cps Musik Symbol diff --git a/src/ui/Languages/el-GR.xml b/src/ui/Languages/el-GR.xml index c4601c58c..cb29adab7 100644 --- a/src/ui/Languages/el-GR.xml +++ b/src/ui/Languages/el-GR.xml @@ -2516,8 +2516,6 @@ Email: mailto:nikse.dk@gmail.com Υπολογισμός όλων πλην κενών CJK 1, λατινικοί 0,5 CJK 1, λατινικοί 0,5, κενό 0 - Αγνόηση αραβικών διακριτικών - Αγνόηση αραβικών διακριτικών/κενών Χωρίς κενά και σημεία στίξης Χωρίς κενά και σημεία στίξης, χαρακτ./δευτ. μόνο Μουσικό σύμβολο diff --git a/src/ui/Languages/es-AR.xml b/src/ui/Languages/es-AR.xml index 737c522ef..9e3d00cba 100644 --- a/src/ui/Languages/es-AR.xml +++ b/src/ui/Languages/es-AR.xml @@ -2532,8 +2532,6 @@ puede editar el mismo archivo de subtítulo (colaboración) Contar todo excepto los espacios CJK 1, Latín 0.5 CJK 1, Latín 0.5, espacios 0 - Ignorar diacríticos árabes - Ignorar diacríticos árabes/espacios Sin espacios ni signos de puntuación ()[]-:;,.!? Sin espacios ni puntuación, solo cps Símbolos musicales diff --git a/src/ui/Languages/es-ES.xml b/src/ui/Languages/es-ES.xml index f4f4f1fde..c95c33d62 100644 --- a/src/ui/Languages/es-ES.xml +++ b/src/ui/Languages/es-ES.xml @@ -2335,8 +2335,6 @@ puede editar el mismo archivo de subtítulo (colaboración) Contar todo excepto los espacios CJK 1, Latín 0.5 CJK 1, Latín 0.5, espacios 0 - Ignorar diacríticos árabes - Ignorar diacríticos árabes/espacios Sin espacios ni signos de puntuación ()[]-:;,.!? Sin espacios ni puntuación, solo cps Símbolos musicales diff --git a/src/ui/Languages/es-MX.xml b/src/ui/Languages/es-MX.xml index aa296f712..12a38b9b4 100644 --- a/src/ui/Languages/es-MX.xml +++ b/src/ui/Languages/es-MX.xml @@ -2532,8 +2532,6 @@ puedan editar el mismo archivo de subtítulo (colaboración) Contar todo excepto los espacios CJK 1, Latín 0.5 CJK 1, Latín 0.5, espacios 0 - Ignorar diacríticos árabes - Ignorar diacríticos árabes/espacios Sin espacios ni signos de puntuación ()[]-:;,.!? Sin espacios ni puntuación, solo cps Símbolos musicales diff --git a/src/ui/Languages/fi-FI.xml b/src/ui/Languages/fi-FI.xml index c65d518fd..fe3fa9a18 100644 --- a/src/ui/Languages/fi-FI.xml +++ b/src/ui/Languages/fi-FI.xml @@ -2527,8 +2527,6 @@ Mikäli tiedostoa on muokattu Subtitle Edit:llä, varmuuskopio voi olla käytett Laske kaikki paitsi välilyönnit CJK 1, latin 0.5 CJK 1, latin 0.5, välilyönti 0 - Jätä huomioimatta arabian diakriittiset merkinnnät - Jätä huomioimatta arabian diakriittiset merkinnnät / välilyönnit Ei välilyöntiä tai välimerkkejä ()[]-:;,.!? Ei välilyöntiä tai välimerkkejä, vain merkit Musiikkisymboli diff --git a/src/ui/Languages/fr-FR.xml b/src/ui/Languages/fr-FR.xml index 2de5116cc..04e17a2e8 100644 --- a/src/ui/Languages/fr-FR.xml +++ b/src/ui/Languages/fr-FR.xml @@ -2515,8 +2515,6 @@ peuvent éditer le même fichier sous-titres (collaboration) Compter tout sauf blancs CJK 1, latin 0.5 CJK 1, latin 0.5, blanc 0 - Ignorer les diacritiques arabes - Ignorer les diacritiques arabes/blanc Pas d'espace / ponctuation ()[]-:;,.!? Pas d'espace / ponctuation, majusc. Symbole musical diff --git a/src/ui/Languages/he-IL.xml b/src/ui/Languages/he-IL.xml index 2fe69e746..df1eaaad5 100644 --- a/src/ui/Languages/he-IL.xml +++ b/src/ui/Languages/he-IL.xml @@ -2348,8 +2348,6 @@ If you have edited this file with Subtitle Edit you might be able to find a back ספור הכל מלבד החלל CJK 1, לטינית 0.5 CJK 1, לטינית 0.5, רווח 0 - התעלם מהדיאקריטיות בערבית - התעלם מהדיאקריטיות/רווח בערבית אין רווח או סימני פיסוק ()[]-:;,.!? ללא רווח או סימני פיסוק, cps בלבד סמל מוזיקה diff --git a/src/ui/Languages/hu-HU.xml b/src/ui/Languages/hu-HU.xml index 2f655b979..ac7103efb 100644 --- a/src/ui/Languages/hu-HU.xml +++ b/src/ui/Languages/hu-HU.xml @@ -2342,8 +2342,6 @@ szerkesztheti ugyanazt a feliratfájlt (együttműködés) Összes számolása a szóközt kivéve CJK 1, Latin 0.5 CJK 1, Latin 0.5, szóköz 0 - Az arab diakritikus jelek figyelmen kívül hagyása - Az arab diakritikus jelek/közök figyelmen kívül hagyása Nincs szóköz vagy írásjel ()[]-:;,.!? Nincs szóköz vagy írásjel, csak cps Zene szimbólum diff --git a/src/ui/Languages/it-IT.xml b/src/ui/Languages/it-IT.xml index 984cc56e2..4053067be 100644 --- a/src/ui/Languages/it-IT.xml +++ b/src/ui/Languages/it-IT.xml @@ -2545,8 +2545,6 @@ stesso file di sottotitolo (collaborazione) Conta tutto tranne gli spazi CJK 1, latino 0.5 CJK 1, latino 0.5, spazio 0 - Ignora i segni diacritici arabi - Ignora i segni diacritici arabi/spazi Nessuno spazio o punteggiatura ()[]-:;,.!? Nessuno spazio o punteggiatura, solo cps Sostituisci con simbolo musicale: diff --git a/src/ui/Languages/ko-KR.xml b/src/ui/Languages/ko-KR.xml index 4eb5711ea..f5aaf0ca1 100644 --- a/src/ui/Languages/ko-KR.xml +++ b/src/ui/Languages/ko-KR.xml @@ -2542,8 +2542,6 @@ FFmpeg를 다운로드하고 사용하시겠습니까? 모든 공백을 제외한 수 한중일 1, 라틴어 0.5 한중일 1, 라틴어 0.5, 공백 0 - 아랍어 분음부 무시 - 아랍어 분음부/공백 무시 공백 또는 구두점()[]-:;,.!? 없음 공백 또는 구두점 없음, cps 만 음표 diff --git a/src/ui/Languages/nl-NL.xml b/src/ui/Languages/nl-NL.xml index a5805e6aa..9cf59251a 100644 --- a/src/ui/Languages/nl-NL.xml +++ b/src/ui/Languages/nl-NL.xml @@ -2527,8 +2527,6 @@ hetzelfde ondertitelbestand bewerken (samenwerken) Alle tekens behalve spaties meetellen CJK 1, Latin 0,5 CJK 1, Latin 0,5, spatie 0 - Arabische diakritische tekens negeren - Arabische diakritische tekens/spaties negeren Geen spaties of interpunctie ()[]-:;,.!? Geen spaties of interpunctie, alleen voor CPS Vervangend muzieksymbool diff --git a/src/ui/Languages/pl-PL.xml b/src/ui/Languages/pl-PL.xml index c07621a92..a9675d2e6 100644 --- a/src/ui/Languages/pl-PL.xml +++ b/src/ui/Languages/pl-PL.xml @@ -2531,8 +2531,6 @@ może edytować ten sam plik napisów (współpraca) Policz wszystko oprócz spacji CJK 1, Latin 0.5 CJK 1, Latin 0.5, spacja 0 - Ignoruj arabskie znaki diakrytyczne - Ignoruj arabskie znaki diakrytyczne/spacje Brak spacji i znaków interpunkcji ()[]-:;,.!? Bez spacji i znaków interpunkcyjnych, tylko ZNS Symbol muzyczny diff --git a/src/ui/Languages/pt-BR.xml b/src/ui/Languages/pt-BR.xml index 58b6c8337..145f2f92b 100644 --- a/src/ui/Languages/pt-BR.xml +++ b/src/ui/Languages/pt-BR.xml @@ -2535,8 +2535,6 @@ podem editar o mesmo arquivo de legenda (colaboração) Contar todos, menos espaços CJK 1, latino 0.5 CJK 1, latino 0.5, espaço 0 - Ignorar diacríticos em árabe - Ignorar diacríticos/espaço em árabe Sem espaço ou pontuação ()[]-:;,.!? Sem espaço ou pontuação, somente cps Símbolo musical diff --git a/src/ui/Languages/pt-PT.xml b/src/ui/Languages/pt-PT.xml index 5d4dd35bb..5c17f531c 100644 --- a/src/ui/Languages/pt-PT.xml +++ b/src/ui/Languages/pt-PT.xml @@ -2546,8 +2546,6 @@ editar o mesmo ficheiro de legenda (colaboração) Contar todos excepto o espaço CJK 1, Latin 0.5 CJK 1, Latin 0.5, espaço 0 - Ignorar diacríticos em árabe - Ignorar diacríticos/espaço em árabe Sem espaço ou pontuação ()[]-:;,.!? Sem espaço ou pontuação, apenas cps Símbolo musical diff --git a/src/ui/Languages/ru-RU.xml b/src/ui/Languages/ru-RU.xml index 08a766f92..aad5bea40 100644 --- a/src/ui/Languages/ru-RU.xml +++ b/src/ui/Languages/ru-RU.xml @@ -2553,8 +2553,6 @@ https://github.com/SubtitleEdit/subtitleedit Исключить пробелы CJK 1, латиница 0.5 CJK 1, латиница 0.5, пробел 0 - Игнор. арабскую диакритику - Игнор. арабскую диакритику/пробел Без пробелов и знак. преп. ()[]-:;,.!? Без пробелов и знак. преп., только CPS Музыкальный символ diff --git a/src/ui/Languages/sl-SI.xml b/src/ui/Languages/sl-SI.xml index 5e176e097..9bf4ead60 100644 --- a/src/ui/Languages/sl-SI.xml +++ b/src/ui/Languages/sl-SI.xml @@ -2360,8 +2360,6 @@ lahko ureja v isti datoteki s podnapisi (sodelovanje) Preštej vse razen presledka CJK 1, latinica 0,5 CJK 1, latinica 0,5, presledek 0 - Prezri arabske diakritične znake - Prezri arabske diakritične znake/presledek Brez presledkov ali ločil ()[]-:;,.!? Brez presledkov ali ločil, samo cps Glasbeni simbol diff --git a/src/ui/Languages/sv-SE.xml b/src/ui/Languages/sv-SE.xml index e2ec76b9e..538bbbf3e 100644 --- a/src/ui/Languages/sv-SE.xml +++ b/src/ui/Languages/sv-SE.xml @@ -2544,8 +2544,6 @@ kan redigera i samma undertextfil (samarbete) Räkna alla utom mellanslag CJK 1, latin 0,5 CJK 1, latin 0,5, mellanslag 0 - Ignorera arabiska diakritiska tecken - Ignorera arabiska diakritiska tecken/mellanslag Inget mellanslag eller skiljetecken ()[]-:;,.!? Inget mellanslag eller skiljetecken, endast cps Musiksymbol diff --git a/src/ui/Languages/vi-VN.xml b/src/ui/Languages/vi-VN.xml index 3820528c5..ab728fedc 100644 --- a/src/ui/Languages/vi-VN.xml +++ b/src/ui/Languages/vi-VN.xml @@ -2257,8 +2257,6 @@ có thể chỉnh sửa trong cùng một tập tin phụ đề (hợp tác vớ Đếm tất cả ngoại trừ dấu cách CJK 1, latin 0,5 CJK 1, latin 0,5, dấu cách 0 - Bỏ qua các dấu phụ tiếng Ả Rập - Bỏ qua dấu/dấu cách tiếng Ả Rập Kí hiệu Âm nhạc Các ký hiệu âm nhạc cần thay thế (phân tách bằng dấu phẩy) Sửa lỗi OCR phổ biến - cũng sử dụng quy tắc hardcoded diff --git a/src/ui/Languages/zh-Hans.xml b/src/ui/Languages/zh-Hans.xml index 66ab15e1c..3388f6a68 100644 --- a/src/ui/Languages/zh-Hans.xml +++ b/src/ui/Languages/zh-Hans.xml @@ -2531,8 +2531,6 @@ Command line: {1} {2} 统计除空格外的字符 CJK 1，拉丁文 0.5 CJK 1，拉丁文 0.5，空格 0 - 忽略阿拉伯语变音符号 - 忽略阿拉伯语变音符号/空格 忽略空格或标点符号 ()[]-:;,.!? 忽略空格或标点符号，仅显示每秒字频 音符 diff --git a/src/ui/Logic/CpsLineLength.cs b/src/ui/Logic/CpsLineLength.cs index f7ba19115..251e7ab12 100644 --- a/src/ui/Logic/CpsLineLength.cs +++ b/src/ui/Logic/CpsLineLength.cs @@ -19,10 +19,10 @@ namespace Nikse.SubtitleEdit.Logic return LanguageSettings.Current.Settings.CpsLineLengthStyleCalcCjk; case nameof(CalcCjkNoSpace): return LanguageSettings.Current.Settings.CpsLineLengthStyleCalcCjkNoSpace; - case nameof(CalcIgnoreArabicDiacritics): - return LanguageSettings.Current.Settings.CpsLineLengthStyleCalcIgnoreArabicDiacritics; - case nameof(CalcIgnoreArabicDiacriticsNoSpace): - return LanguageSettings.Current.Settings.CpsLineLengthStyleCalcIgnoreArabicDiacriticsNoSpace; + case nameof(CalcIncludeCompositionCharacters): + return LanguageSettings.Current.Settings.CpsLineLengthStyleCalcIncludeCompositionCharacters; + case nameof(CalcIncludeCompositionCharactersNotSpace): + return LanguageSettings.Current.Settings.CpsLineLengthStyleCalcIncludeCompositionCharactersNotSpace; case nameof(CalcNoSpaceOrPunctuation): return LanguageSettings.Current.Settings.CpsLineLengthStyleCalcNoSpaceOrPunctuation; case nameof(CalcNoSpaceOrPunctuationCpsOnly): diff --git a/src/ui/Logic/Language.cs b/src/ui/Logic/Language.cs index 207830455..6e20ce573 100644 --- a/src/ui/Logic/Language.cs +++ b/src/ui/Logic/Language.cs @@ -2895,8 +2895,8 @@ can edit in same subtitle file (collaboration)", CpsLineLengthStyleCalcNoSpace = "Count all except space", CpsLineLengthStyleCalcCjk = "CJK 1, Latin 0.5", CpsLineLengthStyleCalcCjkNoSpace = "CJK 1, Latin 0.5, space 0", - CpsLineLengthStyleCalcIgnoreArabicDiacritics = "Ignore Arabic diacritics", - CpsLineLengthStyleCalcIgnoreArabicDiacriticsNoSpace = "Ignore Arabic diacritics/space", + CpsLineLengthStyleCalcIncludeCompositionCharacters = "Include composition characters", + CpsLineLengthStyleCalcIncludeCompositionCharactersNotSpace = "Include composition characters, not space", CpsLineLengthStyleCalcNoSpaceOrPunctuation = "No space or punctuation ()[]-:;,.!?", CpsLineLengthStyleCalcNoSpaceOrPunctuationCpsOnly = "No space or punctuation, cps only", ContinuationStyleNone = "None", diff --git a/src/ui/Logic/LanguageDeserializer.cs b/src/ui/Logic/LanguageDeserializer.cs index 61e1d6049..a836ccbb4 100644 --- a/src/ui/Logic/LanguageDeserializer.cs +++ b/src/ui/Logic/LanguageDeserializer.cs @@ -6922,11 +6922,11 @@ namespace Nikse.SubtitleEdit.Logic case "Settings/CpsLineLengthStyleCalcCjkNoSpace": language.Settings.CpsLineLengthStyleCalcCjkNoSpace = reader.Value; break; - case "Settings/CpsLineLengthStyleCalcIgnoreArabicDiacritics": - language.Settings.CpsLineLengthStyleCalcIgnoreArabicDiacritics = reader.Value; + case "Settings/CpsLineLengthStyleCalcIncludeCompositionCharacters": + language.Settings.CpsLineLengthStyleCalcIncludeCompositionCharacters = reader.Value; break; - case "Settings/CpsLineLengthStyleCalcIgnoreArabicDiacriticsNoSpace": - language.Settings.CpsLineLengthStyleCalcIgnoreArabicDiacriticsNoSpace = reader.Value; + case "Settings/CpsLineLengthStyleCalcIncludeCompositionCharactersNotSpace": + language.Settings.CpsLineLengthStyleCalcIncludeCompositionCharactersNotSpace = reader.Value; break; case "Settings/CpsLineLengthStyleCalcNoSpaceOrPunctuation": language.Settings.CpsLineLengthStyleCalcNoSpaceOrPunctuation = reader.Value; diff --git a/src/ui/Logic/LanguageStructure.cs b/src/ui/Logic/LanguageStructure.cs index 7b1fae186..2b6838fa5 100644 --- a/src/ui/Logic/LanguageStructure.cs +++ b/src/ui/Logic/LanguageStructure.cs @@ -2718,8 +2718,8 @@ public string CpsLineLengthStyleCalcNoSpace { get; set; } public string CpsLineLengthStyleCalcCjk { get; set; } public string CpsLineLengthStyleCalcCjkNoSpace { get; set; } - public string CpsLineLengthStyleCalcIgnoreArabicDiacritics { get; set; } - public string CpsLineLengthStyleCalcIgnoreArabicDiacriticsNoSpace { get; set; } + public string CpsLineLengthStyleCalcIncludeCompositionCharacters { get; set; } + public string CpsLineLengthStyleCalcIncludeCompositionCharactersNotSpace { get; set; } public string CpsLineLengthStyleCalcNoSpaceOrPunctuation { get; set; } public string CpsLineLengthStyleCalcNoSpaceOrPunctuationCpsOnly { get; set; } public string MusicSymbol { get; set; }