release: 1.3.118

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

diff --git a/lily/volta-spanner.cc b/lily/volta-spanner.cc
index f3cc65b459df303fa4a2dbab1971cef3dfd3cb13..eeb1f83aa4ddbad0815bc81c189b1cde6c4663eb 100644 (file)
--- a/lily/volta-spanner.cc
+++ b/lily/volta-spanner.cc
@@ -9,67 +9,83 @@
 
 #include "box.hh"
 #include "debug.hh"
-#include "lookup.hh"
+#include "font-interface.hh"
 #include "molecule.hh"
-#include "note-column.hh"
 #include "paper-column.hh"
-#include "bar.hh"
 #include "paper-def.hh"
+#include "text-item.hh"
 #include "volta-spanner.hh"
-#include "stem.hh"
-#include "dimension-cache.hh"
 #include "group-interface.hh"
 #include "side-position-interface.hh"
 #include "directional-element-interface.hh"
 
-Volta_spanner::Volta_spanner ()
+
+void
+Volta_spanner::set_interface (Grob*)
 {
-  set_elt_property ("bars", SCM_EOL);
-  side_position (this).set_axis (Y_AXIS);
-  directional_element (this).set (UP);
 }
 
-
 /*
   this is too complicated. Yet another version of side-positioning,
   badly implemented.
 
   --
 
-  Should look for system_start_delim to find left edge of staff.
+  * Should look for system_start_delim to find left edge of staff.
+  
 */
-Molecule 
-Volta_spanner::do_brew_molecule () const
-{
-  Molecule  mol;
 
-  Link_array<Bar> bar_arr
-    = Group_interface__extract_elements (this, (Bar*)0, "bars");
+MAKE_SCHEME_CALLBACK(Volta_spanner,brew_molecule,1);
+SCM
+Volta_spanner::brew_molecule (SCM smob) 
+{
+  Grob *me = unsmob_grob (smob);
+  Link_array<Item> bar_arr
+    = Pointer_group_interface__extract_elements (me, (Item*)0, "bars");
 
   if (!bar_arr.size ())
-    return mol;
+    return SCM_EOL;
 
   bool no_vertical_start = false;
-  bool no_vertical_end = to_boolean (get_elt_property ("last-volta"));
-  Spanner *orig_span =  dynamic_cast<Spanner*> (original_l_);
-  if (orig_span && (orig_span->broken_into_l_arr_[0] != (Spanner*)this))
-    no_vertical_start = true;
-  if (orig_span && (orig_span->broken_into_l_arr_.top () != (Spanner*)this))
-    no_vertical_end = true;
-
-#if 0
-  // FIXME
-  if (bar_arr.top ()->get_elt_property (type_str_.length_i () > 1)
-    no_vertical_end = false;
-#endif
-
-  Real staff_space = paper_l ()->get_var ("interline");
-  Real half_space = staff_space / 2;
-
-  Real w = spanner_length () - get_broken_left_end_align () - half_space;
-  Real h = paper_l()->get_var ("volta_spanner_height");
-  Real t = paper_l ()->get_var ("volta_thick");
+  bool no_vertical_end = to_boolean (me->get_grob_property ("last-volta"));
+  Spanner *orig_span =  dynamic_cast<Spanner*> (me->original_l_);
 
+  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);
+
+  /*
+    not a start, but really broken in two
+   */
+  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_grob_property ("height"));
+  Real t =  staff_thick * gh_scm2double (me->get_grob_property ("thickness"));
+
+  /*
+    ugh: should build from line segments.
+   */
   SCM at = (gh_list (ly_symbol2scm ("volta"),
                     gh_double2scm (h),
                     gh_double2scm (w),
@@ -77,53 +93,30 @@ Volta_spanner::do_brew_molecule () const
                     gh_int2scm (no_vertical_start),
                     gh_int2scm (no_vertical_end),
                     SCM_UNDEFINED));
-  //Box b (Interval (0, w), Interval (- h/2, h/2));
+
   Box b (Interval (0, w), Interval (0, h));
-  Molecule volta (b, at);
-  mol.add_molecule (volta);
-  
-  Molecule num (lookup_l ()->text ("volta",
-                                  ly_scm2string (get_elt_property("text")),
-                                  paper_l ()));
+  Molecule mol (b, at);
+  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);
 
   mol.add_at_edge (X_AXIS, LEFT, num, - num.extent (X_AXIS).length ()
-                  - staff_space);
-  return mol;
+                  - 1.0);
+  mol.translate_axis (left, X_AXIS);
+  return mol.smobbed_copy ();
 }
-  
-void
-Volta_spanner::do_add_processing ()
-{
 
-  Link_array<Bar> bar_arr
-    = Group_interface__extract_elements (this, (Bar*)0, "bars");
-
-  if (bar_arr.size ())
-    {
-      set_bound (LEFT, bar_arr[0]);
-      set_bound (RIGHT, bar_arr.top ());  
-    }
-}
 
 void
-Volta_spanner::after_line_breaking ()
+Volta_spanner::add_bar  (Grob *me, Item* b)
 {
-  side_position (this).add_staff_support ();
-}
-  
-void
-Volta_spanner::add_bar  (Bar* b)
-{
-  Group_interface gi(this, "bars");
-  gi.add_element (b);
-
-  side_position (this).add_support (b);
-  add_dependency (b);
+  Pointer_group_interface::add_element(me, "bars",b);
+  Side_position::add_support (me,b);
+  add_bound_item (dynamic_cast<Spanner*>(me), b); 
 }
 
 void
-Volta_spanner::add_column (Note_column* c)
+Volta_spanner::add_column (Grob*me, Grob* c)
 {
-  side_position (this).add_support (c);
-  add_dependency (c);
+  Side_position::add_support (me,c);
 }