release: 1.3.93

[lilypond.git] / lily / volta-spanner.cc

diff --git a/lily/volta-spanner.cc b/lily/volta-spanner.cc
index 7e738429893b004adaa029ba74fc6f6d2933bcfe..34a4016c28ea8cba5bd1d379f3ed5f859b64f059 100644 (file)
--- a/lily/volta-spanner.cc
+++ b/lily/volta-spanner.cc
@@ -22,7 +22,6 @@
 void
 Volta_spanner::set_interface (Score_element*me)
 {
-  me->set_elt_property ("bars", SCM_EOL);
   Side_position::set_axis (me, Y_AXIS);
   Directional_element_interface::set (me, UP);
 }
@@ -64,12 +63,18 @@ Volta_spanner::brew_molecule (SCM smob)
     no_vertical_end = false;
 #endif
 
-  Real staff_space = me->paper_l ()->get_var ("interline");
+  Real staff_space = me->paper_l ()->get_var ("staffspace");
+  Real staff_thick = me->paper_l ()->get_var ("stafflinethickness");  
   Real half_space = staff_space / 2;
-  Real left = dynamic_cast<Spanner*>(me)->get_broken_left_end_align ();
+
+  /*
+    the volta spanner is attached to the bar-line, which is moved
+    to the right. We don't need to compensate for the left edge.
+   */
+  Real left = 0.0;
   Real w = dynamic_cast<Spanner*>(me)->spanner_length () - left - half_space;
-  Real h = me->paper_l()->get_var ("volta_spanner_height");
-  Real t = me->paper_l ()->get_var ("volta_thick");
+  Real h = staff_space * gh_scm2double (me->get_elt_property ("height"));
+  Real t = staff_thick * gh_scm2double (me->get_elt_property ("thickness"));
 
   /*
     ugh: should build from line segments.