source file of the GNU LilyPond music typesetter
- (c) 1996--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 1996--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "system.hh"
#include "pointer-group-interface.hh"
#include "spacing-interface.hh"
#include "staff-symbol-referencer.hh"
-#include "tweak-registration.hh"
#include "warn.hh"
+#include "lookup.hh"
extern bool debug_skylines;
-System::System (System const &src, int count)
- : Spanner (src, count)
+System::System (System const &src)
+ : Spanner (src)
{
all_elements_ = 0;
pscore_ = 0;
init_elements ();
}
-System::System (SCM s, Object_key const *key)
- : Spanner (s, key)
+System::System (SCM s)
+ : Spanner (s)
{
all_elements_ = 0;
rank_ = 0;
}
Grob *
-System::clone (int index) const
+System::clone () const
{
- return new System (*this, index);
+ return new System (*this);
}
int
grobs[i]->fixup_refpoint ();
}
-SCM
-System::get_paper_systems ()
+void
+System::do_break_substitution_and_fixup_refpoints ()
{
for (vsize i = 0; i < all_elements_->size (); i++)
{
if (be_verbose_global)
message (_f ("Element count %d.", count + element_count ()));
+}
+
+SCM
+System::get_broken_system_grobs ()
+{
+ SCM ret = SCM_EOL;
+ for (vsize i = 0; i < broken_intos_.size (); i++)
+ ret = scm_cons (broken_intos_[i]->self_scm (), ret);
+ return scm_reverse (ret);
+}
+SCM
+System::get_paper_systems ()
+{
SCM lines = scm_c_make_vector (broken_intos_.size (), SCM_EOL);
for (vsize i = 0; i < broken_intos_.size (); i++)
{
System *system = dynamic_cast<System *> (broken_intos_[i]);
- system->post_processing ();
- system->build_skylines ();
- if (i > 0)
- {
- System *prev = dynamic_cast<System*> (broken_intos_[i-1]);
- Real r = prev->skylines_[DOWN].distance (system->skylines_[UP]);
- system->set_property ("skyline-distance", scm_from_double (r));
- }
scm_vector_set_x (lines, scm_from_int (i),
system->get_paper_system ());
{
for (vsize i = 0; i < breaking.size (); i++)
{
- System *system = dynamic_cast<System *> (clone (broken_intos_.size ()));
+ System *system = dynamic_cast<System *> (clone ());
system->rank_ = broken_intos_.size ();
vector<Grob*> c (breaking[i].cols_);
ga = unsmob_grob_array (scm_ga);
}
- p->rank_
- = ga->size ()
- ? Paper_column::get_rank (ga->array ().back ()) + 1
- : 0;
+ p->rank_ = ga->size ();
ga->add (p);
Axis_group_interface::add_element (this, 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 ()
{
fixup_refpoints (all_elements_->array ());
- for (vsize i = 0; i < all_elements_->size (); i++)
- apply_tweaks (all_elements_->grob (i), false);
-
for (vsize i = 0; i < all_elements_->size (); i++)
{
Grob *g = all_elements_->grob (i);
{
Grob *g = all_elements_->grob (i);
- apply_tweaks (g, true);
(void) g->get_property ("after-line-breaking");
}
SCM exprs = SCM_EOL;
SCM *tail = &exprs;
+ post_processing ();
+ build_skylines ();
+
vector<Layer_entry> entries;
for (vsize j = 0; j < all_elements_->size (); j++)
{
exprs));
if (debug_skylines)
{
- sys_stencil.add_stencil (points_to_line_stencil (skylines_[UP].to_points ()).in_color (255, 0, 0));
- sys_stencil.add_stencil (points_to_line_stencil (skylines_[DOWN].to_points ()).in_color (0, 255, 0));
+ 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));
}
Grob *left_bound = this->get_bound (LEFT);
/* information that the page breaker might need */
Grob *right_bound = this->get_bound (RIGHT);
- pl->set_property ("skyline-distance", get_property ("skyline-distance"));
+ pl->set_property ("skylines", skylines_.smobbed_copy ());
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"));
pl->set_property ("page-turn-penalty", right_bound->get_property ("page-turn-penalty"));
- if (!scm_is_pair (pl->get_property ("refpoint-Y-extent")))
- {
- Interval staff_refpoints;
- staff_refpoints.set_empty ();
- extract_grob_set (this, "spaceable-staves", staves);
- for (vsize i = 0; i < staves.size (); i++)
- {
- Grob *g = staves[i];
- staff_refpoints.add_point (g->relative_coordinate (this, Y_AXIS));
- }
- pl->set_property ("refpoint-Y-extent", ly_interval2scm (staff_refpoints));
- }
+ 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));
+ pl->set_property ("staff-refpoint-extent", ly_interval2scm (staff_refpoints));
pl->set_property ("system-grob", this->self_scm ());
return pl->unprotect ();
left = left->get_column ();
right = right->get_column ();
+
extract_grob_set (this, "columns", cols);
- vsize i = 0;
- while (i < cols.size ()
- && cols[i] != left)
- i++;
+ vsize i = Paper_column::get_rank (left);
+ int end_rank = Paper_column::get_rank (right);
if (i < cols.size ())
i++;
while (i < cols.size ()
- && cols[i] != right)
+ && Paper_column::get_rank (cols[i]) < end_rank)
{
Paper_column *c = dynamic_cast<Paper_column *> (cols[i]);
if (Paper_column::is_breakable (c) && !c->system_)
return ret;
}
+
/** Return all columns, but filter out any unused columns , since they might
disrupt the spacing problem. */
vector<Grob*>
-System::columns () const
+System::used_columns () const
{
extract_grob_set (this, "columns", ro_columns);
return columns;
}
+Paper_column *
+System::column (vsize which) const
+{
+ extract_grob_set (this, "columns", columns);
+ if (which >= columns.size ())
+ return 0;
+
+ return dynamic_cast<Paper_column*> (columns[which]);
+}
+
Paper_score*
System::paper_score () const
{
boxes.push_back (Box (xiv, yiv));
}
- skylines_[UP] = Skyline (boxes, X_AXIS, UP);
- skylines_[DOWN] = Skyline (boxes, X_AXIS, DOWN);
+ 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);
}
"pure-Y-extent "
"spaceable-staves "
"skyline-distance "
+ "skyline-horizontal-padding "
)