X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsystem.cc;h=07c705ffe6ba4dfb13f80531b532af5be32a5c99;hb=e21e3fd69d0204424e93983460926bc0b90f448c;hp=6bcae7ffba0f5e0129565894488ba31f0322f775;hpb=9d4a5bbc9687aef811a60aabd9cb839412984e96;p=lilypond.git diff --git a/lily/system.cc b/lily/system.cc index 6bcae7ffba..07c705ffe6 100644 --- a/lily/system.cc +++ b/lily/system.cc @@ -23,7 +23,6 @@ #include "staff-symbol-referencer.hh" #include "tweak-registration.hh" #include "warn.hh" -#include "warn.hh" System::System (System const &src, int count) : Spanner (src, count) @@ -47,13 +46,14 @@ System::init_elements () { 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 @@ -106,7 +106,7 @@ System::derived_mark () const } static void -fixup_refpoints (Link_array__Grob_ const &grobs) +fixup_refpoints (vector const &grobs) { for (vsize i = grobs.size (); i--;) grobs[i]->fixup_refpoint (); @@ -124,7 +124,7 @@ System::get_paper_systems () Kill no longer needed grobs. */ Item *it = dynamic_cast (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 (); @@ -163,32 +163,28 @@ System::get_paper_systems () 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 (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 ("["); System *system = dynamic_cast (broken_intos_[i]); + system->post_processing (); scm_vector_set_x (lines, scm_from_int (i), system->get_paper_system ()); @@ -200,16 +196,21 @@ System::get_paper_systems () } void -System::break_into_pieces (std::vector const &breaking) +System::break_into_pieces (vector const &breaking) { for (vsize i = 0; i < breaking.size (); i++) { - System *system = dynamic_cast (clone (i)); - system->rank_ = i; + System *system = dynamic_cast (clone (broken_intos_.size ())); + system->rank_ = broken_intos_.size (); - Link_array__Grob_ c (breaking[i].cols_); + vector c (breaking[i].cols_); pscore_->typeset_system (system); + int st = Paper_column::get_rank (c[0]); + int end = Paper_column::get_rank (c.back ()); + Interval iv (pure_height (this, st, end)); + system->set_property ("pure-Y-extent", ly_interval2scm (iv)); + system->set_bound (LEFT, c[0]); system->set_bound (RIGHT, c.back ()); for (vsize j = 0; j < c.size (); j++) @@ -217,6 +218,7 @@ System::break_into_pieces (std::vector const &breaking) 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_back (system); } @@ -286,9 +288,6 @@ System::pre_processing () (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); @@ -317,8 +316,8 @@ System::post_processing () This might seem inefficient, but Stencils are cached per grob anyway. */ - Link_array__Grob_ all_elts_sorted (all_elements_->array ()); - vector_sort (all_elts_sorted, default_compare); + vector all_elts_sorted (all_elements_->array ()); + vector_sort (all_elts_sorted, std::less ()); uniq (all_elts_sorted); this->get_stencil (); for (vsize i = all_elts_sorted.size (); i--;) @@ -328,42 +327,61 @@ System::post_processing () } } +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 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, std::less ()); + 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); @@ -378,15 +396,20 @@ System::get_paper_system () 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")); + + /* information that the page breaker might need */ + Grob *right_bound = this->get_bound (RIGHT); + pl->set_property ("page-break-permission", right_bound->get_property ("page-break-permission")); + pl->set_property ("page-turn-permission", right_bound->get_property ("page-turn-permission")); + pl->set_property ("page-break-penalty", right_bound->get_property ("page-break-penalty")); + pl->set_property ("page-turn-penalty", right_bound->get_property ("page-turn-penalty")); 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)); @@ -399,10 +422,10 @@ System::get_paper_system () return pl->unprotect (); } -Link_array__Item_ +vector System::broken_col_range (Item const *left, Item const *right) const { - Link_array__Item_ ret; + vector ret; left = left->get_column (); right = right->get_column (); @@ -420,7 +443,7 @@ System::broken_col_range (Item const *left, Item const *right) const && cols[i] != right) { Paper_column *c = dynamic_cast (cols[i]); - if (Item::is_breakable (c) && !c->system_) + if (Paper_column::is_breakable (c) && !c->system_) ret.push_back (c); i++; } @@ -430,7 +453,7 @@ System::broken_col_range (Item const *left, Item const *right) const /** Return all columns, but filter out any unused columns , since they might disrupt the spacing problem. */ -Link_array__Grob_ +vector System::columns () const { extract_grob_set (this, "columns", ro_columns); @@ -439,11 +462,11 @@ System::columns () const 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 columns; for (int i = 0; i <= last_breakable; i++) { if (Paper_column::is_used (ro_columns[i])) @@ -484,6 +507,7 @@ ADD_INTERFACE (System, "system-interface", /* properties */ "all-elements " + "columns " + "pure-Y-extent " "spaceable-staves " - "columns" )