source file of the GNU LilyPond music typesetter
- (c) 1996--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1996--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
-#include "spanner.hh"
-
-#include <math.h>
-
-#include "group-interface.hh"
+#include "pointer-group-interface.hh"
#include "libc-extension.hh"
#include "paper-column.hh"
#include "paper-column.hh"
if (!parent->spanned_rank_iv ().superset (this->spanned_rank_iv ()))
{
programming_error (to_string ("Spanner `%s' is not fully contained in parent spanner `%s'.",
- name ().to_str0 (),
- parent->name ().to_str0 ()));
+ name ().c_str (),
+ parent->name ().c_str ()));
}
}
}
assert (span->get_system ());
span->get_system ()->typeset_grob (span);
- broken_intos_.push (span);
+ broken_intos_.push_back (span);
}
}
while ((flip (&d)) != LEFT);
}
else
{
- Link_array<Item> break_points = pscore_->system_->broken_col_range (left, right);
+ System *root = get_root_system (this);
+ vector<Item*> break_points = root->broken_col_range (left, right);
- break_points.insert (left, 0);
- break_points.push (right);
+ break_points.insert (break_points.begin () + 0, left);
+ break_points.push_back (right);
- for (int i = 1; i < break_points.size (); i++)
+ for (vsize i = 1; i < break_points.size (); i++)
{
Drul_array<Item *> bounds;
bounds[LEFT] = break_points[i - 1];
else
{
bounds[LEFT]->get_system ()->typeset_grob (span);
- broken_intos_.push (span);
+ broken_intos_.push_back (span);
}
}
}
- broken_intos_.sort (Spanner::compare);
- for (int i = broken_intos_.size ();i--;)
+ vector_sort (broken_intos_, Spanner::less);
+ for (vsize i = broken_intos_.size (); i--;)
broken_intos_[i]->break_index_ = i;
}
-int
+vsize
Spanner::get_break_index () const
{
return break_index_;
Interval_t<int> iv (0, 0);
if (spanned_drul_[LEFT] && spanned_drul_[LEFT]->get_column ())
- iv[LEFT] = Paper_column::get_rank (spanned_drul_[LEFT]->get_column ());
+ iv[LEFT] = spanned_drul_[LEFT]->get_column ()->get_rank ();
if (spanned_drul_[RIGHT] && spanned_drul_[RIGHT]->get_column ())
- iv[RIGHT] = Paper_column::get_rank (spanned_drul_[RIGHT]->get_column ());
+ iv[RIGHT] = spanned_drul_[RIGHT]->get_column ()->get_rank ();
return iv;
}
Item *i = dynamic_cast<Item *> (s);
if (!i)
{
- programming_error ("Must have Item for spanner bound.");
+ programming_error ("must have Item for spanner bound");
return;
}
We check for System to prevent the column -> line_of_score
-> column -> line_of_score -> etc situation */
if (d == LEFT && !dynamic_cast<System *> (this))
- {
- set_parent (i, X_AXIS);
- }
+ set_parent (i, X_AXIS);
/*
Signal that this column needs to be kept alive. They need to be
*/
if (dynamic_cast<Paper_column *> (i))
- {
- Pointer_group_interface::add_grob (i, ly_symbol2scm ("bounded-by-me"), this);
- }
+ Pointer_group_interface::add_grob (i, ly_symbol2scm ("bounded-by-me"), this);
}
Spanner::Spanner (SCM s, Object_key const *key)
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, int count)
Grob *
Spanner::find_broken_piece (System *l) const
{
- int idx = binsearch_links (broken_intos_, (Spanner *)l, Spanner::compare);
+ vsize idx = binary_search (broken_intos_, (Spanner *)l, Spanner::less);
+ if (idx != VPOS)
+ return broken_intos_ [idx];
+ return 0;
+}
+
+Spanner *
+Spanner::broken_neighbor (Direction d) const
+{
+ if (!original_)
+ return 0;
- if (idx < 0)
+ vsize k = broken_spanner_index (this);
+ Spanner *orig = dynamic_cast<Spanner*> (original_);
+ int j = int (k) + d;
+ if (j < 0 || vsize (j) >= orig->broken_intos_.size ())
return 0;
- else
- return broken_intos_ [idx];
+
+ return orig->broken_intos_[j];
}
int
Spanner::compare (Spanner *const &p1, Spanner *const &p2)
{
- return p1->get_system ()->rank_ - p2->get_system ()->rank_;
+ return p1->get_system ()->get_rank () - p2->get_system ()->get_rank ();
+}
+
+bool
+Spanner::less (Spanner *const &a, Spanner *const &b)
+{
+ return a->get_system ()->get_rank () < b->get_system ()->get_rank ();
}
bool
return 0.0;
}
-SCM
-Spanner::do_derived_mark () const
+void
+Spanner::derived_mark () const
{
- /*
- We'd be fucked if this is called before spanned_drul_[] is inited. */
- if (status_ == ORPHAN)
- return SCM_EOL;
-
Direction d = LEFT;
do
if (spanned_drul_[d])
while (flip (&d) != LEFT)
;
- for (int i = broken_intos_.size (); i--;)
+ for (vsize i = broken_intos_.size (); i--;)
scm_gc_mark (broken_intos_[i]->self_scm ());
-
- return SCM_EOL;
}
/*
Spanner::set_spacing_rods (SCM smob)
{
Grob *me = unsmob_grob (smob);
+ SCM num_length = me->get_property ("minimum-length");
+ if (scm_is_number (num_length))
+ {
+ Rod r;
+ Spanner *sp = dynamic_cast<Spanner *> (me);
+
- Rod r;
- Spanner *sp = dynamic_cast<Spanner *> (me);
- r.item_drul_[LEFT] = sp->get_bound (LEFT);
- r.item_drul_[RIGHT] = sp->get_bound (RIGHT);
- r.distance_
- = robust_scm2double (me->get_property ("minimum-length"), 0);
+ System *root = get_root_system (me);
+ vector<Item*> cols (root->broken_col_range (sp->get_bound (LEFT)->get_column (),
+ sp->get_bound (RIGHT)->get_column ()));
- r.add_to_cols ();
+ if (cols.size ())
+ {
+ Rod r ;
+ r.item_drul_[LEFT] = sp->get_bound (LEFT);
+ r.item_drul_[RIGHT] = cols[0]->find_prebroken_piece (LEFT);
+ r.distance_ = robust_scm2double (num_length, 0);
+ r.add_to_cols ();
+
+ r.item_drul_[LEFT] = cols.back ()->find_prebroken_piece (RIGHT);
+ r.item_drul_[RIGHT] = sp->get_bound (RIGHT);
+ r.add_to_cols ();
+ }
+
+ r.distance_ = robust_scm2double (num_length, 0);
+ r.item_drul_[LEFT] = sp->get_bound (LEFT);
+ r.item_drul_[RIGHT] = sp->get_bound (RIGHT);
+ r.add_to_cols ();
+ }
+
return SCM_UNSPECIFIED;
}
/*
- Return I such that SP == SP->ORIGINAL_->BROKEN_INTOS_[I].
+ Return I such that SP == SP->ORIGINAL ()->BROKEN_INTOS_[I].
*/
int
-broken_spanner_index (Spanner *sp)
+broken_spanner_index (Spanner const *sp)
{
- Spanner *parent = dynamic_cast<Spanner *> (sp->original_);
- return parent->broken_intos_.find_index (sp);
+ Spanner *parent = dynamic_cast<Spanner *> (sp->original ());
+ /* ugh: casting */
+ return find (parent->broken_intos_, (Spanner*) sp) - parent->broken_intos_.begin ();
}
Spanner *
}
ADD_INTERFACE (Spanner,
- "spanner-interface",
"Some objects are horizontally spanned between objects. For\n"
"example, slur, beam, tie, etc. These grobs form a subtype called\n"
"@code{Spanner}. All spanners have two span-points (these must be\n"
"@code{Item} objects), one on the left and one on the right. The left bound is\n"
"also the X-reference point of the spanner.\n",
"minimum-length");
+
projects / lilypond.git / blobdiff