#include "system.hh"
-#include <math.h>
#include "align-interface.hh"
#include "axis-group-interface.hh"
#include "paper-book.hh"
#include "paper-system.hh"
#include "tweak-registration.hh"
+#include "grob-array.hh"
+#include "pointer-group-interface.hh"
System::System (System const &src, int count)
: Spanner (src, count)
{
+ all_elements_ = 0;
rank_ = 0;
+ init_elements ();
}
System::System (SCM s, Object_key const *key)
: Spanner (s, key)
{
+ all_elements_ = 0;
rank_ = 0;
+ init_elements ();
+}
+
+void
+System::init_elements ()
+{
+ SCM scm_arr = Grob_array::make_array ();
+ all_elements_ = unsmob_grob_array (scm_arr);
+ set_object ("all-elements", scm_arr);
}
Grob *
int
System::element_count () const
{
- return scm_ilength (get_property ("all-elements"));
+ return all_elements_->size ();
}
int
System::spanner_count () const
{
int k = 0;
- for (SCM s = get_property ("all-elements"); scm_is_pair (s); s = scm_cdr (s))
- if (dynamic_cast<Spanner *> (unsmob_grob (scm_car (s))))
+ for (int i = all_elements_->size (); i--;)
+ if (dynamic_cast<Spanner *> (all_elements_->grob (i)))
k++;
return k;
}
else
{
elem->pscore_ = pscore_;
- Pointer_group_interface::add_grob (this, ly_symbol2scm ("all-elements"), elem);
- scm_gc_unprotect_object (elem->self_scm ());
+ all_elements_->add (elem);
+ elem->unprotect ();
}
}
-// todo: use map.
-static void
-fixup_refpoints (SCM s)
+void
+System::derived_mark () const
{
- for (; scm_is_pair (s); s = scm_cdr (s))
+ if (!all_elements_->is_empty ())
{
- Grob::fixup_refpoint (scm_car (s));
+ Grob **ptr = &all_elements_->array_reference ().elem_ref (0);
+ Grob **end = ptr + all_elements_->size ();
+ while (ptr < end)
+ {
+ scm_gc_mark ((*ptr)->self_scm ());
+ ptr++;
+ }
}
+
+ if (pscore_)
+ scm_gc_mark (pscore_->self_scm ());
+
+ Spanner::derived_mark ();
+}
+
+static void
+fixup_refpoints (Link_array<Grob> const &grobs)
+{
+ for (int i = grobs.size (); i--;)
+ grobs[i]->fixup_refpoint ();
}
SCM
System::get_paper_systems ()
{
- for (SCM s = get_property ("all-elements"); scm_is_pair (s); s = scm_cdr (s))
+ for (int i = 0; i < all_elements_->size (); i++)
{
- Grob *g = unsmob_grob (scm_car (s));
+ Grob *g = all_elements_->grob (i);
if (g->internal_has_interface (ly_symbol2scm ("only-prebreak-interface")))
{
/*
for (int i = 0; i < broken_intos_.size (); i++)
{
Grob *se = broken_intos_[i];
- SCM all = se->get_property ("all-elements");
- for (SCM s = all; scm_is_pair (s); s = scm_cdr (s))
- fixup_refpoint (scm_car (s));
- count += scm_ilength (all);
+
+ extract_grob_set (se, "all-elements", all_elts);
+ for (int j = 0; j < all_elts.size (); j++)
+ {
+ Grob *g = all_elts[j];
+ g->fixup_refpoint ();
+ }
+
+ count += all_elts.size ();
}
/*
needed for doing items.
*/
- fixup_refpoints (get_property ("all-elements"));
+ fixup_refpoints (all_elements_->array ());
+
+ for (int i = 0; i < all_elements_->size (); i++)
+ all_elements_->grob (i)->handle_broken_dependencies ();
- for (SCM s = get_property ("all-elements"); scm_is_pair (s); s = scm_cdr (s))
- unsmob_grob (scm_car (s))->handle_broken_dependencies ();
handle_broken_dependencies ();
-#if 0 /* don't do this: strange side effects. */
+#if 0 /* FIXME: strange side effects. */
/* Because the this->get_property (all-elements) contains items in 3
versions, handle_broken_dependencies () will leave duplicated
makes sure that no duplicates are in the list. */
for (int i = 0; i < line_count; i++)
{
- SCM all = broken_intos_[i]->get_property ("all-elements");
+ SCM all = broken_intos_[i]->get_object ("all-elements");
all = ly_list_qsort_uniq_x (all);
}
#endif
System *system = dynamic_cast<System *> (broken_intos_[i]);
system->post_processing ();
- scm_vector_set_x (lines, scm_int2num (i), system->get_paper_system ());
+ scm_vector_set_x (lines, scm_from_int (i), system->get_paper_system ());
if (be_verbose_global)
progress_indication (to_string (i) + "]");
System::add_column (Paper_column *p)
{
Grob *me = this;
- SCM cs = me->get_property ("columns");
- Grob *prev = scm_is_pair (cs) ? unsmob_grob (scm_car (cs)) : 0;
-
- p->rank_ = prev ? Paper_column::get_rank (prev) + 1 : 0;
+ Grob_array *ga = unsmob_grob_array (me->get_object ("columns"));
+ if (!ga)
+ {
+ SCM scm_ga = Grob_array::make_array ();
+ me->set_object ("columns", scm_ga);
+ ga = unsmob_grob_array (scm_ga);
+ }
- me->set_property ("columns", scm_cons (p->self_scm (), cs));
+ p->rank_
+ = ga->size ()
+ ? Paper_column::get_rank (ga->array ().top ()) + 1
+ : 0;
- Axis_group_interface::add_element (me, p);
+ ga->add (p);
+ Axis_group_interface::add_element (this, p);
}
void
void
System::pre_processing ()
{
- for (SCM s = get_property ("all-elements"); scm_is_pair (s); s = scm_cdr (s))
- unsmob_grob (scm_car (s))->discretionary_processing ();
+ for (int i = 0; i < all_elements_->size (); i++)
+ all_elements_->grob (i)->discretionary_processing ();
if (be_verbose_global)
message (_f ("Grob count %d", element_count ()));
- for (SCM s = get_property ("all-elements"); scm_is_pair (s); s = scm_cdr (s))
- unsmob_grob (scm_car (s))->handle_prebroken_dependencies ();
+ /*
+ order is significant: broken grobs are added to the end of the
+ array, and should be processed before the original is potentially
+ killed.
+ */
+ for (int i = all_elements_->size (); i--;)
+ all_elements_->grob (i)->handle_prebroken_dependencies ();
- fixup_refpoints (get_property ("all-elements"));
+ fixup_refpoints (all_elements_->array ());
- for (SCM s = get_property ("all-elements"); scm_is_pair (s); s = scm_cdr (s))
- apply_tweaks (unsmob_grob (scm_car (s)), false);
+ for (int i = 0; i < all_elements_->size (); i++)
+ apply_tweaks (all_elements_->grob (i), false);
- for (SCM s = get_property ("all-elements"); scm_is_pair (s); s = scm_cdr (s))
- {
- Grob *sc = unsmob_grob (scm_car (s));
- sc->calculate_dependencies (PRECALCED, PRECALCING, ly_symbol2scm ("before-line-breaking-callback"));
- }
+ for (int i = 0; i < all_elements_->size (); i++)
+ all_elements_->grob (i)->calculate_dependencies (PRECALCED, PRECALCING,
+ ly_symbol2scm ("before-line-breaking-callback"));
message (_ ("Calculating line breaks..."));
progress_indication (" ");
- for (SCM s = get_property ("all-elements"); scm_is_pair (s); s = scm_cdr (s))
+
+ for (int i = 0; i < all_elements_->size (); i++)
{
- Grob *e = unsmob_grob (scm_car (s));
+ Grob *e = all_elements_->grob (i);
SCM proc = e->get_property ("spacing-procedure");
if (ly_is_procedure (proc))
scm_call_1 (proc, e->self_scm ());
void
System::post_processing ()
{
- for (SCM s = get_property ("all-elements"); scm_is_pair (s); s = scm_cdr (s))
+ for (int i = 0; i < all_elements_->size (); i++)
{
- Grob *g = unsmob_grob (scm_car (s));
+ Grob *g = all_elements_->grob (i);
apply_tweaks (g, true);
-
g->calculate_dependencies (POSTCALCED, POSTCALCING,
ly_symbol2scm ("after-line-breaking-callback"));
}
Interval iv (extent (this, Y_AXIS));
if (iv.is_empty ())
- programming_error ("system with zero extent");
+ programming_error ("system with empty extent");
else
translate_axis (-iv[MAX], Y_AXIS);
/* Generate all stencils to trigger font loads.
This might seem inefficient, but Stencils are cached per grob
anyway. */
- SCM all = get_property ("all-elements");
- all = ly_list_qsort_uniq_x (all);
+ Link_array<Grob> all_elts_sorted (all_elements_->array ());
+ all_elts_sorted.default_sort ();
+ all_elts_sorted.uniq ();
this->get_stencil ();
- for (SCM s = all; scm_is_pair (s); s = scm_cdr (s))
+ for (int i = all_elts_sorted.size (); i--;)
{
- Grob *g = unsmob_grob (scm_car (s));
+ Grob *g = all_elts_sorted[i];
g->get_stencil ();
}
}
SCM *tail = &exprs;
/* Output stencils in three layers: 0, 1, 2. Default layer: 1. */
- SCM all = get_property ("all-elements");
-
for (int i = 0; i < LAYER_COUNT; i++)
- for (SCM s = all; scm_is_pair (s); s = scm_cdr (s))
+ for (int j = all_elements_->size (); j--;)
{
- Grob *g = unsmob_grob (scm_car (s));
+ Grob *g = all_elements_->grob (j);
Stencil *stil = g->get_stencil ();
/* Skip empty stencils and grobs that are not in this layer. */
Interval staff_refpoints;
staff_refpoints.set_empty ();
- for (SCM s = get_property ("spaceable-staves");
- scm_is_pair (s); s = scm_cdr (s))
+ extract_grob_set (this, "spaceable-staves", staves);
+ for (int i = staves.size (); i--;)
{
- Grob *g = unsmob_grob (scm_car (s));
+ Grob *g = staves[i];
staff_refpoints.add_point (g->relative_coordinate (this, Y_AXIS));
}
Paper_system *pl = new Paper_system (sys_stencil, false);
pl->staff_refpoints_ = staff_refpoints;
- Item *break_point = this->get_bound (LEFT);
- pl->break_before_penalty_
- = robust_scm2double (break_point->get_property ("page-penalty"), 0.0);
-
- return scm_gc_unprotect_object (pl->self_scm ());
+ pl->read_left_bound (this->get_bound (LEFT));
+
+ return pl->unprotect ();
}
Link_array<Item>
left = left->get_column ();
right = right->get_column ();
- SCM s = get_property ("columns");
- while (scm_is_pair (s) && scm_car (s) != right->self_scm ())
- s = scm_cdr (s);
+ extract_grob_set (this, "columns", cols);
+ int i = 0;
+ while (i < cols.size ()
+ && cols[i] != left)
+ i++;
- if (scm_is_pair (s))
- s = scm_cdr (s);
+ if (i < cols.size ())
+ i++;
- while (scm_is_pair (s) && scm_car (s) != left->self_scm ())
+ while (i < cols.size ()
+ && cols[i] != right)
{
- Paper_column *c = dynamic_cast<Paper_column *> (unsmob_grob (scm_car (s)));
+ Paper_column *c = dynamic_cast<Paper_column *> (cols[i]);
if (Item::is_breakable (c) && !c->system_)
ret.push (c);
-
- s = scm_cdr (s);
+ i++;
}
- ret.reverse ();
return ret;
}
Link_array<Grob>
System::columns () const
{
- Link_array<Grob> acs
- = extract_grob_array (this, ly_symbol2scm ("columns"));
- bool found = false;
- for (int i = acs.size (); i--;)
+ extract_grob_set (this, "columns", ro_columns);
+
+ int last_breakable = ro_columns.size ();
+
+ while (last_breakable--)
+ {
+ if (Item::is_breakable (ro_columns [last_breakable]))
+ break;
+ }
+
+ Link_array<Grob> columns;
+ for (int i = 0; i <= last_breakable; i++)
{
- bool brb = Item::is_breakable (acs[i]);
- found = found || brb;
-
- /*
- the last column should be breakable. Weed out any columns that
- seem empty. We need to retain breakable columns, in case
- someone forced a breakpoint.
- */
- if (!found || !Paper_column::is_used (acs[i]))
- acs.del (i);
+ if (Paper_column::is_used (ro_columns[i]))
+ columns.push (ro_columns[i]);
}
- return acs;
+
+ return columns;
}
+int
+System::get_rank () const
+{
+ return rank_;
+}
ADD_INTERFACE (System, "system-interface",
"This is the toplevel object: each object in a score "
projects / lilypond.git / blobdiff