#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"
static bool
loose_column (Grob *l, Grob *c, Grob *r)
{
- SCM rns = c->get_grob_property ("right-neighbors");
- SCM lns = c->get_grob_property ("left-neighbors");
+ SCM rns = c->get_property ("right-neighbors");
+ SCM lns = c->get_property ("left-neighbors");
/*
If this column doesn't have a proper neighbor, we should really
such a borderline case.)
*/
- if (!gh_pair_p (lns) || !gh_pair_p (rns))
+ if (!scm_is_pair (lns) || !scm_is_pair (rns))
return false;
- Item * l_neighbor = dynamic_cast<Item*> (unsmob_grob (gh_car (lns)));
- Item * r_neighbor = dynamic_cast<Item*> (unsmob_grob (gh_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;
some cases (two isolated, consecutive clef changes) won't be
nicely folded, but hey, then don't do that.
*/
- if(! ((Paper_column::is_musical (l_neighbor) || Item::breakable_b (l_neighbor))
- && (Paper_column::is_musical (r_neighbor) || Item::breakable_b (r_neighbor))) )
+ if (! ((Paper_column::is_musical (l_neighbor) || Item::is_breakable (l_neighbor))
+ && (Paper_column::is_musical (r_neighbor) || Item::is_breakable (r_neighbor))) )
{
return false;
}
in any case, we don't want to move bar lines.
*/
- for (SCM e = c->get_grob_property ("elements"); gh_pair_p (e); e = gh_cdr (e))
+ for (SCM e = c->get_property ("elements"); scm_is_pair (e); e = scm_cdr (e))
{
- Grob * g = unsmob_grob (gh_car (e));
+ Grob * g = unsmob_grob (scm_car (e));
if (g && Break_align_interface::has_interface (g))
{
- for (SCM s = g->get_grob_property ("elements"); gh_pair_p (s);
- s = gh_cdr (s))
+ for (SCM s = g->get_property ("elements"); scm_is_pair (s);
+ s = scm_cdr (s))
{
- Grob *h = unsmob_grob (gh_car (s));
+ Grob *h = unsmob_grob (scm_car (s));
/*
ugh. -- fix staff-bar name?
- */
- if (h && h->get_grob_property ("break-align-symbol") == ly_symbol2scm ("staff-bar"))
+ */
+ if (h && h->get_property ("break-align-symbol") == ly_symbol2scm ("staff-bar"))
return false;
}
}
Spacing_spanner::prune_loose_columns (Grob*me,Link_array<Grob> *cols, Rational shortest)
{
Link_array<Grob> newcols;
- Real increment = robust_scm2double (me->get_grob_property ("spacing-increment"), 1.2);
+ Real increment = robust_scm2double (me->get_property ("spacing-increment"), 1.2);
for (int i=0; i < cols->size (); i++)
{
- if (Item::breakable_b (cols->elem(i)) || Paper_column::is_musical (cols->elem (i)))
+ if (Item::is_breakable (cols->elem (i)) || Paper_column::is_musical (cols->elem (i)))
{
- newcols.push (cols->elem(i));
+ newcols.push (cols->elem (i));
continue;
}
- Grob *c = cols->elem(i);
+ Grob *c = cols->elem (i);
if (loose_column (cols->elem (i-1), c, cols->elem (i+1)))
{
- SCM lns = c->get_grob_property ("left-neighbors");
- lns = gh_pair_p (lns) ? gh_car (lns) : SCM_BOOL_F;
+ SCM lns = c->get_property ("left-neighbors");
+ lns = scm_is_pair (lns) ? scm_car (lns) : SCM_BOOL_F;
- SCM rns = c->get_grob_property ("right-neighbors");
- rns = gh_pair_p (rns) ? gh_car (rns) : SCM_BOOL_F;
+ SCM rns = c->get_property ("right-neighbors");
+ rns = scm_is_pair (rns) ? scm_car (rns) : SCM_BOOL_F;
/*
Either object can be non existent, if the score ends
prematurely.
- */
- rns = gh_car (unsmob_grob (rns)->get_grob_property ("right-items"));
- c->set_grob_property ("between-cols", gh_cons (lns,
- rns));
+ */
+ rns = scm_car (unsmob_grob (rns)->get_property ("right-items"));
+ c->set_property ("between-cols", scm_cons (lns,
+ rns));
/*
Set distance constraints for loose columns
next_door[LEFT] =cols->elem (i - 1);
next_door[RIGHT] =cols->elem (i + 1);
Direction d = LEFT;
- Drul_array<Real> dists(0,0);
+ Drul_array<Real> dists (0,0);
do
{
Item *lc = dynamic_cast<Item*> ((d == LEFT) ? next_door[LEFT] : c);
Item *rc = dynamic_cast<Item*> (d == LEFT ? c : next_door[RIGHT]);
- for (SCM s = lc->get_grob_property ("spacing-wishes");
- gh_pair_p (s); s = gh_cdr (s))
+ for (SCM s = lc->get_property ("spacing-wishes");
+ scm_is_pair (s); s = scm_cdr (s))
{
- Grob *sp = unsmob_grob (gh_car (s));
+ Grob *sp = unsmob_grob (scm_car (s));
if (Note_spacing::left_column (sp) != lc
|| Note_spacing::right_column (sp) != rc)
continue;
Rod r;
r.distance_ = dists[LEFT] + dists[RIGHT];
- r.item_l_drul_[LEFT] = dynamic_cast<Item*> (cols->elem(i-1));
+ r.item_l_drul_[LEFT] = dynamic_cast<Item*> (cols->elem (i-1));
r.item_l_drul_[RIGHT] = dynamic_cast<Item*> (cols->elem (i+1));
r.add_to_cols ();
void
Spacing_spanner::set_explicit_neighbor_columns (Link_array<Grob> cols)
{
- for (int i=0; i < cols.size(); i++)
+ for (int i=0; i < cols.size (); i++)
{
SCM right_neighbors = SCM_EOL;
int min_rank = 100000; // inf.
- SCM wishes= cols[i]->get_grob_property ("spacing-wishes");
- for (SCM s =wishes; gh_pair_p (s); s = gh_cdr (s))
+ SCM wishes= cols[i]->get_property ("spacing-wishes");
+ for (SCM s =wishes; scm_is_pair (s); s = scm_cdr (s))
{
- Item * wish = dynamic_cast<Item*> (unsmob_grob (gh_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)
right_neighbors =SCM_EOL;
min_rank = right_rank;
- right_neighbors = gh_cons (wish->self_scm (), right_neighbors);
+ right_neighbors = scm_cons (wish->self_scm (), right_neighbors);
}
/*
update the right column of the wish.
- */
+ */
int maxrank = 0;
- SCM left_neighs = rc->get_grob_property ("left-neighbors");
- if (gh_pair_p (left_neighs)
- && unsmob_grob (gh_car (left_neighs)))
+ SCM left_neighs = rc->get_property ("left-neighbors");
+ if (scm_is_pair (left_neighs)
+ && unsmob_grob (scm_car (left_neighs)))
{
- Item * it = dynamic_cast<Item*> (unsmob_grob (gh_car (left_neighs)));
+ Item * it = dynamic_cast<Item*> (unsmob_grob (scm_car (left_neighs)));
maxrank = Paper_column::get_rank (it->get_column ());
}
if (left_rank > maxrank)
left_neighs = SCM_EOL;
- left_neighs = gh_cons (wish->self_scm (), left_neighs);
- rc->set_grob_property ("left-neighbors", right_neighbors);
+ left_neighs = scm_cons (wish->self_scm (), left_neighs);
+ rc->set_property ("left-neighbors", right_neighbors);
}
}
- if (gh_pair_p (right_neighbors))
+ if (scm_is_pair (right_neighbors))
{
- cols[i]->set_grob_property ("right-neighbors", right_neighbors);
+ cols[i]->set_property ("right-neighbors", right_neighbors);
}
}
}
for (int i = 0; i < cols.size (); i++)
{
Item * it = dynamic_cast<Item*>(cols[i]);
- if (!Item::breakable_b (it) && !Paper_column::is_musical (it))
+ if (!Item::is_breakable (it) && !Paper_column::is_musical (it))
continue;
// it->breakable || it->musical
/*
sloppy with typnig left/right-neighbors should take list, but paper-column found instead.
- */
- SCM ln = cols[i] ->get_grob_property ("left-neighbors");
- if (!gh_pair_p (ln) && i )
+ */
+ SCM ln = cols[i] ->get_property ("left-neighbors");
+ if (!scm_is_pair (ln) && i )
{
- cols[i]->set_grob_property ("left-neighbors", gh_cons (cols[i-1]->self_scm(), SCM_EOL));
+ cols[i]->set_property ("left-neighbors", scm_cons (cols[i-1]->self_scm (), SCM_EOL));
}
- SCM rn = cols[i] ->get_grob_property ("right-neighbors");
- if (!gh_pair_p (rn) && i < cols.size () - 1)
+ SCM rn = cols[i] ->get_property ("right-neighbors");
+ if (!scm_is_pair (rn) && i < cols.size () - 1)
{
- cols[i]->set_grob_property ("right-neighbors", gh_cons (cols[i + 1]->self_scm(), SCM_EOL));
+ 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);
- SCM preset_shortest = me->get_grob_property ("common-shortest-duration");
+ SCM preset_shortest = me->get_property ("common-shortest-duration");
Rational global_shortest;
if (unsmob_moment (preset_shortest))
{
{
global_shortest = find_shortest (me, all);
if (verbose_global_b)
- {
- progress_indication (_f("Global shortest duration is %s\n", global_shortest.to_string ()));
- }
+ progress_indication (_f ("Global shortest duration is %s", global_shortest.to_string ()) + "\n");
}
prune_loose_columns (me, &all, global_shortest);
set_implicit_neighbor_columns (all);
for (int i = 1; i < all.size (); i++)
{
Grob *sc = all[i];
- if (Item::breakable_b (sc))
+ if (Item::is_breakable (sc))
{
Link_array<Grob> measure (all.slice (j, i+1));
do_measure (global_shortest, me, &measure);
{
/*
ascending in duration
- */
+ */
Array<Rational> durations;
Array<int> counts;
{
if (Paper_column::is_musical (cols[i]))
{
- Moment *when = unsmob_moment (cols[i]->get_grob_property ("when"));
+ Moment *when = unsmob_moment (cols[i]->get_property ("when"));
/*
ignore grace notes for shortest notes.
if (when && when->grace_part_)
continue;
- SCM st = cols[i]->get_grob_property ("shortest-starter-duration");
+ SCM st = cols[i]->get_property ("shortest-starter-duration");
Moment this_shortest = *unsmob_moment (st);
- assert (this_shortest.to_bool());
+ assert (this_shortest.to_bool ());
shortest_in_measure = shortest_in_measure <? this_shortest.main_part_;
}
else if (!shortest_in_measure.is_infinity ()
- && Item::breakable_b (cols[i]))
+ && Item::is_breakable (cols[i]))
{
int j = 0;
- for (; j < durations.size(); j++)
+ for (; j < durations.size (); j++)
{
if (durations[j] > shortest_in_measure)
{
}
}
- if (durations.size() == j)
+ if (durations.size () == j)
{
durations.push (shortest_in_measure);
counts.push (1);
}
- shortest_in_measure.set_infinite(1);
+ shortest_in_measure.set_infinite (1);
}
}
int max_idx = -1;
int max_count = 0;
- for (int i =durations.size(); i--;)
+ for (int i =durations.size (); i--;)
{
if (counts[i] >= max_count)
{
// printf ("duration %d/%d, count %d\n", durations[i].num (), durations[i].den (), counts[i]);
}
- SCM bsd = me->get_grob_property ("base-shortest-duration");
+ SCM bsd = me->get_property ("base-shortest-duration");
Rational d = Rational (1,8);
if (Moment *m = unsmob_moment (bsd))
d = m->main_part_;
(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_grob_property ("spacing-increment"), 1);
+ Real headwid = robust_scm2double (me->get_property ("spacing-increment"), 1);
for (int i= 0; i < cols->size () - 1; i++)
{
Item * l = dynamic_cast<Item*> (cols->elem (i));
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.
Real compound_fixed_note_space = 0.0;
int wish_count = 0;
- SCM seq = lc->get_grob_property ("right-neighbors");
+ SCM seq = lc->get_property ("right-neighbors");
/*
We adjust the space following a note only if the next note
happens after the current note (this is set in the grob
property SPACING-SEQUENCE.
*/
- for (SCM s = seq; gh_pair_p (s); s = ly_cdr (s))
+ for (SCM s = seq; scm_is_pair (s); s = scm_cdr (s))
{
- Grob * wish = unsmob_grob (gh_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);
}
{
*fixed = 0.0;
Direction d = LEFT;
- Drul_array<Item*> cols(l,r);
+ Drul_array<Item*> cols (l,r);
do
{
while (flip (&d) != LEFT);
- if (l->breakable_b (l) && r->breakable_b(r))
+ if (l->is_breakable (l) && r->is_breakable (r))
{
- Moment *dt = unsmob_moment (l->get_grob_property ("measure-length"));
+ Moment *dt = unsmob_moment (l->get_property ("measure-length"));
Moment mlen (1);
if (dt)
mlen = *dt;
- Real incr = robust_scm2double (me->get_grob_property ("spacing-increment"), 1);
+ Real incr = robust_scm2double (me->get_property ("spacing-increment"), 1);
*space = *fixed + incr * double (mlen.main_part_ / shortest.main_part_) * 0.8;
}
if (dt == Moment (0,0))
{
- for (SCM s = l->get_grob_property ("spacing-wishes");
- gh_pair_p (s); s = gh_cdr (s))
+ for (SCM s = l->get_property ("spacing-wishes");
+ scm_is_pair (s); s = scm_cdr (s))
{
- Item * spacing_grob = dynamic_cast<Item*> (unsmob_grob (gh_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);
}
Real
Spacing_spanner::get_duration_space (Grob*me, Moment d, Rational shortest, bool * expand_only)
{
- Real k = robust_scm2double (me->get_grob_property ("shortest-duration-space"), 1);
- Real incr = robust_scm2double (me->get_grob_property ("spacing-increment"), 1);
+ Real k = robust_scm2double (me->get_property ("shortest-duration-space"), 1);
+ Real incr = robust_scm2double (me->get_property ("spacing-increment"), 1);
if (d < shortest)
{
Moment shortest, bool * expand_only)
{
Moment shortest_playing_len = 0;
- SCM s = lc->get_grob_property ("shortest-playing-duration");
+ SCM s = lc->get_property ("shortest-playing-duration");
if (unsmob_moment (s))
shortest_playing_len = *unsmob_moment (s);
several measures.
*/
- Moment *dt = unsmob_moment (rc->get_grob_property ("measure-length"));
+ Moment *dt = unsmob_moment (rc->get_property ("measure-length"));
if (dt)
{
delta_t = delta_t <? *dt;
dist = get_duration_space (me, shortest, shortest.main_part_, expand_only);
Real grace_fact
- = robust_scm2double (me->get_grob_property ("grace-space-factor"), 1);
+ = robust_scm2double (me->get_property ("grace-space-factor"), 1);
dist *= grace_fact;
}
ADD_INTERFACE (Spacing_spanner,"spacing-spanner-interface",
"The space taken by a note is dependent on its duration. Doubling a\n"
"duration adds spacing-increment to the space. The most common shortest\n"
-"note gets shortest-duration-space. Notes that are even shorter are\n"
+"note gets @code{shortest-duration-space}. Notes that are even shorter are\n"
"spaced proportonial to their duration.\n"
"\n"
"Typically, the increment is the width of a black note head. In a\n"
-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.",
"");
projects / lilypond.git / blobdiff