/*
- spanner.cc -- implement Spanner
+ This file is part of LilyPond, the GNU music typesetter.
- source file of the GNU LilyPond music typesetter
+ Copyright (C) 1996--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
- (c) 1996--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-*/
+ LilyPond is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
-#include "spanner.hh"
+ LilyPond is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
-#include <cmath>
-using namespace std;
+ You should have received a copy of the GNU General Public License
+ along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
+*/
-#include "pointer-group-interface.hh"
#include "libc-extension.hh"
-#include "paper-column.hh"
+#include "moment.hh"
#include "paper-column.hh"
#include "paper-score.hh"
+#include "pointer-group-interface.hh"
#include "stencil.hh"
#include "system.hh"
#include "warn.hh"
Grob *
-Spanner::clone (int count) const
+Spanner::clone () const
{
- return new Spanner (*this, count);
+ return new Spanner (*this);
}
void
if (!left || !right)
return;
- /*
- Check if our parent in X-direction spans equally wide
- or wider than we do.
- */
- for (int a = X_AXIS; a < NO_AXES; a++)
- {
- if (Spanner *parent = dynamic_cast<Spanner *> (get_parent ((Axis)a)))
- {
- 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 ()));
- }
- }
- }
if (get_system () || is_broken ())
return;
programming_error ("no broken bound");
else if (bound->get_system ())
{
- Spanner *span = dynamic_cast<Spanner *> (clone (broken_intos_.size ()));
+ Spanner *span = dynamic_cast<Spanner *> (clone ());
span->set_bound (LEFT, bound);
span->set_bound (RIGHT, bound);
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_->root_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++)
+ Slice parent_rank_slice;
+ parent_rank_slice.set_full ();
+
+ /*
+ Check if our parent in X-direction spans equally wide
+ or wider than we do.
+ */
+ for (int a = X_AXIS; a < NO_AXES; a++)
+ {
+ if (Spanner *parent = dynamic_cast<Spanner *> (get_parent ((Axis)a)))
+ parent_rank_slice.intersect (parent->spanned_rank_interval ());
+ }
+
+ for (vsize i = 1; i < break_points.size (); i++)
{
Drul_array<Item *> bounds;
bounds[LEFT] = break_points[i - 1];
continue;
}
- Spanner *span = dynamic_cast<Spanner *> (clone (broken_intos_.size ()));
+ bool ok = parent_rank_slice.contains (bounds[LEFT]->get_column ()->get_rank ());
+ ok = ok && parent_rank_slice.contains (bounds[RIGHT]->get_column ()->get_rank ());
+
+ if (!ok)
+ {
+ programming_error (to_string ("Spanner `%s' is not fully contained in parent spanner. Ignoring orphaned part",
+ name ().c_str ()));
+ continue;
+ }
+
+
+ Spanner *span = dynamic_cast<Spanner *> (clone ());
span->set_bound (LEFT, bounds[LEFT]);
span->set_bound (RIGHT, bounds[RIGHT]);
if (!bounds[LEFT]->get_system ()
-
|| !bounds[RIGHT]->get_system ()
|| bounds[LEFT]->get_system () != bounds[RIGHT]->get_system ())
{
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>
-Spanner::spanned_rank_iv ()
+Spanner::spanned_rank_interval () const
{
Interval_t<int> iv (0, 0);
return iv;
}
+Interval_t<Moment>
+Spanner::spanned_time () const
+{
+ return spanned_time_interval (spanned_drul_[LEFT],
+ spanned_drul_[RIGHT]);
+}
+
+
Item *
Spanner::get_bound (Direction d) const
{
- return spanned_drul_ [d];
+ return spanned_drul_[d];
}
/*
Item *i = dynamic_cast<Item *> (s);
if (!i)
{
- programming_error ("must have Item for spanner bound");
+ programming_error ("must have Item for spanner bound of " + name());
return;
}
[maybe we should try keeping all columns alive?, and perhaps
inherit position from their (non-)musical brother]
-
*/
if (dynamic_cast<Paper_column *> (i))
Pointer_group_interface::add_grob (i, ly_symbol2scm ("bounded-by-me"), this);
}
-Spanner::Spanner (SCM s, Object_key const *key)
- : Grob (s, key)
+Spanner::Spanner (SCM s)
+ : Grob (s)
{
break_index_ = 0;
- spanned_drul_[LEFT] = 0;
- spanned_drul_[RIGHT] = 0;
+ spanned_drul_.set (0, 0);
}
-Spanner::Spanner (Spanner const &s, int count)
- : Grob (s, count)
+Spanner::Spanner (Spanner const &s)
+ : Grob (s)
{
- spanned_drul_[LEFT] = spanned_drul_[RIGHT] = 0;
+ spanned_drul_.set (0, 0);
}
Real
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;
+}
- if (idx < 0)
+Spanner *
+Spanner::broken_neighbor (Direction d) const
+{
+ if (!original_)
return 0;
- else
- return broken_intos_ [idx];
+
+ 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;
+
+ return orig->broken_intos_[j];
}
int
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
Spanner::is_broken () const
{
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 ());
}
Spanner::set_spacing_rods (SCM smob)
{
Grob *me = unsmob_grob (smob);
-
- 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);
-
- r.add_to_cols ();
+ SCM num_length = me->get_property ("minimum-length");
+ if (scm_is_number (num_length))
+ {
+ Rod r;
+ Spanner *sp = dynamic_cast<Spanner *> (me);
+ System *root = get_root_system (me);
+ Drul_array<Item*> bounds (sp->get_bound (LEFT),
+ sp->get_bound (RIGHT));
+ if (!bounds[LEFT] || !bounds[RIGHT])
+ return SCM_UNSPECIFIED;
+
+ vector<Item*> cols (root->broken_col_range (bounds[LEFT]->get_column (),
+ bounds[RIGHT]->get_column ()));
+
+ 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 *
return dynamic_cast<Spanner *> (unsmob_grob (s));
}
+MAKE_SCHEME_CALLBACK (Spanner, bounds_width, 1);
+SCM
+Spanner::bounds_width (SCM grob)
+{
+ Spanner *me = unsmob_spanner (grob);
+
+ Grob *common = me->get_bound (LEFT)->common_refpoint (me->get_bound (RIGHT), X_AXIS);
+
+ Interval w (me->get_bound (LEFT)->relative_coordinate (common, X_AXIS),
+ me->get_bound (RIGHT)->relative_coordinate (common, X_AXIS));
+
+ w -= me->relative_coordinate (common, X_AXIS);
+
+ return ly_interval2scm (w);
+}
+
+MAKE_SCHEME_CALLBACK (Spanner, kill_zero_spanned_time, 1);
+SCM
+Spanner::kill_zero_spanned_time (SCM grob)
+{
+ Spanner *me = unsmob_spanner (grob);
+ Interval_t<Moment> moments = me->spanned_time ();
+ /*
+ Remove the line or hairpin at the start of the line. For
+ piano voice indicators, it makes no sense to have them at
+ the start of the line.
+
+ I'm not sure what the official rules for glissandi are, but
+ usually the 2nd note of the glissando is "exact", so when playing
+ from the start of the line, there is no need to glide.
+
+ From a typographical p.o.v. this makes sense, since the amount of
+ space left of a note at the start of a line is very small.
+
+ --hwn.
+
+ */
+ if (moments.length () == Moment (0, 0))
+ me->suicide ();
+
+ return SCM_UNSPECIFIED;
+}
+
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");
+ "Some objects are horizontally spanned between objects. For"
+ " example, slurs, beams, ties, etc. These grobs form a subtype"
+ " called @code{Spanner}. All spanners have two span points"
+ " (these must be @code{Item} objects), one on the left and one"
+ " on the right. The left bound is also the X@tie{}reference"
+ " point of the spanner.",
+
+ /* properties */
+ "minimum-length "
+ "to-barline "
+ );
+