#include "debug.hh"
#include "lookup.hh"
#include "molecule.hh"
-#include "note-column.hh"
#include "paper-column.hh"
-#include "bar.hh"
#include "paper-def.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 (Score_element*me)
{
- set_elt_pointer ("bars", SCM_EOL);
- Side_position_interface (this).set_axis (Y_AXIS);
- directional_element (this).set (UP);
+ Side_position::set_axis (me, Y_AXIS);
+ Directional_element_interface::set (me, UP);
}
*/
-Molecule
-Volta_spanner::do_brew_molecule () const
-{
- Molecule mol;
- Link_array<Bar> bar_arr
- = Pointer_group_interface__extract_elements (this, (Bar*)0, "bars");
+MAKE_SCHEME_CALLBACK(Volta_spanner,brew_molecule);
+SCM
+Volta_spanner::brew_molecule (SCM smob)
+{
+ Score_element *me = unsmob_element (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))
+ bool no_vertical_end = to_boolean (me->get_elt_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_elt_property (type_str_.length_i () > 1)
no_vertical_end = false;
#endif
- Real staff_space = 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 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");
-
+ /*
+ 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 = 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.
+ */
SCM at = (gh_list (ly_symbol2scm ("volta"),
gh_double2scm (h),
gh_double2scm (w),
SCM_UNDEFINED));
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);
+ Molecule num (me->lookup_l ()->text ("volta",
+ ly_scm2string (me->get_elt_property("text")),
+ me->paper_l ()));
mol.add_at_edge (X_AXIS, LEFT, num, - num.extent (X_AXIS).length ()
- staff_space);
- return mol;
+ mol.translate_axis (left, X_AXIS);
+ return mol.create_scheme();
}
-
-void
-Volta_spanner::do_add_processing ()
-{
-
- Link_array<Bar> bar_arr
- = Pointer_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 ()
-{
- Side_position_interface (this).add_staff_support ();
-}
-
-void
-Volta_spanner::add_bar (Bar* b)
+Volta_spanner::add_bar (Score_element *me, Item* b)
{
- Pointer_group_interface gi(this, "bars");
+ Pointer_group_interface gi(me, "bars");
gi.add_element (b);
- Side_position_interface (this).add_support (b);
- add_dependency (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 (Score_element*me, Score_element* c)
{
- Side_position_interface (this).add_support (c);
- add_dependency (c);
+ Side_position::add_support (me,c);
}