diff --git a/Resources/Config/oolite-font.plist b/Resources/Config/oolite-font.plist
index 3f75edf4..b3dbb4aa 100644
--- a/Resources/Config/oolite-font.plist
+++ b/Resources/Config/oolite-font.plist
@@ -1,5 +1,16 @@
{
- encoding = 12; // NSWindowsCP1252StringEncoding, Windows Latin 1
+ /*
+ Currently, Oolite supports the following encodings for fonts:
+ windows-latin-1 (Windows code page 1252)
+ windows-latin-2 (Windows code page 1250)
+ windows-cyrillic (Windows code page 1251)
+ windows-greek (Windows code page 1253)
+ windows-turkish (Windows code page 1254)
+
+ OXPs with fonts in each encoding (using Helvetica) are available at:
+ http://svn.berlios.de/svnroot/repos/oolite-linux/trunk/tests/encodings/
+ */
+ encoding = "windows-latin-1";
texture = "oolite-font.png";
substitutions =
diff --git a/src/Core/OOEncodingConverter.h b/src/Core/OOEncodingConverter.h
index c3ccccaf..54c2a10f 100644
--- a/src/Core/OOEncodingConverter.h
+++ b/src/Core/OOEncodingConverter.h
@@ -49,6 +49,9 @@ SOFTWARE.
*/
+
+#ifndef OOENCODINGCONVERTER_EXCLUDE // For the convenience of fonttexgen
+
#import "OOCocoa.h"
@class OOCache;
@@ -67,3 +70,18 @@ SOFTWARE.
- (NSData *) convertString:(NSString *)string;
@end
+
+#endif OOENCODINGCONVERTER_EXCLUDE
+
+
+/*
+ There are a variety of overlapping naming schemes for text encoding.
+ We ignore them and use a fixed list:
+ "windows-latin-1" NSWindowsCP1252StringEncoding
+ "windows-latin-2" NSWindowsCP1250StringEncoding
+ "windows-cyrillic" NSWindowsCP1251StringEncoding
+ "windows-greek" NSWindowsCP1253StringEncoding
+ "windows-turkish" NSWindowsCP1254StringEncoding
+*/
+NSString *StringFromEncoding(NSStringEncoding encoding); // Returns nil for unknown
+NSStringEncoding EncodingFromString(NSString *name); // Returns (NSStringEncoding)NSNotFound for unknown
diff --git a/src/Core/OOEncodingConverter.m b/src/Core/OOEncodingConverter.m
index ba879222..22d41495 100644
--- a/src/Core/OOEncodingConverter.m
+++ b/src/Core/OOEncodingConverter.m
@@ -46,6 +46,8 @@ SOFTWARE.
*/
+#ifndef OOENCODINGCONVERTER_EXCLUDE
+
#import "OOEncodingConverter.h"
#import "OOCache.h"
#import "OOCollectionExtractors.h"
@@ -112,7 +114,7 @@ static unsigned sCacheMisses = 0;
- (id) initWithFontPList:(NSDictionary *)fontPList
{
- return [self initWithEncoding:[fontPList unsignedIntForKey:@"encoding"] substitutions:[fontPList dictionaryForKey:@"substitutions"]];
+ return [self initWithEncoding:EncodingFromString([fontPList stringForKey:@"encoding"]) substitutions:[fontPList dictionaryForKey:@"substitutions"]];
}
@@ -211,3 +213,58 @@ static unsigned sCacheMisses = 0;
#endif
@end
+
+#endif OOENCODINGCONVERTER_EXCLUDE
+
+
+/*
+ There are a variety of overlapping naming schemes for text encoding.
+ We ignore them and use a fixed list:
+ "windows-latin-1" NSWindowsCP1252StringEncoding
+ "windows-latin-2" NSWindowsCP1250StringEncoding
+ "windows-cyrillic" NSWindowsCP1251StringEncoding
+ "windows-greek" NSWindowsCP1253StringEncoding
+ "windows-turkish" NSWindowsCP1254StringEncoding
+*/
+
+#define kWindowsLatin1Str @"windows-latin-1"
+#define kWindowsLatin2Str @"windows-latin-2"
+#define kWindowsCyrillicStr @"windows-cyrillic"
+#define kWindowsGreekStr @"windows-greek"
+#define kWindowsTurkishStr @"windows-turkish"
+
+
+NSString *StringFromEncoding(NSStringEncoding encoding)
+{
+ switch (encoding)
+ {
+ case NSWindowsCP1252StringEncoding:
+ return kWindowsLatin1Str;
+
+ case NSWindowsCP1250StringEncoding:
+ return kWindowsLatin2Str;
+
+ case NSWindowsCP1251StringEncoding:
+ return kWindowsCyrillicStr;
+
+ case NSWindowsCP1253StringEncoding:
+ return kWindowsGreekStr;
+
+ case NSWindowsCP1254StringEncoding:
+ return kWindowsTurkishStr;
+
+ default:
+ return nil;
+ }
+}
+
+
+NSStringEncoding EncodingFromString(NSString *name)
+{
+ if ([name isEqualToString:kWindowsLatin1Str]) return NSWindowsCP1252StringEncoding;
+ if ([name isEqualToString:kWindowsLatin2Str]) return NSWindowsCP1250StringEncoding;
+ if ([name isEqualToString:kWindowsCyrillicStr]) return NSWindowsCP1251StringEncoding;
+ if ([name isEqualToString:kWindowsGreekStr]) return NSWindowsCP1253StringEncoding;
+ if ([name isEqualToString:kWindowsTurkishStr]) return NSWindowsCP1254StringEncoding;
+ return (NSStringEncoding)NSNotFound;
+}
diff --git a/src/Core/OOWeakReference.m b/src/Core/OOWeakReference.m
index d223c0bc..10749289 100644
--- a/src/Core/OOWeakReference.m
+++ b/src/Core/OOWeakReference.m
@@ -96,8 +96,8 @@ This code is hereby placed in the public domain.
if (__builtin_expect(
selector != @selector(weakRefDrop) &&
- selector != @selector(weakRefObjectStillExists)
- && selector != @selector(weakRefUnderlyingObject), 1))
+ selector != @selector(weakRefObjectStillExists) &&
+ selector != @selector(weakRefUnderlyingObject), 1))
{
// Not a proxy method; get signature from _object if it exists, otherwise generic signature for nil calls.
if (__builtin_expect(_object != nil, 1)) result = [(id)_object methodSignatureForSelector:selector];
diff --git a/tools/fonttexgen/English.lproj/MainMenu.nib/designable.nib b/tools/fonttexgen/English.lproj/MainMenu.nib/designable.nib
index 0ee24f52..5a77c07e 100644
--- a/tools/fonttexgen/English.lproj/MainMenu.nib/designable.nib
+++ b/tools/fonttexgen/English.lproj/MainMenu.nib/designable.nib
@@ -9,12 +9,11 @@
@@ -602,182 +470,35 @@
-
-
-
-
_NSMainMenu
-
-
+
+
+
+
+
+
+
+
+
+
@@ -2581,7 +2020,7 @@ aW4gdGhlIEFwcGVhcmFuY2UKc3lzdGVtIHByZWZlcmVuY2VzIHBhbmUuA
- 419
+ 432