X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frest.cc;h=9fa2718b5e727bfb8c84615acf2247a0e6a1a745;hb=46340a068e743b3b35175c80b811c0b3860512ea;hp=2efbf78e0417761b5ffee0424dc0c1745f47dd56;hpb=87932dcb8ec24b069bbce8edbb76f5258ca4ff1b;p=lilypond.git diff --git a/lily/rest.cc b/lily/rest.cc index 2efbf78e04..9fa2718b5e 100644 --- a/lily/rest.cc +++ b/lily/rest.cc @@ -30,7 +30,7 @@ Rest::after_line_breaking (SCM smob) if (d && bt > 4) // UGH. { d->set_grob_property ("staff-position", - gh_int2scm ((bt == 7) ? 4 : 3)); + gh_int2scm ((bt == 7) ? 4 : 3)); } return SCM_UNSPECIFIED; @@ -78,11 +78,12 @@ Rest::brew_internal_molecule (SCM smob) SCM balltype_scm = me->get_grob_property ("duration-log"); if (!gh_number_p (balltype_scm)) return Molecule ().smobbed_copy (); + int balltype = gh_scm2int (balltype_scm); String style; SCM style_sym =me->get_grob_property ("style"); - if (balltype >= 2 && gh_symbol_p (style_sym)) + if (gh_symbol_p (style_sym)) { style = ly_scm2string (scm_symbol_to_string (style_sym)); }