cr-token.h: applied a patch from applied a patch from Greg Lee <greg@ling.lll.hawaii.edu>,

which solves a compilation error under gcc 2.95.3.
Dodji.

8 files changed, 257 insertions, 249 deletions

diff --git a/AUTHORS b/AUTHORS
index c709394..9fb45ba 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1 +1,7 @@
-Dodji Seketeli <dodji@seketeli.org>
+Dodji Seketeli <dodji@seketeli.org> 
+###################################
+Initial Author, main maintainer and main architect.
+
+Gael Chamoulaud <strider@freespiders.org>
+##########################################
+Programmer.
diff --git a/ChangeLog b/ChangeLog
index 4b8b3cf..812bb92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-04-05  Dodji  <dodji@seketeli.org>
+
+	* src/cr-token.h (struct _CRToken): 
+	applied a patch from Greg Lee <greg@ling.lll.hawaii.edu>,
+	which solves a compilation error under gcc 2.95.3. Basically,
+	it transforms an implicitly defined  union into an explicitly
+	defined one. Modified all the files impacted.
+	
 2003-04-03  Dodji  <dodji@seketeli.org>
 
 	* tests/testctl: can now run one single test. This can also
diff --git a/configure.in b/configure.in
index 7ff9e96..196fcc8 100644
--- a/configure.in
+++ b/configure.in
@@ -90,7 +90,7 @@ dnl --enable-tests
 dnl this option enables compilation of the unit tests built in to .c files
 dnl and also some stuff in the test/ subdir
 AC_ARG_ENABLE(tests, 
-	       AC_HELP_STRING([--enable-test=yes|no], 
+	       AC_HELP_STRING([--enable-tests=yes|no], 
 	                      [Enables unit test code, Default=no]),
 	       WITH_TESTS=$enableval,
 	       WITH_TESTS=no)
diff --git a/src/cr-declaration.c b/src/cr-declaration.c
index b2e474d..9081024 100644
--- a/src/cr-declaration.c
+++ b/src/cr-declaration.c
@@ -42,8 +42,8 @@
 static void
 dump (CRDeclaration *a_this, FILE *a_fp, glong a_indent)
 {
-	g_return_if_fail (a_this) ;
 	guchar *str = NULL, *tmp_str = NULL, *tmp_str2 = NULL;
+	g_return_if_fail (a_this) ;
 
 	if (a_this->property && a_this->property->str)
 	{		
diff --git a/src/cr-parser.c b/src/cr-parser.c
index 229fe3c..9bb636a 100644
--- a/src/cr-parser.c
+++ b/src/cr-parser.c
@@ -1577,7 +1577,7 @@ cr_parser_parse_declaration_core (CRParser *a_this)
         ENSURE_PARSING_COND (status == CR_OK 
                              && token
                              && token->type == DELIM_TK
-                             && token->unichar == ':' ) ;
+                             && token->u.unichar == ':' ) ;
         cr_token_destroy (token) ; token = NULL ;
         cr_parser_try_to_skip_spaces_and_comments (a_this) ;        
         status = cr_parser_parse_value_core (a_this) ;
@@ -1994,8 +1994,8 @@ cr_parser_parse_attribute_selector (CRParser *a_this, CRAttrSel **a_sel)
                              && token 
                              && token->type == IDENT_TK) ;
 
-        result->name = token->str ;
-        token->str = NULL ;
+        result->name = token->u.str ;
+        token->u.str = NULL ;
         cr_token_destroy (token) ;
         token = NULL ;
 
@@ -2016,7 +2016,7 @@ cr_parser_parse_attribute_selector (CRParser *a_this, CRAttrSel **a_sel)
                 result->match_way = DASHMATCH ;
                 goto parse_right_part ;
         }
-        else if (token->type == DELIM_TK && token->unichar == '=')
+        else if (token->type == DELIM_TK && token->u.unichar == '=')
         {
                 result->match_way = EQUALS ;
                 goto parse_right_part ;
@@ -2045,13 +2045,13 @@ cr_parser_parse_attribute_selector (CRParser *a_this, CRAttrSel **a_sel)
 
         if (token->type == IDENT_TK)
         {
-                result->value = token->str ;
-                token->str = NULL ;
+                result->value = token->u.str ;
+                token->u.str = NULL ;
         }
         else if (token->type == STRING_TK)
         {
-                result->value = token->str ;
-                token->str = NULL ;
+                result->value = token->u.str ;
+                token->u.str = NULL ;
         }
         else
         {
@@ -2189,12 +2189,12 @@ cr_parser_parse_term (CRParser *a_this, CRTerm **a_term)
                                           &token) ;
         if (status != CR_OK || !token) goto error ;
 
-        if (token->type == DELIM_TK && token->unichar == '+')
+        if (token->type == DELIM_TK && token->u.unichar == '+')
         {
                 result->unary_op = PLUS_UOP ;
         }
         else if (token->type 
-                 == DELIM_TK && token->unichar == '-')
+                 == DELIM_TK && token->u.unichar == '-')
         {
                 result->unary_op = MINUS_UOP ;
         }
