Revert "Sending recent tested changes from inkscape developers to libcroco upstream"

This reverts commit ac3e66fa2bb416507b5b5cf114c1edaa3455f105.

1 files changed, 267 insertions, 206 deletions

diff --git a/src/cr-rgb.c b/src/cr-rgb.c
index 893c208..6313a58 100644
--- a/src/cr-rgb.c
+++ b/src/cr-rgb.c
@@ -29,164 +29,169 @@
 #include "cr-parser.h"
 
 static CRRgb gv_standard_colors[] = {
-        {"aliceblue",	240, 248, 255, FALSE, FALSE, FALSE, {0,0,0}},
-        {"antiquewhite",	250, 235, 215, FALSE, FALSE, FALSE, {0,0,0}},
-        {"aqua",	  0, 255, 255, FALSE, FALSE, FALSE, {0,0,0}},
-        {"aquamarine",	127, 255, 212, FALSE, FALSE, FALSE, {0,0,0}},
-        {"azure",	240, 255, 255, FALSE, FALSE, FALSE, {0,0,0}},
-        {"beige",	245, 245, 220, FALSE, FALSE, FALSE, {0,0,0}},
-        {"bisque",	255, 228, 196, FALSE, FALSE, FALSE, {0,0,0}},
-        {"black",	  0,   0,   0, FALSE, FALSE, FALSE, {0,0,0}},
-        {"blanchedalmond",	255, 235, 205, FALSE, FALSE, FALSE, {0,0,0}},
-        {"blue",	  0,   0, 255, FALSE, FALSE, FALSE, {0,0,0}},
-        {"blueviolet",	138,  43, 226, FALSE, FALSE, FALSE, {0,0,0}},
-        {"brown",	165,  42,  42, FALSE, FALSE, FALSE, {0,0,0}},
-        {"burlywood",	222, 184, 135, FALSE, FALSE, FALSE, {0,0,0}},
-        {"cadetblue",	 95, 158, 160, FALSE, FALSE, FALSE, {0,0,0}},
-        {"chartreuse",	127, 255,   0, FALSE, FALSE, FALSE, {0,0,0}},
-        {"chocolate",	210, 105,  30, FALSE, FALSE, FALSE, {0,0,0}},
-        {"coral",	255, 127,  80, FALSE, FALSE, FALSE, {0,0,0}},
-        {"cornflowerblue",	100, 149, 237, FALSE, FALSE, FALSE, {0,0,0}},
-        {"cornsilk",	255, 248, 220, FALSE, FALSE, FALSE, {0,0,0}},
-        {"crimson",	220,  20,  60, FALSE, FALSE, FALSE, {0,0,0}},
-        {"cyan",	  0, 255, 255, FALSE, FALSE, FALSE, {0,0,0}},
-        {"darkblue",	  0,   0, 139, FALSE, FALSE, FALSE, {0,0,0}},
-        {"darkcyan",	  0, 139, 139, FALSE, FALSE, FALSE, {0,0,0}},
-        {"darkgoldenrod",	184, 134,  11, FALSE, FALSE, FALSE, {0,0,0}},
-        {"darkgray",	169, 169, 169, FALSE, FALSE, FALSE, {0,0,0}},
-        {"darkgreen",	  0, 100,   0, FALSE, FALSE, FALSE, {0,0,0}},
-        {"darkgrey",	169, 169, 169, FALSE, FALSE, FALSE, {0,0,0}},
-        {"darkkhaki",	189, 183, 107, FALSE, FALSE, FALSE, {0,0,0}},
-        {"darkmagenta",	139,   0, 139, FALSE, FALSE, FALSE, {0,0,0}},
-        {"darkolivegreen",	 85, 107,  47, FALSE, FALSE, FALSE, {0,0,0}},
-        {"darkorange",	255, 140,   0, FALSE, FALSE, FALSE, {0,0,0}},
-        {"darkorchid",	153,  50, 204, FALSE, FALSE, FALSE, {0,0,0}},
-        {"darkred",	139,   0,   0, FALSE, FALSE, FALSE, {0,0,0}},
-        {"darksalmon",	233, 150, 122, FALSE, FALSE, FALSE, {0,0,0}},
-        {"darkseagreen",	143, 188, 143, FALSE, FALSE, FALSE, {0,0,0}},
-        {"darkslateblue",	 72,  61, 139, FALSE, FALSE, FALSE, {0,0,0}},
-        {"darkslategray",	 47,  79,  79, FALSE, FALSE, FALSE, {0,0,0}},
-        {"darkslategrey",	 47,  79,  79, FALSE, FALSE, FALSE, {0,0,0}},
-        {"darkturquoise",	  0, 206, 209, FALSE, FALSE, FALSE, {0,0,0}},
-        {"darkviolet",	148,   0, 211, FALSE, FALSE, FALSE, {0,0,0}},
-        {"deeppink",	255,  20, 147, FALSE, FALSE, FALSE, {0,0,0}},
-        {"deepskyblue",	  0, 191, 255, FALSE, FALSE, FALSE, {0,0,0}},
-        {"dimgray",	105, 105, 105, FALSE, FALSE, FALSE, {0,0,0}},
-        {"dimgrey",	105, 105, 105, FALSE, FALSE, FALSE, {0,0,0}},
-        {"dodgerblue",	 30, 144, 255, FALSE, FALSE, FALSE, {0,0,0}},
-        {"firebrick",	178,  34,  34, FALSE, FALSE, FALSE, {0,0,0}},
-        {"floralwhite",	255, 250, 240, FALSE, FALSE, FALSE, {0,0,0}},
-        {"forestgreen",	 34, 139,  34, FALSE, FALSE, FALSE, {0,0,0}},
-        {"fuchsia",	255,   0, 255, FALSE, FALSE, FALSE, {0,0,0}},
-        {"gainsboro",	220, 220, 220, FALSE, FALSE, FALSE, {0,0,0}},
-        {"ghostwhite",	248, 248, 255, FALSE, FALSE, FALSE, {0,0,0}},
-        {"gold",	255, 215,   0, FALSE, FALSE, FALSE, {0,0,0}},
-        {"goldenrod",	218, 165,  32, FALSE, FALSE, FALSE, {0,0,0}},
-        {"gray",	128, 128, 128, FALSE, FALSE, FALSE, {0,0,0}},
-        {"grey",	128, 128, 128, FALSE, FALSE, FALSE, {0,0,0}},
-        {"green",	  0, 128,   0, FALSE, FALSE, FALSE, {0,0,0}},
-        {"greenyellow",	173, 255,  47, FALSE, FALSE, FALSE, {0,0,0}},
-        {"honeydew",	240, 255, 240, FALSE, FALSE, FALSE, {0,0,0}},
-        {"hotpink",	255, 105, 180, FALSE, FALSE, FALSE, {0,0,0}},
-        {"indianred",	205,  92,  92, FALSE, FALSE, FALSE, {0,0,0}},
-        {"indigo",	 75,   0, 130, FALSE, FALSE, FALSE, {0,0,0}},
-        {"ivory",	255, 255, 240, FALSE, FALSE, FALSE, {0,0,0}},
-        {"khaki",	240, 230, 140, FALSE, FALSE, FALSE, {0,0,0}},
-        {"lavender",	230, 230, 250, FALSE, FALSE, FALSE, {0,0,0}},
-        {"lavenderblush",	255, 240, 245, FALSE, FALSE, FALSE, {0,0,0}},
-        {"lawngreen",	124, 252,   0, FALSE, FALSE, FALSE, {0,0,0}},
-        {"lemonchiffon",	255, 250, 205, FALSE, FALSE, FALSE, {0,0,0}},
-        {"lightblue",	173, 216, 230, FALSE, FALSE, FALSE, {0,0,0}},
-        {"lightcoral",	240, 128, 128, FALSE, FALSE, FALSE, {0,0,0}},
-        {"lightcyan",	224, 255, 255, FALSE, FALSE, FALSE, {0,0,0}},
-        {"lightgoldenrodyellow",	250, 250, 210, FALSE, FALSE, FALSE, {0,0,0}},
-        {"lightgray",	211, 211, 211, FALSE, FALSE, FALSE, {0,0,0}},
-        {"lightgreen",	144, 238, 144, FALSE, FALSE, FALSE, {0,0,0}},
-        {"lightgrey",	211, 211, 211, FALSE, FALSE, FALSE, {0,0,0}},
-        {"lightpink",	255, 182, 193, FALSE, FALSE, FALSE, {0,0,0}},
-        {"lightsalmon",	255, 160, 122, FALSE, FALSE, FALSE, {0,0,0}},
-        {"lightseagreen",	 32, 178, 170, FALSE, FALSE, FALSE, {0,0,0}},
-        {"lightskyblue",	135, 206, 250, FALSE, FALSE, FALSE, {0,0,0}},
-        {"lightslategray",	119, 136, 153, FALSE, FALSE, FALSE, {0,0,0}},
-        {"lightslategrey",	119, 136, 153, FALSE, FALSE, FALSE, {0,0,0}},
-        {"lightsteelblue",	176, 196, 222, FALSE, FALSE, FALSE, {0,0,0}},
-        {"lightyellow",	255, 255, 224, FALSE, FALSE, FALSE, {0,0,0}},
-        {"lime",	  0, 255,   0, FALSE, FALSE, FALSE, {0,0,0}},
-        {"limegreen",	 50, 205,  50, FALSE, FALSE, FALSE, {0,0,0}},
-        {"linen",	250, 240, 230, FALSE, FALSE, FALSE, {0,0,0}},
-        {"magenta",	255,   0, 255, FALSE, FALSE, FALSE, {0,0,0}},
-        {"maroon",	128,   0,   0, FALSE, FALSE, FALSE, {0,0,0}},
-        {"mediumaquamarine",	102, 205, 170, FALSE, FALSE, FALSE, {0,0,0}},
-        {"mediumblue",	  0,   0, 205, FALSE, FALSE, FALSE, {0,0,0}},
-        {"mediumorchid",	186,  85, 211, FALSE, FALSE, FALSE, {0,0,0}},
-        {"mediumpurple",	147, 112, 219, FALSE, FALSE, FALSE, {0,0,0}},
-        {"mediumseagreen",	 60, 179, 113, FALSE, FALSE, FALSE, {0,0,0}},
-        {"mediumslateblue",	123, 104, 238, FALSE, FALSE, FALSE, {0,0,0}},
-        {"mediumspringgreen",	  0, 250, 154, FALSE, FALSE, FALSE, {0,0,0}},
-        {"mediumturquoise",	 72, 209, 204, FALSE, FALSE, FALSE, {0,0,0}},
-        {"mediumvioletred",	199,  21, 133, FALSE, FALSE, FALSE, {0,0,0}},
-        {"midnightblue",	 25,  25, 112, FALSE, FALSE, FALSE, {0,0,0}},
-        {"mintcream",	245, 255, 250, FALSE, FALSE, FALSE, {0,0,0}},
-        {"mistyrose",	255, 228, 225, FALSE, FALSE, FALSE, {0,0,0}},
-        {"moccasin",	255, 228, 181, FALSE, FALSE, FALSE, {0,0,0}},
-        {"navajowhite",	255, 222, 173, FALSE, FALSE, FALSE, {0,0,0}},
-        {"navy",	  0,   0, 128, FALSE, FALSE, FALSE, {0,0,0}},
-        {"oldlace",	253, 245, 230, FALSE, FALSE, FALSE, {0,0,0}},
-        {"olive",	128, 128,   0, FALSE, FALSE, FALSE, {0,0,0}},
-        {"olivedrab",	107, 142,  35, FALSE, FALSE, FALSE, {0,0,0}},
-        {"orange",	255, 165,   0, FALSE, FALSE, FALSE, {0,0,0}},
-        {"orangered",	255,  69,   0, FALSE, FALSE, FALSE, {0,0,0}},
-        {"orchid",	218, 112, 214, FALSE, FALSE, FALSE, {0,0,0}},
-        {"palegoldenrod",	238, 232, 170, FALSE, FALSE, FALSE, {0,0,0}},
-        {"palegreen",	152, 251, 152, FALSE, FALSE, FALSE, {0,0,0}},
-        {"paleturquoise",	175, 238, 238, FALSE, FALSE, FALSE, {0,0,0}},
-        {"palevioletred",	219, 112, 147, FALSE, FALSE, FALSE, {0,0,0}},
-        {"papayawhip",	255, 239, 213, FALSE, FALSE, FALSE, {0,0,0}},
-        {"peachpuff",	255, 218, 185, FALSE, FALSE, FALSE, {0,0,0}},
-        {"peru",	205, 133,  63, FALSE, FALSE, FALSE, {0,0,0}},
-        {"pink",	255, 192, 203, FALSE, FALSE, FALSE, {0,0,0}},
-        {"plum",	221, 160, 221, FALSE, FALSE, FALSE, {0,0,0}},
-        {"powderblue",	176, 224, 230, FALSE, FALSE, FALSE, {0,0,0}},
-        {"purple",	128,   0, 128, FALSE, FALSE, FALSE, {0,0,0}},
-        {"red", 	255,   0,   0, FALSE, FALSE, FALSE, {0,0,0}},
-        {"rosybrown",	188, 143, 143, FALSE, FALSE, FALSE, {0,0,0}},
-        {"royalblue",	 65, 105, 225, FALSE, FALSE, FALSE, {0,0,0}},
-        {"saddlebrown",	139,  69,  19, FALSE, FALSE, FALSE, {0,0,0}},
-        {"salmon",	250, 128, 114, FALSE, FALSE, FALSE, {0,0,0}},
-        {"sandybrown",	244, 164,  96, FALSE, FALSE, FALSE, {0,0,0}},
-        {"seagreen",	 46, 139,  87, FALSE, FALSE, FALSE, {0,0,0}},
-        {"seashell",	255, 245, 238, FALSE, FALSE, FALSE, {0,0,0}},
-        {"sienna",	160,  82,  45, FALSE, FALSE, FALSE, {0,0,0}},
-        {"silver",	192, 192, 192, FALSE, FALSE, FALSE, {0,0,0}},
-        {"skyblue",	135, 206, 235, FALSE, FALSE, FALSE, {0,0,0}},
-        {"slateblue",	106,  90, 205, FALSE, FALSE, FALSE, {0,0,0}},
-        {"slategray",	112, 128, 144, FALSE, FALSE, FALSE, {0,0,0}},
-        {"slategrey",	112, 128, 144, FALSE, FALSE, FALSE, {0,0,0}},
-        {"snow",	255, 250, 250, FALSE, FALSE, FALSE, {0,0,0}},
-        {"springgreen",	  0, 255, 127, FALSE, FALSE, FALSE, {0,0,0}},
-        {"steelblue",	 70, 130, 180, FALSE, FALSE, FALSE, {0,0,0}},
-        {"tan", 	210, 180, 140, FALSE, FALSE, FALSE, {0,0,0}},
-        {"teal",	  0, 128, 128, FALSE, FALSE, FALSE, {0,0,0}},
-        {"thistle",	216, 191, 216, FALSE, FALSE, FALSE, {0,0,0}},
-        {"tomato",	255,  99,  71, FALSE, FALSE, FALSE, {0,0,0}},
-        {"turquoise",	 64, 224, 208, FALSE, FALSE, FALSE, {0,0,0}},
-        {"violet",	238, 130, 238, FALSE, FALSE, FALSE, {0,0,0}},
-        {"wheat",	245, 222, 179, FALSE, FALSE, FALSE, {0,0,0}},
-        {"white",	255, 255, 255, FALSE, FALSE, FALSE, {0,0,0}},
-        {"whitesmoke",	245, 245, 245, FALSE, FALSE, FALSE, {0,0,0}},
-        {"yellow",	255, 255,   0, FALSE, FALSE, FALSE, {0,0,0}},
-        {"yellowgreen",	154, 205,  50, FALSE, FALSE, FALSE, {0,0,0}},
-        {"transparent",	255, 255, 255, FALSE, FALSE, TRUE, {0,0,0}}
+        {"aliceblue", 240, 248, 255, 0,},
+        {"antiquewhite", 250, 235, 215, 0},
+        {"aqua", 0, 255, 255, 0},
+        {"aquamarine", 127, 255, 212, 0},
+        {"azure", 240, 255, 255, 0},
+        {"beige", 245, 245, 220, 0},
+        {"bisque", 255, 228, 196, 0},
+        {"black", 0, 0, 0, 0},
+        {"blanchedalmond", 255, 235, 205, 0},
+        {"blue", 0, 0, 255, 0},
+        {"blueviolet", 138, 43, 226, 0},
+        {"brown", 165, 42, 42, 0},
+        {"burlywood", 222, 184, 135, 0},
+        {"cadetblue", 95, 158, 160, 0},
+        {"chartreuse", 127, 255, 0, 0},
+        {"chocolate", 210, 105, 30, 0},
+        {"coral", 255, 127, 80, 0},
+        {"cornflowerblue", 100, 149, 237, 0},
+        {"cornsilk", 255, 248, 220, 0},
+        {"crimson", 220, 20, 60, 0},
+        {"cyan", 0, 255, 255, 0},
+        {"darkblue", 0, 0, 139, 0},
+        {"darkcyan", 0, 139, 139, 0},
+        {"darkgoldenrod", 184, 134, 11, 0},
+        {"darkgray", 169, 169, 169, 0},
+        {"darkgreen", 0, 100, 0, 0},
+        {"darkgrey", 169, 169, 169, 0},
+        {"darkkhaki", 189, 183, 107, 0},
+        {"darkmagenta", 139, 0, 139, 0},
+        {"darkolivegreen", 85, 107, 47, 0},
+        {"darkorange", 255, 140, 0, 0},
+        {"darkorchid", 153, 50, 204, 0},
+        {"darkred", 139, 0, 0, 0},
+        {"darksalmon", 233, 150, 122, 0},
+        {"darkseagreen", 143, 188, 143, 0},
+        {"darkslateblue", 72, 61, 139, 0},
+        {"darkslategray", 47, 79, 79, 0},
+        {"darkslategrey", 47, 79, 79, 0},
+        {"darkturquoise", 0, 206, 209, 0},
+        {"darkviolet", 148, 0, 211, 0},
+        {"deeppink", 255, 20, 147, 0},
+        {"deepskyblue", 0, 191, 255, 0},
+        {"dimgray", 105, 105, 105, 0},
+        {"dimgrey", 105, 105, 105, 0},
+        {"dodgerblue", 30, 144, 255, 0},
+        {"firebrick", 178, 34, 34, 0},
+        {"floralwhite", 255, 250, 240, 0},
+        {"forestgreen", 34, 139, 34, 0},
+        {"fuchsia", 255, 0, 255, 0},
+        {"gainsboro", 220, 220, 220, 0},
+        {"ghostwhite", 248, 248, 255, 0},
+        {"gold", 255, 215, 0, 0},
+        {"goldenrod", 218, 165, 32, 0},
+        {"gray", 128, 128, 128, 0},
+        {"grey", 128, 128, 128, 0},
+        {"green", 0, 128, 0, 0},
+        {"greenyellow", 173, 255, 47, 0},
+        {"honeydew", 240, 255, 240, 0},
+        {"hotpink", 255, 105, 180, 0},
+        {"indianred", 205, 92, 92, 0},
+        {"indigo", 75, 0, 130, 0},
+        {"ivory", 255, 255, 240, 0},
+        {"khaki", 240, 230, 140, 0},
+        {"lavender", 230, 230, 250, 0},
+        {"lavenderblush", 255, 240, 245, 0},
+        {"lawngreen", 124, 252, 0, 0},
+        {"lemonchiffon", 255, 250, 205, 0},
+        {"lightblue", 173, 216, 230, 0},
+        {"lightcoral", 240, 128, 128, 0},
+        {"lightcyan", 224, 255, 255, 0},
+        {"lightgoldenrodyellow", 250, 250, 210, 0},
+        {"lightgray", 211, 211, 211, 0},
+        {"lightgreen", 144, 238, 144, 0},
+        {"lightgrey", 211, 211, 211, 0},
+        {"lightpink", 255, 182, 193, 0},
+        {"lightsalmon", 255, 160, 122, 0},
+        {"lightseagreen", 32, 178, 170, 0},
+        {"lightskyblue", 135, 206, 250, 0},
+        {"lightslategray", 119, 136, 153, 0},
+        {"lightslategrey", 119, 136, 153, 0},
+        {"lightsteelblue", 176, 196, 222, 0},
+        {"lightyellow", 255, 255, 224, 0},
+        {"lime", 0, 255, 0, 0},
+        {"limegreen", 50, 205, 50, 0},
+        {"linen", 250, 240, 230, 0},
+        {"magenta", 255, 0, 255, 0},
+        {"maroon", 128, 0, 0, 0},
+        {"mediumaquamarine", 102, 205, 170, 0},
+        {"mediumblue", 0, 0, 205, 0},
+        {"mediumorchid", 186, 85, 211, 0},
+        {"mediumpurple", 147, 112, 219, 0},
+        {"mediumseagreen", 60, 179, 113, 0},
+        {"mediumslateblue", 123, 104, 238, 0},
+        {"mediumspringgreen", 0, 250, 154, 0},
+        {"mediumturquoise", 72, 209, 204, 0},
+        {"mediumvioletred", 199, 21, 133, 0},
+        {"midnightblue", 25, 25, 112, 0},
+        {"mintcream", 245, 255, 250, 0},
+        {"mistyrose", 255, 228, 225, 0},
+        {"moccasin", 255, 228, 181, 0},
+        {"navajowhite", 255, 222, 173, 0},
+        {"navy", 0, 0, 128, 0},
+        {"oldlace", 253, 245, 230, 0},
+        {"olive", 128, 128, 0, 0},
+        {"olivedrab", 107, 142, 35, 0},
+        {"orange", 255, 165, 0, 0},
+        {"orangered", 255, 69, 0, 0},
+        {"orchid", 218, 112, 214, 0},
+        {"palegoldenrod", 238, 232, 170, 0},
+        {"palegreen", 152, 251, 152, 0},
+        {"paleturquoise", 175, 238, 238, 0},
+        {"palevioletred", 219, 112, 147, 0},
+        {"papayawhip", 255, 239, 213, 0},
+        {"peachpuff", 255, 218, 185, 0},
+        {"peru", 205, 133, 63, 0},
+        {"pink", 255, 192, 203, 0},
+        {"plum", 221, 160, 221, 0},
+        {"powderblue", 176, 224, 230, 0},
+        {"purple", 128, 0, 128, 0},
+        {"red", 255, 0, 0, 0},
+        {"rosybrown", 188, 143, 143, 0},
+        {"royalblue", 65, 105, 225, 0},
+        {"saddlebrown", 139, 69, 19, 0},
+        {"salmon", 250, 128, 114, 0},
+        {"sandybrown", 244, 164, 96, 0},
+        {"seagreen", 46, 139, 87, 0},
+        {"seashell", 255, 245, 238, 0},
+        {"sienna", 160, 82, 45, 0},
+        {"silver", 192, 192, 192, 0},
+        {"skyblue", 135, 206, 235, 0},
+        {"slateblue", 106, 90, 205, 0},
+        {"slategray", 112, 128, 144, 0},
+        {"slategrey", 112, 128, 144, 0},
+        {"snow", 255, 250, 250, 0},
+        {"springgreen", 0, 255, 127, 0},
+        {"steelblue", 70, 130, 180, 0},
+        {"tan", 210, 180, 140, 0},
+        {"teal", 0, 128, 128, 0},
+        {"thistle", 216, 191, 216, 0},
+        {"tomato", 255, 99, 71, 0},
+        {"turquoise", 64, 224, 208, 0},
+        {"violet", 238, 130, 238, 0},
+        {"wheat", 245, 222, 179, 0},
+        {"white", 255, 255, 255, 0},
+        {"whitesmoke", 245, 245, 245, 0,},
+        {"yellow", 255, 255, 0, 0,},
+        {"yellowgreen", 154, 205, 50, 0,},
+        {"transparent", 255, 255, 255, 0, 0, 1}
 };
 
 /**
+ * cr_rgb_new:
+ *
  *The default constructor of #CRRgb.
- *@return the newly built instance of #CRRgb
+ *
+ *Returns the newly built instance of #CRRgb
  */
 CRRgb *
 cr_rgb_new (void)
 {
-        CRRgb *result = (CRRgb *)g_try_malloc (sizeof (CRRgb));
+        CRRgb *result = NULL;
+
+        result = g_try_malloc (sizeof (CRRgb));
 
         if (result == NULL) {
                 cr_utils_trace_info ("No more memory");
@@ -199,13 +204,16 @@ cr_rgb_new (void)
 }
 
 /**
- *A constructor of #CRRgb.
- *@param a_red the red component of the color.
- *@param a_green the green component of the color.
- *@param a_blue the blue component of the color.
- *@param a_unit the unit of the rgb values.
+ * cr_rgb_new_with_vals:
+ *@a_red: the red component of the color.
+ *@a_green: the green component of the color.
+ *@a_blue: the blue component of the color.
+ *@a_unit: the unit of the rgb values.
  *(either percentage or integer values)
- *@return the newly built instance of #CRRgb.
+ *
+ *A constructor of #CRRgb.
+ *
+ *Returns the newly built instance of #CRRgb.
  */
 CRRgb *
 cr_rgb_new_with_vals (gulong a_red, gulong a_green,
@@ -226,16 +234,21 @@ cr_rgb_new_with_vals (gulong a_red, gulong a_green,
 }
 
 /**
+ * cr_rgb_to_string:
+ *@a_this: the instance of #CRRgb to serialize.
+ *
  *Serializes the rgb into a zero terminated string.
- *@param a_this the instance of #CRRgb to serialize.
- *@return the zero terminated string containing the serialized
+ *
+ *Returns the zero terminated string containing the serialized
  *rgb. MUST BE FREED by the caller using g_free().
  */
 guchar *
-cr_rgb_to_string (CRRgb * a_this)
+cr_rgb_to_string (CRRgb const * a_this)
 {
-        gchar *result = NULL;
-        GString *str_buf = (GString *)g_string_new (NULL);
+        guchar *result = NULL;
+        GString *str_buf = NULL;
+
+        str_buf = g_string_new (NULL);
         g_return_val_if_fail (str_buf, NULL);
 
         if (a_this->is_percentage == 1) {
@@ -263,18 +276,20 @@ cr_rgb_to_string (CRRgb * a_this)
                 g_string_free (str_buf, FALSE);
         }
 
-        return (guchar *)result;
+        return result;
 }
 
 /**
+ * cr_rgb_dump:
+ *@a_this: the "this pointer" of
+ *the current instance of #CRRgb.
+ *@a_fp: the destination file pointer.
+ *
  *Dumps the current instance of #CRRgb
  *to a file.
- *@param a_this the "this pointer" of
- *the current instance of #CRRgb.
- *@param a_fp the destination file pointer.
  */
 void
-cr_rgb_dump (CRRgb * a_this, FILE * a_fp)
+cr_rgb_dump (CRRgb const * a_this, FILE * a_fp)
 {
         guchar *str = NULL;
 
@@ -290,10 +305,13 @@ cr_rgb_dump (CRRgb * a_this, FILE * a_fp)
 }
 
 /**
+ * cr_rgb_compute_from_percentage:
+ *@a_this: the current instance of #CRRgb
+ *
  *If the rgb values are expressed in percentage,
  *compute their real value.
- *@param a_this the current instance of #CRRgb
- *@return
+ *
+ *Returns CR_OK upon successful completion, an error code otherwise.
  */
 enum CRStatus
 cr_rgb_compute_from_percentage (CRRgb * a_this)
@@ -310,12 +328,15 @@ cr_rgb_compute_from_percentage (CRRgb * a_this)
 }
 
 /**
+ * cr_rgb_set:
+ *@a_this: the current instance of #CRRgb.
+ *@a_red: the red value.
+ *@a_green: the green value.
+ *@a_blue: the blue value.
+ *
  *Sets rgb values to the RGB.
- *@param a_this the current instance of #CRRgb.
- *@param a_red the red value.
- *@param a_green the green value.
- *@param a_blue the blue value.
- *@return CR_OK upon successful completion, an error code
+ *
+ *Returns CR_OK upon successful completion, an error code
  *otherwise.
  */
 enum CRStatus
@@ -340,11 +361,14 @@ cr_rgb_set (CRRgb * a_this, gulong a_red,
 }
 
 /**
+ * cr_rgb_set_to_inherit:
+ *@a_this: the current instance of #CRRgb
+ *
  *sets the value of the rgb to inherit.
  *Look at the css spec from chapter 6.1 to 6.2 to understand
  *the meaning of "inherit".
- *@param a_this the current instance of #CRRgb
  *
+ * Returns CR_OK upon succesful completion, an error code otherwise.
  */
 enum CRStatus 
 cr_rgb_set_to_inherit (CRRgb *a_this, gboolean a_inherit)
@@ -356,8 +380,15 @@ cr_rgb_set_to_inherit (CRRgb *a_this, gboolean a_inherit)
         return CR_OK ;
 }
 
