Improve "Fix uppercase 'i' nside lowercase words - thx

taxen :)
2024-11-22 11:12:36 +01:00 · 2019-02-21 23:41:44 +01:00 · 2019-02-21 23:41:44 +01:00 · 8d173b8d47
commit 8d173b8d47
parent 53b7338e91
36 changed files with 100 additions and 16 deletions
--- a/libse/Forms/FixCommonErrors/AddMissingQuotes.cs
+++ b/libse/Forms/FixCommonErrors/AddMissingQuotes.cs
@ -1,4 +1,5 @@
 using System;
+using Nikse.SubtitleEdit.Core.Interfaces;

 namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
 {
--- a/libse/Forms/FixCommonErrors/EmptyFixCallback.cs
+++ b/libse/Forms/FixCommonErrors/EmptyFixCallback.cs
@ -1,6 +1,7 @@
 using Nikse.SubtitleEdit.Core.SubtitleFormats;
 using System.Collections.Generic;
 using System.Text;
+using Nikse.SubtitleEdit.Core.Interfaces;

 namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
 {
@ -67,5 +68,9 @@ namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
            return new HashSet<string>();
        }

+        public bool DoSpell(string word)
+        {
+            return false;
+        }
    }
 }
--- a/libse/Forms/FixCommonErrors/Fix3PlusLines.cs
+++ b/libse/Forms/FixCommonErrors/Fix3PlusLines.cs
@ -1,4 +1,5 @@
 using System;
