(c) 1996, 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
+
#include "dimension-cache.hh"
#include "debug.hh"
#include "spanner.hh"
#include "paper-score.hh"
#include "molecule.hh"
#include "paper-outputter.hh"
+#include "paper-column.hh"
+#include "line-of-score.hh"
+#include "break-align-item.hh"
void
-Spanner::do_print() const
-{
-#ifndef NPRINT
- DOUT << "Between " << classname (spanned_drul_[LEFT])
- << " and " << classname (spanned_drul_[RIGHT]) << '\n';
-
- if (broken_b ())
- DOUT << "Broken in " << to_str (broken_into_l_arr_.size ()) << " pieces";
-#endif
-}
-
-void
-Spanner::break_into_pieces ()
+Spanner::do_break_processing()
{
- if (broken_b ())
- return;
-
+ //break_into_pieces
+
+ if (line_l () || broken_b ())
+ return;
+
Item * left = spanned_drul_[LEFT];
Item * right = spanned_drul_[RIGHT];
-
+
if (left == right)
{
- warning (_ ("left spanpoint is right spanpoint\n"));
+ warning (_ ("Left spanpoint is right spanpoint"));
return;
}
for (int i=1; i < break_points.size(); i++)
{
- Breaking_information info;
- info.bounds_[LEFT] = break_points[i-1];
- info.bounds_[RIGHT] = break_points[i];
+ Drul_array<Item*> bounds;
+ bounds[LEFT] = break_points[i-1];
+ bounds[RIGHT] = break_points[i];
Direction d = LEFT;
do
{
- Item *&pc_l = info.bounds_[d] ;
+ Item *&pc_l = bounds[d] ;
if (!pc_l->line_l())
- pc_l = pc_l->find_prebroken_piece(- d);
+ pc_l = pc_l->find_broken_piece(- d);
assert (pc_l);
- if (!info.line_l_)
- info.line_l_ = pc_l-> line_l ();
- else
- assert( info.line_l_ = pc_l->line_l ());
-
}
while ((flip(&d))!= LEFT);
Spanner *span_p = dynamic_cast<Spanner*>(clone ());
- span_p->set_bounds(LEFT,info.bounds_[LEFT]);
- span_p->set_bounds(RIGHT,info.bounds_[RIGHT]);
+ span_p->set_bounds(LEFT,bounds[LEFT]);
+ span_p->set_bounds(RIGHT,bounds[RIGHT]);
+
pscore_l_->typeset_element (span_p);
-
- info.broken_spanner_l_ = span_p;
- span_p->handle_broken_dependencies();
-
broken_into_l_arr_.push (span_p);
}
+
+ broken_into_l_arr_.sort (Spanner::compare);
}
void
Spanner::set_my_columns()
{
- Direction i = (Direction)1;
+ Direction i = (Direction) LEFT;
do
{
if (!spanned_drul_[i]->line_l())
- set_bounds(i,spanned_drul_[i]->find_prebroken_piece((Direction)-i));
+ set_bounds(i,spanned_drul_[i]->find_broken_piece((Direction) -i));
}
- while (flip(&i) != 1);
+ while (flip(&i) != LEFT);
}
void
i->used_b_ = true;
}
- if (d== LEFT)
+ /**
+ Prevent the column -> line_of_score -> column -> line_of_score -> etc situation
+ */
+ if (d== LEFT && !dynamic_cast<Line_of_score*> (this))
{
- set_parent ( i, X_AXIS);
+ set_parent (i, X_AXIS);
}
- if (spanned_drul_[Direction(-d)] == spanned_drul_[d]
+ if (spanned_drul_[Direction(-d)] == spanned_drul_[d]
&& i)
- warning (_f ("Spanner `%s\' with equal left and right spanpoints", classname (this)));
+ warning (_f ("Spanner `%s' has equal left and right spanpoints", classname (this)));
}
-void
-Spanner::do_break_processing()
-{
- if (!line_l())
- break_into_pieces ();
- else
- handle_broken_dependencies();
-}
Spanner::Spanner ()
{
}
-Interval
-Spanner::do_width() const
+Real
+Spanner::spanner_length() const
{
Real l = spanned_drul_[LEFT]->relative_coordinate (0, X_AXIS);
Real r = spanned_drul_[RIGHT]->relative_coordinate (0, X_AXIS);
if (r< l)
- warning ("Spanner with negative length");
-
- return Interval (0, r-l);
+ programming_error ("spanner with negative length");
+
+ return r-l;
}
Line_of_score *
{
if (!spanned_drul_[LEFT] || !spanned_drul_[RIGHT])
return 0;
- if (spanned_drul_[LEFT]->line_l() != spanned_drul_[RIGHT]->line_l())
+ if (spanned_drul_[LEFT]->line_l () != spanned_drul_[RIGHT]->line_l ())
return 0;
return spanned_drul_[LEFT]->line_l();
}
-Spanner*
+Score_element*
Spanner::find_broken_piece (Line_of_score*l) const
{
- for (int i=0; i < broken_into_l_arr_.size (); i++)
- {
- if (broken_into_l_arr_[i]->line_l () == l)
- return broken_into_l_arr_[i];
- }
+ int idx = binsearch_link_array (broken_into_l_arr_, (Spanner*)l, Spanner::compare);
+
+ if (idx < 0)
+ return 0;
+ else
+ return broken_into_l_arr_ [idx];
+}
+
- return 0;
+int
+Spanner::compare (Spanner * const &p1, Spanner * const &p2)
+{
+ return p1->line_l ()->rank_i_ - p2->line_l ()->rank_i_;
}
bool
}
/*
- UGH.
- */
-void
-Spanner::handle_broken_dependents ()
+ If this is a broken spanner, return the amount the left end is to be
+ shifted horizontally so that the spanner starts after the initial
+ clef and key on the staves. This is necessary for ties, slurs,
+ crescendo and decrescendo signs, for example.
+*/
+Real
+Spanner::get_broken_left_end_align () const
{
- Spanner *unbrok = dynamic_cast<Spanner*> (original_l_);
- if (!unbrok || parent_l(Y_AXIS))
- return;
-
- Spanner *refpoint = dynamic_cast<Spanner*> (unbrok->parent_l (Y_AXIS));
-
- if (refpoint)
+ Paper_column *sc = dynamic_cast<Paper_column*> (spanned_drul_[LEFT]->column_l());
+
+ // Relevant only if left span point is first column in line
+ if(sc != NULL &&
+ sc->break_status_dir () == RIGHT)
{
- Spanner * broken_refpoint = refpoint->find_broken_piece (line_l ());
- if (broken_refpoint)
- set_parent ( broken_refpoint,Y_AXIS);
- else
- programming_error ("Spanner y -refpoint lost.");
+ /*
+
+ We used to do a full search for the Break_align_item.
+ But that doesn't make a difference, since the Paper_column
+ is likely to contain only a Break_align_item.
+ */
+ return sc->extent (X_AXIS)[RIGHT];
}
+
+ return 0.0;
}
projects / lilypond.git / blobdiff