Merging the UTF8 patch, consisting of O'ksi'd s original 1.1.6 patch and additions by Ian. PLEASE BE AWARE that the patch in its current incarnation is a regression in many aspects and further work is required before we can announce Unicode support.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6212 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

77 files changed, 674 insertions, 272 deletions

diff --git a/ide/XCode3/plists/colbrowser-Info.plist b/ide/XCode3/plists/colbrowser-Info.plist
deleted file mode 100644
index 92af6c267..000000000
--- a/ide/XCode3/plists/colbrowser-Info.plist
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>${EXECUTABLE_NAME}</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.yourcompany.colbrowser</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1.0</string>
-</dict>
-</plist>
diff --git a/ide/XCode3/plists/curve-Info.plist b/ide/XCode3/plists/curve-Info.plist
deleted file mode 100644
index 3acc3c49b..000000000
--- a/ide/XCode3/plists/curve-Info.plist
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>${EXECUTABLE_NAME}</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.yourcompany.curve</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1.0</string>
-</dict>
-</plist>
diff --git a/ide/XCode3/FLTK.xcodeproj/project.pbxproj b/ide/Xcode3.1/FLTK.xcodeproj/project.pbxproj
index a05207eda..5564c6011 100644
--- a/ide/XCode3/FLTK.xcodeproj/project.pbxproj
+++ b/ide/Xcode3.1/FLTK.xcodeproj/project.pbxproj
@@ -140,13 +140,16 @@
 		C918E1D30DDA132A00167E99 /* fltk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
 		C918E1DB0DDA133400167E99 /* valuators.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C918E1DA0DDA133400167E99 /* valuators.cxx */; };
 		C93F25300DDA257B0017EE72 /* fluid.icns in Resources */ = {isa = PBXBuildFile; fileRef = C93F252F0DDA257B0017EE72 /* fluid.icns */; };
+		C94A763B0E76CF6700AAA38E /* fl_utf.c in Sources */ = {isa = PBXBuildFile; fileRef = C94A76390E76CF5B00AAA38E /* fl_utf.c */; };
+		C94A763C0E76CF6700AAA38E /* fl_utf8.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C94A763A0E76CF6200AAA38E /* fl_utf8.cxx */; };
+		C94A76BD0E76D52C00AAA38E /* demo.menu in CopyFiles */ = {isa = PBXBuildFile; fileRef = C977420D0DD9D36C0047C1BF /* demo.menu */; };
+		C94A76D60E77F59E00AAA38E /* fltk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
+		C94A76E50E77F66D00AAA38E /* utf8.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C94A76E40E77F66200AAA38E /* utf8.cxx */; };
 		C969E9A00DDAE446003BCABC /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
 		C97741930DD9D1BD0047C1BF /* cursor.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C97741920DD9D1BD0047C1BF /* cursor.cxx */; };
 		C977419A0DD9D1C90047C1BF /* fltk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
-		C97741E80DD9D2ED0047C1BF /* curve.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C97741E70DD9D2ED0047C1BF /* curve.cxx */; };
 		C97741F00DD9D3240047C1BF /* fltk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
 		C977420B0DD9D3570047C1BF /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
-		C977420F0DD9D36C0047C1BF /* demo.menu in Resources */ = {isa = PBXBuildFile; fileRef = C977420D0DD9D36C0047C1BF /* demo.menu */; };
 		C97742100DD9D36C0047C1BF /* demo.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C977420E0DD9D36C0047C1BF /* demo.cxx */; };
 		C97742680DD9D8280047C1BF /* doublebuffer.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C97742670DD9D8280047C1BF /* doublebuffer.cxx */; };
 		C97742720DD9DD3E0047C1BF /* fltk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
@@ -158,6 +161,11 @@
 		C99CF59E0DD8CB370094BD10 /* fltk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
 		C99CF59F0DD8CB3C0094BD10 /* fltk_gl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9A3EC830DD639A200486E4F /* fltk_gl.framework */; };
 		C99CF5A50DD8CB5E0094BD10 /* CubeViewUI.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C99CF5A40DD8CB5E0094BD10 /* CubeViewUI.cxx */; };
+		C99E1E9B0E78620B00AECCF6 /* case.c in Sources */ = {isa = PBXBuildFile; fileRef = C99E1E980E7861E600AECCF6 /* case.c */; };
+		C99E1E9C0E78620B00AECCF6 /* is_right2left.c in Sources */ = {isa = PBXBuildFile; fileRef = C99E1E990E7861EF00AECCF6 /* is_right2left.c */; };
+		C99E1E9D0E78620B00AECCF6 /* is_spacing.c in Sources */ = {isa = PBXBuildFile; fileRef = C99E1E9A0E7861F400AECCF6 /* is_spacing.c */; };
+		C99E1EBA0E7862A000AECCF6 /* fltk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
+		C99E1EBC0E7862DA00AECCF6 /* curve.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C97741E70DD9D2ED0047C1BF /* curve.cxx */; };
 		C9A3E9660DD633F100486E4F /* hello.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C9A3E9650DD633F100486E4F /* hello.cxx */; };
 		C9A3EB8C0DD634CC00486E4F /* Fl_get_system_colors.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C9A3EAD60DD634CC00486E4F /* Fl_get_system_colors.cxx */; };
 		C9A3EB8F0DD634CC00486E4F /* Fl_get_key.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C9A3EAD90DD634CC00486E4F /* Fl_get_key.cxx */; };
@@ -297,7 +305,6 @@
 		C9A3ECAB0DD63A9E00486E4F /* adjuster.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C9A3ECAA0DD63A9E00486E4F /* adjuster.cxx */; };
 		C9A3ECB20DD63AE300486E4F /* fltk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
 		C9A3ED0A0DD63CC900486E4F /* arc.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C9A3ED090DD63CC900486E4F /* arc.cxx */; };
-		C9A3ED0C0DD63CE000486E4F /* fltk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
 		C9A3ED220DD63D4C00486E4F /* ask.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C9A3ED210DD63D4C00486E4F /* ask.cxx */; };
 		C9A3ED240DD63D5700486E4F /* fltk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
 		C9A3ED3B0DD63D9E00486E4F /* bitmap.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C9A3ED3A0DD63D9E00486E4F /* bitmap.cxx */; };
@@ -306,7 +313,7 @@
 		C9A3ED570DD63DFA00486E4F /* fltk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
 		C9A3ED5C0DD63E4C00486E4F /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9A3ED5B0DD63E4C00486E4F /* CoreAudio.framework */; };
 		C9A3ED750DD63E9B00486E4F /* boxtype.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C9A3ED740DD63E9B00486E4F /* boxtype.cxx */; };
-		C9A3ED770DD63EAB00486E4F /* fltk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
+		C9A3ED770DD63EAB00486E4F /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
 		C9A3ED900DD63EFF00486E4F /* browser.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C9A3ED8F0DD63EFF00486E4F /* browser.cxx */; };
 		C9A3ED920DD63F0D00486E4F /* fltk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
 		C9A3EDB70DD6459800486E4F /* button.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C9A3EDB60DD6459800486E4F /* button.cxx */; };
@@ -317,8 +324,6 @@
 		C9A3EDE80DD6462E00486E4F /* fltk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
 		C9A3EE010DD6469C00486E4F /* clock.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C9A3EE000DD6469C00486E4F /* clock.cxx */; };
 		C9A3EE030DD646B000486E4F /* fltk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
-		C9A3EE190DD646F100486E4F /* colbrowser.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C9A3EE180DD646F100486E4F /* colbrowser.cxx */; };
-		C9A3EE1B0DD646FA00486E4F /* fltk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
 		C9A3EE240DD6481A00486E4F /* forms_bitmap.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C9A3EB510DD634CC00486E4F /* forms_bitmap.cxx */; };
 		C9A3EE250DD6481B00486E4F /* forms_compatability.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C9A3EB500DD634CC00486E4F /* forms_compatability.cxx */; };
 		C9A3EE260DD6481C00486E4F /* forms_free.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C9A3EB4B0DD634CC00486E4F /* forms_free.cxx */; };
@@ -446,6 +451,37 @@
 		C9DD58190DD784C700A896B4 /* fltk_jpeg.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9A3EC9A0DD639E600486E4F /* fltk_jpeg.framework */; };
 		C9DD581A0DD784C700A896B4 /* fltk_png.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9A3EC8E0DD639CE00486E4F /* fltk_png.framework */; };
 		C9DD58310DD7885D00A896B4 /* fltk_forms.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9A3EC6E0DD6397400486E4F /* fltk_forms.framework */; };
+		C9EAC2E80E786767004F64F7 /* colbrowser.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C9A3EE180DD646F100486E4F /* colbrowser.cxx */; };
+		C9EAC2ED0E78678D004F64F7 /* fltk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
+		C9EAC2FB0E7867B6004F64F7 /* fltk_forms.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9A3EC6E0DD6397400486E4F /* fltk_forms.framework */; };
+		C9EAC4040E7871B1004F64F7 /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
+		C9EAC40C0E787220004F64F7 /* fltk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
+		C9EAC42F0E787418004F64F7 /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
+		C9EAC43F0E787520004F64F7 /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
+		C9EAC4430E787544004F64F7 /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
+		C9EAC44E0E7875C4004F64F7 /* fltk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
+		C9EAC4540E7875F2004F64F7 /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
+		C9EAC4590E78760B004F64F7 /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
+		C9EAC45C0E78761C004F64F7 /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
+		C9EAC4600E787632004F64F7 /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
+		C9EAC4650E787645004F64F7 /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
+		C9EAC4730E787661004F64F7 /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
+		C9EAC4740E787661004F64F7 /* fltk_forms.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3EC6E0DD6397400486E4F /* fltk_forms.framework */; };
+		C9EAC47A0E787682004F64F7 /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
+		C9EAC4810E78769C004F64F7 /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
+		C9EAC4820E78769C004F64F7 /* fltk_gl.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3EC830DD639A200486E4F /* fltk_gl.framework */; };
+		C9EAC4880E7876AE004F64F7 /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
+		C9EAC4890E7876AE004F64F7 /* fltk_gl.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3EC830DD639A200486E4F /* fltk_gl.framework */; };
+		C9EAC4930E7876CA004F64F7 /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
+		C9EAC4950E7876E0004F64F7 /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
+		C9EAC49A0E787775004F64F7 /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
+		C9EAC49E0E7877A3004F64F7 /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
+		C9EAC4A30E7877EA004F64F7 /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
+		C9EAC4AF0E787804004F64F7 /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
+		C9EAC4B00E787804004F64F7 /* fltk_png.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3EC8E0DD639CE00486E4F /* fltk_png.framework */; };
+		C9EAC4B10E787804004F64F7 /* fltk_images.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3EC790DD6398C00486E4F /* fltk_images.framework */; };
+		C9EAC4B20E787804004F64F7 /* fltk_jpeg.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3EC9A0DD639E600486E4F /* fltk_jpeg.framework */; };
+		C9EAC4BC0E78795E004F64F7 /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
 		C9FB9AAE0DE34BD200026BB1 /* fltk_forms.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3EC6E0DD6397400486E4F /* fltk_forms.framework */; };
 		C9FB9AB50DE34C4A00026BB1 /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
 		C9FB9AB60DE34C4A00026BB1 /* fltk_forms.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3EC6E0DD6397400486E4F /* fltk_forms.framework */; };
