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

Always use "real newline" in UI instead of "\N" with ASSA

Browse Source
This commit is contained in:
niksedk 2021-09-25 09:57:11 +02:00
parent bd1723a88c
commit d555252b41
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/libse/SubtitleFormats/AdvancedSubStationAlpha.cs
View File

@ -890,7 +890,7 @@ Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text"
public static string FormatText(Paragraph p)
{
string text = p.Text.Replace(Environment.NewLine, "\\N");
string text = NormalizeNewLines(p.Text);
if (!text.Contains('<'))
{
@ -1002,8 +1002,7 @@ Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text"
public static string GetFormattedText(string input)
{
var text = input.Replace("\\N", Environment.NewLine).Replace("\\n", Environment.NewLine);
var text = NormalizeNewLines(input);
var tooComplex = ContainsUnsupportedTags(text);
if (!tooComplex)
@ -1618,9 +1617,7 @@ Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text"
{
StartTime = GetTimeCodeFromString(start),
EndTime = GetTimeCodeFromString(end),
Text = text
.Replace("\\n", Environment.NewLine)
.Replace("\\N", Environment.NewLine),
Text = NormalizeNewLines(text),
};
if (!string.IsNullOrEmpty(style))
@ -1696,6 +1693,19 @@ Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text"
int.Parse(timeCode[3]) * 10);
}
public static void NormalizeNewLines(Subtitle subtitle)
{
foreach (var p in subtitle.Paragraphs)
{
p.Text = NormalizeNewLines(p.Text);
}
}
private static string NormalizeNewLines(string text)
{
return text.Replace("\\N", Environment.NewLine).Replace("\\n", Environment.NewLine);
}
public override void RemoveNativeFormatting(Subtitle subtitle, SubtitleFormat newFormat)
{
if (newFormat != null && newFormat.Name == SubStationAlpha.NameOfFormat)
@ -1779,8 +1789,7 @@ Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text"
continue;
}
p.Text = p.Text.Replace("\\n", Environment.NewLine); // Soft line break
p.Text = p.Text.Replace("\\N", Environment.NewLine); // Hard line break
p.Text = NormalizeNewLines(p.Text);
p.Text = p.Text.Replace("\\h", " "); // Hard space
if (noTags.StartsWith("m ", StringComparison.Ordinal))

5
src/ui/Forms/Main.cs
View File

@ -214,6 +214,11 @@ namespace Nikse.SubtitleEdit.Forms
private void SetCurrentFormat(SubtitleFormat format)
{
if (format.Name == AdvancedSubStationAlpha.NameOfFormat)
{
AdvancedSubStationAlpha.NormalizeNewLines(_subtitle);
}
if (format.IsVobSubIndexFile)
{
UiUtil.InitializeSubtitleFormatComboBox(comboBoxSubtitleFormats, format);