More refact

This commit is contained in:
ivandrofly 2014-06-27 00:36:37 +01:00
parent bc4acfed4c
commit ca88ae7cd6

View File

@ -326,11 +326,18 @@ namespace Nikse.SubtitleEdit.Logic
private static bool IsPartOfNumber(string s, int position) private static bool IsPartOfNumber(string s, int position)
{ {
if (s == null || s.Trim().Length == 0)
return false;
if (position + 2 > s.Length)
return false;
const string numbers = "1234567890";
if (",.".Contains(s[position].ToString())) if (",.".Contains(s[position].ToString()))
{ {
if (position > 0 && position < s.Length - 1) if (position > 0 && position < s.Length - 1)
{ {
return "1234567890".Contains(s[position - 1].ToString()) && "1234567890".Contains(s[position + 1].ToString()); return numbers.Contains(s[position - 1].ToString()) && numbers.Contains(s[position + 1].ToString());
} }
} }
return false; return false;
@ -805,6 +812,9 @@ namespace Nikse.SubtitleEdit.Logic
if (!s.Contains("<")) if (!s.Contains("<"))
return s; return s;
if(s.Contains("< "))
s = FixInvalidItalicTags(s);
s = s.Replace("<i>", string.Empty); s = s.Replace("<i>", string.Empty);
s = s.Replace("<і>", string.Empty); // different unicode chars s = s.Replace("<і>", string.Empty); // different unicode chars
s = s.Replace("</i>", string.Empty); s = s.Replace("</i>", string.Empty);
@ -2746,7 +2756,7 @@ namespace Nikse.SubtitleEdit.Logic
return null; return null;
} }
/// <summary> /// <summary>
/// HTML-encodes a string /// HTML-encodes a string
/// </summary> /// </summary>
/// <param name="text">Text string to encode</param> /// <param name="text">Text string to encode</param>