(c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
+#include <math.h>
+
#include "axis-group-interface.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"
int
System::spanner_count () const
{
- int k =0;
- for (SCM s = get_property ("all-elements");
- gh_pair_p (s); s = ly_cdr (s))
- {
- if (dynamic_cast<Spanner*> (unsmob_grob (gh_car (s))))
- k++;
- }
-
- return k;
-}
-
-
-int
-scm_default_compare (const void * a, const void *b)
-{
- SCM pa = *(SCM *)a;
- SCM pb = *(SCM *)b;
-
- if (pa < pb)
- return -1;
- else if (pa > pb)
- return 1;
- else
- return 0;
-}
-
-/*
- modify L in place: sort it
-*/
-SCM
-uniquify_list (SCM l)
-{
- int len = scm_ilength (l);
- SCM * arr = new SCM[len];
int k = 0;
- for (SCM s = l; SCM_NNULLP (s); s = SCM_CDR (s))
- arr[k++] = SCM_CAR (s);
-
- assert (k == len);
- qsort (arr, len, sizeof (SCM), &scm_default_compare);
-
- k = 0;
- SCM *tail = &l;
-
- for (int i = 0; i < len ; i++)
- {
- if (i && arr[i] == arr[i-1])
- continue;
-
- SCM_SETCAR (*tail, arr[i]);
- tail = SCM_CDRLOC(*tail);
- }
-
- *tail = SCM_EOL;
- delete[] arr;
-
- return l;
+ for (SCM s = get_property ("all-elements"); ly_c_pair_p (s); s = ly_cdr (s))
+ if (dynamic_cast<Spanner*> (unsmob_grob (ly_car (s))))
+ k++;
+ return k;
}
void
{
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.
static void
fixup_refpoints (SCM s)
{
- for (; gh_pair_p (s); s = ly_cdr (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_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 *g = unsmob_grob (ly_car (s));
if (g->internal_has_interface (ly_symbol2scm ("only-prebreak-interface")))
}
g->suicide ();
}
- else if (g->live ())
+ else if (g->is_live ())
g->do_break_processing ();
}
{
Grob *se = broken_intos_[i];
SCM all = se->get_property ("all-elements");
- for (SCM s = all; gh_pair_p (s); s = ly_cdr (s))
+ for (SCM s = all; ly_c_pair_p (s); s = ly_cdr (s))
fixup_refpoint (ly_car (s));
count += scm_ilength (all);
}
*/
fixup_refpoints (get_property ("all-elements"));
- for (SCM s = get_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_broken_dependencies ();
handle_broken_dependencies ();
/* 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. uniquify_list ()
+ 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++)
{
SCM all = broken_intos_[i]->get_property ("all-elements");
- all = uniquify_list (all);
+ all = ly_list_qsort_uniq_x(all);
}
#endif
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<Item*> (posns->loose_cols_[i]);
if (col->system_)
continue;
- Item * left = 0;
- Item * right = 0;
- do
+ Item *left = 0;
+ Item *right = 0;
+ while (1)
{
SCM between = loose->get_property ("between-cols");
- if (!gh_pair_p (between))
+ if (!ly_c_pair_p (between))
break;
+ Item *le = dynamic_cast<Item*> (unsmob_grob (ly_car (between)));
+ Item *re = dynamic_cast<Item*> (unsmob_grob (ly_cdr (between)));
- Item * l=dynamic_cast<Item*> (unsmob_grob (ly_car (between)));
- Item * r=dynamic_cast<Item*> (unsmob_grob (ly_cdr (between)));
-
- if (!(l && r))
- break ;
+ if (!(le && re))
+ break;
- if (!left && l)
+ if (!left && le)
{
- left = l->get_column ();
+ left = le->get_column ();
if (!left->get_system ())
left = left->find_prebroken_piece (RIGHT);
}
- divide_over ++;
- loose = right = r->get_column ();
+ divide_over++;
+ loose = right = re->get_column ();
}
- while (1);
if (!right->get_system ())
right = right->find_prebroken_piece (LEFT);
- /*
- 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);
+ /* 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 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->system_ = which;
- col->translate_axis (- col->relative_coordinate (common, X_AXIS), X_AXIS);
+ col->translate_axis (-col->relative_coordinate (common, X_AXIS), X_AXIS);
col->translate_axis (lx + dx - cval[LEFT], X_AXIS);
}
}
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 = gh_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", gh_cons (p->self_scm (), cs));
+ me->set_property ("columns", scm_cons (p->self_scm (), cs));
Axis_group_interface::add_element (me, p);
}
void
System::pre_processing ()
{
- for (SCM s = get_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 ("Grob count %d ", element_count ()));
+ progress_indication (_f ("Grob count %d", element_count ()));
- for (SCM s = get_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_property ("all-elements"));
- for (SCM s = get_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 (PRECALCED, PRECALCING, ly_symbol2scm ("before-line-breaking-callback"));
}
progress_indication ("\n" + _ ("Calculating line breaks...") + " ");
- for (SCM s = get_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 * e = unsmob_grob (ly_car (s));
+ Grob *e = unsmob_grob (ly_car (s));
SCM proc = e->get_property ("spacing-procedure");
- if (gh_procedure_p (proc))
- gh_call1 (proc, e->self_scm ());
+ if (ly_c_procedure_p (proc))
+ scm_call_1 (proc, e->self_scm ());
}
}
void
System::post_processing ()
{
- for (SCM s = get_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 *g = unsmob_grob (ly_car (s));
g->calculate_dependencies (POSTCALCED, POSTCALCING,
This might seem inefficient, but Stencils are cached per grob
anyway. */
SCM all = get_property ("all-elements");
- all = uniquify_list (all);
+ all = ly_list_qsort_uniq_x (all);
this->get_stencil ();
- for (SCM s = all; gh_pair_p (s); s = ly_cdr (s))
+ for (SCM s = all; ly_c_pair_p (s); s = ly_cdr (s))
{
Grob *g = unsmob_grob (ly_car (s));
g->get_stencil ();
if (Stencil *me = get_stencil ())
stencils = scm_cons (me->smobbed_copy (), stencils);
- /* Output stencils in three layers: 0, 1, 2. The default layer is
- 1.
+ /* Output stencils in three layers: 0, 1, 2. Default layer: 1.
- Start with layer 3, since scm_cons prepends to list.
-
- */
+ Start with layer 3, since scm_cons prepends to list. */
SCM all = get_property ("all-elements");
-
+
+ Real penalty = 0;
for (int i = LAYER_COUNT; i--;)
- for (SCM s = all; gh_pair_p (s); s = ly_cdr (s))
+ for (SCM s = all; ly_c_pair_p (s); s = ly_cdr (s))
{
Grob *g = unsmob_grob (ly_car (s));
Stencil *stil = g->get_stencil ();
Offset (0, 0))
* Staff_symbol_referencer::staff_space (g);
- /*
- must copy the stencil, for we cannot change the stencil
- cached in G.
- */
+ /* 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 (output_format_global != PAGE_LAYOUT)
- {
- SCM lastcol = ly_car (get_property ("columns"));
- Grob *g = unsmob_grob (lastcol);
-
- SCM between = ly_symbol2scm ("between-system-string");
- SCM inter = g->internal_get_property (between);
- if (gh_string_p (inter))
- stencils = scm_cons (scm_cons (between, inter), 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 (ly_c_number_p (s)) // && fabs (ly_scm2double (s)) < 10000)
+ penalty += ly_scm2double (s);
+ }
+ }
+ }
Interval x (extent (this, X_AXIS));
Interval y (extent (this, Y_AXIS));
Paper_line *pl = new Paper_line (Offset (x.length (), y.length ()),
- stencils);
- return pl->self_scm ();
+ stencils, (bool) penalty); // FIXME.
+
+ 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 (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<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;
ADD_INTERFACE (System,"system-interface",
"This is the toplevel object: each object in a score "
"ultimately has a System object as its X and Y parent. ",
- "between-system-string all-elements columns")
+ "all-elements columns")
projects / lilypond.git / blobdiff