Fixed misspelling.

Squashed commits:
[7dab0a3] 1. dataPath is now readonly public.
2. designated initializer changed to - (id)initWithLanguage:(NSString *)language configDictionary:(NSDictionary *)configDictionary configFileNames:(NSArray *)configFileNames dataPath:(NSString *)dataPath engineMode:(G8OCREngineMode)engineMode NS_DESIGNATED_INITIALIZER;
where configDictionary is a dictioanry of the config variables and configFileNames is an array of file names containing key-value config pairs. All the config variables can be init only and debug time both. Furthermore they could be specified at the same time, in such case tesseract will get variables from every file and dictionary all together.
3. To avoid ambiguity with Apple Naming Conventions the following functions were renamed:
- setUpTesseractToSearchTrainedDataInTrainedDataFolderOfTheApplicatinBundle (only setters should start with set)
- initEngine (only initializer should start with init. in such case the function should return id)
- copyDataToDocumentsDirectory (if function starts from copy, the special rules are implemented by ARC to the function)
4. if the dataPath is specified, the whole content of the tessdata from the application bundle is copied to the Documents/dataPath/tessdata and tesseract is initialized with that path.
5. _dataPath is replaced with self.dataPath everywhere besides init method.

2. some unit tests

print a message if the result of copyItemAtPath == NO

Small changes

Symlinking tessdata files from app bundle to the Documents folder.

updated lib

Check that destination file doesn't exist before symlinking

updated lib.

Author: Kirill Makankov

Products/TesseractOCR.framework/Versions/A/Headers/G8Tesseract.h

@@ -40,6 +40,12 @@
  */
 @property (nonatomic, copy) NSString* language;
 
+/**
+ * The path to the tessdata file, if it was specified in a call to initWithDataPath:language:(NSString engineMode:configFileNames:
+ * Otherwise it's supposed that the tessdata folder is located in the application bundle
+ */
+@property (nonatomic, readonly, copy) NSString *dataPath;
+
 /**
  *  The recognition mode to use. See `G8OCREngineMode` in G8Constants.h for the
  *  available recognition modes.
@@ -228,6 +234,29 @@
 - (id)initWithLanguage:(NSString*)language
             engineMode:(G8OCREngineMode)engineMode;
 
+/**
+ *  Initialize Tesseract with the provided language and engine mode.
+ *
+ *  @param language         The language to use in recognition. See `language`.
+ *  @param configDictionary A dictioanry of the config variables
+ *  @param configFileNames  An array of file names containing key-value config pairs. All the config
+ *                          variables can be init only and debug time both. Furthermore they could be 
+ *                          specified at the same time, in such case tesseract will get variables from 
+ *                          every file and dictionary all together.
+ *  @param dataPath         If the dataPath is specified, the whole content of the tessdata from the
+ *                          application bundle is copied to the Documents/dataPath/tessdata 
+ *                          and tesseract is initialized with that path.
+ *  @param engineMode       The engine mode to use in recognition. See `engineMode`.
+ *
+ *  @return The initialized Tesseract object, or `nil` if there was an error.
+ */
+
+- (id)initWithLanguage:(NSString *)language
+      configDictionary:(NSDictionary *)configDictionary
+       configFileNames:(NSArray *)configFileNames
+              dataPath:(NSString *)dataPath
+            engineMode:(G8OCREngineMode)engineMode NS_DESIGNATED_INITIALIZER;
+
 /**
  *  Set a Tesseract variable. See G8TesseractParameters.h for the available
  *  options.

Products/TesseractOCR.framework/Versions/A/TesseractOCR

@@ -40,6 +40,12 @@
  */
 @property (nonatomic, copy) NSString* language;
 
