diff --git a/Application/LiteratorView.swift b/Application/LiteratorView.swift index 221438d..1410ef7 100644 --- a/Application/LiteratorView.swift +++ b/Application/LiteratorView.swift @@ -87,14 +87,16 @@ class LiteratorModel: ObservableObject { return self.ante!.anteliterate(lit.finalaizedOutput + lit.unfinalaizedOutput) } case (0, 1): - self.trans = try! self.factory.transliterator(schemeName: self.fromScheme, scriptName: self.toScript) + let override: [String: MappingValue]? = MappingStore.read(schemeName: self.fromScheme, scriptName: self.toScript) + self.trans = try! self.factory.transliterator(schemeName: self.fromScheme, scriptName: self.toScript, mappings: override) eval = { (input: String) -> String in _ = self.trans!.reset() let lit = self.trans!.transliterate(input) return lit.finalaizedOutput + lit.unfinalaizedOutput } case (1, 0): - self.ante = try! self.factory.anteliterator(schemeName: self.toScheme, scriptName: self.fromScript) + let override: [String: MappingValue]? = MappingStore.read(schemeName: self.toScheme, scriptName: self.fromScript) + self.ante = try! self.factory.anteliterator(schemeName: self.toScheme, scriptName: self.fromScript, mappings: override) eval = { (input: String) -> String in return self.ante!.anteliterate(input) } diff --git a/Installation/LipikaIME.pkgproj b/Installation/LipikaIME.pkgproj index 389a9d7..3f008ca 100644 --- a/Installation/LipikaIME.pkgproj +++ b/Installation/LipikaIME.pkgproj @@ -464,16 +464,16 @@ POSTINSTALL_PATH PATH - /Users/ratreya/workplace/lipika-ime/Installation/Scripts/postinstall + Scripts/postinstall PATH_TYPE - 0 + 1 PREINSTALL_PATH PATH - /Users/ratreya/workplace/lipika-ime/Installation/Scripts/preinstall + Scripts/preinstall PATH_TYPE - 0 + 1 RESOURCES diff --git a/LipikaIME.xcodeproj/project.pbxproj b/LipikaIME.xcodeproj/project.pbxproj index 31189ce..3af9e47 100644 --- a/LipikaIME.xcodeproj/project.pbxproj +++ b/LipikaIME.xcodeproj/project.pbxproj @@ -332,7 +332,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0940; - LastUpgradeCheck = 1140; + LastUpgradeCheck = 1250; ORGANIZATIONNAME = Daivajnanam; TargetAttributes = { A5122A4620D429D300575848 = { @@ -405,14 +405,14 @@ /* Begin PBXShellScriptBuildPhase section */ A5122A5520D43EE200575848 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; - buildActionMask = 12; + buildActionMask = 8; files = ( ); inputPaths = ( ); outputPaths = ( ); - runOnlyForDeploymentPostprocessing = 0; + runOnlyForDeploymentPostprocessing = 1; shellPath = /bin/sh; shellScript = "set -ex\n${TARGET_BUILD_DIR}/Installer --remove\nif ! killall LipikaIME; then\n echo \"note: no LipikaIME process to kill\"\nfi\nrm -rf /Library/Input\\ Methods/LipikaIME.app\ncp -r ${TARGET_BUILD_DIR}/LipikaIME.app /Library/Input\\ Methods/\nopen /Library/Input\\ Methods/LipikaIME.app\n${TARGET_BUILD_DIR}/Installer --enable\n"; }; @@ -538,6 +538,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -603,6 +604,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES;