release: 1.3.118

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

diff --git a/lily/volta-spanner.cc b/lily/volta-spanner.cc
index 981d1e7629d19162c6fb89dbb7b0c697a6fd6a99..eeb1f83aa4ddbad0815bc81c189b1cde6c4663eb 100644 (file)
--- a/lily/volta-spanner.cc
+++ b/lily/volta-spanner.cc
@@ -21,7 +21,7 @@
 
 
 void
-Volta_spanner::set_interface (Score_element*)
+Volta_spanner::set_interface (Grob*)
 {
 }
 
@@ -39,7 +39,7 @@ MAKE_SCHEME_CALLBACK(Volta_spanner,brew_molecule,1);
 SCM
 Volta_spanner::brew_molecule (SCM smob) 
 {
-  Score_element *me = unsmob_element (smob);
+  Grob *me = unsmob_grob (smob);
   Link_array<Item> bar_arr
     = Pointer_group_interface__extract_elements (me, (Item*)0, "bars");
 
@@ -47,30 +47,41 @@ Volta_spanner::brew_molecule (SCM smob)
     return SCM_EOL;
 
   bool no_vertical_start = false;
-  bool no_vertical_end = to_boolean (me->get_elt_property ("last-volta"));
+  bool no_vertical_end = to_boolean (me->get_grob_property ("last-volta"));
   Spanner *orig_span =  dynamic_cast<Spanner*> (me->original_l_);
-  if (orig_span && (orig_span->broken_into_l_arr_[0] != (Spanner*)me))
-    no_vertical_start = true;
-  if (orig_span && (orig_span->broken_into_l_arr_.top () != (Spanner*)me))
-    no_vertical_end = true;
 
-#if 0
-  // FIXME
-  if (bar_arr.top ()->me->get_elt_property (type_str_.length_i () > 1)
-    no_vertical_end = false;
-#endif
+  bool first_bracket = orig_span && (orig_span->broken_into_l_arr_[0] == (Spanner*)me);
+  
+  bool last_bracket = orig_span && (orig_span->broken_into_l_arr_.top () == (Spanner*)me);
+
+  no_vertical_start = orig_span && !first_bracket;
+  no_vertical_end = orig_span && !last_bracket;
 
   Real staff_thick = me->paper_l ()->get_var ("stafflinethickness");  
   Real half_space = 0.5;
 
+  Item * bound = dynamic_cast<Spanner*>(me)->get_bound (LEFT);
+
   /*
-    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.
+    not a start, but really broken in two
    */
-  Real left = 0.0;
+  Real left =0.;  
+  if (bound->break_status_dir () == RIGHT)
+  {
+    Paper_column *pc = bound->column_l ();
+    left = pc->extent (pc, X_AXIS)[RIGHT]   - bound->relative_coordinate (pc, X_AXIS);
+  }
+  else
+  {
+    /*
+      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 w = dynamic_cast<Spanner*>(me)->spanner_length () - left - half_space;
-  Real h =  gh_scm2double (me->get_elt_property ("height"));
-  Real t =  staff_thick * gh_scm2double (me->get_elt_property ("thickness"));
+  Real h =  gh_scm2double (me->get_grob_property ("height"));
+  Real t =  staff_thick * gh_scm2double (me->get_grob_property ("thickness"));
 
   /*
     ugh: should build from line segments.
@@ -85,7 +96,7 @@ Volta_spanner::brew_molecule (SCM smob)
 
   Box b (Interval (0, w), Interval (0, h));
   Molecule mol (b, at);
-  SCM text = me->get_elt_property("text");
+  SCM text = me->get_grob_property("text");
   SCM properties = gh_list (me->mutable_property_alist_, me->immutable_property_alist_,SCM_UNDEFINED);
   Molecule num = Text_item::text2molecule (me, text, properties);
 
@@ -97,7 +108,7 @@ Volta_spanner::brew_molecule (SCM smob)
 
 
 void
-Volta_spanner::add_bar  (Score_element *me, Item* b)
+Volta_spanner::add_bar  (Grob *me, Item* b)
 {
   Pointer_group_interface::add_element(me, "bars",b);
   Side_position::add_support (me,b);
@@ -105,7 +116,7 @@ Volta_spanner::add_bar  (Score_element *me, Item* b)
 }
 
 void
-Volta_spanner::add_column (Score_element*me, Score_element* c)
+Volta_spanner::add_column (Grob*me, Grob* c)
 {
   Side_position::add_support (me,c);
 }