@@ -623,13 +659,6 @@
 			remoteGlobalIDString = C9A3E9500DD6336500486E4F;
 			remoteInfo = fltk;
 		};
-		C918DB980DD9EFED00167E99 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = C9A3E93C0DD6332D00486E4F /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = C9A3ECA20DD63A5200486E4F;
-			remoteInfo = adjuster;
-		};
 		C918DBA50DD9F00700167E99 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = C9A3E93C0DD6332D00486E4F /* Project object */;
@@ -1428,14 +1457,14 @@
 			remoteGlobalIDString = C918E1BD0DDA12CF00167E99;
 			remoteInfo = valuators;
 		};
-		C97742130DD9D38A0047C1BF /* PBXContainerItemProxy */ = {
+		C94A76D10E77F59E00AAA38E /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = C9A3E93C0DD6332D00486E4F /* Project object */;
 			proxyType = 1;
 			remoteGlobalIDString = C9A3E9500DD6336500486E4F;
 			remoteInfo = fltk;
 		};
-		C97742150DD9D3990047C1BF /* PBXContainerItemProxy */ = {
+		C97742130DD9D38A0047C1BF /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = C9A3E93C0DD6332D00486E4F /* Project object */;
 			proxyType = 1;
@@ -1561,13 +1590,6 @@
 			remoteGlobalIDString = C9A3EDF80DD6467E00486E4F;
 			remoteInfo = clock;
 		};
-		C977423E0DD9D3BA0047C1BF /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = C9A3E93C0DD6332D00486E4F /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = C9A3EE100DD646DA00486E4F;
-			remoteInfo = colbrowser;
-		};
 		C97742400DD9D3BA0047C1BF /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = C9A3E93C0DD6332D00486E4F /* Project object */;
@@ -1596,13 +1618,6 @@
 			remoteGlobalIDString = C97741840DD9D1910047C1BF;
 			remoteInfo = cursor;
 		};
-		C97742480DD9D3BA0047C1BF /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = C9A3E93C0DD6332D00486E4F /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = C97741DB0DD9D2D80047C1BF;
-			remoteInfo = curve;
-		};
 		C97742690DD9D8470047C1BF /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = C9A3E93C0DD6332D00486E4F /* Project object */;
@@ -1638,20 +1653,6 @@
 			remoteGlobalIDString = C9A3E9500DD6336500486E4F;
 			remoteInfo = fltk;
 		};
-		C9A3EE670DD64A6300486E4F /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = C9A3E93C0DD6332D00486E4F /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = C9A3E9500DD6336500486E4F;
-			remoteInfo = fltk;
-		};
-		C9A3EE690DD64A6A00486E4F /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = C9A3E93C0DD6332D00486E4F /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = C9A3EC6D0DD6397400486E4F;
-			remoteInfo = fltk_forms;
-		};
 		C9C870D50DD772AA00A9793F /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = C9A3E93C0DD6332D00486E4F /* Project object */;
@@ -1820,9 +1821,47 @@
 			remoteGlobalIDString = C9A3EC990DD639E600486E4F;
 			remoteInfo = fltk_jpeg;
 		};
+		C9EAC2EB0E786785004F64F7 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = C9A3E93C0DD6332D00486E4F /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = C9A3E9500DD6336500486E4F /* fltk */;
+			remoteInfo = fltk;
+		};
+		C9EAC2FE0E7867C9004F64F7 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = C9A3E93C0DD6332D00486E4F /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = C9A3E9500DD6336500486E4F /* fltk */;
+			remoteInfo = fltk;
+		};
+		C9EAC3000E7867C9004F64F7 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = C9A3E93C0DD6332D00486E4F /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = C9A3EC6D0DD6397400486E4F /* fltk_forms */;
+			remoteInfo = fltk_forms;
+		};
+		C9EAC41E0E78730F004F64F7 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = C9A3E93C0DD6332D00486E4F /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = C94A76CF0E77F59E00AAA38E /* utf8 */;
+			remoteInfo = utf8;
+		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
+		C94A76BC0E76D4A800AAA38E /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 7;
+			files = (
+				C94A76BD0E76D52C00AAA38E /* demo.menu in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		C9E8C6490DDAE3E200F5B0CF /* CopyFiles */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
@@ -1833,6 +1872,222 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		C9EAC3FF0E78718C004F64F7 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				C9EAC4040E7871B1004F64F7 /* fltk.framework in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		C9EAC4280E7873ED004F64F7 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				C9EAC42F0E787418004F64F7 /* fltk.framework in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		C9EAC43D0E7874C3004F64F7 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				C9EAC43F0E787520004F64F7 /* fltk.framework in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		C9EAC4470E78755C004F64F7 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				C9EAC4430E787544004F64F7 /* fltk.framework in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		C9EAC44D0E7875B5004F64F7 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				C9A3ED770DD63EAB00486E4F /* fltk.framework in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		C9EAC46B0E78765E004F64F7 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				C9EAC4540E7875F2004F64F7 /* fltk.framework in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		C9EAC46C0E78765E004F64F7 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				C9EAC4590E78760B004F64F7 /* fltk.framework in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		C9EAC46D0E78765E004F64F7 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				C9EAC45C0E78761C004F64F7 /* fltk.framework in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		C9EAC46E0E78765E004F64F7 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				C9EAC4600E787632004F64F7 /* fltk.framework in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		C9EAC46F0E78765E004F64F7 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				C9EAC4650E787645004F64F7 /* fltk.framework in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		C9EAC4700E78765E004F64F7 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				C9EAC4730E787661004F64F7 /* fltk.framework in CopyFiles */,
+				C9EAC4740E787661004F64F7 /* fltk_forms.framework in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		C9EAC47F0E787699004F64F7 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				C9EAC47A0E787682004F64F7 /* fltk.framework in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		C9EAC4800E787699004F64F7 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				C9EAC4810E78769C004F64F7 /* fltk.framework in CopyFiles */,
+				C9EAC4820E78769C004F64F7 /* fltk_gl.framework in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		C9EAC4900E7876C2004F64F7 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				C9EAC4880E7876AE004F64F7 /* fltk.framework in CopyFiles */,
+				C9EAC4890E7876AE004F64F7 /* fltk_gl.framework in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		C9EAC4910E7876C2004F64F7 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				C9EAC4930E7876CA004F64F7 /* fltk.framework in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		C9EAC4980E7876FB004F64F7 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				C9EAC4950E7876E0004F64F7 /* fltk.framework in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		C9EAC49C0E787777004F64F7 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				C9EAC49A0E787775004F64F7 /* fltk.framework in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		C9EAC4A10E7877A7004F64F7 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				C9EAC49E0E7877A3004F64F7 /* fltk.framework in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		C9EAC4AA0E7877FC004F64F7 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				C9EAC4A30E7877EA004F64F7 /* fltk.framework in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		C9EAC4AB0E7877FC004F64F7 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				C9EAC4AF0E787804004F64F7 /* fltk.framework in CopyFiles */,
+				C9EAC4B00E787804004F64F7 /* fltk_png.framework in CopyFiles */,
+				C9EAC4B10E787804004F64F7 /* fltk_images.framework in CopyFiles */,
+				C9EAC4B20E787804004F64F7 /* fltk_jpeg.framework in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		C9EAC4B90E787926004F64F7 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				C9EAC4BC0E78795E004F64F7 /* fltk.framework in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		C9FB9A980DE34AB200026BB1 /* CopyFiles */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
@@ -2003,10 +2258,14 @@
 		C918E1CB0DDA132100167E99 /* valuators.fl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = valuators.fl; path = ../../test/valuators.fl; sourceTree = SOURCE_ROOT; };
 		C918E1DA0DDA133400167E99 /* valuators.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = valuators.cxx; path = ../../test/valuators.cxx; sourceTree = SOURCE_ROOT; };
 		C93F252F0DDA257B0017EE72 /* fluid.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = fluid.icns; path = icons/fluid.icns; sourceTree = "<group>"; };
+		C94A76390E76CF5B00AAA38E /* fl_utf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = fl_utf.c; path = ../../src/fl_utf.c; sourceTree = SOURCE_ROOT; };
+		C94A763A0E76CF6200AAA38E /* fl_utf8.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = fl_utf8.cxx; path = ../../src/fl_utf8.cxx; sourceTree = SOURCE_ROOT; };
+		C94A76DA0E77F59F00AAA38E /* utf8.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = utf8.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		C94A76DD0E77F5A800AAA38E /* symbols-Info copy.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "symbols-Info copy.plist"; path = "plists/symbols-Info copy.plist"; sourceTree = "<group>"; };
+		C94A76E40E77F66200AAA38E /* utf8.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = utf8.cxx; path = ../../test/utf8.cxx; sourceTree = SOURCE_ROOT; };
 		C97741850DD9D1910047C1BF /* cursor.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = cursor.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		C97741870DD9D1910047C1BF /* cursor-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "cursor-Info.plist"; path = "plists/cursor-Info.plist"; sourceTree = "<group>"; };
 		C97741920DD9D1BD0047C1BF /* cursor.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = cursor.cxx; path = ../../test/cursor.cxx; sourceTree = SOURCE_ROOT; };
-		C97741DC0DD9D2D80047C1BF /* curve.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = curve.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		C97741DE0DD9D2D80047C1BF /* curve-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "curve-Info.plist"; path = "plists/curve-Info.plist"; sourceTree = "<group>"; };
 		C97741E70DD9D2ED0047C1BF /* curve.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = curve.cxx; path = ../../test/curve.cxx; sourceTree = SOURCE_ROOT; };
 		C97741FF0DD9D33B0047C1BF /* Demo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Demo.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -2022,6 +2281,10 @@
 		C99CF52D0DD78BD50094BD10 /* CubeViewUI.fl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CubeViewUI.fl; path = ../../test/CubeViewUI.fl; sourceTree = SOURCE_ROOT; };
 		C99CF5430DD78E690094BD10 /* CubeView.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CubeView.cxx; path = ../../test/CubeView.cxx; sourceTree = SOURCE_ROOT; };
 		C99CF5A40DD8CB5E0094BD10 /* CubeViewUI.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CubeViewUI.cxx; path = ../../test/CubeViewUI.cxx; sourceTree = SOURCE_ROOT; };
+		C99E1E980E7861E600AECCF6 /* case.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = case.c; path = ../../src/xutf8/case.c; sourceTree = SOURCE_ROOT; };
+		C99E1E990E7861EF00AECCF6 /* is_right2left.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = is_right2left.c; path = ../../src/xutf8/is_right2left.c; sourceTree = SOURCE_ROOT; };
+		C99E1E9A0E7861F400AECCF6 /* is_spacing.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = is_spacing.c; path = ../../src/xutf8/is_spacing.c; sourceTree = SOURCE_ROOT; };
+		C99E1EAE0E78628600AECCF6 /* curve.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = curve.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		C9A3E9510DD6336500486E4F /* fltk.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = fltk.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		C9A3E9530DD6336500486E4F /* fltk-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "fltk-Info.plist"; path = "plists/fltk-Info.plist"; sourceTree = "<group>"; };
 		C9A3E95F0DD633C300486E4F /* hello.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = hello.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -2253,7 +2516,6 @@
 		C9A3EDF90DD6467E00486E4F /* clock.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = clock.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		C9A3EDFB0DD6467E00486E4F /* clock-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "clock-Info.plist"; path = "plists/clock-Info.plist"; sourceTree = "<group>"; };
 		C9A3EE000DD6469C00486E4F /* clock.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = clock.cxx; path = ../../test/clock.cxx; sourceTree = SOURCE_ROOT; };
-		C9A3EE110DD646DA00486E4F /* colbrowser.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = colbrowser.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		C9A3EE130DD646DA00486E4F /* colbrowser-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "colbrowser-Info.plist"; path = "plists/colbrowser-Info.plist"; sourceTree = "<group>"; };
 		C9A3EE180DD646F100486E4F /* colbrowser.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = colbrowser.cxx; path = ../../test/colbrowser.cxx; sourceTree = SOURCE_ROOT; };
 		C9A3EE780DD64AE700486E4F /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
@@ -2350,6 +2612,7 @@
 		C9DD57E70DD7828E00A896B4 /* pngpread.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pngpread.c; path = ../../png/pngpread.c; sourceTree = SOURCE_ROOT; };
 		C9DD57E80DD7828E00A896B4 /* pngrtran.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pngrtran.c; path = ../../png/pngrtran.c; sourceTree = SOURCE_ROOT; };
 		C9DD58070DD783F500A896B4 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = /usr/lib/libz.dylib; sourceTree = "<absolute>"; };
+		C9EAC2DC0E786725004F64F7 /* colbrowser.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = colbrowser.app; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -2731,19 +2994,19 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		C97741830DD9D1910047C1BF /* Frameworks */ = {
+		C94A76D50E77F59E00AAA38E /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				C977419A0DD9D1C90047C1BF /* fltk.framework in Frameworks */,
+				C94A76D60E77F59E00AAA38E /* fltk.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		C97741DA0DD9D2D80047C1BF /* Frameworks */ = {
+		C97741830DD9D1910047C1BF /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				C97741F00DD9D3240047C1BF /* fltk.framework in Frameworks */,
+				C977419A0DD9D1C90047C1BF /* fltk.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2775,6 +3038,14 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		C99E1EAC0E78628600AECCF6 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				C99E1EBA0E7862A000AECCF6 /* fltk.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		C9A3E94F0DD6336500486E4F /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -2846,7 +3117,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				C9A3ED0C0DD63CE000486E4F /* fltk.framework in Frameworks */,
+				C9EAC40C0E787220004F64F7 /* fltk.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2879,7 +3150,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				C9A3ED770DD63EAB00486E4F /* fltk.framework in Frameworks */,
+				C9EAC44E0E7875C4004F64F7 /* fltk.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2923,15 +3194,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		C9A3EE0F0DD646DA00486E4F /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				C9A3EE1B0DD646FA00486E4F /* fltk.framework in Frameworks */,
-				C9A3EE300DD6485F00486E4F /* fltk_forms.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		C9C870BC0DD7721700A9793F /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -2964,6 +3226,15 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		C9EAC2DA0E786725004F64F7 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				C9EAC2ED0E78678D004F64F7 /* fltk.framework in Frameworks */,
+				C9EAC2FB0E7867B6004F64F7 /* fltk_forms.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
@@ -3013,13 +3284,11 @@
 				C9A3EDC70DD645C200486E4F /* buttons.app */,
 				C9A3EDDE0DD6460900486E4F /* checkers.app */,
 				C9A3EDF90DD6467E00486E4F /* clock.app */,
-				C9A3EE110DD646DA00486E4F /* colbrowser.app */,
 				C9C870BE0DD7721700A9793F /* color_chooser.app */,
 				C9C871E80DD773E700A9793F /* cube.app */,
 				C9C873740DD7772000A9793F /* Fluid.app */,
 				C99CF5240DD78B550094BD10 /* CubeView.app */,
 				C97741850DD9D1910047C1BF /* cursor.app */,
-				C97741DC0DD9D2D80047C1BF /* curve.app */,
 				C97741FF0DD9D33B0047C1BF /* Demo.app */,
 				C977425D0DD9D8110047C1BF /* doublebuffer.app */,
 				C918DB370DD9EE4100167E99 /* editor.app */,
@@ -3066,6 +3335,9 @@
 				C918E1720DDA122D00167E99 /* tile.app */,
 				C918E1920DDA126E00167E99 /* tiled_image.app */,
 				C918E1BE0DDA12CF00167E99 /* valuators.app */,
+				C94A76DA0E77F59F00AAA38E /* utf8.app */,
+				C99E1EAE0E78628600AECCF6 /* curve.app */,
+				C9EAC2DC0E786725004F64F7 /* colbrowser.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -3143,6 +3415,7 @@
 				C9A3ECA60DD63A5200486E4F /* adjuster-Info.plist */,
 				C9A3E9610DD633C300486E4F /* hello-Info.plist */,
 				C9A3E9530DD6336500486E4F /* fltk-Info.plist */,
+				C94A76DD0E77F5A800AAA38E /* symbols-Info copy.plist */,
 			);
 			name = plists;
 			sourceTree = "<group>";
@@ -3332,6 +3605,11 @@
 				C9A3EB890DD634CC00486E4F /* fl_color_win32.cxx */,
 				C9A3EB8A0DD634CC00486E4F /* Fl_BMP_Image.cxx */,
 				C9A3EB8B0DD634CC00486E4F /* fl_shadow_box.cxx */,
+				C94A76390E76CF5B00AAA38E /* fl_utf.c */,
+				C94A763A0E76CF6200AAA38E /* fl_utf8.cxx */,
+				C99E1E980E7861E600AECCF6 /* case.c */,
+				C99E1E990E7861EF00AECCF6 /* is_right2left.c */,
+				C99E1E9A0E7861F400AECCF6 /* is_spacing.c */,
 			);
 			name = "Library Sources";
 			sourceTree = "<group>";
@@ -3339,6 +3617,7 @@
 		C9A3E95A0DD6339500486E4F /* Test Sources */ = {
 			isa = PBXGroup;
 			children = (
+				C94A76E40E77F66200AAA38E /* utf8.cxx */,
 				C9A3EDB60DD6459800486E4F /* button.cxx */,
 				C9A3ECAA0DD63A9E00486E4F /* adjuster.cxx */,
 				C9A3ED090DD63CC900486E4F /* arc.cxx */,
@@ -3597,6 +3876,7 @@
 				C918DB330DD9EE4100167E99 /* Resources */,
 				C918DB340DD9EE4100167E99 /* Sources */,
 				C918DB350DD9EE4100167E99 /* Frameworks */,
+				C9EAC4A10E7877A7004F64F7 /* CopyFiles */,
 			);
 			buildRules = (
 			);
@@ -3615,6 +3895,7 @@
 				C918DB530DD9EEB800167E99 /* Resources */,
 				C918DB540DD9EEB800167E99 /* Sources */,
 				C918DB550DD9EEB800167E99 /* Frameworks */,
+				C9EAC4AA0E7877FC004F64F7 /* CopyFiles */,
 			);
 			buildRules = (
 				C918DB780DD9EF6800167E99 /* PBXBuildRule */,
@@ -3635,6 +3916,7 @@
 				C918DB9A0DD9EFFA00167E99 /* Resources */,
 				C918DB9B0DD9EFFA00167E99 /* Sources */,
 				C918DB9C0DD9EFFA00167E99 /* Frameworks */,
+				C9EAC4AB0E7877FC004F64F7 /* CopyFiles */,
 			);
 			buildRules = (
 			);
@@ -3656,6 +3938,7 @@
 				C918DBE70DD9F0C100167E99 /* Resources */,
 				C918DBE80DD9F0C100167E99 /* Sources */,
 				C918DBE90DD9F0C100167E99 /* Frameworks */,
+				C9EAC4B90E787926004F64F7 /* CopyFiles */,
 			);
 			buildRules = (
 			);
