Issue 5053/2: Fix extendersOverRests property

[lilypond.git] / lily / tuplet-bracket.cc

diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc
index 4a8487adc5f0163ae45421bb31b2c43d4e2633c0..340b017723753e5431ecce6379129f65ad212caf 100644 (file)
--- a/lily/tuplet-bracket.cc
+++ b/lily/tuplet-bracket.cc
@@ -59,8 +59,6 @@
 #include "paper-column.hh"
 #include "moment.hh"
 
-using std::vector;
-
 static Item *
 get_x_bound_item (Grob *me_grob, Direction hdir, Direction my_dir)
 {
@@ -238,7 +236,7 @@ Tuplet_bracket::calc_x_positions (SCM smob)
           if (to_boolean (me->get_property ("full-length-to-extent")))
             coord = robust_relative_extent (bounds[d], commonx, X_AXIS)[LEFT];
 
-          coord = std::max (coord, x_span[LEFT]);
+          coord = max (coord, x_span[LEFT]);
 
           x_span[d] = coord - padding;
         }
@@ -542,7 +540,7 @@ Tuplet_bracket::calc_position_and_height (Grob *me_grob, Real *offset, Real *dy)
           if (Grob *beam = Stem::get_beam (stems[side]))
             (void) beam->get_property ("quantized-positions");
           poss[side] = stems[side]->extent (stems[side], Y_AXIS)[get_grob_direction (stems[side])]
-                       + stems[side]->get_parent (Y_AXIS)->relative_coordinate (commony, Y_AXIS);
+                       + stems[side]->parent_relative (commony, Y_AXIS);
         }
 
       *dy = poss[RIGHT] - poss[LEFT];