#include "main.hh"
#include "system.hh"
#include "warn.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
#include "paper-score.hh"
#include "paper-column.hh"
#include "item.hh"
such a borderline case.)
*/
- if (!is_pair (lns) || !is_pair (rns))
+ if (!scm_is_pair (lns) || !scm_is_pair (rns))
return false;
- Item * l_neighbor = dynamic_cast<Item*> (unsmob_grob (ly_car (lns)));
- Item * r_neighbor = dynamic_cast<Item*> (unsmob_grob (ly_car (rns)));
+ Item * l_neighbor = dynamic_cast<Item*> (unsmob_grob (scm_car (lns)));
+ Item * r_neighbor = dynamic_cast<Item*> (unsmob_grob (scm_car (rns)));
if (!l_neighbor || !r_neighbor)
return false;
in any case, we don't want to move bar lines.
*/
- for (SCM e = c->get_property ("elements"); is_pair (e); e = ly_cdr (e))
+ for (SCM e = c->get_property ("elements"); scm_is_pair (e); e = scm_cdr (e))
{
- Grob * g = unsmob_grob (ly_car (e));
+ Grob * g = unsmob_grob (scm_car (e));
if (g && Break_align_interface::has_interface (g))
{
- for (SCM s = g->get_property ("elements"); is_pair (s);
- s = ly_cdr (s))
+ for (SCM s = g->get_property ("elements"); scm_is_pair (s);
+ s = scm_cdr (s))
{
- Grob *h = unsmob_grob (ly_car (s));
+ Grob *h = unsmob_grob (scm_car (s));
/*
ugh. -- fix staff-bar name?
- */
+ */
if (h && h->get_property ("break-align-symbol") == ly_symbol2scm ("staff-bar"))
return false;
}
if (loose_column (cols->elem (i-1), c, cols->elem (i+1)))
{
SCM lns = c->get_property ("left-neighbors");
- lns = is_pair (lns) ? ly_car (lns) : SCM_BOOL_F;
+ lns = scm_is_pair (lns) ? scm_car (lns) : SCM_BOOL_F;
SCM rns = c->get_property ("right-neighbors");
- rns = is_pair (rns) ? ly_car (rns) : SCM_BOOL_F;
+ rns = scm_is_pair (rns) ? scm_car (rns) : SCM_BOOL_F;
/*
Either object can be non existent, if the score ends
prematurely.
- */
- rns = ly_car (unsmob_grob (rns)->get_property ("right-items"));
+ */
+ rns = scm_car (unsmob_grob (rns)->get_property ("right-items"));
c->set_property ("between-cols", scm_cons (lns,
- rns));
+ rns));
/*
Set distance constraints for loose columns
Item *rc = dynamic_cast<Item*> (d == LEFT ? c : next_door[RIGHT]);
for (SCM s = lc->get_property ("spacing-wishes");
- is_pair (s); s = ly_cdr (s))
+ scm_is_pair (s); s = scm_cdr (s))
{
- Grob *sp = unsmob_grob (ly_car (s));
+ Grob *sp = unsmob_grob (scm_car (s));
if (Note_spacing::left_column (sp) != lc
|| Note_spacing::right_column (sp) != rc)
continue;
SCM wishes= cols[i]->get_property ("spacing-wishes");
- for (SCM s =wishes; is_pair (s); s = ly_cdr (s))
+ for (SCM s =wishes; scm_is_pair (s); s = scm_cdr (s))
{
- Item * wish = dynamic_cast<Item*> (unsmob_grob (ly_car (s)));
+ Item * wish = dynamic_cast<Item*> (unsmob_grob (scm_car (s)));
Item * lc = wish->get_column ();
Grob * right = Note_spacing::right_column (wish);
/*
update the left column.
- */
+ */
if (right_rank <= min_rank)
{
if (right_rank < min_rank)
/*
update the right column of the wish.
- */
+ */
int maxrank = 0;
SCM left_neighs = rc->get_property ("left-neighbors");
- if (is_pair (left_neighs)
- && unsmob_grob (ly_car (left_neighs)))
+ if (scm_is_pair (left_neighs)
+ && unsmob_grob (scm_car (left_neighs)))
{
- Item * it = dynamic_cast<Item*> (unsmob_grob (ly_car (left_neighs)));
+ Item * it = dynamic_cast<Item*> (unsmob_grob (scm_car (left_neighs)));
maxrank = Paper_column::get_rank (it->get_column ());
}
}
}
- if (is_pair (right_neighbors))
+ if (scm_is_pair (right_neighbors))
{
cols[i]->set_property ("right-neighbors", right_neighbors);
}
/*
sloppy with typnig left/right-neighbors should take list, but paper-column found instead.
- */
+ */
SCM ln = cols[i] ->get_property ("left-neighbors");
- if (!is_pair (ln) && i )
+ if (!scm_is_pair (ln) && i )
{
cols[i]->set_property ("left-neighbors", scm_cons (cols[i-1]->self_scm (), SCM_EOL));
}
SCM rn = cols[i] ->get_property ("right-neighbors");
- if (!is_pair (rn) && i < cols.size () - 1)
+ if (!scm_is_pair (rn) && i < cols.size () - 1)
{
cols[i]->set_property ("right-neighbors", scm_cons (cols[i + 1]->self_scm (), SCM_EOL));
}
{
Grob *me = unsmob_grob (smob);
+ /*
+ can't use get_system() ? --hwn.
+ */
Link_array<Grob> all (me->pscore_->system_->columns ());
set_explicit_neighbor_columns (all);
{
/*
ascending in duration
- */
+ */
Array<Rational> durations;
Array<int> counts;
(different time sigs) than others, and should be spaced differently.
*/
void
-Spacing_spanner::do_measure (Rational global_shortest, Grob*me, Link_array<Grob> *cols)
+Spacing_spanner::do_measure (Rational global_shortest, Grob*me,
+ Link_array<Grob> *cols)
{
Real headwid = robust_scm2double (me->get_property ("spacing-increment"), 1);
breakable_column_spacing (me, l, rb, global_shortest);
if (lb && rb)
breakable_column_spacing (me, lb, rb, global_shortest);
-
- continue ;
}
-
-
- musical_column_spacing (me, lc, rc, headwid, global_shortest);
- if (Item *rb = r->find_prebroken_piece (LEFT))
- musical_column_spacing (me, lc, rb, headwid, global_shortest);
- }
+ else
+ {
+ musical_column_spacing (me, lc, rc, headwid, global_shortest);
+ if (Item *rb = r->find_prebroken_piece (LEFT))
+ musical_column_spacing (me, lc, rb, headwid, global_shortest);
+ }
+ }
}
-
/*
Generate the space between two musical columns LC and RC, given
spacing parameters INCR and SHORTEST.
happens after the current note (this is set in the grob
property SPACING-SEQUENCE.
*/
- for (SCM s = seq; is_pair (s); s = ly_cdr (s))
+ for (SCM s = seq; scm_is_pair (s); s = scm_cdr (s))
{
- Grob * wish = unsmob_grob (ly_car (s));
+ Grob * wish = unsmob_grob (scm_car (s));
Item *wish_rcol = Note_spacing::right_column (wish);
if (Note_spacing::left_column (wish) != lc
*/
compound_fixed_note_space = compound_fixed_note_space <? compound_note_space;
- bool packed = to_boolean (me->get_paper ()->get_scmvar ("packed"));
+ bool packed = to_boolean (me->get_paper ()->c_variable ("packed"));
Real strength, distance;
/*
distance = compound_note_space;
}
- // Spaceable_grob::add_spring (lc, rc, distance, strength, expand_only);
-
- Spaceable_grob::add_spring (lc, rc, distance, strength, false);
+ Spaceable_grob::add_spring (lc, rc, distance, strength);
}
if (dt == Moment (0,0))
{
for (SCM s = l->get_property ("spacing-wishes");
- is_pair (s); s = ly_cdr (s))
+ scm_is_pair (s); s = scm_cdr (s))
{
- Item * spacing_grob = dynamic_cast<Item*> (unsmob_grob (ly_car (s)));
+ Item * spacing_grob = dynamic_cast<Item*> (unsmob_grob (scm_car (s)));
if (!spacing_grob || !Staff_spacing::has_interface (spacing_grob))
continue;
*/
Real strength = 1 / (compound_space - compound_fixed);
Real distance = compound_space;
- Spaceable_grob::add_spring (l, r, distance, strength, false);
+ Spaceable_grob::add_spring (l, r, distance, strength);
}
-ADD_INTERFACE (Spacing_interface,"spacing-interface",
+ADD_INTERFACE (Spacing_interface, "spacing-interface",
"Something to do with line breaking and spacing. Kill this one after determining line breaks.",
"");