X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsystem.cc;h=d1066602fe0ddfe34e52cbe9f1d9824408861629;hb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;hp=041a133a3fb7a22ca29f8a0b6975ae1648ad5bde;hpb=c659cb200486c2f908703696a1b2873e78c8160a;p=lilypond.git diff --git a/lily/system.cc b/lily/system.cc index 041a133a3f..d1066602fe 100644 --- a/lily/system.cc +++ b/lily/system.cc @@ -3,12 +3,12 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2004 Han-Wen Nienhuys + (c) 1996--2005 Han-Wen Nienhuys */ #include "system.hh" -#include +#include #include "align-interface.hh" #include "axis-group-interface.hh" @@ -16,7 +16,6 @@ #include "main.hh" #include "paper-column.hh" #include "output-def.hh" -#include "paper-outputter.hh" #include "paper-score.hh" #include "warn.hh" #include "all-font-metrics.hh" @@ -26,27 +25,24 @@ #include "paper-system.hh" #include "tweak-registration.hh" - System::System (System const &src, int count) : Spanner (src, count) { rank_ = 0; } -System::System (SCM s, Object_key const*key) +System::System (SCM s, Object_key const *key) : Spanner (s, key) { rank_ = 0; } - -Grob * +Grob * System::clone (int count) const { return new System (*this, count); } - int System::element_count () const { @@ -58,13 +54,13 @@ 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)))) + if (dynamic_cast (unsmob_grob (scm_car (s)))) k++; return k; } void -System::typeset_grob (Grob * elem) +System::typeset_grob (Grob *elem) { if (elem->pscore_) programming_error ("Adding element twice."); @@ -95,9 +91,9 @@ System::get_lines () if (g->internal_has_interface (ly_symbol2scm ("only-prebreak-interface"))) { /* - Kill no longer needed grobs. - */ - Item * it = dynamic_cast (g); + Kill no longer needed grobs. + */ + Item *it = dynamic_cast (g); if (it && Item::is_breakable (it)) { it->find_prebroken_piece (LEFT)->suicide (); @@ -113,7 +109,7 @@ System::get_lines () 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 (int i = 0; i < broken_intos_.size (); i++) { Grob *se = broken_intos_[i]; SCM all = se->get_property ("all-elements"); @@ -121,10 +117,10 @@ System::get_lines () fixup_refpoint (scm_car (s)); count += scm_ilength (all); } - + /* needed for doing items. - */ + */ fixup_refpoints (get_property ("all-elements")); for (SCM s = get_property ("all-elements"); scm_is_pair (s); s = scm_cdr (s)) @@ -132,7 +128,7 @@ System::get_lines () 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 @@ -141,122 +137,48 @@ System::get_lines () for (int i = 0; i < line_count; i++) { SCM all = broken_intos_[i]->get_property ("all-elements"); - all = ly_list_qsort_uniq_x(all); + all = ly_list_qsort_uniq_x (all); } #endif - - if (verbose_global_b) - progress_indication (_f ("Element count %d.", count + element_count ())); + + if (be_verbose_global) + progress_indication (_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++) { - if (verbose_global_b) + if (be_verbose_global) progress_indication ("["); - System *system = dynamic_cast (broken_intos_[i]); + System *system = dynamic_cast (broken_intos_[i]); system->post_processing (); scm_vector_set_x (lines, scm_int2num (i), system->get_line ()); - if (verbose_global_b) + if (be_verbose_global) progress_indication (to_string (i) + "]"); } return lines; } -/* Find the loose columns in POSNS, and drape them around the columns - specified in BETWEEN-COLS. */ -static void -set_loose_columns (System* which, Column_x_positions const *posns) -{ - int loose_col_count = posns->loose_cols_.size (); - for (int i = 0; i < loose_col_count; i++) - { - int divide_over = 1; - Item *loose = dynamic_cast (posns->loose_cols_[i]); - Paper_column* col = dynamic_cast (loose); - - if (col->system_) - continue; - - Item *left = 0; - Item *right = 0; - while (1) - { - SCM between = loose->get_property ("between-cols"); - if (!scm_is_pair (between)) - break; - - Item *le = dynamic_cast (unsmob_grob (scm_car (between))); - Item *re = dynamic_cast (unsmob_grob (scm_cdr (between))); - - if (!(le && re)) - break; - - if (!left && le) - { - left = le->get_column (); - if (!left->get_system ()) - left = left->find_prebroken_piece (RIGHT); - } - - divide_over++; - loose = right = re->get_column (); - } - - if (!right->get_system ()) - right = right->find_prebroken_piece (LEFT); - - /* Divide the remaining space of the column over the left and - right side. At the moment, FIXME */ - 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); - - /* 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 ()) - { - /* TODO: this is discontinuous. I'm too tired to - invent a sliding mechanism. Duh. */ - dx *= 0.25; - } - 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); - } -} - -// const? void System::break_into_pieces (Array const &breaking) { for (int i = 0; i < breaking.size (); i++) { - System *system = dynamic_cast (clone (i)); + System *system = dynamic_cast (clone (i)); system->rank_ = i; Link_array c (breaking[i].cols_); pscore_->typeset_line (system); - - system->set_bound (LEFT,c[0]); - system->set_bound (RIGHT,c.top ()); + + system->set_bound (LEFT, c[0]); + system->set_bound (RIGHT, c.top ()); for (int j = 0; j < c.size (); j++) { c[j]->translate_axis (breaking[i].config_[j], X_AXIS); - dynamic_cast (c[j])->system_ = system; + dynamic_cast (c[j])->system_ = system; } set_loose_columns (system, &breaking[i]); broken_intos_.push (system); @@ -264,13 +186,13 @@ System::break_into_pieces (Array const &breaking) } void -System::add_column (Paper_column*p) +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; + Grob *prev = scm_is_pair (cs) ? unsmob_grob (scm_car (cs)) : 0; - p->rank_ = prev ? Paper_column::get_rank (prev) + 1 : 0; + p->rank_ = prev ? Paper_column::get_rank (prev) + 1 : 0; me->set_property ("columns", scm_cons (p->self_scm (), cs)); @@ -287,7 +209,7 @@ apply_tweaks (Grob *g, bool broken) { SCM proc = scm_caar (s); SCM rest = scm_cdar (s); - scm_apply_1 (proc, g->self_scm(), rest); + scm_apply_1 (proc, g->self_scm (), rest); } } } @@ -298,15 +220,14 @@ 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 (); - if (verbose_global_b) + if (be_verbose_global) progress_indication (_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 (); - + fixup_refpoints (get_property ("all-elements")); - for (SCM s = get_property ("all-elements"); scm_is_pair (s); s = scm_cdr (s)) apply_tweaks (unsmob_grob (scm_car (s)), false); @@ -315,7 +236,7 @@ System::pre_processing () Grob *sc = unsmob_grob (scm_car (s)); sc->calculate_dependencies (PRECALCED, PRECALCING, ly_symbol2scm ("before-line-breaking-callback")); } - + progress_indication ("\n"); progress_indication (_ ("Calculating line breaks...")); progress_indication (" "); @@ -334,11 +255,11 @@ System::post_processing () for (SCM s = get_property ("all-elements"); scm_is_pair (s); s = scm_cdr (s)) { Grob *g = unsmob_grob (scm_car (s)); - + apply_tweaks (g, true); g->calculate_dependencies (POSTCALCED, POSTCALCING, - ly_symbol2scm ("after-line-breaking-callback")); + ly_symbol2scm ("after-line-breaking-callback")); } Interval iv (extent (this, Y_AXIS)); @@ -346,7 +267,7 @@ System::post_processing () programming_error ("System with zero 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. */ @@ -363,18 +284,16 @@ System::post_processing () SCM System::get_line () -{ +{ static int const LAYER_COUNT = 3; SCM exprs = SCM_EOL; SCM *tail = &exprs; - /* Output stencils in three layers: 0, 1, 2. Default layer: 1. - - Start with layer 3, since scm_cons prepends to list. */ + /* Output stencils in three layers: 0, 1, 2. Default layer: 1. */ SCM all = get_property ("all-elements"); - - for (int i = LAYER_COUNT; i--;) + + for (int i = 0; i < LAYER_COUNT; i++) for (SCM s = all; scm_is_pair (s); s = scm_cdr (s)) { Grob *g = unsmob_grob (scm_car (s)); @@ -397,8 +316,9 @@ System::get_line () Stencil st = *stil; st.translate (o + extra); + *tail = scm_cons (st.expr (), SCM_EOL); - tail = SCM_CDRLOC(*tail); + tail = SCM_CDRLOC (*tail); } if (Stencil *me = get_stencil ()) @@ -406,30 +326,29 @@ System::get_line () Interval x (extent (this, X_AXIS)); Interval y (extent (this, Y_AXIS)); - Stencil sys_stencil (Box (x,y), + Stencil sys_stencil (Box (x, y), scm_cons (ly_symbol2scm ("combine-stencil"), exprs)); Interval staff_refpoints; - staff_refpoints.set_empty(); + staff_refpoints.set_empty (); for (SCM s = get_property ("spaceable-staves"); scm_is_pair (s); s = scm_cdr (s)) - { - Grob *g = unsmob_grob (scm_car (s)); - staff_refpoints.add_point (g->relative_coordinate (this, Y_AXIS)); - } - - + { + Grob *g = unsmob_grob (scm_car (s)); + 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->penalty_ = - robust_scm2double (break_point->get_property ("page-penalty"), 0.0); - + 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 ()); } -Link_array +Link_array System::broken_col_range (Item const *left, Item const *right) const { Link_array ret; @@ -446,7 +365,7 @@ System::broken_col_range (Item const *left, Item const *right) const while (scm_is_pair (s) && scm_car (s) != left->self_scm ()) { - Paper_column*c = dynamic_cast (unsmob_grob (scm_car (s))); + Paper_column *c = dynamic_cast (unsmob_grob (scm_car (s))); if (Item::is_breakable (c) && !c->system_) ret.push (c); @@ -463,7 +382,7 @@ Link_array System::columns () const { Link_array acs - = Pointer_group_interface__extract_grobs (this, (Grob*) 0, "columns"); + = extract_grob_array (this, ly_symbol2scm ("columns")); bool found = false; for (int i = acs.size (); i--;) { @@ -481,7 +400,7 @@ System::columns () const return acs; } -ADD_INTERFACE (System,"system-interface", +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")