Removed lots of compiler warnings, and formatted code to 80 columns.

Used: indent -kr -st -sc -i3 -bad -nbbo -nut

5 files changed, 488 insertions, 430 deletions

diff --git a/src/css.cc b/src/css.cc
index a3489534..8ecad167 100644
--- a/src/css.cc
+++ b/src/css.cc
@@ -181,7 +181,7 @@ void CssContext::addRule (CssRule *rule, CssPrimaryOrder order) {
 }
 
 void CssContext::buildUserAgentStyle () {
-   char *cssBuf =
+   const char *cssBuf =
      "body  {background-color: #dcd1ba; font-family: helvetica; color: black;" 
      "       margin: 5px; }"
      "big { font-size: 1.17em }"
diff --git a/src/css.hh b/src/css.hh
index 12d60c23..552fd457 100644
--- a/src/css.hh
+++ b/src/css.hh
@@ -171,7 +171,8 @@ class CssPropertyList : public lout::misc::SimpleVector <CssProperty> {
       CssPropertyList() : lout::misc::SimpleVector <CssProperty> (1) {
          refCount = 0;
       };
-      CssPropertyList(const CssPropertyList &p) : lout::misc::SimpleVector <CssProperty> (p) {
+      CssPropertyList(const CssPropertyList &p) :
+         lout::misc::SimpleVector <CssProperty> (p) {
          refCount = 0;
       };
 
diff --git a/src/cssparser.cc b/src/cssparser.cc
index 92ed78ac..658d1286 100644
--- a/src/cssparser.cc
+++ b/src/cssparser.cc
@@ -22,242 +22,285 @@ using namespace dw::core::style;
 /* Applies to symbol lengths and string literals. */
 #define MAX_STR_LEN 256
 
-static char *Css_border_style_enum_vals[] = {
-   "none", "hidden", "dotted", "dashed", "solid", "double", "groove", "ridge",
-   "inset", "outset", NULL
+static const char *Css_border_style_enum_vals[] = {
+   "none", "hidden", "dotted", "dashed", "solid", "double", "groove",
+   "ridge", "inset", "outset", NULL
 };
 
-static char *Css_cursor_enum_vals[] = {
-   "crosshair", "default", "pointer", "move", "e_resize", "ne_resize", "nw_resize",
-   "n_resize", "se_resize", "sw_resize", "s_resize", "w_resize", "text", "wait",
-   "help", NULL
+static const char *Css_cursor_enum_vals[] = {
+   "crosshair", "default", "pointer", "move", "e_resize", "ne_resize",
+   "nw_resize", "n_resize", "se_resize", "sw_resize", "s_resize",
+   "w_resize", "text", "wait", "help", NULL
 };
 
-static char *Css_display_enum_vals[DISPLAY_LAST + 1] = {
+static const char *Css_display_enum_vals[DISPLAY_LAST + 1] = {
    "block", "inline", "list-item", "table", "table-row-group",
    "table-header-group", "table-footer-group", "table-row",
-   "table-cell",  NULL
+   "table-cell", NULL
 };
 
-static char *Css_font_style_enum_vals[] = {
+static const char *Css_font_style_enum_vals[] = {
    "normal", "italic", "oblique", NULL
 };
 
-static char *Css_list_style_type_enum_vals[] = {
+static const char *Css_list_style_type_enum_vals[] = {
    "disc", "circle", "square", "decimal", "decimal-leading-zero",
-   "lower-roman", "upper-roman", "lower-greek", "lower-alpha", "lower-latin",
-   "upper-alpha", "upper-latin", "hebrew", "armenian", "georgian",
-   "cjk-ideographic", "hiragana", "katakana", "hiragana-iroha",
+   "lower-roman", "upper-roman", "lower-greek", "lower-alpha",
+   "lower-latin", "upper-alpha", "upper-latin", "hebrew", "armenian",
+   "georgian", "cjk-ideographic", "hiragana", "katakana", "hiragana-iroha",
    "katakana-iroha", "none", NULL
 };
 
-static char *Css_text_align_enum_vals[] = {
+static const char *Css_text_align_enum_vals[] = {
    "left", "right", "center", "justify", "string", NULL
 };
 
-static char *Css_text_decoration_enum_vals[] = {
+static const char *Css_text_decoration_enum_vals[] = {
    "underline", "overline", "line-through", "blink", NULL
 };
 
-static char *Css_vertical_align_vals[] = {
+static const char *Css_vertical_align_vals[] = {
    "top", "bottom", "middle", "baseline", "sub", "super", NULL
 };
 
-static char *Css_white_space_vals[] = { "normal", "pre", "nowrap", NULL };
+static const char *Css_white_space_vals[] = {
+   "normal", "pre", "nowrap", NULL
+};
 
 CssPropertyInfo Css_property_info[CssProperty::CSS_PROPERTY_LAST] = {
-   { "background-attachment", CSS_TYPE_UNUSED, NULL },
-   { "background-color", CSS_TYPE_COLOR, NULL },
-   { "background-image", CSS_TYPE_UNUSED, NULL },
-   { "background-position", CSS_TYPE_UNUSED, NULL },
-   { "background-repeat", CSS_TYPE_UNUSED, NULL },
-   { "border-bottom-color", CSS_TYPE_COLOR, NULL },
-   { "border-bottom-style", CSS_TYPE_ENUM, Css_border_style_enum_vals },
-   { "border-bottom-width", CSS_TYPE_LENGTH, NULL },
-   { "border-collapse", CSS_TYPE_UNUSED, NULL },
-   { "border-left-color", CSS_TYPE_COLOR, NULL },
-   { "border-left-style", CSS_TYPE_ENUM, Css_border_style_enum_vals },
-   { "border-left-width", CSS_TYPE_LENGTH, NULL },
-   { "border-right-color", CSS_TYPE_COLOR, NULL },
-   { "border-right-style", CSS_TYPE_ENUM, Css_border_style_enum_vals },
-   { "border-right-width", CSS_TYPE_LENGTH, NULL },
-   { "border-spacing", CSS_TYPE_LENGTH, NULL },
-   { "border-top-color", CSS_TYPE_COLOR, NULL },
-   { "border-top-style", CSS_TYPE_ENUM, Css_border_style_enum_vals },
-   { "border-top-width", CSS_TYPE_LENGTH, NULL },
-   { "bottom", CSS_TYPE_UNUSED, NULL },
-   { "caption-side", CSS_TYPE_UNUSED, NULL },
-   { "clear", CSS_TYPE_UNUSED, NULL },
-   { "clip", CSS_TYPE_UNUSED, NULL },
-   { "color", CSS_TYPE_COLOR, NULL },
-   { "content", CSS_TYPE_STRING, NULL },
-   { "counter-increment", CSS_TYPE_UNUSED, NULL },
-   { "counter-reset", CSS_TYPE_UNUSED, NULL },
-   { "cursor", CSS_TYPE_ENUM, Css_cursor_enum_vals },
-   { "direction", CSS_TYPE_UNUSED, NULL },
-   { "display", CSS_TYPE_ENUM, Css_display_enum_vals },
-   { "empty-cells", CSS_TYPE_UNUSED, NULL },
-   { "float", CSS_TYPE_UNUSED, NULL },
-   { "font-family", CSS_TYPE_SYMBOL, NULL },
-   { "font-size", CSS_TYPE_LENGTH_PERCENTAGE, NULL },
-   { "font-size-adjust", CSS_TYPE_UNUSED, NULL },
-   { "font-stretch", CSS_TYPE_UNUSED, NULL },
-   { "font-style", CSS_TYPE_ENUM, Css_font_style_enum_vals },
-   { "font-variant", CSS_TYPE_UNUSED, NULL },
-   { "font-weight", CSS_TYPE_FONT_WEIGHT },
-   { "height", CSS_TYPE_LENGTH_PERCENTAGE, NULL },
-   { "left", CSS_TYPE_UNUSED, NULL },
-   { "letter-spacing", CSS_TYPE_UNUSED, NULL },
-   { "line-height", CSS_TYPE_UNUSED, NULL },
-   { "list-style-image", CSS_TYPE_UNUSED, NULL },
-   { "list-style-position", CSS_TYPE_UNUSED, NULL },
-   { "list-style-type", CSS_TYPE_ENUM, Css_list_style_type_enum_vals },
-   { "margin-bottom", CSS_TYPE_LENGTH, NULL },
-   { "margin-left", CSS_TYPE_LENGTH, NULL },
-   { "margin-right", CSS_TYPE_LENGTH, NULL },
-   { "margin-top", CSS_TYPE_LENGTH, NULL },
-   { "marker-offset", CSS_TYPE_UNUSED, NULL },
-   { "marks", CSS_TYPE_UNUSED, NULL },
-   { "max-height", CSS_TYPE_UNUSED, NULL },
-   { "max-width", CSS_TYPE_UNUSED, NULL },
-   { "min-height", CSS_TYPE_UNUSED, NULL },
-   { "min-width", CSS_TYPE_UNUSED, NULL },
-   { "outline-color", CSS_TYPE_UNUSED, NULL },
-   { "outline-style", CSS_TYPE_UNUSED, NULL },
-   { "outline-width", CSS_TYPE_UNUSED, NULL },
-   { "overflow", CSS_TYPE_UNUSED, NULL },
-   { "padding-bottom", CSS_TYPE_LENGTH, NULL },
-   { "padding-left", CSS_TYPE_LENGTH, NULL },
-   { "padding-right", CSS_TYPE_LENGTH, NULL },
-   { "padding-top", CSS_TYPE_LENGTH, NULL },
-   { "position", CSS_TYPE_UNUSED, NULL },
-   { "quotes", CSS_TYPE_UNUSED, NULL },
-   { "right", CSS_TYPE_UNUSED, NULL },
-   { "text-align", CSS_TYPE_ENUM, Css_text_align_enum_vals },
-   { "text-decoration", CSS_TYPE_MULTI_ENUM, Css_text_decoration_enum_vals },
-   { "text-shadow", CSS_TYPE_UNUSED, NULL },
-   { "text-transform", CSS_TYPE_UNUSED, NULL },
-   { "top", CSS_TYPE_UNUSED, NULL },
-   { "unicode-bidi", CSS_TYPE_UNUSED, NULL },
-   { "vertical-align", CSS_TYPE_ENUM, Css_vertical_align_vals },
-   { "visibility", CSS_TYPE_UNUSED, NULL },
-   { "white-space", CSS_TYPE_ENUM, Css_white_space_vals },
-   { "text-indent", CSS_TYPE_UNUSED, NULL },
-   { "width", CSS_TYPE_LENGTH_PERCENTAGE, NULL },
-   { "word-spacing", CSS_TYPE_UNUSED, NULL },
-   { "z-index", CSS_TYPE_UNUSED, NULL },
+   {"background-attachment", CSS_TYPE_UNUSED, NULL},
+   {"background-color", CSS_TYPE_COLOR, NULL},
+   {"background-image", CSS_TYPE_UNUSED, NULL},
+   {"background-position", CSS_TYPE_UNUSED, NULL},
+   {"background-repeat", CSS_TYPE_UNUSED, NULL},
+   {"border-bottom-color", CSS_TYPE_COLOR, NULL},
+   {"border-bottom-style", CSS_TYPE_ENUM, Css_border_style_enum_vals},
+   {"border-bottom-width", CSS_TYPE_LENGTH, NULL},
+   {"border-collapse", CSS_TYPE_UNUSED, NULL},
+   {"border-left-color", CSS_TYPE_COLOR, NULL},
+   {"border-left-style", CSS_TYPE_ENUM, Css_border_style_enum_vals},
+   {"border-left-width", CSS_TYPE_LENGTH, NULL},
+   {"border-right-color", CSS_TYPE_COLOR, NULL},
+   {"border-right-style", CSS_TYPE_ENUM, Css_border_style_enum_vals},
+   {"border-right-width", CSS_TYPE_LENGTH, NULL},
+   {"border-spacing", CSS_TYPE_LENGTH, NULL},
+   {"border-top-color", CSS_TYPE_COLOR, NULL},
+   {"border-top-style", CSS_TYPE_ENUM, Css_border_style_enum_vals},
+   {"border-top-width", CSS_TYPE_LENGTH, NULL},
+   {"bottom", CSS_TYPE_UNUSED, NULL},
+   {"caption-side", CSS_TYPE_UNUSED, NULL},
+   {"clear", CSS_TYPE_UNUSED, NULL},
+   {"clip", CSS_TYPE_UNUSED, NULL},
+   {"color", CSS_TYPE_COLOR, NULL},
+   {"content", CSS_TYPE_STRING, NULL},
+   {"counter-increment", CSS_TYPE_UNUSED, NULL},
+   {"counter-reset", CSS_TYPE_UNUSED, NULL},
+   {"cursor", CSS_TYPE_ENUM, Css_cursor_enum_vals},
+   {"direction", CSS_TYPE_UNUSED, NULL},
+   {"display", CSS_TYPE_ENUM, Css_display_enum_vals},
+   {"empty-cells", CSS_TYPE_UNUSED, NULL},
+   {"float", CSS_TYPE_UNUSED, NULL},
+   {"font-family", CSS_TYPE_SYMBOL, NULL},
+   {"font-size", CSS_TYPE_LENGTH_PERCENTAGE, NULL},
+   {"font-size-adjust", CSS_TYPE_UNUSED, NULL},
+   {"font-stretch", CSS_TYPE_UNUSED, NULL},
+   {"font-style", CSS_TYPE_ENUM, Css_font_style_enum_vals},
+   {"font-variant", CSS_TYPE_UNUSED, NULL},
+   {"font-weight", CSS_TYPE_FONT_WEIGHT, NULL},
+   {"height", CSS_TYPE_LENGTH_PERCENTAGE, NULL},
+   {"left", CSS_TYPE_UNUSED, NULL},
+   {"letter-spacing", CSS_TYPE_UNUSED, NULL},
+   {"line-height", CSS_TYPE_UNUSED, NULL},
+   {"list-style-image", CSS_TYPE_UNUSED, NULL},
+   {"list-style-position", CSS_TYPE_UNUSED, NULL},
+   {"list-style-type", CSS_TYPE_ENUM, Css_list_style_type_enum_vals},
+   {"margin-bottom", CSS_TYPE_LENGTH, NULL},
+   {"margin-left", CSS_TYPE_LENGTH, NULL},
+   {"margin-right", CSS_TYPE_LENGTH, NULL},
+   {"margin-top", CSS_TYPE_LENGTH, NULL},
+   {"marker-offset", CSS_TYPE_UNUSED, NULL},
+   {"marks", CSS_TYPE_UNUSED, NULL},
+   {"max-height", CSS_TYPE_UNUSED, NULL},
+   {"max-width", CSS_TYPE_UNUSED, NULL},
+   {"min-height", CSS_TYPE_UNUSED, NULL},
+   {"min-width", CSS_TYPE_UNUSED, NULL},
+   {"outline-color", CSS_TYPE_UNUSED, NULL},
+   {"outline-style", CSS_TYPE_UNUSED, NULL},
+   {"outline-width", CSS_TYPE_UNUSED, NULL},
+   {"overflow", CSS_TYPE_UNUSED, NULL},
+   {"padding-bottom", CSS_TYPE_LENGTH, NULL},
+   {"padding-left", CSS_TYPE_LENGTH, NULL},
+   {"padding-right", CSS_TYPE_LENGTH, NULL},
+   {"padding-top", CSS_TYPE_LENGTH, NULL},
+   {"position", CSS_TYPE_UNUSED, NULL},
+   {"quotes", CSS_TYPE_UNUSED, NULL},
+   {"right", CSS_TYPE_UNUSED, NULL},
+   {"text-align", CSS_TYPE_ENUM, Css_text_align_enum_vals},
+   {"text-decoration", CSS_TYPE_MULTI_ENUM, Css_text_decoration_enum_vals},
+   {"text-shadow", CSS_TYPE_UNUSED, NULL},
+   {"text-transform", CSS_TYPE_UNUSED, NULL},
+   {"top", CSS_TYPE_UNUSED, NULL},
+   {"unicode-bidi", CSS_TYPE_UNUSED, NULL},
+   {"vertical-align", CSS_TYPE_ENUM, Css_vertical_align_vals},
+   {"visibility", CSS_TYPE_UNUSED, NULL},
+   {"white-space", CSS_TYPE_ENUM, Css_white_space_vals},
+   {"text-indent", CSS_TYPE_UNUSED, NULL},
+   {"width", CSS_TYPE_LENGTH_PERCENTAGE, NULL},
+   {"word-spacing", CSS_TYPE_UNUSED, NULL},
+   {"z-index", CSS_TYPE_UNUSED, NULL},
 
    /* These are extensions, for internal used, and never parsed. */
-   { "x-link", CSS_TYPE_INTEGER, NULL },
-   { "x-colspan", CSS_TYPE_INTEGER, NULL },
-   { "x-rowspan", CSS_TYPE_INTEGER, NULL },
+   {"x-link", CSS_TYPE_INTEGER, NULL},
+   {"x-colspan", CSS_TYPE_INTEGER, NULL},
+   {"x-rowspan", CSS_TYPE_INTEGER, NULL},
 
-   { "last", CSS_TYPE_UNUSED, NULL },
+   {"last", CSS_TYPE_UNUSED, NULL},
 };
 
 #define CSS_SHORTHAND_NUM 14
 
 typedef struct {
-   char *symbol;
+   const char *symbol;
    enum {
       CSS_SHORTHAND_MULTIPLE,   /* [ p1 || p2 || ...], the property pi is
                                  * determined  by the type */
       CSS_SHORTHAND_DIRECTIONS, /* <t>{1,4} */
       CSS_SHORTHAND_BORDER,     /* special, used for 'border' */
-      CSS_SHORTHAND_FONT,       /* special, used for 'font' */ 
+      CSS_SHORTHAND_FONT,       /* special, used for 'font' */
    } type;
-   CssProperty::Name *properties; /* CSS_SHORTHAND_MULTIPLE:   must be terminated by
-                             * -1 
-                             * CSS_SHORTHAND_DIRECTIONS: must have length 4
-                             * CSS_SHORTHAND_BORDERS:    unused
-                             * CSS_SHORTHAND_FONT:       unused */
+   CssProperty::Name * properties;      /* CSS_SHORTHAND_MULTIPLE:
+                                         *   must be terminated by -1
+                                         * CSS_SHORTHAND_DIRECTIONS:
+                                         *   must have length 4
+                                         * CSS_SHORTHAND_BORDERS:
+                                         *   unused
+                                         * CSS_SHORTHAND_FONT:
+                                         *   unused */
 } CssShorthandInfo;
 
 CssProperty::Name Css_background_properties[] = {
-   CssProperty::CSS_PROPERTY_BACKGROUND_COLOR, CssProperty::CSS_PROPERTY_BACKGROUND_IMAGE,
-   CssProperty::CSS_PROPERTY_BACKGROUND_REPEAT, CssProperty::CSS_PROPERTY_BACKGROUND_ATTACHMENT,
-   CssProperty::CSS_PROPERTY_BACKGROUND_POSITION, (CssProperty::Name) -1
+   CssProperty::CSS_PROPERTY_BACKGROUND_COLOR,
+   CssProperty::CSS_PROPERTY_BACKGROUND_IMAGE,
+   CssProperty::CSS_PROPERTY_BACKGROUND_REPEAT,
+   CssProperty::CSS_PROPERTY_BACKGROUND_ATTACHMENT,
+   CssProperty::CSS_PROPERTY_BACKGROUND_POSITION,
+   (CssProperty::Name) - 1
 };
 
 CssProperty::Name Css_border_bottom_properties[] = {
-   CssProperty::CSS_PROPERTY_BORDER_BOTTOM_WIDTH, CssProperty::CSS_PROPERTY_BORDER_BOTTOM_STYLE,
-   CssProperty::CSS_PROPERTY_BORDER_BOTTOM_COLOR, (CssProperty::Name) -1
+   CssProperty::CSS_PROPERTY_BORDER_BOTTOM_WIDTH,
+   CssProperty::CSS_PROPERTY_BORDER_BOTTOM_STYLE,
+   CssProperty::CSS_PROPERTY_BORDER_BOTTOM_COLOR,
+   (CssProperty::Name) - 1
 };
 
 CssProperty::Name Css_border_color_properties[4] = {
-   CssProperty::CSS_PROPERTY_BORDER_TOP_COLOR, CssProperty::CSS_PROPERTY_BORDER_BOTTOM_COLOR,
-   CssProperty::CSS_PROPERTY_BORDER_LEFT_COLOR, CssProperty::CSS_PROPERTY_BORDER_RIGHT_COLOR
+   CssProperty::CSS_PROPERTY_BORDER_TOP_COLOR,
+   CssProperty::CSS_PROPERTY_BORDER_BOTTOM_COLOR,
+   CssProperty::CSS_PROPERTY_BORDER_LEFT_COLOR,
+   CssProperty::CSS_PROPERTY_BORDER_RIGHT_COLOR
 };
 
 CssProperty::Name Css_border_left_properties[] = {
-   CssProperty::CSS_PROPERTY_BORDER_LEFT_WIDTH, CssProperty::CSS_PROPERTY_BORDER_LEFT_STYLE,
-   CssProperty::CSS_PROPERTY_BORDER_LEFT_COLOR, (CssProperty::Name) -1
+   CssProperty::CSS_PROPERTY_BORDER_LEFT_WIDTH,
+   CssProperty::CSS_PROPERTY_BORDER_LEFT_STYLE,
+   CssProperty::CSS_PROPERTY_BORDER_LEFT_COLOR,
+   (CssProperty::Name) - 1
 };
 
 CssProperty::Name Css_border_right_properties[] = {
-   CssProperty::CSS_PROPERTY_BORDER_RIGHT_WIDTH, CssProperty::CSS_PROPERTY_BORDER_RIGHT_STYLE,
-   CssProperty::CSS_PROPERTY_BORDER_RIGHT_COLOR, (CssProperty::Name) -1
+   CssProperty::CSS_PROPERTY_BORDER_RIGHT_WIDTH,
+   CssProperty::CSS_PROPERTY_BORDER_RIGHT_STYLE,
+   CssProperty::CSS_PROPERTY_BORDER_RIGHT_COLOR,
+   (CssProperty::Name) - 1
 };
 
 CssProperty::Name Css_border_style_properties[4] = {
-   CssProperty::CSS_PROPERTY_BORDER_TOP_STYLE, CssProperty::CSS_PROPERTY_BORDER_BOTTOM_STYLE,
-   CssProperty::CSS_PROPERTY_BORDER_LEFT_STYLE, CssProperty::CSS_PROPERTY_BORDER_RIGHT_STYLE
+   CssProperty::CSS_PROPERTY_BORDER_TOP_STYLE,
+   CssProperty::CSS_PROPERTY_BORDER_BOTTOM_STYLE,
+   CssProperty::CSS_PROPERTY_BORDER_LEFT_STYLE,
+   CssProperty::CSS_PROPERTY_BORDER_RIGHT_STYLE
 };
 
 CssProperty::Name Css_border_top_properties[] = {
-   CssProperty::CSS_PROPERTY_BORDER_TOP_WIDTH, CssProperty::CSS_PROPERTY_BORDER_TOP_STYLE,
-   CssProperty::CSS_PROPERTY_BORDER_TOP_COLOR, (CssProperty::Name) -1
+   CssProperty::CSS_PROPERTY_BORDER_TOP_WIDTH,
+   CssProperty::CSS_PROPERTY_BORDER_TOP_STYLE,
+   CssProperty::CSS_PROPERTY_BORDER_TOP_COLOR,
+   (CssProperty::Name) - 1
 };
 
 CssProperty::Name Css_border_width_properties[4] = {
-   CssProperty::CSS_PROPERTY_BORDER_TOP_WIDTH, CssProperty::CSS_PROPERTY_BORDER_BOTTOM_WIDTH,
-   CssProperty::CSS_PROPERTY_BORDER_LEFT_WIDTH, CssProperty::CSS_PROPERTY_BORDER_RIGHT_WIDTH
+   CssProperty::CSS_PROPERTY_BORDER_TOP_WIDTH,
+   CssProperty::CSS_PROPERTY_BORDER_BOTTOM_WIDTH,
+   CssProperty::CSS_PROPERTY_BORDER_LEFT_WIDTH,
+   CssProperty::CSS_PROPERTY_BORDER_RIGHT_WIDTH
 };
 
 CssProperty::Name Css_list_style_properties[] = {
-   CssProperty::CSS_PROPERTY_LIST_STYLE_TYPE, CssProperty::CSS_PROPERTY_LIST_STYLE_POSITION,
-   CssProperty::CSS_PROPERTY_LIST_STYLE_IMAGE, (CssProperty::Name) -1
+   CssProperty::CSS_PROPERTY_LIST_STYLE_TYPE,
+   CssProperty::CSS_PROPERTY_LIST_STYLE_POSITION,
+   CssProperty::CSS_PROPERTY_LIST_STYLE_IMAGE,
+   (CssProperty::Name) - 1
 };
 
 CssProperty::Name Css_margin_properties[4] = {
-   CssProperty::CSS_PROPERTY_MARGIN_TOP, CssProperty::CSS_PROPERTY_MARGIN_BOTTOM,
-   CssProperty::CSS_PROPERTY_MARGIN_LEFT, CssProperty::CSS_PROPERTY_MARGIN_RIGHT
+   CssProperty::CSS_PROPERTY_MARGIN_TOP,
+   CssProperty::CSS_PROPERTY_MARGIN_BOTTOM,
+   CssProperty::CSS_PROPERTY_MARGIN_LEFT,
+   CssProperty::CSS_PROPERTY_MARGIN_RIGHT
 };
 
 CssProperty::Name Css_outline_properties[] = {
-   CssProperty::CSS_PROPERTY_OUTLINE_COLOR, CssProperty::CSS_PROPERTY_OUTLINE_STYLE,
-   CssProperty::CSS_PROPERTY_OUTLINE_WIDTH, (CssProperty::Name) -1
+   CssProperty::CSS_PROPERTY_OUTLINE_COLOR,
+   CssProperty::CSS_PROPERTY_OUTLINE_STYLE,
+   CssProperty::CSS_PROPERTY_OUTLINE_WIDTH,
+   (CssProperty::Name) - 1
 };
 
 CssProperty::Name Css_padding_properties[4] = {
-   CssProperty::CSS_PROPERTY_PADDING_TOP, CssProperty::CSS_PROPERTY_PADDING_BOTTOM,
-   CssProperty::CSS_PROPERTY_PADDING_LEFT, CssProperty::CSS_PROPERTY_PADDING_RIGHT
+   CssProperty::CSS_PROPERTY_PADDING_TOP,
+   CssProperty::CSS_PROPERTY_PADDING_BOTTOM,
+   CssProperty::CSS_PROPERTY_PADDING_LEFT,
+   CssProperty::CSS_PROPERTY_PADDING_RIGHT
 };
 
 static CssShorthandInfo Css_shorthand_info[CSS_SHORTHAND_NUM] = {
-   { "background", CssShorthandInfo::CSS_SHORTHAND_MULTIPLE, Css_background_properties },
-   { "border", CssShorthandInfo::CSS_SHORTHAND_BORDER, NULL },
-   { "border-bottom", CssShorthandInfo::CSS_SHORTHAND_MULTIPLE, Css_border_bottom_properties },
-   { "border-color", CssShorthandInfo::CSS_SHORTHAND_DIRECTIONS, Css_border_color_properties },
-   { "border-left", CssShorthandInfo::CSS_SHORTHAND_MULTIPLE, Css_border_left_properties },
-   { "border-right", CssShorthandInfo::CSS_SHORTHAND_MULTIPLE, Css_border_right_properties },
-   { "border-style", CssShorthandInfo::CSS_SHORTHAND_DIRECTIONS, Css_border_style_properties },
-   { "border-top", CssShorthandInfo::CSS_SHORTHAND_MULTIPLE, Css_border_top_properties },
-   { "border-width", CssShorthandInfo::CSS_SHORTHAND_DIRECTIONS, Css_border_width_properties },
-   { "font", CssShorthandInfo::CSS_SHORTHAND_FONT, NULL },
-   { "list-style", CssShorthandInfo::CSS_SHORTHAND_MULTIPLE, Css_list_style_properties },
-   { "margin", CssShorthandInfo::CSS_SHORTHAND_DIRECTIONS, Css_margin_properties },
-   { "outline", CssShorthandInfo::CSS_SHORTHAND_MULTIPLE, Css_outline_properties },
-   { "padding", CssShorthandInfo::CSS_SHORTHAND_DIRECTIONS, Css_padding_properties },
+   {"background", CssShorthandInfo::CSS_SHORTHAND_MULTIPLE,
+    Css_background_properties},
+   {"border", CssShorthandInfo::CSS_SHORTHAND_BORDER, NULL},
+   {"border-bottom", CssShorthandInfo::CSS_SHORTHAND_MULTIPLE,
+    Css_border_bottom_properties},
+   {"border-color", CssShorthandInfo::CSS_SHORTHAND_DIRECTIONS,
+    Css_border_color_properties},
+   {"border-left", CssShorthandInfo::CSS_SHORTHAND_MULTIPLE,
+    Css_border_left_properties},
+   {"border-right", CssShorthandInfo::CSS_SHORTHAND_MULTIPLE,
+    Css_border_right_properties},
+   {"border-style", CssShorthandInfo::CSS_SHORTHAND_DIRECTIONS,
+    Css_border_style_properties},
+   {"border-top", CssShorthandInfo::CSS_SHORTHAND_MULTIPLE,
+    Css_border_top_properties},
+   {"border-width", CssShorthandInfo::CSS_SHORTHAND_DIRECTIONS,
+    Css_border_width_properties},
+   {"font", CssShorthandInfo::CSS_SHORTHAND_FONT, NULL},
+   {"list-style", CssShorthandInfo::CSS_SHORTHAND_MULTIPLE,
+    Css_list_style_properties},
+   {"margin", CssShorthandInfo::CSS_SHORTHAND_DIRECTIONS,
+    Css_margin_properties},
+   {"outline", CssShorthandInfo::CSS_SHORTHAND_MULTIPLE,
+    Css_outline_properties},
+   {"padding", CssShorthandInfo::CSS_SHORTHAND_DIRECTIONS,
+    Css_padding_properties},
 };
 
 
-static char *Css_primary_text[CSS_PRIMARY_LAST] = {
+static const char *Css_primary_text[CSS_PRIMARY_LAST] = {
    "user stylesheets, important", "author stylesheets, important",
    "author stylesheets", "user stylesheets", "user-agent stylesheets"
-};   
+};
 
-static char *Css_level_text[4] = { "id", "class", "pseudo-class", "element" };
+static const char *Css_level_text[4] =
+    { "id", "class", "pseudo-class", "element" };
 
 
 /* ----------------------------------------------------------------------
@@ -266,15 +309,15 @@ static char *Css_level_text[4] = { "id", "class", "pseudo-class", "element" };
 
 static int values_num;
 
-void a_Css_init (void)
+void a_Css_init(void)
 {
    values_num = 0;
 }
 
-void a_Css_freeall (void)
+void a_Css_freeall(void)
 {
    if (values_num)
-      fprintf (stderr, "%d CSS values left", values_num);
+      fprintf(stderr, "%d CSS values left", values_num);
 }
 
 /* ----------------------------------------------------------------------
@@ -293,7 +336,7 @@ typedef struct {
 
    const char *buf;
    int buflen, bufptr;
-   
+
    CssTokenType ttype;
    char tval[MAX_STR_LEN];
    bool within_block;
@@ -302,7 +345,7 @@ typedef struct {
 /*
  * Gets the next character from the buffer, or EOF.
  */
-static int Css_getc (CssParser *parser)
+static int Css_getc(CssParser * parser)
 {
    int c;
 
@@ -310,7 +353,7 @@ static int Css_getc (CssParser *parser)
       c = EOF;
    else
       c = parser->buf[parser->bufptr];
-   
+
    /* The buffer pointer is increased in any case, so that Css_ungetc works
     * correctly at the end of the buffer. */
    parser->bufptr++;
@@ -320,65 +363,65 @@ static int Css_getc (CssParser *parser)
 /*
  * Undoes the last Css_getc().
  */
-static void Css_ungetc (CssParser *parser)
+static void Css_ungetc(CssParser * parser)
 {
    parser->bufptr--;
 }
 
-static void Css_next_token (CssParser *parser)
+static void Css_next_token(CssParser * parser)
 {
    int c, c1, d, i, j;
    bool point_allowed;
    char hexbuf[5];
    bool escaped;
-   
+
    do
-      c = Css_getc (parser);
-   while (isspace (c));
+      c = Css_getc(parser);
+   while (isspace(c));
 
-   if (isdigit (c)) {
+   if (isdigit(c)) {
       parser->ttype = CSS_TK_DECINT;
       point_allowed = true;
 
       parser->tval[0] = c;
       i = 1;
-      c = Css_getc (parser);
+      c = Css_getc(parser);
       while (isdigit(c) || (point_allowed && c == '.')) {
          if (c == '.') {
             parser->ttype = CSS_TK_FLOAT;
-            point_allowed = false; /* Only one point read. */
-         } 
+            point_allowed = false;      /* Only one point read. */
+         }
 
          if (i < MAX_STR_LEN - 1) {
             parser->tval[i] = c;
             i++;
-         } /* else silently truncated */
-
-         c = Css_getc (parser);
+         }
+         /* else silently truncated */
+         c = Css_getc(parser);
       }
       parser->tval[i] = 0;
-      Css_ungetc (parser);
+      Css_ungetc(parser);
 
-      DEBUG_MSG (DEBUG_TOKEN_LEVEL, "token number %s\n", parser->tval);
+      DEBUG_MSG(DEBUG_TOKEN_LEVEL, "token number %s\n", parser->tval);
       return;
    }
-   
-   if (isalpha (c) || c == '_' || c == '-') {
+
+   if (isalpha(c) || c == '_' || c == '-') {
       parser->ttype = CSS_TK_SYMBOL;
-      
+
       parser->tval[0] = c;
       i = 1;
-      c = Css_getc (parser);
-      while (isalnum (c) || c == '_' || c == '-') {
+      c = Css_getc(parser);
+      while (isalnum(c) || c == '_' || c == '-') {
          if (i < MAX_STR_LEN - 1) {
             parser->tval[i] = c;
             i++;
-         } /* else silently truncated */
-         c = Css_getc (parser);
+         }                      /* else silently truncated */
+         c = Css_getc(parser);
       }
       parser->tval[i] = 0;
-      Css_ungetc (parser);
-      DEBUG_MSG (DEBUG_TOKEN_LEVEL, "token symbol '%s'\n", parser->tval);
+      Css_ungetc(parser);
+      DEBUG_MSG(DEBUG_TOKEN_LEVEL, "token symbol '%s'\n", parser->tval);
       return;
    }
 
@@ -387,42 +430,42 @@ static void Css_next_token (CssParser *parser)
       parser->ttype = CSS_TK_STRING;
 
       i = 0;
-      c = Css_getc (parser);
+      c = Css_getc(parser);
       escaped = false;
 
       while (escaped || c != c1) {
          if (c == '\\') {
             escaped = true;
-            d = Css_getc (parser);
-            if (isxdigit (d)) {
+            d = Css_getc(parser);
+            if (isxdigit(d)) {
                /* Read hex Unicode char. (Actually, strings are yet only 8 
                 * bit.) */
                hexbuf[0] = d;
                j = 1;
-               d = Css_getc (parser);
-               while (j < 4 && isxdigit (d)) {
+               d = Css_getc(parser);
+               while (j < 4 && isxdigit(d)) {
                   hexbuf[j] = d;
                   j++;
-                  d = Css_getc (parser);
+                  d = Css_getc(parser);
                }
                hexbuf[j] = 0;
-               Css_ungetc (parser);
-               c = strtol (hexbuf, NULL, 16);
+               Css_ungetc(parser);
+               c = strtol(hexbuf, NULL, 16);
             } else
                /* Take next character literally. */
-               c = Css_getc (parser);
+               c = Css_getc(parser);
          } else
             escaped = false;
 
          if (i < MAX_STR_LEN - 1) {
             parser->tval[i] = c;
             i++;
-         } /* else silently truncated */
-         c = Css_getc (parser);
+         }                      /* else silently truncated */
+         c = Css_getc(parser);
       }
       parser->tval[i] = 0;
       /* No Css_ungetc(). */
-      DEBUG_MSG (DEBUG_TOKEN_LEVEL, "token string '%s'\n", parser->tval);
+      DEBUG_MSG(DEBUG_TOKEN_LEVEL, "token string '%s'\n", parser->tval);
       return;
    }
 
@@ -431,25 +474,25 @@ static void Css_next_token (CssParser *parser)
     */
    if (c == '#' && parser->within_block) {
       parser->ttype = CSS_TK_COLOR;
-      
+
       parser->tval[0] = c;
       i = 1;
-      c = Css_getc (parser);
-      while (isxdigit (c)) {
+      c = Css_getc(parser);
+      while (isxdigit(c)) {
          if (i < MAX_STR_LEN - 1) {
             parser->tval[i] = c;
             i++;
-         } /* else silently truncated */
-         c = Css_getc (parser);
+         }                      /* else silently truncated */
+         c = Css_getc(parser);
       }
       parser->tval[i] = 0;
-      Css_ungetc (parser);
-      DEBUG_MSG (DEBUG_TOKEN_LEVEL, "token color '%s'\n", parser->tval);
+      Css_ungetc(parser);
+      DEBUG_MSG(DEBUG_TOKEN_LEVEL, "token color '%s'\n", parser->tval);
       return;
    }
-  
+
    if (c == EOF) {
-      DEBUG_MSG (DEBUG_TOKEN_LEVEL, "token %s\n", "EOF");
+      DEBUG_MSG(DEBUG_TOKEN_LEVEL, "token %s\n", "EOF");
       parser->ttype = CSS_TK_END;
       return;
    }
@@ -457,12 +500,12 @@ static void Css_next_token (CssParser *parser)
    parser->ttype = CSS_TK_CHAR;
    parser->tval[0] = c;
    parser->tval[1] = 0;
-   DEBUG_MSG (DEBUG_TOKEN_LEVEL, "token char '%c'\n", c);
+   DEBUG_MSG(DEBUG_TOKEN_LEVEL, "token char '%c'\n", c);
 }
 
 
-static bool Css_token_matches_property (CssParser *parser,
-                                            CssProperty::Name prop)
+static bool Css_token_matches_property(CssParser * parser,
+                                       CssProperty::Name prop)
 {
    int i, err = 1;
 
@@ -470,69 +513,70 @@ static bool Css_token_matches_property (CssParser *parser,
    case CSS_TYPE_ENUM:
       if (parser->ttype == CSS_TK_SYMBOL) {
          for (i = 0; Css_property_info[prop].enum_symbols[i]; i++)
-            if (strcmp (parser->tval,
-                        Css_property_info[prop].enum_symbols[i]) == 0)
+            if (strcmp(parser->tval,
+                       Css_property_info[prop].enum_symbols[i]) == 0)
                return true;
       }
       return false;
-      
+
    case CSS_TYPE_MULTI_ENUM:
       if (parser->ttype == CSS_TK_SYMBOL) {
-         if (strcmp (parser->tval, "none") != 0)
+         if (strcmp(parser->tval, "none") != 0)
             return true;
          else {
             for (i = 0; Css_property_info[prop].enum_symbols[i]; i++) {
-               if (strcmp (parser->tval,
-                           Css_property_info[prop].enum_symbols[i]) == 0)
+               if (strcmp(parser->tval,
+                          Css_property_info[prop].enum_symbols[i]) == 0)
                   return true;
             }
          }
       }
       return true;
-      
+
    case CSS_TYPE_LENGTH_PERCENTAGE:
    case CSS_TYPE_LENGTH:
-      return parser->ttype == CSS_TK_DECINT || parser->ttype == CSS_TK_FLOAT ||
-         (parser->ttype == CSS_TK_SYMBOL &&
-          strcmp (parser->tval, "auto") == 0);
-         
+      return parser->ttype == CSS_TK_DECINT ||
+          parser->ttype == CSS_TK_FLOAT || (parser->ttype == CSS_TK_SYMBOL
+                                            && strcmp(parser->tval,
+                                                      "auto") == 0);
+
    case CSS_TYPE_COLOR:
       return (parser->ttype == CSS_TK_COLOR ||
               parser->ttype == CSS_TK_SYMBOL) &&
-         a_Color_parse (parser->tval, -1, &err) != -1;
+          a_Color_parse(parser->tval, -1, &err) != -1;
 
    case CSS_TYPE_STRING:
       return parser->ttype == CSS_TK_STRING;
-      
+
    case CSS_TYPE_SYMBOL:
       return parser->ttype == CSS_TK_SYMBOL;
 
    case CSS_TYPE_FONT_WEIGHT:
       if (parser->ttype == CSS_TK_DECINT) {
-         i = atoi (parser->tval);
+         i = atoi(parser->tval);
          return i >= 100 && i <= 900;
-      } else 
+      } else
          return (parser->ttype == CSS_TK_SYMBOL &&
-                 (strcmp (parser->tval, "normal") == 0 ||
-                  strcmp (parser->tval, "bold") == 0 ||
-                  strcmp (parser->tval, "bolder") == 0 ||
-                  strcmp (parser->tval, "lighter") == 0));
+                 (strcmp(parser->tval, "normal") == 0 ||
+                  strcmp(parser->tval, "bold") == 0 ||
+                  strcmp(parser->tval, "bolder") == 0 ||
+                  strcmp(parser->tval, "lighter") == 0));
       break;
-      
+
    case CSS_TYPE_UNUSED:
       return false;
 
    case CSS_TYPE_INTEGER:
       /* Not used for parser values. */
    default:
-      assert (false);
+      assert(false);
       return false;
    }
 }
 
-static bool Css_parse_value (CssParser *parser,
-                             CssProperty::Name prop,
-                             CssProperty::Value *val)
+static bool Css_parse_value(CssParser * parser,
+                            CssProperty::Name prop,
+                            CssProperty::Value * val)
 {
    int i, lentype;
    bool found, ret = false;
@@ -543,147 +587,147 @@ static bool Css_parse_value (CssParser *parser,
    case CSS_TYPE_ENUM:
       if (parser->ttype == CSS_TK_SYMBOL) {
          for (i = 0; Css_property_info[prop].enum_symbols[i]; i++)
-            if (strcmp (parser->tval,
-                        Css_property_info[prop].enum_symbols[i]) == 0) {
+            if (strcmp(parser->tval,
+                       Css_property_info[prop].enum_symbols[i]) == 0) {
                val->intVal = i;
                ret = true;
                break;
             }
-         Css_next_token (parser);
+         Css_next_token(parser);
       }
       break;
-      
+
    case CSS_TYPE_MULTI_ENUM:
       val->intVal = 0;
       ret = true;
 
       while (parser->ttype == CSS_TK_SYMBOL) {
-         if (strcmp (parser->tval, "none") != 0) {
+         if (strcmp(parser->tval, "none") != 0) {
             for (i = 0, found = false;
-                 !found && Css_property_info[prop].enum_symbols[i];
-                 i++) {
-               if (strcmp (parser->tval,
-                           Css_property_info[prop].enum_symbols[i]) == 0)
+                 !found && Css_property_info[prop].enum_symbols[i]; i++) {
+               if (strcmp(parser->tval,
+                          Css_property_info[prop].enum_symbols[i]) == 0)
                   val->intVal |= (1 << i);
             }
          }
-         Css_next_token (parser);
+         Css_next_token(parser);
       }
       break;
-      
+
    case CSS_TYPE_LENGTH_PERCENTAGE:
    case CSS_TYPE_LENGTH:
       if (parser->ttype == CSS_TK_DECINT || parser->ttype == CSS_TK_FLOAT) {
-         fval = atof (parser->tval);
-         lentype = CSS_LENGTH_TYPE_PX; /* Actually, there must be a unit,
-                                        * except for num == 0. */
+         fval = atof(parser->tval);
+         lentype = CSS_LENGTH_TYPE_PX;  /* Actually, there must be a unit,
+                                         * except for num == 0. */
 
          ret = true;
-         
-         Css_next_token (parser);
+
+         Css_next_token(parser);
          if (parser->ttype == CSS_TK_SYMBOL) {
-            if (strcmp (parser->tval, "px") == 0) {
+            if (strcmp(parser->tval, "px") == 0) {
                lentype = CSS_LENGTH_TYPE_PX;
-               Css_next_token (parser);
-            } else if (strcmp (parser->tval, "mm") == 0) {
+               Css_next_token(parser);
+            } else if (strcmp(parser->tval, "mm") == 0) {
                lentype = CSS_LENGTH_TYPE_MM;
-               Css_next_token (parser);
-            } else if (strcmp (parser->tval, "cm") == 0) {
+               Css_next_token(parser);
+            } else if (strcmp(parser->tval, "cm") == 0) {
                lentype = CSS_LENGTH_TYPE_MM;
                fval *= 10;
-               Css_next_token (parser);
-            } else if (strcmp (parser->tval, "in") == 0) {
+               Css_next_token(parser);
+            } else if (strcmp(parser->tval, "in") == 0) {
                lentype = CSS_LENGTH_TYPE_MM;
                fval *= 25.4;
-               Css_next_token (parser);
-            } else if (strcmp (parser->tval, "pt") == 0) {
+               Css_next_token(parser);
+            } else if (strcmp(parser->tval, "pt") == 0) {
                lentype = CSS_LENGTH_TYPE_MM;
                fval *= (25.4 / 72);
-               Css_next_token (parser);
-            } else if (strcmp (parser->tval, "pc") == 0) {
+               Css_next_token(parser);
+            } else if (strcmp(parser->tval, "pc") == 0) {
                lentype = CSS_LENGTH_TYPE_MM;
                fval *= (25.4 / 6);
-               Css_next_token (parser);
-            } else if (strcmp (parser->tval, "em") == 0) {
+               Css_next_token(parser);
+            } else if (strcmp(parser->tval, "em") == 0) {
                lentype = CSS_LENGTH_TYPE_EM;
-               Css_next_token (parser);
-            } else if (strcmp (parser->tval, "ex") == 0) {
+               Css_next_token(parser);
+            } else if (strcmp(parser->tval, "ex") == 0) {
                lentype = CSS_LENGTH_TYPE_EX;
-               Css_next_token (parser);
+               Css_next_token(parser);
             }
-         } else if (Css_property_info[prop].type == CSS_TYPE_LENGTH_PERCENTAGE
-                    && parser->ttype == CSS_TK_CHAR &&
+         } else if (Css_property_info[prop].type ==
+                    CSS_TYPE_LENGTH_PERCENTAGE &&
+                    parser->ttype == CSS_TK_CHAR &&
                     parser->tval[0] == '%') {
             fval /= 100;
             lentype = CSS_LENGTH_TYPE_PERCENTAGE;
-            Css_next_token (parser);
-         }            
+            Css_next_token(parser);
+         }
 
-         val->intVal = CSS_CREATE_LENGTH (fval, lentype);
+         val->intVal = CSS_CREATE_LENGTH(fval, lentype);
       } else if (parser->ttype == CSS_TK_SYMBOL &&
-                 strcmp (parser->tval, "auto") == 0) {
+                 strcmp(parser->tval, "auto") == 0) {
          val->intVal = CSS_LENGTH_TYPE_AUTO;
       }
       break;
-        
+
    case CSS_TYPE_COLOR:
       if (parser->ttype == CSS_TK_COLOR) {
-         val->intVal = a_Color_parse (parser->tval, -1, &err);
+         val->intVal = a_Color_parse(parser->tval, -1, &err);
          if (err)
             MSG_CSS("color is not in \"%s\" format\n", "#RRGGBB");
          else
             ret = true;
-         Css_next_token (parser);
+         Css_next_token(parser);
       } else if (parser->ttype == CSS_TK_SYMBOL) {
-         val->intVal = a_Color_parse (parser->tval, -1, &err);
+         val->intVal = a_Color_parse(parser->tval, -1, &err);
          if (err)
             MSG_CSS("color is not in \"%s\" format\n", "#RRGGBB");
          else
             ret = true;
-         Css_next_token (parser);
+         Css_next_token(parser);
       }
       break;
-      
+
    case CSS_TYPE_STRING:
       if (parser->ttype == CSS_TK_STRING) {
-         val->strVal = dStrdup (parser->tval);
-         Css_next_token (parser);
+         val->strVal = dStrdup(parser->tval);
+         Css_next_token(parser);
       }
       break;
-      
+
    case CSS_TYPE_SYMBOL:
       if (parser->ttype == CSS_TK_SYMBOL) {
-         val->strVal = dStrdup (parser->tval);
+         val->strVal = dStrdup(parser->tval);
          ret = true;
-         Css_next_token (parser);
+         Css_next_token(parser);
       }
       break;
 
    case CSS_TYPE_FONT_WEIGHT:
       ival = 0;
       if (parser->ttype == CSS_TK_DECINT) {
-         ival = atoi (parser->tval);
+         ival = atoi(parser->tval);
          if (ival < 100 || ival > 900)
             /* invalid */
             ival = 0;
       } else if (parser->ttype == CSS_TK_SYMBOL) {
-         if (strcmp (parser->tval, "normal") == 0)
+         if (strcmp(parser->tval, "normal") == 0)
             ival = CssProperty::CSS_FONT_WEIGHT_NORMAL;
-         if (strcmp (parser->tval, "bold") == 0)
+         if (strcmp(parser->tval, "bold") == 0)
             ival = CssProperty::CSS_FONT_WEIGHT_BOLD;
-         if (strcmp (parser->tval, "bolder") == 0)
+         if (strcmp(parser->tval, "bolder") == 0)
             ival = CssProperty::CSS_FONT_WEIGHT_BOLDER;
-         if (strcmp (parser->tval, "lighter") == 0)
-            ival = CssProperty::CSS_FONT_WEIGHT_LIGHTER;       
+         if (strcmp(parser->tval, "lighter") == 0)
+            ival = CssProperty::CSS_FONT_WEIGHT_LIGHTER;
       }
-      
+
       if (ival != 0) {
          val->intVal = ival;
          ret = true;
-         Css_next_token (parser);
+         Css_next_token(parser);
       }
       break;
-      
+
    case CSS_TYPE_UNUSED:
       /* nothing */
       break;
@@ -691,19 +735,19 @@ static bool Css_parse_value (CssParser *parser,
    case CSS_TYPE_INTEGER:
       /* Not used for parser values. */
    default:
-      assert (false); /* not reached */
+      assert(false);            /* not reached */
    }
 
    return ret;
 }
 
-static bool Css_parse_weight (CssParser *parser)
+static bool Css_parse_weight(CssParser * parser)
 {
    if (parser->ttype == CSS_TK_CHAR && parser->tval[0] == '!') {
-      Css_next_token (parser);
+      Css_next_token(parser);
       if (parser->ttype == CSS_TK_SYMBOL &&
-          strcmp (parser->tval, "important") == 0) {
-         Css_next_token (parser);
+          strcmp(parser->tval, "important") == 0) {
+         Css_next_token(parser);
          return true;
       }
    }
@@ -714,135 +758,145 @@ static bool Css_parse_weight (CssParser *parser)
 /*
  * bsearch(3) compare function for searching properties
  */
-static int Css_property_info_cmp (const void *a, const void *b)
+static int Css_property_info_cmp(const void *a, const void *b)
 {
-   return strcmp(((CssPropertyInfo*)a)->symbol, ((CssPropertyInfo*)b)->symbol);
+   return strcmp(((CssPropertyInfo *) a)->symbol,
+                 ((CssPropertyInfo *) b)->symbol);
 }
 
 
 /*
  * bsearch(3) compare function for searching shorthands
  */
-static int Css_shorthand_info_cmp (const void *a, const void *b)
+static int Css_shorthand_info_cmp(const void *a, const void *b)
 {
-   return strcmp(((CssShorthandInfo*)a)->symbol,
-                 ((CssShorthandInfo*)b)->symbol);
+   return strcmp(((CssShorthandInfo *) a)->symbol,
+                 ((CssShorthandInfo *) b)->symbol);
 }
 
-static void Css_parse_declaration (CssParser *parser,
-   CssPropertyList *props, CssPropertyList *importantProps)
+static void Css_parse_declaration(CssParser * parser,
+                                  CssPropertyList * props,
+                                  CssPropertyList * importantProps)
 {
    CssPropertyInfo pi, *pip;
    CssShorthandInfo si, *sip;
+
    CssProperty::Name prop;
    CssProperty::Value val, dir_vals[4];
-   bool found, weight;  
+   bool found, weight;
    int sh_index, i, n;
    int dir_set[4][4] = {
-      /* 1 value  */ { 0, 0, 0, 0 },
-      /* 2 values */ { 0, 0, 1, 1 },
-      /* 3 values */ { 0, 2, 1, 1 },
-      /* 4 values */ { 0, 2, 3, 1 }
+      /* 1 value  */ {0, 0, 0, 0},
+      /* 2 values */ {0, 0, 1, 1},
+      /* 3 values */ {0, 2, 1, 1},
+      /* 4 values */ {0, 2, 3, 1}
    };
 
    if (parser->ttype == CSS_TK_SYMBOL) {
       pi.symbol = parser->tval;
-      pip = (CssPropertyInfo*) bsearch(&pi, Css_property_info, CSS_NUM_PARSED_PROPERTIES,
-                    sizeof (CssPropertyInfo), Css_property_info_cmp);
+      pip =
+          (CssPropertyInfo *) bsearch(&pi, Css_property_info,
+                                      CSS_NUM_PARSED_PROPERTIES,
+                                      sizeof(CssPropertyInfo),
+                                      Css_property_info_cmp);
       if (pip) {
          prop = (CssProperty::Name) (pip - Css_property_info);
-         Css_next_token (parser);
+         Css_next_token(parser);
          if (parser->ttype == CSS_TK_CHAR && parser->tval[0] == ':') {
-            Css_next_token (parser);
-            if (Css_parse_value (parser, prop, &val)) {
-               weight = Css_parse_weight (parser);
+            Css_next_token(parser);
+            if (Css_parse_value(parser, prop, &val)) {
+               weight = Css_parse_weight(parser);
                if (weight)
-                  importantProps->set (prop, val);
+                  importantProps->set(prop, val);
                else
-                  props->set (prop, val);
+                  props->set(prop, val);
             }
          }
-      } else  {
+      } else {
          /* Try shorthands. */
          si.symbol = parser->tval;
-         sip = (CssShorthandInfo*) bsearch(&pi, Css_shorthand_info, CSS_SHORTHAND_NUM,
-                       sizeof (CssShorthandInfo), Css_shorthand_info_cmp);
+         sip =
+             (CssShorthandInfo *) bsearch(&pi, Css_shorthand_info,
+                                          CSS_SHORTHAND_NUM,
+                                          sizeof(CssShorthandInfo),
+                                          Css_shorthand_info_cmp);
          if (sip) {
             sh_index = sip - Css_shorthand_info;
-            Css_next_token (parser);
+            Css_next_token(parser);
             if (parser->ttype == CSS_TK_CHAR && parser->tval[0] == ':') {
-               Css_next_token (parser);
+               Css_next_token(parser);
 
                switch (Css_shorthand_info[sh_index].type) {
                case CssShorthandInfo::CSS_SHORTHAND_MULTIPLE:
                   do {
                      for (found = false, i = 0;
                           !found &&
-                             Css_shorthand_info[sh_index].properties[i] != -1;
+                          Css_shorthand_info[sh_index].properties[i] != -1;
                           i++)
-                        if (Css_token_matches_property (
-                               parser,
-                               Css_shorthand_info[sh_index].properties[i])) {
+                        if (Css_token_matches_property(parser,
+                                                       Css_shorthand_info
+                                                       [sh_index].
+                                                       properties[i])) {
                            found = true;
-                           DEBUG_MSG (DEBUG_PARSE_LEVEL,
-                                      "will assign to '%s'\n",
-                                      Css_property_info
-                                      [Css_shorthand_info[sh_index]
-                                       .properties[i]].symbol);
-                           if (Css_parse_value ( parser,
-                                         Css_shorthand_info[sh_index]
-                                            .properties[i], &val)) {
-                              weight = Css_parse_weight (parser);
+                           DEBUG_MSG(DEBUG_PARSE_LEVEL,
+                                     "will assign to '%s'\n",
+                                     Css_property_info
+                                     [Css_shorthand_info[sh_index]
+                                      .properties[i]].symbol);
+                           if (Css_parse_value(parser,
+                                               Css_shorthand_info[sh_index]
+                                               .properties[i], &val)) {
+                              weight = Css_parse_weight(parser);
                               if (weight)
-                                 importantProps->set (
-                                      Css_shorthand_info[sh_index].properties[i],
-                                      val);
+                                 importantProps->
+                                     set(Css_shorthand_info[sh_index].
+                                         properties[i], val);
                               else
-                                 props->set (
-                                      Css_shorthand_info[sh_index].properties[i],
-                                      val);
+                                 props->set(Css_shorthand_info[sh_index].
+                                            properties[i], val);
                            }
                         }
                   } while (found);
                   break;
-                              
+
                case CssShorthandInfo::CSS_SHORTHAND_DIRECTIONS:
                   n = 0;
                   while (n < 4) {
-                     if (Css_token_matches_property (
-                            parser,
-                            Css_shorthand_info[sh_index].properties[0]) &&
-                         Css_parse_value (
-                                   parser,
-                                   Css_shorthand_info[sh_index]
-                                      .properties[0], &val)) {
+                     if (Css_token_matches_property(parser,
+                                                    Css_shorthand_info
+                                                    [sh_index].
+                                                    properties[0]) &&
+                         Css_parse_value(parser,
+                                         Css_shorthand_info[sh_index]
+                                         .properties[0], &val)) {
                         dir_vals[n] = val;
                         n++;
                      } else
                         break;
                   }
 
-                  weight = Css_parse_weight (parser);
+                  weight = Css_parse_weight(parser);
                   if (n > 0) {
                      for (i = 0; i < 4; i++)
                         if (weight)
-                           importantProps->set (Css_shorthand_info[sh_index]
-                                                              .properties[i],
-                                                dir_vals[dir_set[n - 1][i]]);
+                           importantProps->set(Css_shorthand_info[sh_index]
+                                               .properties[i],
+                                               dir_vals[dir_set[n - 1]
+                                                        [i]]);
                         else
-                           props->set (Css_shorthand_info[sh_index]
-                                              .properties[i],
-                                       dir_vals[dir_set[n - 1][i]]);
+                           props->set(Css_shorthand_info[sh_index]
+                                      .properties[i],
+                                      dir_vals[dir_set[n - 1][i]]);
                   } else
                      MSG_CSS("no values for shorthand proprerty '%s'\n",
                              Css_shorthand_info[sh_index].symbol);
 
                   break;
-                  
+
                case CssShorthandInfo::CSS_SHORTHAND_BORDER:
                   /* todo: Not yet implemented. */
                   break;
-                  
+
                case CssShorthandInfo::CSS_SHORTHAND_FONT:
                   /* todo: Not yet implemented. */
                   break;
@@ -856,40 +910,40 @@ static void Css_parse_declaration (CssParser *parser,
    while (!(parser->ttype == CSS_TK_END ||
             (parser->ttype == CSS_TK_CHAR &&
              (parser->tval[0] == ';' || parser->tval[0] == '}'))))
-      Css_next_token (parser);
+      Css_next_token(parser);
 
    if (parser->ttype == CSS_TK_CHAR && parser->tval[0] == ';')
-      Css_next_token (parser);
+      Css_next_token(parser);
 }
 
-static void Css_parse_ruleset (CssParser *parser)
+static void Css_parse_ruleset(CssParser * parser)
 {
-   lout::misc::SimpleVector <CssSelector*> *list;
+   lout::misc::SimpleVector < CssSelector * >*list;
    CssPropertyList *props, *importantProps;
    CssSelector *selector;
    const char *p, **pp;
-   
-   list = new lout::misc::SimpleVector <CssSelector*> (1);
+
+   list = new lout::misc::SimpleVector < CssSelector * >(1);
 
    while (true) {
       selector = NULL;
 
       if (parser->ttype == CSS_TK_SYMBOL) {
-         selector = new CssSelector ();
+         selector = new CssSelector();
          selector->element = a_Html_tag_index(parser->tval);
-         Css_next_token (parser);
+         Css_next_token(parser);
       } else if (parser->ttype == CSS_TK_CHAR && parser->tval[0] == '*') {
-         selector = new CssSelector ();
-         Css_next_token (parser);
+         selector = new CssSelector();
+         Css_next_token(parser);
       } else if (parser->ttype == CSS_TK_CHAR &&
                  (parser->tval[0] == '.' || parser->tval[0] == ':' ||
                   parser->tval[0] == '#')) {
-         selector = new CssSelector ();
+         selector = new CssSelector();
          /* But no next token. */
       }
 
       if (selector) {
-         selector->ref ();
+         selector->ref();
          selector->id = selector->klass = selector->pseudo = NULL;
 
          do {
@@ -909,101 +963,103 @@ static void Css_parse_ruleset (CssParser *parser)
             }
 
             if (pp) {
-               Css_next_token (parser);
+               Css_next_token(parser);
                if (parser->ttype == CSS_TK_SYMBOL ||
                    parser->ttype == CSS_TK_DECINT) {
                   if (*pp == NULL)
-                     *pp = dStrdup (parser->tval);
-                  Css_next_token (parser);
+                     *pp = dStrdup(parser->tval);
+                  Css_next_token(parser);
                } else if (parser->ttype == CSS_TK_FLOAT) {
                   /* In this case, we are actually interested in three tokens:
                    * number, '.', number. Instead, we have a decimal fraction,
                    * which we split up again. */
-                  p = strchr (parser->tval, '.');
+                  p = strchr(parser->tval, '.');
                   if (*pp == NULL)
-                     *pp = dStrndup (parser->tval, p - parser->tval);
+                     *pp = dStrndup(parser->tval, p - parser->tval);
                   if (selector->klass == NULL)
-                     selector->klass = dStrdup (p + 1);
-                  Css_next_token (parser);
+                     selector->klass = dStrdup(p + 1);
+                  Css_next_token(parser);
                }
             }
          } while (pp);
       }
-    
+
       /* Skip all tokens which may "belong" to this selector. */
       while (!(parser->ttype == CSS_TK_END ||
                (parser->ttype == CSS_TK_CHAR &&
                 (parser->tval[0] == ',' || parser->tval[0] == '{'))))
-         Css_next_token (parser);
+         Css_next_token(parser);
 
       if (selector)
-         DEBUG_MSG (DEBUG_PARSE_LEVEL, "end of selector (%s, %s, %s, %d)\n",
-                    selector->id, selector->klass, selector->pseudo,
-                    selector->element);
+         DEBUG_MSG(DEBUG_PARSE_LEVEL, "end of selector (%s, %s, %s, %d)\n",
+                   selector->id, selector->klass, selector->pseudo,
+                   selector->element);
       else
-         DEBUG_MSG (DEBUG_PARSE_LEVEL, "not a %s\n", "selector");
-      
+         DEBUG_MSG(DEBUG_PARSE_LEVEL, "not a %s\n", "selector");
+
       if (selector) {
-         list->increase ();
-         list->set (list->size () - 1, selector);
+         list->increase();
+         list->set(list->size() - 1, selector);
       }
 
       if (parser->ttype == CSS_TK_CHAR && parser->tval[0] == ',')
          /* To read the next token. */
-         Css_next_token (parser);
+         Css_next_token(parser);
       else
          /* No more selectors. */
          break;
    }
 
-   DEBUG_MSG (DEBUG_PARSE_LEVEL, "end of %s\n", "selectors");
+   DEBUG_MSG(DEBUG_PARSE_LEVEL, "end of %s\n", "selectors");
+
+   props = new CssPropertyList();
+   props->ref();
+   importantProps = new CssPropertyList();
+   importantProps->ref();
 
-   props = new CssPropertyList ();
-   props->ref ();
-   importantProps = new CssPropertyList ();
-   importantProps->ref ();
-   
    /* Read block. ('{' has already been read.) */
    if (parser->ttype != CSS_TK_END) {
       parser->within_block = true;
-      Css_next_token (parser);
+      Css_next_token(parser);
       do
-         Css_parse_declaration (parser, props, importantProps);
+         Css_parse_declaration(parser, props, importantProps);
       while (!(parser->ttype == CSS_TK_END ||
                (parser->ttype == CSS_TK_CHAR && parser->tval[0] == '}')));
       parser->within_block = false;
    }
 
-   for (int i = 0; i < list->size (); i++) {
-      CssSelector *s = list->get (i);
+   for (int i = 0; i < list->size(); i++) {
+      CssSelector *s = list->get(i);
 
       if (parser->origin == CSS_ORIGIN_USER_AGENT) {
-         parser->context->addRule (new CssRule (s, props), CSS_PRIMARY_USER_AGENT);
+         parser->context->addRule(new CssRule(s, props),
+                                  CSS_PRIMARY_USER_AGENT);
       } else if (parser->origin == CSS_ORIGIN_USER) {
-         parser->context->addRule (new CssRule (s, props), CSS_PRIMARY_USER);
-         parser->context->addRule (new CssRule (s, importantProps), CSS_PRIMARY_USER_IMPORTANT);
+         parser->context->addRule(new CssRule(s, props), CSS_PRIMARY_USER);
+         parser->context->addRule(new CssRule(s, importantProps),
+                                  CSS_PRIMARY_USER_IMPORTANT);
       } else if (parser->origin == CSS_ORIGIN_AUTHOR) {
-         parser->context->addRule (new CssRule (s, props), CSS_PRIMARY_AUTHOR);
-         parser->context->addRule (new CssRule (s, importantProps), CSS_PRIMARY_AUTHOR_IMPORTANT);
+         parser->context->addRule(new CssRule(s, props),
+                                  CSS_PRIMARY_AUTHOR);
+         parser->context->addRule(new CssRule(s, importantProps),
+                                  CSS_PRIMARY_AUTHOR_IMPORTANT);
       }
 
-      s->unref ();
+      s->unref();
    }
 
-   props->unref ();
-   importantProps->unref ();
+   props->unref();
+   importantProps->unref();
 
    delete list;
 
    if (parser->ttype == CSS_TK_CHAR && parser->tval[0] == '}')
-      Css_next_token (parser);
+      Css_next_token(parser);
 }
 
-void a_Css_parse (CssContext *context,
-                  const char *buf,
-                  int buflen,
-                  int order_count,
-                  CssOrigin origin)
+void a_Css_parse(CssContext * context,
+                 const char *buf,
+                 int buflen, int order_count, CssOrigin origin)
 {
    CssParser parser;
 
@@ -1015,21 +1071,20 @@ void a_Css_parse (CssContext *context,
    parser.origin = origin;
    parser.within_block = false;
 
-   Css_next_token (&parser);
+   Css_next_token(&parser);
    while (parser.ttype != CSS_TK_END)
-      Css_parse_ruleset (&parser);
+      Css_parse_ruleset(&parser);
 }
 
 #if 0
-void p_Css_parse_element_style (CssContext *context,
-                                char *id,
-                                char *klass,
-                                char *pseudo,
-                                char *element,
-                                const char *buf,
-                                int buflen,
-                                int order_count,
-                                CssOrigin origin)
+void p_Css_parse_element_style(CssContext * context,
+                               char *id,
+                               char *klass,
+                               char *pseudo,
+                               char *element,
+                               const char *buf,
+                               int buflen,
+                               int order_count, CssOrigin origin)
 {
    CssParser parser;
    CssSelector *selector;
@@ -1043,18 +1098,18 @@ void p_Css_parse_element_style (CssContext *context,
    parser.origin = origin;
    parser.within_block = true;
 
-   selector = g_new (CssSelector, 1);
+   selector = g_new(CssSelector, 1);
    selector->id = id;
    selector->klass = klass;
    selector->pseudo = pseudo;
    selector->element = element;
-   list = g_slist_append (NULL, selector);
+   list = g_slist_append(NULL, selector);
 
-   Css_next_token (&parser);
+   Css_next_token(&parser);
    while (parser.ttype != CSS_TK_END)
-      Css_parse_declaration (&parser, list);
-   
-   dFree (selector);
-   g_slist_free (list);
+      Css_parse_declaration(&parser, list);
+
+   dFree(selector);
+   g_slist_free(list);
 }
 #endif
diff --git a/src/cssparser.hh b/src/cssparser.hh
index 5089d9bb..2446e4a9 100644
--- a/src/cssparser.hh
+++ b/src/cssparser.hh
@@ -43,9 +43,9 @@ typedef enum {
 } CssOrigin;
 
 typedef struct {
-   char *symbol;
+   const char *symbol;
    CssValueType type;
-   char **enum_symbols;
+   const char **enum_symbols;
 } CssPropertyInfo;
 
 
diff --git a/src/html.cc b/src/html.cc
index 4ebd97ad..3edd59a4 100644
--- a/src/html.cc
+++ b/src/html.cc
@@ -2366,9 +2366,10 @@ static void Html_tag_open_object(DilloHtml *html, const char *tag, int tagsize)
             html->visited_color
 /*
             a_Color_vc(html->visited_color,
-                       html->styleEngine->style ()->color->getColor(),
+                       html->styleEngine->style()->color->getColor(),
                        html->link_color,
-                       html->styleEngine->style ()->backgroundColor->getColor()),
+                       html->styleEngine->style()->backgroundColor->getColor()
+                      );
 */
             );
       } else {
@@ -2690,7 +2691,8 @@ static void Html_tag_open_li(DilloHtml *html, const char *tag, int tagsize)
          BUG_MSG("illegal negative LIST VALUE attribute; Starting from 0\n");
          *list_number = 0;
       }
-      numtostr((*list_number)++, buf, 16, html->styleEngine->style ()->listStyleType);
+      numtostr((*list_number)++, buf, 16,
+               html->styleEngine->style ()->listStyleType);
       list_item->initWithText (dStrdup(buf), word_style);
       list_item->addSpace (word_style);
       html->PrevWasSPC = true;