@@ -2207,9 +2207,9 @@ cr_parser_parse_term (CRParser *a_this, CRTerm **a_term)
                 || token->type == PERCENTAGE_TK
                 || token->type == NUMBER_TK)
         {
-                status = cr_term_set_number (result, token->num) ;
+                status = cr_term_set_number (result, token->u.num) ;
                 CHECK_PARSING_STATUS (status, TRUE) ;
-                token->num = NULL ;
+                token->u.num = NULL ;
                 status = CR_OK ;
         }
         else if (token && token->type == FUNCTION_TK)
@@ -2229,27 +2229,27 @@ cr_parser_parse_term (CRParser *a_this, CRTerm **a_term)
         }
         else if (token && token->type == STRING_TK)
         {
-                status = cr_term_set_string (result, token->str) ;
+                status = cr_term_set_string (result, token->u.str) ;
                 CHECK_PARSING_STATUS (status, TRUE) ;
-                token->str = NULL ;
+                token->u.str = NULL ;
         }
         else if (token && token->type == IDENT_TK)
         {
-                status = cr_term_set_ident (result, token->str) ;
+                status = cr_term_set_ident (result, token->u.str) ;
                 CHECK_PARSING_STATUS (status, TRUE) ;
-                token->str = NULL ;
+                token->u.str = NULL ;
         }
         else if (token && token->type == URI_TK)
         {
-                status = cr_term_set_uri (result, token->str) ;
+                status = cr_term_set_uri (result, token->u.str) ;
                 CHECK_PARSING_STATUS (status, TRUE) ;
-                token->str = NULL ;
+                token->u.str = NULL ;
         }
         else if (token && token->type == RGB_TK)
         {
-                status = cr_term_set_rgb (result, token->rgb) ;
+                status = cr_term_set_rgb (result, token->u.rgb) ;
                 CHECK_PARSING_STATUS (status, TRUE) ;
-                token->rgb = NULL ;
+                token->u.rgb = NULL ;
         }
         else if (token && token->type == UNICODERANGE_TK)
         {
@@ -2258,9 +2258,9 @@ cr_parser_parse_term (CRParser *a_this, CRTerm **a_term)
         }
         else if (token && token->type == HASH_TK)
         {
-                status = cr_term_set_hash (result, token->str) ;
+                status = cr_term_set_hash (result, token->u.str) ;
                 CHECK_PARSING_STATUS (status, TRUE) ;
-                token->str = NULL ;
+                token->u.str = NULL ;
         }
         else
         {
@@ -2443,7 +2443,7 @@ cr_parser_parse_simple_selector (CRParser *a_this, CRSimpleSel **a_sel)
         sel = cr_simple_sel_new () ;
         ENSURE_PARSING_COND (sel) ;
 
-        if (token && token->type == DELIM_TK && token->unichar == '*')
+        if (token && token->type == DELIM_TK && token->u.unichar == '*')
         {
                 sel->type_mask |= UNIVERSAL_SELECTOR ;
                 sel->name = g_string_new ("*") ;
@@ -2451,9 +2451,9 @@ cr_parser_parse_simple_selector (CRParser *a_this, CRSimpleSel **a_sel)
         }
         else if (token && token->type == IDENT_TK)
         {
-                sel->name = token->str ;
+                sel->name = token->u.str ;
                 sel->type_mask |= TYPE_SELECTOR ;
-                token->str = NULL ;
+                token->u.str = NULL ;
                 found_sel = TRUE ;
                 
         }
@@ -2492,8 +2492,8 @@ cr_parser_parse_simple_selector (CRParser *a_this, CRSimpleSel **a_sel)
                         add_sel = cr_additional_sel_new_with_type 
                                 (ID_ADD_SELECTOR) ;
 
-                        add_sel->content.id_name = token->str ;
-                        token->str = NULL ;
+                        add_sel->content.id_name = token->u.str ;
+                        token->u.str = NULL ;
                         
                         add_sel_list = 
                                 cr_additional_sel_append 
@@ -2503,7 +2503,7 @@ cr_parser_parse_simple_selector (CRParser *a_this, CRSimpleSel **a_sel)
                 }
                 else if (token 
                          && (token->type == DELIM_TK) 
-                         && (token->unichar == '.'))
+                         && (token->u.unichar == '.'))
                 {
                         cr_token_destroy (token) ;
                         token = NULL ;
@@ -2519,8 +2519,8 @@ cr_parser_parse_simple_selector (CRParser *a_this, CRSimpleSel **a_sel)
                                 add_sel = cr_additional_sel_new_with_type
                                         (CLASS_ADD_SELECTOR) ;
 
-                                add_sel->content.class_name = token->str ;
-                                token->str = NULL ;
+                                add_sel->content.class_name = token->u.str ;
+                                token->u.str = NULL ;
 
                                 add_sel_list = 
                                         cr_additional_sel_append 
@@ -2562,7 +2562,7 @@ cr_parser_parse_simple_selector (CRParser *a_this, CRSimpleSel **a_sel)
                 }
                 else if (token 
                          && (token->type == DELIM_TK)
-                         && (token->unichar == ':'))
+                         && (token->u.unichar == ':'))
                 {
                         CRPseudo *pseudo = NULL ;
 
@@ -2585,14 +2585,14 @@ cr_parser_parse_simple_selector (CRParser *a_this, CRSimpleSel **a_sel)
                         if (token->type == IDENT_TK)
                         {
                                 pseudo->type = IDENT_PSEUDO ;
-                                pseudo->name = token->str ;
-                                token->str = NULL ;
+                                pseudo->name = token->u.str ;
+                                token->u.str = NULL ;
                                 found_sel = TRUE ;
                         }
                         else if (token->type == FUNCTION_TK)
                         {
-                                pseudo->name = token->str ;
-                                token->str = NULL ;
+                                pseudo->name = token->u.str ;
+                                token->u.str = NULL ;
                                 cr_parser_try_to_skip_spaces_and_comments 
                                         (a_this) ;
                                 status = cr_parser_parse_ident 
@@ -2816,8 +2816,8 @@ cr_parser_parse_charset (CRParser *a_this, GString **a_value)
                                           &token) ;
         ENSURE_PARSING_COND (status == CR_OK 
                              && token && token->type == STRING_TK) ;
-        charset_str = token->str ;
-        token->str = NULL ;
+        charset_str = token->u.str ;
+        token->u.str = NULL ;
         cr_token_destroy (token) ;
         token = NULL ;
 
@@ -3087,8 +3087,8 @@ cr_parser_parse_media (CRParser *a_this)
         ENSURE_PARSING_COND (status == CR_OK
                              && token && token->type == IDENT_TK) ;
 
-        medium = token->str ;
-        token->str = NULL ;
+        medium = token->u.str ;
+        token->u.str = NULL ;
         cr_token_destroy (token) ;
         token = NULL ;
         
@@ -3273,8 +3273,8 @@ cr_parser_parse_page (CRParser *a_this)
 
         if (token->type == IDENT_TK)
         {
-                page_selector = token->str ;
-                token->str = NULL ;
+                page_selector = token->u.str ;
+                token->u.str = NULL ;
                 cr_token_destroy (token) ;
                 token = NULL ;
         }
@@ -3294,7 +3294,7 @@ cr_parser_parse_page (CRParser *a_this)
         ENSURE_PARSING_COND (status == CR_OK 
                              && token) ;
 
-        if (token->type == DELIM_TK && token->unichar == ':')
+        if (token->type == DELIM_TK && token->u.unichar == ':')
         {
                 cr_token_destroy (token) ;
                 token = NULL ;
@@ -3997,8 +3997,8 @@ cr_parser_parse_function (CRParser *a_this, GString **a_func_name,
 
         if (token && token->type == FUNCTION_TK)
         {
-                *a_func_name = token->str ;
-                token->str = NULL ;
+                *a_func_name = token->u.str ;
+                token->u.str = NULL ;
         }
         else
         {
@@ -4474,11 +4474,11 @@ cr_parser_parse_stylesheet (CRParser *a_this)
                 else if (token 
                          && (token->type == HASH_TK
                              || (token->type == DELIM_TK 
-                                 && token->unichar == '.')
+                                 && token->u.unichar == '.')
                              || (token->type == DELIM_TK
-                                 && token->unichar == ':')
+                                 && token->u.unichar == ':')
                              || (token->type == DELIM_TK
-                                 && token->unichar == '*')
+                                 && token->u.unichar == '*')
                              || (token->type == BO_TK)
                              || token->type == IDENT_TK))
                 {
diff --git a/src/cr-tknzr.c b/src/cr-tknzr.c
index b23d0f1..544e134 100644
--- a/src/cr-tknzr.c
+++ b/src/cr-tknzr.c
@@ -3471,8 +3471,8 @@ cr_tknzr_parse_token (CRTknzr *a_this, enum CRTokenType a_type,
                 case FUNCTION_TK:
                 case COMMENT_TK:
                 case URI_TK:
-                        *((GString**)a_res) = token->str ;
-                        token->str = NULL ;
+                        *((GString**)a_res) = token->u.str ;
+                        token->u.str = NULL ;
                         status = CR_OK ;
                         break ;
 		
@@ -3480,8 +3480,8 @@ cr_tknzr_parse_token (CRTknzr *a_this, enum CRTokenType a_type,
 		case EXS_TK:
                 case PERCENTAGE_TK:
                 case NUMBER_TK:                
-                        *((CRNum**)a_res) = token->num ;
-                        token->num = NULL ;
+                        *((CRNum**)a_res) = token->u.num ;
+                        token->u.num = NULL ;
                         status = CR_OK ;
                         break ;
 
@@ -3491,14 +3491,14 @@ cr_tknzr_parse_token (CRTknzr *a_this, enum CRTokenType a_type,
 		case FREQ_TK:
                         if (token->extra_type == a_et)
                         {
-                                *((CRNum**)a_res) = token->num ;
-                                token->num = NULL ;
+                                *((CRNum**)a_res) = token->u.num ;
+                                token->u.num = NULL ;
                                 status = CR_OK ;
                         }
                         break ;
 
 		case DIMEN_TK:
-                        *((CRNum**)a_res) = token->num ;
+                        *((CRNum**)a_res) = token->u.num ;
                         if (a_extra_res == NULL)
                         {
                                 status = CR_BAD_PARAM_ERROR ;
@@ -3506,13 +3506,13 @@ cr_tknzr_parse_token (CRTknzr *a_this, enum CRTokenType a_type,
                         }
 
                         *((GString**)a_extra_res) = token->dimen ;
-                        token->num = NULL ;
+                        token->u.num = NULL ;
                         token->dimen = NULL ;
                         status = CR_OK ;
                         break ;
 
 		case DELIM_TK:
-                        *((guint32*)a_res) = token->unichar ;
+                        *((guint32*)a_res) = token->u.unichar ;
                         status = CR_OK ;
                         break ;
 
diff --git a/src/cr-token.c b/src/cr-token.c
index 36e9703..2404d8d 100644
--- a/src/cr-token.c
+++ b/src/cr-token.c
@@ -63,10 +63,10 @@ cr_token_clear (CRToken *a_this)
     case URI_TK:
     case FUNCTION_TK:
     case COMMENT_TK:
-        if (a_this->str)
+        if (a_this->u.str)
         {
-            g_string_free (a_this->str, TRUE) ;
-            a_this->str = NULL ;
+            g_string_free (a_this->u.str, TRUE) ;
+            a_this->u.str = NULL ;
         }
 		break ;
         
@@ -78,18 +78,18 @@ cr_token_clear (CRToken *a_this)
     case FREQ_TK:
     case PERCENTAGE_TK:
     case NUMBER_TK:
-        if (a_this->num)
+        if (a_this->u.num)
         {
-            cr_num_destroy (a_this->num) ;
-            a_this->num = NULL ;
+            cr_num_destroy (a_this->u.num) ;
+            a_this->u.num = NULL ;
         }
 		break ;
         
 	case DIMEN_TK:
-        if (a_this->num)
+        if (a_this->u.num)
         {
-            cr_num_destroy (a_this->num) ;
-            a_this->num = NULL ;
+            cr_num_destroy (a_this->u.num) ;
+            a_this->u.num = NULL ;
         }
         
         if (a_this->dimen)
@@ -249,7 +249,7 @@ cr_token_set_comment (CRToken *a_this, GString *a_str)
 
         a_this->type = COMMENT_TK ;
 
-        a_this->str = a_str ;
+        a_this->u.str = a_str ;
 
         return CR_OK ;
 }
@@ -263,7 +263,7 @@ cr_token_set_string (CRToken *a_this, GString *a_str)
 
         a_this->type = STRING_TK ;
 
-        a_this->str = a_str ;
+        a_this->u.str = a_str ;
 
         return CR_OK ;
 }
@@ -278,7 +278,7 @@ cr_token_set_ident (CRToken *a_this, GString * a_ident)
 
         a_this->type = IDENT_TK ;
 
-        a_this->str = a_ident ;
+        a_this->u.str = a_ident ;
 
         return CR_OK ;
 }
@@ -293,7 +293,7 @@ cr_token_set_function (CRToken *a_this, GString *a_fun_name)
 
         a_this->type = FUNCTION_TK ;
 
-        a_this->str = a_fun_name ;
+        a_this->u.str = a_fun_name ;
 
         return CR_OK ;
 }
@@ -307,7 +307,7 @@ cr_token_set_hash (CRToken *a_this, GString *a_hash)
 
         a_this->type = HASH_TK ;
 
-        a_this->str = a_hash ;
+        a_this->u.str = a_hash ;
 
         return CR_OK ;
 }
@@ -321,7 +321,7 @@ cr_token_set_rgb (CRToken *a_this, CRRgb *a_rgb)
 
         a_this->type = RGB_TK ;
 
-        a_this->rgb = a_rgb ;
+        a_this->u.rgb = a_rgb ;
 
         return CR_OK ;
 }
