Update so that the directories are not hard coded and can be overridden by defaults

Author: gcasa

Source/fontconfig/FCFontAssetInstaller.m

@@ -229,17 +229,68 @@ - (BOOL) installFontError: (NSError **)error
   return YES;
 }
 
-- (NSString *) systemFontsDirectory
+- (NSString *) userFontsDirectory
 {
-  return @"/usr/local/share/fonts";
+  NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+  NSString *fontsPath = [defaults stringForKey: @"GSUserFontsDirectory"];
+  NSString *homeDir = NSHomeDirectory();
+
+  // If the default isn't set, discover it...
+  if (fontsPath == nil)
+    {
+      NSProcessInfo *procInfo = [NSProcessInfo processInfo];
+      NSString *osName = [procInfo operatingSystemName];
+
+      if ([osName isEqualToString: @"NSWindowsNTOperatingSystem"]
+	  || [osName isEqualToString: @"NSWindows95OperatingSystem"])
+	{
+	  NSString *winDir = [NSString stringWithUTF8String: getenv("USERPROFILE")];
+	  fontsPath = [winDir stringByAppendingPathComponent: @"Fonts"];
+	}
+      else if ([osName isEqualToString: @"NSMACHOperatingSystem"])
+	{
+	  fontsPath = [homeDir stringByAppendingPathComponent: @"Library"];
+	  fontsPath = [fontsPath stringByAppendingPathComponent: @"Fonts"];
+	}
+      else // Assume linux/unix
+	{
+	  fontsPath = [homeDir stringByAppendingPathComponent: @".fonts"];
+	}
+    }
+  
+  return fontsPath;
+
 }
 
-- (NSString *) userFontsDirectory
+- (NSString *) systemFontsDirectory
 {
-  NSString *homeDir = NSHomeDirectory();
+  NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+  NSString *fontsPath = [defaults stringForKey: @"GSSystemFontsDirectory"];
+
+  // If the default isn't set, discover it...
+  if (fontsPath == nil)
+    {
+      NSProcessInfo *procInfo = [NSProcessInfo processInfo];
+      NSString *osName = [procInfo operatingSystemName];
+
+      if ([osName isEqualToString: @"NSWindowsNTOperatingSystem"]
+	  || [osName isEqualToString: @"NSWindows95OperatingSystem"])
+	{
+	  NSString *winDir = [NSString stringWithUTF8String: getenv("WINDIR")];
+	  fontsPath = [winDir stringByAppendingPathComponent: @"Fonts"];
+	}
+      else if ([osName isEqualToString: @"NSMACHOperatingSystem"])
+	{
+	  fontsPath = @"/Library/Fonts";
+	}
+      else // Assume linux/unix
+	{
+	  fontsPath = @"/usr/local/share/fonts";
+	}
+    }
+  
+  return fontsPath;
 
-  // Generic Unix/other systems
-  return [homeDir stringByAppendingPathComponent: @".fonts"];
 }
 
 @end