From a71624399de346c68349dc916b67374c8ca49937 Mon Sep 17 00:00:00 2001
From: niksedk <nikse.dk@gmail.com>
Date: Wed, 21 Sep 2011 19:52:34 +0000
Subject: [PATCH] Fix loading of some words in the ocr replace list + fixed a
 crash in the fix ocr errors - thx Yankee + Bob :)

git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@662 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
---
 src/Logic/OCR/OcrFixEngine.cs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Logic/OCR/OcrFixEngine.cs b/src/Logic/OCR/OcrFixEngine.cs
index cb3adb975..a14f3b137 100644
--- a/src/Logic/OCR/OcrFixEngine.cs
+++ b/src/Logic/OCR/OcrFixEngine.cs
@@ -88,7 +88,7 @@ namespace Nikse.SubtitleEdit.Logic.OCR
                 doc.Load(_replaceListXmlFileName);
 
                 _wordReplaceList = LoadReplaceList(doc, "WholeWords");
-                _partialWordReplaceList = LoadReplaceList(doc, "PartialWordsAlways");
+                _partialWordReplaceListAlways = LoadReplaceList(doc, "PartialWordsAlways");
                 _partialWordReplaceList = LoadReplaceList(doc, "PartialWords");
                 _partialLineReplaceList = LoadReplaceList(doc, "PartialLines");
                 _beginLineReplaceList = LoadReplaceList(doc, "BeginLines");
@@ -767,7 +767,7 @@ namespace Nikse.SubtitleEdit.Logic.OCR
             }
 
             int idx = input.IndexOf(Environment.NewLine + "-");
-            if (idx > 0 && Utilities.GetLetters(true, false, false).Contains(input[idx+Environment.NewLine.Length+1].ToString()))
+            if (idx > 0 && idx + Environment.NewLine.Length + 1 < input.Length && Utilities.GetLetters(true, false, false).Contains(input[idx + Environment.NewLine.Length + 1].ToString()))
             {
                 input = input.Insert(idx + Environment.NewLine.Length + 1, " ");
             }
@@ -1186,12 +1186,14 @@ namespace Nikse.SubtitleEdit.Logic.OCR
                     {
                         bool startOk = i == 0;
                         if (!startOk)
-                            startOk = (" ¡¿<>-\"”“[]'‘`´¶()♪¿¡.…—!?,:;/" + Environment.NewLine).Contains(text.Substring(i - 1, 1));
+                            startOk = (" ¡¿<>-\"”“()[]'‘`´¶♪¿¡.…—!?,:;/" + Environment.NewLine).Contains(text.Substring(i - 1, 1));
                         if (startOk)
                         {
                             bool endOK = (i + word.Length == text.Length);
                             if (!endOK)
-                                endOK = (" ¡¿<>-\"”“[]'‘`´¶()♪¿¡.…—!?,:;/" + Environment.NewLine).Contains(text.Substring(i + word.Length, 1));
+                                endOK = (" ¡¿<>-\"”“()[]'‘`´¶♪¿¡.…—!?,:;/" + Environment.NewLine).Contains(text.Substring(i + word.Length, 1));
+                            if (!endOK)
+                                endOK = newWord.EndsWith(" ");
                             if (endOK)
                             {
                                 sb.Append(newWord);