X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=score.c;h=0228b6e2ab3aea5d94f8d2ef5b8e430c63abc98a;hb=997636705c1b736ae8355bf67d9b2336ef17e43c;hp=b2866096e3c0183c254ae6ae3838e9325c637dcb;hpb=03f4abc3182dfe2602d44d38ce7b3db2892e018e;p=scherzo

diff --git a/score.c b/score.c
index b286609..0228b6e 100644
--- a/score.c
+++ b/score.c
@@ -58,13 +58,6 @@ struct score
     int num_staves;
 };
 
-typedef struct score_note
-{
-    score_pitch_t pitch;
-    int octave;
-    score_duration_t duration;
-} score_note_t;
-
 score_t *
 score_create (void *ctx)
 {
@@ -177,6 +170,15 @@ _draw_note (score_t *score, cairo_t *cr,
 {
     double line;
     cairo_glyph_t note_glyph;
+    static double extend_factor = 0.25;
+
+    void _draw_ledger_line (double line, double width) {
+	cairo_move_to (cr,
+		       - width * extend_factor / 2.0,
+		       score->space_height * line + score->line_width / 2.0);
+	cairo_rel_line_to (cr, (1 + extend_factor) * width, 0);
+	cairo_stroke (cr);
+    }
 
     cairo_save (cr);
 
@@ -210,7 +212,22 @@ _draw_note (score_t *score, cairo_t *cr,
     }
 
     note_glyph.x = 0;
-    note_glyph.y = score->space_height * line + score->line_width / 2.0;
+    note_glyph.y = score->space_height * line;
+
+    if (line < 0 || line > 4) {
+	int i;
+	cairo_text_extents_t note_extents;
+
+	cairo_glyph_extents (cr, &note_glyph, 1, &note_extents);
+
+	if (line < 0) {
+	    for (i = -1; i >= line; i--)
+		_draw_ledger_line (i, note_extents.width);
+	} else {
+	    for (i = 5; i <= line; i++)
+		_draw_ledger_line (i, note_extents.width);
+	}
+    }
 
     cairo_set_source_rgb (cr, 0.0, 0.0, 0.0); /* black */
     cairo_show_glyphs (cr, &note_glyph, 1);
@@ -373,10 +390,10 @@ score_add_staff (score_t *score, score_clef_t clef)
 }
 
 score_note_t *
-score_staff_add_note (score_staff_t *staff,
-		      score_pitch_t pitch,
-		      int octave,
-		      score_duration_t duration)
+score_add_note (score_staff_t *staff,
+		score_pitch_t pitch,
+		int octave,
+		score_duration_t duration)
 {
     score_note_t *note;
 
@@ -384,6 +401,7 @@ score_staff_add_note (score_staff_t *staff,
     if (note == NULL)
 	return NULL;
 
+    note->staff = staff;
     note->pitch = pitch;
     note->octave = octave;
     note->duration = duration;
@@ -404,8 +422,9 @@ score_staff_add_note (score_staff_t *staff,
 }
 
 void
-score_staff_remove_note (score_staff_t *staff, score_note_t *note)
+score_remove_note (score_note_t *note)
 {
+    score_staff_t *staff = note->staff;
     int i;
 
     for (i = 0; i < staff->num_notes; i++)