source file of the GNU LilyPond music typesetter
- (c) 1996--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 1996--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "system.hh"
#include "axis-group-interface.hh"
#include "grob-array.hh"
#include "international.hh"
+#include "lookup.hh"
#include "main.hh"
#include "output-def.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)
}
if (be_verbose_global)
- message (_f ("Element count %d.", count + element_count ()));
+ message (_f ("Element count %d", count + element_count ()) + "\n");
}
SCM
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<Paper_column *> (c[j])->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);
Skyline_pair *skylines = Skyline_pair::unsmob (get_property ("vertical-skylines"));
if (skylines)
{
- sys_stencil.add_stencil (Lookup::points_to_line_stencil (0.1, (*skylines)[UP].to_points (X_AXIS)).in_color (255, 0, 0));
- sys_stencil.add_stencil (Lookup::points_to_line_stencil (0.1, (*skylines)[DOWN].to_points (X_AXIS)).in_color (0, 255, 0));
+ 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));
}
}
/* information that the page breaker might need */
Grob *right_bound = this->get_bound (RIGHT);
- pl->set_property ("skylines", this->get_property ("skylines"));
+ 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"));
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 ());
}
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 "