@@ -397,7 +397,7 @@ cr_token_set_atkeyword (CRToken *a_this, GString *a_atname)
 
         a_this->type = ATKEYWORD_TK ;
 
-        a_this->str = a_atname ;
+        a_this->u.str = a_atname ;
 
         return CR_OK ;
 }
@@ -423,7 +423,7 @@ cr_token_set_ems (CRToken *a_this, CRNum *a_num)
 
         a_this->type = EMS_TK ;
 
-        a_this->num = a_num ;
+        a_this->u.num = a_num ;
 
         return CR_OK ;
 }
@@ -438,7 +438,7 @@ cr_token_set_exs (CRToken *a_this, CRNum *a_num)
 
         a_this->type = EXS_TK ;
 
-        a_this->num = a_num ;
+        a_this->u.num = a_num ;
 
         return CR_OK ;
 }
@@ -454,7 +454,7 @@ cr_token_set_length (CRToken *a_this, CRNum *a_num,
         a_this->type = LENGTH_TK ;
         
         a_this->extra_type = a_et ;
-        a_this->num = a_num ;
+        a_this->u.num = a_num ;
 
         return CR_OK ;
 }
@@ -469,7 +469,7 @@ cr_token_set_angle (CRToken *a_this, CRNum *a_num,
 
         a_this->type = ANGLE_TK ;
         a_this->extra_type = a_et ;
-        a_this->num = a_num ;
+        a_this->u.num = a_num ;
 
         return CR_OK ;
 }
