--- src/frontends/qt2/qfont_loader.C.orig	Fri Oct  3 09:34:40 2003
+++ src/frontends/qt2/qfont_loader.C	Tue Dec 30 12:25:32 2003
@@ -43,6 +43,10 @@
 using std::pair;
 using std::make_pair;
 
+#ifdef Q_WS_MAC
+#include <ApplicationServices/ApplicationServices.h>
+#endif
+
 namespace {
 
 void addFontPath()
@@ -64,6 +68,33 @@
 		lyxerr << "Unable to add font path." << endl;
 	}
 #endif
+#ifdef Q_WS_MAC
+	CFBundleRef  myAppBundle = CFBundleGetMainBundle();
+	CFURLRef  myAppResourcesURL, FontsURL;
+	FSRef  fontDirRef;
+	FSSpec  fontDirSpec;
+	CFStringRef  filePath = CFStringCreateWithBytes(kCFAllocatorDefault,
+					(UInt8 *) "Fonts", strlen("Fonts"),  
+					kCFStringEncodingISOLatin1, false);
+
+	myAppResourcesURL = CFBundleCopyResourcesDirectoryURL(myAppBundle);
+	FontsURL = CFURLCreateCopyAppendingPathComponent(kCFAllocatorDefault, 
+			myAppResourcesURL, filePath, true);
+	if (lyxerr.debugging(Debug::FONT)) {
+		UInt8  buf[255];
+		CFURLGetFileSystemRepresentation(FontsURL, true, buf, 255);
+		lyxerr[Debug::FONT] << "Adding Fonts directory: " << buf << endl;
+	}
+	CFURLGetFSRef (FontsURL, &fontDirRef);
+	OSStatus err = FSGetCatalogInfo (&fontDirRef, kFSCatInfoNone, 
+					 NULL, NULL, &fontDirSpec, NULL);
+	if (err) 
+		lyxerr << "FSGetCatalogInfo err = " << err << endl;
+	err = FMActivateFonts (&fontDirSpec, NULL, NULL, 
+			       kFMLocalActivationContext); 
+	if (err)
+		lyxerr << "FMActivateFonts err = " << err << endl;
+#endif
 }
 
 
@@ -220,6 +251,9 @@
 			}
 		}
 	}
+#ifdef Q_WS_MAC
+	addFontPath();
+#endif
 }
 
 
--- src/frontends/qt2/ChangeLog.orig	Tue Dec  9 09:15:22 2003
+++ src/frontends/qt2/ChangeLog	Tue Dec 30 07:52:43 2003
@@ -1,3 +1,8 @@
+2003-12-30  Ronald Florence  <ron@18james.com>
+
+	* qfont_loader.C: added support for LyX/Mac to find Fonts
+	directory inside the application bundle.
+
 2003-12-08  Ronald Florence  <ron@18james.com>
 
 	* QWorkArea.C (checkAppleEventForMissingParams)