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

Don't remove spaces in auto-br - thx thehulk :)

Browse Source
This commit is contained in:
Nikolaj Olsson 2020-06-09 21:18:51 +02:00
parent cf2a013da5
commit 4a89871c61
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libse/SubtitleFormats/Lrc.cs
View File

@ -36,7 +36,7 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
if (subtitle.Paragraphs.Count > 4)
{
bool allStartWithNumber = true;
foreach (Paragraph p in subtitle.Paragraphs)
foreach (var p in subtitle.Paragraphs)
{
if (p.Text.Length > 1 && !Utilities.IsInteger(p.Text.Substring(0, 2)))
{
@ -51,7 +51,9 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
}
if (subtitle.Paragraphs.Count > _errorCount)
{
if (new UnknownSubtitle33().IsMine(lines, fileName) || new UnknownSubtitle36().IsMine(lines, fileName) || new TMPlayer().IsMine(lines, fileName))
if (new UnknownSubtitle33().IsMine(lines, fileName) ||
new UnknownSubtitle36().IsMine(lines, fileName) ||
new TMPlayer().IsMine(lines, fileName))
{
return false;
}
@ -76,8 +78,8 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
const string timeCodeFormat = "[{0:00}:{1:00}.{2:00}]{3}";
for (int i = 0; i < subtitle.Paragraphs.Count; i++)
{
Paragraph p = subtitle.Paragraphs[i];
Paragraph next = subtitle.GetParagraphOrDefault(i + 1);
var p = subtitle.Paragraphs[i];
var next = subtitle.GetParagraphOrDefault(i + 1);
string text = HtmlUtil.RemoveHtmlTags(p.Text);
text = text.Replace(Environment.NewLine, " ");
@ -203,7 +205,7 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
int max = subtitle.Paragraphs.Count;
for (int i = 0; i < max; i++)
{
Paragraph p = subtitle.Paragraphs[i];
var p = subtitle.Paragraphs[i];
while (RegexTimeCodes.Match(p.Text).Success)
{
string s = p.Text.Substring(1, 8);

5
libse/Utilities.cs
View File

@ -658,16 +658,17 @@ namespace Nikse.SubtitleEdit.Core
s = s.Replace("</i> " + Environment.NewLine + "<i>", " ");
s = s.Replace("</i>" + Environment.NewLine + " <i>", " ");
s = s.Replace("</i>" + Environment.NewLine + "<i>", " ");
s = s.Replace(" " + Environment.NewLine + " ", " ");
s = s.Replace(Environment.NewLine + " ", " ");
s = s.Replace(" " + Environment.NewLine + " ", " ");
s = s.Replace(Environment.NewLine, " ");
s = s.Replace(" </i>", "</i> ");
s = s.Replace(" </b>", "</b> ");
s = s.Replace(" </u>", "</u> ");
s = s.Replace(" </font>", "</font> ");
s = s.FixExtraSpaces();
return s.Trim();
}
/// <summary>
/// Note: Requires a space before the NewLine
/// </summary>