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

A few minor improvements

Browse Source
This commit is contained in:
Nikolaj Olsson 2017-05-08 17:42:09 +02:00
parent 3a35c9df63
commit b05db70b06
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Dictionaries/eng_OCRFixReplaceList.xml
View File

@ -1918,6 +1918,9 @@
<Word from="ourpatient" to="our patient" /> <Word from="ourpatient" to="our patient" />
<Word from="oryou're" to="or you're" /> <Word from="oryou're" to="or you're" />
<Word from="ofyourself" to="of yourself" /> <Word from="ofyourself" to="of yourself" />
<Word from="poweryour" to="power your" />
<Word from="Ofcourse" to="Of course" />
<Word from="Ofmy" to="Of my" />
</WholeWords> </WholeWords>
<PartialWordsAlways> <PartialWordsAlways>
<!-- Will be replaced always --> <!-- Will be replaced always -->

BIN
Ocr/Latin.db
View File

Binary file not shown.

27
libse/Forms/RemoveTextForHI.cs
View File

@ -1,7 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.Linq;
using System.Text; using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
@ -134,7 +133,7 @@ namespace Nikse.SubtitleEdit.Core.Forms
s = s.Insert(indexOf + 1, " -"); s = s.Insert(indexOf + 1, " -");
if (newText.StartsWith("<i>", StringComparison.Ordinal) && !newText.StartsWith("<i>-", StringComparison.Ordinal)) if (newText.StartsWith("<i>", StringComparison.Ordinal) && !newText.StartsWith("<i>-", StringComparison.Ordinal))
newText = "<i>- " + newText.Remove(0, 3); newText = "<i>- " + newText.Remove(0, 3);
else if (!newText.StartsWith("-")) else if (!newText.StartsWith('-'))
newText = "- " + newText; newText = "- " + newText;
} }
} }
@ -264,9 +263,9 @@ namespace Nikse.SubtitleEdit.Core.Forms
{ {
s = s.Remove(indexOf + 1, indexOfColon - indexOf); s = s.Remove(indexOf + 1, indexOfColon - indexOf);
s = s.Insert(indexOf + 1, " -"); s = s.Insert(indexOf + 1, " -");
if (newText.StartsWith("<i>") && !newText.StartsWith("<i>-")) if (newText.StartsWith("<i>", StringComparison.Ordinal) && !newText.StartsWith("<i>-", StringComparison.Ordinal))
newText = "<i>- " + newText.Remove(0, 3); newText = "<i>- " + newText.Remove(0, 3);
else if (!newText.StartsWith("-")) else if (!newText.StartsWith('-'))
newText = "- " + newText; newText = "- " + newText;
} }
} }
@ -619,7 +618,7 @@ namespace Nikse.SubtitleEdit.Core.Forms
{ {
if (text.StartsWith("<i>-", StringComparison.Ordinal)) if (text.StartsWith("<i>-", StringComparison.Ordinal))
{ {
text = "<i>" + text.Remove(0,4).Trim(); text = "<i>" + text.Remove(0, 4).Trim();
} }
else else
{ {
@ -660,25 +659,25 @@ namespace Nikse.SubtitleEdit.Core.Forms
} }
string removeText = "<i>- </i>" + Environment.NewLine + "-"; string removeText = "<i>- </i>" + Environment.NewLine + "-";
if (text.StartsWith(removeText)) if (text.StartsWith(removeText, StringComparison.Ordinal))
{ {
text = text.Remove(0, removeText.Length).TrimStart(' '); text = text.Remove(0, removeText.Length).TrimStart(' ');
} }
removeText = "<i>-</i>" + Environment.NewLine + "-"; removeText = "<i>-</i>" + Environment.NewLine + "-";
if (text.StartsWith(removeText)) if (text.StartsWith(removeText, StringComparison.Ordinal))
{ {
text = text.Remove(0, removeText.Length).TrimStart(' '); text = text.Remove(0, removeText.Length).TrimStart(' ');
} }
removeText = "<i>-</i>" + Environment.NewLine + "<i>-"; removeText = "<i>-</i>" + Environment.NewLine + "<i>-";
if (text.StartsWith(removeText)) if (text.StartsWith(removeText, StringComparison.Ordinal))
{ {
text = "<i>" + text.Remove(0, removeText.Length).TrimStart(' '); text = "<i>" + text.Remove(0, removeText.Length).TrimStart(' ');
} }
removeText = "<i>- </i>" + Environment.NewLine + "<i>-"; removeText = "<i>- </i>" + Environment.NewLine + "<i>-";
if (text.StartsWith(removeText)) if (text.StartsWith(removeText, StringComparison.Ordinal))
{ {
text = "<i>" + text.Remove(0, removeText.Length).TrimStart(' '); text = "<i>" + text.Remove(0, removeText.Length).TrimStart(' ');
} }
@ -910,7 +909,7 @@ namespace Nikse.SubtitleEdit.Core.Forms
temp = temp.Remove(subIndex, 2); temp = temp.Remove(subIndex, 2);
removeAfter = false; removeAfter = false;
} }
else if (subIndex > 3 && ".!?".Contains(temp.Substring(subIndex -1, 1))) else if (subIndex > 3 && ".!?".Contains(temp.Substring(subIndex - 1, 1)))
{ {
subTemp = temp.Substring(subIndex); subTemp = temp.Substring(subIndex);
if (subTemp == " ..." || subTemp.StartsWith(" ..." + Environment.NewLine, StringComparison.InvariantCulture)) if (subTemp == " ..." || subTemp.StartsWith(" ..." + Environment.NewLine, StringComparison.InvariantCulture))
@ -1002,7 +1001,7 @@ namespace Nikse.SubtitleEdit.Core.Forms
temp = temp.Remove(0, 1); temp = temp.Remove(0, 1);
} }
if (temp.StartsWith("...")) if (temp.StartsWith("...", StringComparison.Ordinal))
{ {
pre = pre.Trim(); pre = pre.Trim();
} }
@ -1126,11 +1125,11 @@ namespace Nikse.SubtitleEdit.Core.Forms
{ {
text = text.Replace(Environment.NewLine + "<i>" + Environment.NewLine, Environment.NewLine + "<i>"); text = text.Replace(Environment.NewLine + "<i>" + Environment.NewLine, Environment.NewLine + "<i>");
text = text.Replace(Environment.NewLine + "</i>" + Environment.NewLine, "</i>" + Environment.NewLine); text = text.Replace(Environment.NewLine + "</i>" + Environment.NewLine, "</i>" + Environment.NewLine);
if (text.StartsWith("<i>" + Environment.NewLine)) if (text.StartsWith("<i>" + Environment.NewLine, StringComparison.Ordinal))
{ {
text = text.Remove(3, Environment.NewLine.Length); text = text.Remove(3, Environment.NewLine.Length);
} }
if (text.EndsWith(Environment.NewLine + "</i>")) if (text.EndsWith(Environment.NewLine + "</i>", StringComparison.Ordinal))
{ {
text = text.Remove(text.Length - (Environment.NewLine.Length + 4), Environment.NewLine.Length); text = text.Remove(text.Length - (Environment.NewLine.Length + 4), Environment.NewLine.Length);
} }
@ -1189,7 +1188,7 @@ namespace Nikse.SubtitleEdit.Core.Forms
text = text.Remove(0, indexOfEndBracketSuccessor).TrimStart(); text = text.Remove(0, indexOfEndBracketSuccessor).TrimStart();
} }
string preNewLine = string.Empty; string preNewLine = string.Empty;
if (text.StartsWith(Environment.NewLine)) if (text.StartsWith(Environment.NewLine, StringComparison.Ordinal))
preNewLine = Environment.NewLine; preNewLine = Environment.NewLine;
if (Settings.RemoveTextBetweenSquares) if (Settings.RemoveTextBetweenSquares)
{ {