From e3b87ad8d0c8c1da1d85960a7055e82cbef0aeb6 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sun, 9 Oct 2005 22:30:37 +0000 Subject: [PATCH 1/1] (internal_print): don't shadow idx parameter. This fixes wrong attachment for do shape heads. --- ChangeLog | 5 +++++ lily/note-head.cc | 3 ++- mf/feta-bolletjes.mf | 4 ++-- scm/ps-to-png.scm | 2 -- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3f170d6554..ec83f6b953 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-10-10 Han-Wen Nienhuys + + * lily/note-head.cc (internal_print): don't shadow idx + parameter. This fixes wrong attachment for do shape heads. + 2005-10-09 Han-Wen Nienhuys * scm/parser-ly-from-scheme.scm: rename from ly-from-scheme.scm diff --git a/lily/note-head.cc b/lily/note-head.cc index 416dd0e2b9..1a51dd69b9 100644 --- a/lily/note-head.cc +++ b/lily/note-head.cc @@ -56,7 +56,8 @@ internal_print (Grob *me, String *font_char) if (stem_dir == CENTER) programming_error ("must have stem dir for note head"); - String idx = prefix + ((stem_dir == UP) ? "u" : "d") + suffix; + + idx = prefix + ((stem_dir == UP) ? "u" : "d") + suffix; out = fm->find_by_name (idx); } diff --git a/mf/feta-bolletjes.mf b/mf/feta-bolletjes.mf index 8e5ec4f078..ca405b5a60 100644 --- a/mf/feta-bolletjes.mf +++ b/mf/feta-bolletjes.mf @@ -950,7 +950,7 @@ fet_beginchar ("Half dohead", "d1do"); fet_endchar; -fet_beginchar ("Half dohead", "s1do"); +fet_beginchar ("Half dohead", "u1do"); draw_do_head (1.5, 1); fill p_out; unfill p_in; @@ -963,7 +963,7 @@ fet_beginchar ("Quart dohead", "d2do"); fet_endchar; -fet_beginchar ("Quart dohead", "s2do"); +fet_beginchar ("Quart dohead", "u2do"); draw_do_head (1.55, 1); fill p_out; fet_endchar; diff --git a/scm/ps-to-png.scm b/scm/ps-to-png.scm index 248a9d47de..a7c87d8b8d 100644 --- a/scm/ps-to-png.scm +++ b/scm/ps-to-png.scm @@ -56,8 +56,6 @@ (ly:gulp-file nm len)) -;;; ARGH - cuases memory usage to explode with GUILE cvs. - (define BOUNDING-BOX-RE "^%%BoundingBox: (-?[0-9]+) (-?[0-9]+) (-?[0-9]+) (-?[0-9]+)") -- 2.39.2