X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsystem.cc;h=ddf5c613cd3e33cd58dc3aca97f6a3c083e68ed1;hb=1da74a6f525cdbb102ad93bfbcc36a620a5754ee;hp=2a88a4ae3c8968a2d532aa4cac33e2d908ddeeaf;hpb=6eced6a93bbfda6e6af37a7d77a8e75a5052dbee;p=lilypond.git diff --git a/lily/system.cc b/lily/system.cc index 2a88a4ae3c..ddf5c613cd 100644 --- a/lily/system.cc +++ b/lily/system.cc @@ -3,38 +3,51 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2005 Han-Wen Nienhuys + (c) 1996--2006 Han-Wen Nienhuys */ #include "system.hh" -#include - #include "align-interface.hh" +#include "all-font-metrics.hh" #include "axis-group-interface.hh" -#include "warn.hh" +#include "grob-array.hh" +#include "international.hh" #include "main.hh" -#include "paper-column.hh" #include "output-def.hh" +#include "paper-column.hh" #include "paper-score.hh" -#include "warn.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-system.hh" #include "tweak-registration.hh" +#include "warn.hh" +#include "warn.hh" System::System (System const &src, int count) : Spanner (src, count) { + all_elements_ = 0; + pscore_ = 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 * @@ -46,15 +59,15 @@ System::clone (int count) const 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 (unsmob_grob (scm_car (s)))) + for (vsize i = all_elements_->size (); i--;) + if (dynamic_cast (all_elements_->grob (i))) k++; return k; } @@ -62,32 +75,49 @@ System::spanner_count () const void System::typeset_grob (Grob *elem) { - if (elem->pscore_) + if (elem->layout_) programming_error ("adding element twice"); else { - elem->pscore_ = pscore_; - Pointer_group_interface::add_grob (this, ly_symbol2scm ("all-elements"), elem); - scm_gc_unprotect_object (elem->self_scm ()); + elem->layout_ = pscore_->layout (); + 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_->empty ()) { - Grob::fixup_refpoint (scm_car (s)); + 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 (); +} + +static void +fixup_refpoints (vector const &grobs) +{ + for (vsize 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 (vsize 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"))) { /* @@ -109,25 +139,31 @@ System::get_paper_systems () 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; 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 (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"); 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 @@ -136,7 +172,7 @@ System::get_paper_systems () 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 @@ -154,7 +190,8 @@ System::get_paper_systems () System *system = dynamic_cast (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) + "]"); @@ -163,25 +200,25 @@ System::get_paper_systems () } void -System::break_into_pieces (Array const &breaking) +System::break_into_pieces (vector const &breaking) { - for (int i = 0; i < breaking.size (); i++) + for (vsize i = 0; i < breaking.size (); i++) { System *system = dynamic_cast (clone (i)); system->rank_ = i; - Link_array c (breaking[i].cols_); + vector c (breaking[i].cols_); pscore_->typeset_system (system); system->set_bound (LEFT, c[0]); - system->set_bound (RIGHT, c.top ()); - for (int j = 0; j < c.size (); j++) + system->set_bound (RIGHT, c.back ()); + for (vsize j = 0; j < c.size (); j++) { c[j]->translate_axis (breaking[i].config_[j], X_AXIS); dynamic_cast (c[j])->system_ = system; } set_loose_columns (system, &breaking[i]); - broken_intos_.push (system); + broken_intos_.push_back (system); } } @@ -189,20 +226,27 @@ void 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 ().back ()) + 1 + : 0; - Axis_group_interface::add_element (me, p); + ga->add (p); + Axis_group_interface::add_element (this, p); } void apply_tweaks (Grob *g, bool broken) { - if (bool (g->original_) == 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)) @@ -217,66 +261,69 @@ apply_tweaks (Grob *g, bool broken) 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 (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 ())); - 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 (vsize 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 (vsize 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)) + for (vsize i = 0; i < all_elements_->size (); i++) { - Grob *sc = unsmob_grob (scm_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"); } message (_ ("Calculating line breaks...")); progress_indication (" "); - for (SCM s = get_property ("all-elements"); scm_is_pair (s); s = scm_cdr (s)) + + for (vsize i = 0; i < all_elements_->size (); i++) { - Grob *e = unsmob_grob (scm_car (s)); - SCM proc = e->get_property ("spacing-procedure"); - if (ly_is_procedure (proc)) - scm_call_1 (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"); scm_is_pair (s); s = scm_cdr (s)) + for (vsize 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")); + (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 = ly_list_qsort_uniq_x (all); + vector all_elts_sorted (all_elements_->array ()); + vector_sort (all_elts_sorted, default_compare); + uniq (all_elts_sorted); this->get_stencil (); - for (SCM s = all; scm_is_pair (s); s = scm_cdr (s)) + for (vsize i = all_elts_sorted.size (); i--;) { - Grob *g = unsmob_grob (scm_car (s)); + Grob *g = all_elts_sorted[i]; g->get_stencil (); } } @@ -290,21 +337,20 @@ System::get_paper_system () 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 (vsize j = all_elements_->size (); j--;) { - Grob *g = unsmob_grob (scm_car (s)); - Stencil *stil = g->get_stencil (); + Grob *g = all_elements_->grob (j); + Stencil st = g->get_print_stencil (); /* Skip empty stencils and grobs that are not in this layer. */ - if (!stil + if (st.expr() == SCM_EOL || robust_scm2int (g->get_property ("layer"), 1) != i) continue; - Offset o (g->relative_coordinate (this, X_AXIS), - g->relative_coordinate (this, Y_AXIS)); + 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)) @@ -313,7 +359,6 @@ System::get_paper_system () /* Must copy the stencil, for we cannot change the stencil cached in G. */ - Stencil st = *stil; st.translate (o + extra); *tail = scm_cons (st.expr (), SCM_EOL); @@ -329,78 +374,116 @@ System::get_paper_system () scm_cons (ly_symbol2scm ("combine-stencil"), exprs)); - Interval staff_refpoints; - staff_refpoints.set_empty (); - for (SCM s = get_property ("spaceable-staves"); - scm_is_pair (s); s = scm_cdr (s)) + 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); + pl->set_property ("penalty", + left_bound->get_property ("page-penalty")); + + if (!scm_is_pair (pl->get_property ("refpoint-Y-extent"))) { - Grob *g = unsmob_grob (scm_car (s)); - staff_refpoints.add_point (g->relative_coordinate (this, Y_AXIS)); + Interval staff_refpoints; + staff_refpoints.set_empty (); + extract_grob_set (this, "spaceable-staves", staves); + for (vsize 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)); } - 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); + pl->set_property ("system-grob", this->self_scm ()); - return scm_gc_unprotect_object (pl->self_scm ()); + return pl->unprotect (); } -Link_array +vector System::broken_col_range (Item const *left, Item const *right) const { - Link_array ret; + vector ret; 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); + vsize 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 (unsmob_grob (scm_car (s))); + Paper_column *c = dynamic_cast (cols[i]); if (Item::is_breakable (c) && !c->system_) - ret.push (c); - - s = scm_cdr (s); + 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 +vector System::columns () const { - Link_array 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; + } + + vector 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_back (ro_columns[i]); } - return acs; + + return columns; +} + +Paper_score* +System::paper_score () const +{ + return pscore_; } +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_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. ", - "all-elements spaceable-staves columns") + + /* properties */ + "all-elements " + "spaceable-staves " + "columns" + )