merge

1 files changed, 21 insertions, 3 deletions

diff --git a/dw/style.hh b/dw/style.hh
index 57ee1d10..370d8d1b 100644
--- a/dw/style.hh
+++ b/dw/style.hh
@@ -64,7 +64,7 @@ namespace core {
  * attribute, which is supported by dillo, will refer to an attribute in
  * dw::core::style::Style. For this reason, the attributes in
  * dw::core::style::Style get the names from the CSS attributes, with
- * "camelCase" instead of hythens (e.g. "background-color" becomes
+ * "camelCase" instead of hyphens (e.g. "background-color" becomes
  * "backgroundColor").
  *
  * However, dw::core::style::Style will be extended by some more
@@ -193,7 +193,7 @@ namespace core {
 namespace style {
 
 enum Cursor {
-   CURSOR_COSSHAIR,
+   CURSOR_CROSSHAIR,
    CURSOR_DEFAULT,
    CURSOR_POINTER,
    CURSOR_MOVE,
@@ -210,6 +210,11 @@ enum Cursor {
    CURSOR_HELP
 };
 
+enum BorderCollapse {
+   BORDER_MODEL_SEPARATE,
+   BORDER_MODEL_COLLAPSE
+};
+
 enum BorderStyle {
    BORDER_NONE,
    BORDER_HIDDEN,
@@ -258,6 +263,12 @@ enum DisplayType {
    DISPLAY_TABLE_CELL
 };
 
+enum LineType {
+   LINE_NORMAL,
+   LINE_DOTTED,
+   LINE_DASHED
+};
+
 enum ListStylePosition {
    LIST_STYLE_POSITION_INSIDE,
    LIST_STYLE_POSITION_OUTSIDE
@@ -292,6 +303,11 @@ enum FontStyle {
   FONT_STYLE_OBLIQUE
 };
 
+enum FontVariant {
+   FONT_VARIANT_NORMAL,
+   FONT_VARIANT_SMALL_CAPS
+};
+
 enum TextDecoration {
    TEXT_DECORATION_NONE         = 0,
    TEXT_DECORATION_UNDERLINE    = 1 << 0,
@@ -442,9 +458,10 @@ public:
    ClearType clear;
 
    int hBorderSpacing, vBorderSpacing, wordSpacing;
-   Length width, height, lineHeight;
+   Length width, height, lineHeight, textIndent;
 
    Box margin, borderWidth, padding;
+   BorderCollapse borderCollapse;
    struct { Color *top, *right, *bottom, *left; } borderColor;
    struct { BorderStyle top, right, bottom, left; } borderStyle;
 
@@ -573,6 +590,7 @@ public:
    int size;
    int weight;
    int letterSpacing;
+   FontVariant fontVariant;
    FontStyle style;
 
    bool equals(lout::object::Object *other);