recent_enough (int bar_number, SCM alteration_def, SCM laziness)
{
if (scm_is_number (alteration_def)
- || laziness== SCM_BOOL_T)
+ || laziness == SCM_BOOL_T)
return true;
return (bar_number <= scm_to_int (scm_cdr (alteration_def)) + scm_to_int (laziness));
return;
}
- Pitch *p= unsmob_pitch (mcause->get_property ("pitch"));
+ Pitch *p = unsmob_pitch (mcause->get_property ("pitch"));
int n = p->get_notename ();
Link_array<Grob> *break_reminder,
Link_array<Grob> *real_acc)
{
- for (SCM acs =accs->get_property ("accidental-grobs"); scm_is_pair (acs);
- acs =scm_cdr (acs))
+ for (SCM acs = accs->get_property ("accidental-grobs"); scm_is_pair (acs);
+ acs = scm_cdr (acs))
for (SCM s = scm_cdar (acs); scm_is_pair (s); s = scm_cdr (s))
{
Grob *a = unsmob_grob (scm_car (s));
Y-position, they share an Ape, and will be printed in overstrike.
*/
Link_array<Accidental_placement_entry> apes;
- for (SCM s = accs; scm_is_pair (s); s =scm_cdr (s))
+ for (SCM s = accs; scm_is_pair (s); s = scm_cdr (s))
{
Accidental_placement_entry *ape = new Accidental_placement_entry;
ape->notename_ = scm_to_int (scm_caar (s));
- for (SCM t = scm_cdar (s); scm_is_pair (t); t =scm_cdr (t))
+ for (SCM t = scm_cdar (s); scm_is_pair (t); t = scm_cdr (t))
ape->grobs_.push (unsmob_grob (scm_car (t)));
apes.push (ape);
extents if we're sure that we've found the right common refpoint
*/
Link_array<Grob> note_cols, heads;
- for (int i= apes.size (); i--;)
+ for (int i = apes.size (); i--;)
{
Accidental_placement_entry * ape = apes[i];
for (int j = ape->grobs_.size (); j--;)
common[Y_AXIS] = common_refpoint_of_array (heads, common[Y_AXIS], Y_AXIS);
- for (int i= apes.size (); i--;)
+ for (int i = apes.size (); i--;)
{
Accidental_placement_entry * ape = apes[i];
ape->left_skyline_ = empty_skyline (LEFT);
/*
Add accs entries right-to-left.
*/
- for (int i= apes.size (); i-- > 0;)
+ for (int i = apes.size (); i-- > 0;)
{
Real offset =
-skyline_meshing_distance (apes[i]->right_skyline_, left_skyline);
for (int i = 256 >? fi->numOfChars; i--;)
ascii_to_metric_idx_.push (-1);
- for (int i= 0; i < fi->numOfChars; i++)
+ for (int i = 0; i < fi->numOfChars; i++)
{
AFM_CharMetricInfo * c = fi->cmi + i;
Link_array<Grob> elems
= Pointer_group_interface__extract_grobs (me, (Grob*) 0, "elements");
- Real where_f= 0;
+ Real where_f = 0;
Interval v;
v.set_empty ();
Array<Real> translates;
- for (int j= elems.size (); j--; )
+ for (int j = elems.size (); j--; )
{
/*
This is not very elegant, in that we need special support for
Link_array<Grob> elems;
Link_array<Grob> all_grobs
= Pointer_group_interface__extract_grobs (me, (Grob*) 0, "elements");
- for (int i= 0; i < all_grobs.size (); i++)
+ for (int i = 0; i < all_grobs.size (); i++)
{
Interval y = all_grobs[i]->extent (me, a);
if (!y.is_empty ())
{
- Grob *e =dynamic_cast<Grob*> (all_grobs[i]);
+ Grob *e = dynamic_cast<Grob*> (all_grobs[i]);
elems.push (e);
dims.push (y);
Array<Real> translates ;
Interval total;
- Real where_f= 0;
+ Real where_f = 0;
- for (int j= 0 ; j < elems.size (); j++)
+ for (int j = 0 ; j < elems.size (); j++)
{
Real dy = - dims[j][-stacking_dir];
if (j)
{
Grob * stem = unsmob_grob (scm_car (s));
Grob * ss = Staff_symbol_referencer::get_staff_symbol (stem);
- Interval iv =Stem::head_positions (stem);
+ Interval iv = Stem::head_positions (stem);
iv *= Staff_symbol::staff_space (ss)/2.0;
heads.unite (iv + ss->relative_coordinate (common, Y_AXIS)
}
Stencil mol;
- Font_metric *fm =Font_interface::get_default_font (me);
+ Font_metric *fm = Font_interface::get_default_font (me);
Stencil squiggle = fm->find_by_name ("scripts-arpeggio");
Stencil arrow ;
heads[dir] -= dir * arrow.extent (Y_AXIS).length ();
}
- for (Real y= heads[LEFT] ; y < heads[RIGHT];
+ for (Real y = heads[LEFT] ; y < heads[RIGHT];
y+= squiggle. extent (Y_AXIS).length ())
mol.add_at_edge (Y_AXIS, UP,squiggle, 0.0, 0);
Audio_key::Audio_key (int acc, bool major)
{
- accidentals_=acc;
- major_=major;
+ accidentals_ = acc;
+ major_ = major;
}
Audio_dynamic::Audio_dynamic (Real volume)
/*
Determine end moment for auto beaming (or begin moment, but mostly
- 0==anywhere) In order of increasing priority:
+ 0== anywhere) In order of increasing priority:
i. begin anywhere, end at every beat
ii. end * <num> <den>
finished_beam_ = 0;
delete finished_grouping_;
- finished_grouping_= 0;
+ finished_grouping_ = 0;
}
}
if (!staffline_)
return ;
- for (int i= 0; i < elts_.size (); i++)
+ for (int i = 0; i < elts_.size (); i++)
{
if (!unsmob_grob (elts_[i]->get_property ("axis-group-parent-Y")))
{
{
SCM ax = scm_cons (sa1, SCM_EOL);
if (a1 != a2)
- ax= scm_cons (sa2, ax);
+ ax = scm_cons (sa2, ax);
me->set_property ("axes", ax);
}
Context *tr = get_outlet ();
SCM mp = tr->get_property ("measurePosition");
- SCM sync= tr->get_property ("barCheckSynchronize");
+ SCM sync = tr->get_property ("barCheckSynchronize");
- Moment * where =unsmob_moment (mp);
+ Moment * where = unsmob_moment (mp);
if (!where)
return;
if (where->main_part_)
{
- bool warn =true;
+ bool warn = true;
if (to_boolean (sync))
{
tr = tr->where_defined (ly_symbol2scm ("measurePosition"));
SCM barsiz_proc = me->get_property ("bar-size-procedure");
if (scm_is_string (s) && ly_c_procedure_p (barsiz_proc))
{
- String str =ly_scm2string (s);
+ String str = ly_scm2string (s);
SCM siz = scm_call_1 (barsiz_proc, me->self_scm ());
Real sz = robust_scm2double (siz, 0);
if (sz <= 0)
Stencil thick = simple_barline (me, fatline, h);
Stencil dot = Font_interface::get_default_font (me)->find_by_name ("dots-dot");
- int lines =Staff_symbol_referencer::line_count (me);
+ int lines = Staff_symbol_referencer::line_count (me);
Real dist
= ((lines & 1 || lines == 0)
? 1
SCM
Bar_line::before_line_breaking (SCM smob)
{
- Grob*me=unsmob_grob (smob);
+ Grob*me = unsmob_grob (smob);
Item * item = dynamic_cast<Item*> (me);
SCM g = me->get_property ("glyph");
Array<int> close_positions;
Array<int> far_positions;
- for (int i= 0; i < stems.size (); i++)
+ for (int i = 0; i < stems.size (); i++)
{
/*
For chords, we take the note head that is closest to the beam.
{
beam_ = 0;
finished_beam_ = 0;
- finished_beam_info_= 0;
+ finished_beam_info_ = 0;
beam_info_ = 0;
now_stop_ev_ = 0;
start_ev_ = 0;
{
start_ev_ = m;
}
- else if (d==STOP)
+ else if (d == STOP)
{
now_stop_ev_ = m;
}
{
start_ev_ = m;
}
- else if (d==STOP)
+ else if (d == STOP)
{
now_stop_ev_ = m;
}
Do stem computations. These depend on YL and YR linearly, so we can
precompute for every stem 2 factors.
*/
- Link_array<Grob> stems=
+ Link_array<Grob> stems =
Pointer_group_interface__extract_grobs (me, (Grob*)0, "stems");
Array<Stem_info> stem_infos;
Array<Real> base_lengths;
stem_y != 0.0, when we're cross staff.
*/
- for (int i= 0; i < stems.size (); i++)
+ for (int i = 0; i < stems.size (); i++)
{
Grob*s = stems[i];
stem_xposns.push (s->relative_coordinate (common[X_AXIS], X_AXIS));
}
- bool xstaff= false;
+ bool xstaff = false;
if (lvs && fvs)
{
Grob *commony = fvs->common_refpoint (lvs, Y_AXIS);
for (int i = qscores.size (); i--;)
if (qscores[i].demerits < reasonable_score)
{
- Real d=score_stem_lengths (stems, stem_infos,
+ Real d = score_stem_lengths (stems, stem_infos,
base_lengths, stem_xposns,
xl, xr,
is_knee,
Real mindist = 1e6;
for (; i < qscores.size (); i ++)
{
- Real d =fabs (qscores[i].yl- ins[LEFT]) + fabs (qscores[i].yr - ins[RIGHT]);
+ Real d = fabs (qscores[i].yl- ins[LEFT]) + fabs (qscores[i].yr - ins[RIGHT]);
if (d < mindist)
{
best_idx = i;
- mindist= d;
+ mindist = d;
}
}
if (mindist > 1e5)
Drul_array<Real> score (0, 0);
Drul_array<int> count (0, 0);
- for (int i= 0; i < stems.size (); i++)
+ for (int i = 0; i < stems.size (); i++)
{
Grob* s = stems[i];
if (Stem::is_invisible (s))
void
Beam::connect_beams (Grob *me)
{
- Link_array<Grob> stems=
+ Link_array<Grob> stems =
Pointer_group_interface__extract_grobs (me, (Grob*)0, "stems");
Slice last_int;
Spanner *me = unsmob_spanner (grob);
position_beam (me);
- Link_array<Grob> stems=
+ Link_array<Grob> stems =
Pointer_group_interface__extract_grobs (me, (Grob*)0, "stems");
Grob* xcommon = common_refpoint_of_array (stems, me, X_AXIS);
pos = Interval (0,0);
}
else
- pos= ly_scm2realdrul (posns);
+ pos = ly_scm2realdrul (posns);
scale_drul (&pos, Staff_symbol_referencer::staff_space (me));
Array<int> rfliebertjes;
for (SCM s = left;
- scm_is_pair (s); s =scm_cdr (s))
+ scm_is_pair (s); s = scm_cdr (s))
{
int b = scm_to_int (scm_car (s));
if (scm_c_memq (scm_car (s), right) != SCM_BOOL_F)
}
}
for (SCM s = right;
- scm_is_pair (s); s =scm_cdr (s))
+ scm_is_pair (s); s = scm_cdr (s))
{
int b = scm_to_int (scm_car (s));
if (scm_c_memq (scm_car (s), left) == SCM_BOOL_F)
count[UP] = count[DOWN] = 0;
Direction d = DOWN;
- Link_array<Grob> stems=
+ Link_array<Grob> stems =
Pointer_group_interface__extract_grobs (me, (Grob*)0, "stems");
- for (int i= 0; i < stems.size (); i++)
+ for (int i = 0; i < stems.size (); i++)
do {
Grob *s = stems[i];
Direction sd = get_grob_direction (s);
Beam::set_stem_directions (Grob *me, Direction d)
{
Link_array<Grob> stems
- =Pointer_group_interface__extract_grobs (me, (Grob*) 0, "stems");
+ = Pointer_group_interface__extract_grobs (me, (Grob*) 0, "stems");
- for (int i= 0; i <stems.size (); i++)
+ for (int i = 0; i <stems.size (); i++)
{
Grob *s = stems[i];
gaps.set_full ();
- Link_array<Grob> stems=
+ Link_array<Grob> stems =
Pointer_group_interface__extract_grobs (me, (Grob*)0, "stems");
Grob *common = common_refpoint_of_array (stems, me, Y_AXIS);
Real staff_space = Staff_symbol_referencer::staff_space (me);
Array<Interval> hps_array;
- for (int i= 0; i < stems.size (); i++)
+ for (int i = 0; i < stems.size (); i++)
{
Grob* stem = stems[i];
if (Stem::is_invisible (stem))
Array<Real> x_posns ;
- Link_array<Grob> stems=
+ Link_array<Grob> stems =
Pointer_group_interface__extract_grobs (me, (Grob*)0, "stems");
Grob *commonx = common_refpoint_of_array (stems, me, X_AXIS);
Grob *commony = common_refpoint_of_array (stems, me, Y_AXIS);
+ lvs->relative_coordinate (commony, Y_AXIS) - my_y);
Real x0 = first_visible_stem (me)->relative_coordinate (commonx, X_AXIS);
- for (int i= 0; i < stems.size (); i++)
+ for (int i = 0; i < stems.size (); i++)
{
Grob* s = stems[i];
else
{
Array<Offset> ideals;
- for (int i= 0; i < stems.size (); i++)
+ for (int i = 0; i < stems.size (); i++)
{
Grob* s = stems[i];
if (Stem::is_invisible (s))
Code dup.
*/
Array<Real> x_posns ;
- Link_array<Grob> stems=
+ Link_array<Grob> stems =
Pointer_group_interface__extract_grobs (me, (Grob*)0, "stems");
Grob *commonx = common_refpoint_of_array (stems, me, X_AXIS);
Grob *commony = common_refpoint_of_array (stems, me, Y_AXIS);
if (!fvs)
return SCM_UNSPECIFIED;
- Real x0 =fvs->relative_coordinate (commonx, X_AXIS);
- for (int i= 0; i < stems.size (); i++)
+ Real x0 = fvs->relative_coordinate (commonx, X_AXIS);
+ for (int i = 0; i < stems.size (); i++)
{
Grob* s = stems[i];
Real dy = pos[RIGHT] - pos[LEFT];
Real y = pos[LEFT];
- Real slope =dy/dx;
+ Real slope = dy/dx;
/*
*/
Interval feasible_left_point;
feasible_left_point.set_full ();
- for (int i= 0; i < stems.size (); i++)
+ for (int i = 0; i < stems.size (); i++)
{
Grob* s = stems[i];
if (Stem::is_invisible (s))
{
Slice bm = Stem::beam_multiplicity (s);
if (!bm.is_empty ())
- stem_y +=bm[my_dir] * beam_translation;
+ stem_y += bm[my_dir] * beam_translation;
}
Real id = me->relative_coordinate (common[Y_AXIS], Y_AXIS)
void
Beam::set_stem_lengths (Grob *me)
{
- Link_array<Grob> stems=
+ Link_array<Grob> stems =
Pointer_group_interface__extract_grobs (me, (Grob*)0, "stems");
if (!stems.size ())
Real xl = fvs ? fvs->relative_coordinate (common[X_AXIS], X_AXIS) : 0.0;
Real xr = lvs ? lvs->relative_coordinate (common[X_AXIS], X_AXIS) : 0.0;
- for (int i= 0; i < stems.size (); i++)
+ for (int i = 0; i < stems.size (); i++)
{
Grob* s = stems[i];
if (Stem::is_invisible (s))
void
Beam::set_beaming (Grob *me, Beaming_info_list *beaming)
{
- Link_array<Grob> stems=
+ Link_array<Grob> stems =
Pointer_group_interface__extract_grobs (me, (Grob *)0, "stems");
Direction d = LEFT;
- for (int i= 0; i < stems.size (); i++)
+ for (int i = 0; i < stems.size (); i++)
{
/*
Don't overwrite user settings.
Link_array<Grob>stems =
Pointer_group_interface__extract_grobs (me, (Grob*) 0, "stems");
int f = 0;
- for (int i= 0; i < stems.size (); i++)
+ for (int i = 0; i < stems.size (); i++)
{
Grob *s = stems[i];
int minidx = -1;
Moment beat_pos;
- for (int i=1; i < infos_.size (); i++)
+ for (int i =1; i < infos_.size (); i++)
{
beat_pos = infos_[i].start_mom_ / beat_length;
int den = beat_pos.den ();
}
}
- return minidx|(minden==1 && subdivide ? at_beat : 0);
+ return minidx|(minden ==1 && subdivide ? at_beat : 0);
}
int
Formula of the bezier 3-spline
- sum_{j= 0}^3 (3 over j) z_j (1-t)^ (3-j) t^j
+ sum_{j = 0}^3 (3 over j) z_j (1-t)^ (3-j) t^j
A is the axis of X coordinate.
Real one_min_tj = (1-t)* (1-t)* (1-t);
Offset o;
- for (int j= 0 ; j < 4; j++)
+ for (int j = 0 ; j < 4; j++)
{
o += control_[j] * binomial_coefficient (3, j)
* pow (t,j) * pow (1-t, 3-j);
Bezier::polynomial (Axis a)const
{
Polynomial p (0.0);
- for (int j= 0; j <= 3; j++)
+ for (int j = 0; j <= 3; j++)
{
p +=
(control_[j][a] * binomial_coefficient (3, j))
Array<Real>
Bezier::solve_derivative (Offset deriv)const
{
- Polynomial xp=polynomial (X_AXIS);
- Polynomial yp=polynomial (Y_AXIS);
+ Polynomial xp = polynomial (X_AXIS);
+ Polynomial yp = polynomial (Y_AXIS);
xp.differentiate ();
yp.differentiate ();
Array<Real> sols (solve_derivative (d));
sols.push (1.0);
sols.push (0.0);
- for (int i= sols.size (); i--;)
+ for (int i = sols.size (); i--;)
{
Offset o (curve_point (sols[i]));
iv.unite (Interval (o[a],o[a]));
void
Bezier::assert_sanity () const
{
- for (int i= 0; i < CONTROL_COUNT; i++)
+ for (int i = 0; i < CONTROL_COUNT; i++)
assert (!isnan (control_[i].length ())
&& !isinf (control_[i].length ()));
}
void
Box::translate (Offset o)
{
- for (Axis i=X_AXIS; i < NO_AXES; incr (i))
+ for (Axis i = X_AXIS; i < NO_AXES; incr (i))
interval_a_[i] += o[i];
}
void
Box::unite (Box b)
{
- for (Axis i=X_AXIS; i < NO_AXES; incr (i))
+ for (Axis i = X_AXIS; i < NO_AXES; incr (i))
interval_a_[i].unite (b[i]);
}
if (item->get_parent (X_AXIS))
return;
- SCM bp=item->get_property ("breakable");
+ SCM bp = item->get_property ("breakable");
bool breakable = (to_boolean (bp));
if (!breakable)
return ;
{
SCM sym = scm_car (order);
- for (SCM s =elts; scm_is_pair (s); s = scm_cdr (s))
+ for (SCM s = elts; scm_is_pair (s); s = scm_cdr (s))
{
Grob *g = unsmob_grob (scm_car (s));
if (g && sym == g->get_property ("break-align-symbol"))
Array<Interval> extents;
int last_nonempty = -1;
- for (int i= 0; i < elems.size (); i++)
+ for (int i = 0; i < elems.size (); i++)
{
Interval y = elems[i]->extent (elems[i], X_AXIS);
extents.push (y);
Array<Real> offsets;
offsets.set_size (elems.size ());
- for (int i= 0; i < offsets.size ();i ++)
+ for (int i = 0; i < offsets.size ();i ++)
offsets[i] = 0.0;
== ly_symbol2scm ( "left-edge"))
edge_idx = idx;
- SCM l =elt->get_property ("space-alist");
+ SCM l = elt->get_property ("space-alist");
if (scm_is_pair (l))
{
- alist= l;
+ alist = l;
break;
}
}
for (SCM s = r ? r->get_property ("elements") : SCM_EOL;
!scm_is_symbol (rsym) && scm_is_pair (s); s = scm_cdr (s))
{
- Grob * elt =unsmob_grob (scm_car (s));
+ Grob * elt = unsmob_grob (scm_car (s));
rsym = elt->get_property ("break-align-symbol");
}
for (SCM s = grob_list; scm_is_pair (s); s = scm_cdr (s))
{
- SCM n= substitute_grob (unsmob_grob (scm_car (s)));
+ SCM n = substitute_grob (unsmob_grob (scm_car (s)));
if (n != SCM_UNDEFINED)
{
Slice
item_system_range (Item* it)
{
- if (System*st= it->get_system ())
+ if (System*st = it->get_system ())
return Slice (st->rank_, st->rank_);
Slice sr;
if (bi && bi->get_system ())
sr.add_point (bi->get_system ()->rank_);
}
- while (flip (&d)!=LEFT);
+ while (flip (&d)!= LEFT);
return sr;
}
for (int k = 0; k < 2;k++)
for (int j = (*arrs[k])[i][LEFT]; j <= (*arrs[k])[i][RIGHT]; j++)
{
- SCM subs =substitute_grob (vec[j].grob_);
+ SCM subs = substitute_grob (vec[j].grob_);
if (subs!= SCM_UNDEFINED)
{
*tail = scm_cons (subs, SCM_EOL);
sp_indices[i].length () , len -sp_index);
{
- SCM l1 =substitute_grob_list (grob_list);
+ SCM l1 = substitute_grob_list (grob_list);
assert (scm_ilength (l1) == scm_ilength (newval));
}
#endif
int octavation = scm_to_int (oct);
Pitch orig = p->transposed (Pitch (-octavation, 0,0));
- pitches= scm_cons (orig.smobbed_copy (), pitches);
+ pitches = scm_cons (orig.smobbed_copy (), pitches);
}
else
programming_error ("Inversion does not have original pitch.");
void
Clef_engraver::acknowledge_grob (Grob_info info)
{
- Item * item =dynamic_cast <Item *> (info.grob_);
+ Item * item = dynamic_cast <Item *> (info.grob_);
if (item)
{
if (Bar_line::has_interface (info.grob_)
for (int i = 0; i <cluster_notes_.size (); i++)
{
- Pitch *pit =unsmob_pitch (cluster_notes_[i]->get_property ("pitch"));
+ Pitch *pit = unsmob_pitch (cluster_notes_[i]->get_property ("pitch"));
int p =( pit ? pit->steps () : 0) + c0;
{
Real blotdiameter = Staff_symbol_referencer::staff_space (me)/2;
- Real padding =robust_scm2double ( me->get_property ("padding"), 0.0);
+ Real padding = robust_scm2double ( me->get_property ("padding"), 0.0);
Offset vpadding = Offset (0, padding);
Offset hpadding = Offset (0.5 * blotdiameter, 0);
Item *right_bound = spanner->get_bound (RIGHT);
Grob *commonx = left_bound->common_refpoint (right_bound, X_AXIS);
- SCM cols =me->get_property ("columns");
+ SCM cols = me->get_property ("columns");
if (!scm_is_pair (cols))
{
SCM incr_scm = lc->get_property ("forced-spacing");
if (incr_scm != SCM_EOL) /* (Paper_column::is_musical (l)) */
{
- me->warning (_f ("gotcha: ptr=%ul", lc));//debug
+ me->warning (_f ("gotcha: ptr =%ul", lc));//debug
ly_display_scm (lc->self_scm ());
Real distance;
if (incr_scm != SCM_EOL)
me->warning ("distance undefined, assuming 0.1");
distance = 0.1;
}
- me->warning (_f ("distance=%f", distance));//debug
+ me->warning (_f ("distance =%f", distance));//debug
Real strength = 1.0;
Spaceable_grob::add_spring (lc, rc, distance, strength);
if (Item *rb = r->find_prebroken_piece (LEFT))
Grob *sibling_parent = sibling->get_parent (X_AXIS);
sibling_parent->warning (_f ("Coherent_ligature_engraver: "
"setting `spacing-increment = "
- "0.01': ptr=%ul", parent));
+ "0.01': ptr =%ul", parent));
sibling_parent->set_property ("forced-spacing",
scm_make_real (0.01));
#endif
}
- for (int i= 0; i< note_columns_.size (); i++)
+ for (int i = 0; i< note_columns_.size (); i++)
Note_collision_interface::add_column (col_,note_columns_[i]);
}
Duration
Completion_heads_engraver::find_nearest_duration (Rational length)
{
- int log_limit= 6;
+ int log_limit = 6;
Duration d (0,0);
note->set_property ("duration-log",
scm_int2num (note_dur.duration_log ()));
- int dots= note_dur.dot_count ();
+ int dots = note_dur.dot_count ();
if (dots)
{
Item * d = make_item ("Dots", SCM_EOL);
dots_.push (d);
}
- Pitch *pit =unsmob_pitch (req->get_property ("pitch"));
+ Pitch *pit = unsmob_pitch (req->get_property ("pitch"));
int pos = pit->steps ();
SCM c0 = get_property ("middleCPosition");
if (prev_notes_.size () == notes_.size ())
{
- for (int i= 0; i < notes_.size (); i++)
+ for (int i = 0; i < notes_.size (); i++)
{
Grob * p = make_spanner ("Tie", SCM_EOL);
Tie::set_interface (p); // cannot remove yet!
accepteds.push (t);
Link_array<Context_def> best_result;
- for (int i= 0; i < accepteds.size (); i++)
+ for (int i = 0; i < accepteds.size (); i++)
{
/* do not check aliases, because \context Staff should not
create RhythmicStaff. */
}
}
- int best_depth= INT_MAX;
- for (int i= 0; i < accepteds.size (); i++)
+ int best_depth = INT_MAX;
+ for (int i = 0; i < accepteds.size (); i++)
{
Context_def * g = accepteds[i];
if (scm_is_pair (trans_list))
scm_set_cdr_x (scm_last_pair (trans_list), cons);
else
- trans_list= cons;
+ trans_list = cons;
}
else
{
void
Interpretation_context_handle::set_context (Context *trans)
{
- if (outlet_ ==trans)
+ if (outlet_ == trans)
return;
if (outlet_)
down ();
"Return the value of @var{name} from context @var{c}")
{
Context *t = unsmob_context (c);
- Context * tr= (t);
+ Context * tr = (t);
SCM_ASSERT_TYPE (tr, c, SCM_ARG1, __FUNCTION__, "Translator group");
SCM_ASSERT_TYPE (scm_is_symbol (name), name, SCM_ARG2, __FUNCTION__, "symbol");
Context * current = this;
// start at 1. The first one (index 0) will be us.
- for (int i= 0; i < path.size (); i++)
+ for (int i = 0; i < path.size (); i++)
{
SCM ops = (i == path.size () -1) ? operations : SCM_EOL;
Context * current = this;
// start at 1. The first one (index 0) will be us.
- for (int i= 0; i < path.size (); i++)
+ for (int i = 0; i < path.size (); i++)
{
SCM ops = (i == path.size () -1) ? operations : SCM_EOL;
scm_display (d->get_context_name (), port);
}
- if (Context *td=dynamic_cast<Context *> (sc))
+ if (Context *td = dynamic_cast<Context *> (sc))
{
scm_puts ("=", port);
scm_puts (td->id_string_.to_str0 (), port);
Direction
get_grob_direction (Grob*me)
{
- SCM d= me->get_property ("direction");
+ SCM d = me->get_property ("direction");
if (!is_direction (d))
return CENTER;
}
int p = Staff_symbol_referencer::get_rounded_position (dp.dot_);
- dp.pos_= p;
+ dp.pos_ = p;
if (dp.extremal_head_)
dp.dir_ = to_dir (dp.dot_->get_property ("direction"));
Drum_notes_engraver::process_music ()
{
SCM tab = 0;
- for (int i= 0; i < events_.size (); i++)
+ for (int i = 0; i < events_.size (); i++)
{
if (!tab)
tab = get_property ("drumStyleTable");
if (scm_is_pair (defn))
{
SCM pos = scm_caddr (defn);
- SCM style =scm_car (defn);
+ SCM style = scm_car (defn);
SCM script = scm_cadr (defn);
if (scm_integer_p (pos) == SCM_BOOL_T)
{
if (Stem::has_interface (inf.grob_))
{
- for (int i= 0; i < scripts_.size (); i++)
+ for (int i = 0; i < scripts_.size (); i++)
{
Grob*e = scripts_[i];
}
else if (Note_column::has_interface (inf.grob_))
{
- for (int i= 0; i < scripts_.size (); i++)
+ for (int i = 0; i < scripts_.size (); i++)
{
Grob *e = scripts_[i];
// why don't grace notes show up here?
// --> grace notes effectively do not get delayed
Global_context * global = get_global_context ();
- for (int i= 0; i < notes_.size (); i++)
+ for (int i = 0; i < notes_.size (); i++)
{
Audio_note* n = notes_[i];
- Moment m= n->delayed_until_mom_;
+ Moment m = n->delayed_until_mom_;
if (m.to_bool ())
{
global->add_moment_to_process (m);
}
Moment now = now_mom ();
- for (int i= 0; i < notes_.size (); i++)
+ for (int i = 0; i < notes_.size (); i++)
{
play_element (notes_[i]);
}
notes_.clear ();
note_evs_.clear ();
- for (int i= 0; i < delayeds_.size (); i++)
+ for (int i = 0; i < delayeds_.size (); i++)
{
Audio_note* n = delayeds_[i];
if (n->delayed_until_mom_ <= now)
SCM
Dynamic_text_spanner::print (SCM smob)
{
- Grob *me= unsmob_grob (smob);
+ Grob *me = unsmob_grob (smob);
Spanner *spanner = dynamic_cast<Spanner*> (me);
Grob *common = spanner->get_bound (LEFT)->common_refpoint (spanner->get_bound (RIGHT), X_AXIS);
if (!span_points.is_empty ())
{
- Stencil l =Line_spanner::line_stencil (me,
+ Stencil l = Line_spanner::line_stencil (me,
Offset (span_points[LEFT], 0),
Offset (span_points[RIGHT], 0));
m.add_stencil (l);
{
Context *c = unsmob_context (scm_car (s));
Engraver_group_engraver * group
- =dynamic_cast<Engraver_group_engraver*> (c->implementation ());
+ = dynamic_cast<Engraver_group_engraver*> (c->implementation ());
if (group)
count += group->pending_grob_count ();
}
for (SCM s = c->children_contexts () ; scm_is_pair (s);
- s =scm_cdr (s))
+ s = scm_cdr (s))
{
recurse_down_engravers (unsmob_context (scm_car (s)), ptr, context_first);
}
scm_to_int (scm_cdr (key)),
scm_to_int (alter));
- orig =orig.transposed (*p);
+ orig = orig.transposed (*p);
SCM key = scm_cons (scm_int2num (orig.get_octave ()),
scm_int2num (orig.get_notename ()));
Pitch orig (0, scm_to_int (key), scm_to_int (alter));
orig = orig.transposed (*p);
- key =scm_int2num (orig.get_notename ());
+ key = scm_int2num (orig.get_notename ());
alter = scm_int2num (orig.get_alteration ());
newlist = scm_cons (scm_cons (key, alter), newlist);
}
{
if (Stem::has_interface (inf.grob_))
{
- for (int i= 0; i < fingerings_.size (); i++)
+ for (int i = 0; i < fingerings_.size (); i++)
{
Side_position_interface::add_support (fingerings_[i], inf.grob_);
}
}
else if (Rhythmic_head::has_interface (inf.grob_))
{
- for (int i= 0; i < fingerings_.size (); i++)
+ for (int i = 0; i < fingerings_.size (); i++)
{
Grob*t = fingerings_[i];
Side_position_interface::add_support (t,inf.grob_);
void
Fingering_engraver::process_music ()
{
- for (int i= reqs_.size (); i--;)
+ for (int i = reqs_.size (); i--;)
{
SCM dir = reqs_[i]->get_property ("direction");
make_script (to_dir (dir), reqs_[i], i);
if (m < now_mom_)
programming_error ("Trying to freeze in time.");
- for (int i= 0; i < extra_mom_pq_.size (); i++)
+ for (int i = 0; i < extra_mom_pq_.size (); i++)
if (extra_mom_pq_[i] == m)
return;
extra_mom_pq_.insert (m);
void
call_constructors ()
{
- for (int i= 0; i < ctor_global_statics_->size (); i++)
+ for (int i = 0; i < ctor_global_statics_->size (); i++)
(ctor_global_statics_->elem (i)) ();
}
if (optimal_paths.top ().demerits_ >= infinity_f)
warning (_ ("No feasible line breaking found"));
- for (int i= final_breaks.size (); i--;)
+ for (int i = final_breaks.size (); i--;)
{
Column_x_positions cp (optimal_paths[final_breaks[i]].line_config_);
Moment
Grace_iterator::pending_moment () const
{
- Moment cp =Music_wrapper_iterator::pending_moment ();
+ Moment cp = Music_wrapper_iterator::pending_moment ();
Moment pending;
pending.grace_part_ = start_mom_.grace_part_ + cp.main_part_;
SCM ifs = me->get_property ("interfaces");
bool found = false;
- for (; !found && scm_is_pair (ifs); ifs =scm_cdr (ifs))
+ for (; !found && scm_is_pair (ifs); ifs = scm_cdr (ifs))
{
SCM iface = scm_hashq_ref (all_ifaces , scm_car (ifs), SCM_BOOL_F);
if (iface == SCM_BOOL_F)
continue;
}
- found= found || (scm_c_memq (sym, scm_caddr (iface)) != SCM_BOOL_F);
+ found = found || (scm_c_memq (sym, scm_caddr (iface)) != SCM_BOOL_F);
}
if (!found)
gi.grob_->self_scm (),
SCM_EOL);
- SCM busy= get_property ("busyGrobs");
+ SCM busy = get_property ("busyGrobs");
busy = scm_merge_x (lst, busy, ly_grob_pq_less_p_proc);
context ()->set_property ("busyGrobs", busy);
}
key_ = key;
/* FIXME: default should be no callback. */
self_scm_ = SCM_EOL;
- pscore_= 0;
+ pscore_ = 0;
status_ = 0;
original_ = 0;
immutable_property_alist_ = basicprops;
;
else if (ly_c_procedure_p (d->dimension_))
/* FIXME: add doco on types, and should typecheck maybe? */
- d->dimension_= scm_call_2 (d->dimension_, self_scm (), scm_int2num (a));
+ d->dimension_ = scm_call_2 (d->dimension_, self_scm (), scm_int2num (a));
else
return ext;
SCM
Hairpin::print (SCM smob)
{
- Grob *me= unsmob_grob (smob);
+ Grob *me = unsmob_grob (smob);
Spanner *spanner = dynamic_cast<Spanner*> (me);
SCM s = me->get_property ("grow-direction");
private:
Audio_item (Audio_item const&);
- Audio_item& operator= ( Audio_item const&);
+ Audio_item& operator = ( Audio_item const&);
};
class Audio_dynamic : public Audio_item
Simple_spacer_wrapper* generate_spacing_problem (Link_array<Grob> const &, Interval) const;
- virtual Array<Column_x_positions> do_solve () const= 0;
+ virtual Array<Column_x_positions> do_solve () const = 0;
public:
Simple_spacer* (*get_line_spacer) ();
voiceA = \notes { \grace b16 c'2 }
voiceB = \notes { c'2 \voiceA }
- the iterator for voiceB will contain a fixup entry with (START= 0/1,
- LENGTH=2/1, GRACE_START=(0G-1/16) )
+ the iterator for voiceB will contain a fixup entry with (START = 0/1,
+ LENGTH =2/1, GRACE_START =(0G-1/16) )
Graces at the start of a sequential music iterator are handled
by initting here_mom_ with Music::start_music (); no fixups are needed.
for administration of what was done already
*/
enum Grob_status {
- ORPHAN= 0, // not yet added to Paper_score
+ ORPHAN = 0, // not yet added to Paper_score
PRECALCING,
PRECALCED, // calcs before spacing done
POSTCALCING, // busy calculating. This is used to trap cyclic deps.
#if __GNUC__ > 2
std::ostream *open_file_stream (String file_name,
- std::ios_base::openmode mode=std::ios::out);
+ std::ios_base::openmode mode = std::ios::out);
#else
-std::ostream *open_file_stream (String file_name, int mode=ios::out);
+std::ostream *open_file_stream (String file_name, int mode = ios::out);
#endif
void close_file_stream (std::ostream *os);
SCM encoding_table_;
private:
- Tex_font_char_metric const *find_ascii (int ascii, bool warn=true) const;
+ Tex_font_char_metric const *find_ascii (int ascii, bool warn = true) const;
Tex_font_metric ();
};
SCM \
classname::static_translator_description () const \
{ \
- SCM static_properties= SCM_EOL; \
- /* static_properties= acons (name ,gh_str02scm (Translator::name (self_scm ())), \
+ SCM static_properties = SCM_EOL; \
+ /* static_properties = acons (name ,gh_str02scm (Translator::name (self_scm ())), \
static_properties_); \
*/ \
- static_properties= scm_acons (ly_symbol2scm ("grobs-created"), \
+ static_properties = scm_acons (ly_symbol2scm ("grobs-created"), \
parse_symbol_list (grobs), static_properties); \
\
- static_properties= scm_acons (ly_symbol2scm ("description"), \
+ static_properties = scm_acons (ly_symbol2scm ("description"), \
scm_makfrom0str (desc), static_properties); \
\
- static_properties= scm_acons (ly_symbol2scm ("interfaces-acked"), \
+ static_properties = scm_acons (ly_symbol2scm ("interfaces-acked"), \
parse_symbol_list (acked), static_properties); \
- static_properties= scm_acons (ly_symbol2scm ("events-accepted"), \
+ static_properties = scm_acons (ly_symbol2scm ("events-accepted"), \
parse_symbol_list (accepted), static_properties); \
\
- static_properties= scm_acons (ly_symbol2scm ("properties-read"), \
+ static_properties = scm_acons (ly_symbol2scm ("properties-read"), \
parse_symbol_list (read), static_properties); \
\
- static_properties= scm_acons (ly_symbol2scm ("properties-written"), \
+ static_properties = scm_acons (ly_symbol2scm ("properties-written"), \
parse_symbol_list (write), static_properties); \
\
return static_properties; \
Input::Input (Source_file*s, char const *cl)
{
- source_file_=s;
- defined_str0_=cl;
+ source_file_ = s;
+ defined_str0_ = cl;
}
Input::Input ()
Grob * dolly = clone (count ++);
Item * item = dynamic_cast<Item*> (dolly);
pscore_->system_->typeset_grob (item);
- new_copies[i] =item;
+ new_copies[i] = item;
}
while (flip (&i) != LEFT);
- broken_to_drul_= new_copies;
+ broken_to_drul_ = new_copies;
}
/*
FIXME: too much hardcoding here.
*/
-const int FLAT_TOP_PITCH=2; /* fes,ges,as and bes typeset in lower octave */
-const int SHARP_TOP_PITCH=4; /* ais and bis typeset in lower octave */
+const int FLAT_TOP_PITCH =2; /* fes,ges,as and bes typeset in lower octave */
+const int SHARP_TOP_PITCH =4; /* ais and bis typeset in lower octave */
/*
TODO: look this up. I'm not sure where the naturals ought to go.
it's a hack, but probably not worth
the effort of finding a nicer solution.
--dl. */
- if (c0==2 && alter >0 && p==3)
+ if (c0==2 && alter >0 && p ==3)
p -= 7;
- if (c0==-3 && alter>0 && p==-1)
+ if (c0==-3 && alter>0 && p ==-1)
p += 7;
- if (c0==-4 && alter<0 && p==-1)
+ if (c0==-4 && alter<0 && p ==-1)
p += 7;
- if (c0==-2 && alter<0 && p==-3)
+ if (c0==-2 && alter<0 && p ==-3)
p += 7;
return p + c0;
SCM
Key_signature_interface::print (SCM smob)
{
- Grob*me =unsmob_grob (smob);
+ Grob*me = unsmob_grob (smob);
Real inter = Staff_symbol_referencer::staff_space (me)/2.0;
Stencil natural;
if (scm_is_pair (old))
- natural=Font_interface::get_default_font (me)->
+ natural = Font_interface::get_default_font (me)->
find_by_name (String ("accidentals-") + style + String ("0"));
Real sqx = 0.0;
Real sxy = 0.0;
- for (int i= 0; i < input.size ();i++)
+ for (int i = 0; i < input.size ();i++)
{
- Real x=input[i][X_AXIS];
+ Real x = input[i][X_AXIS];
Real y = input[i][Y_AXIS];
sx += x;
sy += y;
/*
- ledger-line-engraver.cc -- implement Ledger_line_engraver=
+ ledger-line-engraver.cc -- implement Ledger_line_engraver =
source file of the GNU LilyPond music typesetter
error_level_ = 1;
}
- for (int i= 0; i < n; i++)
+ for (int i = 0; i < n; i++)
{
yyinput ();
}
}
{REAL} {
Real r;
- int cnv=sscanf (YYText (), "%lf", &r);
+ int cnv = sscanf (YYText (), "%lf", &r);
assert (cnv == 1);
yylval.scm = scm_make_real (r);
}
<INITIAL,lyrics,notes,figures>\\. {
- char c= YYText ()[1];
+ char c = YYText ()[1];
switch (c) {
case '>':
void
strip_leading_white (String&s)
{
- int i= 0;
+ int i = 0;
for (; i < s.length (); i++)
if (!isspace (s[i]))
break;
void
strip_trailing_white (String&s)
{
- int i=s.length ();
+ int i = s.length ();
while (i--)
if (!isspace (s[i]))
break;
String
lyric_fudge (String s)
{
- char * chars =s.get_copy_str0 ();
+ char * chars = s.get_copy_str0 ();
for (char * p = chars; *p ; p++)
{
delete[] chars;
int i = 0;
- if ((i=s.index ("\\,")) != -1) // change "\," to TeX's "\c "
+ if ((i = s.index ("\\,")) != -1) // change "\," to TeX's "\c "
{
* (s.get_str0 () + i + 1) = 'c';
s = s.left_string (i+2) + " " + s.right_string (s.length ()-i-2);
int
music_function_type (SCM func)
{
- SCM type= scm_object_property (func, ly_symbol2scm ("music-function-signature-keyword"));
+ SCM type = scm_object_property (func, ly_symbol2scm ("music-function-signature-keyword"));
if (type == ly_symbol2scm ("scm"))
{
return MUSIC_FUNCTION_SCM;
if (scm_is_number (s))
{
int i = scm_to_int (s);
- return i== 0 || i == 1;
+ return i == 0 || i == 1;
}
return false;
}
SCM p = scm_current_output_port ();
scm_puts ("(", p);
- for (; scm_is_pair (s); s =scm_cdr (s))
+ for (; scm_is_pair (s); s = scm_cdr (s))
{
scm_display (scm_car (s), p);
scm_puts (" ", p);
Input
Lily_lexer::here_input () const
{
- Source_file * f= get_source_file ();
+ Source_file * f = get_source_file ();
return Input (f, (char*)here_str0 ());
}
SCM_ASSERT_TYPE (scm_is_symbol (symbol), symbol, SCM_ARG2, __FUNCTION__, "symbol");
SCM_ASSERT_TYPE (parser, parser_smob, SCM_ARG2, __FUNCTION__, "parser");
- SCM val= parser->lexer_->lookup_identifier (ly_scm2string (scm_symbol_to_string (symbol)));
+ SCM val = parser->lexer_->lookup_identifier (ly_scm2string (scm_symbol_to_string (symbol)));
if (val != SCM_UNDEFINED)
return val;
else
+ bound[RIGHT]->extent (common[X_AXIS], ax).center ()
- bound[LEFT]->extent (common[X_AXIS], ax).center ();
- my_off[ax] =me->relative_coordinate (common[a], ax);
+ my_off[ax] = me->relative_coordinate (common[a], ax);
his_off[ax] = bound[LEFT]->relative_coordinate (common[a], ax);
}
* / | v
* | /
* | /
- * (0,0) x /slope=dy/dx
+ * (0,0) x /slope = dy/dx
* | /
* |/
*
{
SCM l = SCM_EOL;
- for (int i= 4; i -- ;)
+ for (int i = 4; i -- ;)
{
l = scm_cons (ly_offset2scm (b.control_[i]), l);
}
SCM scontrols[8];
- for (int i=4; i--;)
+ for (int i =4; i--;)
scontrols[ i ] = ly_offset2scm (back.control_[i]);
- for (int i=4 ; i--;)
+ for (int i =4 ; i--;)
scontrols[i+4] = ly_offset2scm (curve.control_[i]);
/*
*/
int indices[]= {5, 6, 7, 4, 1, 2, 3, 0};
SCM list = SCM_EOL;
- for (int i= 8; i--;)
+ for (int i = 8; i--;)
{
list = scm_cons (scontrols[indices[i]], list);
}
{
SCM_VALIDATE_MODULE (1, mod);
- SCM obarr= SCM_MODULE_OBARRAY (mod);
+ SCM obarr = SCM_MODULE_OBARRAY (mod);
return scm_internal_hash_fold ((Hash_cl_func) &accumulate_symbol,
NULL, SCM_EOL, obarr);
}
"Dump the contents of module @var{mod} as an alist.")
{
SCM_VALIDATE_MODULE (1, mod);
- SCM obarr= SCM_MODULE_OBARRAY (mod);
+ SCM obarr = SCM_MODULE_OBARRAY (mod);
return scm_internal_hash_fold ((Hash_cl_func) &entry_to_alist, NULL, SCM_EOL, obarr);
}
if (get_busy_status () && !melisma_busy () && lyric_iter_->ok ())
{
- Moment m= lyric_iter_->pending_moment ();
+ Moment m = lyric_iter_->pending_moment ();
lyric_iter_->process (m);
}
}
r.distance_ =
robust_scm2double (me->get_property ("minimum-length"), 0);
- Direction d=LEFT;
+ Direction d = LEFT;
do
{
r.item_l_drul_[d] = sp->get_bound (d);
{
{_i ("EXPR"), "evaluate", 'e',
_i ("set option, use -e '(ly:option-usage)' for help")},
- /* Bug in option parser: --output=foe is taken as an abbreviation
+ /* Bug in option parser: --output =foe is taken as an abbreviation
for --output-format. */
{_i ("EXT"), "format", 'f', _i ("select back-end to use")},
{0, "help", 'h', _i ("print this help")},
dir_info (FILE *out)
{
fputs ("\n", out);
- fprintf (out, "LILYPOND_DATADIR=\"%s\"\n", LILYPOND_DATADIR);
- fprintf (out, "LOCAL_LILYPOND_DATADIR=\"\%s\"\n", LOCAL_LILYPOND_DATADIR);
- fprintf (out, "LOCALEDIR=\"%s\"\n", LOCALEDIR);
+ fprintf (out, "LILYPOND_DATADIR =\"%s\"\n", LILYPOND_DATADIR);
+ fprintf (out, "LOCAL_LILYPOND_DATADIR =\"\%s\"\n", LOCAL_LILYPOND_DATADIR);
+ fprintf (out, "LOCALEDIR =\"%s\"\n", LOCALEDIR);
char *lilypond_prefix = getenv ("LILYPONDPREFIX");
- fprintf (out, "LILYPONDPREFIX=\"%s\"\n",
+ fprintf (out, "LILYPONDPREFIX =\"%s\"\n",
(lilypond_prefix ? lilypond_prefix : ""));
}
{
grouping_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn")));
grouping_->suicide ();
- grouping_= 0;
+ grouping_ = 0;
}
}
create_items (mark_ev_);
SCM proc = get_property ("metronomeMarkFormatter");
- SCM result= scm_call_2 (proc, mark_ev_->self_scm (),
+ SCM result = scm_call_2 (proc, mark_ev_->self_scm (),
context ()->self_scm ());
text_->set_property ("text", result);
String str = Midi_chunk::data_string ();
if (midi_debug_global_b)
str += "\n";
- for (Cons<Midi_event> *i=event_p_list_.head_; i; i = i->next_)
+ for (Cons<Midi_event> *i = event_p_list_.head_; i; i = i->next_)
{
str += i->car_->to_string ();
if (midi_debug_global_b)
Midi_walker::Midi_walker (Audio_staff* audio_staff, Midi_track* track)
{
track_ = track;
- index_= 0;
+ index_ = 0;
items_ = &audio_staff->audio_items_;
last_mom_ = 0;
Moment stop_mom = note->get_length () + ptr->audio_column_->at_mom ();
bool play_start = true;
- for (int i= 0; i < stop_note_queue.size (); i++)
+ for (int i = 0; i < stop_note_queue.size (); i++)
{
/* if this pith already in queue */
if (stop_note_queue[i].val->get_pitch () == note->get_pitch ())
intlog2 (int d)
{
assert (d);
- int i= 0;
+ int i = 0;
while ((d != 1))
{
d /= 2;
void
Moment::operator += (Moment const &src)
{
- main_part_ +=src.main_part_ ;
+ main_part_ += src.main_part_ ;
grace_part_ += src.grace_part_;
}
void
Direction d = DOWN;
do {
Grob *last = 0;
- for (int i= 0; i <numbers_.size (); i++)
+ for (int i = 0; i <numbers_.size (); i++)
{
if (scm_int2num (d) == numbers_[i]->get_property ("direction"))
{
Stencil
Multi_measure_rest::big_rest (Grob *me, Real width)
{
- Real thick_thick =robust_scm2double (me->get_property ("thick-thickness"), 1.0);
+ Real thick_thick = robust_scm2double (me->get_property ("thick-thickness"), 1.0);
Real hair_thick = robust_scm2double (me->get_property ("hair-thickness"), .1);
Real sym_width = symbol_stencil (me, 0.0).extent (X_AXIS).length ();
- for (int i= 0; i < 4; i++)
+ for (int i = 0; i < 4; i++)
{
Item *li = combinations[i][0];
Item *ri = combinations[i][1];
music_list_to_relative (SCM l,Pitch p, bool ret_first)
{
Pitch first = p;
- int count= 0;
+ int count = 0;
Pitch last = p;
for (SCM s = l; scm_is_pair (s); s = scm_cdr (s))
{
if (Rhythmic_head::has_interface (inf.grob_))
{
- Music * note_ev =inf.music_cause ();
+ Music * note_ev = inf.music_cause ();
if (!note_ev)
return;
{
Finger_tuple ft ;
- Grob * g= make_item ("Script", event->self_scm () );
+ Grob * g = make_item ("Script", event->self_scm () );
make_script_from_event (g, &ft.follow_into_staff_, context (),
event->get_property ("articulation-type"), 0);
if (g)
{
- ft.script_ =g ;
+ ft.script_ = g ;
articulations_.push (ft);
{
if (lyric_iter_)
lyric_iter_->substitute_outlet (f,t);
- if (lyrics_context_ && lyrics_context_==f)
+ if (lyrics_context_ && lyrics_context_ == f)
lyrics_context_ = t;
if (music_context_ && music_context_ == f)
music_context_ = t;
if (music_context_
&& start_new_syllable () && lyric_iter_->ok ())
{
- Moment m= lyric_iter_->pending_moment ();
+ Moment m = lyric_iter_->pending_moment ();
lyric_iter_->process (m);
music_found_ = true;
bool distant_half_collide = false;
bool full_collide = false;
- int i = 0, j= 0;
+ int i = 0, j = 0;
while (i < ups.size () && j < dps.size ())
{
if (abs (ups[i] - dps[j]) == 1)
else
distant_half_collide = true;
}
- else if (ups[i]==dps[j])
+ else if (ups[i]== dps[j])
full_collide = true;
else if (ups[i] >dps[0] && ups[i] < dps.top ())
merge_possible = false;
Direction d = UP;
do
{
- for (int i= 0; i < clash_groups[d].size (); i++)
+ for (int i = 0; i < clash_groups[d].size (); i++)
(*offsets)[d][i] += d * shift_amount;
}
while ((flip (&d))!= UP);
Real left_most = 1e6;
Array<Real> amounts;
- for (; scm_is_pair (hand); hand =scm_cdr (hand))
+ for (; scm_is_pair (hand); hand = scm_cdr (hand))
{
Grob * s = unsmob_grob (scm_caar (hand));
Real amount = scm_to_double (scm_cdar (hand)) * wid;
left_most = amount;
}
- for (; scm_is_pair (autos); autos =scm_cdr (autos))
+ for (; scm_is_pair (autos); autos = scm_cdr (autos))
{
Grob * s = unsmob_grob (scm_caar (autos));
Real amount = scm_to_double (scm_cdar (autos)) *wid;
Array<int> & shift (shifts[d]);
Link_array<Grob> & clashes (clash_groups[d]);
- for (int i= 0; i < clashes.size (); i++)
+ for (int i = 0; i < clashes.size (); i++)
{
SCM sh
= clashes[i]->get_property ("horizontal-shift");
shift.push (0);
}
- for (int i=1; i < shift.size (); i++)
+ for (int i =1; i < shift.size (); i++)
{
if (shift[i-1] == shift[i])
{
d = UP;
do
{
- for (int i= 0; i < clash_groups[d].size (); i++)
+ for (int i = 0; i < clash_groups[d].size (); i++)
{
Slice s (Note_column::head_positions_interval (clash_groups[d][i]));
s[LEFT] --;
do
{
- for (int i=1; i < clash_groups[d].size (); i++)
+ for (int i =1; i < clash_groups[d].size (); i++)
{
- Slice prev =extents[d][i-1];
+ Slice prev = extents[d][i-1];
prev.intersect (extents[d][i]);
if (prev.length ()> 0 ||
(extents[-d].size () && d * (extents[d][i][-d] - extents[-d][0][d]) < 0))
do
{
- for (int i= 0; i < clash_groups[d].size (); i++)
+ for (int i = 0; i < clash_groups[d].size (); i++)
tups = scm_cons (scm_cons (clash_groups[d][i]->self_scm (),
scm_make_real (offsets[d][i])),
tups);
{
SCM heads = me->get_property ("note-heads");
Grob * acc = 0;
- for (;scm_is_pair (heads); heads =scm_cdr (heads))
+ for (;scm_is_pair (heads); heads = scm_cdr (heads))
{
Grob * h = unsmob_grob (scm_car (heads));
acc = h ? unsmob_grob (h->get_property ("accidental-grob")) : 0;
void
Note_heads_engraver::process_music ()
{
- for (int i= 0; i < note_evs_.size (); i++)
+ for (int i = 0; i < note_evs_.size (); i++)
{
Music * ev = note_evs_[i];
dots_.push (d);
}
- Pitch *pit =unsmob_pitch (ev->get_property ("pitch"));
+ Pitch *pit = unsmob_pitch (ev->get_property ("pitch"));
int pos = pit ? pit->steps () : 0;
SCM c0 = get_property ("middleCPosition");
Note_name_engraver::process_music ()
{
String s ;
- for (int i= 0; i < events_.size (); i++)
+ for (int i = 0; i < events_.size (); i++)
{
if (i)
s += " ";
// why don't grace notes show up here?
// --> grace notes effectively do not get delayed
Global_context * global = get_global_context ();
- for (int i= 0; i < notes_.size (); i++)
+ for (int i = 0; i < notes_.size (); i++)
{
Audio_note* n = notes_[i];
- Moment m= n->delayed_until_mom_;
+ Moment m = n->delayed_until_mom_;
if (m.to_bool ())
{
global->add_moment_to_process (m);
}
Moment now = now_mom ();
- for (int i= 0; i < notes_.size (); i++)
+ for (int i = 0; i < notes_.size (); i++)
{
play_element (notes_[i]);
}
notes_.clear ();
note_evs_.clear ();
- for (int i= 0; i < delayeds_.size (); i++)
+ for (int i = 0; i < delayeds_.size (); i++)
{
Audio_note* n = delayeds_[i];
if (n->delayed_until_mom_ <= now)
{
for (SCM s = props[d]; scm_is_pair (s); s = scm_cdr (s))
{
- Item * it= dynamic_cast<Item*> (unsmob_grob (scm_car (s)));
+ Item * it = dynamic_cast<Item*> (unsmob_grob (scm_car (s)));
if (d == RIGHT && it->break_status_dir () != col_dir)
{
{
// I'm a lazy bum. We could do this in-place.
SCM newright = SCM_EOL;
- for (SCM s = right ; scm_is_pair (s) ; s =scm_cdr (s))
+ for (SCM s = right ; scm_is_pair (s) ; s = scm_cdr (s))
{
if (unsmob_item (scm_car (s))->get_column () == mincol)
newright = scm_cons (scm_car (s), newright);
{
for (SCM s = props[d]; scm_is_pair (s); s = scm_cdr (s))
{
- Item * it= dynamic_cast<Item*> (unsmob_grob (scm_car (s)));
+ Item * it = dynamic_cast<Item*> (unsmob_grob (scm_car (s)));
if (d == RIGHT)
acc_right = acc_right || Note_column::accidentals (it);
if (correct_stem_dirs)
{
- correction =abs (intersect.length ());
+ correction = abs (intersect.length ());
/*
Real corr = robust_scm2double (me->get_property ("stem-spacing-correction"), 0);
corr = (delta <= 1) ? 0.0 : 0.25;
- correction= -lowest * corr ;
+ correction = -lowest * corr ;
}
*space += correction;
{
SCM heads = b->get_property ("note-heads");
common = common_refpoint_of_list (heads, common, X_AXIS);
- for (SCM s = heads; scm_is_pair (s); s =scm_cdr (s))
+ for (SCM s = heads; scm_is_pair (s); s = scm_cdr (s))
{
Grob * h = unsmob_grob (scm_car (s));
Grob * dots = Rhythmic_head::get_dots (h);
Interval ext;
if (Note_column::has_interface (b))
{
- for (SCM s = b->get_property ("note-heads"); scm_is_pair (s); s =scm_cdr (s))
+ for (SCM s = b->get_property ("note-heads"); scm_is_pair (s); s = scm_cdr (s))
{
Grob * h = unsmob_grob (scm_car (s));
ext.unite (h->extent (common, X_AXIS));
SCM ott = get_property ("ottavation");
if (ott != last_ottavation_)
{
- finished_= span_;
+ finished_ = span_;
span_ = 0;
if (scm_is_string (ott))
{
smobify_self ();
input_origin_ = s.input_origin_;
- scope_= ly_make_anonymous_module (false);
+ scope_ = ly_make_anonymous_module (false);
if (ly_c_module_p (s.scope_))
ly_module_copy (scope_, s.scope_);
}
void
Output_property_engraver::acknowledge_grob (Grob_info inf)
{
- for (int i=props_.size (); i--;)
+ for (int i = props_.size (); i--;)
{
Music * o = props_[i];
SCM pred = o->get_property ("predicate");
/*
should typecheck pred.
*/
- SCM result=scm_call_1 (pred, inf.grob_->self_scm ());
+ SCM result = scm_call_1 (pred, inf.grob_->self_scm ());
if (to_boolean (result))
{
SCM sym = o->get_property ("grob-property");
SCM
internal_ly_parse_scm (Parse_start * ps)
{
- Source_file *sf =ps->start_location_.source_file_;
+ Source_file *sf = ps->start_location_.source_file_;
SCM port = sf->get_port ();
int off = ps->start_location_.defined_str0_ - sf->to_str0 ();
context_change:
CHANGE STRING '=' STRING {
- Music*t= MY_MAKE_MUSIC ("ContextChange");
+ Music*t = MY_MAKE_MUSIC ("ContextChange");
t-> set_property ("change-to-type", scm_string_to_symbol ($2));
t-> set_property ("change-to-id", $4);
$$->set_spot (THIS->here_input ());
}
| '|' {
- SCM pipe =THIS->lexer_->lookup_identifier ("pipeSymbol");
+ SCM pipe = THIS->lexer_->lookup_identifier ("pipeSymbol");
if (Music * m = unsmob_music (pipe))
$$ = m->clone ();
$$ = unsmob_music (result);
}
| TIME_T fraction {
- SCM proc= ly_scheme_function ("make-time-signature-set");
+ SCM proc = ly_scheme_function ("make-time-signature-set");
SCM result = scm_apply_2 (proc, scm_car ($2), scm_cdr ($2), SCM_EOL);
scm_gc_protect_object (result);
$$ = $1;
}
| KEY DEFAULT {
- Music *key= MY_MAKE_MUSIC ("KeyChangeEvent");
+ Music *key = MY_MAKE_MUSIC ("KeyChangeEvent");
$$ = key;
}
| KEY NOTENAME_PITCH SCM_IDENTIFIER {
- Music *key= MY_MAKE_MUSIC ("KeyChangeEvent");
+ Music *key = MY_MAKE_MUSIC ("KeyChangeEvent");
if (scm_ilength ($3) > 0)
{
key->set_property ("pitch-alist", $3);
SCM text = SCM_EOL;
if (what == ly_symbol2scm ("solo1"))
text = get_property ("soloText");
- else if (what== ly_symbol2scm ("solo2"))
+ else if (what == ly_symbol2scm ("solo2"))
text = get_property ("soloIIText");
else if (what == ly_symbol2scm ("unisono"))
text = get_property ("aDueText");
finished_perc_ = perc_;
typeset_perc ();
perc_ = make_spanner ("PercentRepeat", repeat_->self_scm ());
- SCM col =get_property ("currentCommandColumn");
+ SCM col = get_property ("currentCommandColumn");
perc_->set_bound (LEFT, unsmob_grob (col));
}
else if (repeat_sign_type_ == DOUBLE_MEASURE)
{
if (finished_perc_)
{
- SCM col =get_property ("currentCommandColumn");
+ SCM col = get_property ("currentCommandColumn");
finished_perc_->set_bound (RIGHT, unsmob_grob (col));
finished_perc_ = 0;
}
void
Percent_repeat_iterator::construct_children ()
{
- Repeated_music * mus =dynamic_cast<Repeated_music *> (get_music ());
+ Repeated_music * mus = dynamic_cast<Repeated_music *> (get_music ());
finish_mom_ = mus->get_length ();
child_iter_ = unsmob_iterator (get_iterator (mus->body ()));
}
void
Performance::add_element (Audio_element *p)
{
- if (Audio_staff*s
=dynamic_cast<Audio_staff *> (p))
+ if (Audio_staff*s
= dynamic_cast<Audio_staff *> (p))
{
audio_staffs_.push (s);
}
Performer::announce_element (Audio_element_info i)
{
if (!i.origin_trans_)
- i.origin_trans_= this;
+ i.origin_trans_ = this;
get_daddy_performer ()->announce_element (i);
}
Phrasing_slur_engraver::Phrasing_slur_engraver ()
{
- events_[START] =events_[STOP] = 0;
+ events_[START] = events_[STOP] = 0;
}
bool
void
Phrasing_slur_engraver::acknowledge_grob (Grob_info info)
{
- Grob *e =info.grob_;
+ Grob *e = info.grob_;
if (Note_column::has_interface (info.grob_))
{
for (int i = slurs_.size (); i--; )
{
if (!p->bracket_ && p->event_drul_[STOP])
{
- String msg =_f ("can't find start of piano pedal bracket: `%s'", p->name_);
+ String msg = _f ("can't find start of piano pedal bracket: `%s'", p->name_);
p->event_drul_[STOP]->origin ()->warning (msg);
p->event_drul_[STOP] = 0;
}
void
Piano_pedal_performer::stop_translation_timestep ()
{
- for (int i= 0; i< audios_.size (); i++)
+ for (int i = 0; i< audios_.size (); i++)
play_element (audios_[i]);
audios_.clear ();
}
int
Pitch::compare (Pitch const &m1, Pitch const &m2)
{
- int o= m1.octave_ - m2.octave_;
+ int o = m1.octave_ - m2.octave_;
int n = m1.notename_ - m2.notename_;
int a = m1.alteration_ - m2.alteration_;
if (scm_is_symbol (sym))
{
SCM val = get_music ()->get_property ("value");
- bool ok= true;
+ bool ok = true;
if (val != SCM_EOL)
ok = type_check_assignment (sym, val, ly_symbol2scm ("translation-type?"));
if (ok)
SCM trans = get_outlet ()->self_scm ();
SCM music = get_music ()->self_scm ();
- Global_context * tg= get_outlet ()->get_global_context ();
+ Global_context * tg = get_outlet ()->get_global_context ();
tg->add_finalization (scm_list_n (once_finalization_proc,
trans, music, SCM_UNDEFINED));
}
Protected_scm&
Protected_scm::operator = (Protected_scm const &s)
{
- return operator= (s.object_);
+ return operator = (s.object_);
}
Protected_scm::operator SCM () const
rest_collision_ = make_item ("RestCollision", SCM_EOL);
- for (int i= 0; i < note_columns_.size (); i++)
+ for (int i = 0; i < note_columns_.size (); i++)
Rest_collision::add_column (rest_collision_,note_columns_[i]);
}
center one should be centered on the staff.
*/
Drul_array< Link_array <Grob > > ordered_rests;
- for (int i= 0; i < rests.size (); i++)
+ for (int i = 0; i < rests.size (); i++)
{
Grob * r = Note_column::get_rest (rests[i]);
Grob * rcol = 0;
Direction dir = CENTER;
- for (int i= rests.size (); !rcol && i--;)
+ for (int i = rests.size (); !rcol && i--;)
if (Note_column::dir (rests[i]))
{
dir = Note_column::dir (rests[i]);
rest_->set_property ("duration-log",
scm_int2num (durlog));
- int dots =unsmob_duration (rest_req_->get_property ("duration"))->dot_count ();
+ int dots = unsmob_duration (rest_req_->get_property ("duration"))->dot_count ();
if (dots)
{
*/
if (p)
{
- int pos= p->steps ();
+ int pos = p->steps ();
SCM c0 = get_property ("middleCPosition");
if (scm_is_number (c0))
pos += scm_to_int (c0);
last_spacing_ = 0;
stem_ = 0;
- note_column_= 0;
+ note_column_ = 0;
dotcol_ = 0;
}
}
- for (int i= 0; i < rheads_.size (); i++)
+ for (int i = 0; i < rheads_.size (); i++)
{
if (!rheads_[i]->get_parent (X_AXIS))
Note_column::add_head (note_column_, rheads_[i]);
Paper_column * pc = item_l_drul_[d]->get_column ();
distance_ += - d * item_l_drul_[d]->relative_coordinate (pc, X_AXIS);
item_l_drul_[d] = pc;
- } while ((flip (&d))!=LEFT);
+ } while ((flip (&d))!= LEFT);
}
void
Score_performer::play_element (Audio_element * p)
{
- if (Audio_item * i
=dynamic_cast<Audio_item *> (p))
+ if (Audio_item * i
= dynamic_cast<Audio_item *> (p))
{
audio_column_->add_audio_item (i);
}
smobify_self ();
- Music *m =unsmob_music (s.music_);
+ Music *m = unsmob_music (s.music_);
music_ = m ? m->clone ()->self_scm () : SCM_EOL;
scm_gc_unprotect_object (music_);
if (scol_)
{
- for (int i= 0; i < scripts_.size (); i++)
+ for (int i = 0; i < scripts_.size (); i++)
Script_column::add_staff_sided (scol_, scripts_[i]);
scripts_.clear ();
}
SCM
Script_interface::print (SCM smob)
{
- Grob *me= unsmob_grob (smob);
+ Grob *me = unsmob_grob (smob);
Direction dir = Side_position_interface::get_direction (me);
if (!dir)
Grob *him = me->get_parent (a);
Interval he = him->extent (him, a);
- SCM sym= (a == X_AXIS) ? ly_symbol2scm ("self-alignment-X")
+ SCM sym = (a == X_AXIS) ? ly_symbol2scm ("self-alignment-X")
: ly_symbol2scm ("self-alignment-Y");
SCM align_prop (me->internal_get_property (sym));
Grob *me = unsmob_grob (element_smob);
Axis a = (Axis) scm_to_int (axis);
- SCM sym= (a == X_AXIS) ? ly_symbol2scm ("self-alignment-X")
+ SCM sym = (a == X_AXIS) ? ly_symbol2scm ("self-alignment-X")
: ly_symbol2scm ("self-alignment-Y");
SCM align (me->internal_get_property (sym));
{
Rod rod;
- rod.item_l_drul_[LEFT] =l;
- rod.item_l_drul_[RIGHT]=r;
+ rod.item_l_drul_[LEFT] = l;
+ rod.item_l_drul_[RIGHT]= r;
rod.distance_ = li[RIGHT] - ri[LEFT] + padding;
sep_span_->set_bound (RIGHT, unsmob_grob (ccol));
sep_span_ = 0;
- for (int i= 0 ; i < last_spacings_.note_spacings_.size (); i++)
+ for (int i = 0 ; i < last_spacings_.note_spacings_.size (); i++)
{
Pointer_group_interface::add_grob (last_spacings_.note_spacings_[i],
ly_symbol2scm ("right-items" ),
return ;
}
- bool ib =Item::is_breakable (it);
+ bool ib = Item::is_breakable (it);
Item *&p_ref_ (ib ? break_item_
: musical_item_);
void
Sequential_iterator::next_element (bool)
{
- Moment len =iter_->music_get_length () - iter_->music_start_mom ();
+ Moment len = iter_->music_get_length () - iter_->music_start_mom ();
assert (!grace_fixups_ || grace_fixups_->start_ >= here_mom_);
if (len.main_part_
if (st && a == Y_AXIS
&& scm_is_number (me->get_property ("staff-padding")))
{
- Real padding=
+ Real padding =
Staff_symbol_referencer::staff_space (me)
* scm_to_double (me->get_property ("staff-padding"));
Real block_force = c * block_stretch;
force_ = force_ >? block_force;
- for (int i=l; i < r; i++)
+ for (int i = l; i < r; i++)
springs_[i].block_force_ = block_force >?
springs_[i].block_force_ ;
}
Simple_spacer::range_ideal_len (int l, int r) const
{
Real d = 0.;
- for (int i=l; i < r; i++)
+ for (int i = l; i < r; i++)
d += springs_[i].ideal_;
return d;
}
Simple_spacer::range_stiffness (int l, int r) const
{
Real den = 0.0;
- for (int i=l; i < r; i++)
+ for (int i = l; i < r; i++)
{
if (springs_[i].is_active_)
den += 1 / springs_[i].hooke_;
Simple_spacer::active_blocking_force () const
{
Real bf = - infinity_f;
- for (int i= 0; i < springs_.size (); i++)
+ for (int i = 0; i < springs_.size (); i++)
if (springs_[i].is_active_)
{
bf = bf >? springs_[i].block_force_;
Real max_block_force = -infinity_f;
int max_i = -1;
- for (int i= 0; i < springs_.size (); i++)
+ for (int i = 0; i < springs_.size (); i++)
{
if (springs_[i].block_force_ > max_block_force)
{
Simple_spacer::set_active_states ()
{
/* float comparison is safe, since force is only copied. */
- for (int i= 0 ; i <springs_.size (); i++)
+ for (int i = 0 ; i <springs_.size (); i++)
if (springs_[i].is_active_
&& springs_[i].block_force_ >= force_)
{
Simple_spacer::configuration_length () const
{
Real l = 0.;
- for (int i= 0; i < springs_.size (); i++)
+ for (int i = 0; i < springs_.size (); i++)
l += springs_[i].length (force_);
return l;
force_return = SCM_BOOL_F;
}
- SCM retval= SCM_EOL;
+ SCM retval = SCM_EOL;
for (int i = posns.size(); i--;)
{
retval = scm_cons (scm_from_double (posns[i]), retval);
fucked up wtk1-fugue2 (taking 3 full pages.)
*/
positions->config_.push (spacer_->indent_);
- for (int i= 0; i < spacer_->springs_.size (); i++)
+ for (int i = 0; i < spacer_->springs_.size (); i++)
{
Real l = spacer_->springs_[i].length ((ragged) ? 0.0 : spacer_->force_);
positions->config_.push (positions->config_.top () + l);
}
spaced_cols_ = cols;
- for (int i= 0; i < cols.size () - 1; i++)
+ for (int i = 0; i < cols.size () - 1; i++)
{
Spring_smob *spring = 0;
spacer_->add_spring (ideal, hooke);
}
- for (int i= 0; i < cols.size () - 1; i++)
+ for (int i = 0; i < cols.size () - 1; i++)
{
for (SCM s = Spaceable_grob::get_minimum_distances (cols[i]);
scm_is_pair (s); s = scm_cdr (s))
Music_iterator*
Simultaneous_music_iterator::try_music_in_children (Music *m) const
{
- Music_iterator * b= 0;
+ Music_iterator * b = 0;
for (SCM s = children_list_; !b && scm_is_pair (s); s = scm_cdr (s))
- b =unsmob_iterator (scm_car (s))->try_music (m);
+ b = unsmob_iterator (scm_car (s))->try_music (m);
return b;
}
else
return false;
- Global_context *global =get_global_context ();
+ Global_context *global = get_global_context ();
for (int i = 0; i < count; i++)
global->add_moment_to_process (next_moment_ + Moment (i) * body_length_);
{
Real x = state.encompass_infos_[j].x_;
- bool l_edge = j== 0;
- bool r_edge = j==state.encompass_infos_.size ()-1;
+ bool l_edge = j == 0;
+ bool r_edge = j == state.encompass_infos_.size ()-1;
bool edge = l_edge || r_edge;
if (! (x < attachment_[RIGHT][X_AXIS]
if (state.dir_ * (y - state.encompass_infos_[j].stem_) < 0)
{
- Real stem_dem =state.parameters_.stem_encompass_penalty_ ;
+ Real stem_dem = state.parameters_.stem_encompass_penalty_ ;
if ((l_edge && state.dir_ == UP)
|| (r_edge && state.dir_ == DOWN))
stem_dem /= 5;
Slur_engraver::Slur_engraver ()
{
- events_[START] =events_[STOP] = 0;
+ events_[START] = events_[STOP] = 0;
}
bool
void
Slur_engraver::acknowledge_grob (Grob_info info)
{
- Grob *e =info.grob_;
+ Grob *e = info.grob_;
if (Note_column::has_interface (info.grob_))
{
for (int i = slurs_.size (); i--; )
{
start_ev_ = m;
}
- else if (d==STOP)
+ else if (d == STOP)
{
now_stop_ev_ = m;
}
Real mindist = 1e6;
for (int i = 0; i < configurations_.size (); i ++)
{
- Real d =fabs (configurations_[i]->attachment_[LEFT][Y_AXIS] - ins[LEFT])
+ Real d = fabs (configurations_[i]->attachment_[LEFT][Y_AXIS] - ins[LEFT])
+ fabs (configurations_[i]->attachment_[RIGHT][Y_AXIS] - ins[RIGHT]);
if (d < mindist)
{
opt_idx = i;
- mindist= d;
+ mindist = d;
}
}
if (mindist > 1e5)
= Pointer_group_interface__extract_grobs (me, (Grob*) 0, "note-columns");
Direction d = DOWN;
- for (int i= 0; i < encompasses.size (); i ++)
+ for (int i = 0; i < encompasses.size (); i ++)
{
if (Note_column::dir (encompasses[i]) < 0)
{
if (!newline_locations_.size ())
return 1;
- int lo= 0;
+ int lo = 0;
int hi = newline_locations_.size ();
if (newline_locations_[lo] > pos_str0)
Sources::Sources ()
{
sourcefile_list_ = 0;
- path_= 0;
+ path_ = 0;
is_binary_ = false;
}
{
Moment shortest_playing;
shortest_playing.set_infinite (1);
- for (int i= 0; i < playing_durations_.size (); i++)
+ for (int i = 0; i < playing_durations_.size (); i++)
{
Music * mus = playing_durations_[i].info_.music_cause ();
if (mus)
Moment starter;
starter.set_infinite (1);
- for (int i= 0; i < now_durations_.size (); i++)
+ for (int i = 0; i < now_durations_.size (); i++)
{
Moment m = now_durations_[i].info_.music_cause ()->get_length ();
if (m.to_bool ())
{
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)))
{
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);
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 = scm_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 (scm_car (s)));
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 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));
we do this very late, to make sure we also catch `extra'
side-pos support like accidentals.
*/
- for (int i= 0; i < arpeggios_.size (); i ++)
+ for (int i = 0; i < arpeggios_.size (); i ++)
{
for (SCM s = arpeggios_[i]->get_property ("stems");
scm_is_pair (s); s = scm_cdr (s))
{
if (spanbar_)
{
- for (int i= 0; i < bars_.size () ; i++)
+ for (int i = 0; i < bars_.size () ; i++)
Span_bar::add_bar (spanbar_,bars_[i]);
- SCM vissym =ly_symbol2scm ("break-visibility");
+ SCM vissym = ly_symbol2scm ("break-visibility");
SCM vis = bars_[0]->internal_get_property (vissym);
if (ly_c_equal_p (spanbar_->internal_get_property (vissym), vis))
spanbar_->internal_set_property (vissym, vis);
{
type = ".|";
}
- else if (type== ":|")
+ else if (type == ":|")
{
type = "|.";
}
- else if (type== ":|:")
+ else if (type == ":|:")
{
type = ".|.";
}
}
Moment start_mom = finished_dynamic_tuples_[0].mom_;
Moment dt = finished_dynamic_tuples_.top ().mom_ - start_mom;
- for (int i= 0; i < finished_dynamic_tuples_.size (); i++)
+ for (int i = 0; i < finished_dynamic_tuples_.size (); i++)
{
Audio_dynamic_tuple* a = &finished_dynamic_tuples_[i];
Real volume = start_volume + dv * (Real) (a->mom_ - start_mom).main_part_
break_points.insert (left,0);
break_points.push (right);
- for (int i=1; i < break_points.size (); i++)
+ for (int i =1; i < break_points.size (); i++)
{
Drul_array<Item*> bounds;
bounds[LEFT] = break_points[i-1];
}
}
broken_intos_.sort (Spanner::compare);
- for (int i= broken_intos_.size ();i--;)
+ for (int i = broken_intos_.size ();i--;)
broken_intos_[i]->break_index_ = i;
}
return;
}
- spanned_drul_[d] =i;
+ spanned_drul_[d] = i;
/**
We check for System to prevent the column -> line_of_score
-> column -> line_of_score -> etc situation */
- if (d== LEFT && !dynamic_cast<System*> (this))
+ if (d == LEFT && !dynamic_cast<System*> (this))
{
set_parent (i, X_AXIS);
}
scm_gc_mark (spanned_drul_[d]->self_scm ());
while (flip (&d) != LEFT);
- for (int i= broken_intos_.size () ; i--;)
+ for (int i = broken_intos_.size () ; i--;)
scm_gc_mark (broken_intos_[i]->self_scm ());
return SCM_EOL;
SCM
Spring_smob::equal_p (SCM a , SCM b)
{
- return a==b? SCM_BOOL_T : SCM_BOOL_F;
+ return a == b? SCM_BOOL_T : SCM_BOOL_F;
}
if (!g || !Note_column::has_interface (g))
return 0.0;
- Item *col =dynamic_cast<Item*> (g)->get_column ();
+ Item *col = dynamic_cast<Item*> (g)->get_column ();
Real max_corr = 0. >? (- g->extent (col, X_AXIS)[LEFT]);
/*
*space = 1.0;
*fixed = 1.0;
- Grob * separation_item= 0;
+ Grob * separation_item = 0;
Item * me_item = dynamic_cast<Item*> (me);
for (SCM s = me->get_property ("left-items");
span_points[d] -= d* t/2;
}
- while (flip (&d) !=LEFT);
+ while (flip (&d) != LEFT);
int l = Staff_symbol::line_count (me);
t);
Stencil m;
- for (int i= 0; i < l; i++)
+ for (int i = 0; i < l; i++)
{
Stencil b(a);
b.translate_axis (height - i * staff_space (me), Y_AXIS);
void
Stanza_number_align_engraver::stop_translation_timestep ()
{
- for (int i= lyrics_.size (); i--;)
+ for (int i = lyrics_.size (); i--;)
for (int j = stanza_numbers_.size (); j--;)
Side_position_interface::add_support (stanza_numbers_[j], lyrics_[i]);
for (int i = 1; i < heads.size (); i ++)
{
Real p = Staff_symbol_referencer::get_position (heads[i]);
- Real dy =fabs (lastpos- p);
+ Real dy = fabs (lastpos- p);
/*
dy should always be 0.5, 0.0, 1.0, but provide safety margin
/*
ugh. - this dependency should be automatic.
*/
- Grob *beam= get_beam (me);
+ Grob *beam = get_beam (me);
if (beam)
{
Beam::after_line_breaking (beam->self_scm ());
Interval iv;
if (mol != SCM_EOL)
iv = unsmob_stencil (mol)->extent (a);
- if (Grob *b =get_beam (me))
+ if (Grob *b = get_beam (me))
{
Direction d = get_direction (me);
iv[d] += d * Beam::get_thickness (b) * 0.5 ;
Slice
Stem::beam_multiplicity (Grob *stem)
{
- SCM beaming= stem->get_property ("beaming");
+ SCM beaming = stem->get_property ("beaming");
Slice le = int_list_to_slice (scm_car (beaming));
Slice ri = int_list_to_slice (scm_cdr (beaming));
le.unite (ri);
Offset o = ly_scm2offset (offset);
SCM new_s = s->smobbed_copy ();
- Stencil *q =unsmob_stencil (new_s);
+ Stencil *q = unsmob_stencil (new_s);
q->translate (o);
return new_s;
}
{
if (!delim_)
{
- SCM delim_name =get_property ("systemStartDelimiter");
+ SCM delim_name = get_property ("systemStartDelimiter");
delim_ = make_spanner_from_properties (this, delim_name, SCM_EOL,
ly_symbol2string (delim_name).to_str0());
Stencil
System_start_delimiter::simple_bar (Grob*me,Real h)
{
- Real lt =me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness")) ;
+ Real lt = me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness")) ;
Real w = lt * robust_scm2double (me->get_property ("thickness"), 1);
return Lookup::round_filled_box (Box (Interval (0,w), Interval (-h/2, h/2)),
lt);
Stencil m;
- if (gsym== ly_symbol2scm ("bracket"))
+ if (gsym == ly_symbol2scm ("bracket"))
m = staff_bracket (me, len);
else if (gsym == ly_symbol2scm ("brace"))
m = staff_brace (me, len);
fixups must be done in broken line_of_scores, because new elements
are put over there. */
int count = 0;
- for (int i= 0; i < broken_intos_.size (); i++)
+ for (int i = 0; i < broken_intos_.size (); i++)
{
Grob *se = broken_intos_[i];
SCM all = se->get_property ("all-elements");
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);
+ Interval cval = col->extent (col, X_AXIS);
/* Put it in the middle. This is not an ideal solution -- the
break alignment code inserts a fixed space before the clef
Paper_system *pl = new Paper_system (sys_stencil, false);
pl->staff_refpoints_ = staff_refpoints;
- Item * break_point =this->get_bound(LEFT);
+ Item * break_point = this->get_bound(LEFT);
pl->break_before_penalty_ =
robust_scm2double (break_point->get_property ("page-penalty"), 0.0);
Tab_note_heads_engraver::process_music ()
{
int j = 0;
- for (int i= 0; i < note_events_.size (); i++)
+ for (int i = 0; i < note_events_.size (); i++)
{
SCM stringTunings = get_property ("stringTunings");
int number_of_strings = ((int) ly_length (stringTunings));
Item * note = make_item ("TabNoteHead", event->self_scm ());
- Music * tabstring_event= 0;
+ Music * tabstring_event = 0;
- for (SCM s =event->get_property ("articulations");
+ for (SCM s = event->get_property ("articulations");
!tabstring_event && scm_is_pair (s); s = scm_cdr (s))
{
Music * art = unsmob_music (scm_car (s));
{
if (Rhythmic_head::has_interface (inf.grob_))
{
- for (int i= 0; i < texts_.size (); i++)
+ for (int i = 0; i < texts_.size (); i++)
{
Grob*t = texts_[i];
Side_position_interface::add_support (t,inf.grob_);
if (Stem::has_interface (inf.grob_))
{
- for (int i= 0; i < texts_.size (); i++)
+ for (int i = 0; i < texts_.size (); i++)
{
Side_position_interface::add_support (texts_[i],inf.grob_);
}
{
if (texts_.size ())
return;
- for (int i= 0; i < evs_.size (); i++)
+ for (int i = 0; i < evs_.size (); i++)
{
Music * r = evs_[i];
SCM
Text_spanner::print (SCM smob)
{
- Grob *me= unsmob_grob (smob);
+ Grob *me = unsmob_grob (smob);
Spanner *spanner = dynamic_cast<Spanner*> (me);
/* Ugh, must be same as Hairpin::print. */
if (!span_points.is_empty ())
{
- Stencil l =Line_spanner::line_stencil (me, Offset (span_points[LEFT], 0),
+ Stencil l = Line_spanner::line_stencil (me, Offset (span_points[LEFT], 0),
Offset (span_points[RIGHT], 0));
m.add_stencil (l);
}
: input_ (name)
{
- for (int i= 0; i < TFM_SIZE; i++)
+ for (int i = 0; i < TFM_SIZE; i++)
ascii_to_metric_idx_.push (-1);
read_header ();
ties.del (0);
set_grob_direction (ties.pop (), UP);
- for (int i=ties.size (); i--;)
+ for (int i = ties.size (); i--;)
{
Grob * t = ties[i];
Real p = Tie::get_position (t);
if (ties_.size ())
{
heads_to_tie_.clear ();
- for (int i= 0; i< ties_.size (); i++)
+ for (int i = 0; i< ties_.size (); i++)
{
typeset_tie (ties_[i]);
}
SCM controls = SCM_EOL;
- for (int i= 4; i--;)
+ for (int i = 4; i--;)
controls = scm_cons (ly_offset2scm (b.control_[i]), controls);
return controls;
}
Bezier b;
int i = 0;
- for (SCM s= cp; s != SCM_EOL; s = scm_cdr (s))
+ for (SCM s = cp; s != SCM_EOL; s = scm_cdr (s))
{
b.control_[i] = ly_scm2offset (scm_car (s));
i++;
void
Timing_translator::start_translation_timestep ()
{
- Global_context *global =get_global_context ();
+ Global_context *global = get_global_context ();
Moment now = global->now_mom ();
Moment dt = now - global->previous_moment ();
}
SCM cad = get_property ("timing");
- bool c= to_boolean (cad);
+ bool c = to_boolean (cad);
Rational len = measure_length ();
while (c && measposp.main_part_ >= len)
should delete these after exit.
*/
-Scheme_hash_table *global_translator_dict= 0;
+Scheme_hash_table *global_translator_dict = 0;
LY_DEFINE (get_all_translators,"ly:get-all-translators", 0, 0, 0, (),
"Return a list of all translator objects that may be instantiated. "
{
SCM l = global_translator_dict ? global_translator_dict->to_alist () : SCM_EOL;
- for (SCM s =l; scm_is_pair (s); s = scm_cdr (s))
+ for (SCM s = l; scm_is_pair (s); s = scm_cdr (s))
{
scm_set_car_x (s, scm_cdar (s));
}
if (!global_translator_dict)
global_translator_dict = new Scheme_hash_table;
- SCM k= ly_symbol2scm (classname (t));
+ SCM k = ly_symbol2scm (classname (t));
global_translator_dict->set (k, t->self_scm ());
scm_gc_unprotect_object (t->self_scm ());
}
for (SCM s = c->children_contexts () ; scm_is_pair (s);
- s =scm_cdr (s))
+ s = scm_cdr (s))
{
recurse_over_translators (unsmob_context (scm_car (s)), ptr, dir);
}
Spanner*sp = dynamic_cast<Spanner*> (me);
- *equally_long= false;
+ *equally_long = false;
if (! (b1 && (b1 == b2) && !sp->is_broken ()))
return 0;
SCM
Tuplet_bracket::print (SCM smob)
{
- Grob *me= unsmob_grob (smob);
+ Grob *me = unsmob_grob (smob);
Stencil mol;
- Link_array<Grob> columns=
+ Link_array<Grob> columns =
Pointer_group_interface__extract_grobs (me, (Grob*)0, "note-columns");
if (!columns.size ())
if (bracket_visibility)
{
Real ss = Staff_symbol_referencer::staff_space (me);
- Real gap= 0.;
+ Real gap = 0.;
if (!num.extent (X_AXIS).is_empty ())
gap = num.extent (X_AXIS).length () + 1.0;
void
Tuplet_bracket::calc_position_and_height (Grob*me,Real *offset, Real * dy)
{
- Link_array<Grob> columns=
+ Link_array<Grob> columns =
Pointer_group_interface__extract_grobs (me, (Grob*)0, "note-columns");
if (l < r)
{
- Interval rv =columns[r]->extent (commony, Y_AXIS);
- Interval lv =columns[l]->extent (commony, Y_AXIS);
+ Interval rv = columns[r]->extent (commony, Y_AXIS);
+ Interval lv = columns[l]->extent (commony, Y_AXIS);
rv.unite (staff);
lv.unite (staff);
Real graphical_dy = rv[dir] - lv[dir];
for (int i = 0; i < columns.size (); i++)
{
- Interval note_ext =columns[i]->extent (commony, Y_AXIS);
+ Interval note_ext = columns[i]->extent (commony, Y_AXIS);
note_ext.unite (staff);
Real notey = note_ext[dir] - me->relative_coordinate (commony, Y_AXIS);
horizontal brackets should not collide with staff lines.
*/
- Real ss= Staff_symbol_referencer::staff_space (me);
+ Real ss = Staff_symbol_referencer::staff_space (me);
if (*dy == 0 && fabs (*offset) < ss * Staff_symbol_referencer::staff_radius (me))
{
// quantize, then do collision check.
Tuplet_bracket::before_line_breaking (SCM smob)
{
Grob *me = unsmob_grob (smob);
- Link_array<Grob> columns=
+ Link_array<Grob> columns =
Pointer_group_interface__extract_grobs (me, (Grob*)0, "note-columns");
for (int i = columns.size (); i--;)
{
- Grob * s =Note_column::get_stem (columns[i]);
+ Grob * s = Note_column::get_stem (columns[i]);
Grob * b = s ? Stem::get_beam (s): 0;
if (b)
me->add_dependency (b);
Tuplet_bracket::after_line_breaking (SCM smob)
{
Grob * me = unsmob_grob (smob);
- Link_array<Grob> columns=
+ Link_array<Grob> columns =
Pointer_group_interface__extract_grobs (me, (Grob*)0, "note-columns");
if (!columns.size ())
void
Tuplet_engraver::process_music ()
{
- for (int i= 0; i < tuplets_.size (); i++)
+ for (int i = 0; i < tuplets_.size (); i++)
{
if (tuplets_[i].spanner_)
continue;
Volta_repeat_iterator::Volta_repeat_iterator ()
{
- done_count_ = alt_count_ = rep_count_= 0;
+ done_count_ = alt_count_ = rep_count_ = 0;
first_time_ = true;
}
Vaticana_ligature_engraver::transform_heads (Spanner *ligature,
Array<Grob_info> primitives)
{
- Real flexa_width= robust_scm2double ( ligature->get_property ("flexa-width"), 2);
+ Real flexa_width = robust_scm2double ( ligature->get_property ("flexa-width"), 2);
- Real thickness= robust_scm2double ( ligature->get_property ("thickness"), 1);
+ Real thickness = robust_scm2double ( ligature->get_property ("thickness"), 1);
Item *prev_primitive = 0;
int prev_prefix_set = 0;
Item *first_primitive = dynamic_cast<Item*> (primitives[0].grob_);
Paper_column *paper_column = first_primitive->get_column ();
paper_column->warning (_f ("Vaticana_ligature_engraver: "
- "setting `spacing-increment = %f': ptr=%ul",
+ "setting `spacing-increment = %f': ptr =%ul",
ligature_width, paper_column));
paper_column->
set_property ("forced-spacing", scm_make_real (ligature_width));
int total = 0;
for (SCM s = font_list_; m.is_empty () && scm_is_pair (s); s = scm_cdr (s))
{
- Font_metric *m =unsmob_metrics (scm_car (s));
+ Font_metric *m = unsmob_metrics (scm_car (s));
int k = m->name_to_index (glyph);
if (k >= 0)
return total + k;
(strcmp (cs,":|")!= 0 && strcmp (cs,"|:")!= 0 && strcmp (cs,"|.")!= 0
&& strcmp (cs,":|:")!= 0 && strcmp (cs,".|")!= 0);
- Output_def * layout =me->get_layout ();
+ Output_def * layout = me->get_layout ();
Real half_space = 0.5;
Item * bound = dynamic_cast<Spanner*> (me)->get_bound (LEFT);
bool
Volta_engraver::staff_eligible ()
{
- SCM doit =get_property ("voltaOnThisStaff");
+ SCM doit = get_property ("voltaOnThisStaff");
if (scm_is_bool (doit))
{
return to_boolean (doit);
projects / lilypond.git / commitdiff