From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Tue, 28 Mar 2006 19:26:15 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: release/2.9.0~4
X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=a6ef345436fad6539e1e3f9342281092c5eb19a4;p=lilypond.git

*** empty log message ***
---

diff --git a/ChangeLog b/ChangeLog
index 4c296a3786..8c21b0006f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
 
 2006-03-28  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+	* mf/feta-bolletjes.mf: match width of solfa notes with normal
+	note heads.
+
 	* lily/ttf.cc (print_trailer): use it.
 
 	* lily/pango-font.cc (get_unicode_name): new function.
diff --git a/lily/pango-font.cc b/lily/pango-font.cc
index 6419187dbf..97ab6698c7 100644
--- a/lily/pango-font.cc
+++ b/lily/pango-font.cc
@@ -92,9 +92,9 @@ void
 get_unicode_name (char*s, FT_ULong code)
 {
   if (code > 0xFFFF)
-    sprintf (s,  "u%06lX", char_code);
+    sprintf (s,  "u%06lX", code);
   else
-    sprintf (s,  "uni%04lX", char_code);
+    sprintf (s,  "uni%04lX", code);
 }
 
 
diff --git a/mf/feta-bolletjes.mf b/mf/feta-bolletjes.mf
index dd83129a6a..1483af4d9f 100644
--- a/mf/feta-bolletjes.mf
+++ b/mf/feta-bolletjes.mf
@@ -26,8 +26,14 @@ picture remember_pic;
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 save black_notehead_width, noteheight;
-save slash_thick, slash_slope, overdone_heads, solfa_noteheight;
-numeric black_notehead_width, noteheight, slash_thick;
+save half_notehead_width, whole_notehead_width, slash_thick;
+save slash_slope, overdone_heads, solfa_noteheight;
+
+numeric noteheight;
+numeric slash_thick;
+numeric black_notehead_width;
+numeric whole_notehead_width;
+numeric half_notehead_width;
 
 
 fet_begingroup ("noteheads");
@@ -191,6 +197,8 @@ fet_beginchar ("Whole notehead", "s0");
 	undraw_inside_ellipse (1.30, 125 - puff_up_factor * 10,
 			       0.68, 2 stafflinethickness#);
 
+	whole_notehead_width# := charwd;
+
 	draw_staff (-2, 2, 0);
 fet_endchar;
 
@@ -213,6 +221,8 @@ fet_beginchar ("Half notehead", "s1");
 	draw_outside_ellipse (1.53 - puff_up_factor / 3.0, 34, 0.66, 0.17);
 	undraw_inside_ellipse (3.25, 33, 0.81, 2.5 stafflinethickness#);
 
+	half_notehead_width# := charwd;
+
 	draw_staff (-2, 2, 0);
 fet_endchar;
 
@@ -888,14 +898,16 @@ fi;
 %
 
 save solfa_pen_thick;
-solfa_pen_thick# = 2 stafflinethickness#;
+solfa_pen_thick# = 1.75 stafflinethickness#;
 define_blacker_pixels (solfa_pen_thick);
 
 
-solfa_whole_width := 1.8;
-solfa_half_width := 1.35;
-solfa_quarter_width := 1.35;
+save solfa_base_notewidth;
+solfa_base_notewidth# := black_notehead_width#;
 
+solfa_whole_width := whole_notehead_width# / black_notehead_width#;
+solfa_half_width := half_notehead_width# / black_notehead_width#;
+solfa_quarter_width := 1.0;
 
 def draw_do_head (expr width_factor, dir) =
 	save p_in, p_out;
@@ -903,7 +915,7 @@ def draw_do_head (expr width_factor, dir) =
 	path p_in, p_out;
 	pair left_dist, right_dist;
 
-	set_char_box (0, width_factor * solfa_noteheight#,
+	set_char_box (0, width_factor * solfa_base_notewidth#,
 		      0.5 solfa_noteheight#, 0.5 solfa_noteheight#);
 
 	pickup pencircle scaled solfa_pen_thick;