+/**
+ * cr_rgb_is_set_to_inherit:
+ *
+ * @a_this: the current instance of #CRRgb.
+ *
+ * Returns TRUE if the rgb is set to the value "inherit", FALSE otherwise.
+ */
 gboolean
-cr_rgb_is_set_to_inherit (CRRgb *a_this)
+cr_rgb_is_set_to_inherit (CRRgb const *a_this)
 {
         g_return_val_if_fail (a_this, CR_BAD_PARAM_ERROR) ;
 
@@ -365,15 +396,18 @@ cr_rgb_is_set_to_inherit (CRRgb *a_this)
 }
 
 /**
+ * cr_rgb_is_set_to_transparent:
+ *@a_this: the current instance of
+ *#CRRgb
+ *
  *Tests if the the rgb is set to the
  *value "transparent" or not.
- *@param a_this the current instance of
- *#CRRgb
- *@return TRUE if the rgb has been set to
+ *
+ *Returns TRUE if the rgb has been set to
  *transparent, FALSE otherwise.
  */
 gboolean 
-cr_rgb_is_set_to_transparent (CRRgb *a_this)
+cr_rgb_is_set_to_transparent (CRRgb const *a_this)
 {
         g_return_val_if_fail (a_this, FALSE) ;
         return a_this->is_transparent ;
@@ -381,9 +415,12 @@ cr_rgb_is_set_to_transparent (CRRgb *a_this)
 
 
 /**
+ * cr_rgb_set_to_transparent:
+ *@a_this: the current instance of #CRRgb
+ *@a_is_transparent: set to transparent or not.
+ *
  *Sets the rgb to the "transparent" value (or not)
- *@param a_this the current instance of #CRRgb
- *@param a_is_transparent set to transparent or not.
+ *Returns CR_OK upon successfull completion, an error code otherwise.
  */
 enum CRStatus 
 cr_rgb_set_to_transparent (CRRgb *a_this, 
@@ -395,13 +432,16 @@ cr_rgb_set_to_transparent (CRRgb *a_this,
 }
 
 /**
+ * cr_rgb_set_from_rgb:
+ *@a_this: the current instance of #CRRgb.
+ *@a_rgb: the rgb to "copy"
+ *
  *Sets the rgb from an other one.
- *@param a_this the current instance of #CRRgb.
- *@param a_rgb the rgb to "copy"
- *@return CR_OK upon successful completion, an error code otherwise.
+ *
+ *Returns CR_OK upon successful completion, an error code otherwise.
  */
 enum CRStatus
-cr_rgb_set_from_rgb (CRRgb * a_this, CRRgb * a_rgb)
+cr_rgb_set_from_rgb (CRRgb * a_this, CRRgb const * a_rgb)
 {
         g_return_val_if_fail (a_this && a_rgb, CR_BAD_PARAM_ERROR);
 
@@ -410,6 +450,13 @@ cr_rgb_set_from_rgb (CRRgb * a_this, CRRgb * a_rgb)
         return CR_OK;
 }
 
+/**
+ * cr_rgb_set_from_name:
+ * @a_this: the current instance of #CRRgb
+ * @a_color_name: the color name
+ * 
+ * Returns CR_OK upon successful completion, an error code otherwise.
+ */
 enum CRStatus
 cr_rgb_set_from_name (CRRgb * a_this, const guchar * a_color_name)
 {
@@ -418,14 +465,14 @@ cr_rgb_set_from_name (CRRgb * a_this, const guchar * a_color_name)
 
         g_return_val_if_fail (a_this && a_color_name, CR_BAD_PARAM_ERROR);
 
-        for (i = 0; i < sizeof (gv_standard_colors); i++) {
-                if (!strcmp ((char *)a_color_name, gv_standard_colors[i].name)) {
+        for (i = 0; i < G_N_ELEMENTS (gv_standard_colors); i++) {
+                if (!strcmp (a_color_name, gv_standard_colors[i].name)) {
                         cr_rgb_set_from_rgb (a_this, &gv_standard_colors[i]);
                         break;
                 }
         }
 
-        if (i < sizeof (gv_standard_colors))
+        if (i < G_N_ELEMENTS (gv_standard_colors))
                 status = CR_OK;
         else
                status = CR_UNKNOWN_TYPE_ERROR;
@@ -433,6 +480,13 @@ cr_rgb_set_from_name (CRRgb * a_this, const guchar * a_color_name)
         return status;
 }
 
+/**
+ * cr_rgb_set_from_hex_str:
+ * @a_this: the current instance of #CRRgb
+ * @a_hex: the hexadecimal value to set.
+ *
+ * Returns CR_OK upon successful completion.
+ */
 enum CRStatus
 cr_rgb_set_from_hex_str (CRRgb * a_this, const guchar * a_hex)
 {
@@ -442,7 +496,7 @@ cr_rgb_set_from_hex_str (CRRgb * a_this, const guchar * a_hex)
 
         g_return_val_if_fail (a_this && a_hex, CR_BAD_PARAM_ERROR);
 
-        if (strlen ((char *)a_hex) == 3) {
+        if (strlen (a_hex) == 3) {
                 for (i = 0; i < 3; i++) {
                         if (a_hex[i] >= '0' && a_hex[i] <= '9') {
                                 colors[i] = a_hex[i] - '0';
@@ -457,7 +511,7 @@ cr_rgb_set_from_hex_str (CRRgb * a_this, const guchar * a_hex)
                                 status = CR_UNKNOWN_TYPE_ERROR;
                         }
                 }
-        } else if (strlen ((char *)a_hex) == 6) {
+        } else if (strlen (a_hex) == 6) {
                 for (i = 0; i < 6; i++) {
                         if (a_hex[i] >= '0' && a_hex[i] <= '9') {
                                 colors[i / 2] <<= 4;
@@ -488,15 +542,19 @@ cr_rgb_set_from_hex_str (CRRgb * a_this, const guchar * a_hex)
 }
 
 /**
+ * cr_rgb_set_from_term:
+ *@a_this: the instance of #CRRgb to set
+ *@a_value: the terminal from which to set
+ *
  *Set the rgb from a terminal symbol
- *@param a_this the instance of #CRRgb to set
- *@param a_value the terminal from which to set
+ *
+ * Returns CR_OK upon successful completion, an error code otherwise.
  */
 enum CRStatus
 cr_rgb_set_from_term (CRRgb *a_this, const struct _CRTerm *a_value)
 {
-    enum CRStatus status = CR_OK ;
-    g_return_val_if_fail (a_this && a_value,
+        enum CRStatus status = CR_OK ;
+        g_return_val_if_fail (a_this && a_value,
                               CR_BAD_PARAM_ERROR) ;
 
 	switch(a_value->type) {
@@ -518,7 +576,7 @@ cr_rgb_set_from_term (CRRgb *a_this, const struct _CRTerm *a_value)
 			} else  {
                         	status = cr_rgb_set_from_name
                                         (a_this,
-                                         (guchar *)a_value->content.str->stryng->str) ;
+                                         a_value->content.str->stryng->str) ;
 			}
                 } else {
                         cr_utils_trace_info 
@@ -531,7 +589,7 @@ cr_rgb_set_from_term (CRRgb *a_this, const struct _CRTerm *a_value)
                     && a_value->content.str->stryng->str) {
                         status = cr_rgb_set_from_hex_str
                                 (a_this, 
-                                 (guchar *)a_value->content.str->stryng->str) ;
+                                 a_value->content.str->stryng->str) ;
                 } else {
                         cr_utils_trace_info
                                 ("a_value has NULL string value") ;
@@ -544,7 +602,7 @@ cr_rgb_set_from_term (CRRgb *a_this, const struct _CRTerm *a_value)
 }
 
 enum CRStatus 
-cr_rgb_copy (CRRgb *a_dest, CRRgb*a_src)
+cr_rgb_copy (CRRgb *a_dest, CRRgb const *a_src)
 {
         g_return_val_if_fail (a_dest && a_src,
                               CR_BAD_PARAM_ERROR) ;
@@ -554,9 +612,11 @@ cr_rgb_copy (CRRgb *a_dest, CRRgb*a_src)
 }
 
 /**
- *Destructor of #CRRgb.
- *@param a_this the "this pointer" of the
+ * cr_rgb_destroy:
+ *@a_this: the "this pointer" of the
  *current instance of #CRRgb.
+ *
+ *Destructor of #CRRgb.
  */
 void
 cr_rgb_destroy (CRRgb * a_this)
@@ -566,13 +626,16 @@ cr_rgb_destroy (CRRgb * a_this)
 }
 
 /**
+ * cr_rgb_parse_from_buf:
+ *@a_str: a string that contains a color description
+ *@a_enc: the encoding of a_str
+ *
  *Parses a text buffer that contains a rgb color
  *
- *@param a_str a string that contains a color description
- *@param a_enc the encoding of a_str
- *@return the parsed color, or NULL in case of error
+ *Returns the parsed color, or NULL in case of error
  */
-CRRgb *cr_rgb_parse_from_buf (const guchar *a_str,
+CRRgb *
+cr_rgb_parse_from_buf (const guchar *a_str,
                               enum CREncoding a_enc)
 {
 	enum CRStatus status = CR_OK ;
@@ -582,7 +645,7 @@ CRRgb *cr_rgb_parse_from_buf (const guchar *a_str,
 	
 	g_return_val_if_fail (a_str, NULL);
 	
-	parser = cr_parser_new_from_buf ((guchar *)a_str, strlen ((char *)a_str), 
+	parser = cr_parser_new_from_buf ((guchar*)a_str, strlen (a_str), 
                                          a_enc, FALSE) ;
 
 	g_return_val_if_fail (parser, NULL);
@@ -612,6 +675,4 @@ cleanup:
 	}
 	return result ;
 }
-	  
 
-