From 68066f90e1e2c7df5f7e6c701e54490f82490834 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Mon, 4 Dec 2006 22:09:34 +0000 Subject: 2006-12-04 Roman Kennke * javax/swing/text/BoxView.java (paint): Replaced painting algorithm with more simple and more reliable painting of the box. * javax/swing/text/html/BlockView.java (PositionInfo): New inner class. Stores additional CSS positioning information. (positionInfo): New field. (BlockView): Initialize positionInfo field. (fetchLayoutInfo): New helper method. Fetches additional CSS positioning information. (layoutMajorAxis): Perform additional CSS layout. (layoutMinorAxis): Perform additional CSS layout. (positionView): New helper method. (replace): Overridden to fetch additional layout information. * javax/swing/text/html/CSS.java (Attribute.POSITION): New field. (Attribute.LEFT): New field. (Attribute.RIGHT): New field. (Attribute.TOP): New field. (Attribute.BOTTOM): New field. (getValue): Create Length for left, right, top and bottom attributes. 2006-12-04 Roman Kennke * gnu/javax/swing/text/html/parser/support/Parser.java (Sgml): Consume any whitespace that immediately follows and sgml insertion. (parseDocument): Consume any initial whitespace. --- ChangeLog | 32 ++++++++++++++++++++++++++++++++ javax/swing/text/html/CSS.java | 1 + 2 files changed, 33 insertions(+) diff --git a/ChangeLog b/ChangeLog index 995d5977b..b8aafeb09 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,35 @@ +2006-12-04 Roman Kennke + + * javax/swing/text/BoxView.java + (paint): Replaced painting algorithm with more simple and more + reliable painting of the box. + * javax/swing/text/html/BlockView.java + (PositionInfo): New inner class. Stores additional CSS + positioning information. + (positionInfo): New field. + (BlockView): Initialize positionInfo field. + (fetchLayoutInfo): New helper method. Fetches additional + CSS positioning information. + (layoutMajorAxis): Perform additional CSS layout. + (layoutMinorAxis): Perform additional CSS layout. + (positionView): New helper method. + (replace): Overridden to fetch additional layout information. + * javax/swing/text/html/CSS.java + (Attribute.POSITION): New field. + (Attribute.LEFT): New field. + (Attribute.RIGHT): New field. + (Attribute.TOP): New field. + (Attribute.BOTTOM): New field. + (getValue): Create Length for left, right, top and bottom + attributes. + +2006-12-04 Roman Kennke + + * gnu/javax/swing/text/html/parser/support/Parser.java + (Sgml): Consume any whitespace that immediately follows + and sgml insertion. + (parseDocument): Consume any initial whitespace. + 2006-12-03 Mark Wielaard * gnu/javax/management/Server.java (beans): Initialize. diff --git a/javax/swing/text/html/CSS.java b/javax/swing/text/html/CSS.java index 77f94a608..294d47fb2 100644 --- a/javax/swing/text/html/CSS.java +++ b/javax/swing/text/html/CSS.java @@ -645,6 +645,7 @@ public class CSS implements Serializable if (numTokens == 1) { Length l = new Length(tokens.nextToken()); + System.err.println("margin: " + l); atts.addAttribute(Attribute.MARGIN_BOTTOM, l); atts.addAttribute(Attribute.MARGIN_LEFT, l); atts.addAttribute(Attribute.MARGIN_RIGHT, l); -- cgit v1.2.1