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

[sullivan]

The following commit has been merged in the debian/unstable branch:
commit 93209c312cab3ce2980c05d703031000a65a901d
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 4 23:09:22 2002 +0000

    	Changed default fonts.
    
    	* WebView.subproj/IFWebDataSource.mm:
    	(+[IFWebDataSource initialize]): Changed default fonts to ones
    	that actually exist (this was listing "Times-Roman" where it
    	meant either "Times" or "Times New Roman"). I'm about to check
    	in working font preferences, so it won't matter too much if you
    	don't like the defaults (although we should of course make sure
    	that the defaults are sensible, which I think they are).
    
        Made font preferences work (though not font size preferences; that is next).
        Various font-related tweaking.
    
    	* AppController.m: (+[AppController initialize]):
    	Added NSLog in case where Defaults.plist couldn't be parsed as a dictionary;
    	this can be caused by typos or cut-and-paste errors and is often difficult
    	to notice.
    
    	* BrowserDocument.m: (-[BrowserDocument changeFont:]),
    	* LocationFieldEditor.m: (-[LocationFieldEditor changeFont:]):
    	Pass changeFont: messages to the preferences window, so the font panel keeps
    	working when you bring a browser window to the front.
    
    	* Defaults.plist:
    	* PreferenceKeys.h:
    	Removed values for WebKit preferences, since the default values for those
    	are stored in WebKit. Removed size-per-font defaults since at least for
    	now there will be a single font size for all fonts. Added default for
    	"medium font size", which will be used later to construct the array of
    	font sizes WebKit wants.
    
    	* Preferences.subproj/TextPreferences.m:
    
    	(-[TextPreferences updateFontSampleField:]): use same sizeKey for each
    	sample; use localizedNameForFamily instead of fontName for displayed text;
    	get font from chosen family name with standard weight so sample field won't
    	show typeface that WebKit won't use.
    
    	(-[TextPreferences updateFontSampleFields]):
    	New method, calls updateFontSampleField on each field.
    
    	(-[TextPreferences chooseFont:]): New method, bottleneck for the three
    	font-choosing methods;
    
    	(-[TextPreferences chooseSerifFont:]),
    	(-[TextPreferences chooseSansSerifFont:]),
    	(-[TextPreferences chooseMonospacedFont:]):
    	Call chooseFont: instead of	duplicating code.
    
    	(-[TextPreferences changeFont:]): use same sizeKey for all fonts; update
    	all sample fields after change since size changes affect all fonts; store
    	familyName instead of fontName.
    
    	(-[TextPreferences takeStandardFontChoiceFrom:]): use same sizeKey for all fonts.
    
    	(-[TextPreferences initializeFromDefaults]): Call updateFontSampleFields.
    
    	(-[TextPreferences moduleWillBeRemoved]): Close the font panel when the
    	text preferences pane is no longer showing.
    
    	* Preferences.subproj/WBPreferences.m: (-[WBPreferences windowWillClose:]):
    	Call moduleWillBeRemoved on current module.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@687 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 703be10..b58295f 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,4 +1,16 @@
-2002-03-04  John Sullivan (local)  <sullivan at apple.com>
+2002-03-04  John Sullivan  <sullivan at apple.com>
+
+	Changed default fonts.
+
+	* WebView.subproj/IFWebDataSource.mm: 
+	(+[IFWebDataSource initialize]): Changed default fonts to ones
+	that actually exist (this was listing "Times-Roman" where it
+	meant either "Times" or "Times New Roman"). I'm about to check
+	in working font preferences, so it won't matter too much if you
+	don't like the defaults (although we should of course make sure
+	that the defaults are sensible, which I think they are).
+
+2002-03-04  John Sullivan  <sullivan at apple.com>
 
 	* WebView.subproj/IFWebDataSource.mm: (+[IFWebDataSource initialize]):
 	Reverted default fonts to what they were before I accidentally
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 703be10..b58295f 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,4 +1,16 @@
-2002-03-04  John Sullivan (local)  <sullivan at apple.com>
+2002-03-04  John Sullivan  <sullivan at apple.com>
+
+	Changed default fonts.
+
+	* WebView.subproj/IFWebDataSource.mm: 
+	(+[IFWebDataSource initialize]): Changed default fonts to ones
+	that actually exist (this was listing "Times-Roman" where it
+	meant either "Times" or "Times New Roman"). I'm about to check
+	in working font preferences, so it won't matter too much if you
+	don't like the defaults (although we should of course make sure
+	that the defaults are sensible, which I think they are).
+
+2002-03-04  John Sullivan  <sullivan at apple.com>
 
 	* WebView.subproj/IFWebDataSource.mm: (+[IFWebDataSource initialize]):
 	Reverted default fonts to what they were before I accidentally
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index afb96f1..3565adf 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 35;
+	objectVersion = 34;
 	objects = {
 		014CEA440018CDF011CA2923 = {
 			buildRules = (
diff --git a/WebKit/WebView.subproj/IFWebDataSource.mm b/WebKit/WebView.subproj/IFWebDataSource.mm
index 6506be0..094a8f2 100644
--- a/WebKit/WebView.subproj/IFWebDataSource.mm
+++ b/WebKit/WebView.subproj/IFWebDataSource.mm
@@ -21,12 +21,12 @@
     NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
 //        @"0xffffffff", 		@"WebKitLogLevel",
         @"0x0", 		@"WebKitLogLevel",
-        @"Times-Roman", 	@"WebKitStandardFont",
-        @"Courier",  		@"WebKitFixedFont",
-        @"Times-Roman", 	@"WebKitSerifFont",
+        @"Georgia", 		@"WebKitStandardFont",
+        @"Andale Mono",  	@"WebKitFixedFont",
+        @"Georgia", 		@"WebKitSerifFont",
         @"Arial", 		@"WebKitSansSerifFont",
-        @"Times-Roman", 	@"WebKitCursiveFont",
-        @"Times-Roman", 	@"WebKitFantasyFont",
+        @"Apple Chancery", 	@"WebKitCursiveFont",
+        @"Papyrus", 		@"WebKitFantasyFont",
         @"6", 			@"WebKitMinimumFontSize",
         fontSizeArray,		@"WebKitFontSizes",
         pluginsEnabled,		@"WebKitPluginsEnabled",
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index 6506be0..094a8f2 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -21,12 +21,12 @@
     NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
 //        @"0xffffffff", 		@"WebKitLogLevel",
         @"0x0", 		@"WebKitLogLevel",
-        @"Times-Roman", 	@"WebKitStandardFont",
-        @"Courier",  		@"WebKitFixedFont",
-        @"Times-Roman", 	@"WebKitSerifFont",
+        @"Georgia", 		@"WebKitStandardFont",
+        @"Andale Mono",  	@"WebKitFixedFont",
+        @"Georgia", 		@"WebKitSerifFont",
         @"Arial", 		@"WebKitSansSerifFont",
-        @"Times-Roman", 	@"WebKitCursiveFont",
-        @"Times-Roman", 	@"WebKitFantasyFont",
+        @"Apple Chancery", 	@"WebKitCursiveFont",
+        @"Papyrus", 		@"WebKitFantasyFont",
         @"6", 			@"WebKitMinimumFontSize",
         fontSizeArray,		@"WebKitFontSizes",
         pluginsEnabled,		@"WebKitPluginsEnabled",

-- 
WebKit Debian packaging