X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsystem.cc;h=1be38ea570ab8520b531eb6ff02a9eee032fdbba;hb=be6c990b752b8f9619988d870794ba779c9fe807;hp=85670f2927b087b7044bdc0e03750f2c799f92a0;hpb=1f3b8cf85db24896d7021f8babda94bd48a48ebe;p=lilypond.git diff --git a/lily/system.cc b/lily/system.cc index 85670f2927..1be38ea570 100644 --- a/lily/system.cc +++ b/lily/system.cc @@ -1,9 +1,20 @@ /* - system.cc -- implement System + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1996--2010 Han-Wen Nienhuys - (c) 1996--2007 Han-Wen Nienhuys + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #include "system.hh" @@ -12,19 +23,19 @@ #include "all-font-metrics.hh" #include "axis-group-interface.hh" #include "grob-array.hh" +#include "hara-kiri-group-spanner.hh" #include "international.hh" +#include "lookup.hh" #include "main.hh" #include "output-def.hh" +#include "page-layout-problem.hh" #include "paper-column.hh" #include "paper-score.hh" #include "paper-system.hh" #include "pointer-group-interface.hh" -#include "spacing-interface.hh" +#include "skyline-pair.hh" #include "staff-symbol-referencer.hh" #include "warn.hh" -#include "lookup.hh" - -extern bool debug_skylines; System::System (System const &src) : Spanner (src) @@ -174,10 +185,16 @@ System::do_break_substitution_and_fixup_refpoints () { System *child = dynamic_cast (broken_intos_[i]); child->all_elements_->remove_duplicates (); + for (vsize j = 0; j < child->all_elements_->size (); j++) + { + Grob *g = child->all_elements_->grob (j); + + (void) g->get_property ("after-line-breaking"); + } } if (be_verbose_global) - message (_f ("Element count %d.", count + element_count ())); + message (_f ("Element count %d", count + element_count ()) + "\n"); } SCM @@ -227,11 +244,17 @@ System::break_into_pieces (vector const &breaking) system->set_bound (LEFT, c[0]); system->set_bound (RIGHT, c.back ()); + SCM system_labels = SCM_EOL; for (vsize 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])->set_system (system); + /* collect the column labels */ + SCM col_labels = c[j]->get_property ("labels"); + if (scm_is_pair (col_labels)) + system_labels = scm_append (scm_list_2 (col_labels, system_labels)); } + system->set_property ("labels", system_labels); set_loose_columns (system, &breaking[i]); broken_intos_.push_back (system); @@ -250,7 +273,7 @@ System::add_column (Paper_column *p) ga = unsmob_grob_array (scm_ga); } - p->rank_ = ga->size (); + p->set_rank (ga->size ()); ga->add (p); Axis_group_interface::add_element (this, p); @@ -291,13 +314,6 @@ System::pre_processing () void System::post_processing () { - for (vsize i = 0; i < all_elements_->size (); i++) - { - Grob *g = all_elements_->grob (i); - - (void) g->get_property ("after-line-breaking"); - } - Interval iv (extent (this, Y_AXIS)); if (iv.is_empty ()) programming_error ("system with empty extent"); @@ -340,7 +356,6 @@ System::get_paper_system () SCM *tail = &exprs; post_processing (); - build_skylines (); vector entries; for (vsize j = 0; j < all_elements_->size (); j++) @@ -358,7 +373,7 @@ System::get_paper_system () Grob *g = entries[j].grob_; Stencil st = g->get_print_stencil (); - if (st.expr() == SCM_EOL) + if (st.expr () == SCM_EOL) continue; Offset o; @@ -388,8 +403,16 @@ System::get_paper_system () exprs)); if (debug_skylines) { - sys_stencil.add_stencil (Lookup::points_to_line_stencil (0.1, skylines_[UP].to_points ()).in_color (255, 0, 0)); - sys_stencil.add_stencil (Lookup::points_to_line_stencil (0.1, skylines_[DOWN].to_points ()).in_color (0, 255, 0)); + Skyline_pair *skylines = Skyline_pair::unsmob (get_property ("vertical-skylines")); + if (skylines) + { + Stencil up + = Lookup::points_to_line_stencil (0.1, (*skylines)[UP].to_points (X_AXIS)); + Stencil down + = Lookup::points_to_line_stencil (0.1, (*skylines)[DOWN].to_points (X_AXIS)); + sys_stencil.add_stencil (up.in_color (255, 0, 0)); + sys_stencil.add_stencil (down.in_color (0, 255, 0)); + } } Grob *left_bound = this->get_bound (LEFT); @@ -399,7 +422,7 @@ System::get_paper_system () /* information that the page breaker might need */ Grob *right_bound = this->get_bound (RIGHT); - pl->set_property ("skylines", skylines_.smobbed_copy ()); + pl->set_property ("vertical-skylines", this->get_property ("vertical-skylines")); 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")); @@ -408,7 +431,8 @@ System::get_paper_system () Interval staff_refpoints; extract_grob_set (this, "spaceable-staves", staves); for (vsize i = 0; i < staves.size (); i++) - staff_refpoints.add_point (staves[i]->relative_coordinate (this, Y_AXIS)); + if (staves[i]->is_live ()) + staff_refpoints.add_point (staves[i]->relative_coordinate (this, Y_AXIS)); pl->set_property ("staff-refpoint-extent", ly_interval2scm (staff_refpoints)); pl->set_property ("system-grob", this->self_scm ()); @@ -436,7 +460,7 @@ System::broken_col_range (Item const *left, Item const *right) const && Paper_column::get_rank (cols[i]) < end_rank) { Paper_column *c = dynamic_cast (cols[i]); - if (Paper_column::is_breakable (c) && !c->system_) + if (Paper_column::is_breakable (c) && !c->get_system ()) ret.push_back (c); i++; } @@ -503,36 +527,58 @@ get_root_system (Grob *me) return dynamic_cast (system_grob); } -void -System::build_skylines () +Grob * +System::get_vertical_alignment () { - vector boxes; - for (vsize i = 0; i < all_elements_->size (); i++) + extract_grob_set (this, "elements", elts); + Grob *ret = 0; + for (vsize i = 0; i < elts.size (); i++) + if (Align_interface::has_interface (elts[i])) + { + if (ret) + programming_error ("found multiple vertical alignments in this system"); + ret = elts[i]; + } + + if (!ret) + programming_error ("didn't find a vertical alignment in this system"); + return ret; +} + +// Finds the furthest staff in the given direction whose x-extent +// overlaps with the given interval. +Grob * +System::get_extremal_staff (Direction dir, Interval const &iv) +{ + Grob *align = get_vertical_alignment (); + if (!align) + return 0; + + extract_grob_set (align, "elements", elts); + vsize start = (dir == UP) ? 0 : elts.size () - 1; + vsize end = (dir == UP) ? elts.size () : VPOS; + for (vsize i = start; i != end; i += dir) { - Grob *g = all_elements_->grob (i); - if (!unsmob_stencil (g->get_property ("stencil"))) - continue; + if (Hara_kiri_group_spanner::has_interface (elts[i])) + Hara_kiri_group_spanner::consider_suicide (elts[i]); - Interval xiv = g->extent (this, X_AXIS); - Interval yiv = g->extent (this, Y_AXIS); - if (!xiv.is_empty () && !yiv.is_empty ()) - boxes.push_back (Box (xiv, yiv)); + Interval intersection = elts[i]->extent (this, X_AXIS); + intersection.intersect (iv); + if (elts[i]->is_live () && !intersection.is_empty ()) + return elts[i]; } - - SCM horizon_padding_scm = get_property ("skyline-horizontal-padding"); - Real horizon_padding = robust_scm2double (horizon_padding_scm, 0); - skylines_[UP] = Skyline (boxes, horizon_padding, X_AXIS, UP); - skylines_[DOWN] = Skyline (boxes, horizon_padding, X_AXIS, DOWN); + return 0; } - ADD_INTERFACE (System, - "This is the toplevel object: each object in a score " - "ultimately has a System object as its X and Y parent. ", + "This is the top-level object: Each object in a score" + " ultimately has a @code{System} object as its X and" + " Y@tie{}parent.", /* properties */ "all-elements " "columns " + "labels " "pure-Y-extent " "spaceable-staves " "skyline-distance "