(internal_print): don't shadow idx

parameter. This fixes wrong attachment for do shape heads.

diff --git a/ChangeLog b/ChangeLog
index 3f170d655437d0b7877b7f2b751fb04deff5a7e8..ec83f6b953730236e62d503fe7593e3b4c0a5f1e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-10  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * 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  <hanwen@xs4all.nl>
 
        * 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 416dd0e2b9c36fb081436d6814205a8584d5ce1e..1a51dd69b97dbd5150862132da566c49cd7c31c2 100644 (file)
--- 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 8e5ec4f078779f65132c4f83a91c4733f271b032..ca405b5a60cefdf8b14f51ac77fb60d5de32fd5a 100644 (file)
--- 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 248a9d47defc71196da76a98dfb57f13f480af76..a7c87d8b8dce1f8e4a7b9ca56b5d5f62e3a9c4f5 100644 (file)
--- 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]+)")