From: Janek Warchoł <lemniskata.bernoullego@gmail.com>
Date: Sun, 17 Aug 2014 12:59:35 +0000 (+0200)
Subject: Fix ugly code in ClefModifier alignment
X-Git-Tag: release/2.19.13-1~14
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=54e99169c083ddde748e0f583c2d007cfe937044;p=lilypond.git

Fix ugly code in ClefModifier alignment
---

diff --git a/lily/clef-modifier.cc b/lily/clef-modifier.cc
index 6d802ad271..c56b935a16 100644
--- a/lily/clef-modifier.cc
+++ b/lily/clef-modifier.cc
@@ -32,13 +32,10 @@ Clef_modifier::calc_parent_alignment (SCM smob)
   Grob *me = Grob::unsmob (smob);
   Grob *clef = me->get_parent (X_AXIS);
   string full_clef_name = ly_scm2string (clef->get_property ("glyph"));
-
-  int separator_position = full_clef_name.find ('.');
-  string clef_type = full_clef_name.substr (separator_position + 1,
-                                            separator_position + 2);
+  string clef_name = replace_all(&full_clef_name, "clefs.", "");
 
   // find entry with keyname clef_type in clef-alignments
-  SCM alist_entry = scm_assq (ly_symbol2scm (clef_type.c_str ()),
+  SCM alist_entry = scm_assq (ly_symbol2scm (clef_name.c_str ()),
                               me->get_property ("clef-alignments"));
 
   if (scm_is_pair (alist_entry))