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

Remove position codes when reading PAC - thx Ernest :)

Browse Source
This commit is contained in:
niksedk 2022-01-04 16:18:40 +01:00
parent f409235f4d
commit cc2dd49e88
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/libse/SubtitleFormats/Pac.cs
View File

@ -1480,9 +1480,9 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
_lastStartTotalSeconds = p.StartTime.TotalSeconds;
_lastEndTotalSeconds = p.EndTime.TotalSeconds;
int maxIndex = timeStartIndex + 10 + textLength;
var maxIndex = timeStartIndex + 10 + textLength;
byte verticalAlignment = buffer[timeStartIndex + 11];
var verticalAlignment = buffer[timeStartIndex + 11];
if (CodePage == -1 && !IsFpc)
{
@ -1492,13 +1492,13 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
var overrides = (CodePage == CodePageLatinTurkish) ? LatinTurkishOverrides : null;
var sb = new StringBuilder();
index = feIndex + 3;
bool w16 = buffer[index] == 0x1f && Encoding.ASCII.GetString(buffer, index + 1, 3) == "W16";
var w16 = buffer[index] == 0x1f && Encoding.ASCII.GetString(buffer, index + 1, 3) == "W16";
if (w16)
{
index += 5;
}
bool isUnicode = false;
var isUnicode = false;
while (index < buffer.Length && index <= maxIndex) // buffer[index] != endDelimiter)
{
if (buffer.Length > index + 3 && buffer[index] == 0x1f && Encoding.ASCII.GetString(buffer, index + 1, 3) == "W16")
@ -1697,6 +1697,13 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
}
}
// Remove position tags
var indexOfPositioningCodes = p.Text.IndexOf("\u002e\u001f");
if (indexOfPositioningCodes > 0)
{
p.Text = p.Text.Substring(0, indexOfPositioningCodes + 1);
}
p.Text = p.Text.RemoveControlCharactersButWhiteSpace().TrimEnd();
return p;
}