Index: gtkhtml/src/gtkhtml-enums.h
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/gtkhtml-enums.h,v
retrieving revision 1.35
diff -u -p -r1.35 gtkhtml-enums.h
--- gtkhtml/src/gtkhtml-enums.h	19 May 2003 14:41:02 -0000	1.35
+++ gtkhtml/src/gtkhtml-enums.h	16 Jul 2003 02:06:40 -0000
@@ -242,15 +242,13 @@ typedef enum {
 } GtkHTMLEtchStyle; 
 
 typedef enum {
-	GTK_HTML_FONT_STYLE_SHIFT_FIRST = 3,
-	GTK_HTML_FONT_STYLE_SHIFT_BOLD = GTK_HTML_FONT_STYLE_SHIFT_FIRST,
-	GTK_HTML_FONT_STYLE_SHIFT_ITALIC,
-	GTK_HTML_FONT_STYLE_SHIFT_UNDERLINE,
-	GTK_HTML_FONT_STYLE_SHIFT_STRIKEOUT,
-	GTK_HTML_FONT_STYLE_SHIFT_FIXED,
-	GTK_HTML_FONT_STYLE_SHIFT_SUBSCRIPT,
-	GTK_HTML_FONT_STYLE_SHIFT_SUPERSCRIPT,
-	GTK_HTML_FONT_STYLE_SHIFT_LAST = GTK_HTML_FONT_STYLE_SHIFT_SUPERSCRIPT,
+	GTK_HTML_FONT_STYLE_SHIFT_BOLD = 3,
+	GTK_HTML_FONT_STYLE_SHIFT_ITALIC = 4,
+	GTK_HTML_FONT_STYLE_SHIFT_UNDERLINE = 5,
+	GTK_HTML_FONT_STYLE_SHIFT_STRIKEOUT = 6,
+	GTK_HTML_FONT_STYLE_SHIFT_FIXED = 7,
+	GTK_HTML_FONT_STYLE_SHIFT_SUBSCRIPT = 8,
+	GTK_HTML_FONT_STYLE_SHIFT_SUPERSCRIPT = 9,
 } GtkHTMLFontStyleShift;
 
 typedef enum {
@@ -263,13 +261,13 @@ typedef enum {
 	GTK_HTML_FONT_STYLE_SIZE_6 = 6,
 	GTK_HTML_FONT_STYLE_SIZE_7 = 7,
 	GTK_HTML_FONT_STYLE_SIZE_MASK = 0x7,
-	GTK_HTML_FONT_STYLE_BOLD        = 1 << GTK_HTML_FONT_STYLE_SHIFT_BOLD,
-	GTK_HTML_FONT_STYLE_ITALIC      = 1 << GTK_HTML_FONT_STYLE_SHIFT_ITALIC,
-	GTK_HTML_FONT_STYLE_UNDERLINE   = 1 << GTK_HTML_FONT_STYLE_SHIFT_UNDERLINE,
-	GTK_HTML_FONT_STYLE_STRIKEOUT   = 1 << GTK_HTML_FONT_STYLE_SHIFT_STRIKEOUT,
-	GTK_HTML_FONT_STYLE_FIXED       = 1 << GTK_HTML_FONT_STYLE_SHIFT_FIXED,
-	GTK_HTML_FONT_STYLE_SUBSCRIPT   = 1 << GTK_HTML_FONT_STYLE_SHIFT_SUBSCRIPT,
-	GTK_HTML_FONT_STYLE_SUPERSCRIPT = 1 << GTK_HTML_FONT_STYLE_SHIFT_SUPERSCRIPT,
+	GTK_HTML_FONT_STYLE_BOLD        = 1 << 3,
+	GTK_HTML_FONT_STYLE_ITALIC      = 1 << 4,
+	GTK_HTML_FONT_STYLE_UNDERLINE   = 1 << 5,
+	GTK_HTML_FONT_STYLE_STRIKEOUT   = 1 << 6,
+	GTK_HTML_FONT_STYLE_FIXED       = 1 << 7,
+	GTK_HTML_FONT_STYLE_SUBSCRIPT   = 1 << 8,
+	GTK_HTML_FONT_STYLE_SUPERSCRIPT = 1 << 9,
 } GtkHTMLFontStyle;
 
 typedef enum {