@@ -4403,50 +4686,52 @@
 			productReference = C918E1BE0DDA12CF00167E99 /* valuators.app */;
 			productType = "com.apple.product-type.application";
 		};
-		C97741840DD9D1910047C1BF /* cursor */ = {
+		C94A76CF0E77F59E00AAA38E /* utf8 */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = C977418A0DD9D1910047C1BF /* Build configuration list for PBXNativeTarget "cursor" */;
+			buildConfigurationList = C94A76D70E77F59E00AAA38E /* Build configuration list for PBXNativeTarget "utf8" */;
 			buildPhases = (
-				C97741810DD9D1910047C1BF /* Resources */,
-				C97741820DD9D1910047C1BF /* Sources */,
-				C97741830DD9D1910047C1BF /* Frameworks */,
+				C94A76D20E77F59E00AAA38E /* Resources */,
+				C94A76D30E77F59E00AAA38E /* Sources */,
+				C94A76D50E77F59E00AAA38E /* Frameworks */,
 			);
 			buildRules = (
 			);
 			dependencies = (
-				C97742140DD9D38A0047C1BF /* PBXTargetDependency */,
+				C94A76D00E77F59E00AAA38E /* PBXTargetDependency */,
 			);
-			name = cursor;
-			productName = cursor;
-			productReference = C97741850DD9D1910047C1BF /* cursor.app */;
+			name = utf8;
+			productName = symbols;
+			productReference = C94A76DA0E77F59F00AAA38E /* utf8.app */;
 			productType = "com.apple.product-type.application";
 		};
-		C97741DB0DD9D2D80047C1BF /* curve */ = {
+		C97741840DD9D1910047C1BF /* cursor */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = C97741E10DD9D2D90047C1BF /* Build configuration list for PBXNativeTarget "curve" */;
+			buildConfigurationList = C977418A0DD9D1910047C1BF /* Build configuration list for PBXNativeTarget "cursor" */;
 			buildPhases = (
-				C97741D80DD9D2D80047C1BF /* Resources */,
-				C97741D90DD9D2D80047C1BF /* Sources */,
-				C97741DA0DD9D2D80047C1BF /* Frameworks */,
+				C97741810DD9D1910047C1BF /* Resources */,
+				C97741820DD9D1910047C1BF /* Sources */,
+				C97741830DD9D1910047C1BF /* Frameworks */,
+				C9EAC4910E7876C2004F64F7 /* CopyFiles */,
 			);
 			buildRules = (
 			);
 			dependencies = (
-				C97742160DD9D3990047C1BF /* PBXTargetDependency */,
+				C97742140DD9D38A0047C1BF /* PBXTargetDependency */,
 			);
-			name = curve;
-			productName = curve;
-			productReference = C97741DC0DD9D2D80047C1BF /* curve.app */;
+			name = cursor;
+			productName = cursor;
+			productReference = C97741850DD9D1910047C1BF /* cursor.app */;
 			productType = "com.apple.product-type.application";
 		};
 		C97741FE0DD9D33B0047C1BF /* Demo */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = C97742040DD9D33C0047C1BF /* Build configuration list for PBXNativeTarget "Demo" */;
 			buildPhases = (
-				C97741FB0DD9D33B0047C1BF /* Resources */,
+				C9EAC4140E787298004F64F7 /* Resources */,
 				C97741FC0DD9D33B0047C1BF /* Sources */,
 				C97741FD0DD9D33B0047C1BF /* Frameworks */,
 				C9FB9A980DE34AB200026BB1 /* CopyFiles */,
+				C94A76BC0E76D4A800AAA38E /* CopyFiles */,
 			);
 			buildRules = (
 				01AA1C120E630B7700E0A684 /* PBXBuildRule */,
@@ -4471,12 +4756,10 @@
 				C97742390DD9D3BA0047C1BF /* PBXTargetDependency */,
 				C977423B0DD9D3BA0047C1BF /* PBXTargetDependency */,
 				C977423D0DD9D3BA0047C1BF /* PBXTargetDependency */,
-				C977423F0DD9D3BA0047C1BF /* PBXTargetDependency */,
 				C97742410DD9D3BA0047C1BF /* PBXTargetDependency */,
 				C97742430DD9D3BA0047C1BF /* PBXTargetDependency */,
 				C97742450DD9D3BA0047C1BF /* PBXTargetDependency */,
 				C97742470DD9D3BA0047C1BF /* PBXTargetDependency */,
-				C97742490DD9D3BA0047C1BF /* PBXTargetDependency */,
 				C918E1E80DDA13BC00167E99 /* PBXTargetDependency */,
 				C918E1EA0DDA13BC00167E99 /* PBXTargetDependency */,
 				C918E1EC0DDA13BC00167E99 /* PBXTargetDependency */,
@@ -4520,6 +4803,7 @@
 				C918E2380DDA13BC00167E99 /* PBXTargetDependency */,
 				C918E23A0DDA13BC00167E99 /* PBXTargetDependency */,
 				C918E23C0DDA13BC00167E99 /* PBXTargetDependency */,
+				C9EAC41F0E78730F004F64F7 /* PBXTargetDependency */,
 				C918E23E0DDA13BC00167E99 /* PBXTargetDependency */,
 			);
 			name = Demo;
