X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fsystem.cc;h=68fcc8cdc4de5ac876636048dda895799c641656;hb=93b5b6bf5495d930fccd442dc402897f7f07b2de;hp=d8485232ab2b83f428705416122fc2a9df0233de;hpb=1c5b28defa29c019a3d2038bf4b19ed215ec2d87;p=lilypond.git diff --git a/lily/system.cc b/lily/system.cc index d8485232ab..68fcc8cdc4 100644 --- a/lily/system.cc +++ b/lily/system.cc @@ -3,34 +3,49 @@ 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 "align-interface.hh" #include "axis-group-interface.hh" #include "warn.hh" -#include "system.hh" #include "main.hh" #include "paper-column.hh" #include "output-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 "spacing-interface.hh" #include "staff-symbol-referencer.hh" #include "paper-book.hh" -#include "paper-line.hh" +#include "paper-system.hh" +#include "tweak-registration.hh" + + +System::System (System const &src, int count) + : Spanner (src, count) +{ + rank_ = 0; +} -System::System (SCM s) - : Spanner (s) +System::System (SCM s, Object_key const*key) + : Spanner (s, key) { rank_ = 0; } + +Grob * +System::clone (int count) const +{ + return new System (*this, count); +} + + int System::element_count () const { @@ -41,8 +56,8 @@ int System::spanner_count () const { int k = 0; - for (SCM s = get_property ("all-elements"); ly_c_pair_p (s); s = ly_cdr (s)) - if (dynamic_cast (unsmob_grob (ly_car (s)))) + for (SCM s = get_property ("all-elements"); scm_is_pair (s); s = scm_cdr (s)) + if (dynamic_cast (unsmob_grob (scm_car (s)))) k++; return k; } @@ -64,18 +79,18 @@ System::typeset_grob (Grob * elem) static void fixup_refpoints (SCM s) { - for (; ly_c_pair_p (s); s = ly_cdr (s)) + for (; scm_is_pair (s); s = scm_cdr (s)) { - Grob::fixup_refpoint (ly_car (s)); + Grob::fixup_refpoint (scm_car (s)); } } SCM System::get_lines () { - for (SCM s = get_property ("all-elements"); ly_c_pair_p (s); s = ly_cdr (s)) + for (SCM s = get_property ("all-elements"); scm_is_pair (s); s = scm_cdr (s)) { - Grob *g = unsmob_grob (ly_car (s)); + Grob *g = unsmob_grob (scm_car (s)); if (g->internal_has_interface (ly_symbol2scm ("only-prebreak-interface"))) { /* @@ -97,12 +112,12 @@ 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"); - for (SCM s = all; ly_c_pair_p (s); s = ly_cdr (s)) - fixup_refpoint (ly_car (s)); + for (SCM s = all; scm_is_pair (s); s = scm_cdr (s)) + fixup_refpoint (scm_car (s)); count += scm_ilength (all); } @@ -111,8 +126,8 @@ System::get_lines () */ fixup_refpoints (get_property ("all-elements")); - for (SCM s = get_property ("all-elements"); ly_c_pair_p (s); s = ly_cdr (s)) - unsmob_grob (ly_car (s))->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. */ @@ -129,25 +144,25 @@ System::get_lines () } #endif - if (verbose_global_b) + 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_UNDEFINED); + SCM lines = scm_c_make_vector (line_count, SCM_EOL); - for (int i = 0; i < line_count; i++) + 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->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; + return lines; } /* Find the loose columns in POSNS, and drape them around the columns @@ -170,11 +185,11 @@ set_loose_columns (System* which, Column_x_positions const *posns) while (1) { SCM between = loose->get_property ("between-cols"); - if (!ly_c_pair_p (between)) + if (!scm_is_pair (between)) break; - Item *le = dynamic_cast (unsmob_grob (ly_car (between))); - Item *re = dynamic_cast (unsmob_grob (ly_cdr (between))); + Item *le = dynamic_cast (unsmob_grob (scm_car (between))); + Item *re = dynamic_cast (unsmob_grob (scm_cdr (between))); if (!(le && re)) break; @@ -200,7 +215,7 @@ set_loose_columns (System* which, Column_x_positions const *posns) 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); + 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 @@ -229,14 +244,14 @@ System::break_into_pieces (Array const &breaking) { for (int i = 0; i < breaking.size (); i++) { - System *system = dynamic_cast (clone ()); + 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); @@ -252,7 +267,7 @@ System::add_column (Paper_column*p) { Grob *me = this; SCM cs = me->get_property ("columns"); - Grob *prev = ly_c_pair_p (cs) ? unsmob_grob (ly_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; @@ -261,31 +276,51 @@ System::add_column (Paper_column*p) Axis_group_interface::add_element (me, 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)) + { + SCM proc = scm_caar (s); + SCM rest = scm_cdar (s); + scm_apply_1 (proc, g->self_scm(), rest); + } + } +} + void System::pre_processing () { - for (SCM s = get_property ("all-elements"); ly_c_pair_p (s); s = ly_cdr (s)) - unsmob_grob (ly_car (s))->discretionary_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"); ly_c_pair_p (s); s = ly_cdr (s)) - unsmob_grob (ly_car (s))->handle_prebroken_dependencies (); + 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"); ly_c_pair_p (s); s = ly_cdr (s)) + for (SCM s = get_property ("all-elements"); scm_is_pair (s); s = scm_cdr (s)) + apply_tweaks (unsmob_grob (scm_car (s)), false); + + for (SCM s = get_property ("all-elements"); scm_is_pair (s); s = scm_cdr (s)) { - Grob* sc = unsmob_grob (ly_car (s)); + Grob *sc = unsmob_grob (scm_car (s)); sc->calculate_dependencies (PRECALCED, PRECALCING, ly_symbol2scm ("before-line-breaking-callback")); } - progress_indication ("\n" + _ ("Calculating line breaks...") + " "); - for (SCM s = get_property ("all-elements"); ly_c_pair_p (s); s = ly_cdr (s)) + progress_indication ("\n"); + progress_indication (_ ("Calculating line breaks...")); + progress_indication (" "); + for (SCM s = get_property ("all-elements"); scm_is_pair (s); s = scm_cdr (s)) { - Grob *e = unsmob_grob (ly_car (s)); + Grob *e = unsmob_grob (scm_car (s)); SCM proc = e->get_property ("spacing-procedure"); if (ly_c_procedure_p (proc)) scm_call_1 (proc, e->self_scm ()); @@ -295,9 +330,12 @@ System::pre_processing () void System::post_processing () { - for (SCM s = get_property ("all-elements"); ly_c_pair_p (s); s = ly_cdr (s)) + for (SCM s = get_property ("all-elements"); scm_is_pair (s); s = scm_cdr (s)) { - Grob *g = unsmob_grob (ly_car (s)); + Grob *g = unsmob_grob (scm_car (s)); + + apply_tweaks (g, true); + g->calculate_dependencies (POSTCALCED, POSTCALCING, ly_symbol2scm ("after-line-breaking-callback")); } @@ -307,7 +345,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. */ @@ -315,9 +353,9 @@ System::post_processing () all = ly_list_qsort_uniq_x (all); this->get_stencil (); - for (SCM s = all; ly_c_pair_p (s); s = ly_cdr (s)) + for (SCM s = all; scm_is_pair (s); s = scm_cdr (s)) { - Grob *g = unsmob_grob (ly_car (s)); + Grob *g = unsmob_grob (scm_car (s)); g->get_stencil (); } } @@ -327,20 +365,18 @@ System::get_line () { static int const LAYER_COUNT = 3; - SCM stencils = SCM_EOL; - if (Stencil *me = get_stencil ()) - stencils = scm_cons (me->smobbed_copy (), stencils); + 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. */ SCM all = get_property ("all-elements"); - - Real penalty = 0; + for (int i = LAYER_COUNT; i--;) - for (SCM s = all; ly_c_pair_p (s); s = ly_cdr (s)) + for (SCM s = all; scm_is_pair (s); s = scm_cdr (s)) { - Grob *g = unsmob_grob (ly_car (s)); + Grob *g = unsmob_grob (scm_car (s)); Stencil *stil = g->get_stencil (); /* Skip empty stencils and grobs that are not in this layer. */ @@ -357,28 +393,38 @@ System::get_line () /* 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 (g->original_) - { - if (Item *it = dynamic_cast (g)) - { - Grob *col = it->get_column (); - SCM s = col->get_property ("page-penalty"); - // FIXME; page breaking is not discrete at +-10000 - if (ly_c_number_p (s)) // && fabs (ly_scm2double (s)) < 10000) - penalty += ly_scm2double (s); - } - } + + Stencil st = *stil; + 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, (bool) penalty); // FIXME. - + Stencil sys_stencil (Box (x, y), + 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 *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->break_before_penalty_ = + robust_scm2double (break_point->get_property ("page-penalty"), 0.0); + return scm_gc_unprotect_object (pl->self_scm ()); } @@ -391,19 +437,19 @@ System::broken_col_range (Item const *left, Item const *right) const right = right->get_column (); SCM s = get_property ("columns"); - while (ly_c_pair_p (s) && ly_car (s) != right->self_scm ()) - s = ly_cdr (s); + while (scm_is_pair (s) && scm_car (s) != right->self_scm ()) + s = scm_cdr (s); - if (ly_c_pair_p (s)) - s = ly_cdr (s); + if (scm_is_pair (s)) + s = scm_cdr (s); - while (ly_c_pair_p (s) && ly_car (s) != left->self_scm ()) + while (scm_is_pair (s) && scm_car (s) != left->self_scm ()) { - Paper_column*c = dynamic_cast (unsmob_grob (ly_car (s))); + Paper_column*c = dynamic_cast (unsmob_grob (scm_car (s))); if (Item::is_breakable (c) && !c->system_) ret.push (c); - s = ly_cdr (s); + s = scm_cdr (s); } ret.reverse (); @@ -434,7 +480,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 columns") + "all-elements spaceable-staves columns")