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

A fix for italics when splitting line via waveform - thx Trottel :)

Browse Source 
git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@1501 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
niksedk 2012-11-21 15:22:53 +00:00
parent 922a41c79f
commit 9e669debe2
1 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/Forms/Main.cs
View File

@ -6089,6 +6089,9 @@ namespace Nikse.SubtitleEdit.Forms
Paragraph currentParagraph = _subtitle.GetParagraphOrDefault(firstSelectedIndex);
var newParagraph = new Paragraph(currentParagraph);
currentParagraph.Text = currentParagraph.Text.Replace("< /i>", "</i>");
currentParagraph.Text = currentParagraph.Text.Replace("< i>", "<i>");
string oldText = currentParagraph.Text;
string[] lines = currentParagraph.Text.Split(Environment.NewLine.ToCharArray(), StringSplitOptions.RemoveEmptyEntries);
if (textIndex != null && textIndex.Value > 2 && textIndex.Value < oldText.Length -2)
@ -6205,6 +6208,25 @@ namespace Nikse.SubtitleEdit.Forms
currentParagraph.Text = Utilities.AutoBreakLine(lines[0]);
newParagraph.Text = string.Empty;
}
if (currentParagraph.Text.StartsWith("<i>") && !currentParagraph.Text.Contains("</i>") &&
newParagraph.Text.EndsWith("</i>") && !newParagraph.Text.Contains("<i>"))
{
currentParagraph.Text = currentParagraph.Text + "</i>";
newParagraph.Text = "<i>" + newParagraph.Text;
}
if (currentParagraph.Text.StartsWith("<b>") && !currentParagraph.Text.Contains("</b>") &&
newParagraph.Text.EndsWith("</b>") && !newParagraph.Text.Contains("<b>"))
{
currentParagraph.Text = currentParagraph.Text + "</b>";
newParagraph.Text = "<b>" + newParagraph.Text;
}
if (currentParagraph.Text.StartsWith("<i>-") && (currentParagraph.Text.EndsWith(".</i>") || currentParagraph.Text.EndsWith("!</i>")) &&
newParagraph.Text.StartsWith("<i>-") && (newParagraph.Text.EndsWith(".</i>") || newParagraph.Text.EndsWith("!</i>")))
{
currentParagraph.Text = currentParagraph.Text.Remove(3, 1);
newParagraph.Text = newParagraph.Text.Remove(3, 1);
}
}
}
if (currentParagraph != null && newParagraph != null)
@ -6351,6 +6373,36 @@ namespace Nikse.SubtitleEdit.Forms
}
if (lines.Length == 2)
{
string a = lines[0].Trim();
string b = lines[1].Trim();
if (oldText.TrimStart().StartsWith("<i>") && oldText.TrimEnd().EndsWith("</i>") &&
Utilities.CountTagInText(oldText, "<i>") == 1 && Utilities.CountTagInText(oldText, "</i>") == 1)
{
a = a + "</i>";
b = "<i>" + b;
}
if (oldText.TrimStart().StartsWith("<b>") && oldText.TrimEnd().EndsWith("</b>") &&
Utilities.CountTagInText(oldText, "<b>") == 1 && Utilities.CountTagInText(oldText, "</b>") == 1)
{
a = a + "</b>";
b = "<b>" + b;
}
if (a.StartsWith("-") && (a.EndsWith(".") || a.EndsWith("!") || a.EndsWith("?")) &&
b.StartsWith("-") && (b.EndsWith(".") || b.EndsWith("!") || b.EndsWith("?")))
{
a = a.TrimStart('-').TrimStart();
b = b.TrimStart('-').TrimStart();
}
if (a.StartsWith("<i>-") && (a.EndsWith(".</i>") || a.EndsWith("!</i>") || a.EndsWith("?</i>")) &&
b.StartsWith("<i>-") && (b.EndsWith(".</i>") || b.EndsWith("!</i>") || b.EndsWith("?</i>")))
{
a = a.Remove(3, 1).Replace(" ", " ");
b = b.Remove(3, 1).Replace(" ", " ");
}
lines[0] = a;
lines[1] = b;
originalCurrent.Text = Utilities.AutoBreakLine(lines[0]);
originalNew.Text = Utilities.AutoBreakLine(lines[1]);
}