@@ -4534,6 +4818,7 @@
 				C97742590DD9D8110047C1BF /* Resources */,
 				C977425A0DD9D8110047C1BF /* Sources */,
 				C977425B0DD9D8110047C1BF /* Frameworks */,
+				C9EAC49C0E787777004F64F7 /* CopyFiles */,
 			);
 			buildRules = (
 			);
@@ -4552,6 +4837,7 @@
 				C99CF5200DD78B550094BD10 /* Resources */,
 				C99CF5210DD78B550094BD10 /* Sources */,
 				C99CF5220DD78B550094BD10 /* Frameworks */,
+				C9EAC4900E7876C2004F64F7 /* CopyFiles */,
 			);
 			buildRules = (
 				C99CF5350DD78C640094BD10 /* PBXBuildRule */,
@@ -4566,6 +4852,25 @@
 			productReference = C99CF5240DD78B550094BD10 /* CubeView.app */;
 			productType = "com.apple.product-type.application";
 		};
+		C99E1EAD0E78628600AECCF6 /* curve */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = C99E1EB90E78628800AECCF6 /* Build configuration list for PBXNativeTarget "curve" */;
+			buildPhases = (
+				C99E1EAA0E78628600AECCF6 /* Resources */,
+				C99E1EAB0E78628600AECCF6 /* Sources */,
+				C99E1EAC0E78628600AECCF6 /* Frameworks */,
+				C9EAC4980E7876FB004F64F7 /* CopyFiles */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				C9EAC2EC0E786785004F64F7 /* PBXTargetDependency */,
+			);
+			name = curve;
+			productName = curve;
+			productReference = C99E1EAE0E78628600AECCF6 /* curve.app */;
+			productType = "com.apple.product-type.application";
+		};
 		C9A3E9500DD6336500486E4F /* fltk */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = C9A3E9570DD6336500486E4F /* Build configuration list for PBXNativeTarget "fltk" */;
@@ -4723,6 +5028,7 @@
 				C9A3ECFE0DD63C8B00486E4F /* Resources */,
 				C9A3ECFF0DD63C8B00486E4F /* Sources */,
 				C9A3ED000DD63C8B00486E4F /* Frameworks */,
+				C9EAC3FF0E78718C004F64F7 /* CopyFiles */,
 			);
 			buildRules = (
 			);
@@ -4741,11 +5047,11 @@
 				C9A3ED160DD63D2800486E4F /* Resources */,
 				C9A3ED170DD63D2800486E4F /* Sources */,
 				C9A3ED180DD63D2800486E4F /* Frameworks */,
+				C9EAC4280E7873ED004F64F7 /* CopyFiles */,
 			);
 			buildRules = (
 			);
 			dependencies = (
-				C918DB990DD9EFED00167E99 /* PBXTargetDependency */,
 				C9C873590DD7769B00A9793F /* PBXTargetDependency */,
 			);
 			name = ask;
@@ -4760,6 +5066,7 @@
 				C9A3ED2F0DD63D8600486E4F /* Resources */,
 				C9A3ED300DD63D8600486E4F /* Sources */,
 				C9A3ED310DD63D8600486E4F /* Frameworks */,
+				C9EAC43D0E7874C3004F64F7 /* CopyFiles */,
 			);
 			buildRules = (
 			);
@@ -4778,6 +5085,7 @@
 				C9A3ED490DD63DD100486E4F /* Resources */,
 				C9A3ED4A0DD63DD100486E4F /* Sources */,
 				C9A3ED4B0DD63DD100486E4F /* Frameworks */,
+				C9EAC4470E78755C004F64F7 /* CopyFiles */,
 			);
 			buildRules = (
 			);
@@ -4796,6 +5104,7 @@
 				C9A3ED690DD63E7F00486E4F /* Resources */,
 				C9A3ED6A0DD63E7F00486E4F /* Sources */,
 				C9A3ED6B0DD63E7F00486E4F /* Frameworks */,
+				C9EAC44D0E7875B5004F64F7 /* CopyFiles */,
 			);
 			buildRules = (
 			);
@@ -4814,6 +5123,7 @@
 				C9A3ED810DD63EDC00486E4F /* Resources */,
 				C9A3ED820DD63EDC00486E4F /* Sources */,
 				C9A3ED830DD63EDC00486E4F /* Frameworks */,
+				C9EAC46B0E78765E004F64F7 /* CopyFiles */,
 			);
 			buildRules = (
 			);
@@ -4832,6 +5142,7 @@
 				C9A3EDAB0DD6457A00486E4F /* Resources */,
 				C9A3EDAC0DD6457A00486E4F /* Sources */,
 				C9A3EDAD0DD6457A00486E4F /* Frameworks */,
+				C9EAC46C0E78765E004F64F7 /* CopyFiles */,
 			);
 			buildRules = (
 			);
@@ -4850,6 +5161,7 @@
 				C9A3EDC30DD645C200486E4F /* Resources */,
 				C9A3EDC40DD645C200486E4F /* Sources */,
 				C9A3EDC50DD645C200486E4F /* Frameworks */,
+				C9EAC46D0E78765E004F64F7 /* CopyFiles */,
 			);
 			buildRules = (
 			);
@@ -4868,6 +5180,7 @@
 				C9A3EDDA0DD6460900486E4F /* Resources */,
 				C9A3EDDB0DD6460900486E4F /* Sources */,
 				C9A3EDDC0DD6460900486E4F /* Frameworks */,
+				C9EAC46E0E78765E004F64F7 /* CopyFiles */,
 			);
 			buildRules = (
 			);
@@ -4886,6 +5199,7 @@
 				C9A3EDF50DD6467E00486E4F /* Resources */,
 				C9A3EDF60DD6467E00486E4F /* Sources */,
 				C9A3EDF70DD6467E00486E4F /* Frameworks */,
+				C9EAC46F0E78765E004F64F7 /* CopyFiles */,
 			);
 			buildRules = (
 			);
@@ -4897,25 +5211,6 @@
 			productReference = C9A3EDF90DD6467E00486E4F /* clock.app */;
 			productType = "com.apple.product-type.application";
 		};
-		C9A3EE100DD646DA00486E4F /* colbrowser */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = C9A3EE160DD646DB00486E4F /* Build configuration list for PBXNativeTarget "colbrowser" */;
-			buildPhases = (
-				C9A3EE0D0DD646DA00486E4F /* Resources */,
-				C9A3EE0E0DD646DA00486E4F /* Sources */,
-				C9A3EE0F0DD646DA00486E4F /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				C9A3EE680DD64A6300486E4F /* PBXTargetDependency */,
-				C9A3EE6A0DD64A6A00486E4F /* PBXTargetDependency */,
-			);
-			name = colbrowser;
-			productName = colbrowser;
-			productReference = C9A3EE110DD646DA00486E4F /* colbrowser.app */;
-			productType = "com.apple.product-type.application";
-		};
 		C9C870BD0DD7721700A9793F /* color_chooser */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = C9C870C30DD7721700A9793F /* Build configuration list for PBXNativeTarget "color_chooser" */;
@@ -4923,6 +5218,7 @@
 				C9C870BA0DD7721700A9793F /* Resources */,
 				C9C870BB0DD7721700A9793F /* Sources */,
 				C9C870BC0DD7721700A9793F /* Frameworks */,
+				C9EAC47F0E787699004F64F7 /* CopyFiles */,
 			);
 			buildRules = (
 			);
@@ -4941,6 +5237,7 @@
 				C9C871E40DD773E700A9793F /* Resources */,
 				C9C871E50DD773E700A9793F /* Sources */,
 				C9C871E60DD773E700A9793F /* Frameworks */,
+				C9EAC4800E787699004F64F7 /* CopyFiles */,
 			);
 			buildRules = (
 			);
@@ -4976,6 +5273,26 @@
 			productReference = C9C873740DD7772000A9793F /* Fluid.app */;
 			productType = "com.apple.product-type.application";
 		};
+		C9EAC2DB0E786725004F64F7 /* colbrowser */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = C9EAC2E10E786726004F64F7 /* Build configuration list for PBXNativeTarget "colbrowser" */;
+			buildPhases = (
+				C9EAC2D80E786725004F64F7 /* Resources */,
+				C9EAC2D90E786725004F64F7 /* Sources */,
+				C9EAC2DA0E786725004F64F7 /* Frameworks */,
+				C9EAC4700E78765E004F64F7 /* CopyFiles */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				C9EAC2FF0E7867C9004F64F7 /* PBXTargetDependency */,
+				C9EAC3010E7867C9004F64F7 /* PBXTargetDependency */,
+			);
+			name = colbrowser;
+			productName = colbrowser;
+			productReference = C9EAC2DC0E786725004F64F7 /* colbrowser.app */;
+			productType = "com.apple.product-type.application";
+		};
 /* End PBXNativeTarget section */
 
 /* Begin PBXProject section */
@@ -5008,12 +5325,12 @@
 				C9A3EDC60DD645C200486E4F /* buttons */,
 				C9A3EDDD0DD6460900486E4F /* checkers */,
 				C9A3EDF80DD6467E00486E4F /* clock */,
-				C9A3EE100DD646DA00486E4F /* colbrowser */,
+				C9EAC2DB0E786725004F64F7 /* colbrowser */,
 				C9C870BD0DD7721700A9793F /* color_chooser */,
 				C9C871E70DD773E700A9793F /* cube */,
 				C99CF5230DD78B550094BD10 /* CubeView */,
 				C97741840DD9D1910047C1BF /* cursor */,
-				C97741DB0DD9D2D80047C1BF /* curve */,
+				C99E1EAD0E78628600AECCF6 /* curve */,
 				C977425C0DD9D8110047C1BF /* doublebuffer */,
 				C918DB360DD9EE4100167E99 /* editor */,
 				C918DB560DD9EEB800167E99 /* fast_slow */,
@@ -5058,6 +5375,7 @@
 				C918E1510DDA11E400167E99 /* threads */,
 				C918E1710DDA122D00167E99 /* tile */,
 				C918E1910DDA126E00167E99 /* tiled_image */,
