X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frest.cc;h=9057e45af1bd90deaf29c0419ac2a2b2233ee8a9;hb=1dca79ad0e125124abcae8ac048b351af4ed702a;hp=0bb61444b4c025882f0bb924cb531350c246102d;hpb=41a6d7cfae2219e01f35cbacd86288bfdba7a02d;p=lilypond.git diff --git a/lily/rest.cc b/lily/rest.cc index 0bb61444b4..9057e45af1 100644 --- a/lily/rest.cc +++ b/lily/rest.cc @@ -45,8 +45,8 @@ Rest::y_offset_callback (SCM smob) if (position_override) { - amount = - robust_scm2double (me->get_property ("staff-position"), 0) * 0.5 * ss; + amount + = robust_scm2double (me->get_property ("staff-position"), 0) * 0.5 * ss; /* semibreve rests are positioned one staff line off @@ -75,15 +75,15 @@ Rest::y_offset_callback (SCM smob) /* make sure rest is aligned to a staff line */ - if (Grob *staff = Staff_symbol_referencer::get_staff_symbol(me)) + if (Grob *staff = Staff_symbol_referencer::get_staff_symbol (me)) { std::vector linepos = Staff_symbol::line_positions (staff); - std::sort(linepos.begin(), linepos.end()); + std::sort (linepos.begin (), linepos.end ()); std::vector::const_iterator it - = std::lower_bound(linepos.begin(), linepos.end(), pos); - if (it != linepos.end()) + = std::lower_bound (linepos.begin (), linepos.end (), pos); + if (it != linepos.end ()) { - pos = (int)ceil(*it); + pos = (int)ceil (*it); } } @@ -127,8 +127,8 @@ Rest::glyph_name (Grob *me, int durlog, string style, bool try_ledgers) */ if (-1 <= durlog && durlog <= 1) is_ledgered = !Staff_symbol_referencer::on_staff_line (me, pos) - && !(durlog == -1 - && Staff_symbol_referencer::on_staff_line (me, pos + 2)); + && !(durlog == -1 + && Staff_symbol_referencer::on_staff_line (me, pos + 2)); } string actual_style (style.c_str ());