[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit a9bdc3e48d714a60dceffcc2bcb249c62d96a8c8
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 6 15:36:10 2002 +0000

    	- fixed 3017536 -- Change default font to Lucida Grande 14 pt.
    
            * WebView.subproj/WebPreferences.m: (+[WebPreferences load]):
    	Changed default font and sans serif font family names to Lucida Grande.
    	Changed default font size to 14 point.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1747 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 2a95ed0..df480c7 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,11 @@
+2002-08-06  Darin Adler  <darin at apple.com>
+
+	- fixed 3017536 -- Change default font to Lucida Grande 14 pt.
+
+        * WebView.subproj/WebPreferences.m: (+[WebPreferences load]):
+	Changed default font and sans serif font family names to Lucida Grande.
+	Changed default font size to 14 point.
+
 2002-08-05  Maciej Stachowiak  <mjs at apple.com>
 
 	fixed 2974993 - window.open does not return the right window object
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 2a95ed0..df480c7 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,11 @@
+2002-08-06  Darin Adler  <darin at apple.com>
+
+	- fixed 3017536 -- Change default font to Lucida Grande 14 pt.
+
+        * WebView.subproj/WebPreferences.m: (+[WebPreferences load]):
+	Changed default font and sans serif font family names to Lucida Grande.
+	Changed default font size to 14 point.
+
 2002-08-05  Maciej Stachowiak  <mjs at apple.com>
 
 	fixed 2974993 - window.open does not return the right window object
diff --git a/WebKit/WebView.subproj/WebPreferences.m b/WebKit/WebView.subproj/WebPreferences.m
index 53d6653..dd894e3 100644
--- a/WebKit/WebView.subproj/WebPreferences.m
+++ b/WebKit/WebView.subproj/WebPreferences.m
@@ -1,32 +1,32 @@
-/*	
+/*        
         WebPreferences.mm
-	Copyright 2001, Apple, Inc. All rights reserved.
+        Copyright 2001, Apple, Inc. All rights reserved.
 */
 #import "WebPreferences.h"
 
 #import <WebKit/WebKitDebug.h>
 
 // These are private because callers should be using the cover methods
-#define	WebKitLogLevelPreferenceKey		@"WebKitLogLevel"
-#define	WebKitStandardFontPreferenceKey		@"WebKitStandardFont"
-#define	WebKitFixedFontPreferenceKey		@"WebKitFixedFont"
-#define	WebKitSerifFontPreferenceKey		@"WebKitSerifFont"
-#define	WebKitSansSerifFontPreferenceKey	@"WebKitSansSerifFont"
-#define	WebKitCursiveFontPreferenceKey		@"WebKitCursiveFont"
-#define	WebKitFantasyFontPreferenceKey		@"WebKitFantasyFont"
-#define	WebKitMinimumFontSizePreferenceKey	@"WebKitMinimumFontSize"
-#define	WebKitDefaultFontSizePreferenceKey	@"WebKitDefaultFontSize"
-#define	WebKitJavaEnabledPreferenceKey		@"WebKitJavaEnabled"
-#define	WebKitJavaScriptEnabledPreferenceKey	@"WebKitJavaScriptEnabled"
-#define	WebKitJavaScriptCanOpenWindowsAutomaticallyPreferenceKey	@"WebKitJavaScriptCanOpenWindowsAutomatically"
-#define	WebKitPluginsEnabledPreferenceKey	@"WebKitPluginsEnabled"
-#define	WebKitInitialTimedLayoutDelayPreferenceKey	@"WebKitInitialTimedLayoutDelay"
-#define	WebKitInitialTimedLayoutSizePreferenceKey	@"WebKitInitialTimedLayoutSize"
-#define	WebKitInitialTimedLayoutEnabledPreferenceKey	@"WebKitInitialTimedLayoutEnabled"
-#define	WebKitResourceTimedLayoutEnabledPreferenceKey	@"WebKitResourceTimedLayoutEnabled"
-#define	WebKitResourceTimedLayoutDelayPreferenceKey	@"WebKitResourceTimedLayoutDelay"
-#define	WebKitAllowAnimatedImagesPreferenceKey	@"WebKitAllowAnimatedImagesPreferenceKey"
-#define	WebKitAllowAnimatedImageLoopingPreferenceKey	@"WebKitAllowAnimatedImageLoopingPreferenceKey"
+#define        WebKitLogLevelPreferenceKey                @"WebKitLogLevel"
+#define        WebKitStandardFontPreferenceKey                @"WebKitStandardFont"
+#define        WebKitFixedFontPreferenceKey                @"WebKitFixedFont"
+#define        WebKitSerifFontPreferenceKey                @"WebKitSerifFont"
+#define        WebKitSansSerifFontPreferenceKey        @"WebKitSansSerifFont"
+#define        WebKitCursiveFontPreferenceKey                @"WebKitCursiveFont"
+#define        WebKitFantasyFontPreferenceKey                @"WebKitFantasyFont"
+#define        WebKitMinimumFontSizePreferenceKey        @"WebKitMinimumFontSize"
+#define        WebKitDefaultFontSizePreferenceKey        @"WebKitDefaultFontSize"
+#define        WebKitJavaEnabledPreferenceKey                @"WebKitJavaEnabled"
+#define        WebKitJavaScriptEnabledPreferenceKey        @"WebKitJavaScriptEnabled"
+#define        WebKitJavaScriptCanOpenWindowsAutomaticallyPreferenceKey        @"WebKitJavaScriptCanOpenWindowsAutomatically"
+#define        WebKitPluginsEnabledPreferenceKey        @"WebKitPluginsEnabled"
+#define        WebKitInitialTimedLayoutDelayPreferenceKey        @"WebKitInitialTimedLayoutDelay"
+#define        WebKitInitialTimedLayoutSizePreferenceKey        @"WebKitInitialTimedLayoutSize"
+#define        WebKitInitialTimedLayoutEnabledPreferenceKey        @"WebKitInitialTimedLayoutEnabled"
+#define        WebKitResourceTimedLayoutEnabledPreferenceKey        @"WebKitResourceTimedLayoutEnabled"
+#define        WebKitResourceTimedLayoutDelayPreferenceKey        @"WebKitResourceTimedLayoutDelay"
+#define        WebKitAllowAnimatedImagesPreferenceKey        @"WebKitAllowAnimatedImagesPreferenceKey"
+#define        WebKitAllowAnimatedImageLoopingPreferenceKey        @"WebKitAllowAnimatedImageLoopingPreferenceKey"
 
 @implementation WebPreferences
 
@@ -56,26 +56,26 @@ static WebPreferences *_standardPreferences = nil;
     NSNumber *allowAnimatedImageLooping = [NSNumber numberWithBool:TRUE];
 
     NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
-        @"0x0", 			WebKitLogLevelPreferenceKey,
-        @"Times New Roman", 		WebKitStandardFontPreferenceKey,
-        @"Courier",	  		WebKitFixedFontPreferenceKey,
-        @"Times New Roman", 		WebKitSerifFontPreferenceKey,
-        @"Arial", 			WebKitSansSerifFontPreferenceKey,
-        @"Apple Chancery", 		WebKitCursiveFontPreferenceKey,
-        @"Papyrus", 			WebKitFantasyFontPreferenceKey,
-        @"6", 				WebKitMinimumFontSizePreferenceKey,
-        @"16", 				WebKitDefaultFontSizePreferenceKey,
-        @"1.85",		 	WebKitInitialTimedLayoutDelayPreferenceKey,
-        @"4096", 			WebKitInitialTimedLayoutSizePreferenceKey,
-        @"1.85", 			WebKitResourceTimedLayoutDelayPreferenceKey,
-        timedLayoutEnabled,		WebKitInitialTimedLayoutEnabledPreferenceKey,
-        resourceTimedLayoutEnabled,	WebKitResourceTimedLayoutEnabledPreferenceKey,
-        javaEnabled,			WebKitJavaEnabledPreferenceKey,
-        javaScriptEnabled,		WebKitJavaScriptEnabledPreferenceKey,
-        javaScriptCanOpenWindows,	WebKitJavaScriptCanOpenWindowsAutomaticallyPreferenceKey,
-        pluginsEnabled,			WebKitPluginsEnabledPreferenceKey,
-        allowAnimatedImages,    WebKitAllowAnimatedImagesPreferenceKey,
-        allowAnimatedImageLooping,    WebKitAllowAnimatedImageLoopingPreferenceKey,
+        @"0x0",                         WebKitLogLevelPreferenceKey,
+        @"Lucida Grande",               WebKitStandardFontPreferenceKey,
+        @"Courier",                     WebKitFixedFontPreferenceKey,
+        @"Times New Roman",             WebKitSerifFontPreferenceKey,
+        @"Lucida Grande",               WebKitSansSerifFontPreferenceKey,
+        @"Apple Chancery",              WebKitCursiveFontPreferenceKey,
+        @"Papyrus",                     WebKitFantasyFontPreferenceKey,
+        @"6",                           WebKitMinimumFontSizePreferenceKey,
+        @"14",                          WebKitDefaultFontSizePreferenceKey,
+        @"1.85",                        WebKitInitialTimedLayoutDelayPreferenceKey,
+        @"4096",                        WebKitInitialTimedLayoutSizePreferenceKey,
+        @"1.85",                        WebKitResourceTimedLayoutDelayPreferenceKey,
+        timedLayoutEnabled,             WebKitInitialTimedLayoutEnabledPreferenceKey,
+        resourceTimedLayoutEnabled,     WebKitResourceTimedLayoutEnabledPreferenceKey,
+        javaEnabled,                    WebKitJavaEnabledPreferenceKey,
+        javaScriptEnabled,              WebKitJavaScriptEnabledPreferenceKey,
+        javaScriptCanOpenWindows,       WebKitJavaScriptCanOpenWindowsAutomaticallyPreferenceKey,
+        pluginsEnabled,                 WebKitPluginsEnabledPreferenceKey,
+        allowAnimatedImages,            WebKitAllowAnimatedImagesPreferenceKey,
+        allowAnimatedImageLooping,      WebKitAllowAnimatedImageLoopingPreferenceKey,
         nil];
 
     [[NSUserDefaults standardUserDefaults] registerDefaults:dict];

-- 
WebKit Debian packaging