+				C94A76CF0E77F59E00AAA38E /* utf8 */,
 				C918E1BD0DDA12CF00167E99 /* valuators */,
 			);
 		};
@@ -5374,40 +5692,39 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		C97741810DD9D1910047C1BF /* Resources */ = {
+		C94A76D20E77F59E00AAA38E /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		C97741D80DD9D2D80047C1BF /* Resources */ = {
+		C97741810DD9D1910047C1BF /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		C97741FB0DD9D33B0047C1BF /* Resources */ = {
+		C97742590DD9D8110047C1BF /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				C977420F0DD9D36C0047C1BF /* demo.menu in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		C97742590DD9D8110047C1BF /* Resources */ = {
+		C99CF5200DD78B550094BD10 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				C99CF52E0DD78BD50094BD10 /* CubeViewUI.fl in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		C99CF5200DD78B550094BD10 /* Resources */ = {
+		C99E1EAA0E78628600AECCF6 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				C99CF52E0DD78BD50094BD10 /* CubeViewUI.fl in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -5537,32 +5854,39 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		C9A3EE0D0DD646DA00486E4F /* Resources */ = {
+		C9C870BA0DD7721700A9793F /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		C9C870BA0DD7721700A9793F /* Resources */ = {
+		C9C871E40DD773E700A9793F /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		C9C871E40DD773E700A9793F /* Resources */ = {
+		C9C873700DD7772000A9793F /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				C93F25300DDA257B0017EE72 /* fluid.icns in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		C9C873700DD7772000A9793F /* Resources */ = {
+		C9EAC2D80E786725004F64F7 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		C9EAC4140E787298004F64F7 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				C93F25300DDA257B0017EE72 /* fluid.icns in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -5916,19 +6240,19 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		C97741820DD9D1910047C1BF /* Sources */ = {
+		C94A76D30E77F59E00AAA38E /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				C97741930DD9D1BD0047C1BF /* cursor.cxx in Sources */,
+				C94A76E50E77F66D00AAA38E /* utf8.cxx in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		C97741D90DD9D2D80047C1BF /* Sources */ = {
+		C97741820DD9D1910047C1BF /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				C97741E80DD9D2ED0047C1BF /* curve.cxx in Sources */,
+				C97741930DD9D1BD0047C1BF /* cursor.cxx in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -5958,6 +6282,14 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		C99E1EAB0E78628600AECCF6 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				C99E1EBC0E7862DA00AECCF6 /* curve.cxx in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		C9A3E94E0DD6336500486E4F /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -6096,6 +6428,11 @@
 				C9A3EC3D0DD634CC00486E4F /* fl_gtk.cxx in Sources */,
 				C9A3EC3E0DD634CC00486E4F /* Fl_compose.cxx in Sources */,
 				C9A3EC410DD634CC00486E4F /* fl_shadow_box.cxx in Sources */,
+				C94A763B0E76CF6700AAA38E /* fl_utf.c in Sources */,
+				C94A763C0E76CF6700AAA38E /* fl_utf8.cxx in Sources */,
+				C99E1E9B0E78620B00AECCF6 /* case.c in Sources */,
+				C99E1E9C0E78620B00AECCF6 /* is_right2left.c in Sources */,
+				C99E1E9D0E78620B00AECCF6 /* is_spacing.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -6315,14 +6652,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		C9A3EE0E0DD646DA00486E4F /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				C9A3EE190DD646F100486E4F /* colbrowser.cxx in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		C9C870BB0DD7721700A9793F /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -6365,6 +6694,14 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		C9EAC2D90E786725004F64F7 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				C9EAC2E80E786767004F64F7 /* colbrowser.cxx in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
@@ -6393,11 +6730,6 @@
 			target = C9A3E9500DD6336500486E4F /* fltk */;
 			targetProxy = C918DB740DD9EF4900167E99 /* PBXContainerItemProxy */;
 		};
-		C918DB990DD9EFED00167E99 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = C9A3ECA20DD63A5200486E4F /* adjuster */;
-			targetProxy = C918DB980DD9EFED00167E99 /* PBXContainerItemProxy */;
-		};
 		C918DBA60DD9F00700167E99 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = C9A3E9500DD6336500486E4F /* fltk */;
@@ -6968,15 +7300,15 @@
 			target = C918E1BD0DDA12CF00167E99 /* valuators */;
 			targetProxy = C918E23D0DDA13BC00167E99 /* PBXContainerItemProxy */;
 		};
-		C97742140DD9D38A0047C1BF /* PBXTargetDependency */ = {
+		C94A76D00E77F59E00AAA38E /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = C9A3E9500DD6336500486E4F /* fltk */;
-			targetProxy = C97742130DD9D38A0047C1BF /* PBXContainerItemProxy */;
+			targetProxy = C94A76D10E77F59E00AAA38E /* PBXContainerItemProxy */;
 		};
-		C97742160DD9D3990047C1BF /* PBXTargetDependency */ = {
+		C97742140DD9D38A0047C1BF /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = C9A3E9500DD6336500486E4F /* fltk */;
-			targetProxy = C97742150DD9D3990047C1BF /* PBXContainerItemProxy */;
+			targetProxy = C97742130DD9D38A0047C1BF /* PBXContainerItemProxy */;
 		};
 		C97742190DD9D3BA0047C1BF /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
@@ -7063,11 +7395,6 @@
 			target = C9A3EDF80DD6467E00486E4F /* clock */;
 			targetProxy = C977423C0DD9D3BA0047C1BF /* PBXContainerItemProxy */;
 		};
-		C977423F0DD9D3BA0047C1BF /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = C9A3EE100DD646DA00486E4F /* colbrowser */;
-			targetProxy = C977423E0DD9D3BA0047C1BF /* PBXContainerItemProxy */;
-		};
 		C97742410DD9D3BA0047C1BF /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = C9C870BD0DD7721700A9793F /* color_chooser */;
@@ -7088,11 +7415,6 @@
 			target = C97741840DD9D1910047C1BF /* cursor */;
 			targetProxy = C97742460DD9D3BA0047C1BF /* PBXContainerItemProxy */;
 		};
-		C97742490DD9D3BA0047C1BF /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = C97741DB0DD9D2D80047C1BF /* curve */;
-			targetProxy = C97742480DD9D3BA0047C1BF /* PBXContainerItemProxy */;
-		};
 		C977426A0DD9D8470047C1BF /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = C9A3E9500DD6336500486E4F /* fltk */;
@@ -7118,16 +7440,6 @@
 			target = C9A3E9500DD6336500486E4F /* fltk */;
 			targetProxy = C9A3EE630DD64A5100486E4F /* PBXContainerItemProxy */;
 		};
-		C9A3EE680DD64A6300486E4F /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = C9A3E9500DD6336500486E4F /* fltk */;
-			targetProxy = C9A3EE670DD64A6300486E4F /* PBXContainerItemProxy */;
-		};
-		C9A3EE6A0DD64A6A00486E4F /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = C9A3EC6D0DD6397400486E4F /* fltk_forms */;
-			targetProxy = C9A3EE690DD64A6A00486E4F /* PBXContainerItemProxy */;
-		};
 		C9C870D60DD772AA00A9793F /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = C9A3E9500DD6336500486E4F /* fltk */;
@@ -7248,6 +7560,26 @@
 			target = C9A3EC990DD639E600486E4F /* fltk_jpeg */;
 			targetProxy = C9DD583B0DD7888200A896B4 /* PBXContainerItemProxy */;
 		};
+		C9EAC2EC0E786785004F64F7 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = C9A3E9500DD6336500486E4F /* fltk */;
+			targetProxy = C9EAC2EB0E786785004F64F7 /* PBXContainerItemProxy */;
+		};
+		C9EAC2FF0E7867C9004F64F7 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = C9A3E9500DD6336500486E4F /* fltk */;
+			targetProxy = C9EAC2FE0E7867C9004F64F7 /* PBXContainerItemProxy */;
+		};
+		C9EAC3010E7867C9004F64F7 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = C9A3EC6D0DD6397400486E4F /* fltk_forms */;
+			targetProxy = C9EAC3000E7867C9004F64F7 /* PBXContainerItemProxy */;
+		};
+		C9EAC41F0E78730F004F64F7 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = C94A76CF0E77F59E00AAA38E /* utf8 */;
+			targetProxy = C9EAC41E0E78730F004F64F7 /* PBXContainerItemProxy */;
+		};
 /* End PBXTargetDependency section */
 
 /* Begin XCBuildConfiguration section */
@@ -9272,7 +9604,7 @@
 			};
 			name = Release;
 		};
-		C97741880DD9D1910047C1BF /* Debug */ = {
+		C94A76D80E77F59E00AAA38E /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				COPY_PHASE_STRIP = NO;
@@ -9283,20 +9615,20 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
 				HEADER_SEARCH_PATHS = ../../;
-				INFOPLIST_FILE = "plists/cursor-Info.plist";
+				INFOPLIST_FILE = "plists/utf8-Info.plist";
 				INSTALL_PATH = "$(HOME)/Applications";
 				OTHER_LDFLAGS = (
 					"-framework",
 					Carbon,
 				);
 				PREBINDING = NO;
-				PRODUCT_NAME = cursor;
+				PRODUCT_NAME = utf8;
 				WRAPPER_EXTENSION = app;
 				ZERO_LINK = YES;
 			};
 			name = Debug;
 		};
-		C97741890DD9D1910047C1BF /* Release */ = {
+		C94A76D90E77F59E00AAA38E /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				COPY_PHASE_STRIP = YES;
@@ -9306,20 +9638,20 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
 				HEADER_SEARCH_PATHS = ../../;
-				INFOPLIST_FILE = "plists/cursor-Info.plist";
+				INFOPLIST_FILE = "/Users/matt/dev/fltk-1.3-utf8/ide/Xcode3.0/plists/symbols-Info copy.plist";
 				INSTALL_PATH = "$(HOME)/Applications";
 				OTHER_LDFLAGS = (
 					"-framework",
 					Carbon,
 				);
 				PREBINDING = NO;
-				PRODUCT_NAME = cursor;
+				PRODUCT_NAME = symbols;
 				WRAPPER_EXTENSION = app;
 				ZERO_LINK = NO;
 			};
 			name = Release;
 		};
-		C97741DF0DD9D2D90047C1BF /* Debug */ = {
+		C97741880DD9D1910047C1BF /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				COPY_PHASE_STRIP = NO;
@@ -9330,20 +9662,20 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
 				HEADER_SEARCH_PATHS = ../../;
-				INFOPLIST_FILE = "plists/curve-Info.plist";
+				INFOPLIST_FILE = "plists/cursor-Info.plist";
 				INSTALL_PATH = "$(HOME)/Applications";
 				OTHER_LDFLAGS = (
 					"-framework",
 					Carbon,
 				);
 				PREBINDING = NO;
-				PRODUCT_NAME = curve;
+				PRODUCT_NAME = cursor;
 				WRAPPER_EXTENSION = app;
 				ZERO_LINK = YES;
 			};
 			name = Debug;
 		};
-		C97741E00DD9D2D90047C1BF /* Release */ = {
+		C97741890DD9D1910047C1BF /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				COPY_PHASE_STRIP = YES;
@@ -9353,14 +9685,14 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
 				HEADER_SEARCH_PATHS = ../../;
-				INFOPLIST_FILE = "plists/curve-Info.plist";
+				INFOPLIST_FILE = "plists/cursor-Info.plist";
 				INSTALL_PATH = "$(HOME)/Applications";
 				OTHER_LDFLAGS = (
 					"-framework",
 					Carbon,
 				);
 				PREBINDING = NO;
-				PRODUCT_NAME = curve;
+				PRODUCT_NAME = cursor;
 				WRAPPER_EXTENSION = app;
 				ZERO_LINK = NO;
 			};
