Fix for diveintomark.org's blog

[David Hyatt]

--Apple-Mail-5--574046685
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
	charset=US-ASCII;
	format=flowed

This fix is dependent on porting of the @-konq-quirks directive.  The 
fix is that lists should not flow around floats in strict mode.  This 
addresses the bug.  Note that the new list code in Safari (that stops 
making the bullets float) will naturally have different logic about the 
positioning of the bullets to avoid floats that intrude into the list, 
so you may want to test this with your current list implementation 
before considering it as a fix.


--Apple-Mail-5--574046685
Content-Disposition: attachment;
	filename=diff.txt
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
	x-unix-mode=0644;
	name="diff.txt"

? diff.txt
? patch.txt
? khtml/html/bak.cpp
? khtml/html/diff.txt
? khtml/rendering/bak.cpp
? khtml/rendering/bak.h
? khtml/rendering/bak_container.cpp
? khtml/rendering/bak_flow.cpp
? khtml/rendering/bak_text.cpp
? khtml/rendering/bak_text.h
? khtml/rendering/diff.txt
? khtml/rendering/patch.txt
Index: ChangeLog
===================================================================
RCS file: /local/home/cvs/Labyrinth/WebCore/ChangeLog,v
retrieving revision 1.1228
diff -u -r1.1228 ChangeLog
--- ChangeLog	2003/01/09 18:52:21	1.1228
+++ ChangeLog	2003/01/09 23:53:03
@@ -1,3 +1,15 @@
+2003-01-09  David Hyatt  <hyatt@apple.com>
+
+	The "flow-mode" quirk for lists is just that - a quirk, and should
+	not be applied when in strict mode.
+
+	Fixes diveintomark.org's navigation bar on the front page (issue #2
+	on his list).
+	
+        Reviewed by ???
+
+        * khtml/css/html4.css:
+
 2003-01-08  David Hyatt  <hyatt@apple.com>
 
 	Finish the KONQBLOCK removal and make sure that table rows and
Index: khtml/css/html4.css
===================================================================
RCS file: /local/home/cvs/Labyrinth/WebCore/khtml/css/html4.css,v
retrieving revision 1.34
diff -u -r1.34 html4.css
--- html4.css	2002/12/20 01:50:10	1.34
+++ html4.css	2003/01/09 23:53:04
@@ -267,7 +267,6 @@
         list-style-type: disc;
         margin: 1_qem 0 1em 0;
         padding-left: 40px;
-        -konq-flow-mode: -konq-around-floats;
 }
 
 OL {
@@ -275,7 +274,6 @@
         list-style-type: decimal;
         margin: 1_qem 0 1em 0;
         padding-left: 40px;
-        -konq-flow-mode: -konq-around-floats;
 }
 
 LI {
@@ -539,6 +537,11 @@
     
     img[align="right"] {
         margin-left: 3px;
+    }
+    
+    /* Make lists flow around floats. */
+    UL, OL, MENU, DIR {
+        -konq-flow-mode: -konq-around-floats;
     }
 }
 

--Apple-Mail-5--574046685
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
	charset=US-ASCII;
	format=flowed



Dave
(hyatt@apple.com)



--Apple-Mail-5--574046685--