Grob **ptr = &all_elements_->array_reference ()[0];
Grob **end = ptr + all_elements_->size ();
while (ptr < end)
- {
- scm_gc_mark ((*ptr)->self_scm ());
- ptr++;
- }
+ {
+ scm_gc_mark ((*ptr)->self_scm ());
+ ptr++;
+ }
}
if (pscore_)
{
Grob *g = all_elements_->grob (i);
if (g->internal_has_interface (ly_symbol2scm ("only-prebreak-interface")))
- {
- /*
- Kill no longer needed grobs.
- */
- Item *it = dynamic_cast<Item *> (g);
- if (it && Item::is_non_musical (it))
- {
- it->find_prebroken_piece (LEFT)->suicide ();
- it->find_prebroken_piece (RIGHT)->suicide ();
- }
- g->suicide ();
- }
+ {
+ /*
+ Kill no longer needed grobs.
+ */
+ Item *it = dynamic_cast<Item *> (g);
+ if (it && Item::is_non_musical (it))
+ {
+ it->find_prebroken_piece (LEFT)->suicide ();
+ it->find_prebroken_piece (RIGHT)->suicide ();
+ }
+ g->suicide ();
+ }
else if (g->is_live ())
- g->do_break_processing ();
+ g->do_break_processing ();
}
/*
extract_grob_set (se, "all-elements", all_elts);
for (vsize j = 0; j < all_elts.size (); j++)
- {
- Grob *g = all_elts[j];
- g->fixup_refpoint ();
- }
-
+ {
+ Grob *g = all_elts[j];
+ g->fixup_refpoint ();
+ }
+
count += all_elts.size ();
}
System *child = dynamic_cast<System *> (broken_intos_[i]);
child->all_elements_->remove_duplicates ();
for (vsize j = 0; j < child->all_elements_->size (); j++)
- {
- Grob *g = child->all_elements_->grob (j);
+ {
+ Grob *g = child->all_elements_->grob (j);
- (void) g->get_property ("after-line-breaking");
- }
+ (void) g->get_property ("after-line-breaking");
+ }
}
- if (be_verbose_global)
- message (_f ("Element count %d", count + element_count ()) + "\n");
+ debug_output (_f ("Element count %d", count + element_count ()) + "\n");
}
SCM
SCM lines = scm_c_make_vector (broken_intos_.size (), SCM_EOL);
for (vsize i = 0; i < broken_intos_.size (); i++)
{
- if (be_verbose_global)
- progress_indication ("[");
+ debug_output ("[", false);
System *system = dynamic_cast<System *> (broken_intos_[i]);
scm_vector_set_x (lines, scm_from_int (i),
- system->get_paper_system ());
+ system->get_paper_system ());
- if (be_verbose_global)
- progress_indication (to_string (i) + "]");
+ debug_output (to_string (i) + "]", false);
}
return lines;
}
bool end_of_line_visible = true;
if (Spanner *s = dynamic_cast<Spanner *>(footnote_grobs_[i]))
{
- Real spanner_placement = robust_scm2double (s->get_property ("spanner-placement"), -1.0);
- if (spanner_placement < -1.0)
- spanner_placement = -1.0;
- if (spanner_placement > 1.0)
- spanner_placement = 1.0;
-
- spanner_placement = (spanner_placement + 1.0) / 2.0;
- int rpos = s->spanned_rank_interval ()[RIGHT];
- pos = (int)((rpos - pos) * spanner_placement + pos + 0.5);
+ Direction spanner_placement = robust_scm2dir (s->get_property ("spanner-placement"), LEFT);
+ if (spanner_placement == CENTER)
+ spanner_placement = LEFT;
+
+ pos = s->spanned_rank_interval ()[spanner_placement];
}
-
+
if (Item *item = dynamic_cast<Item *>(footnote_grobs_[i]))
{
if (!Item::break_visible (item))
end_of_line_visible = (LEFT == item->break_status_dir ());
}
- if (pos < (int)start)
+ if (pos < int (start))
continue;
- if (pos > (int)end)
+ if (pos > int (end))
break;
- if (pos == (int)end && !end_of_line_visible)
+ if (pos == int (start) && end_of_line_visible)
+ continue;
+ if (pos == int (end) && !end_of_line_visible)
continue;
if (!footnote_grobs_[i]->is_live ())
continue;
return out;
}
-Stencil
-System::make_footnote_stencil (Real padding)
+vsize
+System::num_footnotes ()
{
- Stencil mol;
-
- for (vsize i = 0; i < footnote_grobs_.size (); i++)
- {
- SCM footnote_markup = footnote_grobs_[i]->get_property ("footnote-text");
- if (Spanner *orig = dynamic_cast<Spanner *>(footnote_grobs_[i]))
- if (orig->is_broken ())
- footnote_markup = orig->broken_intos_[0]->get_property ("footnote-text");
-
- if (!Text_interface::is_markup (footnote_markup))
- continue;
-
- SCM props = scm_call_1 (ly_lily_module_constant ("layout-extract-page-properties"),
- pscore_->layout ()->self_scm ());
-
- SCM footnote_stl = Text_interface::interpret_markup (pscore_->layout ()->self_scm (),
- props, footnote_markup);
-
- mol.add_at_edge (Y_AXIS, DOWN, *unsmob_stencil (footnote_stl), padding);
- }
+ return footnote_grobs_.size ();
+}
- return mol;
+vector<Grob *>*
+System::footnote_grobs ()
+{
+ return &footnote_grobs_;
}
void
system->set_bound (RIGHT, c.back ());
SCM system_labels = SCM_EOL;
for (vsize j = 0; j < c.size (); j++)
- {
- c[j]->translate_axis (breaking[i].config_[j], X_AXIS);
- dynamic_cast<Paper_column *> (c[j])->set_system (system);
- /* collect the column labels */
- collect_labels (c[j], &system_labels);
- }
+ {
+ c[j]->translate_axis (breaking[i].config_[j], X_AXIS);
+
dynamic_cast<Paper_column *> (c[j])->set_system (system);
+ /* collect the column labels */
+ collect_labels (c[j], &system_labels);
+ }
/*
- Collect labels from any loose columns too: theses will be set on
- an empty bar line or a column which is otherwise unused mid-line
+ Collect labels from any loose columns too: theses will be set on
+ an empty bar line or a column which is otherwise unused mid-line
*/
vector<Grob *> loose (breaking[i].loose_cols_);
for (vsize j = 0; j < loose.size (); j++)
- collect_labels (loose[j], &system_labels);
+ collect_labels (loose[j], &system_labels);
system->set_property ("labels", system_labels);
for (vsize i = 0; i < all_elements_->size (); i++)
all_elements_->grob (i)->discretionary_processing ();
- if (be_verbose_global)
- message (_f ("Grob count %d", element_count ()));
+ debug_output (_f ("Grob count %d", element_count ()));
/*
order is significant: broken grobs are added to the end of the
};
bool
-operator< (Layer_entry const &a,
- Layer_entry const &b)
+operator < (Layer_entry const &a,
+ Layer_entry const &b)
{
return a.layer_ < b.layer_;
}
Stencil st = g->get_print_stencil ();
if (st.expr () == SCM_EOL)
- continue;
+ continue;
Offset o;
for (int a = X_AXIS; a < NO_AXES; a++)
- o[Axis (a)] = g->relative_coordinate (this, Axis (a));
+ o[Axis (a)] = g->relative_coordinate (this, Axis (a));
Offset extra = robust_scm2offset (g->get_property ("extra-offset"),
- Offset (0, 0))
- * Staff_symbol_referencer::staff_space (g);
+ Offset (0, 0))
+ * Staff_symbol_referencer::staff_space (g);
/* Must copy the stencil, for we cannot change the stencil
- cached in G. */
+ cached in G. */
st.translate (o + extra);
Interval x (extent (this, X_AXIS));
Interval y (extent (this, Y_AXIS));
Stencil sys_stencil (Box (x, y),
- scm_cons (ly_symbol2scm ("combine-stencil"),
- exprs));
+ scm_cons (ly_symbol2scm ("combine-stencil"),
+ exprs));
if (debug_skylines)
{
Skyline_pair *skylines = Skyline_pair::unsmob (get_property ("vertical-skylines"));
if (skylines)
- {
- Stencil up
- = Lookup::points_to_line_stencil (0.1, (*skylines)[UP].to_points (X_AXIS));
- Stencil down
- = Lookup::points_to_line_stencil (0.1, (*skylines)[DOWN].to_points (X_AXIS));
- sys_stencil.add_stencil (up.in_color (255, 0, 0));
- sys_stencil.add_stencil (down.in_color (0, 255, 0));
- }
+ {
+ Stencil up
+ = Lookup::points_to_line_stencil (0.1, (*skylines)[UP].to_points (X_AXIS));
+ Stencil down
+ = Lookup::points_to_line_stencil (0.1, (*skylines)[DOWN].to_points (X_AXIS));
+ sys_stencil.add_stencil (up.in_color (255, 0, 0));
+ sys_stencil.add_stencil (down.in_color (0, 255, 0));
+ }
}
Grob *left_bound = this->get_bound (LEFT);
{
extract_grob_set (align, "elements", staves);
for (vsize i = 0; i < staves.size (); i++)
- if (staves[i]->is_live ()
- && Page_layout_problem::is_spaceable (staves[i]))
- staff_refpoints.add_point (staves[i]->relative_coordinate (this,
- Y_AXIS));
+ if (staves[i]->is_live ()
+ && Page_layout_problem::is_spaceable (staves[i]))
+ staff_refpoints.add_point (staves[i]->relative_coordinate (this,
+ Y_AXIS));
}
pl->set_property ("staff-refpoint-extent", ly_interval2scm (staff_refpoints));
i++;
while (i < cols.size ()
- && Paper_column::get_rank (cols[i]) < end_rank)
+ && Paper_column::get_rank (cols[i]) < end_rank)
{
Paper_column *c = dynamic_cast<Paper_column *> (cols[i]);
if (Paper_column::is_breakable (c) && !c->get_system ())
- ret.push_back (c);
+ ret.push_back (c);
i++;
}
while (last_breakable--)
{
if (Paper_column::is_breakable (ro_columns [last_breakable]))
- break;
+ break;
}
vector<Grob *> columns;
for (int i = 0; i <= last_breakable; i++)
{
if (Paper_column::is_used (ro_columns[i]))
- columns.push_back (ro_columns[i]);
+ columns.push_back (ro_columns[i]);
}
return columns;
for (vsize i = 0; i < elts.size (); i++)
if (Align_interface::has_interface (elts[i]))
{
- if (ret)
- programming_error ("found multiple vertical alignments in this system");
- ret = elts[i];
+ if (ret)
+ programming_error ("found multiple vertical alignments in this system");
+ ret = elts[i];
}
if (!ret)
for (vsize i = start; i != end; i += dir)
{
if (Hara_kiri_group_spanner::has_interface (elts[i]))
- Hara_kiri_group_spanner::consider_suicide (elts[i]);
+ Hara_kiri_group_spanner::consider_suicide (elts[i]);
Interval intersection = elts[i]->extent (this, X_AXIS);
intersection.intersect (iv);
if (elts[i]->is_live () && !intersection.is_empty ())
- return elts[i];
+ return elts[i];
}
return 0;
}
for (vsize i = 0; i < offsets.size (); ++i)
if (Page_layout_problem::is_spaceable (staves[i]))
{
- ret[UP] = offsets[i];
- break;
+ ret[UP] = offsets[i];
+ break;
}
for (vsize i = offsets.size (); i--;)
if (Page_layout_problem::is_spaceable (staves[i]))
{
- ret[DOWN] = offsets[i];
- break;
+ ret[DOWN] = offsets[i];
+ break;
}
return ret;
for (vsize i = 0; i < staves.size (); ++i)
{
Interval iv = begin
- ? Axis_group_interface::begin_of_line_pure_height (staves[i], start)
- : Axis_group_interface::rest_of_line_pure_height (staves[i], start, end);
+ ? Axis_group_interface::begin_of_line_pure_height (staves[i], start)
+ : Axis_group_interface::rest_of_line_pure_height (staves[i], start, end);
if (i < offsets.size ())
- iv.translate (offsets[i]);
+ iv.translate (offsets[i]);
ret.unite (iv);
}
Interval other_elements = begin
- ? Axis_group_interface::begin_of_line_pure_height (this, start)
- : Axis_group_interface::rest_of_line_pure_height (this, start, end);
+ ? Axis_group_interface::begin_of_line_pure_height (this, start)
+ : Axis_group_interface::rest_of_line_pure_height (this, start, end);
ret.unite (other_elements);
for (vsize i = 0; i < elts.size (); ++i)
{
if (!Axis_group_interface::has_interface (elts[i]))
- {
- if (to_boolean (scm_apply_1 (pure_relevant_p, elts[i]->self_scm (), SCM_EOL)))
- relevant_grobs.push_back (elts[i]);
-
- if (Item *it = dynamic_cast<Item*> (elts[i]))
- {
- Direction d = LEFT;
- do
- {
- Item *piece = it->find_prebroken_piece (d);
- if (piece && to_boolean (scm_apply_1 (pure_relevant_p, piece->self_scm (), SCM_EOL)))
- relevant_grobs.push_back (piece);
- }
- while (flip (&d) != LEFT);
- }
- }
+ {
+ if (to_boolean (scm_apply_1 (pure_relevant_p, elts[i]->self_scm (), SCM_EOL)))
+ relevant_grobs.push_back (elts[i]);
+
+ if (Item *it = dynamic_cast<Item *> (elts[i]))
+ {
+ Direction d = LEFT;
+ do
+ {
+ Item *piece = it->find_prebroken_piece (d);
+ if (piece && to_boolean (scm_apply_1 (pure_relevant_p, piece->self_scm (), SCM_EOL)))
+ relevant_grobs.push_back (piece);
+ }
+ while (flip (&d) != LEFT);
+ }
+ }
}
SCM grobs_scm = Grob_array::make_array ();
return ly_interval2scm (begin);
}
-Grob*
+Grob *
System::get_pure_bound (Direction d, int start, int end)
{
vector<vsize> ranks = pscore_->get_break_ranks ();
vector<vsize> indices = pscore_->get_break_indices ();
- vector<Grob*> cols = pscore_->get_columns ();
+ vector<Grob *> cols = pscore_->get_columns ();
vsize target_rank = (d == LEFT ? start : end);
- vector<vsize>::const_iterator i =
- lower_bound (ranks.begin (), ranks.end (), target_rank, std::less<vsize> ());
+ vector<vsize>::const_iterator i
+ = lower_bound (ranks.begin (), ranks.end (), target_rank, std::less<vsize> ());
if (i != ranks.end () && (*i) == target_rank)
return cols[indices[i - ranks.begin ()]];
return 0;
}
-Grob*
+Grob *
System::get_maybe_pure_bound (Direction d, bool pure, int start, int end)
{
return pure ? get_pure_bound (d, start, end) : get_bound (d);
}
ADD_INTERFACE (System,
- "This is the top-level object: Each object in a score"
- " ultimately has a @code{System} object as its X and"
- " Y@tie{}parent.",
-
- /* properties */
- "all-elements "
- "columns "
- "labels "
- "pure-Y-extent "
- "skyline-horizontal-padding "
- );
+ "This is the top-level object: Each object in a score"
+ " ultimately has a @code{System} object as its X and"
+ " Y@tie{}parent.",
+
+ /* properties */
+ "all-elements "
+ "columns "
+ "labels "
+ "pure-Y-extent "
+ "skyline-horizontal-padding "
+ );
projects / lilypond.git / blobdiff