@@ -484,7 +484,7 @@ cr_token_set_time (CRToken *a_this, CRNum *a_num,
 
         a_this->type = TIME_TK ;
         a_this->extra_type = a_et;
-        a_this->num = a_num ;
+        a_this->u.num = a_num ;
 
         return CR_OK ;
 }
@@ -499,7 +499,7 @@ cr_token_set_freq (CRToken *a_this, CRNum *a_num,
 
         a_this->type = FREQ_TK ;
         a_this->extra_type = a_et ;
-        a_this->num = a_num ;
+        a_this->u.num = a_num ;
 
         return CR_OK ;
 }
@@ -513,7 +513,7 @@ cr_token_set_dimen (CRToken *a_this, CRNum *a_num,
         cr_token_clear (a_this) ;
 
         a_this->type = DIMEN_TK ;
-        a_this->num = a_num ;
+        a_this->u.num = a_num ;
         a_this->dimen = a_dim ;
 
         return CR_OK ;
@@ -529,7 +529,7 @@ cr_token_set_percentage (CRToken *a_this, CRNum *a_num)
         cr_token_clear (a_this) ;
 
         a_this->type = PERCENTAGE_TK ;
-        a_this->num = a_num ;
+        a_this->u.num = a_num ;
 
         return CR_OK ;
 }
