[project @ 2002-06-18 21:24:21 by bursa]

Improved inline and float layout, new CSS properties, better debug output.

svn path=/import/netsurf/; revision=20

1 files changed, 17 insertions, 2 deletions

diff --git a/render/css.h b/render/css.h
index 425db27f4..2a963f4f3 100644
--- a/render/css.h
+++ b/render/css.h
@@ -1,5 +1,5 @@
 /**
- * $Id: css.h,v 1.2 2002/05/04 21:17:06 bursa Exp $
+ * $Id: css.h,v 1.3 2002/06/18 21:24:21 bursa Exp $
  */
 
 #include "css_enum.h"
@@ -39,6 +39,20 @@ struct css_style {
 	} height;
 
 	struct {
+		enum { CSS_LINE_HEIGHT_INHERIT,
+		       CSS_LINE_HEIGHT_ABSOLUTE,
+		       CSS_LINE_HEIGHT_LENGTH,
+		       CSS_LINE_HEIGHT_PERCENT } size;
+		union {
+			float absolute;
+			struct css_length length;
+			float percent;
+		} value;
+	} line_height;
+
+	css_text_align text_align;
+
+	struct {
 		enum { CSS_WIDTH_AUTO,
 		       CSS_WIDTH_LENGTH,
 		       CSS_WIDTH_PERCENT } width;
@@ -52,7 +66,7 @@ struct css_style {
 struct css_stylesheet;
 
 struct css_selector {
-	char * element;
+	const char * element;
 	char * class;
 	char * id;
 };
@@ -69,6 +83,7 @@ void css_get_style(struct css_stylesheet * stylesheet, struct css_selector * sel
 			unsigned int selectors, struct css_style * style);
 void css_parse_stylesheet(struct css_stylesheet * stylesheet, char * str);
 void css_dump_style(const struct css_style * const style);
+void css_dump_stylesheet(const struct css_stylesheet * stylesheet);
 void css_cascade(struct css_style * const style, const struct css_style * const apply);
 void css_parse_property_list(struct css_style * style, char * str);