mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-10-27 22:42:38 +01:00
Remove karoke tags when mergning lines - thx MMT :)
This commit is contained in:
parent
41a68f6456
commit
de0bbae17e
@ -12240,6 +12240,8 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
addText = RemoveAssStartAlignmentTag(addText);
|
addText = RemoveAssStartAlignmentTag(addText);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
addText = RemoveAssaKarokeTag(addText);
|
||||||
|
|
||||||
if (breakMode == BreakMode.UnbreakNoSpace)
|
if (breakMode == BreakMode.UnbreakNoSpace)
|
||||||
{
|
{
|
||||||
sb.Append(addText);
|
sb.Append(addText);
|
||||||
@ -12647,7 +12649,7 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
private static string RemoveAssStartAlignmentTag(string text)
|
private static string RemoveAssStartAlignmentTag(string text)
|
||||||
{
|
{
|
||||||
var s = text.TrimStart();
|
var s = text.TrimStart();
|
||||||
if (s.StartsWith("{\\an") && s.Length > 5 && s[5] == '}')
|
if (s.StartsWith("{\\an", StringComparison.Ordinal) && s.Length > 5 && s[5] == '}')
|
||||||
{
|
{
|
||||||
s = s.Remove(0, 6);
|
s = s.Remove(0, 6);
|
||||||
}
|
}
|
||||||
@ -12655,6 +12657,18 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
return s;
|
return s;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static string RemoveAssaKarokeTag(string text)
|
||||||
|
{
|
||||||
|
var s = text.TrimStart();
|
||||||
|
var end = s.IndexOf('}');
|
||||||
|
if (end > 5 && end < 9 && s.StartsWith("{\\k", StringComparison.Ordinal))
|
||||||
|
{
|
||||||
|
s = s.Remove(0, end + 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
return s;
|
||||||
|
}
|
||||||
|
|
||||||
private void UpdateStartTimeInfo(TimeCode startTime)
|
private void UpdateStartTimeInfo(TimeCode startTime)
|
||||||
{
|
{
|
||||||
if (_subtitle.Paragraphs.Count > 0 && SubtitleListview1.SelectedItems.Count > 0 && startTime != null)
|
if (_subtitle.Paragraphs.Count > 0 && SubtitleListview1.SelectedItems.Count > 0 && startTime != null)
|
||||||
@ -19892,7 +19906,7 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
{
|
{
|
||||||
var pre = string.Empty;
|
var pre = string.Empty;
|
||||||
var s = SplitStartTags(line, ref pre);
|
var s = SplitStartTags(line, ref pre);
|
||||||
if (!line.StartsWith("-"))
|
if (!line.StartsWith('-'))
|
||||||
{
|
{
|
||||||
sb.Append(pre).Append("- ").AppendLine(s);
|
sb.Append(pre).Append("- ").AppendLine(s);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user