@@ -542,7 +542,7 @@ cr_token_set_number (CRToken *a_this, CRNum *a_num)
         cr_token_clear (a_this) ;
 
         a_this->type = NUMBER_TK ;
-        a_this->num = a_num ;
+        a_this->u.num = a_num ;
 
         return CR_OK ;
 }
@@ -555,7 +555,7 @@ cr_token_set_uri (CRToken *a_this, GString *a_uri)
         cr_token_clear (a_this) ;
 
         a_this->type = URI_TK ;
-        a_this->str = a_uri ;
+        a_this->u.str = a_uri ;
 
         return CR_OK ;
 }
@@ -569,7 +569,7 @@ cr_token_set_delim (CRToken *a_this, guint32 a_char)
         cr_token_clear (a_this) ;
 
         a_this->type = DELIM_TK ;
-        a_this->unichar = a_char ;
+        a_this->u.unichar = a_char ;
 
         return CR_OK ;
 }
diff --git a/src/cr-token.h b/src/cr-token.h
index 9a45b77..23aac22 100644
--- a/src/cr-token.h
+++ b/src/cr-token.h
@@ -32,43 +32,40 @@
 #include "cr-num.h"
 #include "cr-rgb.h"
 
-#ifdef __cplusplus
-extern "C"
+G_BEGIN_DECLS
+
+enum CRTokenType
 {
-#endif
-
-	enum CRTokenType
-	{
-		NO_TK,
-		S_TK,
-		CDO_TK,
-		CDC_TK,
-		INCLUDES_TK,
-		DASHMATCH_TK,
+        NO_TK,
+        S_TK,
+        CDO_TK,
+        CDC_TK,
+        INCLUDES_TK,
+        DASHMATCH_TK,
         COMMENT_TK,
-		STRING_TK,
-		IDENT_TK,
-		HASH_TK,
-		IMPORT_SYM_TK,
-		PAGE_SYM_TK,
-		MEDIA_SYM_TK,
-		FONT_FACE_SYM_TK,
-		CHARSET_SYM_TK,
-		ATKEYWORD_TK,
-		IMPORTANT_SYM_TK,
-		EMS_TK,
-		EXS_TK,
-		LENGTH_TK,
-		ANGLE_TK,
-		TIME_TK,
-		FREQ_TK,
-		DIMEN_TK,
-		PERCENTAGE_TK,
-		NUMBER_TK,
+        STRING_TK,
+        IDENT_TK,
+        HASH_TK,
+        IMPORT_SYM_TK,
+        PAGE_SYM_TK,
+        MEDIA_SYM_TK,
+        FONT_FACE_SYM_TK,
+        CHARSET_SYM_TK,
+        ATKEYWORD_TK,
+        IMPORTANT_SYM_TK,
+        EMS_TK,
+        EXS_TK,
+        LENGTH_TK,
+        ANGLE_TK,
+        TIME_TK,
+        FREQ_TK,
+        DIMEN_TK,
+        PERCENTAGE_TK,
+        NUMBER_TK,
         RGB_TK,
-		URI_TK,
-		FUNCTION_TK,
-		UNICODERANGE_TK,
+        URI_TK,
+        FUNCTION_TK,
+        UNICODERANGE_TK,
         SEMICOLON_TK,
         CBO_TK, /*opening curly bracket*/
         CBC_TK, /*closing curly bracket*/
@@ -76,178 +73,175 @@ extern "C"
         PC_TK, /*closing parenthesis*/
         BO_TK, /*opening bracket*/
         BC_TK, /*closing bracket*/
-		DELIM_TK,
-	} ;
-
-	enum CRTokenExtraType
-	{
-		NO_ET = 0,
-		LENGTH_PX_ET,
-		LENGTH_CM_ET,
-		LENGTH_MM_ET,
-		LENGTH_IN_ET,
-		LENGTH_PT_ET,
-		LENGTH_PC_ET,
-		ANGLE_DEG_ET,
-		ANGLE_RAD_ET,
-		ANGLE_GRAD_ET,
-		TIME_MS_ET,
-		TIME_S_ET,
-		FREQ_HZ_ET,
-		FREQ_KHZ_ET,
-	} ;
+        DELIM_TK,
+} ;
+
+enum CRTokenExtraType
+{
+        NO_ET = 0,
+        LENGTH_PX_ET,
+        LENGTH_CM_ET,
+        LENGTH_MM_ET,
+        LENGTH_IN_ET,
+        LENGTH_PT_ET,
+        LENGTH_PC_ET,
+        ANGLE_DEG_ET,
+        ANGLE_RAD_ET,
+        ANGLE_GRAD_ET,
+        TIME_MS_ET,
+        TIME_S_ET,
+        FREQ_HZ_ET,
+        FREQ_KHZ_ET,
+} ;
  
