{
SCM scm_arr = Grob_array::make_array ();
all_elements_ = unsmob_grob_array (scm_arr);
+ all_elements_->set_ordered (false);
set_object ("all-elements", scm_arr);
}
Grob *
-System::clone (int count) const
+System::clone (int index) const
{
- return new System (*this, count);
+ return new System (*this, index);
}
int
{
if (!all_elements_->empty ())
{
- Grob **ptr = &all_elements_->array_reference ().elem_ref (0);
+ Grob **ptr = &all_elements_->array_reference ()[0];
Grob **end = ptr + all_elements_->size ();
while (ptr < end)
{
}
static void
-fixup_refpoints (Link_array<Grob> const &grobs)
+fixup_refpoints (vector<Grob*> const &grobs)
{
for (vsize i = grobs.size (); i--;)
grobs[i]->fixup_refpoint ();
Kill no longer needed grobs.
*/
Item *it = dynamic_cast<Item *> (g);
- if (it && Item::is_breakable (it))
+ if (it && Item::is_non_musical (it))
{
it->find_prebroken_piece (LEFT)->suicide ();
it->find_prebroken_piece (RIGHT)->suicide ();
handle_broken_dependencies ();
-#if 0 /* FIXME: strange side effects. */
-
/* Because the this->get_property (all-elements) contains items in 3
versions, handle_broken_dependencies () will leave duplicated
items in all-elements. Strictly speaking this is harmless, but
- it leads to duplicated symbols in the output. ly_list_qsort_uniq_x ()
- makes sure that no duplicates are in the list. */
- for (int i = 0; i < line_count; i++)
+ it leads to duplicated symbols in the output. uniq makes sure
+ that no duplicates are in the list. */
+ for (vsize i = 0; i < broken_intos_.size (); i++)
{
- SCM all = broken_intos_[i]->get_object ("all-elements");
- all = ly_list_qsort_uniq_x (all);
+ System *child = dynamic_cast<System*> (broken_intos_[i]);
+ child->all_elements_->remove_duplicates ();
}
-#endif
if (be_verbose_global)
message (_f ("Element count %d.", count + element_count ()));
- int line_count = broken_intos_.size ();
- SCM lines = scm_c_make_vector (line_count, SCM_EOL);
-
- for (int i = 0; i < line_count; i++)
+ 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 ("[");
}
void
-System::break_into_pieces (std::vector<Column_x_positions> const &breaking)
+System::break_into_pieces (vector<Column_x_positions> const &breaking)
{
for (vsize i = 0; i < breaking.size (); i++)
{
- System *system = dynamic_cast<System *> (clone (i));
- system->rank_ = i;
+ System *system = dynamic_cast<System *> (clone (broken_intos_.size ()));
+ system->rank_ = broken_intos_.size ();
- Link_array<Grob> c (breaking[i].cols_);
+ vector<Grob*> c (breaking[i].cols_);
pscore_->typeset_system (system);
system->set_bound (LEFT, c[0]);
(void) g->get_property ("before-line-breaking");
}
- message (_ ("Calculating line breaks..."));
- progress_indication (" ");
-
for (vsize i = 0; i < all_elements_->size (); i++)
{
Grob *e = all_elements_->grob (i);
This might seem inefficient, but Stencils are cached per grob
anyway. */
- Link_array<Grob> all_elts_sorted (all_elements_->array ());
- all_elts_sorted.default_sort ();
- all_elts_sorted.uniq ();
+ vector<Grob*> all_elts_sorted (all_elements_->array ());
+ vector_sort (all_elts_sorted, default_compare);
+ uniq (all_elts_sorted);
this->get_stencil ();
for (vsize i = all_elts_sorted.size (); i--;)
{
}
}
+struct Layer_entry
+{
+ Grob *grob_;
+ int layer_;
+};
+
+bool
+operator< (Layer_entry const &a,
+ Layer_entry const &b)
+{
+ return a.layer_ < b.layer_;
+}
+
+
SCM
System::get_paper_system ()
{
- static int const LAYER_COUNT = 3;
-
SCM exprs = SCM_EOL;
SCM *tail = &exprs;
- /* Output stencils in three layers: 0, 1, 2. Default layer: 1. */
- for (int i = 0; i < LAYER_COUNT; i++)
- for (vsize j = all_elements_->size (); j--;)
- {
- Grob *g = all_elements_->grob (j);
- Stencil st = g->get_print_stencil ();
+ vector<Layer_entry> entries;
+ for (vsize j = 0; j < all_elements_->size (); j++)
+ {
+ Layer_entry e;
+ e.grob_ = all_elements_->grob (j);
+ e.layer_ = robust_scm2int (e.grob_->get_property ("layer"), 1);
+
+ entries.push_back (e);
+ }
- /* Skip empty stencils and grobs that are not in this layer. */
- if (st.expr() == SCM_EOL
- || robust_scm2int (g->get_property ("layer"), 1) != i)
- continue;
+ vector_sort (entries, default_compare);
+ for (vsize j = 0; j < entries.size (); j++)
+ {
+ Grob *g = entries[j].grob_;
+ Stencil st = g->get_print_stencil ();
- Offset o;
- for (int a = X_AXIS; a < NO_AXES; a++)
- o[Axis (a)] = g->relative_coordinate (this, Axis (a));
+ if (st.expr() == SCM_EOL)
+ continue;
+
+ Offset o;
+ for (int a = X_AXIS; a < NO_AXES; 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 extra = robust_scm2offset (g->get_property ("extra-offset"),
+ Offset (0, 0))
+ * Staff_symbol_referencer::staff_space (g);
- /* Must copy the stencil, for we cannot change the stencil
- cached in G. */
+ /* Must copy the stencil, for we cannot change the stencil
+ cached in G. */
- st.translate (o + extra);
+ st.translate (o + extra);
- *tail = scm_cons (st.expr (), SCM_EOL);
- tail = SCM_CDRLOC (*tail);
- }
+ *tail = scm_cons (st.expr (), SCM_EOL);
+ tail = SCM_CDRLOC (*tail);
+ }
if (Stencil *me = get_stencil ())
exprs = scm_cons (me->expr (), exprs);
SCM prop_init = left_bound->get_property ("line-break-system-details");
Prob *pl = make_paper_system (prop_init);
paper_system_set_stencil (pl, sys_stencil);
- pl->set_property ("penalty",
- left_bound->get_property ("page-penalty"));
+
+ /* backwards-compatibility hack for the old page-breaker */
+ SCM turn_perm = left_bound->get_property ("page-break-permission");
+ if (!scm_is_symbol (turn_perm))
+ pl->set_property ("penalty", scm_from_double (10001.0));
+ else if (turn_perm == ly_symbol2scm ("force"))
+ pl->set_property ("penalty", scm_from_double (-10001.0));
+ else
+ pl->set_property ("penalty", scm_from_double (0.0));
if (!scm_is_pair (pl->get_property ("refpoint-Y-extent")))
{
Interval staff_refpoints;
staff_refpoints.set_empty ();
extract_grob_set (this, "spaceable-staves", staves);
- for (vsize i = staves.size (); i--;)
+ for (vsize i = 0; i < staves.size (); i++)
{
Grob *g = staves[i];
staff_refpoints.add_point (g->relative_coordinate (this, Y_AXIS));
return pl->unprotect ();
}
-Link_array<Item>
+vector<Item*>
System::broken_col_range (Item const *left, Item const *right) const
{
- Link_array<Item> ret;
+ vector<Item*> ret;
left = left->get_column ();
right = right->get_column ();
&& cols[i] != right)
{
Paper_column *c = dynamic_cast<Paper_column *> (cols[i]);
- if (Item::is_breakable (c) && !c->system_)
+ if (Paper_column::is_breakable (c) && !c->system_)
ret.push_back (c);
i++;
}
/** Return all columns, but filter out any unused columns , since they might
disrupt the spacing problem. */
-Link_array<Grob>
+vector<Grob*>
System::columns () const
{
extract_grob_set (this, "columns", ro_columns);
while (last_breakable--)
{
- if (Item::is_breakable (ro_columns [last_breakable]))
+ if (Paper_column::is_breakable (ro_columns [last_breakable]))
break;
}
- Link_array<Grob> columns;
+ vector<Grob*> columns;
for (int i = 0; i <= last_breakable; i++)
{
if (Paper_column::is_used (ro_columns[i]))
/* properties */
"all-elements "
+ "columns "
"spaceable-staves "
- "columns"
)
projects / lilypond.git / blobdiff