Completely change the approach used for presentational hints.

This one stands a chance of working sanely.

While this compiles, please don't expect it to link.

svn path=/trunk/libcss/; revision=6820

1 files changed, 7 insertions, 85 deletions

diff --git a/include/libcss/hint.h b/include/libcss/hint.h
index 366b254..8e960e9 100644
--- a/include/libcss/hint.h
+++ b/include/libcss/hint.h
@@ -23,96 +23,18 @@ typedef struct css_hint_length {
 } css_hint_length;
 
 /**
- * Typed colour object for use in presentational hints
- */
-typedef struct css_hint_typed_colour {
-	uint8_t type;
-	css_colour color;
-} css_hint_typed_colour;
-
-/**
- * Typed length object for use in presentational hints
- */
-typedef struct css_hint_typed_length {
-	uint8_t type;
-	css_hint_length length;
-} css_hint_typed_length;
-
-/**
- * Typed string object for use in presentational hints
- */
-typedef struct css_hint_typed_string {
-	uint8_t type;
-	lwc_string *string;
-} css_hint_typed_string;
-
-/**
- * Presentational hint border
- */
-typedef struct css_hint_border {
-	css_hint_typed_length width;
-	css_hint_typed_colour color;
-	uint8_t style;
-} css_hint_border;
-
-/**
  * Presentational hints
- *
- * \todo There's no way to flag that a property isn't set here.
  */
 typedef struct css_hint {
-	css_hint_typed_colour background_color;
-
-	css_hint_typed_string background_image;
-
-	uint8_t border_collapse;
-
-	css_hint_border border_bottom;
-	css_hint_border border_left;
-	css_hint_border border_right;
-	css_hint_border border_top;
+	uint8_t status;
 
-	struct {
-		uint8_t type;
-		css_hint_length h;
-		css_hint_length v;
-	} border_spacing;
-
-	uint8_t caption_side;
-
-	uint8_t clear;
-
-	css_hint_typed_colour color;
-
-	uint8_t _float;
-
-	css_hint_typed_string font_family;
-
-	css_hint_typed_length font_size;
-
-	css_hint_typed_length height;
-
-	uint8_t list_style_type;
-
-	css_hint_typed_length margin_bottom;
-	css_hint_typed_length margin_left;
-	css_hint_typed_length margin_right;
-	css_hint_typed_length margin_top;
-
-	uint8_t overflow;
-
-	css_hint_typed_length padding_bottom;
-	css_hint_typed_length padding_left;
-	css_hint_typed_length padding_right;
-	css_hint_typed_length padding_top;
-
-	uint8_t text_align;
-
-	css_hint_typed_length vertical_align;
-
-	uint8_t white_space;
+	css_colour color;
+	int32_t integer;
+	css_hint_length length1;
+	css_hint_length length2;
+	lwc_string *string;
 
-	css_hint_typed_length width;
+	/** \todo Support clip/content/counter-{increment,reset}? */
 } css_hint;
 
 #endif