+using Nikse.SubtitleEdit.Core.Interfaces;

 namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
 {
--- a/libse/Forms/FixCommonErrors/FixAloneLowercaseIToUppercaseI.cs
+++ b/libse/Forms/FixCommonErrors/FixAloneLowercaseIToUppercaseI.cs
@ -1,5 +1,6 @@
 using System;
 using System.Text.RegularExpressions;
+using Nikse.SubtitleEdit.Core.Interfaces;

 namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
 {
--- a/libse/Forms/FixCommonErrors/FixDanishLetterI.cs
+++ b/libse/Forms/FixCommonErrors/FixDanishLetterI.cs
@ -1,4 +1,5 @@
 using System.Text.RegularExpressions;
+using Nikse.SubtitleEdit.Core.Interfaces;

 namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
 {
--- a/libse/Forms/FixCommonErrors/FixDialogsOnOneLine.cs
+++ b/libse/Forms/FixCommonErrors/FixDialogsOnOneLine.cs
@ -1,4 +1,6 @@
-namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
+using Nikse.SubtitleEdit.Core.Interfaces;
+
+namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
 {
    public class FixDialogsOnOneLine : IFixCommonError
    {
--- a/libse/Forms/FixCommonErrors/FixDoubleApostrophes.cs
+++ b/libse/Forms/FixCommonErrors/FixDoubleApostrophes.cs
@ -1,4 +1,6 @@
-namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
+using Nikse.SubtitleEdit.Core.Interfaces;
+
+namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
 {
    public class FixDoubleApostrophes : IFixCommonError
    {
--- a/libse/Forms/FixCommonErrors/FixDoubleDash.cs
+++ b/libse/Forms/FixCommonErrors/FixDoubleDash.cs
@ -1,4 +1,5 @@
 using System;
+using Nikse.SubtitleEdit.Core.Interfaces;

 namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
 {
--- a/libse/Forms/FixCommonErrors/FixDoubleGreaterThan.cs
+++ b/libse/Forms/FixCommonErrors/FixDoubleGreaterThan.cs
@ -1,4 +1,5 @@
 using System;
+using Nikse.SubtitleEdit.Core.Interfaces;

 namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
 {
--- a/libse/Forms/FixCommonErrors/FixEllipsesStart.cs
+++ b/libse/Forms/FixCommonErrors/FixEllipsesStart.cs
@ -1,4 +1,5 @@
 using System;
+using Nikse.SubtitleEdit.Core.Interfaces;

 namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
 {
--- a/libse/Forms/FixCommonErrors/FixEmptyLines.cs
+++ b/libse/Forms/FixCommonErrors/FixEmptyLines.cs
@ -1,4 +1,5 @@
 using System;
+using Nikse.SubtitleEdit.Core.Interfaces;

 namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
 {
--- a/libse/Forms/FixCommonErrors/FixHyphensAdd.cs
+++ b/libse/Forms/FixCommonErrors/FixHyphensAdd.cs
@ -1,4 +1,6 @@
-namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
+using Nikse.SubtitleEdit.Core.Interfaces;
+
+namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
 {
    public class FixHyphensAdd : IFixCommonError
    {
--- a/libse/Forms/FixCommonErrors/FixHyphensRemove.cs
+++ b/libse/Forms/FixCommonErrors/FixHyphensRemove.cs
@ -1,4 +1,6 @@
-namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
+using Nikse.SubtitleEdit.Core.Interfaces;
+
+namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
 {
    public class FixHyphensRemove : IFixCommonError
    {
--- a/libse/Forms/FixCommonErrors/FixInvalidItalicTags.cs
+++ b/libse/Forms/FixCommonErrors/FixInvalidItalicTags.cs
@ -1,4 +1,6 @@
-namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
+using Nikse.SubtitleEdit.Core.Interfaces;
+
+namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
 {
    public class FixInvalidItalicTags : IFixCommonError
    {
--- a/libse/Forms/FixCommonErrors/FixLongDisplayTimes.cs
+++ b/libse/Forms/FixCommonErrors/FixLongDisplayTimes.cs
@ -1,4 +1,6 @@
-namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
+using Nikse.SubtitleEdit.Core.Interfaces;
+
+namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
 {
    public class FixLongDisplayTimes : IFixCommonError
    {
--- a/libse/Forms/FixCommonErrors/FixLongLines.cs
+++ b/libse/Forms/FixCommonErrors/FixLongLines.cs
@ -1,4 +1,6 @@
-namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
+using Nikse.SubtitleEdit.Core.Interfaces;
+
+namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
 {
    public class FixLongLines : IFixCommonError
    {
--- a/libse/Forms/FixCommonErrors/FixMissingOpenBracket.cs
+++ b/libse/Forms/FixCommonErrors/FixMissingOpenBracket.cs
@ -1,4 +1,5 @@
 using System;
+using Nikse.SubtitleEdit.Core.Interfaces;

 namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
 {
--- a/libse/Forms/FixCommonErrors/FixMissingPeriodsAtEndOfLine.cs
+++ b/libse/Forms/FixCommonErrors/FixMissingPeriodsAtEndOfLine.cs
@ -1,4 +1,5 @@
 using System;
+using Nikse.SubtitleEdit.Core.Interfaces;

 namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
 {
--- a/libse/Forms/FixCommonErrors/FixMissingSpaces.cs
+++ b/libse/Forms/FixCommonErrors/FixMissingSpaces.cs
@ -1,5 +1,6 @@
 using System;
 using System.Text.RegularExpressions;
+using Nikse.SubtitleEdit.Core.Interfaces;

 namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
 {
--- a/libse/Forms/FixCommonErrors/FixMusicNotation.cs
+++ b/libse/Forms/FixCommonErrors/FixMusicNotation.cs
@ -1,4 +1,5 @@
 using System;
+using Nikse.SubtitleEdit.Core.Interfaces;

 namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
 {
--- a/libse/Forms/FixCommonErrors/FixOverlappingDisplayTimes.cs
+++ b/libse/Forms/FixCommonErrors/FixOverlappingDisplayTimes.cs
@ -1,5 +1,6 @@
 using Nikse.SubtitleEdit.Core.SubtitleFormats;
 using System;
+using Nikse.SubtitleEdit.Core.Interfaces;

 namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
 {
--- a/libse/Forms/FixCommonErrors/FixShortDisplayTimes.cs
+++ b/libse/Forms/FixCommonErrors/FixShortDisplayTimes.cs
@ -1,4 +1,6 @@
-namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
+using Nikse.SubtitleEdit.Core.Interfaces;
+
+namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
 {
    public class FixShortDisplayTimes : IFixCommonError
    {
--- a/libse/Forms/FixCommonErrors/FixShortLines.cs
+++ b/libse/Forms/FixCommonErrors/FixShortLines.cs
@ -1,4 +1,6 @@
-namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
+using Nikse.SubtitleEdit.Core.Interfaces;
+
+namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
 {
    public class FixShortLines : IFixCommonError
    {
--- a/libse/Forms/FixCommonErrors/FixShortLinesAll.cs
+++ b/libse/Forms/FixCommonErrors/FixShortLinesAll.cs
@ -1,4 +1,5 @@
 using System;
+using Nikse.SubtitleEdit.Core.Interfaces;

 namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
 {
--- a/libse/Forms/FixCommonErrors/FixSpanishInvertedQuestionAndExclamationMarks.cs
+++ b/libse/Forms/FixCommonErrors/FixSpanishInvertedQuestionAndExclamationMarks.cs
@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
+using Nikse.SubtitleEdit.Core.Interfaces;

 namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
 {
--- a/libse/Forms/FixCommonErrors/FixStartWithUppercaseLetterAfterColon.cs
+++ b/libse/Forms/FixCommonErrors/FixStartWithUppercaseLetterAfterColon.cs
@ -1,5 +1,6 @@
 using System;
 using System.Globalization;
+using Nikse.SubtitleEdit.Core.Interfaces;

 namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
 {
--- a/libse/Forms/FixCommonErrors/FixStartWithUppercaseLetterAfterParagraph.cs
+++ b/libse/Forms/FixCommonErrors/FixStartWithUppercaseLetterAfterParagraph.cs
@ -1,6 +1,7 @@
 using System;
 using System.Globalization;
 using System.Text;
+using Nikse.SubtitleEdit.Core.Interfaces;

 namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
 {
--- a/libse/Forms/FixCommonErrors/FixStartWithUppercaseLetterAfterPeriodInsideParagraph.cs
+++ b/libse/Forms/FixCommonErrors/FixStartWithUppercaseLetterAfterPeriodInsideParagraph.cs
@ -1,4 +1,5 @@
 using System.Globalization;
+using Nikse.SubtitleEdit.Core.Interfaces;

 namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
 {
--- a/libse/Forms/FixCommonErrors/FixTurkishAnsiToUnicode.cs
+++ b/libse/Forms/FixCommonErrors/FixTurkishAnsiToUnicode.cs
@ -1,4 +1,6 @@
-namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
+using Nikse.SubtitleEdit.Core.Interfaces;
+
+namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
 {
    public class FixTurkishAnsiToUnicode : IFixCommonError
    {
--- a/libse/Forms/FixCommonErrors/FixUnneededPeriods.cs
+++ b/libse/Forms/FixCommonErrors/FixUnneededPeriods.cs
@ -1,4 +1,5 @@
 using System;
+using Nikse.SubtitleEdit.Core.Interfaces;

 namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
 {
--- a/libse/Forms/FixCommonErrors/FixUnneededSpaces.cs
+++ b/libse/Forms/FixCommonErrors/FixUnneededSpaces.cs
@ -1,4 +1,5 @@
 using System;
+using Nikse.SubtitleEdit.Core.Interfaces;

 namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
 {
--- a/libse/Forms/FixCommonErrors/FixUppercaseIInsideWords.cs
+++ b/libse/Forms/FixCommonErrors/FixUppercaseIInsideWords.cs
@ -1,5 +1,6 @@
 using System;
 using System.Text.RegularExpressions;
+using Nikse.SubtitleEdit.Core.Interfaces;

 namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
 {
@ -8,6 +9,7 @@ namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
        private static readonly Regex ReAfterLowercaseLetter = new Regex(@"[a-zæøåäöéùáàìéóúñüéíóúñü]I", RegexOptions.Compiled);
        private static readonly Regex ReBeforeLowercaseLetter = new Regex(@"I[a-zæøåäöéùáàìéóúñüéíóúñü]", RegexOptions.Compiled);

+
        public void Fix(Subtitle subtitle, IFixCallbacks callbacks)
        {
            var l = Configuration.Settings.Language.FixCommonErrors;
@ -68,6 +70,10 @@ namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
                                word.Equals("islands", StringComparison.OrdinalIgnoreCase))
                            {
                            }
+                            else if (word.StartsWith("I") && !callbacks.DoSpell("l" + word.Remove(0,1)))
+                            {
+                                // word starting with "I", replaced by "l" is not spell check correct, so we skip it (probably a name)
+                            }
                            else if (match.Index == 0)
                            {  // first letter in paragraph

--- a/libse/Forms/FixCommonErrors/RemoveSpaceBetweenNumbers.cs
+++ b/libse/Forms/FixCommonErrors/RemoveSpaceBetweenNumbers.cs
@ -1,4 +1,6 @@
-namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
+using Nikse.SubtitleEdit.Core.Interfaces;
+
+namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
 {
    public class RemoveSpaceBetweenNumbers : IFixCommonError
    {
--- a/libse/Interfaces/IFixCallbacks.cs
+++ b/libse/Interfaces/IFixCallbacks.cs
@ -1,10 +1,10 @@
-using Nikse.SubtitleEdit.Core.SubtitleFormats;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Text;
+using Nikse.SubtitleEdit.Core.SubtitleFormats;

-namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
+namespace Nikse.SubtitleEdit.Core.Interfaces
 {
-    public interface IFixCallbacks
+    public interface IFixCallbacks : IDoSpell
    {
        bool AllowFix(Paragraph p, string action);
        void AddFixToListView(Paragraph p, string action, string before, string after);
--- a/libse/Interfaces/IFixCommonError.cs
+++ b/libse/Interfaces/IFixCommonError.cs
@ -1,4 +1,4 @@
-namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
+namespace Nikse.SubtitleEdit.Core.Interfaces
 {
    public interface IFixCommonError
    {
--- a/src/Forms/FixCommonErrors.cs
+++ b/src/Forms/FixCommonErrors.cs
@ -12,6 +12,8 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Windows.Forms;
+using Nikse.SubtitleEdit.Core.Interfaces;
+using Nikse.SubtitleEdit.Logic.SpellCheck;

 namespace Nikse.SubtitleEdit.Forms
 {
@ -1825,5 +1827,34 @@ namespace Nikse.SubtitleEdit.Forms
                e.SuppressKeyPress = true;
            }
        }
+
+        private Hunspell _hunspell;
+
+        public bool DoSpell(string word)
+        {
+            if (_hunspell == null && Language != null)
+            {
+                var fileMatches = Directory.GetFiles(Utilities.DictionaryFolder, Language + "*.dic");
+                if (fileMatches.Length > 0)
+                {
+                    var dictionary = fileMatches[0].Substring(0, fileMatches[0].Length - 4);
+                    try
+                    {
+                        _hunspell = Hunspell.GetHunspell(dictionary);
+                    }
+                    catch 
+                    {
+                        _hunspell = null;
+                    }
+                }               
+            }
+
+            if (_hunspell == null)
+            {
+                return false;
+            }
+
+            return _hunspell.Spell(word);
+        }
    }
 }