*/
#include <math.h>
-#include <stdio.h>
+#include <cstdio>
#include "main.hh"
#include "system.hh"
#include "output-def.hh"
#include "paper-score.hh"
#include "paper-column.hh"
-#include "item.hh"
#include "moment.hh"
#include "note-spacing.hh"
#include "misc.hh"
#include "break-align-interface.hh"
#include "spacing-interface.hh"
-
/*
TODO: this file/class is too complex. Should figure out how to chop
this up even more.
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"); scm_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"); scm_is_pair (s);
- s = ly_cdr (s))
+ s = scm_cdr (s))
{
- Grob *h = unsmob_grob (ly_car (s));
+ Grob *h = unsmob_grob (scm_car (s));
/*
ugh. -- fix staff-bar name?
{
Link_array<Grob> newcols;
Real increment = robust_scm2double (me->get_property ("spacing-increment"), 1.2);
- for (int i=0; i < cols->size (); i++)
+ for (int i = 0; i < cols->size (); i++)
{
if (Item::is_breakable (cols->elem (i)) || Paper_column::is_musical (cols->elem (i)))
{
if (loose_column (cols->elem (i-1), c, cols->elem (i+1)))
{
SCM lns = c->get_property ("left-neighbors");
- lns = scm_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 = scm_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));
Set distance constraints for loose columns
*/
Drul_array<Grob*> next_door;
- next_door[LEFT] =cols->elem (i - 1);
- next_door[RIGHT] =cols->elem (i + 1);
+ next_door[LEFT] = cols->elem (i - 1);
+ next_door[RIGHT] = cols->elem (i + 1);
Direction d = LEFT;
Drul_array<Real> dists (0,0);
Item *rc = dynamic_cast<Item*> (d == LEFT ? c : next_door[RIGHT]);
for (SCM s = lc->get_property ("spacing-wishes");
- scm_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;
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_property ("spacing-wishes");
- for (SCM s =wishes; scm_is_pair (s); s = ly_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 (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);
if (right_rank <= min_rank)
{
if (right_rank < min_rank)
- right_neighbors =SCM_EOL;
+ right_neighbors = SCM_EOL;
min_rank = right_rank;
right_neighbors = scm_cons (wish->self_scm (), right_neighbors);
int maxrank = 0;
SCM left_neighs = rc->get_property ("left-neighbors");
if (scm_is_pair (left_neighs)
- && unsmob_grob (ly_car (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 ());
}
Rational shortest_in_measure;
shortest_in_measure.set_infinite (1);
- for (int i =0 ; i < cols.size (); i++)
+ for (int i = 0 ; i < cols.size (); i++)
{
if (Paper_column::is_musical (cols[i]))
{
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)
{
{
Real headwid = robust_scm2double (me->get_property ("spacing-increment"), 1);
- for (int i= 0; i < cols->size () - 1; i++)
+ for (int i = 0; i < cols->size () - 1; i++)
{
Item * l = dynamic_cast<Item*> (cols->elem (i));
Item * r = dynamic_cast<Item*> (cols->elem (i+1));
happens after the current note (this is set in the grob
property SPACING-SEQUENCE.
*/
- for (SCM s = seq; scm_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
music. */
if (Note_spacing::has_interface (wish))
{
- Real space =0.0;
- Real fixed =0.0;
+ Real space = 0.0;
+ Real fixed = 0.0;
Note_spacing::get_spacing (wish, rc, base_note_space, increment, &space, &fixed);
*/
compound_fixed_note_space = compound_fixed_note_space <? compound_note_space;
- bool packed = to_boolean (me->get_paper ()->c_variable ("packed"));
+ bool packed = to_boolean (me->get_layout ()->c_variable ("packed"));
Real strength, distance;
/*
if (dt == Moment (0,0))
{
for (SCM s = l->get_property ("spacing-wishes");
- scm_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;
projects / lilypond.git / blobdiff