X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsystem.cc;h=0d2ce87b9ddbf9996721207b37373f307d7118dc;hb=fe2ea684b9dcdd98146d608a43e27acc881ff3cd;hp=d4e81941323315296761dd92b0d75189db4106d9;hpb=da5ebcb20a260914bc71260f68c38559a344016c;p=lilypond.git diff --git a/lily/system.cc b/lily/system.cc index d4e8194132..0d2ce87b9d 100644 --- a/lily/system.cc +++ b/lily/system.cc @@ -3,235 +3,223 @@ 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 + #include "axis-group-interface.hh" -#include "debug.hh" -#include "line-of-score.hh" +#include "warn.hh" +#include "system.hh" #include "main.hh" #include "paper-column.hh" -#include "paper-def.hh" +#include "output-def.hh" #include "paper-outputter.hh" #include "paper-score.hh" #include "string.hh" #include "warn.hh" -#include "dimensions.hh" -#include "molecule.hh" +#include "stencil.hh" #include "all-font-metrics.hh" - -// todo: use map. -void -fixup_refpoints (SCM s) -{ - for (; gh_pair_p (s); s = ly_cdr (s)) - { - Grob::fixup_refpoint (ly_car (s)); - } -} - +#include "spacing-interface.hh" +#include "staff-symbol-referencer.hh" +#include "paper-book.hh" +#include "paper-system.hh" 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")); } -void -System::typeset_grob (Grob * elem_p) +int +System::spanner_count () const { - 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 ()); + 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)))) + k++; + return k; } void -System::output_lines () +System::typeset_grob (Grob * elem) +{ + if (elem->pscore_) + 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 ()); + } +} + +// todo: use map. +static void +fixup_refpoints (SCM s) +{ + for (; ly_c_pair_p (s); s = ly_cdr (s)) + { + Grob::fixup_refpoint (ly_car (s)); + } +} + +SCM +System::get_lines () { - for (SCM s = get_grob_property ("all-elements"); - gh_pair_p (s); s = ly_cdr (s)) + for (SCM s = get_property ("all-elements"); ly_c_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->is_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"); - for (SCM s = all; gh_pair_p (s); s = ly_cdr (s)) - { - fixup_refpoint (ly_car (s)); - } + 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)); count += scm_ilength (all); } /* needed for doing items. */ - fixup_refpoints (get_grob_property ("all-elements")); + 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 (); + handle_broken_dependencies (); +#if 0 /* don't do this: strange side effects. */ - for (SCM s = get_grob_property ("all-elements"); - gh_pair_p (s); s = ly_cdr (s)) + /* 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++) { - unsmob_grob (ly_car (s))->handle_broken_dependencies (); + SCM all = broken_intos_[i]->get_property ("all-elements"); + all = ly_list_qsort_uniq_x(all); } - handle_broken_dependencies (); - +#endif + if (verbose_global_b) 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 < broken_into_l_arr_.size (); i++) + for (int i = 0; i < line_count; i++) { - System *line_l = dynamic_cast (broken_into_l_arr_[i]); - if (verbose_global_b) progress_indication ("["); - line_l->post_processing (i+1 == broken_into_l_arr_.size ()); - - if (verbose_global_b) - { - progress_indication (to_str (i)); - progress_indication ("]"); - } - if (i < broken_into_l_arr_.size () - 1) - { - SCM lastcol = ly_car (line_l->get_grob_property ("columns")); - Grob* e = unsmob_grob (lastcol); + System *system = dynamic_cast (broken_intos_[i]); + system->post_processing (); + scm_vector_set_x (lines, scm_int2num (i), system->get_line ()); - SCM between = ly_symbol2scm ("between-system-string"); - SCM inter = e->internal_get_grob_property (between); - if (gh_string_p (inter)) - { - pscore_l_->outputter_l_ - ->output_scheme (scm_list_n (between, - inter, SCM_UNDEFINED)); - } - } + if (verbose_global_b) + progress_indication (to_string (i) + "]"); } + return lines; } - - - -/* - Find the loose columns in POSNS, and drape them around the columns - specified in BETWEEN-COLS. */ -void +/* 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) { - for (int i = 0; i < posns->loose_cols_.size (); i++) + 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->line_l_) + if (col->system_) continue; - - Item * left = 0; - Item * right = 0; - do + Item *left = 0; + Item *right = 0; + while (1) { - SCM between = loose->get_grob_property ("between-cols"); - if (!gh_pair_p (between)) + SCM between = loose->get_property ("between-cols"); + if (!ly_c_pair_p (between)) break; + Item *le = dynamic_cast (unsmob_grob (ly_car (between))); + Item *re = dynamic_cast (unsmob_grob (ly_cdr (between))); - Item * l=dynamic_cast (unsmob_grob (ly_car (between))); - Item * r=dynamic_cast (unsmob_grob (ly_cdr (between))); - - if (!(l && r)) - break ; + if (!(le && re)) + break; - if (!left && l) + if (!left && le) { - left = l->column_l (); + left = le->get_column (); + if (!left->get_system ()) + left = left->find_prebroken_piece (RIGHT); } - divide_over ++; - - loose = right = r->column_l (); + divide_over++; + loose = right = re->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 - /* - We divide the remaining space of the column over the left and - right side. At the moment, we - - */ - Grob * common = right->common_refpoint (left, X_AXIS); + 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 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); - /* - - We 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 (); + /* 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. - - TODO. - */ + /* TODO: this is discontinuous. I'm too tired to + invent a sliding mechanism. Duh. */ dx *= 0.25; } 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 } } @@ -239,267 +227,183 @@ set_loose_columns (System* which, Column_x_positions const *posns) void System::break_into_pieces (Array const &breaking) { - for (int i=0; i < breaking.size (); i++) + 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)); - Link_array c (breaking[i].cols_); - pscore_l_->typeset_line (line_l); - - line_l->set_bound (LEFT,c[0]); - line_l->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; - } - set_loose_columns (line_l, &breaking[i]); - broken_into_l_arr_.push (line_l); - } -} + System *system = dynamic_cast (clone ()); + system->rank_ = i; - -#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) -{ - - while (1) - { - if (!gh_pair_p (expr)) - return; - - SCM head =ly_car (expr); - if (unsmob_input (head)) - { - Input * ip = unsmob_input (head); + Link_array c (breaking[i].cols_); + pscore_->typeset_line (system); - - pscore_l_->outputter_l_->output_scheme (scm_list_n (ly_symbol2scm ("define-origin"), - ly_str02scm (ip->file_str ().ch_C ()), - gh_int2scm (ip->line_number ()), - gh_int2scm (ip->column_number ()), - SCM_UNDEFINED)); - expr = ly_cadr (expr); - } - else if (head == ly_symbol2scm ("no-origin")) + system->set_bound (LEFT,c[0]); + system->set_bound (RIGHT,c.top ()); + for (int j = 0; j < c.size (); j++) { - pscore_l_->outputter_l_->output_scheme (scm_list_n (head, SCM_UNDEFINED)); - expr = ly_cadr (expr); - } - else if (head == ly_symbol2scm ("translate-molecule")) - { - o += ly_scm2offset (ly_cadr (expr)); - expr = ly_caddr (expr); - } - else if (head == ly_symbol2scm ("combine-molecule")) - { - output_molecule (ly_cadr (expr), o); - expr = ly_caddr (expr); - } - else - { - pscore_l_->outputter_l_-> - output_scheme (scm_list_n (placebox_sym, - gh_double2scm (o[X_AXIS]), - gh_double2scm (o[Y_AXIS]), - expr, - SCM_UNDEFINED)); - - return; + 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); } } -void -System::output_scheme (SCM s) -{ - pscore_l_->outputter_l_->output_scheme (s); -} - void System::add_column (Paper_column*p) { Grob *me = this; - SCM cs = me->get_grob_property ("columns"); - Grob * prev = gh_pair_p (cs) ? unsmob_grob (ly_car (cs)) : 0; + SCM cs = me->get_property ("columns"); + Grob *prev = ly_c_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", scm_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"); ly_c_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"); ly_c_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"); ly_c_pair_p (s); s = ly_cdr (s)) { - Grob* sc = unsmob_grob (ly_car (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"); + progress_indication (_ ("Calculating line breaks...")); + progress_indication (" "); + for (SCM s = get_property ("all-elements"); ly_c_pair_p (s); s = ly_cdr (s)) { - Grob * e = unsmob_grob (ly_car (s)); - SCM proc = e->get_grob_property ("spacing-procedure"); - if (gh_procedure_p (proc)) - gh_call1 (proc, e->self_scm ()); + Grob *e = unsmob_grob (ly_car (s)); + SCM proc = e->get_property ("spacing-procedure"); + if (ly_c_procedure_p (proc)) + scm_call_1 (proc, e->self_scm ()); } } void -System::post_processing (bool last_line) +System::post_processing () { - for (SCM s = get_grob_property ("all-elements"); - gh_pair_p (s); s = ly_cdr (s)) + for (SCM s = get_property ("all-elements"); ly_c_pair_p (s); s = ly_cdr (s)) { - Grob* sc = unsmob_grob (ly_car (s)); - sc->calculate_dependencies (POSTCALCED, POSTCALCING, - ly_symbol2scm ("after-line-breaking-callback")); + Grob *g = unsmob_grob (ly_car (s)); + g->calculate_dependencies (POSTCALCED, POSTCALCING, + ly_symbol2scm ("after-line-breaking-callback")); } - Interval i (extent (this, Y_AXIS)); - if (i.empty_b ()) - programming_error ("Huh? Empty System?"); + Interval iv (extent (this, Y_AXIS)); + if (iv.is_empty ()) + programming_error ("System with zero extent."); else - translate_axis (- i[MAX], Y_AXIS); + 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); - Real height = i.length (); - if (height > 50 CM) + this->get_stencil (); + for (SCM s = all; ly_c_pair_p (s); s = ly_cdr (s)) { - programming_error ("Improbable system height"); - height = 50 CM; + Grob *g = unsmob_grob (ly_car (s)); + g->get_stencil (); } +} - /* - generate all molecules to trigger all font loads. +SCM +System::get_line () +{ + static int const LAYER_COUNT = 3; - (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)) - { - unsmob_grob (ly_car (s))->get_molecule (); - } - /* - font defs; - */ - SCM font_names = ly_quote_scm (paper_l ()->font_descriptions ()); - output_scheme (scm_list_n (ly_symbol2scm ("define-fonts"), - font_names, - SCM_UNDEFINED)); + SCM stencils = SCM_EOL; + if (Stencil *me = get_stencil ()) + stencils = scm_cons (me->smobbed_copy (), stencils); - /* - line preamble. - */ - output_scheme (scm_list_n (ly_symbol2scm ("start-system"), - gh_double2scm (height), - SCM_UNDEFINED)); - - /* Output elements in three layers, 0, 1, 2. - The default layer is 1. */ - - { - Molecule *m = this->get_molecule(); - if (m) - output_molecule (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); - s = ly_cdr (s)) + /* 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"); + + SCM exprs = SCM_EOL; + SCM *tail = &exprs; + + for (int i = LAYER_COUNT; i--;) + for (SCM s = all; ly_c_pair_p (s); s = ly_cdr (s)) { - Grob *sc = unsmob_grob (ly_car (s)); - Molecule *m = sc->get_molecule (); - if (!m) - continue; - - SCM s = sc->get_grob_property ("layer"); - int layer = gh_number_p (s) ? gh_scm2int (s) : 1; - if (layer != i) + Grob *g = unsmob_grob (ly_car (s)); + Stencil *stil = g->get_stencil (); + + /* Skip empty stencils and grobs that are not in this layer. */ + if (!stil + || robust_scm2int (g->get_property ("layer"), 1) != i) continue; + + Offset o (g->relative_coordinate (this, X_AXIS), + g->relative_coordinate (this, Y_AXIS)); + + 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. */ + + Stencil st = *stil; + st.translate (o + extra); + *tail = scm_cons (st.expr (), SCM_EOL); + tail = SCM_CDRLOC(*tail); - Offset o (sc->relative_coordinate (this, X_AXIS), - sc->relative_coordinate (this, Y_AXIS)); - - SCM e = sc->get_grob_property ("extra-offset"); - if (gh_pair_p (e)) - { - o[X_AXIS] += gh_scm2double (ly_car (e)); - o[Y_AXIS] += gh_scm2double (ly_cdr (e)); - } - - output_molecule (m->get_expr (), o); } + + Interval x (extent (this, X_AXIS)); + Interval y (extent (this, Y_AXIS)); + Stencil sys_stencil (Box (x,y), + scm_cons (ly_symbol2scm ("combine-stencil"), + exprs)); - if (last_line) - { - output_scheme (scm_list_n (ly_symbol2scm ("stop-last-system"), SCM_UNDEFINED)); - } - else - { - output_scheme (scm_list_n (ly_symbol2scm ("stop-system"), SCM_UNDEFINED)); - } -} + Paper_system *pl = new Paper_system (sys_stencil, false); + Item * break_point =this->get_bound(LEFT); + pl->penalty_ = + robust_scm2double (break_point->get_property ("page-penalty"), 0.0); + + return scm_gc_unprotect_object (pl->self_scm ()); +} Link_array -System::broken_col_range (Item const*l, Item const*r) const +System::broken_col_range (Item const *left, Item const *right) const { Link_array ret; - l = l->column_l (); - r = r->column_l (); - SCM s = get_grob_property ("columns"); + left = left->get_column (); + right = right->get_column (); + SCM s = get_property ("columns"); - while (gh_pair_p (s) && ly_car (s) != r->self_scm ()) + while (ly_c_pair_p (s) && ly_car (s) != right->self_scm ()) s = ly_cdr (s); - - if (gh_pair_p (s)) + + if (ly_c_pair_p (s)) s = ly_cdr (s); - - while (gh_pair_p (s) && ly_car (s) != l->self_scm ()) + + while (ly_c_pair_p (s) && ly_car (s) != left->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); @@ -509,41 +413,31 @@ System::broken_col_range (Item const*l, Item const*r) const return ret; } -/** - Return all columns, but filter out any unused columns , since they might - disrupt the spacing problem. - */ +/** Return all columns, but filter out any unused columns , since they might + 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 found = false; + for (int i = acs.size (); i--;) { - bool brb = Item::breakable_b (acs[i]); - bfound = bfound || brb; + 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 (!bfound || !Paper_column::used_b (acs[i])) + if (!found || !Paper_column::is_used (acs[i])) acs.del (i); } return acs; } - - - 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 spacing-procedure before-line-breaking-callback after-line-breaking-callback all-elements columns"); + "This is the toplevel object: each object in a score " + "ultimately has a System object as its X and Y parent. ", + "all-elements columns")