+/**
+ * The path to the tessdata file, if it was specified in a call to initWithDataPath:language:(NSString engineMode:configFileNames:
+ * Otherwise it's supposed that the tessdata folder is located in the application bundle
+ */
+@property (nonatomic, readonly, copy) NSString *dataPath;
+
 /**
  *  The recognition mode to use. See `G8OCREngineMode` in G8Constants.h for the
  *  available recognition modes.
@@ -228,6 +234,29 @@
 - (id)initWithLanguage:(NSString*)language
             engineMode:(G8OCREngineMode)engineMode;
 
+/**
+ *  Initialize Tesseract with the provided language and engine mode.
+ *
+ *  @param language         The language to use in recognition. See `language`.
+ *  @param configDictionary A dictioanry of the config variables
+ *  @param configFileNames  An array of file names containing key-value config pairs. All the config
+ *                          variables can be init only and debug time both. Furthermore they could be 
+ *                          specified at the same time, in such case tesseract will get variables from 
+ *                          every file and dictionary all together.
+ *  @param dataPath         If the dataPath is specified, the whole content of the tessdata from the
+ *                          application bundle is copied to the Documents/dataPath/tessdata 
+ *                          and tesseract is initialized with that path.
+ *  @param engineMode       The engine mode to use in recognition. See `engineMode`.
+ *
+ *  @return The initialized Tesseract object, or `nil` if there was an error.
+ */
+
+- (id)initWithLanguage:(NSString *)language
+      configDictionary:(NSDictionary *)configDictionary
+       configFileNames:(NSArray *)configFileNames
+              dataPath:(NSString *)dataPath
+            engineMode:(G8OCREngineMode)engineMode NS_DESIGNATED_INITIALIZER;
+
 /**
  *  Set a Tesseract variable. See G8TesseractParameters.h for the available
  *  options.

TesseractOCR/G8Tesseract.h

@@ -19,6 +19,8 @@
 #import "pix.h"
 #import "ocrclass.h"
 #import "allheaders.h"
+#import "genericvector.h"
+#import "strngs.h"
 
 namespace tesseract {
     class TessBaseAPI;
@@ -30,6 +32,8 @@ @interface G8Tesseract () {
 }
 
 @property (nonatomic, copy) NSString *dataPath;
+@property (nonatomic, strong) NSDictionary *configDictionary;
+@property (nonatomic, strong) NSArray *configFileNames;
 @property (nonatomic, strong) NSMutableDictionary *variables;
 
 @property (readwrite, assign) CGSize imageSize;
@@ -67,22 +71,26 @@ - (id)init
 
 - (id)initWithLanguage:(NSString*)language
 {
-    return [self initPrivateWithDataPath:nil language:language engineMode:G8OCREngineModeTesseractOnly];
+    return [self initWithLanguage:language configDictionary:nil configFileNames:nil dataPath:nil engineMode:G8OCREngineModeTesseractOnly];
 }
 
 - (id)initWithLanguage:(NSString *)language engineMode:(G8OCREngineMode)engineMode
 {
-    return [self initPrivateWithDataPath:nil language:language engineMode:engineMode];
+    return [self initWithLanguage:language configDictionary:nil configFileNames:nil dataPath:nil engineMode:engineMode];
 }
 
-- (id)initPrivateWithDataPath:(NSString *)dataPath
-                     language:(NSString *)language
-                   engineMode:(G8OCREngineMode)engineMode
+- (id)initWithLanguage:(NSString *)language
+      configDictionary:(NSDictionary *)configDictionary
+       configFileNames:(NSArray *)configFileNames
+              dataPath:(NSString *)dataPath
+            engineMode:(G8OCREngineMode)engineMode
 {
     self = [super init];
     if (self != nil) {
         _dataPath = [dataPath copy];
         _language = [language copy];
+        _configDictionary = configDictionary;
+        _configFileNames = configFileNames;
         _engineMode = engineMode;
         _pageSegmentationMode = G8PageSegmentationModeSingleBlock;
         _variables = [NSMutableDictionary dictionary];
@@ -93,16 +101,25 @@ - (id)initPrivateWithDataPath:(NSString *)dataPath
         _monitor->cancel = (CANCEL_FUNC)[self methodForSelector:@selector(tesseractCancelCallbackFunction:)];
         _monitor->cancel_this = (__bridge void*)self;
 
-        if (dataPath != nil) {
-            [self copyDataToDocumentsDirectory];
+        if (self.dataPath != nil) {
+            // config Tesseract to search trainedData in tessdata folder of the Documents folder];
+            NSArray *documentPaths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
+            NSString *documentPath = documentPaths.firstObject;
+            assert(documentPath);
+            _dataPath = [documentPath stringByAppendingPathComponent:self.dataPath];
+
+            [self moveTessdataToDocumentsDirectoryIfNecessary];
         }
         else {
-            [self setUpTesseractToSearchTrainedDataInTrainedDataFolderOfTheApplicatinBundle];
+            // config Tesseract to search trainedData in tessdata folder of the application bundle];
+            _dataPath = [NSString stringWithFormat:@"%@/", [NSString stringWithString:[NSBundle bundleForClass:self.class].bundlePath]];
         }
+        
+        setenv("TESSDATA_PREFIX", [self.dataPath stringByAppendingString:@"/"].UTF8String, 1);
 
         _tesseract = new tesseract::TessBaseAPI();
 
-        BOOL success = [self initEngine];
+        BOOL success = [self configEngine];
         if (success == NO) {
             self = nil;
         }
@@ -125,17 +142,31 @@ - (void)dealloc
     }
 }
 
-- (void)setUpTesseractToSearchTrainedDataInTrainedDataFolderOfTheApplicatinBundle
+- (BOOL)configEngine
 {
-    NSString *datapath =
-        [NSString stringWithFormat:@"%@/", [NSString stringWithString:[[NSBundle mainBundle] bundlePath]]];
-    setenv("TESSDATA_PREFIX", datapath.UTF8String, 1);
-}
+    GenericVector<STRING> tessKeys;
+    for( NSString *key in self.configDictionary.allKeys ){
+        tessKeys.push_back(STRING(key.UTF8String));
+    }
 
-- (BOOL)initEngine
-{
+    GenericVector<STRING> tessValues;
+    for( NSString *val in self.configDictionary.allValues ){
+        tessValues.push_back(STRING(val.UTF8String));
+    }
+    
+    int count = (int)self.configFileNames.count;
+    const char **configs = (const char **)malloc(sizeof(int) * count);
+    for (int i = 0; i < count; i++) {
+        configs[i] = ((NSString*)self.configFileNames[i]).UTF8String;
+    }
     int returnCode = _tesseract->Init(self.dataPath.UTF8String, self.language.UTF8String,
-                                      (tesseract::OcrEngineMode)self.engineMode);
+                                      (tesseract::OcrEngineMode)self.engineMode,
+                                      (char **)configs, count,
+                                      &tessKeys, &tessValues,
+                                      false);
+    if (configs != nullptr) {
+        free(configs);
+    }
     return returnCode == 0;
 }
 
@@ -147,7 +178,7 @@ - (void)resetFlags
 
 - (BOOL)resetEngine
 {
-    BOOL isInitDone = [self initEngine];
+    BOOL isInitDone = [self configEngine];
     if (isInitDone) {
         [self loadVariables];
         [self resetFlags];
@@ -159,43 +190,60 @@ - (BOOL)resetEngine
     return isInitDone;
 }
 
-- (void)copyDataToDocumentsDirectory
+- (BOOL)moveTessdataToDocumentsDirectoryIfNecessary
 {
-    // Useful paths
     NSFileManager *fileManager = [NSFileManager defaultManager];
-    NSArray *documentPaths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
-    NSString *documentPath = documentPaths.firstObject;
-    NSString *dataPath = [documentPath stringByAppendingPathComponent:self.dataPath];
-
-    //	NSString *dataPath = [[NSBundle mainBundle] pathForResource:@"grc" ofType:@"traineddata"];
-    NSLog(@"DATAPATH %@", dataPath);
-
-    // Copy data in Doc Directory
-    if ([fileManager fileExistsAtPath:dataPath] == NO) {
-        [fileManager createDirectoryAtPath:dataPath withIntermediateDirectories:YES attributes:nil error:nil];
+    
+    // Useful paths
+    NSString *tessdataFolderName = @"tessdata";
+    NSString *tessdataPath = [[NSBundle bundleForClass:self.class].resourcePath stringByAppendingPathComponent:tessdataFolderName];
+    NSString *destinationPath = [self.dataPath stringByAppendingPathComponent:tessdataFolderName];
+    NSLog(@"Tesseract destination path: %@", destinationPath);
+    
+    if ([fileManager fileExistsAtPath:destinationPath] == NO) {
+        NSError *error = nil;
+        BOOL res = [fileManager createDirectoryAtPath:destinationPath withIntermediateDirectories:YES attributes:nil error:nil];
+        if (error != nil) {
+            NSLog(@"Error creating folder %@: %@", destinationPath, error);
+            return NO;
+        }
+        if (res == NO) {
+            NSLog(@"Error creating folder %@", destinationPath);
+            return NO;
+        }
     }
-
-    NSBundle *bundle = [NSBundle bundleForClass:[self class]];
-    for (NSString *languageName in [self.language componentsSeparatedByString:@"+"]) {
-        NSString *tessdataPath = [bundle pathForResource:languageName ofType:@"traineddata"];
-
-        if (tessdataPath != nil) {
-            NSString *destinationPath = [dataPath stringByAppendingPathComponent:tessdataPath.lastPathComponent];
-
-            if([fileManager fileExistsAtPath:destinationPath] == NO) {
-                NSError *error = nil;
-                NSLog(@"found %@", tessdataPath);
-                NSLog(@"coping in %@", destinationPath);
-                [fileManager copyItemAtPath:tessdataPath toPath:destinationPath error:&error];
-
-                if(error != nil) {
-                    NSLog(@"ERROR! %@", error.description);
-                }
+    
+    BOOL result = YES;
+    NSError *error = nil;
+    NSArray *files = [fileManager contentsOfDirectoryAtPath:tessdataPath error:&error];
+    if (error != nil) {
+        NSLog(@"ERROR! %@", error.description);
+        result = NO;
+    }
+    for (NSString *filename in files) {
+        
+        NSString *destinationFileName = [destinationPath stringByAppendingPathComponent:filename];
+        if (![fileManager fileExistsAtPath:destinationFileName]) {
+            
+            NSString *filePath = [tessdataPath stringByAppendingPathComponent:filename];
+            //NSLog(@"found %@", filePath);
+            //NSLog(@"symlink in %@", destinationFileName);
+            
+            BOOL res = [fileManager createSymbolicLinkAtPath:destinationFileName
+                                         withDestinationPath:filePath
+                                                       error:&error];
+            if (res == NO) {
+                NSLog(@"The result of createSymbolicLinkAtPath == NO");
+                result = NO;
+            }
+            if (error != nil) {
+                NSLog(@"Error creating symlink %@: %@", filePath, error);
+                result = NO;
             }
         }
     }
-
-    setenv("TESSDATA_PREFIX", [documentPath stringByAppendingString:@"/"].UTF8String, 1);
+    
+    return result;
 }
 
 - (void)setVariableValue:(NSString *)value forKey:(NSString *)key

TesseractOCR/G8Tesseract.mm

@@ -26,6 +26,7 @@
 		41C68DAF1A41825500848AE1 /* UIImage+G8Equal.m in Sources */ = {isa = PBXBuildFile; fileRef = 41C68DAE1A41825500848AE1 /* UIImage+G8Equal.m */; };
 		41C68DB31A41849100848AE1 /* image_sample.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 41C68DB21A41849100848AE1 /* image_sample.jpg */; };
 		41C68DB51A41854600848AE1 /* image_sample_tr.png in Resources */ = {isa = PBXBuildFile; fileRef = 41C68DB41A41854600848AE1 /* image_sample_tr.png */; };