-	typedef struct _CRToken CRToken ;
-
-	/**
-	 *This class abstracts a css2 token.
-	 */
-	struct _CRToken
-	{
-		enum CRTokenType type ;
-                enum CRTokenExtraType extra_type ;
-		CRInputPos pos ;
-
-		union
-		{
-			GString *str ;
-            CRRgb *rgb ;
-			CRNum *num ;
-			guint32 unichar ;
-		} ;
+typedef struct _CRToken CRToken ;
+
+/**
+ *This class abstracts a css2 token.
+ */
+struct _CRToken
+{
+        enum CRTokenType type ;
+        enum CRTokenExtraType extra_type ;
+        CRInputPos pos ;
+
+        union
+        {
+                GString *str ;
+                CRRgb *rgb ;
+                CRNum *num ;
+                guint32 unichar ;
+        } u ;
 
         GString * dimen ;
-	} ;
+} ;
 
-        CRToken*
-        cr_token_new (void) ;
+CRToken*
+cr_token_new (void) ;
         
-        enum CRStatus
-        cr_token_set_s (CRToken *a_this) ;
+enum CRStatus
+cr_token_set_s (CRToken *a_this) ;
         
-        enum CRStatus
-        cr_token_set_cdo (CRToken *a_this) ;
+enum CRStatus
+cr_token_set_cdo (CRToken *a_this) ;
         
