From: Benkő Pál Date: Sat, 1 Sep 2012 13:49:49 +0000 (+0200) Subject: default position for a time signature is unconditionally 0 X-Git-Tag: release/2.17.2-1~12 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2c00d625e88fb68342ac2fbaaffc6e8f9a182483;p=lilypond.git default position for a time signature is unconditionally 0 --- diff --git a/lily/time-signature.cc b/lily/time-signature.cc index 263817c708..f00c2563f6 100644 --- a/lily/time-signature.cc +++ b/lily/time-signature.cc @@ -23,10 +23,7 @@ #include "font-interface.hh" #include "international.hh" #include "output-def.hh" -#include "staff-symbol.hh" -#include "staff-symbol-referencer.hh" #include "text-interface.hh" -#include "warn.hh" /* TODO: @@ -58,36 +55,6 @@ Time_signature::print (SCM smob) else m = numbered_time_signature (me, n, d); - /* - position the signature centred on the staff line - nearest to the middle of the staff - */ - if (Grob *staff = Staff_symbol_referencer::get_staff_symbol (me)) - { - std::vector const linepos = Staff_symbol::line_positions (staff); - if (!linepos.empty ()) - { - Interval const span = Staff_symbol::line_span (staff); - Real const mid = span.center (); - Real pos = linepos.front (); - Real dist = fabs (pos - mid); - for (std::vector::const_iterator - i = linepos.begin (), e = linepos.end (); - ++i != e;) - { - double const d = fabs (*i - mid); - if (d < dist) - { - pos = *i; - dist = d; - } - } - - m.translate_axis - (pos * Staff_symbol_referencer::staff_space (me) / 2, Y_AXIS); - } - } - return m.smobbed_copy (); }