X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fside-position-interface.cc;h=dcd6f237d34e962f2456979dec476cb76a3d6bb9;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=73da30e9e32d26fc3d9c65a35fedcdb7d0c880c3;hpb=fec91b4e613b780ddc9ad9dc04b477296d60a6db;p=lilypond.git diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc index 73da30e9e3..dcd6f237d3 100644 --- a/lily/side-position-interface.cc +++ b/lily/side-position-interface.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2007 Han-Wen Nienhuys + (c) 1998--2008 Han-Wen Nienhuys */ #include "side-position-interface.hh" @@ -96,13 +96,15 @@ Side_position_interface::general_side_position (Grob *me, Axis a, bool use_exten continue; if (e) - if (use_extents) - dim.unite (e->maybe_pure_extent (common, a, pure, start, end)); - else - { - Real x = e->maybe_pure_coordinate (common, a, pure, start, end); - dim.unite (Interval (x, x)); - } + { + if (use_extents) + dim.unite (e->maybe_pure_extent (common, a, pure, start, end)); + else + { + Real x = e->maybe_pure_coordinate (common, a, pure, start, end); + dim.unite (Interval (x, x)); + } + } } if (dim.is_empty ()) @@ -267,7 +269,7 @@ Side_position_interface::aligned_side (Grob *me, Axis a, bool pure, int start, i { Interval iv = me->maybe_pure_extent (me, a, pure, start, end); - Real padding + Real padding = Staff_symbol_referencer::staff_space (me) * scm_to_double (me->get_property ("staff-padding"));