Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-10-27 14:32:35 +01:00
Code Issues Projects Releases Wiki Activity

Don't apply to commas & insert space for Portuguese

Browse Source
This commit is contained in:
Martijn van Berkel (Flitskikker) 2020-04-27 21:44:04 +02:00
parent ff7c17ecb5
commit 2b87bc3269
2 changed files with 82 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
libse/ContinuationUtilities.cs
View File

@ -272,9 +272,10 @@ namespace Nikse.SubtitleEdit.Core
return lastWord;
}
public static bool ShouldAddSuffix(string input, ContinuationProfile profile, bool sanitize)
public static bool ShouldAddSuffix(string input, ContinuationProfile profile, bool sanitize, bool gap)
{
string text = sanitize ? SanitizeString(input) : input;
bool applyIfComma = gap && profile.UseDifferentStyleGap ? profile.GapSuffixApplyIfComma : profile.SuffixApplyIfComma;
// Return if empty string
if (string.IsNullOrEmpty(text))
@ -282,13 +283,18 @@ namespace Nikse.SubtitleEdit.Core
return false;
}
if ((EndsWithNothing(text, profile) || text.EndsWith(',') || HasSuffix(text, profile)) && !text.EndsWith("--", StringComparison.Ordinal) && !text.EndsWith(':') && !text.EndsWith(';'))
if ((EndsWithNothing(text, profile) || (applyIfComma && text.EndsWith(',')) || HasSuffix(text, profile)) && !text.EndsWith("--", StringComparison.Ordinal) && !text.EndsWith(':') && !text.EndsWith(';'))
{
return true;
}
return false;
}
public static bool ShouldAddSuffix(string input, ContinuationProfile profile, bool sanitize)
{
return ShouldAddSuffix(input, profile, sanitize, false);
}
public static bool ShouldAddSuffix(string input, ContinuationProfile profile)
{
@ -850,6 +856,35 @@ namespace Nikse.SubtitleEdit.Core
return true;
}
public static bool IsBold(string input)
{
input = ExtractParagraphOnly(input);
// Return if empty string
if (string.IsNullOrEmpty(input))
{
return false;
}
while (input.IndexOf("<b>", StringComparison.Ordinal) >= 0)
{
var startIndex = input.IndexOf("<b>", StringComparison.Ordinal);
var endIndex = input.IndexOf("</b>", StringComparison.Ordinal);
var textToRemove = endIndex >= 0 ? input.Substring(startIndex, (endIndex + 4) - startIndex) : input.Substring(startIndex);
input = input.Replace(textToRemove, "");
}
foreach (var c in input)
{
if (c != '\n' && c != '\r')
{
return false;
}
}
return true;
}
public static bool IsFullLineTag(string input, int position)
{
input = ExtractParagraphOnly(input);
@ -1315,12 +1350,14 @@ namespace Nikse.SubtitleEdit.Core
return new ContinuationProfile
{
Suffix = "",
SuffixApplyIfComma = false,
SuffixAddSpace = false,
SuffixReplaceComma = false,
Prefix = "",
PrefixAddSpace = false,
UseDifferentStyleGap = true,
GapSuffix = "...",
GapSuffixApplyIfComma = true,
GapSuffixAddSpace = false,
GapSuffixReplaceComma = true,
GapPrefix = "",
@ -1330,12 +1367,14 @@ namespace Nikse.SubtitleEdit.Core
return new ContinuationProfile
{
Suffix = "",
SuffixApplyIfComma = false,
SuffixAddSpace = false,
SuffixReplaceComma = false,
Prefix = "",
PrefixAddSpace = false,
UseDifferentStyleGap = true,
GapSuffix = "...",
GapSuffixApplyIfComma = true,
GapSuffixAddSpace = false,
GapSuffixReplaceComma = true,
GapPrefix = "...",
@ -1345,6 +1384,7 @@ namespace Nikse.SubtitleEdit.Core
return new ContinuationProfile
{
Suffix = "...",
SuffixApplyIfComma = true,
SuffixAddSpace = false,
SuffixReplaceComma = true,
Prefix = "",
@ -1355,6 +1395,7 @@ namespace Nikse.SubtitleEdit.Core
return new ContinuationProfile
{
Suffix = "...",
SuffixApplyIfComma = true,
SuffixAddSpace = false,
SuffixReplaceComma = true,
Prefix = "...",
@ -1365,6 +1406,7 @@ namespace Nikse.SubtitleEdit.Core
return new ContinuationProfile
{
Suffix = "-",
SuffixApplyIfComma = true,
SuffixAddSpace = true,
SuffixReplaceComma = true,
Prefix = "-",
@ -1375,12 +1417,14 @@ namespace Nikse.SubtitleEdit.Core
return new ContinuationProfile
{
Suffix = "-",
SuffixApplyIfComma = true,
SuffixAddSpace = true,
SuffixReplaceComma = true,
Prefix = "-",
PrefixAddSpace = true,
UseDifferentStyleGap = true,
GapSuffix = "...",
GapSuffixApplyIfComma = true,
GapSuffixAddSpace = false,
GapSuffixReplaceComma = true,
GapPrefix = "...",
@ -1390,6 +1434,7 @@ namespace Nikse.SubtitleEdit.Core
return new ContinuationProfile
{
Suffix = "",
SuffixApplyIfComma = false,
SuffixAddSpace = false,
SuffixReplaceComma = false,
Prefix = "",
@ -1402,12 +1447,14 @@ namespace Nikse.SubtitleEdit.Core
public class ContinuationProfile
{
public string Suffix { get; set; }
public bool SuffixApplyIfComma { get; set; }
public bool SuffixAddSpace { get; set; }
public bool SuffixReplaceComma { get; set; }
public string Prefix { get; set; }
public bool PrefixAddSpace { get; set; }
public bool UseDifferentStyleGap { get; set; }
public string GapSuffix { get; set; }
public bool GapSuffixApplyIfComma { get; set; }
public bool GapSuffixAddSpace { get; set; }
public bool GapSuffixReplaceComma { get; set; }
public string GapPrefix { get; set; }

41
libse/Forms/FixCommonErrors/FixContinuationStyle.cs
View File

@ -25,6 +25,23 @@ namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
SetContinuationProfile(Configuration.Settings.General.ContinuationStyle);
}
// Quick fix for Portuguese
if (callbacks.Language == "pt")
{
_continuationProfile.SuffixApplyIfComma = false;
_continuationProfile.GapSuffixApplyIfComma = false;
if (_continuationProfile.Prefix == "...")
{
_continuationProfile.PrefixAddSpace = true;
}
if (_continuationProfile.GapPrefix == "...")
{
_continuationProfile.GapPrefixAddSpace = true;
}
}
int minGapMs = ContinuationUtilities.GetMinimumGapMs();
bool inSentence = false;
@ -42,6 +59,9 @@ namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
var isChecked = true;
var shouldProcess = true;
// Detect gap
bool gap = pNext.StartTime.TotalMilliseconds - p.EndTime.TotalMilliseconds > minGapMs;
// Convert for Arabic
if (callbacks.Language == "ar")
{
@ -52,7 +72,7 @@ namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
}
// Check if we should fix this paragraph
if (ShouldFixParagraph(text))
if (ShouldFixParagraph(text, gap))
{
// If ends with nothing...
if (!ContinuationUtilities.IsEndOfSentence(text))
@ -85,6 +105,15 @@ namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
isChecked = false;
}
}
// ...ignore bold tags for Portuguese
if (callbacks.Language == "pt")
{
if (ContinuationUtilities.IsBold(oldText) || ContinuationUtilities.IsBold(oldText))
{
isChecked = false;
}
}
}
// ...ignore Arabic inserts
@ -96,11 +125,7 @@ namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
}
}
}
// Detect gap
bool gap = pNext.StartTime.TotalMilliseconds - p.EndTime.TotalMilliseconds > minGapMs;
// Remove any suffixes and prefixes
var oldTextWithoutSuffix = ContinuationUtilities.RemoveSuffix(oldText, _continuationProfile, new List<string> { "," }, false).Trim();
var oldTextNextWithoutPrefix = ContinuationUtilities.RemovePrefix(oldTextNext, _continuationProfile, true, gap);
@ -230,9 +255,9 @@ namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
return callbacks.AllowFix(new Paragraph { Number = -1 }, string.Empty);
}
private bool ShouldFixParagraph(string input)
private bool ShouldFixParagraph(string input, bool gap)
{
return ContinuationUtilities.ShouldAddSuffix(input, _continuationProfile, false);
return ContinuationUtilities.ShouldAddSuffix(input, _continuationProfile, false, gap);
}
private bool HasPrefix(string input)