+		732C54761A514DA6000322DA /* InitializationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 732C54751A514DA5000322DA /* InitializationTests.m */; };
 		8FA2F9CE23919BEC8C64A5EA /* libPods-TestsProjectTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CD3C116A45C293ADAC81D1B /* libPods-TestsProjectTests.a */; };
 /* End PBXBuildFile section */
 
@@ -70,6 +71,7 @@
 		41C68DB21A41849100848AE1 /* image_sample.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = image_sample.jpg; sourceTree = "<group>"; };
 		41C68DB41A41854600848AE1 /* image_sample_tr.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = image_sample_tr.png; sourceTree = "<group>"; };
 		5CD3C116A45C293ADAC81D1B /* libPods-TestsProjectTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-TestsProjectTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		732C54751A514DA5000322DA /* InitializationTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InitializationTests.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -144,6 +146,7 @@
 		4115B9771A3EF8E90004EC0A /* TestsProjectTests */ = {
 			isa = PBXGroup;
 			children = (
+				732C54751A514DA5000322DA /* InitializationTests.m */,
 				4115B97A1A3EF8E90004EC0A /* RecognitionTests.m */,
 				4115B9781A3EF8E90004EC0A /* Supporting Files */,
 			);
@@ -348,6 +351,7 @@
 			files = (
 				414121231A4C5A5700583ED4 /* G8RecognitionTestsHelper.m in Sources */,
 				4115B97B1A3EF8E90004EC0A /* RecognitionTests.m in Sources */,
+				732C54761A514DA6000322DA /* InitializationTests.m in Sources */,
 				41C68DAF1A41825500848AE1 /* UIImage+G8Equal.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;