X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-head.cc;h=5f86f6e401d7ee869fcab4062d4e02051aeda8a7;hb=9f3572d98bb948c9689cd1f75401a029451fa001;hp=cb89b5ae17d52dad44277c75ce144026444a27bb;hpb=04265f11d1f21416ccebd2dcaa1d903dc781b36e;p=lilypond.git diff --git a/lily/note-head.cc b/lily/note-head.cc index cb89b5ae17..5f86f6e401 100644 --- a/lily/note-head.cc +++ b/lily/note-head.cc @@ -43,11 +43,8 @@ internal_print (Grob *me, string *font_char) Font_metric *fm = Font_interface::get_default_font (me); - string idx_symmetric; - string idx_directed; - string idx_either; - idx_symmetric = idx_either = "noteheads.s" + suffix; - Stencil out = fm->find_by_name (idx_symmetric); + string idx = "noteheads.s" + suffix; + Stencil out = fm->find_by_name (idx); if (out.is_empty ()) { string prefix = "noteheads."; @@ -58,20 +55,18 @@ internal_print (Grob *me, string *font_char) if (stem_dir == CENTER) programming_error ("must have stem dir for note head"); - idx_directed = idx_either = - prefix + ((stem_dir == UP) ? "u" : "d") + suffix; - out = fm->find_by_name (idx_directed); + idx = prefix + ((stem_dir == UP) ? "u" : "d") + suffix; + out = fm->find_by_name (idx); } if (out.is_empty ()) { - me->warning (_f ("none of note heads `%s' or `%s' found", - idx_symmetric.c_str (), idx_directed.c_str ())); + me->warning (_f ("note head `%s' not found", idx.c_str ())); out = Stencil (Box (Interval (0, 0), Interval (0, 0)), SCM_EOL); } else - *font_char = idx_either; + *font_char = idx; return out; }