1 files changed, 90 insertions, 90 deletions

diff --git a/src/css.hh b/src/css.hh
index 70e2680e..c2a54ca3 100644
--- a/src/css.hh
+++ b/src/css.hh
@@ -23,90 +23,90 @@ class CssProperty {
       } Value;
 
       typedef enum {
-         BACKGROUND_ATTACHMENT,
-         BACKGROUND_COLOR,
-         BACKGROUND_IMAGE,
-         BACKGROUND_POSITION,
-         BACKGROUND_REPEAT,
-         BORDER_BOTTOM_COLOR,
-         BORDER_BOTTOM_STYLE,
-         BORDER_BOTTOM_WIDTH,
-         BORDER_COLLAPSE,
-         BORDER_LEFT_COLOR,
-         BORDER_LEFT_STYLE,
-         BORDER_LEFT_WIDTH,
-         BORDER_RIGHT_COLOR,
-         BORDER_RIGHT_STYLE,
-         BORDER_RIGHT_WIDTH,
-         BORDER_SPACING,
-         BORDER_TOP_COLOR,
-         BORDER_TOP_STYLE,
-         BORDER_TOP_WIDTH,
-         BOTTOM,
-         CAPTION_SIDE,
-         CLEAR,
-         CLIP,
-         COLOR,
-         CONTENT,
-         COUNTER_INCREMENT,
-         COUNTER_RESET,
-         CURSOR,
-         DIRECTION,
-         DISPLAY,
-         EMPTY_CELLS,
-         FLOAT,
-         FONT_FAMILY,
-         FONT_SIZE,
-         FONT_SIZE_ADJUST,
-         FONT_STRETCH,
-         FONT_STYLE,
-         FONT_VARIANT,
-         FONT_WEIGHT,
-         HEIGHT,
-         LEFT,
-         LETTER_SPACING,
-         LINE_HEIGHT,
-         LIST_STYLE_IMAGE,
-         LIST_STYLE_POSITION,
-         LIST_STYLE_TYPE,
-         MARGIN_BOTTOM,
-         MARGIN_LEFT,
-         MARGIN_RIGHT,
-         MARGIN_TOP,
-         MARKER_OFFSET,
-         MARKS,
-         MAX_HEIGHT,
-         MAX_WIDTH,
-         MIN_HEIGHT,
-         MIN_WIDTH,
-         OUTLINE_COLOR,
-         OUTLINE_STYLE,
-         OUTLINE_WIDTH,
-         OVERFLOW,
-         PADDING_BOTTOM,
-         PADDING_LEFT,
-         PADDING_RIGHT,
-         PADDING_TOP,
-         POSITION,
-         QUOTES,
-         RIGHT,
-         TEXT_ALIGN,
-         TEXT_DECORATION,
-         TEXT_SHADOW,
-         TEXT_TRANSFORM,
-         TOP,
-         UNICODE_BIDI,
-         VERTICAL_ALIGN,
-         VISIBILITY,
-         WHITE_SPACE,
-         TEXT_INDENT,
-         WIDTH,
-         WORD_SPACING,
-         Z_INDEX,
-         X_LINK,
-         X_COLSPAN,
-         X_ROWSPAN,
-         LAST
+         CSS_PROPERTY_BACKGROUND_ATTACHMENT,
+         CSS_PROPERTY_BACKGROUND_COLOR,
+         CSS_PROPERTY_BACKGROUND_IMAGE,
+         CSS_PROPERTY_BACKGROUND_POSITION,
+         CSS_PROPERTY_BACKGROUND_REPEAT,
+         CSS_PROPERTY_BORDER_BOTTOM_COLOR,
+         CSS_PROPERTY_BORDER_BOTTOM_STYLE,
+         CSS_PROPERTY_BORDER_BOTTOM_WIDTH,
+         CSS_PROPERTY_BORDER_COLLAPSE,
+         CSS_PROPERTY_BORDER_LEFT_COLOR,
+         CSS_PROPERTY_BORDER_LEFT_STYLE,
+         CSS_PROPERTY_BORDER_LEFT_WIDTH,
+         CSS_PROPERTY_BORDER_RIGHT_COLOR,
+         CSS_PROPERTY_BORDER_RIGHT_STYLE,
+         CSS_PROPERTY_BORDER_RIGHT_WIDTH,
+         CSS_PROPERTY_BORDER_SPACING,
+         CSS_PROPERTY_BORDER_TOP_COLOR,
+         CSS_PROPERTY_BORDER_TOP_STYLE,
+         CSS_PROPERTY_BORDER_TOP_WIDTH,
+         CSS_PROPERTY_BOTTOM,
+         CSS_PROPERTY_CAPTION_SIDE,
+         CSS_PROPERTY_CLEAR,
+         CSS_PROPERTY_CLIP,
+         CSS_PROPERTY_COLOR,
+         CSS_PROPERTY_CONTENT,
+         CSS_PROPERTY_COUNTER_INCREMENT,
+         CSS_PROPERTY_COUNTER_RESET,
+         CSS_PROPERTY_CURSOR,
+         CSS_PROPERTY_DIRECTION,
+         CSS_PROPERTY_DISPLAY,
+         CSS_PROPERTY_EMPTY_CELLS,
+         CSS_PROPERTY_FLOAT,
+         CSS_PROPERTY_FONT_FAMILY,
+         CSS_PROPERTY_FONT_SIZE,
+         CSS_PROPERTY_FONT_SIZE_ADJUST,
+         CSS_PROPERTY_FONT_STRETCH,
+         CSS_PROPERTY_FONT_STYLE,
+         CSS_PROPERTY_FONT_VARIANT,
+         CSS_PROPERTY_FONT_WEIGHT,
+         CSS_PROPERTY_HEIGHT,
+         CSS_PROPERTY_LEFT,
+         CSS_PROPERTY_LETTER_SPACING,
+         CSS_PROPERTY_LINE_HEIGHT,
+         CSS_PROPERTY_LIST_STYLE_IMAGE,
+         CSS_PROPERTY_LIST_STYLE_POSITION,
+         CSS_PROPERTY_LIST_STYLE_TYPE,
+         CSS_PROPERTY_MARGIN_BOTTOM,
+         CSS_PROPERTY_MARGIN_LEFT,
+         CSS_PROPERTY_MARGIN_RIGHT,
+         CSS_PROPERTY_MARGIN_TOP,
+         CSS_PROPERTY_MARKER_OFFSET,
+         CSS_PROPERTY_MARKS,
+         CSS_PROPERTY_MAX_HEIGHT,
+         CSS_PROPERTY_MAX_WIDTH,
+         CSS_PROPERTY_MIN_HEIGHT,
+         CSS_PROPERTY_MIN_WIDTH,
+         CSS_PROPERTY_OUTLINE_COLOR,
+         CSS_PROPERTY_OUTLINE_STYLE,
+         CSS_PROPERTY_OUTLINE_WIDTH,
+         CSS_PROPERTY_OVERFLOW,
+         CSS_PROPERTY_PADDING_BOTTOM,
+         CSS_PROPERTY_PADDING_LEFT,
+         CSS_PROPERTY_PADDING_RIGHT,
+         CSS_PROPERTY_PADDING_TOP,
+         CSS_PROPERTY_POSITION,
+         CSS_PROPERTY_QUOTES,
+         CSS_PROPERTY_RIGHT,
+         CSS_PROPERTY_TEXT_ALIGN,
+         CSS_PROPERTY_TEXT_DECORATION,
+         CSS_PROPERTY_TEXT_SHADOW,
+         CSS_PROPERTY_TEXT_TRANSFORM,
+         CSS_PROPERTY_TOP,
+         CSS_PROPERTY_UNICODE_BIDI,
+         CSS_PROPERTY_VERTICAL_ALIGN,
+         CSS_PROPERTY_VISIBILITY,
+         CSS_PROPERTY_WHITE_SPACE,
+         CSS_PROPERTY_TEXT_INDENT,
+         CSS_PROPERTY_WIDTH,
+         CSS_PROPERTY_WORD_SPACING,
+         CSS_PROPERTY_Z_INDEX,
+         CSS_PROPERTY_X_LINK,
+         CSS_PROPERTY_X_COLSPAN,
+         CSS_PROPERTY_X_ROWSPAN,
+         CSS_PROPERTY_LAST
       } Name;
 
       Name name;
@@ -161,15 +161,15 @@ class CssStyleSheet : public lout::misc::SimpleVector <CssRule*> {
 class CssContext {
    public:
       typedef enum {
-         USER_AGENT,
-         USER,
-         AUTHOR,
-         AUTHOR_IMPORTANT,
-         USER_IMPORTANT
+         CSS_PRIMARY_USER_AGENT,
+         CSS_PRIMARY_USER,
+         CSS_PRIMARY_AUTHOR,
+         CSS_PRIMARY_AUTHOR_IMPORTANT,
+         CSS_PRIMARY_USER_IMPORTANT
       } PrimaryOrder;
 
    private:
-      CssStyleSheet sheet[USER_IMPORTANT + 1];
+      CssStyleSheet sheet[CSS_PRIMARY_USER_IMPORTANT + 1];
 
    public:
       void addRule (CssRule *rule, PrimaryOrder order);