X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsystem.cc;h=61ab2ebbecd69b90bbe3dbc9b6d40b95701bf072;hb=304b5f3aa7eee7b0ff8d4ba7526a1410735f6e74;hp=dce65a693192f8420dc14a2da9cd169721070d00;hpb=bfb10684605084baf1a898be8f42c0e463c5764a;p=lilypond.git diff --git a/lily/system.cc b/lily/system.cc index dce65a6931..61ab2ebbec 100644 --- a/lily/system.cc +++ b/lily/system.cc @@ -3,12 +3,12 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2002 Han-Wen Nienhuys + (c) 1996--2004 Han-Wen Nienhuys */ #include "input-smob.hh" #include "axis-group-interface.hh" -#include "debug.hh" +#include "warn.hh" #include "system.hh" #include "main.hh" #include "paper-column.hh" @@ -18,8 +18,10 @@ #include "string.hh" #include "warn.hh" #include "dimensions.hh" -#include "molecule.hh" +#include "stencil.hh" #include "all-font-metrics.hh" +#include "spacing-interface.hh" +#include "staff-symbol-referencer.hh" // todo: use map. void @@ -35,40 +37,119 @@ fixup_refpoints (SCM s) System::System (SCM s) : Spanner (s) { - rank_i_ = 0; + rank_ = 0; } int System::element_count () const { - return scm_ilength (get_grob_property ("all-elements")); + return scm_ilength (get_property ("all-elements")); +} + +int +System::spanner_count () const +{ + int k =0; + for (SCM s = get_property ("all-elements"); + gh_pair_p (s); s = ly_cdr (s)) + { + if (dynamic_cast (unsmob_grob (gh_car (s)))) + k++; + } + + return k; +} + + +int +scm_default_compare (const void * a, const void *b) +{ + SCM pa = *(SCM *)a; + SCM pb = *(SCM *)b; + + if (pa < pb) return -1 ; + else if (pa > pb) return 1; + else return 0; +} + +/* + modify L in place: sort it +*/ + +SCM +uniquify_list (SCM l) +{ + 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); + + k = 0; + SCM s =l; + for (int i = 0; i < len ; i++) + { + if (i && arr[i] == arr[i-1]) + continue; + + SCM_SETCAR (s, arr[i]); + + if (i < len - 1) + s = SCM_CDR (s); + } + + SCM_SETCDR (s, SCM_EOL); + delete[] arr; + + return l; } void -System::typeset_grob (Grob * elem_p) +System::typeset_grob (Grob * elem) { - elem_p->pscore_l_ = pscore_l_; - Pointer_group_interface::add_grob (this, ly_symbol2scm ("all-elements"),elem_p); - scm_gc_unprotect_object (elem_p->self_scm ()); + 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 ()); } void System::output_lines () { - for (SCM s = get_grob_property ("all-elements"); + for (SCM s = get_property ("all-elements"); gh_pair_p (s); s = ly_cdr (s)) { - unsmob_grob (ly_car (s))->do_break_processing (); + Grob * g = unsmob_grob (ly_car (s)); + if (g->internal_has_interface (ly_symbol2scm ("only-prebreak-interface"))) + { + /* + Kill no longer needed grobs. + */ + Item * it = dynamic_cast (g); + if (it && Item::is_breakable (it)) + { + it->find_prebroken_piece (LEFT)->suicide (); + it->find_prebroken_piece (RIGHT)->suicide (); + } + g->suicide (); + } + else if (g->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_into_l_arr_.size (); i++) + for (int i=0; i < broken_intos_.size (); i++) { - Grob *se = broken_into_l_arr_[i]; - SCM all = se->get_grob_property ("all-elements"); + 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)); @@ -79,44 +160,61 @@ System::output_lines () /* needed for doing items. */ - fixup_refpoints (get_grob_property ("all-elements")); + fixup_refpoints (get_property ("all-elements")); - for (SCM s = get_grob_property ("all-elements"); + 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 (); + /* + 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 < broken_intos_.size (); i++) + { + /* + don't do this: strange side effects. + */ + // SCM al = broken_intos_[i]->get_property ("all-elements"); + // al = uniquify_list (al); + } + if (verbose_global_b) progress_indication (_f ("Element count %d.", count + element_count ())); - for (int i=0; i < broken_into_l_arr_.size (); i++) + for (int i=0; i < broken_intos_.size (); i++) { - System *line_l = dynamic_cast (broken_into_l_arr_[i]); + System *system = dynamic_cast (broken_intos_[i]); if (verbose_global_b) progress_indication ("["); - line_l->post_processing (i+1 == broken_into_l_arr_.size ()); + bool last = i+1 == broken_intos_.size (); + system->post_processing (last); if (verbose_global_b) { - progress_indication (to_str (i)); + progress_indication (to_string (i)); progress_indication ("]"); } - if (i < broken_into_l_arr_.size () - 1) + if (i < broken_intos_.size () - 1) { - SCM lastcol = ly_car (line_l->get_grob_property ("columns")); + SCM lastcol = ly_car (system->get_property ("columns")); Grob* e = unsmob_grob (lastcol); SCM between = ly_symbol2scm ("between-system-string"); - SCM inter = e->internal_get_grob_property (between); + SCM inter = e->internal_get_property (between); if (gh_string_p (inter)) { - pscore_l_->outputter_l_ + pscore_->outputter_ ->output_scheme (scm_list_n (between, inter, SCM_UNDEFINED)); } @@ -139,15 +237,14 @@ set_loose_columns (System* which, Column_x_positions const *posns) Item *loose = dynamic_cast (posns->loose_cols_[i]); Paper_column* col = dynamic_cast (loose); - if (col->line_l_) + if (col->system_) continue; - Item * left = 0; Item * right = 0; do { - SCM between = loose->get_grob_property ("between-cols"); + SCM between = loose->get_property ("between-cols"); if (!gh_pair_p (between)) break; @@ -160,40 +257,19 @@ set_loose_columns (System* which, Column_x_positions const *posns) if (!left && l) { - left = l->column_l (); + left = l->get_column (); + if (!left->get_system ()) + left = left->find_prebroken_piece (RIGHT); } divide_over ++; - - loose = right = r->column_l (); + loose = right = r->get_column (); } while (1); - - -#if 0 - Real rx = right->relative_coordinate (right->get_parent (X_AXIS), X_AXIS); - Real lx = left->relative_coordinate (left->get_parent (X_AXIS), X_AXIS); - - /* - divide space equally over loose columns. - */ - int j = 1; - loose = col; - while (1) - { - SCM between = loose->get_grob_property ("between-cols"); - if (!gh_pair_p (between)) - break; - - Paper_column *thiscol = dynamic_cast (loose); - - thiscol->line_l_ = which; - thiscol->translate_axis (lx + j*(rx - lx)/divide_over, X_AXIS); - j ++; - loose = dynamic_cast (unsmob_grob (ly_cdr (between))); - } -#else + 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 @@ -201,8 +277,8 @@ set_loose_columns (System* which, Column_x_positions const *posns) */ 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 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); @@ -229,9 +305,9 @@ set_loose_columns (System* which, Column_x_positions const *posns) else dx *= 0.5; - col->line_l_ = which; + col->system_ = which; + col->translate_axis (- col->relative_coordinate (common, X_AXIS), X_AXIS); col->translate_axis (lx + dx - cval[LEFT], X_AXIS); -#endif } } @@ -241,46 +317,27 @@ System::break_into_pieces (Array const &breaking) { for (int i=0; i < breaking.size (); i++) { - System *line_l = dynamic_cast (clone ()); - line_l->rank_i_ = i; - // line_l->set_immutable_grob_property ("rank", gh_int2scm (i)); + System *system = dynamic_cast (clone ()); + system->rank_ = i; + Link_array c (breaking[i].cols_); - pscore_l_->typeset_line (line_l); + pscore_->typeset_line (system); - line_l->set_bound (LEFT,c[0]); - line_l->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])->line_l_ = line_l; + dynamic_cast (c[j])->system_ = system; } - set_loose_columns (line_l, &breaking[i]); - broken_into_l_arr_.push (line_l); + set_loose_columns (system, &breaking[i]); + broken_intos_.push (system); } } - -#define GLOBAL_SYMBOL(cname, name) \ -SCM cname ; \ -void \ -cname ## _init_func () \ -{ \ - cname = ly_symbol2scm (name); \ - scm_permanent_object (cname); \ -} \ -ADD_SCM_INIT_FUNC (cname,cname ## _init_func);\ - - -GLOBAL_SYMBOL (offset_sym , "translate-molecule"); -GLOBAL_SYMBOL (placebox_sym , "placebox"); -GLOBAL_SYMBOL (combine_sym , "combine-molecule"); - - - void -System::output_molecule (SCM expr, Offset o) +System::output_stencil (SCM expr, Offset o) { - while (1) { if (!gh_pair_p (expr)) @@ -291,9 +348,8 @@ System::output_molecule (SCM expr, Offset o) { Input * ip = unsmob_input (head); - - pscore_l_->outputter_l_->output_scheme (scm_list_n (ly_symbol2scm ("define-origin"), - ly_str02scm (ip->file_str ().ch_C ()), + pscore_->outputter_->output_scheme (scm_list_n (ly_symbol2scm ("define-origin"), + scm_makfrom0str (ip->file_string ().to_str0 ()), gh_int2scm (ip->line_number ()), gh_int2scm (ip->column_number ()), SCM_UNDEFINED)); @@ -301,23 +357,23 @@ System::output_molecule (SCM expr, Offset o) } else if (head == ly_symbol2scm ("no-origin")) { - pscore_l_->outputter_l_->output_scheme (scm_list_n (head, SCM_UNDEFINED)); + pscore_->outputter_->output_scheme (scm_list_n (head, SCM_UNDEFINED)); expr = ly_cadr (expr); } - else if (head == ly_symbol2scm ("translate-molecule")) + else if (head == ly_symbol2scm ("translate-stencil")) { o += ly_scm2offset (ly_cadr (expr)); expr = ly_caddr (expr); } - else if (head == ly_symbol2scm ("combine-molecule")) + else if (head == ly_symbol2scm ("combine-stencil")) { - output_molecule (ly_cadr (expr), o); + output_stencil (ly_cadr (expr), o); expr = ly_caddr (expr); } else { - pscore_l_->outputter_l_-> - output_scheme (scm_list_n (placebox_sym, + pscore_->outputter_-> + output_scheme (scm_list_n (ly_symbol2scm ("placebox"), gh_double2scm (o[X_AXIS]), gh_double2scm (o[Y_AXIS]), expr, @@ -331,63 +387,63 @@ System::output_molecule (SCM expr, Offset o) void System::output_scheme (SCM s) { - pscore_l_->outputter_l_->output_scheme (s); + pscore_->outputter_->output_scheme (s); } void System::add_column (Paper_column*p) { Grob *me = this; - SCM cs = me->get_grob_property ("columns"); + SCM cs = me->get_property ("columns"); Grob * prev = gh_pair_p (cs) ? unsmob_grob (ly_car (cs)) : 0; - p->rank_i_ = prev ? Paper_column::rank_i (prev) + 1 : 0; + p->rank_ = prev ? Paper_column::get_rank (prev) + 1 : 0; - me->set_grob_property ("columns", gh_cons (p->self_scm (), cs)); + me->set_property ("columns", gh_cons (p->self_scm (), cs)); Axis_group_interface::add_element (me, p); } - - -/* - TODO: use scm_map iso. for loops. - */ void System::pre_processing () { - for (SCM s = get_grob_property ("all-elements"); gh_pair_p (s); s = ly_cdr (s)) + for (SCM s = get_property ("all-elements"); gh_pair_p (s); s = ly_cdr (s)) unsmob_grob (ly_car (s))->discretionary_processing (); if (verbose_global_b) - progress_indication (_f ("Element count %d ", element_count ())); + progress_indication (_f ("Grob count %d ", element_count ())); - for (SCM s = get_grob_property ("all-elements"); gh_pair_p (s); s = ly_cdr (s)) + 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_grob_property ("all-elements")); + fixup_refpoints (get_property ("all-elements")); - for (SCM s = get_grob_property ("all-elements"); gh_pair_p (s); s = ly_cdr (s)) + for (SCM s = get_property ("all-elements"); gh_pair_p (s); s = ly_cdr (s)) { Grob* sc = unsmob_grob (ly_car (s)); sc->calculate_dependencies (PRECALCED, PRECALCING, ly_symbol2scm ("before-line-breaking-callback")); } - progress_indication ("\n" + _ ("Calculating column positions...") + " "); - for (SCM s = get_grob_property ("all-elements"); gh_pair_p (s); s = ly_cdr (s)) + progress_indication ("\n" + _ ("Calculating line breaks...") + " "); + for (SCM s = get_property ("all-elements"); gh_pair_p (s); s = ly_cdr (s)) { Grob * e = unsmob_grob (ly_car (s)); - SCM proc = e->get_grob_property ("spacing-procedure"); + SCM proc = e->get_property ("spacing-procedure"); if (gh_procedure_p (proc)) gh_call1 (proc, e->self_scm ()); } } + + const int LAYER_COUNT= 3; + + + void System::post_processing (bool last_line) { - for (SCM s = get_grob_property ("all-elements"); + for (SCM s = get_property ("all-elements"); gh_pair_p (s); s = ly_cdr (s)) { Grob* sc = unsmob_grob (ly_car (s)); @@ -396,7 +452,7 @@ System::post_processing (bool last_line) } Interval i (extent (this, Y_AXIS)); - if (i.empty_b ()) + if (i.is_empty ()) programming_error ("Huh? Empty System?"); else translate_axis (- i[MAX], Y_AXIS); @@ -409,18 +465,28 @@ System::post_processing (bool last_line) } /* - generate all molecules to trigger all font loads. + generate all stencils to trigger all font loads. + */ + SCM all = get_property ("all-elements") ; + all = uniquify_list (all); - (ugh. This is not very memory efficient.) */ - this->get_molecule(); - for (SCM s = get_grob_property ("all-elements"); gh_pair_p (s); s = ly_cdr (s)) + /* + trigger font loads first. + + This might seem inefficient, but Stencils are cached per grob + anyway. + */ + this->get_stencil (); + for (SCM s = all; gh_pair_p (s); s = ly_cdr (s)) { - unsmob_grob (ly_car (s))->get_molecule (); + Grob * g = unsmob_grob (ly_car (s)); + g->get_stencil (); } + /* font defs; */ - SCM font_names = ly_quote_scm (paper_l ()->font_descriptions ()); + SCM font_names = ly_quote_scm (get_paper ()->font_descriptions ()); output_scheme (scm_list_n (ly_symbol2scm ("define-fonts"), font_names, SCM_UNDEFINED)); @@ -428,29 +494,32 @@ System::post_processing (bool last_line) /* line preamble. */ + Interval j (extent (this, X_AXIS)); + Real length = j[RIGHT]; + output_scheme (scm_list_n (ly_symbol2scm ("start-system"), + gh_double2scm (length), gh_double2scm (height), SCM_UNDEFINED)); /* Output elements in three layers, 0, 1, 2. The default layer is 1. */ - { - Molecule *m = this->get_molecule(); + Stencil *m = this->get_stencil (); if (m) - output_molecule (m->get_expr (), Offset(0,0)); + output_stencil (m->get_expr (), Offset (0,0)); } for (int i = 0; i < 3; i++) - for (SCM s = get_grob_property ("all-elements"); gh_pair_p (s); + for (SCM s = get_property ("all-elements"); gh_pair_p (s); s = ly_cdr (s)) { Grob *sc = unsmob_grob (ly_car (s)); - Molecule *m = sc->get_molecule (); + Stencil *m = sc->get_stencil (); if (!m) continue; - SCM s = sc->get_grob_property ("layer"); + SCM s = sc->get_property ("layer"); int layer = gh_number_p (s) ? gh_scm2int (s) : 1; if (layer != i) continue; @@ -458,14 +527,16 @@ System::post_processing (bool last_line) Offset o (sc->relative_coordinate (this, X_AXIS), sc->relative_coordinate (this, Y_AXIS)); - SCM e = sc->get_grob_property ("extra-offset"); + SCM e = sc->get_property ("extra-offset"); if (gh_pair_p (e)) { - o[X_AXIS] += gh_scm2double (ly_car (e)); - o[Y_AXIS] += gh_scm2double (ly_cdr (e)); + Offset z = ly_scm2offset (e); + z *= Staff_symbol_referencer::staff_space (sc); + + o += z; } - output_molecule (m->get_expr (), o); + output_stencil (m->get_expr (), o); } @@ -486,9 +557,9 @@ System::broken_col_range (Item const*l, Item const*r) const { Link_array ret; - l = l->column_l (); - r = r->column_l (); - SCM s = get_grob_property ("columns"); + l = l->get_column (); + r = r->get_column (); + SCM s = get_property ("columns"); while (gh_pair_p (s) && ly_car (s) != r->self_scm ()) s = ly_cdr (s); @@ -499,7 +570,7 @@ System::broken_col_range (Item const*l, Item const*r) const while (gh_pair_p (s) && ly_car (s) != l->self_scm ()) { Paper_column*c = dynamic_cast (unsmob_grob (ly_car (s))); - if (Item::breakable_b (c) && !c->line_l_) + if (Item::is_breakable (c) && !c->system_) ret.push (c); s = ly_cdr (s); @@ -514,14 +585,14 @@ System::broken_col_range (Item const*l, Item const*r) const disrupt the spacing problem. */ Link_array -System::column_l_arr ()const +System::columns ()const { Link_array acs = Pointer_group_interface__extract_grobs (this, (Grob*) 0, "columns"); bool bfound = false; for (int i= acs.size (); i -- ;) { - bool brb = Item::breakable_b (acs[i]); + bool brb = Item::is_breakable (acs[i]); bfound = bfound || brb; /* @@ -529,7 +600,7 @@ System::column_l_arr ()const seem empty. We need to retain breakable columns, in case someone forced a breakpoint. */ - if (!bfound || !Paper_column::used_b (acs[i])) + if (!bfound || !Paper_column::is_used (acs[i])) acs.del (i); } return acs; @@ -539,11 +610,7 @@ System::column_l_arr ()const ADD_INTERFACE (System,"system-interface", - "Super grob, parent of all: - -The columns of a score that form one line. The toplevel grob. Any -grob has a Line_of_score as both X and Y reference point. The -Paper_score contains one grob of this type. Control enters the -Grob dependency calculation from this single Line_of_score -object.", - "between-system-string all-elements columns"); + "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");