From 237b518a0992362a6d5aadd58a2b4d4f700835c3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=BCrgen=20Reuter?= Date: Fri, 6 Oct 2006 16:44:58 +0000 Subject: [PATCH] * lily/note-head.cc: Fixed programming_error message. --- ChangeLog | 4 ++++ lily/note-head.cc | 17 +++++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index d10ac47ee3..ff9ba4ac2b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2006-10-06 Jürgen Reuter + + * lily/note-head.cc: Fixed programming_error message. + 2006-10-06 Han-Wen Nienhuys * scm/define-grobs.scm (pure-conversion): move pure-callback diff --git a/lily/note-head.cc b/lily/note-head.cc index 5f86f6e401..cb89b5ae17 100644 --- 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; } -- 2.39.2