#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 "spacing-interface.hh"
#include "staff-symbol-referencer.hh"
#include "paper-book.hh"
-#include "paper-line.hh"
+#include "paper-system.hh"
System::System (SCM s)
: Spanner (s)
{
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 ());
+ 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.
}
g->suicide ();
}
- else if (g->live ())
+ else if (g->is_live ())
g->do_break_processing ();
}
progress_indication (_f ("Element count %d.", count + element_count ()));
int line_count = broken_intos_.size ();
- SCM lines = scm_c_make_vector (line_count, SCM_UNDEFINED);
+ SCM lines = scm_c_make_vector (line_count, SCM_EOL);
- for (int i = 0; i < line_count; i++)
+ for (int i = 0; i < line_count; i++)
{
if (verbose_global_b)
progress_indication ("[");
if (verbose_global_b)
progress_indication (to_string (i) + "]");
}
- return lines;
+ return lines;
}
-
-
-
/* Find the loose columns in POSNS, and drape them around the columns
specified in BETWEEN-COLS. */
static void
void
System::break_into_pieces (Array<Column_x_positions> const &breaking)
{
- for (int i=0; i < breaking.size (); i++)
+ for (int i = 0; i < breaking.size (); i++)
{
System *system = dynamic_cast <System*> (clone ());
system->rank_ = i;
system->set_bound (LEFT,c[0]);
system->set_bound (RIGHT,c.top ());
- for (int j=0; j < c.size (); j++)
+ for (int j = 0; j < c.size (); j++)
{
- c[j]->translate_axis (breaking[i].config_[j],X_AXIS);
+ c[j]->translate_axis (breaking[i].config_[j], X_AXIS);
dynamic_cast<Paper_column*> (c[j])->system_ = system;
}
set_loose_columns (system, &breaking[i]);
{
Grob *me = this;
SCM cs = me->get_property ("columns");
- Grob * prev = ly_c_pair_p (cs) ? unsmob_grob (ly_car (cs)) : 0;
+ Grob *prev = ly_c_pair_p (cs) ? unsmob_grob (ly_car (cs)) : 0;
p->rank_ = prev ? Paper_column::get_rank (prev) + 1 : 0;
- me->set_property ("columns", scm_cons (p->self_scm (), cs));
+ me->set_property ("columns", scm_cons (p->self_scm (), cs));
Axis_group_interface::add_element (me, p);
}
unsmob_grob (ly_car (s))->discretionary_processing ();
if (verbose_global_b)
- progress_indication (_f ("Grob count %d", element_count ()));
-
+ progress_indication (_f ("Grob count %d", element_count ()));
for (SCM s = get_property ("all-elements"); ly_c_pair_p (s); s = ly_cdr (s))
unsmob_grob (ly_car (s))->handle_prebroken_dependencies ();
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 line breaks...") + " ");
+ 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));
+ 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 ());
Start with layer 3, since scm_cons prepends to list. */
SCM all = get_property ("all-elements");
- Real penalty = 0;
+ 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))
{
/* Must copy the stencil, for we cannot change the stencil
cached in G. */
- SCM my_stencil = stil->smobbed_copy ();
- unsmob_stencil (my_stencil)->translate (o + extra);
- stencils = scm_cons (my_stencil, stencils);
-
- if (g->original_)
- {
- if (Item *it = dynamic_cast <Item*> (g))
- {
- Grob *col = it->get_column ();
- SCM s = col->get_property ("page-penalty");
- // FIXME; page breaking is not discrete at +-10000
- if (is_number (s)) // && fabs (ly_scm2double (s)) < 10000)
- penalty += ly_scm2double (s);
- }
- }
+
+ Stencil st = *stil;
+ st.translate (o + extra);
+ *tail = scm_cons (st.expr (), SCM_EOL);
+ tail = SCM_CDRLOC(*tail);
+
}
+
+
Interval x (extent (this, X_AXIS));
Interval y (extent (this, Y_AXIS));
- Paper_line *pl = new Paper_line (Offset (x.length (), y.length ()),
- stencils, penalty);
+ Stencil sys_stencil (Box (x,y),
+ scm_cons (ly_symbol2scm ("combine-stencil"),
+ exprs));
+
+ Paper_system *pl = new Paper_system (sys_stencil, false);
- scm_gc_unprotect_object (pl->self_scm ());
- return pl->self_scm ();
+ 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<Item>
-System::broken_col_range (Item const*l, Item const*r) const
+System::broken_col_range (Item const *left, Item const *right) const
{
Link_array<Item> ret;
- l = l->get_column ();
- r = r->get_column ();
+ left = left->get_column ();
+ right = right->get_column ();
SCM s = get_property ("columns");
- while (ly_c_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 (ly_c_pair_p (s))
s = ly_cdr (s);
- while (ly_c_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<Paper_column*> (unsmob_grob (ly_car (s)));
if (Item::is_breakable (c) && !c->system_)
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<Grob>
-System::columns ()const
+System::columns () const
{
Link_array<Grob> 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::is_breakable (acs[i]);
- bfound = bfound || brb;
+ 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::is_used (acs[i]))
+ if (!found || !Paper_column::is_used (acs[i]))
acs.del (i);
}
return acs;
projects / lilypond.git / blobdiff