From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Wed, 15 Feb 2006 14:57:21 +0000 (+0000)
Subject: (side_position): reach stem via dots->
X-Git-Tag: release/2.7.35~26
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=665588d4d4da774799f8402e482b0f2266c01791;p=lilypond.git

(side_position): reach stem via dots->
head->stem. Inspect all stems for dot collisions.
---

diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc
index 0288939987..1248b9cd6b 100644
--- a/lily/tuplet-bracket.cc
+++ b/lily/tuplet-bracket.cc
@@ -128,7 +128,7 @@ Tuplet_bracket::calc_connect_to_neighbors (SCM smob)
       
       Spanner *orig_spanner = dynamic_cast<Spanner*> (me->original ());
 
-      int neighbor_idx = me->get_break_index () - break_dir;
+      vsize neighbor_idx = me->get_break_index () - break_dir;
       if (break_dir
 	  && d == RIGHT
 	  && neighbor_idx < orig_spanner->broken_intos_.size ())
@@ -141,8 +141,7 @@ Tuplet_bracket::calc_connect_to_neighbors (SCM smob)
 
       connect_to_other[d]
 	= (break_dir
-	   && (neighbor_idx < orig_spanner->broken_intos_.size ()
-	       && neighbor_idx >= 0)
+	   && neighbor_idx < orig_spanner->broken_intos_.size ()
 	   && orig_spanner->broken_intos_[neighbor_idx]->is_live ());
     }
   while (flip (&d) != LEFT);
@@ -648,8 +647,13 @@ Tuplet_bracket::calc_positions (SCM smob)
       /*
 	duh. magic.
       */
+      Real ss = Staff_symbol_referencer::staff_space (me);
+      
       offset = lp + dir * (0.5 + scm_to_double (me->get_property ("padding")));
-      dy = rp - lp;
+      dy = (rp - lp);
+
+      dy *= ss;
+      offset *= ss;	
     }