@@ -9515,6 +9847,50 @@
 			};
 			name = Release;
 		};
+		C99E1EB70E78628800AECCF6 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_MODEL_TUNING = G5;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
+				INFOPLIST_FILE = "plists/curve-Info.plist";
+				INSTALL_PATH = "$(HOME)/Applications";
+				OTHER_LDFLAGS = (
+					"-framework",
+					Carbon,
+				);
+				PREBINDING = NO;
+				PRODUCT_NAME = curve;
+			};
+			name = Debug;
+		};
+		C99E1EB80E78628800AECCF6 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_ENABLE_FIX_AND_CONTINUE = NO;
+				GCC_MODEL_TUNING = G5;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
+				INFOPLIST_FILE = "curve-Info.plist";
+				INSTALL_PATH = "$(HOME)/Applications";
+				OTHER_LDFLAGS = (
+					"-framework",
+					Carbon,
+				);
+				PREBINDING = NO;
+				PRODUCT_NAME = curve;
+				ZERO_LINK = NO;
+			};
+			name = Release;
+		};
 		C9A3E93D0DD6332D00486E4F /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -10437,7 +10813,7 @@
 			};
 			name = Release;
 		};
-		C9A3EE140DD646DB00486E4F /* Debug */ = {
+		C9C870C10DD7721700A9793F /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				COPY_PHASE_STRIP = NO;
@@ -10447,22 +10823,21 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
-				GCC_PREPROCESSOR_DEFINITIONS = USING_XCODE;
 				HEADER_SEARCH_PATHS = ../../;
-				INFOPLIST_FILE = "plists/colbrowser-Info.plist";
+				INFOPLIST_FILE = "plists/color_chooser-Info.plist";
 				INSTALL_PATH = "$(HOME)/Applications";
 				OTHER_LDFLAGS = (
 					"-framework",
 					Carbon,
 				);
 				PREBINDING = NO;
-				PRODUCT_NAME = colbrowser;
+				PRODUCT_NAME = color_chooser;
 				WRAPPER_EXTENSION = app;
 				ZERO_LINK = YES;
 			};
 			name = Debug;
 		};
-		C9A3EE150DD646DB00486E4F /* Release */ = {
+		C9C870C20DD7721700A9793F /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				COPY_PHASE_STRIP = YES;
@@ -10471,22 +10846,21 @@
 				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
-				GCC_PREPROCESSOR_DEFINITIONS = USING_XCODE;
 				HEADER_SEARCH_PATHS = ../../;
-				INFOPLIST_FILE = "plists/colbrowser-Info.plist";
+				INFOPLIST_FILE = "plists/color_chooser-Info.plist";
 				INSTALL_PATH = "$(HOME)/Applications";
 				OTHER_LDFLAGS = (
 					"-framework",
 					Carbon,
 				);
 				PREBINDING = NO;
-				PRODUCT_NAME = colbrowser;
+				PRODUCT_NAME = color_chooser;
 				WRAPPER_EXTENSION = app;
 				ZERO_LINK = NO;
 			};
 			name = Release;
 		};
-		C9C870C10DD7721700A9793F /* Debug */ = {
+		C9C871EB0DD773E700A9793F /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				COPY_PHASE_STRIP = NO;
@@ -10497,20 +10871,20 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
 				HEADER_SEARCH_PATHS = ../../;
-				INFOPLIST_FILE = "plists/color_chooser-Info.plist";
+				INFOPLIST_FILE = "plists/cube-Info.plist";
 				INSTALL_PATH = "$(HOME)/Applications";
 				OTHER_LDFLAGS = (
 					"-framework",
 					Carbon,
 				);
 				PREBINDING = NO;
-				PRODUCT_NAME = color_chooser;
+				PRODUCT_NAME = cube;
 				WRAPPER_EXTENSION = app;
 				ZERO_LINK = YES;
 			};
 			name = Debug;
 		};
-		C9C870C20DD7721700A9793F /* Release */ = {
+		C9C871EC0DD773E700A9793F /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				COPY_PHASE_STRIP = YES;
@@ -10520,20 +10894,20 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
 				HEADER_SEARCH_PATHS = ../../;
-				INFOPLIST_FILE = "plists/color_chooser-Info.plist";
+				INFOPLIST_FILE = "plists/cube-Info.plist";
 				INSTALL_PATH = "$(HOME)/Applications";
 				OTHER_LDFLAGS = (
 					"-framework",
 					Carbon,
 				);
 				PREBINDING = NO;
-				PRODUCT_NAME = color_chooser;
+				PRODUCT_NAME = cube;
 				WRAPPER_EXTENSION = app;
 				ZERO_LINK = NO;
 			};
 			name = Release;
 		};
-		C9C871EB0DD773E700A9793F /* Debug */ = {
+		C9C873770DD7772100A9793F /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				COPY_PHASE_STRIP = NO;
@@ -10543,21 +10917,26 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
-				HEADER_SEARCH_PATHS = ../../;
-				INFOPLIST_FILE = "plists/cube-Info.plist";
-				INSTALL_PATH = "$(HOME)/Applications";
+				HEADER_SEARCH_PATHS = (
+					../../ide/XCode3/,
+					../../,
+					../../png,
+				);
+				INFOPLIST_FILE = "plists/Fluid-Info.plist";
+				INSTALL_PATH = /Applications;
 				OTHER_LDFLAGS = (
 					"-framework",
 					Carbon,
 				);
 				PREBINDING = NO;
-				PRODUCT_NAME = cube;
+				PRODUCT_NAME = Fluid;
+				USER_HEADER_SEARCH_PATHS = "";
 				WRAPPER_EXTENSION = app;
 				ZERO_LINK = YES;
 			};
 			name = Debug;
 		};
-		C9C871EC0DD773E700A9793F /* Release */ = {
+		C9C873780DD7772100A9793F /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				COPY_PHASE_STRIP = YES;
@@ -10566,23 +10945,29 @@
 				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
-				HEADER_SEARCH_PATHS = ../../;
-				INFOPLIST_FILE = "plists/cube-Info.plist";
-				INSTALL_PATH = "$(HOME)/Applications";
+				HEADER_SEARCH_PATHS = (
+					../../ide/XCode3/,
+					../../,
+					../../png,
+				);
+				INFOPLIST_FILE = "plists/Fluid-Info.plist";
+				INSTALL_PATH = /Applications;
 				OTHER_LDFLAGS = (
 					"-framework",
 					Carbon,
 				);
 				PREBINDING = NO;
-				PRODUCT_NAME = cube;
+				PRODUCT_NAME = Fluid;
+				USER_HEADER_SEARCH_PATHS = "";
 				WRAPPER_EXTENSION = app;
 				ZERO_LINK = NO;
 			};
 			name = Release;
 		};
-		C9C873770DD7772100A9793F /* Debug */ = {
+		C9EAC2DF0E786726004F64F7 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
 				COPY_PHASE_STRIP = NO;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
@@ -10590,49 +10975,37 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
-				HEADER_SEARCH_PATHS = (
-					../../ide/XCode3/,
-					../../,
-					../../png,
-				);
-				INFOPLIST_FILE = "plists/Fluid-Info.plist";
-				INSTALL_PATH = /Applications;
+				GCC_PREPROCESSOR_DEFINITIONS = USING_XCODE;
+				INFOPLIST_FILE = "plists/colbrowser-Info.plist";
+				INSTALL_PATH = "$(HOME)/Applications";
 				OTHER_LDFLAGS = (
 					"-framework",
 					Carbon,
 				);
 				PREBINDING = NO;
-				PRODUCT_NAME = Fluid;
-				USER_HEADER_SEARCH_PATHS = "";
-				WRAPPER_EXTENSION = app;
-				ZERO_LINK = YES;
+				PRODUCT_NAME = colbrowser;
 			};
 			name = Debug;
 		};
-		C9C873780DD7772100A9793F /* Release */ = {
+		C9EAC2E00E786726004F64F7 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
 				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
-				HEADER_SEARCH_PATHS = (
-					../../ide/XCode3/,
-					../../,
-					../../png,
-				);
-				INFOPLIST_FILE = "plists/Fluid-Info.plist";
-				INSTALL_PATH = /Applications;
+				GCC_PREPROCESSOR_DEFINITIONS = USING_XCODE;
+				INFOPLIST_FILE = "colbrowser-Info.plist";
+				INSTALL_PATH = "$(HOME)/Applications";
 				OTHER_LDFLAGS = (
 					"-framework",
 					Carbon,
 				);
 				PREBINDING = NO;
-				PRODUCT_NAME = Fluid;
-				USER_HEADER_SEARCH_PATHS = "";
-				WRAPPER_EXTENSION = app;
+				PRODUCT_NAME = colbrowser;
 				ZERO_LINK = NO;
 			};
 			name = Release;
