X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=scherzo.c;h=329884da93764973e0d595265d85dd5e2ac9b061;hb=f6b8f7f23bb8a4a5b30bfde8242578cca90ddacf;hp=f6669edc3fda5194149cd72d88883c963b5cc076;hpb=e8131140bc963d8f19e4d8691a6b9447bff94534;p=scherzo

diff --git a/scherzo.c b/scherzo.c
index f6669ed..329884d 100644
--- a/scherzo.c
+++ b/scherzo.c
@@ -62,8 +62,8 @@ on_expose_event_draw (GtkWidget *widget,
     cairo_set_source_rgb (cr, 1.0, 1.0, 1.0);
     cairo_paint (cr);
 
-    /* Add some padding on the left/right */
-    cairo_translate (cr, pad, pad);
+    /* Add some padding on the sides and top */
+    cairo_translate (cr, pad, (int) scherzo->staff_height / 2);
     score_set_staff_height (score, scherzo->staff_height);
     score_set_width (score, widget_width - 2 * pad);
 
@@ -111,13 +111,37 @@ main (int argc, char *argv[])
     GtkWidget *window;
     GtkWidget *drawing_area;
     scherzo_t scherzo;
+    score_staff_t *treble;
+    score_staff_t *bass;
 
     gtk_init (&argc, &argv);
 
     scherzo.score = score_create (NULL);
-    scherzo.staff_height = 24;
+    scherzo.staff_height = 48;
     score_set_staff_height (scherzo.score, scherzo.staff_height);
 
+    score_add_brace (scherzo.score, 2);
+    treble = score_add_staff (scherzo.score, SCORE_CLEF_G);
+    bass = score_add_staff (scherzo.score, SCORE_CLEF_F);
+
+    score_staff_add_note (treble, SCORE_BUILD_NOTE (D, 4, WHOLE));
+    score_staff_add_note (treble, SCORE_BUILD_NOTE (E, 4, WHOLE));
+    score_staff_add_note (treble, SCORE_BUILD_NOTE (F, 4, WHOLE));
+    score_staff_add_note (treble, SCORE_BUILD_NOTE (G, 4, WHOLE));
+    score_staff_add_note (treble, SCORE_BUILD_NOTE (A, 4, WHOLE));
+    score_staff_add_note (treble, SCORE_BUILD_NOTE (B, 4, WHOLE));
+    score_staff_add_note (treble, SCORE_BUILD_NOTE (C, 5, WHOLE));
+    score_staff_add_note (treble, SCORE_BUILD_NOTE (D, 5, WHOLE));
+
+    score_staff_add_note (bass, SCORE_BUILD_NOTE (B, 2, WHOLE));
+    score_staff_add_note (bass, SCORE_BUILD_NOTE (C, 3, WHOLE));
+    score_staff_add_note (bass, SCORE_BUILD_NOTE (D, 3, WHOLE));
+    score_staff_add_note (bass, SCORE_BUILD_NOTE (E, 3, WHOLE));
+    score_staff_add_note (bass, SCORE_BUILD_NOTE (F, 3, WHOLE));
+    score_staff_add_note (bass, SCORE_BUILD_NOTE (G, 3, WHOLE));
+    score_staff_add_note (bass, SCORE_BUILD_NOTE (A, 3, WHOLE));
+    score_staff_add_note (bass, SCORE_BUILD_NOTE (B, 3, WHOLE));
+
     window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 
     gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);