#include <libc-extension.hh>
-#include "debug.hh"
+#include "warn.hh"
#include "spanner.hh"
#include "paper-column.hh"
#include "paper-score.hh"
#include "molecule.hh"
#include "paper-outputter.hh"
#include "paper-column.hh"
-#include "line-of-score.hh"
-
+#include "system.hh"
#include "group-interface.hh"
void
{
if (!parent->spanned_rank_iv ().contains_b (this->spanned_rank_iv ()))
{
- programming_error (to_str ("Spanner `%s' is not fully contained in parent spanner `%s'.",
- name ().ch_C (),
- parent->name ().ch_C ()));
+ programming_error (to_string ("Spanner `%s' is not fully contained in parent spanner `%s'.",
+ name ().to_str0 (),
+ parent->name ().to_str0 ()));
}
}
}
- if (line_l () || broken_b ())
+ if (get_system () || broken_b ())
return;
if (left == right)
Item* bound = left->find_prebroken_piece (d);
if (!bound)
programming_error ("no broken bound");
- else if (bound->line_l ())
+ else if (bound->get_system ())
{
- Spanner * span_p = dynamic_cast<Spanner*> (clone ());
- span_p->set_bound (LEFT, bound);
- span_p->set_bound (RIGHT, bound);
+ Spanner * span = dynamic_cast<Spanner*> (clone ());
+ span->set_bound (LEFT, bound);
+ span->set_bound (RIGHT, bound);
- assert (span_p->line_l ());
- span_p->line_l ()->typeset_grob (span_p);
- broken_into_l_arr_.push (span_p);
+ assert (span->get_system ());
+ span->get_system ()->typeset_grob (span);
+ broken_intos_.push (span);
}
}
while ((flip (&d))!= LEFT);
}
else
{
- Link_array<Item> break_points = pscore_l_->line_l_->broken_col_range (left,right);
+ Link_array<Item> break_points = pscore_->system_->broken_col_range (left,right);
break_points.insert (left,0);
break_points.push (right);
Direction d = LEFT;
do
{
- if (!bounds[d]->line_l ())
+ if (!bounds[d]->get_system ())
bounds[d] = bounds[d]->find_prebroken_piece (- d);
}
while ((flip (&d))!= LEFT);
continue;
}
- Spanner *span_p = dynamic_cast<Spanner*> (clone ());
- span_p->set_bound (LEFT,bounds[LEFT]);
- span_p->set_bound (RIGHT,bounds[RIGHT]);
+ Spanner *span = dynamic_cast<Spanner*> (clone ());
+ span->set_bound (LEFT,bounds[LEFT]);
+ span->set_bound (RIGHT,bounds[RIGHT]);
- if (!bounds[LEFT]->line_l ()
+ if (!bounds[LEFT]->get_system ()
- || !bounds[RIGHT]->line_l ()
- || bounds[LEFT]->line_l () != bounds[RIGHT]->line_l ())
+ || !bounds[RIGHT]->get_system ()
+ || bounds[LEFT]->get_system () != bounds[RIGHT]->get_system ())
{
programming_error ("bounds of spanner are invalid");
- span_p->suicide ();
+ span->suicide ();
}
else
{
- bounds[LEFT]->line_l ()->typeset_grob (span_p);
- broken_into_l_arr_.push (span_p);
+ bounds[LEFT]->get_system ()->typeset_grob (span);
+ broken_intos_.push (span);
}
}
}
- broken_into_l_arr_.sort (Spanner::compare);
+ broken_intos_.sort (Spanner::compare);
+ for (int i= broken_intos_.size();i--;)
+ broken_intos_[i]->break_index_ = i;
}
void
Direction i = (Direction) LEFT;
do
{
- if (!spanned_drul_[i]->line_l ())
+ if (!spanned_drul_[i]->get_system ())
set_bound (i,spanned_drul_[i]->find_prebroken_piece ((Direction) -i));
}
while (flip (&i) != LEFT);
if (spanned_drul_[LEFT])
{
- iv[LEFT] = Paper_column::rank_i (spanned_drul_[LEFT]->column_l ());
+ iv[LEFT] = Paper_column::get_rank (spanned_drul_[LEFT]->get_column ());
}
if (spanned_drul_[RIGHT])
{
- iv[RIGHT] = Paper_column::rank_i (spanned_drul_[RIGHT]->column_l ());
+ iv[RIGHT] = Paper_column::get_rank (spanned_drul_[RIGHT]->get_column ());
}
return iv;
}
+
Item*
Spanner::get_bound (Direction d) const
{
Spanner::Spanner (SCM s)
: Grob (s)
{
+ break_index_ = 0;
spanned_drul_[LEFT]=0;
spanned_drul_[RIGHT]=0;
+ Group_interface::add_thing (this, ly_symbol2scm ("interfaces"), ly_symbol2scm ("spanner-interface"));
+
+
}
Spanner::Spanner (Spanner const &s)
}
System *
-Spanner::line_l () const
+Spanner::get_system () const
{
if (!spanned_drul_[LEFT] || !spanned_drul_[RIGHT])
return 0;
- if (spanned_drul_[LEFT]->line_l () != spanned_drul_[RIGHT]->line_l ())
+ if (spanned_drul_[LEFT]->get_system () != spanned_drul_[RIGHT]->get_system ())
return 0;
- return spanned_drul_[LEFT]->line_l ();
+ return spanned_drul_[LEFT]->get_system ();
}
Grob*
Spanner::find_broken_piece (System*l) const
{
- int idx = binsearch_link_array (broken_into_l_arr_, (Spanner*)l, Spanner::compare);
+ int idx = binsearch_links (broken_intos_, (Spanner*)l, Spanner::compare);
if (idx < 0)
return 0;
else
- return broken_into_l_arr_ [idx];
+ return broken_intos_ [idx];
}
int
Spanner::compare (Spanner * const &p1, Spanner * const &p2)
{
- return p1->line_l ()->rank_i_ - p2->line_l ()->rank_i_;
+ return p1->get_system ()->rank_ - p2->get_system ()->rank_;
}
bool
Spanner::broken_b () const
{
- return broken_into_l_arr_.size ();
+ return broken_intos_.size ();
}
Real
Spanner::get_broken_left_end_align () const
{
- Paper_column *sc = dynamic_cast<Paper_column*> (spanned_drul_[LEFT]->column_l ());
+ Paper_column *sc = dynamic_cast<Paper_column*> (spanned_drul_[LEFT]->get_column ());
// Relevant only if left span point is first column in line
if (sc != NULL &&
}
SCM
-Spanner::do_derived_mark ()
+Spanner::do_derived_mark () const
{
/*
We'd be fucked if this is called before spanned_drul_[] is inited. */
- if (status_c_ == ORPHAN)
+ if (status_ == ORPHAN)
return SCM_EOL;
Direction d = LEFT;
scm_gc_mark (spanned_drul_[d]->self_scm ());
while (flip (&d) != LEFT);
- for (int i= broken_into_l_arr_.size () ; i--;)
- scm_gc_mark (broken_into_l_arr_[i]->self_scm ());
+ for (int i= broken_intos_.size () ; i--;)
+ scm_gc_mark (broken_intos_[i]->self_scm ());
return SCM_EOL;
}
-void
-add_bound_item (Spanner* sp, Item*it)
-{
- if (!sp->get_bound (LEFT))
- sp->set_bound (LEFT, it);
- else
- sp->set_bound (RIGHT, it);
-}
/*
- Extends EXTREMAL_PAIR to include IT
- */
-static void
-extend_spanner_over_item (Item *it, SCM extremal_pair)
-{
- if (!it)
- return;
- Item * col = it->column_l ();
- Item * i1 = dynamic_cast<Item*> (unsmob_grob (ly_car (extremal_pair)));
- Item * i2 = dynamic_cast<Item*> (unsmob_grob (ly_cdr (extremal_pair)));
- int r = Paper_column::rank_i (col);
- if (!i1 || r < Paper_column::rank_i (i1->column_l ()))
- {
- gh_set_car_x (extremal_pair, it->self_scm ());
- }
- if (!i2 || r > Paper_column::rank_i (i2->column_l ()))
- {
- gh_set_cdr_x (extremal_pair, it->self_scm ());
- }
-}
+ Set left or right bound to IT.
-/*
- Extends EXTREMAL_PAIR to include every grob in VALUE
+ Warning: caller should ensure that subsequent calls put in ITems
+ that are left-to-right ordered.
*/
-static void
-extend_spanner_over_elements (SCM value, SCM extremal_pair)
-{
- if (gh_pair_p (value))
- {
- extend_spanner_over_elements (ly_car (value), extremal_pair);
- extend_spanner_over_elements (ly_cdr (value), extremal_pair);
- }
- else if (unsmob_grob (value))
- {
- if (Spanner * sp = dynamic_cast<Spanner*> (unsmob_grob (value)))
- {
- extend_spanner_over_item (sp->get_bound (LEFT), extremal_pair);
- extend_spanner_over_item (sp->get_bound (RIGHT), extremal_pair);
- }
- else if (Item * it= dynamic_cast<Item*> (unsmob_grob (value)))
- extend_spanner_over_item (it, extremal_pair);
- }
-}
-
-
-/*
- Make sure that the left and right bounds encompasses all objects it
- points to.
-
- TODO: maybe be more specific. Most probably fucks up if someone sets
- a pointer to the staff symbol in S
-*/
void
-extend_spanner_over_elements (Grob*s)
+add_bound_item (Spanner* sp, Grob*it)
{
- Spanner*sp = dynamic_cast<Spanner*> (s);
-
- SCM s1 = sp->get_bound (LEFT) ? sp->get_bound (LEFT)->self_scm () : SCM_EOL;
- SCM s2 = sp->get_bound (RIGHT) ? sp->get_bound (RIGHT)->self_scm () : SCM_EOL;
-
- SCM pair = gh_cons (s1,s2);
- extend_spanner_over_elements (sp->mutable_property_alist_, pair);
-
- Grob *p1 = unsmob_grob (ly_car (pair));
- Grob* p2 = unsmob_grob (ly_cdr (pair));
- sp->set_bound (LEFT,p1);
- sp->set_bound (RIGHT, p2);
+ if (!sp->get_bound (LEFT))
+ sp->set_bound (LEFT, it);
+ else
+ sp->set_bound (RIGHT, it);
}
Spanner*sp = dynamic_cast<Spanner*> (me);
r.item_l_drul_[LEFT] = sp->get_bound (LEFT);
r.item_l_drul_[RIGHT] = sp->get_bound (RIGHT);
- r.distance_f_ =
- gh_scm2double (me->get_grob_property ("minimum-length"))
- * 1.0;
+ r.distance_ =
+ gh_scm2double (me->get_grob_property ("minimum-length"));
r.add_to_cols ();
return SCM_UNSPECIFIED;
{
return dynamic_cast<Spanner*> (unsmob_grob (s));
}
+
+ADD_INTERFACE(Spanner,
+ "spanner-interface",
+ "
+Other grobs have a shape that depends on the horizontal spacing. For
+example, slur, beam, tie, etc. These grobs form a subtype called
+@code{Spanner}. All spanners have two span-points (these must be
+@code{Item}s), one on the left and one on the right. The left bound is
+also the X-reference point of the spanner.
+",
+ "minimum-length");
projects / lilypond.git / blobdiff