@@ -11027,20 +11400,20 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		C977418A0DD9D1910047C1BF /* Build configuration list for PBXNativeTarget "cursor" */ = {
+		C94A76D70E77F59E00AAA38E /* Build configuration list for PBXNativeTarget "utf8" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				C97741880DD9D1910047C1BF /* Debug */,
-				C97741890DD9D1910047C1BF /* Release */,
+				C94A76D80E77F59E00AAA38E /* Debug */,
+				C94A76D90E77F59E00AAA38E /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		C97741E10DD9D2D90047C1BF /* Build configuration list for PBXNativeTarget "curve" */ = {
+		C977418A0DD9D1910047C1BF /* Build configuration list for PBXNativeTarget "cursor" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				C97741DF0DD9D2D90047C1BF /* Debug */,
-				C97741E00DD9D2D90047C1BF /* Release */,
+				C97741880DD9D1910047C1BF /* Debug */,
+				C97741890DD9D1910047C1BF /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
@@ -11072,6 +11445,15 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		C99E1EB90E78628800AECCF6 /* Build configuration list for PBXNativeTarget "curve" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				C99E1EB70E78628800AECCF6 /* Debug */,
+				C99E1EB80E78628800AECCF6 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 		C9A3E93F0DD6332D00486E4F /* Build configuration list for PBXProject "FLTK" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
@@ -11243,15 +11625,6 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		C9A3EE160DD646DB00486E4F /* Build configuration list for PBXNativeTarget "colbrowser" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				C9A3EE140DD646DB00486E4F /* Debug */,
-				C9A3EE150DD646DB00486E4F /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
 		C9C870C30DD7721700A9793F /* Build configuration list for PBXNativeTarget "color_chooser" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
@@ -11279,6 +11652,15 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		C9EAC2E10E786726004F64F7 /* Build configuration list for PBXNativeTarget "colbrowser" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				C9EAC2DF0E786726004F64F7 /* Debug */,
+				C9EAC2E00E786726004F64F7 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 /* End XCConfigurationList section */
 	};
 	rootObject = C9A3E93C0DD6332D00486E4F /* Project object */;
diff --git a/ide/XCode3/TODO b/ide/Xcode3.1/TODO
index e8b35da42..e8b35da42 100644
--- a/ide/XCode3/TODO
+++ b/ide/Xcode3.1/TODO
diff --git a/ide/XCode3/config.h b/ide/Xcode3.1/config.h
index 7ecaa45d0..7ecaa45d0 100644
--- a/ide/XCode3/config.h
+++ b/ide/Xcode3.1/config.h
diff --git a/ide/XCode3/icons/fluid.icns b/ide/Xcode3.1/icons/fluid.icns
index 0fda05512..0fda05512 100644
--- a/ide/XCode3/icons/fluid.icns
+++ b/ide/Xcode3.1/icons/fluid.icns
diff --git a/ide/XCode3/plists/CubeView-Info.plist b/ide/Xcode3.1/plists/CubeView-Info.plist
index 18e9a2ce9..18e9a2ce9 100644
--- a/ide/XCode3/plists/CubeView-Info.plist
+++ b/ide/Xcode3.1/plists/CubeView-Info.plist
diff --git a/ide/XCode3/plists/Demo-Info.plist b/ide/Xcode3.1/plists/Demo-Info.plist
index 4b9ec151f..4b9ec151f 100644
--- a/ide/XCode3/plists/Demo-Info.plist
+++ b/ide/Xcode3.1/plists/Demo-Info.plist
diff --git a/ide/XCode3/plists/Fluid-Info.plist b/ide/Xcode3.1/plists/Fluid-Info.plist
index 24a8bd1d6..24a8bd1d6 100644
--- a/ide/XCode3/plists/Fluid-Info.plist
+++ b/ide/Xcode3.1/plists/Fluid-Info.plist
diff --git a/ide/XCode3/plists/adjuster-Info.plist b/ide/Xcode3.1/plists/adjuster-Info.plist
index 354c2a6b8..354c2a6b8 100644
--- a/ide/XCode3/plists/adjuster-Info.plist
+++ b/ide/Xcode3.1/plists/adjuster-Info.plist
diff --git a/ide/XCode3/plists/arc-Info.plist b/ide/Xcode3.1/plists/arc-Info.plist
index 0d5eb9b5d..0d5eb9b5d 100644
--- a/ide/XCode3/plists/arc-Info.plist
+++ b/ide/Xcode3.1/plists/arc-Info.plist
diff --git a/ide/XCode3/plists/ask-Info.plist b/ide/Xcode3.1/plists/ask-Info.plist
index 77f29f2d9..77f29f2d9 100644
--- a/ide/XCode3/plists/ask-Info.plist
+++ b/ide/Xcode3.1/plists/ask-Info.plist
diff --git a/ide/XCode3/plists/bitmap-Info.plist b/ide/Xcode3.1/plists/bitmap-Info.plist
index 41f8efc12..41f8efc12 100644
--- a/ide/XCode3/plists/bitmap-Info.plist
+++ b/ide/Xcode3.1/plists/bitmap-Info.plist
diff --git a/ide/XCode3/plists/blocks-Info.plist b/ide/Xcode3.1/plists/blocks-Info.plist
index d2391e277..d2391e277 100644
--- a/ide/XCode3/plists/blocks-Info.plist
+++ b/ide/Xcode3.1/plists/blocks-Info.plist
diff --git a/ide/XCode3/plists/boxtype-Info.plist b/ide/Xcode3.1/plists/boxtype-Info.plist
index b1c9906c5..b1c9906c5 100644
--- a/ide/XCode3/plists/boxtype-Info.plist
+++ b/ide/Xcode3.1/plists/boxtype-Info.plist
diff --git a/ide/XCode3/plists/browser-Info.plist b/ide/Xcode3.1/plists/browser-Info.plist
index 3afdc8e63..3afdc8e63 100644
--- a/ide/XCode3/plists/browser-Info.plist
+++ b/ide/Xcode3.1/plists/browser-Info.plist
diff --git a/ide/XCode3/plists/button-Info.plist b/ide/Xcode3.1/plists/button-Info.plist
index f6e92147b..f6e92147b 100644
--- a/ide/XCode3/plists/button-Info.plist
+++ b/ide/Xcode3.1/plists/button-Info.plist
diff --git a/ide/XCode3/plists/buttons-Info.plist b/ide/Xcode3.1/plists/buttons-Info.plist
index 42ae60000..42ae60000 100644
--- a/ide/XCode3/plists/buttons-Info.plist
+++ b/ide/Xcode3.1/plists/buttons-Info.plist
diff --git a/ide/XCode3/plists/checkers-Info.plist b/ide/Xcode3.1/plists/checkers-Info.plist
index 2fb15d9c2..2fb15d9c2 100644
--- a/ide/XCode3/plists/checkers-Info.plist
+++ b/ide/Xcode3.1/plists/checkers-Info.plist
diff --git a/ide/XCode3/plists/clock-Info.plist b/ide/Xcode3.1/plists/clock-Info.plist
index 6d948c7a3..6d948c7a3 100644
--- a/ide/XCode3/plists/clock-Info.plist
+++ b/ide/Xcode3.1/plists/clock-Info.plist
diff --git a/ide/Xcode3.1/plists/colbrowser-Info.plist b/ide/Xcode3.1/plists/colbrowser-Info.plist
new file mode 100644
index 000000000..8d0b68908
--- /dev/null
+++ b/ide/Xcode3.1/plists/colbrowser-Info.plist
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.fltk.test.colbrowser</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleSignature</key>
+	<string>FLTK</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+</dict>
+</plist>
diff --git a/ide/XCode3/plists/color_chooser-Info.plist b/ide/Xcode3.1/plists/color_chooser-Info.plist
index 54ea9b6fb..54ea9b6fb 100644
--- a/ide/XCode3/plists/color_chooser-Info.plist
+++ b/ide/Xcode3.1/plists/color_chooser-Info.plist
diff --git a/ide/XCode3/plists/cube-Info.plist b/ide/Xcode3.1/plists/cube-Info.plist
index e682531a7..e682531a7 100644
--- a/ide/XCode3/plists/cube-Info.plist
+++ b/ide/Xcode3.1/plists/cube-Info.plist
diff --git a/ide/XCode3/plists/cursor-Info.plist b/ide/Xcode3.1/plists/cursor-Info.plist
index 4a4fbca1f..4a4fbca1f 100644
--- a/ide/XCode3/plists/cursor-Info.plist
+++ b/ide/Xcode3.1/plists/cursor-Info.plist
diff --git a/ide/Xcode3.1/plists/curve-Info.plist b/ide/Xcode3.1/plists/curve-Info.plist
new file mode 100644
index 000000000..f239b8721
--- /dev/null
+++ b/ide/Xcode3.1/plists/curve-Info.plist
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.fltk.test.curve</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleSignature</key>
+	<string>FLTK</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+</dict>
+</plist>
diff --git a/ide/XCode3/plists/doublebuffer-Info.plist b/ide/Xcode3.1/plists/doublebuffer-Info.plist
index e297bf965..e297bf965 100644
--- a/ide/XCode3/plists/doublebuffer-Info.plist
+++ b/ide/Xcode3.1/plists/doublebuffer-Info.plist
diff --git a/ide/XCode3/plists/editor-Info.plist b/ide/Xcode3.1/plists/editor-Info.plist
index 827f6e737..827f6e737 100644
--- a/ide/XCode3/plists/editor-Info.plist
+++ b/ide/Xcode3.1/plists/editor-Info.plist
diff --git a/ide/XCode3/plists/fast_slow-Info.plist b/ide/Xcode3.1/plists/fast_slow-Info.plist
index 92f9bd54b..92f9bd54b 100644
--- a/ide/XCode3/plists/fast_slow-Info.plist
+++ b/ide/Xcode3.1/plists/fast_slow-Info.plist
diff --git a/ide/XCode3/plists/file_chooser-Info.plist b/ide/Xcode3.1/plists/file_chooser-Info.plist
index 5bc736887..5bc736887 100644
--- a/ide/XCode3/plists/file_chooser-Info.plist
+++ b/ide/Xcode3.1/plists/file_chooser-Info.plist
diff --git a/ide/XCode3/plists/fltk-Info.plist b/ide/Xcode3.1/plists/fltk-Info.plist
index 985b3a84b..985b3a84b 100644
--- a/ide/XCode3/plists/fltk-Info.plist
+++ b/ide/Xcode3.1/plists/fltk-Info.plist
diff --git a/ide/XCode3/plists/fltk_forms-Info.plist b/ide/Xcode3.1/plists/fltk_forms-Info.plist
index 96db271b8..96db271b8 100644
--- a/ide/XCode3/plists/fltk_forms-Info.plist
+++ b/ide/Xcode3.1/plists/fltk_forms-Info.plist
diff --git a/ide/XCode3/plists/fltk_gl-Info.plist b/ide/Xcode3.1/plists/fltk_gl-Info.plist
index 06f34b0b0..06f34b0b0 100644
--- a/ide/XCode3/plists/fltk_gl-Info.plist
+++ b/ide/Xcode3.1/plists/fltk_gl-Info.plist
diff --git a/ide/XCode3/plists/fltk_images-Info.plist b/ide/Xcode3.1/plists/fltk_images-Info.plist
index d48866081..d48866081 100644
--- a/ide/XCode3/plists/fltk_images-Info.plist
+++ b/ide/Xcode3.1/plists/fltk_images-Info.plist
diff --git a/ide/XCode3/plists/fltk_jpeg-Info.plist b/ide/Xcode3.1/plists/fltk_jpeg-Info.plist
index e28cf40ad..e28cf40ad 100644
--- a/ide/XCode3/plists/fltk_jpeg-Info.plist
+++ b/ide/Xcode3.1/plists/fltk_jpeg-Info.plist
diff --git a/ide/XCode3/plists/fltk_png-Info.plist b/ide/Xcode3.1/plists/fltk_png-Info.plist
index 88da5d54d..88da5d54d 100644
--- a/ide/XCode3/plists/fltk_png-Info.plist
+++ b/ide/Xcode3.1/plists/fltk_png-Info.plist
diff --git a/ide/XCode3/plists/fonts-Info.plist b/ide/Xcode3.1/plists/fonts-Info.plist
index 7215b1390..7215b1390 100644
--- a/ide/XCode3/plists/fonts-Info.plist
+++ b/ide/Xcode3.1/plists/fonts-Info.plist
diff --git a/ide/XCode3/plists/forms-Info.plist b/ide/Xcode3.1/plists/forms-Info.plist
index cfc933592..cfc933592 100644
--- a/ide/XCode3/plists/forms-Info.plist
+++ b/ide/Xcode3.1/plists/forms-Info.plist
diff --git a/ide/XCode3/plists/fractals-Info.plist b/ide/Xcode3.1/plists/fractals-Info.plist
index 56511d18d..56511d18d 100644
--- a/ide/XCode3/plists/fractals-Info.plist
+++ b/ide/Xcode3.1/plists/fractals-Info.plist
diff --git a/ide/XCode3/plists/fullscreen-Info.plist b/ide/Xcode3.1/plists/fullscreen-Info.plist
index 0fedb62a2..0fedb62a2 100644
--- a/ide/XCode3/plists/fullscreen-Info.plist
+++ b/ide/Xcode3.1/plists/fullscreen-Info.plist
diff --git a/ide/XCode3/plists/gl_overlay-Info.plist b/ide/Xcode3.1/plists/gl_overlay-Info.plist
index 1678f8b50..1678f8b50 100644
--- a/ide/XCode3/plists/gl_overlay-Info.plist
+++ b/ide/Xcode3.1/plists/gl_overlay-Info.plist
diff --git a/ide/XCode3/plists/glpuzzle-Info.plist b/ide/Xcode3.1/plists/glpuzzle-Info.plist
index cbb4dd67c..cbb4dd67c 100644
--- a/ide/XCode3/plists/glpuzzle-Info.plist
+++ b/ide/Xcode3.1/plists/glpuzzle-Info.plist
diff --git a/ide/XCode3/plists/hello-Info.plist b/ide/Xcode3.1/plists/hello-Info.plist
index de7678b91..de7678b91 100644
--- a/ide/XCode3/plists/hello-Info.plist
+++ b/ide/Xcode3.1/plists/hello-Info.plist
diff --git a/ide/XCode3/plists/help-Info.plist b/ide/Xcode3.1/plists/help-Info.plist
index e1f2fe915..e1f2fe915 100644
--- a/ide/XCode3/plists/help-Info.plist
+++ b/ide/Xcode3.1/plists/help-Info.plist
diff --git a/ide/XCode3/plists/iconize-Info.plist b/ide/Xcode3.1/plists/iconize-Info.plist
index d8ac60b6b..d8ac60b6b 100644
--- a/ide/XCode3/plists/iconize-Info.plist
+++ b/ide/Xcode3.1/plists/iconize-Info.plist
diff --git a/ide/XCode3/plists/image-Info.plist b/ide/Xcode3.1/plists/image-Info.plist
index c1ea9c7ef..c1ea9c7ef 100644
--- a/ide/XCode3/plists/image-Info.plist
+++ b/ide/Xcode3.1/plists/image-Info.plist
diff --git a/ide/XCode3/plists/inactive-Info.plist b/ide/Xcode3.1/plists/inactive-Info.plist
index e5469ee38..e5469ee38 100644
--- a/ide/XCode3/plists/inactive-Info.plist
+++ b/ide/Xcode3.1/plists/inactive-Info.plist
diff --git a/ide/XCode3/plists/input-Info.plist b/ide/Xcode3.1/plists/input-Info.plist
index e71658e83..e71658e83 100644
--- a/ide/XCode3/plists/input-Info.plist
+++ b/ide/Xcode3.1/plists/input-Info.plist
diff --git a/ide/XCode3/plists/input_choice-Info.plist b/ide/Xcode3.1/plists/input_choice-Info.plist
index 86da1aebd..86da1aebd 100644
--- a/ide/XCode3/plists/input_choice-Info.plist
+++ b/ide/Xcode3.1/plists/input_choice-Info.plist
diff --git a/ide/XCode3/plists/keyboard-Info.plist b/ide/Xcode3.1/plists/keyboard-Info.plist
index a2ec0d4fd..a2ec0d4fd 100644
--- a/ide/XCode3/plists/keyboard-Info.plist
+++ b/ide/Xcode3.1/plists/keyboard-Info.plist
diff --git a/ide/XCode3/plists/label-Info.plist b/ide/Xcode3.1/plists/label-Info.plist
index 90702ae71..90702ae71 100644
--- a/ide/XCode3/plists/label-Info.plist
+++ b/ide/Xcode3.1/plists/label-Info.plist
diff --git a/ide/XCode3/plists/line_style-Info.plist b/ide/Xcode3.1/plists/line_style-Info.plist
index 2bfc91460..2bfc91460 100644
--- a/ide/XCode3/plists/line_style-Info.plist
+++ b/ide/Xcode3.1/plists/line_style-Info.plist
diff --git a/ide/XCode3/plists/list_visuals-Info.plist b/ide/Xcode3.1/plists/list_visuals-Info.plist
index 4f2f2379c..4f2f2379c 100644
--- a/ide/XCode3/plists/list_visuals-Info.plist
+++ b/ide/Xcode3.1/plists/list_visuals-Info.plist
diff --git a/ide/XCode3/plists/mandelbrot-Info.plist b/ide/Xcode3.1/plists/mandelbrot-Info.plist
index e84c0e7e7..e84c0e7e7 100644
--- a/ide/XCode3/plists/mandelbrot-Info.plist
+++ b/ide/Xcode3.1/plists/mandelbrot-Info.plist
diff --git a/ide/XCode3/plists/menubar-Info.plist b/ide/Xcode3.1/plists/menubar-Info.plist
index 8f38c4ba0..8f38c4ba0 100644
--- a/ide/XCode3/plists/menubar-Info.plist
+++ b/ide/Xcode3.1/plists/menubar-Info.plist
diff --git a/ide/XCode3/plists/message-Info.plist b/ide/Xcode3.1/plists/message-Info.plist
index d60db4166..d60db4166 100644
--- a/ide/XCode3/plists/message-Info.plist
+++ b/ide/Xcode3.1/plists/message-Info.plist
diff --git a/ide/XCode3/plists/minimum-Info.plist b/ide/Xcode3.1/plists/minimum-Info.plist
index 98745afbc..98745afbc 100644
--- a/ide/XCode3/plists/minimum-Info.plist
+++ b/ide/Xcode3.1/plists/minimum-Info.plist
diff --git a/ide/XCode3/plists/navigation-Info.plist b/ide/Xcode3.1/plists/navigation-Info.plist
index e5cda0367..e5cda0367 100644
--- a/ide/XCode3/plists/navigation-Info.plist
+++ b/ide/Xcode3.1/plists/navigation-Info.plist
diff --git a/ide/XCode3/plists/output-Info.plist b/ide/Xcode3.1/plists/output-Info.plist
index 760b373d0..760b373d0 100644
--- a/ide/XCode3/plists/output-Info.plist
+++ b/ide/Xcode3.1/plists/output-Info.plist
diff --git a/ide/XCode3/plists/overlay-Info.plist b/ide/Xcode3.1/plists/overlay-Info.plist
index 6d59e2ffc..6d59e2ffc 100644
--- a/ide/XCode3/plists/overlay-Info.plist
+++ b/ide/Xcode3.1/plists/overlay-Info.plist
diff --git a/ide/XCode3/plists/pack-Info.plist b/ide/Xcode3.1/plists/pack-Info.plist
index d3ceef764..d3ceef764 100644
--- a/ide/XCode3/plists/pack-Info.plist
+++ b/ide/Xcode3.1/plists/pack-Info.plist
diff --git a/ide/XCode3/plists/pixmap-Info.plist b/ide/Xcode3.1/plists/pixmap-Info.plist
index e6cb686f3..e6cb686f3 100644
--- a/ide/XCode3/plists/pixmap-Info.plist
+++ b/ide/Xcode3.1/plists/pixmap-Info.plist
diff --git a/ide/XCode3/plists/pixmap_browser-Info.plist b/ide/Xcode3.1/plists/pixmap_browser-Info.plist
index 140bb0a60..140bb0a60 100644
--- a/ide/XCode3/plists/pixmap_browser-Info.plist
+++ b/ide/Xcode3.1/plists/pixmap_browser-Info.plist
diff --git a/ide/XCode3/plists/preferences-Info.plist b/ide/Xcode3.1/plists/preferences-Info.plist
index c2a11d02d..c2a11d02d 100644
--- a/ide/XCode3/plists/preferences-Info.plist
+++ b/ide/Xcode3.1/plists/preferences-Info.plist
diff --git a/ide/XCode3/plists/radio-Info.plist b/ide/Xcode3.1/plists/radio-Info.plist
index 8438966a9..8438966a9 100644
--- a/ide/XCode3/plists/radio-Info.plist
+++ b/ide/Xcode3.1/plists/radio-Info.plist
diff --git a/ide/XCode3/plists/resize-Info.plist b/ide/Xcode3.1/plists/resize-Info.plist
index 7168ae8ae..7168ae8ae 100644
--- a/ide/XCode3/plists/resize-Info.plist
+++ b/ide/Xcode3.1/plists/resize-Info.plist
diff --git a/ide/XCode3/plists/resizebox-Info.plist b/ide/Xcode3.1/plists/resizebox-Info.plist
index c49783065..c49783065 100644
--- a/ide/XCode3/plists/resizebox-Info.plist
+++ b/ide/Xcode3.1/plists/resizebox-Info.plist
diff --git a/ide/XCode3/plists/scroll-Info.plist b/ide/Xcode3.1/plists/scroll-Info.plist
index ae64f2fb8..ae64f2fb8 100644
--- a/ide/XCode3/plists/scroll-Info.plist
+++ b/ide/Xcode3.1/plists/scroll-Info.plist
diff --git a/ide/XCode3/plists/shape-Info.plist b/ide/Xcode3.1/plists/shape-Info.plist
index d59e8ef8b..d59e8ef8b 100644
--- a/ide/XCode3/plists/shape-Info.plist
+++ b/ide/Xcode3.1/plists/shape-Info.plist
diff --git a/ide/XCode3/plists/subwindow-Info.plist b/ide/Xcode3.1/plists/subwindow-Info.plist
index af46a4ad5..af46a4ad5 100644
--- a/ide/XCode3/plists/subwindow-Info.plist
+++ b/ide/Xcode3.1/plists/subwindow-Info.plist
diff --git a/ide/XCode3/plists/sudoku-Info.plist b/ide/Xcode3.1/plists/sudoku-Info.plist
index 9c7c501fe..9c7c501fe 100644
--- a/ide/XCode3/plists/sudoku-Info.plist
+++ b/ide/Xcode3.1/plists/sudoku-Info.plist
diff --git a/ide/XCode3/plists/symbols-Info.plist b/ide/Xcode3.1/plists/symbols-Info.plist
index ece697629..ece697629 100644
--- a/ide/XCode3/plists/symbols-Info.plist
+++ b/ide/Xcode3.1/plists/symbols-Info.plist
diff --git a/ide/XCode3/plists/tabs-Info.plist b/ide/Xcode3.1/plists/tabs-Info.plist
index eb3b8ab92..eb3b8ab92 100644
--- a/ide/XCode3/plists/tabs-Info.plist
+++ b/ide/Xcode3.1/plists/tabs-Info.plist
diff --git a/ide/XCode3/plists/threads-Info.plist b/ide/Xcode3.1/plists/threads-Info.plist
index 163de285b..163de285b 100644
--- a/ide/XCode3/plists/threads-Info.plist
+++ b/ide/Xcode3.1/plists/threads-Info.plist
diff --git a/ide/XCode3/plists/tile-Info.plist b/ide/Xcode3.1/plists/tile-Info.plist
index 21c095ef4..21c095ef4 100644
--- a/ide/XCode3/plists/tile-Info.plist
+++ b/ide/Xcode3.1/plists/tile-Info.plist
diff --git a/ide/XCode3/plists/tiled_image-Info.plist b/ide/Xcode3.1/plists/tiled_image-Info.plist
index a302c5e9c..a302c5e9c 100644
--- a/ide/XCode3/plists/tiled_image-Info.plist
+++ b/ide/Xcode3.1/plists/tiled_image-Info.plist
diff --git a/ide/Xcode3.1/plists/utf8-Info.plist b/ide/Xcode3.1/plists/utf8-Info.plist
new file mode 100644
index 000000000..ece697629
--- /dev/null
+++ b/ide/Xcode3.1/plists/utf8-Info.plist
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.yourcompany.symbols</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+</dict>
+</plist>
diff --git a/ide/XCode3/plists/valuators-Info.plist b/ide/Xcode3.1/plists/valuators-Info.plist
index dad63cc54..dad63cc54 100644
--- a/ide/XCode3/plists/valuators-Info.plist
+++ b/ide/Xcode3.1/plists/valuators-Info.plist