[ccss] ccss_stylesheet_dump() dumps almost valid CSS.

Problem is still with file paths, we need to distinguish between
producing just "/foo/bar" when the property is read vs.
"url(/foo/bar)" when dumping.

4 files changed, 20 insertions, 28 deletions

diff --git a/ccss/ccss-background-parser.c b/ccss/ccss-background-parser.c
index 8241500..1b505ea 100644
--- a/ccss/ccss-background-parser.c
+++ b/ccss/ccss-background-parser.c
@@ -497,7 +497,11 @@ background_image_convert (ccss_background_image_t const	*property,
 	if (CCSS_PROPERTY_TYPE_DOUBLE == target)
 		return false;
 
-	ret = g_strdup (property->uri);
+	if (property->uri) {
+		ret = g_strdup (property->uri);
+	} else {
+		ret = g_strdup ("none");
+	}
 
 	* (char **) value = ret;
 
diff --git a/ccss/ccss-border-image-parser.c b/ccss/ccss-border-image-parser.c
index ffb821a..583f8b7 100644
--- a/ccss/ccss-border-image-parser.c
+++ b/ccss/ccss-border-image-parser.c
@@ -199,6 +199,11 @@ border_image_convert (ccss_border_image_t const	*property,
 	if (CCSS_PROPERTY_TYPE_DOUBLE == target)
 		return false;
 
+	if (property->uri == NULL) {
+		* (char **) value = g_strdup ("none");
+		return true;
+	}
+
 	top = ccss_position_serialize (&property->top);
 	right = ccss_position_serialize (&property->right);
 	bottom = ccss_position_serialize (&property->bottom);
diff --git a/ccss/ccss-selector-group.c b/ccss/ccss-selector-group.c
index ebd2fed..c66c4e8 100644
--- a/ccss/ccss-selector-group.c
+++ b/ccss/ccss-selector-group.c
@@ -397,7 +397,7 @@ ccss_selector_group_dump (ccss_selector_group_t const *self)
 	g_tree_foreach (self->sets, (GTraverseFunc) traverse_dump, NULL);
 
 	for (GSList const *iter = self->dangling_selectors; iter != NULL; iter = iter->next) {
-		printf ("(dangling) ");
+		printf ("/* dangling */\n");
 		ccss_selector_dump ((ccss_selector_t const *) iter->data);
 	}
 }
diff --git a/ccss/ccss-selector.c b/ccss/ccss-selector.c
index afb1533..cb38e3d 100644
--- a/ccss/ccss-selector.c
+++ b/ccss/ccss-selector.c
@@ -121,7 +121,7 @@ universal_selector_destroy (ccss_universal_selector_t *self)
 static void
 universal_selector_dump (ccss_universal_selector_t const *self)
 {
-	printf (" *");
+	printf ("*");
 }
 
 /*
@@ -175,7 +175,7 @@ type_selector_destroy (ccss_type_selector_t *self)
 static void
 type_selector_dump (ccss_type_selector_t const *self)
 {
-	printf (" %s", self->type_name);
+	printf ("%s", self->type_name);
 }
 
 /*
@@ -254,7 +254,7 @@ class_selector_destroy (ccss_class_selector_t *self)
 static void
 class_selector_dump (ccss_class_selector_t const *self)
 {
-	printf (".%s", self->class_name);
+	printf ("%s", self->class_name);
 }
 
 /*
@@ -487,7 +487,7 @@ instance_selector_destroy (ccss_instance_selector_t *self)
 static void
 instance_selector_dump (ccss_instance_selector_t const *self)
 {
-	printf (":%x", self->instance);
+	printf ("/*:instance(%x)*/", self->instance);
 }
 
 ccss_selector_t *
@@ -1008,28 +1008,14 @@ ccss_selector_dump (ccss_selector_t const *self)
 {
 	g_assert (self);
 
-	printf ("%p: ", (void *) self);
-
 	if (self->container) {
-		ccss_selector_t const *container;
-		printf ("( ");
-		container = self->container;
-		while (container) {
-			printf("%s < ", ccss_selector_get_key (container));
-			container = container->container;
-		}
-		printf (")");
+		ccss_selector_dump (self->container);
+		printf (" > ");
 	}
 
 	if (self->antecessor) {
-		ccss_selector_t const *container;
-		printf ("( ");
-		container = self->antecessor;
-		while (container) {
-			printf("%s", ccss_selector_get_key (container));
-			container = container->antecessor;
-		}
-		printf (")");
+		ccss_selector_dump (self->antecessor);
+		printf (" ");
 	}
 
 	switch (self->modality) {
@@ -1064,10 +1050,7 @@ ccss_selector_dump (ccss_selector_t const *self)
 	if (self->block) {
 		printf (" {\n");
 		ccss_block_dump (self->block);
-		printf ("}");
+		printf ("}\n\n");
 	}
-
-	printf (" # modality: %d, specificity: %d,%d,%d,%d,%d\n", 
-		self->modality, self->a, self->b, self->c, self->d, self->e);
 }