* lily/note-head.cc: Fixed programming_error message.

diff --git a/ChangeLog b/ChangeLog
index d10ac47ee3ebe4ec89314fbbb231e710025b23ed..ff9ba4ac2b6ddda9b835e5c086a0c0e70f3286e1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-10-06  Jürgen Reuter  <reuter@ipd.uka.de>
+
+       * lily/note-head.cc: Fixed programming_error message.
+
 2006-10-06  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
        * scm/define-grobs.scm (pure-conversion): move pure-callback

diff --git a/lily/note-head.cc b/lily/note-head.cc
index 5f86f6e401d7ee869fcab4062d4e02051aeda8a7..cb89b5ae17d52dad44277c75ce144026444a27bb 100644 (file)
--- a/lily/note-head.cc
+++ b/lily/note-head.cc
@@ -43,8 +43,11 @@ internal_print (Grob *me, string *font_char)
 
   Font_metric *fm = Font_interface::get_default_font (me);
 
-  string idx = "noteheads.s" + suffix;
-  Stencil out = fm->find_by_name (idx);
+  string idx_symmetric;
+  string idx_directed;
+  string idx_either;
+  idx_symmetric = idx_either = "noteheads.s" + suffix;
+  Stencil out = fm->find_by_name (idx_symmetric);
   if (out.is_empty ())
     {
       string prefix = "noteheads.";
@@ -55,18 +58,20 @@ internal_print (Grob *me, string *font_char)
       if (stem_dir == CENTER)
        programming_error ("must have stem dir for note head");
       
-      idx = prefix + ((stem_dir == UP) ? "u" : "d") + suffix;
-      out = fm->find_by_name (idx);
+      idx_directed = idx_either =
+       prefix + ((stem_dir == UP) ? "u" : "d") + suffix;
+      out = fm->find_by_name (idx_directed);
     }
 
 
   if (out.is_empty ())
     {
-      me->warning (_f ("note head `%s' not found", idx.c_str ()));
+      me->warning (_f ("none of note heads `%s' or `%s' found",
+                      idx_symmetric.c_str (), idx_directed.c_str ()));
       out = Stencil (Box (Interval (0, 0), Interval (0, 0)), SCM_EOL);
     }
   else
-    *font_char = idx;
+    *font_char = idx_either;
 
   return out;
 }