-        enum CRStatus
-        cr_token_set_cdc (CRToken *a_this) ;
+enum CRStatus
+cr_token_set_cdc (CRToken *a_this) ;
         
-        enum CRStatus
-        cr_token_set_includes (CRToken *a_this) ;
+enum CRStatus
+cr_token_set_includes (CRToken *a_this) ;
         
-        enum CRStatus
-        cr_token_set_dashmatch (CRToken *a_this) ;
+enum CRStatus
+cr_token_set_dashmatch (CRToken *a_this) ;
         
-        enum CRStatus
-        cr_token_set_comment (CRToken *a_this, GString *a_str) ;
+enum CRStatus
+cr_token_set_comment (CRToken *a_this, GString *a_str) ;
         
-        enum CRStatus
-        cr_token_set_string (CRToken *a_this, GString *a_str) ;
+enum CRStatus
+cr_token_set_string (CRToken *a_this, GString *a_str) ;
         
-        enum CRStatus
-        cr_token_set_ident (CRToken *a_this, GString * a_ident) ;
+enum CRStatus
+cr_token_set_ident (CRToken *a_this, GString * a_ident) ;
         
-        enum CRStatus
-        cr_token_set_hash (CRToken *a_this, GString *a_hash) ;
+enum CRStatus
+cr_token_set_hash (CRToken *a_this, GString *a_hash) ;
         
-        enum CRStatus
-        cr_token_set_rgb (CRToken *a_this, CRRgb *a_rgb) ;
+enum CRStatus
+cr_token_set_rgb (CRToken *a_this, CRRgb *a_rgb) ;
         
-        enum CRStatus
-        cr_token_set_import_sym (CRToken *a_this) ;
+enum CRStatus
+cr_token_set_import_sym (CRToken *a_this) ;
         
-        enum CRStatus
-        cr_token_set_page_sym (CRToken *a_this) ;
+enum CRStatus
+cr_token_set_page_sym (CRToken *a_this) ;
         
-        enum CRStatus
-        cr_token_set_media_sym (CRToken *a_this) ;
+enum CRStatus
+cr_token_set_media_sym (CRToken *a_this) ;
         
-        enum CRStatus
-        cr_token_set_font_face_sym (CRToken *a_this) ;
+enum CRStatus
+cr_token_set_font_face_sym (CRToken *a_this) ;
         
-        enum CRStatus
-        cr_token_set_charset_sym (CRToken *a_this) ;
+enum CRStatus
+cr_token_set_charset_sym (CRToken *a_this) ;
         
-        enum CRStatus
-        cr_token_set_atkeyword (CRToken *a_this, GString *a_atname) ;
+enum CRStatus
+cr_token_set_atkeyword (CRToken *a_this, GString *a_atname) ;
         
-        enum CRStatus
-        cr_token_set_important_sym (CRToken *a_this) ;
+enum CRStatus
+cr_token_set_important_sym (CRToken *a_this) ;
         
-        enum CRStatus
-        cr_token_set_ems (CRToken *a_this, CRNum *a_num) ;
+enum CRStatus
+cr_token_set_ems (CRToken *a_this, CRNum *a_num) ;
         
-        enum CRStatus
-        cr_token_set_exs (CRToken *a_this, CRNum *a_num) ;
+enum CRStatus
+cr_token_set_exs (CRToken *a_this, CRNum *a_num) ;
         
