release: 1.3.110

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

diff --git a/lily/volta-spanner.cc b/lily/volta-spanner.cc
index 6e99afdb84463b06c135632dd5557904b9110326..3046205792b03c30032affb687206d779f40e467 100644 (file)
--- a/lily/volta-spanner.cc
+++ b/lily/volta-spanner.cc
@@ -9,28 +9,22 @@
 
 #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 (SCM s)
-  : Spanner (s)
+
+void
+Volta_spanner::set_interface (Grob*)
 {
-  set_elt_pointer ("bars", SCM_EOL);
-  Side_position_interface (this).set_axis (Y_AXIS);
-  Directional_element_interface (this).set (UP);
 }
 
-
 /*
   this is too complicated. Yet another version of side-positioning,
   badly implemented.
@@ -39,41 +33,48 @@ Volta_spanner::Volta_spanner (SCM s)
 
   * Should look for system_start_delim to find left edge of staff.
   
-  
 */
 
-GLUE_SCORE_ELEMENT(Volta_spanner,brew_molecule);
+MAKE_SCHEME_CALLBACK(Volta_spanner,brew_molecule,1);
 SCM
-Volta_spanner::member_brew_molecule () const
+Volta_spanner::brew_molecule (SCM smob) 
 {
-  
-  Link_array<Bar> bar_arr
-    = Pointer_group_interface__extract_elements (this, (Bar*)0, "bars");
+  Grob *me = unsmob_grob (smob);
+  Link_array<Item> bar_arr
+    = Pointer_group_interface__extract_elements (me, (Item*)0, "bars");
 
   if (!bar_arr.size ())
     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))
+  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*)this))
+  if (orig_span && (orig_span->broken_into_l_arr_.top () != (Spanner*)me))
     no_vertical_end = true;
 
 #if 0
   // FIXME
-  if (bar_arr.top ()->get_elt_property (type_str_.length_i () > 1)
+  if (bar_arr.top ()->me->get_grob_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 left = get_broken_left_end_align ();
-  Real w = spanner_length () - left - half_space;
-  Real h = paper_l()->get_var ("volta_spanner_height");
-  Real t = paper_l ()->get_var ("volta_thick");
-
+  Real staff_thick = me->paper_l ()->get_var ("stafflinethickness");  
+  Real half_space = 0.5;
+
+  /*
+    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 =  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),
@@ -83,41 +84,28 @@ Volta_spanner::member_brew_molecule () const
                     SCM_UNDEFINED));
 
   Box b (Interval (0, w), Interval (0, h));
-  Molecule  mol (b, at);
-  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);
+                  - 1.0);
   mol.translate_axis (left, X_AXIS);
-  return mol.create_scheme();
+  return mol.smobbed_copy ();
 }
 
 
-GLUE_SCORE_ELEMENT(Volta_spanner,after_line_breaking);
-SCM
-Volta_spanner::member_after_line_breaking ()
-{
-  Side_position_interface (this).add_staff_support ();
-  return SCM_UNDEFINED;
-}
-  
 void
-Volta_spanner::add_bar  (Bar* b)
+Volta_spanner::add_bar  (Grob *me, Item* b)
 {
-  Pointer_group_interface gi(this, "bars");
-  gi.add_element (b);
-
-  Side_position_interface (this).add_support (b);
-  add_dependency (b);
-
-  add_bound_item (this, 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_interface (this).add_support (c);
-  add_dependency (c);
+  Side_position::add_support (me,c);
 }