Add a FIXME, and rationise the style elements so far

2 files changed, 41 insertions, 28 deletions

diff --git a/src/slide_render.c b/src/slide_render.c
index a174e3c..0a07560 100644
--- a/src/slide_render.c
+++ b/src/slide_render.c
@@ -176,7 +176,7 @@ static void render_text_object(cairo_t *cr, struct object *o)
 
 	cairo_move_to(cr, o->x, o->y);
 	gdk_color_parse(o->style->colour, &col);
-	gdk_cairo_set_source_color(cr, &col);
+	gdk_cairo_set_source_color(cr, &col);  /* FIXME: Honour alpha as well */
 	pango_cairo_show_layout(cr, o->layout);
 
 	if ( furniture ) {
diff --git a/src/stylesheet.c b/src/stylesheet.c
index 1e5b77b..20d01c4 100644
--- a/src/stylesheet.c
+++ b/src/stylesheet.c
@@ -467,43 +467,56 @@ static void default_stylesheet(StyleSheet *ss)
 	sty->offset_y = 0.0;  /* irrelevant */
 
 	sty = new_style(ss, "Slide credit");
-	sty->font = strdup("Sans 30");
-	sty->colour = strdup("#000000000000");  /* Black */
+	sty->font = strdup("Sans 14");
+	sty->colour = strdup("#777777777777");  /* Grey */
 	sty->alpha = 1.0;
 	sty->margin_left = 20.0;
 	sty->margin_right = 20.0;
 	sty->margin_top = 20.0;
-	sty->margin_bottom = 20.0;
-	sty->halign = J_CENTER;
-	sty->valign = V_CENTER;
-	sty->offset_x = +200.0;
-	sty->offset_y = -300.0;
+	sty->margin_bottom = 30.0;
+	sty->halign = J_RIGHT;
+	sty->valign = V_BOTTOM;
+	sty->offset_x = 0.0;
+	sty->offset_y = 0.0;
 
 	sty = new_style(ss, "Slide date");
-	sty->font = strdup("Sans 30");
-	sty->colour = strdup("#000000000000");  /* Black */
+	sty->font = strdup("Sans 12");
+	sty->colour = strdup("#999999999999");  /* Grey */
 	sty->alpha = 1.0;
-	sty->margin_left = 20.0;
-	sty->margin_right = 20.0;
-	sty->margin_top = 20.0;
-	sty->margin_bottom = 20.0;
-	sty->halign = J_CENTER;
-	sty->valign = V_CENTER;
-	sty->offset_x = +200.0;
-	sty->offset_y = -300.0;
+	sty->margin_left = 600.0;
+	sty->margin_right = 100.0;
+	sty->margin_top = 600.0;
+	sty->margin_bottom = 5.0;
+	sty->halign = J_RIGHT;
+	sty->valign = V_BOTTOM;
+	sty->offset_x = 0.0;
+	sty->offset_y = 0.0;
 
 	sty = new_style(ss, "Slide number");
-	sty->font = strdup("Sans 30");
-	sty->colour = strdup("#000000000000");  /* Black */
+	sty->font = strdup("Sans 12");
+	sty->colour = strdup("#999999999999");  /* Grey */
 	sty->alpha = 1.0;
-	sty->margin_left = 20.0;
-	sty->margin_right = 20.0;
-	sty->margin_top = 20.0;
-	sty->margin_bottom = 20.0;
-	sty->halign = J_CENTER;
-	sty->valign = V_CENTER;
-	sty->offset_x = +200.0;
-	sty->offset_y = -300.0;
+	sty->margin_left = 600.0;
+	sty->margin_right = 5.0;
+	sty->margin_top = 600.0;
+	sty->margin_bottom = 5.0;
+	sty->halign = J_RIGHT;
+	sty->valign = V_BOTTOM;
+	sty->offset_x = 0.0;
+	sty->offset_y = 0.0;
+
+	sty = new_style(ss, "Presentation title on slide");
+	sty->font = strdup("Sans 12");
+	sty->colour = strdup("#999999999999");  /* Grey */
+	sty->alpha = 1.0;
+	sty->margin_left = 5.0;
+	sty->margin_right = 600.0;
+	sty->margin_top = 600.0;
+	sty->margin_bottom = 5.0;
+	sty->halign = J_LEFT;
+	sty->valign = V_BOTTOM;
+	sty->offset_x = 0.0;
+	sty->offset_y = 0.0;
 
 	sty = new_style(ss, "Presentation title");
 	sty->font = strdup("Sans 50");