-        enum CRStatus
-        cr_token_set_length (CRToken *a_this, CRNum *a_num,
-                             enum CRTokenExtraType a_et) ;
+enum CRStatus
+cr_token_set_length (CRToken *a_this, CRNum *a_num,
+                     enum CRTokenExtraType a_et) ;
         
-        enum CRStatus
-        cr_token_set_angle (CRToken *a_this, CRNum *a_num,
-                            enum CRTokenExtraType a_et) ;
+enum CRStatus
+cr_token_set_angle (CRToken *a_this, CRNum *a_num,
+                    enum CRTokenExtraType a_et) ;
         
-        enum CRStatus
-        cr_token_set_time (CRToken *a_this, CRNum *a_num,
-                           enum CRTokenExtraType a_et) ;
+enum CRStatus
+cr_token_set_time (CRToken *a_this, CRNum *a_num,
+                   enum CRTokenExtraType a_et) ;
         
-        enum CRStatus
-        cr_token_set_freq (CRToken *a_this, CRNum *a_num,
-                           enum CRTokenExtraType a_et) ;
-        enum CRStatus
-        cr_token_set_dimen (CRToken *a_this, CRNum *a_num,
-                            GString *a_dim) ;
+enum CRStatus
+cr_token_set_freq (CRToken *a_this, CRNum *a_num,
+                   enum CRTokenExtraType a_et) ;
+enum CRStatus
+cr_token_set_dimen (CRToken *a_this, CRNum *a_num,
+                    GString *a_dim) ;
         
-        enum CRStatus
-        cr_token_set_percentage (CRToken *a_this, CRNum *a_num) ;
+enum CRStatus
+cr_token_set_percentage (CRToken *a_this, CRNum *a_num) ;
         
-        enum CRStatus
-        cr_token_set_number (CRToken *a_this, CRNum *a_num) ;
+enum CRStatus
+cr_token_set_number (CRToken *a_this, CRNum *a_num) ;
         
-        enum CRStatus
-        cr_token_set_uri (CRToken *a_this, GString *a_uri) ;
+enum CRStatus
+cr_token_set_uri (CRToken *a_this, GString *a_uri) ;
         
-        enum CRStatus
-        cr_token_set_function (CRToken *a_this, GString *a_fun_name) ;
+enum CRStatus
+cr_token_set_function (CRToken *a_this, GString *a_fun_name) ;
         
-        enum CRStatus
-        cr_token_set_bc (CRToken *a_this) ;
+enum CRStatus
+cr_token_set_bc (CRToken *a_this) ;
         
-        enum CRStatus
-        cr_token_set_bo (CRToken *a_this) ;
+enum CRStatus
+cr_token_set_bo (CRToken *a_this) ;
         
-        enum CRStatus
-        cr_token_set_po (CRToken *a_this) ;
+enum CRStatus
+cr_token_set_po (CRToken *a_this) ;
 
-        enum CRStatus
-        cr_token_set_pc (CRToken *a_this) ;
+enum CRStatus
+cr_token_set_pc (CRToken *a_this) ;
 
-        enum CRStatus
-        cr_token_set_cbc (CRToken *a_this) ;
+enum CRStatus
+cr_token_set_cbc (CRToken *a_this) ;
 
-        enum CRStatus
-        cr_token_set_cbo (CRToken *a_this) ;
+enum CRStatus
+cr_token_set_cbo (CRToken *a_this) ;
 
-        enum CRStatus
-        cr_token_set_semicolon (CRToken *a_this) ;
+enum CRStatus
+cr_token_set_semicolon (CRToken *a_this) ;
 
-        enum CRStatus
-        cr_token_set_delim (CRToken *a_this, guint32 a_char) ;
+enum CRStatus
+cr_token_set_delim (CRToken *a_this, guint32 a_char) ;
 
         
-	/*
-	enum CRStatus
-	cr_token_set_unicoderange (CRToken *a_this, 
-				   CRUnicodeRange *a_range) ;
-	*/
+/*
+  enum CRStatus
+  cr_token_set_unicoderange (CRToken *a_this, 
+  CRUnicodeRange *a_range) ;
+*/
 
-        void
-        cr_token_destroy (CRToken *a_this) ;
+void
+cr_token_destroy (CRToken *a_this) ;
         
 	
-        
-#ifdef __cplusplus
-} /*extern "C"*/
-#endif
+G_END_DECLS
 
 #endif /*__CR_TOKEN_H__*/