source file of the GNU LilyPond music typesetter
- (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1996--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
-#include "axis-group-interface.hh"
-#include "warn.hh"
#include "system.hh"
+
+#include "align-interface.hh"
+#include "all-font-metrics.hh"
+#include "axis-group-interface.hh"
+#include "grob-array.hh"
+#include "international.hh"
#include "main.hh"
+#include "output-def.hh"
#include "paper-column.hh"
-#include "paper-def.hh"
-#include "paper-outputter.hh"
#include "paper-score.hh"
-#include "string.hh"
-#include "warn.hh"
-#include "stencil.hh"
-#include "all-font-metrics.hh"
+#include "paper-system.hh"
+#include "pointer-group-interface.hh"
#include "spacing-interface.hh"
#include "staff-symbol-referencer.hh"
-#include "paper-book.hh"
-#include "paper-line.hh"
+#include "tweak-registration.hh"
+#include "warn.hh"
+#include "warn.hh"
-System::System (SCM s)
- : Spanner (s)
+System::System (System const &src, int count)
+ : Spanner (src, count)
{
+ all_elements_ = 0;
+ pscore_ = 0;
rank_ = 0;
+ init_elements ();
}
-int
-System::element_count () const
+System::System (SCM s, Object_key const *key)
+ : Spanner (s, key)
{
- return scm_ilength (get_property ("all-elements"));
+ all_elements_ = 0;
+ rank_ = 0;
+ init_elements ();
}
-int
-System::spanner_count () const
+void
+System::init_elements ()
{
- int k =0;
- for (SCM s = get_property ("all-elements");
- gh_pair_p (s); s = ly_cdr (s))
- {
- if (dynamic_cast<Spanner*> (unsmob_grob (gh_car (s))))
- k++;
- }
+ 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);
+}
- return k;
+Grob *
+System::clone (int index) const
+{
+ return new System (*this, index);
}
-
int
-scm_default_compare (const void * a, const void *b)
+System::element_count () const
{
- SCM pa = *(SCM *)a;
- SCM pb = *(SCM *)b;
-
- if (pa < pb)
- return -1;
- else if (pa > pb)
- return 1;
- else
- return 0;
+ return all_elements_->size ();
}
-/*
- modify L in place: sort it
-*/
-SCM
-uniquify_list (SCM l)
+int
+System::spanner_count () const
{
- int len = scm_ilength (l);
- SCM * arr = new SCM[len];
int k = 0;
- for (SCM s = l; SCM_NNULLP (s); s = SCM_CDR (s))
- arr[k++] = SCM_CAR (s);
-
- assert (k == len);
- qsort (arr, len, sizeof (SCM), &scm_default_compare);
+ for (vsize i = all_elements_->size (); i--;)
+ if (dynamic_cast<Spanner *> (all_elements_->grob (i)))
+ k++;
+ return k;
+}
- k = 0;
- SCM *tail = &l;
-
- for (int i = 0; i < len ; i++)
+void
+System::typeset_grob (Grob *elem)
+{
+ if (elem->layout_)
+ programming_error ("adding element twice");
+ else
{
- if (i && arr[i] == arr[i-1])
- continue;
-
- SCM_SETCAR (*tail, arr[i]);
- tail = SCM_CDRLOC(*tail);
+ elem->layout_ = pscore_->layout ();
+ all_elements_->add (elem);
+ elem->unprotect ();
}
-
- *tail = SCM_EOL;
- delete[] arr;
-
- return l;
}
void
-System::typeset_grob (Grob * elem)
+System::derived_mark () const
{
- if (elem->pscore_)
- programming_error ("Adding element twice.");
-
- elem->pscore_ = pscore_;
- Pointer_group_interface::add_grob (this, ly_symbol2scm ("all-elements"), elem);
- scm_gc_unprotect_object (elem->self_scm ());
+ if (!all_elements_->empty ())
+ {
+ Grob **ptr = &all_elements_->array_reference ()[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 ();
}
-// todo: use map.
static void
-fixup_refpoints (SCM s)
+fixup_refpoints (vector<Grob*> const &grobs)
{
- for (; gh_pair_p (s); s = ly_cdr (s))
- {
- Grob::fixup_refpoint (ly_car (s));
- }
+ for (vsize i = grobs.size (); i--;)
+ grobs[i]->fixup_refpoint ();
}
SCM
-System::get_lines ()
+System::get_paper_systems ()
{
- for (SCM s = get_property ("all-elements"); gh_pair_p (s); s = ly_cdr (s))
+ for (vsize i = 0; i < all_elements_->size (); i++)
{
- Grob *g = unsmob_grob (ly_car (s));
+ 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_breakable (it))
+ 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->live ())
+ else if (g->is_live ())
g->do_break_processing ();
}
fixups must be done in broken line_of_scores, because new elements
are put over there. */
int count = 0;
- for (int i=0; i < broken_intos_.size (); i++)
+ for (vsize i = 0; i < broken_intos_.size (); i++)
{
Grob *se = broken_intos_[i];
- SCM all = se->get_property ("all-elements");
- for (SCM s = all; gh_pair_p (s); s = ly_cdr (s))
- fixup_refpoint (ly_car (s));
- count += scm_ilength (all);
+
+ 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 ();
+ }
+
+ count += all_elts.size ();
}
-
+
/*
needed for doing items.
- */
- fixup_refpoints (get_property ("all-elements"));
+ */
+ fixup_refpoints (all_elements_->array ());
+
+ for (vsize i = 0; i < all_elements_->size (); i++)
+ all_elements_->grob (i)->handle_broken_dependencies ();
- for (SCM s = get_property ("all-elements"); gh_pair_p (s); s = ly_cdr (s))
- unsmob_grob (ly_car (s))->handle_broken_dependencies ();
handle_broken_dependencies ();
-#if 0 /* don't do this: 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. uniquify_list ()
- 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_property ("all-elements");
- all = uniquify_list (all);
+ System *child = dynamic_cast<System*> (broken_intos_[i]);
+ child->all_elements_->remove_duplicates ();
}
-#endif
-
- if (verbose_global_b)
- progress_indication (_f ("Element count %d.", count + element_count ()));
- int line_count = broken_intos_.size ();
- SCM lines = scm_c_make_vector (line_count, SCM_UNDEFINED);
-
- for (int i = 0; i < line_count; i++)
+ if (be_verbose_global)
+ message (_f ("Element count %d.", count + element_count ()));
+
+ SCM lines = scm_c_make_vector (broken_intos_.size (), SCM_EOL);
+ for (vsize i = 0; i < broken_intos_.size (); i++)
{
- if (verbose_global_b)
+ if (be_verbose_global)
progress_indication ("[");
- System *system = dynamic_cast<System*> (broken_intos_[i]);
+ System *system = dynamic_cast<System *> (broken_intos_[i]);
system->post_processing ();
- scm_vector_set_x (lines, scm_int2num (i), system->get_line ());
+ scm_vector_set_x (lines, scm_from_int (i),
+ system->get_paper_system ());
- if (verbose_global_b)
+ if (be_verbose_global)
progress_indication (to_string (i) + "]");
}
- return lines;
+ return lines;
}
-
-
-
-/*
- Find the loose columns in POSNS, and drape them around the columns
- specified in BETWEEN-COLS. */
void
-set_loose_columns (System* which, Column_x_positions const *posns)
+System::break_into_pieces (vector<Column_x_positions> const &breaking)
{
- for (int i = 0; i < posns->loose_cols_.size (); i++)
+ for (vsize i = 0; i < breaking.size (); i++)
{
- int divide_over = 1;
- Item *loose = dynamic_cast<Item*> (posns->loose_cols_[i]);
- Paper_column* col = dynamic_cast<Paper_column*> (loose);
-
- if (col->system_)
- continue;
-
- Item * left = 0;
- Item * right = 0;
- do
- {
- SCM between = loose->get_property ("between-cols");
- if (!gh_pair_p (between))
- break;
-
+ System *system = dynamic_cast<System *> (clone (broken_intos_.size ()));
+ system->rank_ = broken_intos_.size ();
- Item * l=dynamic_cast<Item*> (unsmob_grob (ly_car (between)));
- Item * r=dynamic_cast<Item*> (unsmob_grob (ly_cdr (between)));
+ vector<Grob*> c (breaking[i].cols_);
+ pscore_->typeset_system (system);
- if (!(l && r))
- break ;
-
- if (!left && l)
- {
- left = l->get_column ();
- if (!left->get_system ())
- left = left->find_prebroken_piece (RIGHT);
- }
-
- divide_over ++;
- loose = right = r->get_column ();
- }
- while (1);
-
- if (!right->get_system ())
- right = right->find_prebroken_piece (LEFT);
-
- /*
- We divide the remaining space of the column over the left and
- right side. At the moment, we
-
- */
- Grob * common = right->common_refpoint (left, X_AXIS);
-
- Real rx = right->extent (common, X_AXIS)[LEFT];
- Real lx = left->extent (common, X_AXIS)[RIGHT];
- Real total_dx = rx - lx;
- Interval cval =col->extent (col, X_AXIS);
-
- /*
-
- We put it in the middle. This is not an ideal solution -- the
- break alignment code inserts a fixed space before the clef
- (about 1 SS), while the space following the clef is
- flexible. In tight situations, the clef will almost be on top
- of the following note.
-
- */
- Real dx = rx-lx - cval.length ();
- if (total_dx < 2* cval.length ())
+ system->set_bound (LEFT, c[0]);
+ system->set_bound (RIGHT, c.back ());
+ for (vsize j = 0; j < c.size (); j++)
{
- /*
- todo: this is discontinuous. I'm too tired to
- invent a sliding mechanism. Duh.
-
- TODO.
- */
- dx *= 0.25;
+ c[j]->translate_axis (breaking[i].config_[j], X_AXIS);
+ dynamic_cast<Paper_column *> (c[j])->system_ = system;
}
- else
- dx *= 0.5;
-
- col->system_ = which;
- col->translate_axis (- col->relative_coordinate (common, X_AXIS), X_AXIS);
- col->translate_axis (lx + dx - cval[LEFT], X_AXIS);
+ set_loose_columns (system, &breaking[i]);
+ broken_intos_.push_back (system);
}
}
-// const?
void
-System::break_into_pieces (Array<Column_x_positions> const &breaking)
+System::add_column (Paper_column *p)
{
- for (int i=0; i < breaking.size (); i++)
+ Grob *me = this;
+ Grob_array *ga = unsmob_grob_array (me->get_object ("columns"));
+ if (!ga)
{
- System *system = dynamic_cast <System*> (clone ());
- system->rank_ = i;
+ SCM scm_ga = Grob_array::make_array ();
+ me->set_object ("columns", scm_ga);
+ ga = unsmob_grob_array (scm_ga);
+ }
- Link_array<Grob> c (breaking[i].cols_);
- pscore_->typeset_line (system);
-
- system->set_bound (LEFT,c[0]);
- system->set_bound (RIGHT,c.top ());
- for (int j=0; j < c.size (); j++)
+ p->rank_
+ = ga->size ()
+ ? Paper_column::get_rank (ga->array ().back ()) + 1
+ : 0;
+
+ ga->add (p);
+ Axis_group_interface::add_element (this, p);
+}
+
+void
+apply_tweaks (Grob *g, bool broken)
+{
+ if (bool (g->original ()) == broken)
+ {
+ SCM tweaks = global_registry_->get_tweaks (g);
+ for (SCM s = tweaks; scm_is_pair (s); s = scm_cdr (s))
{
- c[j]->translate_axis (breaking[i].config_[j],X_AXIS);
- dynamic_cast<Paper_column*> (c[j])->system_ = system;
+ SCM proc = scm_caar (s);
+ SCM rest = scm_cdar (s);
+ scm_apply_1 (proc, g->self_scm (), rest);
}
- set_loose_columns (system, &breaking[i]);
- broken_intos_.push (system);
}
}
void
-System::add_column (Paper_column*p)
+System::pre_processing ()
{
- Grob *me = this;
- SCM cs = me->get_property ("columns");
- Grob * prev = gh_pair_p (cs) ? unsmob_grob (ly_car (cs)) : 0;
-
- p->rank_ = prev ? Paper_column::get_rank (prev) + 1 : 0;
+ for (vsize i = 0; i < all_elements_->size (); i++)
+ all_elements_->grob (i)->discretionary_processing ();
- me->set_property ("columns", gh_cons (p->self_scm (), cs));
+ if (be_verbose_global)
+ message (_f ("Grob count %d", element_count ()));
- Axis_group_interface::add_element (me, p);
-}
+ /*
+ order is significant: broken grobs are added to the end of the
+ array, and should be processed before the original is potentially
+ killed.
+ */
+ for (vsize i = all_elements_->size (); i--;)
+ all_elements_->grob (i)->handle_prebroken_dependencies ();
-void
-System::pre_processing ()
-{
- for (SCM s = get_property ("all-elements"); gh_pair_p (s); s = ly_cdr (s))
- unsmob_grob (ly_car (s))->discretionary_processing ();
+ fixup_refpoints (all_elements_->array ());
- if (verbose_global_b)
- progress_indication (_f ("Grob count %d ", element_count ()));
+ for (vsize i = 0; i < all_elements_->size (); i++)
+ apply_tweaks (all_elements_->grob (i), false);
-
- for (SCM s = get_property ("all-elements"); gh_pair_p (s); s = ly_cdr (s))
- unsmob_grob (ly_car (s))->handle_prebroken_dependencies ();
-
- fixup_refpoints (get_property ("all-elements"));
-
- for (SCM s = get_property ("all-elements"); gh_pair_p (s); s = ly_cdr (s))
+ for (vsize i = 0; i < all_elements_->size (); i++)
{
- Grob* sc = unsmob_grob (ly_car (s));
- sc->calculate_dependencies (PRECALCED, PRECALCING, ly_symbol2scm ("before-line-breaking-callback"));
+ Grob *g = all_elements_->grob (i);
+ (void) g->get_property ("before-line-breaking");
}
-
- progress_indication ("\n" + _ ("Calculating line breaks...") + " ");
- for (SCM s = get_property ("all-elements"); gh_pair_p (s); s = ly_cdr (s))
+
+ for (vsize i = 0; i < all_elements_->size (); i++)
{
- Grob * e = unsmob_grob (ly_car (s));
- SCM proc = e->get_property ("spacing-procedure");
- if (gh_procedure_p (proc))
- gh_call1 (proc, e->self_scm ());
+ Grob *e = all_elements_->grob (i);
+ (void) e->get_property ("springs-and-rods");
}
}
void
System::post_processing ()
{
- for (SCM s = get_property ("all-elements"); gh_pair_p (s); s = ly_cdr (s))
+ for (vsize i = 0; i < all_elements_->size (); i++)
{
- Grob *g = unsmob_grob (ly_car (s));
- g->calculate_dependencies (POSTCALCED, POSTCALCING,
- ly_symbol2scm ("after-line-breaking-callback"));
+ Grob *g = all_elements_->grob (i);
+
+ apply_tweaks (g, true);
+ (void) g->get_property ("after-line-breaking");
}
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 = uniquify_list (all);
+ vector<Grob*> all_elts_sorted (all_elements_->array ());
+ vector_sort (all_elts_sorted, default_compare);
+ uniq (all_elts_sorted);
this->get_stencil ();
- for (SCM s = all; gh_pair_p (s); s = ly_cdr (s))
+ for (vsize i = all_elts_sorted.size (); i--;)
{
- Grob *g = unsmob_grob (ly_car (s));
+ Grob *g = all_elts_sorted[i];
g->get_stencil ();
}
}
-SCM
-System::get_line ()
-{
- static int const LAYER_COUNT = 3;
+struct Layer_entry
+{
+ Grob *grob_;
+ int layer_;
+};
- SCM stencils = SCM_EOL;
- if (Stencil *me = get_stencil ())
- stencils = scm_cons (me->smobbed_copy (), stencils);
+bool
+operator< (Layer_entry const &a,
+ Layer_entry const &b)
+{
+ return a.layer_ < b.layer_;
+}
- /* Output stencils in three layers: 0, 1, 2. The default layer is
- 1.
- Start with layer 3, since scm_cons prepends to list.
-
- */
- SCM all = get_property ("all-elements");
-
- for (int i = LAYER_COUNT; i--;)
- for (SCM s = all; gh_pair_p (s); s = ly_cdr (s))
- {
- Grob *g = unsmob_grob (ly_car (s));
- Stencil *stil = g->get_stencil ();
-
- /* Skip empty stencils and grobs that are not in this layer. */
- if (!stil
- || robust_scm2int (g->get_property ("layer"), 1) != i)
- continue;
-
- Offset o (g->relative_coordinate (this, X_AXIS),
- g->relative_coordinate (this, Y_AXIS));
-
- 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.
- */
- SCM my_stencil = stil->smobbed_copy ();
- unsmob_stencil (my_stencil)->translate (o + extra);
- stencils = scm_cons (my_stencil, stencils);
- }
-
- if (output_format_global != PAGE_LAYOUT)
+SCM
+System::get_paper_system ()
+{
+ SCM exprs = SCM_EOL;
+ SCM *tail = &exprs;
+
+ vector<Layer_entry> entries;
+ for (vsize j = 0; j < all_elements_->size (); j++)
{
- SCM lastcol = ly_car (get_property ("columns"));
- Grob *g = unsmob_grob (lastcol);
+ Layer_entry e;
+ e.grob_ = all_elements_->grob (j);
+ e.layer_ = robust_scm2int (e.grob_->get_property ("layer"), 1);
- SCM between = ly_symbol2scm ("between-system-string");
- SCM inter = g->internal_get_property (between);
- if (gh_string_p (inter))
- stencils = scm_cons (scm_cons (between, inter), stencils);
+ entries.push_back (e);
}
+ vector_sort (entries, default_compare);
+ for (vsize j = 0; j < entries.size (); j++)
+ {
+ Grob *g = entries[j].grob_;
+ Stencil st = g->get_print_stencil ();
+
+ 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);
+
+ /* Must copy the stencil, for we cannot change the stencil
+ cached in G. */
+
+ st.translate (o + extra);
+
+ *tail = scm_cons (st.expr (), SCM_EOL);
+ tail = SCM_CDRLOC (*tail);
+ }
+
+ if (Stencil *me = get_stencil ())
+ exprs = scm_cons (me->expr (), exprs);
+
Interval x (extent (this, X_AXIS));
Interval y (extent (this, Y_AXIS));
- Paper_line *pl = new Paper_line (Offset (x.length (), y.length ()),
- stencils);
- return pl->self_scm ();
+ Stencil sys_stencil (Box (x, y),
+ scm_cons (ly_symbol2scm ("combine-stencil"),
+ exprs));
+
+ Grob *left_bound = this->get_bound (LEFT);
+ 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);
+
+ /* 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 = 0; i < staves.size (); i++)
+ {
+ Grob *g = staves[i];
+ staff_refpoints.add_point (g->relative_coordinate (this, Y_AXIS));
+ }
+ pl->set_property ("refpoint-Y-extent", ly_interval2scm (staff_refpoints));
+ }
+
+ pl->set_property ("system-grob", this->self_scm ());
+
+ return pl->unprotect ();
}
-Link_array<Item>
-System::broken_col_range (Item const*l, Item const*r) const
+vector<Item*>
+System::broken_col_range (Item const *left, Item const *right) const
{
- Link_array<Item> ret;
+ vector<Item*> ret;
- l = l->get_column ();
- r = r->get_column ();
- SCM s = get_property ("columns");
+ left = left->get_column ();
+ right = right->get_column ();
- while (gh_pair_p (s) && ly_car (s) != r->self_scm ())
- s = ly_cdr (s);
+ extract_grob_set (this, "columns", cols);
+ vsize i = 0;
+ while (i < cols.size ()
+ && cols[i] != left)
+ i++;
- if (gh_pair_p (s))
- s = ly_cdr (s);
+ if (i < cols.size ())
+ i++;
- while (gh_pair_p (s) && ly_car (s) != l->self_scm ())
+ while (i < cols.size ()
+ && cols[i] != right)
{
- Paper_column*c = dynamic_cast<Paper_column*> (unsmob_grob (ly_car (s)));
- if (Item::is_breakable (c) && !c->system_)
- ret.push (c);
-
- s = ly_cdr (s);
+ Paper_column *c = dynamic_cast<Paper_column *> (cols[i]);
+ if (Paper_column::is_breakable (c) && !c->system_)
+ ret.push_back (c);
+ i++;
}
- ret.reverse ();
return ret;
}
-/**
- Return all columns, but filter out any unused columns , since they might
- disrupt the spacing problem.
- */
-Link_array<Grob>
-System::columns ()const
+/** Return all columns, but filter out any unused columns , since they might
+ disrupt the spacing problem. */
+vector<Grob*>
+System::columns () const
{
- Link_array<Grob> acs
- = Pointer_group_interface__extract_grobs (this, (Grob*) 0, "columns");
- bool bfound = false;
- for (int i= acs.size (); i -- ;)
+ extract_grob_set (this, "columns", ro_columns);
+
+ int last_breakable = ro_columns.size ();
+
+ while (last_breakable--)
{
- bool brb = Item::is_breakable (acs[i]);
- bfound = bfound || 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 (!bfound || !Paper_column::is_used (acs[i]))
- acs.del (i);
+ if (Paper_column::is_breakable (ro_columns [last_breakable]))
+ break;
}
- return acs;
+
+ 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]);
+ }
+
+ return columns;
+}
+
+Paper_score*
+System::paper_score () const
+{
+ return pscore_;
}
-ADD_INTERFACE (System,"system-interface",
+int
+System::get_rank () const
+{
+ return rank_;
+}
+
+System *
+get_root_system (Grob *me)
+{
+ Grob *system_grob = me;
+
+ while (system_grob->get_parent (Y_AXIS))
+ system_grob = system_grob->get_parent (Y_AXIS);
+
+ return dynamic_cast<System*> (system_grob);
+}
+
+
+
+ADD_INTERFACE (System, "system-interface",
"This is the toplevel object: each object in a score "
"ultimately has a System object as its X and Y parent. ",
- "between-system-string all-elements columns")
+
+ /* properties */
+ "all-elements "
+ "columns "
+ "spaceable-staves "
+ )
projects / lilypond.git / blobdiff