From: Han-Wen Nienhuys Date: Thu, 9 Dec 2004 00:16:45 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: release/2.5.14~466 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=332da9f4d25f9f63a3222efc87fae06b0c7abbdd;p=lilypond.git *** empty log message *** --- diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc index f4bbbd21e9..a83ce1beb3 100644 --- a/lily/accidental-engraver.cc +++ b/lily/accidental-engraver.cc @@ -141,7 +141,7 @@ static bool 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)); diff --git a/lily/accidental-placement.cc b/lily/accidental-placement.cc index fae8a012db..087f62abd0 100644 --- a/lily/accidental-placement.cc +++ b/lily/accidental-placement.cc @@ -52,7 +52,7 @@ Accidental_placement::add_accidental (Grob* me, Grob* a) return; } - Pitch *p= unsmob_pitch (mcause->get_property ("pitch")); + Pitch *p = unsmob_pitch (mcause->get_property ("pitch")); int n = p->get_notename (); @@ -81,8 +81,8 @@ Accidental_placement::split_accidentals (Grob * accs, Link_array *break_reminder, Link_array *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)); @@ -262,12 +262,12 @@ Accidental_placement::position_accidentals (Grob * me) Y-position, they share an Ape, and will be printed in overstrike. */ Link_array 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); @@ -280,7 +280,7 @@ Accidental_placement::position_accidentals (Grob * me) extents if we're sure that we've found the right common refpoint */ Link_array 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--;) @@ -330,7 +330,7 @@ Accidental_placement::position_accidentals (Grob * me) 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); @@ -390,7 +390,7 @@ Accidental_placement::position_accidentals (Grob * me) /* 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); diff --git a/lily/afm.cc b/lily/afm.cc index fb2b761df7..6f9fe444e1 100644 --- a/lily/afm.cc +++ b/lily/afm.cc @@ -24,7 +24,7 @@ Adobe_font_metric::Adobe_font_metric (AFM_Font_info *fi) 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; diff --git a/lily/align-interface.cc b/lily/align-interface.cc index 343275fed2..31707ec327 100644 --- a/lily/align-interface.cc +++ b/lily/align-interface.cc @@ -60,13 +60,13 @@ Align_interface::align_to_fixed_distance (Grob *me , Axis a) Link_array elems = Pointer_group_interface__extract_grobs (me, (Grob*) 0, "elements"); - Real where_f= 0; + Real where_f = 0; Interval v; v.set_empty (); Array 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 @@ -135,12 +135,12 @@ Align_interface::align_elements_to_extents (Grob * me, Axis a) Link_array elems; Link_array 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 (all_grobs[i]); + Grob *e = dynamic_cast (all_grobs[i]); elems.push (e); dims.push (y); @@ -166,9 +166,9 @@ Align_interface::align_elements_to_extents (Grob * me, Axis a) Array 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) diff --git a/lily/arpeggio.cc b/lily/arpeggio.cc index e4b9a03a19..f0aa6ceaa2 100644 --- a/lily/arpeggio.cc +++ b/lily/arpeggio.cc @@ -46,7 +46,7 @@ Arpeggio::print (SCM smob) { 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) @@ -72,7 +72,7 @@ Arpeggio::print (SCM smob) } 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 ; @@ -82,7 +82,7 @@ Arpeggio::print (SCM smob) 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); diff --git a/lily/audio-item.cc b/lily/audio-item.cc index 3cf2300827..cd16061147 100644 --- a/lily/audio-item.cc +++ b/lily/audio-item.cc @@ -43,8 +43,8 @@ Audio_note::tie_to (Audio_note* t) Audio_key::Audio_key (int acc, bool major) { - accidentals_=acc; - major_=major; + accidentals_ = acc; + major_ = major; } Audio_dynamic::Audio_dynamic (Real volume) diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc index 662ebeff5f..93b918b4c7 100644 --- a/lily/auto-beam-engraver.cc +++ b/lily/auto-beam-engraver.cc @@ -113,7 +113,7 @@ Auto_beam_engraver::try_music (Music*m) /* 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 * @@ -364,7 +364,7 @@ Auto_beam_engraver::typeset_beam () finished_beam_ = 0; delete finished_grouping_; - finished_grouping_= 0; + finished_grouping_ = 0; } } diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc index a53a676eee..50dd889714 100644 --- a/lily/axis-group-engraver.cc +++ b/lily/axis-group-engraver.cc @@ -102,7 +102,7 @@ Axis_group_engraver::process_acknowledged_grobs () 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"))) { diff --git a/lily/axis-group-interface.cc b/lily/axis-group-interface.cc index 6a336f1efe..cd1ff8cbba 100644 --- a/lily/axis-group-interface.cc +++ b/lily/axis-group-interface.cc @@ -85,7 +85,7 @@ Axis_group_interface::set_axes (Grob*me,Axis a1, Axis a2) { 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); } diff --git a/lily/bar-check-iterator.cc b/lily/bar-check-iterator.cc index 76fdc53675..1cb9458249 100644 --- a/lily/bar-check-iterator.cc +++ b/lily/bar-check-iterator.cc @@ -39,15 +39,15 @@ Bar_check_iterator::process (Moment m) 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")); diff --git a/lily/bar-line.cc b/lily/bar-line.cc index 42f03f423c..1ba07c18d4 100644 --- a/lily/bar-line.cc +++ b/lily/bar-line.cc @@ -28,7 +28,7 @@ Bar_line::print (SCM smob) 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) @@ -60,7 +60,7 @@ Bar_line::compound_barline (Grob*me, String str, Real h) 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 @@ -156,7 +156,7 @@ MAKE_SCHEME_CALLBACK (Bar_line,before_line_breaking ,1); SCM Bar_line::before_line_breaking (SCM smob) { - Grob*me=unsmob_grob (smob); + Grob*me = unsmob_grob (smob); Item * item = dynamic_cast (me); SCM g = me->get_property ("glyph"); diff --git a/lily/beam-concave.cc b/lily/beam-concave.cc index 367a1a4990..ea040131cb 100644 --- a/lily/beam-concave.cc +++ b/lily/beam-concave.cc @@ -112,7 +112,7 @@ Beam::check_concave (SCM smob) Array close_positions; Array 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. diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc index bf194f978c..0217378217 100644 --- a/lily/beam-engraver.cc +++ b/lily/beam-engraver.cc @@ -84,7 +84,7 @@ Beam_engraver::Beam_engraver () { beam_ = 0; finished_beam_ = 0; - finished_beam_info_= 0; + finished_beam_info_ = 0; beam_info_ = 0; now_stop_ev_ = 0; start_ev_ = 0; @@ -106,7 +106,7 @@ Beam_engraver::try_music (Music *m) { start_ev_ = m; } - else if (d==STOP) + else if (d == STOP) { now_stop_ev_ = m; } diff --git a/lily/beam-performer.cc b/lily/beam-performer.cc index 107eeb4357..dc5194a60a 100644 --- a/lily/beam-performer.cc +++ b/lily/beam-performer.cc @@ -77,7 +77,7 @@ Beam_performer::try_music (Music *m) { start_ev_ = m; } - else if (d==STOP) + else if (d == STOP) { now_stop_ev_ = m; } diff --git a/lily/beam-quanting.cc b/lily/beam-quanting.cc index 553b8c4bcb..c10dc8b189 100644 --- a/lily/beam-quanting.cc +++ b/lily/beam-quanting.cc @@ -141,7 +141,7 @@ Beam::quanting (SCM smob) Do stem computations. These depend on YL and YR linearly, so we can precompute for every stem 2 factors. */ - Link_array stems= + Link_array stems = Pointer_group_interface__extract_grobs (me, (Grob*)0, "stems"); Array stem_infos; Array base_lengths; @@ -165,7 +165,7 @@ Beam::quanting (SCM smob) 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]; @@ -182,7 +182,7 @@ Beam::quanting (SCM smob) 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); @@ -268,7 +268,7 @@ Beam::quanting (SCM smob) 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, @@ -294,11 +294,11 @@ Beam::quanting (SCM smob) 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) @@ -336,7 +336,7 @@ Beam::score_stem_lengths (Link_array const &stems, Drul_array score (0, 0); Drul_array 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)) diff --git a/lily/beam.cc b/lily/beam.cc index d73bfc4fc3..0f76d58cae 100644 --- a/lily/beam.cc +++ b/lily/beam.cc @@ -228,7 +228,7 @@ position_with_maximal_common_beams (SCM left_beaming, SCM right_beaming, void Beam::connect_beams (Grob *me) { - Link_array stems= + Link_array stems = Pointer_group_interface__extract_grobs (me, (Grob*)0, "stems"); Slice last_int; @@ -308,7 +308,7 @@ Beam::print (SCM grob) Spanner *me = unsmob_spanner (grob); position_beam (me); - Link_array stems= + Link_array stems = Pointer_group_interface__extract_grobs (me, (Grob*)0, "stems"); Grob* xcommon = common_refpoint_of_array (stems, me, X_AXIS); @@ -336,7 +336,7 @@ Beam::print (SCM grob) pos = Interval (0,0); } else - pos= ly_scm2realdrul (posns); + pos = ly_scm2realdrul (posns); scale_drul (&pos, Staff_symbol_referencer::staff_space (me)); @@ -376,7 +376,7 @@ Beam::print (SCM grob) Array 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) @@ -389,7 +389,7 @@ Beam::print (SCM grob) } } 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) @@ -544,10 +544,10 @@ Beam::get_default_dir (Grob *me) count[UP] = count[DOWN] = 0; Direction d = DOWN; - Link_array stems= + Link_array 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); @@ -584,9 +584,9 @@ void Beam::set_stem_directions (Grob *me, Direction d) { Link_array 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= + Link_array 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 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)) @@ -823,7 +823,7 @@ Beam::least_squares (SCM smob) Array x_posns ; - Link_array stems= + Link_array 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); @@ -839,7 +839,7 @@ Beam::least_squares (SCM smob) + 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]; @@ -888,7 +888,7 @@ Beam::least_squares (SCM smob) else { Array 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)) @@ -936,7 +936,7 @@ Beam::shift_region_to_valid (SCM grob) Code dup. */ Array x_posns ; - Link_array stems= + Link_array 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); @@ -946,8 +946,8 @@ Beam::shift_region_to_valid (SCM grob) 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]; @@ -967,7 +967,7 @@ Beam::shift_region_to_valid (SCM grob) Real dy = pos[RIGHT] - pos[LEFT]; Real y = pos[LEFT]; - Real slope =dy/dx; + Real slope = dy/dx; /* @@ -976,7 +976,7 @@ Beam::shift_region_to_valid (SCM grob) */ 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)) @@ -1124,7 +1124,7 @@ Beam::calc_stem_y (Grob *me, Grob* s, Grob ** common, { 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) @@ -1140,7 +1140,7 @@ Beam::calc_stem_y (Grob *me, Grob* s, Grob ** common, void Beam::set_stem_lengths (Grob *me) { - Link_array stems= + Link_array stems = Pointer_group_interface__extract_grobs (me, (Grob*)0, "stems"); if (!stems.size ()) @@ -1170,7 +1170,7 @@ Beam::set_stem_lengths (Grob *me) 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)) @@ -1195,11 +1195,11 @@ Beam::set_stem_lengths (Grob *me) void Beam::set_beaming (Grob *me, Beaming_info_list *beaming) { - Link_array stems= + Link_array 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. @@ -1236,7 +1236,7 @@ Beam::forced_stem_count (Grob *me) Link_arraystems = 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]; diff --git a/lily/beaming-info.cc b/lily/beaming-info.cc index 1e4e6c0956..21354a5f32 100644 --- a/lily/beaming-info.cc +++ b/lily/beaming-info.cc @@ -33,7 +33,7 @@ Beaming_info_list::best_splitpoint_index (Moment &beat_length,bool subdivide) co 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 (); @@ -46,7 +46,7 @@ Beaming_info_list::best_splitpoint_index (Moment &beat_length,bool subdivide) co } } - return minidx|(minden==1 && subdivide ? at_beat : 0); + return minidx|(minden ==1 && subdivide ? at_beat : 0); } int diff --git a/lily/bezier.cc b/lily/bezier.cc index 87c0623ba2..c51ba3706d 100644 --- a/lily/bezier.cc +++ b/lily/bezier.cc @@ -57,7 +57,7 @@ translate (Array* array, Offset o) 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. @@ -91,7 +91,7 @@ Bezier::curve_point (Real t)const 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); @@ -114,7 +114,7 @@ Polynomial 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)) @@ -143,8 +143,8 @@ filter_solutions (Array sol) Array 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 (); @@ -180,7 +180,7 @@ Bezier::extent (Axis a)const Array 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])); @@ -219,7 +219,7 @@ Bezier::translate (Offset o) 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 ())); } diff --git a/lily/box.cc b/lily/box.cc index 1dc85ea63f..5463abef86 100644 --- a/lily/box.cc +++ b/lily/box.cc @@ -13,14 +13,14 @@ 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]); } diff --git a/lily/break-align-engraver.cc b/lily/break-align-engraver.cc index 49ea7ca788..5d2987b6b3 100644 --- a/lily/break-align-engraver.cc +++ b/lily/break-align-engraver.cc @@ -78,7 +78,7 @@ Break_align_engraver::acknowledge_grob (Grob_info inf) 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 ; diff --git a/lily/break-align-interface.cc b/lily/break-align-interface.cc index 1b1b1abde3..88fb549dea 100644 --- a/lily/break-align-interface.cc +++ b/lily/break-align-interface.cc @@ -91,7 +91,7 @@ Break_align_interface::ordered_elements (Grob *grob) { 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")) @@ -120,7 +120,7 @@ Break_align_interface::do_alignment (Grob *grob) Array 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); @@ -134,7 +134,7 @@ Break_align_interface::do_alignment (Grob *grob) Array 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; @@ -169,10 +169,10 @@ Break_align_interface::do_alignment (Grob *grob) == 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; } } @@ -187,7 +187,7 @@ Break_align_interface::do_alignment (Grob *grob) 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"); } diff --git a/lily/break-substitution.cc b/lily/break-substitution.cc index 3fcf35b6f6..c5f98c727e 100644 --- a/lily/break-substitution.cc +++ b/lily/break-substitution.cc @@ -142,7 +142,7 @@ substitute_grob_list (SCM grob_list) 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) { @@ -228,7 +228,7 @@ spanner_system_range (Spanner* sp) 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; @@ -239,7 +239,7 @@ item_system_range (Item* it) if (bi && bi->get_system ()) sr.add_point (bi->get_system ()->rank_); } - while (flip (&d)!=LEFT); + while (flip (&d)!= LEFT); return sr; } @@ -407,7 +407,7 @@ Spanner::fast_fubstitute_grob_list (SCM sym, 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); @@ -424,7 +424,7 @@ Spanner::fast_fubstitute_grob_list (SCM sym, 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 diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc index cb92fe9589..fa8191a422 100644 --- a/lily/chord-name-engraver.cc +++ b/lily/chord-name-engraver.cc @@ -98,7 +98,7 @@ Chord_name_engraver::process_music () 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."); diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc index 999e553f05..4131005ae4 100644 --- a/lily/clef-engraver.cc +++ b/lily/clef-engraver.cc @@ -71,7 +71,7 @@ Clef_engraver::set_glyph () void Clef_engraver::acknowledge_grob (Grob_info info) { - Item * item =dynamic_cast (info.grob_); + Item * item = dynamic_cast (info.grob_); if (item) { if (Bar_line::has_interface (info.grob_) diff --git a/lily/cluster-engraver.cc b/lily/cluster-engraver.cc index 542863a376..f576e671df 100644 --- a/lily/cluster-engraver.cc +++ b/lily/cluster-engraver.cc @@ -81,7 +81,7 @@ Cluster_spanner_engraver::process_music () for (int i = 0; i get_property ("pitch")); + Pitch *pit = unsmob_pitch (cluster_notes_[i]->get_property ("pitch")); int p =( pit ? pit->steps () : 0) + c0; diff --git a/lily/cluster.cc b/lily/cluster.cc index 3d1adbe29b..5eee6ee6db 100644 --- a/lily/cluster.cc +++ b/lily/cluster.cc @@ -31,7 +31,7 @@ brew_cluster_piece (Grob *me, Array bottom_points, Array top_poi { 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); @@ -141,7 +141,7 @@ Cluster::print (SCM smob) 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)) { diff --git a/lily/coherent-ligature-engraver.cc b/lily/coherent-ligature-engraver.cc index 1fad0f9b24..c233baa6c4 100644 --- a/lily/coherent-ligature-engraver.cc +++ b/lily/coherent-ligature-engraver.cc @@ -81,7 +81,7 @@ 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) @@ -93,7 +93,7 @@ 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)) @@ -138,7 +138,7 @@ Coherent_ligature_engraver::get_set_column (Item *item, Paper_column *column) 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 diff --git a/lily/collision-engraver.cc b/lily/collision-engraver.cc index f18f1dc612..bfaf52c412 100644 --- a/lily/collision-engraver.cc +++ b/lily/collision-engraver.cc @@ -37,7 +37,7 @@ Collision_engraver::process_acknowledged_grobs () } - 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]); } diff --git a/lily/completion-note-heads-engraver.cc b/lily/completion-note-heads-engraver.cc index 08a6737c2b..dda44e2196 100644 --- a/lily/completion-note-heads-engraver.cc +++ b/lily/completion-note-heads-engraver.cc @@ -124,7 +124,7 @@ Completion_heads_engraver::next_barline_moment ( ) Duration Completion_heads_engraver::find_nearest_duration (Rational length) { - int log_limit= 6; + int log_limit = 6; Duration d (0,0); @@ -224,7 +224,7 @@ Completion_heads_engraver::process_music () 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); @@ -240,7 +240,7 @@ Completion_heads_engraver::process_music () 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"); @@ -253,7 +253,7 @@ Completion_heads_engraver::process_music () 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! diff --git a/lily/context-def.cc b/lily/context-def.cc index 6c0f7f87b5..1bc3e7a9c8 100644 --- a/lily/context-def.cc +++ b/lily/context-def.cc @@ -169,7 +169,7 @@ Context_def::path_to_acceptable_context (SCM type_sym, Output_def *odef) const accepteds.push (t); Link_array 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. */ @@ -180,8 +180,8 @@ Context_def::path_to_acceptable_context (SCM type_sym, Output_def *odef) const } } - 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]; @@ -295,7 +295,7 @@ Context_def::instantiate (SCM ops, Object_key const *key) if (scm_is_pair (trans_list)) scm_set_cdr_x (scm_last_pair (trans_list), cons); else - trans_list= cons; + trans_list = cons; } else { diff --git a/lily/context-handle.cc b/lily/context-handle.cc index a18a9eba05..03698a48d4 100644 --- a/lily/context-handle.cc +++ b/lily/context-handle.cc @@ -73,7 +73,7 @@ Interpretation_context_handle::operator = (Interpretation_context_handle const & void Interpretation_context_handle::set_context (Context *trans) { - if (outlet_ ==trans) + if (outlet_ == trans) return; if (outlet_) down (); diff --git a/lily/context-scheme.cc b/lily/context-scheme.cc index 594a7c19a1..f5a27b82a3 100644 --- a/lily/context-scheme.cc +++ b/lily/context-scheme.cc @@ -69,7 +69,7 @@ LY_DEFINE (ly_context_property, "ly:context-property", "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"); diff --git a/lily/context.cc b/lily/context.cc index 8dc53e2645..4cad8ea641 100644 --- a/lily/context.cc +++ b/lily/context.cc @@ -127,7 +127,7 @@ Context::create_unique_context (SCM n, SCM operations) 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; @@ -186,7 +186,7 @@ Context::find_create_context (SCM n, String id, SCM operations) 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; @@ -493,7 +493,7 @@ Context::print_smob (SCM s, SCM port, scm_print_state *) scm_display (d->get_context_name (), port); } - if (Context *td=dynamic_cast (sc)) + if (Context *td = dynamic_cast (sc)) { scm_puts ("=", port); scm_puts (td->id_string_.to_str0 (), port); diff --git a/lily/directional-element-interface.cc b/lily/directional-element-interface.cc index 698f2ff122..2032325f5a 100644 --- a/lily/directional-element-interface.cc +++ b/lily/directional-element-interface.cc @@ -12,7 +12,7 @@ Direction get_grob_direction (Grob*me) { - SCM d= me->get_property ("direction"); + SCM d = me->get_property ("direction"); if (!is_direction (d)) return CENTER; diff --git a/lily/dot-column.cc b/lily/dot-column.cc index e464b52fa0..8480362f1e 100644 --- a/lily/dot-column.cc +++ b/lily/dot-column.cc @@ -273,7 +273,7 @@ Dot_column::do_shifts (Grob*me) } 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")); diff --git a/lily/drum-note-engraver.cc b/lily/drum-note-engraver.cc index a1527b237f..22b9084560 100644 --- a/lily/drum-note-engraver.cc +++ b/lily/drum-note-engraver.cc @@ -54,7 +54,7 @@ void 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"); @@ -90,7 +90,7 @@ Drum_notes_engraver::process_music () 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) @@ -125,7 +125,7 @@ Drum_notes_engraver::acknowledge_grob (Grob_info inf) { 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]; @@ -141,7 +141,7 @@ Drum_notes_engraver::acknowledge_grob (Grob_info inf) } 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]; diff --git a/lily/drum-note-performer.cc b/lily/drum-note-performer.cc index d143e883ff..9036e1ab52 100644 --- a/lily/drum-note-performer.cc +++ b/lily/drum-note-performer.cc @@ -60,10 +60,10 @@ Drum_note_performer::stop_translation_timestep () // 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); @@ -75,13 +75,13 @@ Drum_note_performer::stop_translation_timestep () } 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) diff --git a/lily/dynamic-text-spanner.cc b/lily/dynamic-text-spanner.cc index 56267f363c..529444925e 100644 --- a/lily/dynamic-text-spanner.cc +++ b/lily/dynamic-text-spanner.cc @@ -55,7 +55,7 @@ MAKE_SCHEME_CALLBACK (Dynamic_text_spanner, print, 1); SCM Dynamic_text_spanner::print (SCM smob) { - Grob *me= unsmob_grob (smob); + Grob *me = unsmob_grob (smob); Spanner *spanner = dynamic_cast (me); Grob *common = spanner->get_bound (LEFT)->common_refpoint (spanner->get_bound (RIGHT), X_AXIS); @@ -133,7 +133,7 @@ Dynamic_text_spanner::print (SCM smob) 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); diff --git a/lily/engraver-group-engraver.cc b/lily/engraver-group-engraver.cc index 5592d7b55c..0be5398260 100644 --- a/lily/engraver-group-engraver.cc +++ b/lily/engraver-group-engraver.cc @@ -89,7 +89,7 @@ Engraver_group_engraver::pending_grob_count () const { Context *c = unsmob_context (scm_car (s)); Engraver_group_engraver * group - =dynamic_cast (c->implementation ()); + = dynamic_cast (c->implementation ()); if (group) count += group->pending_grob_count (); @@ -202,7 +202,7 @@ recurse_down_engravers (Context * c, Engraver_method ptr, bool context_first) } 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); } diff --git a/lily/event.cc b/lily/event.cc index 9fe4f5f64b..de42836dcf 100644 --- a/lily/event.cc +++ b/lily/event.cc @@ -130,7 +130,7 @@ LY_DEFINE (ly_transpose_key_alist, "ly:transpose-key-alist", 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 ())); @@ -143,7 +143,7 @@ LY_DEFINE (ly_transpose_key_alist, "ly:transpose-key-alist", 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); } diff --git a/lily/fingering-engraver.cc b/lily/fingering-engraver.cc index 9b2c9cae59..9a615f073d 100644 --- a/lily/fingering-engraver.cc +++ b/lily/fingering-engraver.cc @@ -47,14 +47,14 @@ Fingering_engraver::acknowledge_grob (Grob_info inf) { 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_); @@ -67,7 +67,7 @@ Fingering_engraver::acknowledge_grob (Grob_info inf) 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); diff --git a/lily/global-context.cc b/lily/global-context.cc index 6b6ba4e5a6..ee26880d4d 100644 --- a/lily/global-context.cc +++ b/lily/global-context.cc @@ -53,7 +53,7 @@ Global_context::add_moment_to_process (Moment m) 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); diff --git a/lily/global-ctor.cc b/lily/global-ctor.cc index ce0c6224c2..f5672e9c5e 100644 --- a/lily/global-ctor.cc +++ b/lily/global-ctor.cc @@ -24,6 +24,6 @@ add_constructor (Global_ctor c) 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)) (); } diff --git a/lily/gourlay-breaking.cc b/lily/gourlay-breaking.cc index c25d2403a6..6632d06bfe 100644 --- a/lily/gourlay-breaking.cc +++ b/lily/gourlay-breaking.cc @@ -204,7 +204,7 @@ Gourlay_breaking::do_solve () const 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_); diff --git a/lily/grace-iterator.cc b/lily/grace-iterator.cc index 17ba7bd187..daa8137548 100644 --- a/lily/grace-iterator.cc +++ b/lily/grace-iterator.cc @@ -28,7 +28,7 @@ Grace_iterator::process (Moment m) 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_; diff --git a/lily/grob-interface.cc b/lily/grob-interface.cc index 21ce34c48e..8bcf12bddd 100644 --- a/lily/grob-interface.cc +++ b/lily/grob-interface.cc @@ -65,7 +65,7 @@ check_interfaces_for_property (Grob const *me, SCM sym) 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) @@ -76,7 +76,7 @@ check_interfaces_for_property (Grob const *me, SCM sym) 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) diff --git a/lily/grob-pq-engraver.cc b/lily/grob-pq-engraver.cc index e3917c3758..86e2814900 100644 --- a/lily/grob-pq-engraver.cc +++ b/lily/grob-pq-engraver.cc @@ -69,7 +69,7 @@ Grob_pq_engraver::acknowledge_grob (Grob_info gi) 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); } diff --git a/lily/grob.cc b/lily/grob.cc index ffee088446..888e6836db 100644 --- a/lily/grob.cc +++ b/lily/grob.cc @@ -48,7 +48,7 @@ Grob::Grob (SCM basicprops, key_ = key; /* FIXME: default should be no callback. */ self_scm_ = SCM_EOL; - pscore_= 0; + pscore_ = 0; status_ = 0; original_ = 0; immutable_property_alist_ = basicprops; @@ -414,7 +414,7 @@ Grob::extent (Grob *refp, Axis a) const ; 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; diff --git a/lily/hairpin.cc b/lily/hairpin.cc index de83f6a3b8..e002839924 100644 --- a/lily/hairpin.cc +++ b/lily/hairpin.cc @@ -24,7 +24,7 @@ MAKE_SCHEME_CALLBACK (Hairpin, print, 1); SCM Hairpin::print (SCM smob) { - Grob *me= unsmob_grob (smob); + Grob *me = unsmob_grob (smob); Spanner *spanner = dynamic_cast (me); SCM s = me->get_property ("grow-direction"); diff --git a/lily/include/audio-item.hh b/lily/include/audio-item.hh index f2f73efacf..a8dfbcbc17 100644 --- a/lily/include/audio-item.hh +++ b/lily/include/audio-item.hh @@ -24,7 +24,7 @@ public: private: Audio_item (Audio_item const&); - Audio_item& operator= ( Audio_item const&); + Audio_item& operator = ( Audio_item const&); }; class Audio_dynamic : public Audio_item diff --git a/lily/include/break-algorithm.hh b/lily/include/break-algorithm.hh index e4e6590f07..570307b1ec 100644 --- a/lily/include/break-algorithm.hh +++ b/lily/include/break-algorithm.hh @@ -32,7 +32,7 @@ protected: Simple_spacer_wrapper* generate_spacing_problem (Link_array const &, Interval) const; - virtual Array do_solve () const= 0; + virtual Array do_solve () const = 0; public: Simple_spacer* (*get_line_spacer) (); diff --git a/lily/include/grace-fixup.hh b/lily/include/grace-fixup.hh index c655969c4e..8cf0ba306a 100644 --- a/lily/include/grace-fixup.hh +++ b/lily/include/grace-fixup.hh @@ -28,8 +28,8 @@ 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. diff --git a/lily/include/grob.hh b/lily/include/grob.hh index 17b6cfa475..db082f8665 100644 --- a/lily/include/grob.hh +++ b/lily/include/grob.hh @@ -18,7 +18,7 @@ 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. diff --git a/lily/include/stream.hh b/lily/include/stream.hh index ea403993e1..baecc6fb9f 100644 --- a/lily/include/stream.hh +++ b/lily/include/stream.hh @@ -17,9 +17,9 @@ source file of the GNU LilyPond music typesetter #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); diff --git a/lily/include/tfm.hh b/lily/include/tfm.hh index 3fcf49cf13..95d2dfa913 100644 --- a/lily/include/tfm.hh +++ b/lily/include/tfm.hh @@ -162,7 +162,7 @@ public: 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 (); }; diff --git a/lily/include/translator.hh b/lily/include/translator.hh index cc255a59c8..9dba8e17bb 100644 --- a/lily/include/translator.hh +++ b/lily/include/translator.hh @@ -99,25 +99,25 @@ ADD_THIS_TRANSLATOR (classname);\ 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; \ diff --git a/lily/input.cc b/lily/input.cc index 6408fea4ec..9728079837 100644 --- a/lily/input.cc +++ b/lily/input.cc @@ -15,8 +15,8 @@ Input::Input (Source_file*s, char const *cl) { - source_file_=s; - defined_str0_=cl; + source_file_ = s; + defined_str0_ = cl; } Input::Input () diff --git a/lily/item.cc b/lily/item.cc index df7a6c5c75..a47b19eafd 100644 --- a/lily/item.cc +++ b/lily/item.cc @@ -78,10 +78,10 @@ Item::copy_breakable_items () Grob * dolly = clone (count ++); Item * item = dynamic_cast (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; } diff --git a/lily/key-signature-interface.cc b/lily/key-signature-interface.cc index 6dbc94a51d..e20570df6f 100644 --- a/lily/key-signature-interface.cc +++ b/lily/key-signature-interface.cc @@ -26,8 +26,8 @@ struct Key_signature_interface /* 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. @@ -72,13 +72,13 @@ alteration_pos (SCM what, int alter, int c0p) 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; @@ -92,7 +92,7 @@ MAKE_SCHEME_CALLBACK (Key_signature_interface,print,1); 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; @@ -148,7 +148,7 @@ Key_signature_interface::print (SCM smob) 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")); diff --git a/lily/least-squares.cc b/lily/least-squares.cc index 78f42bd1d7..53b74028c3 100644 --- a/lily/least-squares.cc +++ b/lily/least-squares.cc @@ -20,9 +20,9 @@ minimise_least_squares (Real * coef, Real * offset, 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; diff --git a/lily/ledger-line-engraver.cc b/lily/ledger-line-engraver.cc index e0eda1fb70..b1f5b3aed6 100644 --- a/lily/ledger-line-engraver.cc +++ b/lily/ledger-line-engraver.cc @@ -1,5 +1,5 @@ /* - ledger-line-engraver.cc -- implement Ledger_line_engraver= + ledger-line-engraver.cc -- implement Ledger_line_engraver = source file of the GNU LilyPond music typesetter diff --git a/lily/lexer.ll b/lily/lexer.ll index 5d317a2979..29e4d6367d 100644 --- a/lily/lexer.ll +++ b/lily/lexer.ll @@ -294,7 +294,7 @@ HYPHEN -- error_level_ = 1; } - for (int i= 0; i < n; i++) + for (int i = 0; i < n; i++) { yyinput (); } @@ -564,7 +564,7 @@ HYPHEN -- } {REAL} { Real r; - int cnv=sscanf (YYText (), "%lf", &r); + int cnv = sscanf (YYText (), "%lf", &r); assert (cnv == 1); yylval.scm = scm_make_real (r); @@ -592,7 +592,7 @@ HYPHEN -- } \\. { - char c= YYText ()[1]; + char c = YYText ()[1]; switch (c) { case '>': @@ -772,7 +772,7 @@ Lily_lexer::is_figure_state () const void strip_leading_white (String&s) { - int i= 0; + int i = 0; for (; i < s.length (); i++) if (!isspace (s[i])) break; @@ -783,7 +783,7 @@ strip_leading_white (String&s) void strip_trailing_white (String&s) { - int i=s.length (); + int i = s.length (); while (i--) if (!isspace (s[i])) break; @@ -818,7 +818,7 @@ is_valid_version (String s) String lyric_fudge (String s) { - char * chars =s.get_copy_str0 (); + char * chars = s.get_copy_str0 (); for (char * p = chars; *p ; p++) { @@ -830,7 +830,7 @@ lyric_fudge (String s) 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); @@ -886,7 +886,7 @@ lookup_markup_command (String s) 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; diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc index f907fef758..936d12d460 100644 --- a/lily/lily-guile.cc +++ b/lily/lily-guile.cc @@ -306,7 +306,7 @@ is_axis (SCM s) if (scm_is_number (s)) { int i = scm_to_int (s); - return i== 0 || i == 1; + return i == 0 || i == 1; } return false; } @@ -732,7 +732,7 @@ display_list (SCM s) 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); diff --git a/lily/lily-lexer.cc b/lily/lily-lexer.cc index 983dbc043f..df238ef784 100644 --- a/lily/lily-lexer.cc +++ b/lily/lily-lexer.cc @@ -264,7 +264,7 @@ Lily_lexer::escaped_char (char c) const Input Lily_lexer::here_input () const { - Source_file * f= get_source_file (); + Source_file * f = get_source_file (); return Input (f, (char*)here_str0 ()); } diff --git a/lily/lily-parser.cc b/lily/lily-parser.cc index 11bdf7fa6d..fd982bc659 100644 --- a/lily/lily-parser.cc +++ b/lily/lily-parser.cc @@ -358,7 +358,7 @@ LY_DEFINE (ly_parser_lookup, "ly:parser-lookup", 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 diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc index 201df916f0..4d202f05b2 100644 --- a/lily/line-spanner.cc +++ b/lily/line-spanner.cc @@ -274,7 +274,7 @@ Line_spanner::print (SCM smob) + 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); } diff --git a/lily/lookup.cc b/lily/lookup.cc index dd82090959..37c51a7655 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -49,7 +49,7 @@ Lookup::dot (Offset p, Real radius) * / | v * | / * | / - * (0,0) x /slope=dy/dx + * (0,0) x /slope = dy/dx * | / * |/ * @@ -80,7 +80,7 @@ Lookup::dashed_slur (Bezier b, Real thick, Real dash) { SCM l = SCM_EOL; - for (int i= 4; i -- ;) + for (int i = 4; i -- ;) { l = scm_cons (ly_offset2scm (b.control_[i]), l); } @@ -363,9 +363,9 @@ Lookup::slur (Bezier curve, Real curvethick, Real linethick) 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]); /* @@ -373,7 +373,7 @@ Lookup::slur (Bezier curve, Real curvethick, Real linethick) */ 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); } diff --git a/lily/ly-module.cc b/lily/ly-module.cc index f3f0c528b3..9b0a6dc558 100644 --- a/lily/ly-module.cc +++ b/lily/ly-module.cc @@ -94,7 +94,7 @@ ly_module_symbols (SCM mod) { 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); } @@ -119,7 +119,7 @@ LY_DEFINE (ly_module2alist, "ly:module->alist", "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); } diff --git a/lily/lyric-combine-music-iterator.cc b/lily/lyric-combine-music-iterator.cc index 6f118427a8..c1076cd792 100644 --- a/lily/lyric-combine-music-iterator.cc +++ b/lily/lyric-combine-music-iterator.cc @@ -168,7 +168,7 @@ Lyric_combine_music_iterator::process (Moment m) 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); } } diff --git a/lily/lyric-hyphen.cc b/lily/lyric-hyphen.cc index 39cd7555f5..abe2e09ba9 100644 --- a/lily/lyric-hyphen.cc +++ b/lily/lyric-hyphen.cc @@ -97,7 +97,7 @@ Hyphen_spanner::set_spacing_rods (SCM smob) 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); diff --git a/lily/main.cc b/lily/main.cc index 2cd0a59d1f..71c45cfa25 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -123,7 +123,7 @@ static Long_option_init options_static[] = { {_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")}, @@ -150,12 +150,12 @@ static void 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 : "")); } diff --git a/lily/measure-grouping-engraver.cc b/lily/measure-grouping-engraver.cc index bda7ed0bda..85e3c4e99f 100644 --- a/lily/measure-grouping-engraver.cc +++ b/lily/measure-grouping-engraver.cc @@ -32,7 +32,7 @@ Measure_grouping_engraver::finalize () { grouping_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn"))); grouping_->suicide (); - grouping_= 0; + grouping_ = 0; } } diff --git a/lily/metronome-engraver.cc b/lily/metronome-engraver.cc index 752b3358a9..50eab8b607 100644 --- a/lily/metronome-engraver.cc +++ b/lily/metronome-engraver.cc @@ -81,7 +81,7 @@ Metronome_mark_engraver::process_music () 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); diff --git a/lily/midi-item.cc b/lily/midi-item.cc index 916d518d95..064fdd2292 100644 --- a/lily/midi-item.cc +++ b/lily/midi-item.cc @@ -458,7 +458,7 @@ Midi_track::data_string () const String str = Midi_chunk::data_string (); if (midi_debug_global_b) str += "\n"; - for (Cons *i=event_p_list_.head_; i; i = i->next_) + for (Cons *i = event_p_list_.head_; i; i = i->next_) { str += i->car_->to_string (); if (midi_debug_global_b) diff --git a/lily/midi-walker.cc b/lily/midi-walker.cc index 72c175a956..2287a512ae 100644 --- a/lily/midi-walker.cc +++ b/lily/midi-walker.cc @@ -36,7 +36,7 @@ compare (Midi_note_event const& left, Midi_note_event const& right) 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; @@ -58,7 +58,7 @@ Midi_walker::do_start_note (Midi_note* note) 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 ()) diff --git a/lily/misc.cc b/lily/misc.cc index 01e72f6258..649f72c900 100644 --- a/lily/misc.cc +++ b/lily/misc.cc @@ -18,7 +18,7 @@ int intlog2 (int d) { assert (d); - int i= 0; + int i = 0; while ((d != 1)) { d /= 2; diff --git a/lily/moment.cc b/lily/moment.cc index ea5ec2e7df..815f3f9529 100644 --- a/lily/moment.cc +++ b/lily/moment.cc @@ -193,7 +193,7 @@ Moment::compare (Moment const &a, Moment const &b) void Moment::operator += (Moment const &src) { - main_part_ +=src.main_part_ ; + main_part_ += src.main_part_ ; grace_part_ += src.grace_part_; } void diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc index b9cbec39c8..7d5e333f6d 100644 --- a/lily/multi-measure-rest-engraver.cc +++ b/lily/multi-measure-rest-engraver.cc @@ -106,7 +106,7 @@ Multi_measure_rest_engraver::process_music () Direction d = DOWN; do { Grob *last = 0; - for (int i= 0; i get_property ("direction")) { diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc index 1b13aad8c5..4cf770a127 100644 --- a/lily/multi-measure-rest.cc +++ b/lily/multi-measure-rest.cc @@ -180,7 +180,7 @@ Multi_measure_rest::symbol_stencil (Grob *me, Real space) 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); @@ -319,7 +319,7 @@ Multi_measure_rest::set_spacing_rods (SCM smob) 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]; diff --git a/lily/music-sequence.cc b/lily/music-sequence.cc index 928b8617bf..c15ebaf2db 100644 --- a/lily/music-sequence.cc +++ b/lily/music-sequence.cc @@ -81,7 +81,7 @@ Pitch 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)) diff --git a/lily/new-fingering-engraver.cc b/lily/new-fingering-engraver.cc index b8863aed5e..e1a71795b3 100644 --- a/lily/new-fingering-engraver.cc +++ b/lily/new-fingering-engraver.cc @@ -61,7 +61,7 @@ New_fingering_engraver::acknowledge_grob (Grob_info inf) { if (Rhythmic_head::has_interface (inf.grob_)) { - Music * note_ev =inf.music_cause (); + Music * note_ev = inf.music_cause (); if (!note_ev) return; @@ -111,12 +111,12 @@ New_fingering_engraver::add_script (Grob * head, { 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); diff --git a/lily/new-lyric-combine-music-iterator.cc b/lily/new-lyric-combine-music-iterator.cc index e14512c861..81ecd8172f 100644 --- a/lily/new-lyric-combine-music-iterator.cc +++ b/lily/new-lyric-combine-music-iterator.cc @@ -129,7 +129,7 @@ New_lyric_combine_music_iterator::derived_substitute (Context *f, Context *t) { 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; @@ -223,7 +223,7 @@ New_lyric_combine_music_iterator::process (Moment ) 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; diff --git a/lily/note-collision.cc b/lily/note-collision.cc index b314cb2faf..a37cf3063f 100644 --- a/lily/note-collision.cc +++ b/lily/note-collision.cc @@ -140,7 +140,7 @@ check_meshing_chords (Grob *me, 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) @@ -151,7 +151,7 @@ check_meshing_chords (Grob *me, 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; @@ -288,7 +288,7 @@ check_meshing_chords (Grob *me, 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); @@ -318,7 +318,7 @@ Note_collision_interface::do_shifts (Grob* me) Real left_most = 1e6; Array 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; @@ -329,7 +329,7 @@ Note_collision_interface::do_shifts (Grob* me) 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; @@ -395,7 +395,7 @@ Note_collision_interface::automatic_shift (Grob *me, Array & shift (shifts[d]); Link_array & 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"); @@ -406,7 +406,7 @@ Note_collision_interface::automatic_shift (Grob *me, 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]) { @@ -422,7 +422,7 @@ Note_collision_interface::automatic_shift (Grob *me, 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] --; @@ -444,9 +444,9 @@ Note_collision_interface::automatic_shift (Grob *me, 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)) @@ -465,7 +465,7 @@ Note_collision_interface::automatic_shift (Grob *me, 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); diff --git a/lily/note-column.cc b/lily/note-column.cc index b44e7be487..a576939ae1 100644 --- a/lily/note-column.cc +++ b/lily/note-column.cc @@ -159,7 +159,7 @@ Note_column::accidentals (Grob *me) { 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; diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc index 595750e244..b87ecec4e3 100644 --- a/lily/note-heads-engraver.cc +++ b/lily/note-heads-engraver.cc @@ -53,7 +53,7 @@ Note_heads_engraver::try_music (Music *m) 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]; @@ -76,7 +76,7 @@ Note_heads_engraver::process_music () 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"); diff --git a/lily/note-name-engraver.cc b/lily/note-name-engraver.cc index e9787ce7a1..b89999aca5 100644 --- a/lily/note-name-engraver.cc +++ b/lily/note-name-engraver.cc @@ -37,7 +37,7 @@ void 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 += " "; diff --git a/lily/note-performer.cc b/lily/note-performer.cc index 71799e1c07..88b0e48a4e 100644 --- a/lily/note-performer.cc +++ b/lily/note-performer.cc @@ -66,10 +66,10 @@ Note_performer::stop_translation_timestep () // 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); @@ -81,13 +81,13 @@ Note_performer::stop_translation_timestep () } 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) diff --git a/lily/note-spacing.cc b/lily/note-spacing.cc index 377367a909..0460e59081 100644 --- a/lily/note-spacing.cc +++ b/lily/note-spacing.cc @@ -41,7 +41,7 @@ Note_spacing::get_spacing (Grob *me, Item* right_col, { for (SCM s = props[d]; scm_is_pair (s); s = scm_cdr (s)) { - Item * it= dynamic_cast (unsmob_grob (scm_car (s))); + Item * it = dynamic_cast (unsmob_grob (scm_car (s))); if (d == RIGHT && it->break_status_dir () != col_dir) { @@ -206,7 +206,7 @@ Note_spacing::right_column (Grob*me) { // 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); @@ -263,7 +263,7 @@ Note_spacing::stem_dir_correction (Grob*me, Item * rcolumn, { for (SCM s = props[d]; scm_is_pair (s); s = scm_cdr (s)) { - Item * it= dynamic_cast (unsmob_grob (scm_car (s))); + Item * it = dynamic_cast (unsmob_grob (scm_car (s))); if (d == RIGHT) acc_right = acc_right || Note_column::accidentals (it); @@ -382,7 +382,7 @@ Note_spacing::stem_dir_correction (Grob*me, Item * rcolumn, if (correct_stem_dirs) { - correction =abs (intersect.length ()); + correction = abs (intersect.length ()); /* @@ -434,7 +434,7 @@ Note_spacing::stem_dir_correction (Grob*me, Item * rcolumn, 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; diff --git a/lily/ottava-bracket.cc b/lily/ottava-bracket.cc index a491ea42e3..985fa41120 100644 --- a/lily/ottava-bracket.cc +++ b/lily/ottava-bracket.cc @@ -57,7 +57,7 @@ Ottava_bracket::print (SCM smob) { 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); @@ -90,7 +90,7 @@ Ottava_bracket::print (SCM smob) 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)); diff --git a/lily/ottava-engraver.cc b/lily/ottava-engraver.cc index 0cf47d5039..82586c91ef 100644 --- a/lily/ottava-engraver.cc +++ b/lily/ottava-engraver.cc @@ -49,7 +49,7 @@ Ottava_spanner_engraver::process_music () SCM ott = get_property ("ottavation"); if (ott != last_ottavation_) { - finished_= span_; + finished_ = span_; span_ = 0; if (scm_is_string (ott)) { diff --git a/lily/output-def.cc b/lily/output-def.cc index 1c2cb47834..404b512807 100644 --- a/lily/output-def.cc +++ b/lily/output-def.cc @@ -34,7 +34,7 @@ Output_def::Output_def (Output_def const &s) 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_); } diff --git a/lily/output-property-engraver.cc b/lily/output-property-engraver.cc index c2443f5b52..82364e9e82 100644 --- a/lily/output-property-engraver.cc +++ b/lily/output-property-engraver.cc @@ -37,7 +37,7 @@ Output_property_engraver::try_music (Music* m) 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"); @@ -49,7 +49,7 @@ Output_property_engraver::acknowledge_grob (Grob_info inf) /* 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"); diff --git a/lily/parse-scm.cc b/lily/parse-scm.cc index cb7c7c2618..629366baf1 100644 --- a/lily/parse-scm.cc +++ b/lily/parse-scm.cc @@ -22,7 +22,7 @@ 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 (); diff --git a/lily/parser.yy b/lily/parser.yy index e85909b37d..f93b0b5df7 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -1338,7 +1338,7 @@ re_rhythmed_music: 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); @@ -1661,7 +1661,7 @@ command_element: $$->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 (); @@ -1706,7 +1706,7 @@ command_element: $$ = 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); @@ -1733,12 +1733,12 @@ command_req: $$ = $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); diff --git a/lily/part-combine-engraver.cc b/lily/part-combine-engraver.cc index 2938f281d4..52811a6eb9 100644 --- a/lily/part-combine-engraver.cc +++ b/lily/part-combine-engraver.cc @@ -53,7 +53,7 @@ Part_combine_engraver::process_music () 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"); diff --git a/lily/percent-repeat-engraver.cc b/lily/percent-repeat-engraver.cc index 325f9306b6..7e0bec50e1 100644 --- a/lily/percent-repeat-engraver.cc +++ b/lily/percent-repeat-engraver.cc @@ -134,7 +134,7 @@ Percent_repeat_engraver::process_music () 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) @@ -168,7 +168,7 @@ Percent_repeat_engraver::typeset_perc () { if (finished_perc_) { - SCM col =get_property ("currentCommandColumn"); + SCM col = get_property ("currentCommandColumn"); finished_perc_->set_bound (RIGHT, unsmob_grob (col)); finished_perc_ = 0; } diff --git a/lily/percent-repeat-iterator.cc b/lily/percent-repeat-iterator.cc index 6792231283..56b477b45e 100644 --- a/lily/percent-repeat-iterator.cc +++ b/lily/percent-repeat-iterator.cc @@ -36,7 +36,7 @@ Percent_repeat_iterator::ok () const void Percent_repeat_iterator::construct_children () { - Repeated_music * mus =dynamic_cast (get_music ()); + Repeated_music * mus = dynamic_cast (get_music ()); finish_mom_ = mus->get_length (); child_iter_ = unsmob_iterator (get_iterator (mus->body ())); } diff --git a/lily/performance.cc b/lily/performance.cc index c2b822e765..0fde4b3e52 100644 --- a/lily/performance.cc +++ b/lily/performance.cc @@ -144,7 +144,7 @@ Performance::output_header_track (Midi_stream& midi_stream) void Performance::add_element (Audio_element *p) { - if (Audio_staff*s=dynamic_cast (p)) + if (Audio_staff*s = dynamic_cast (p)) { audio_staffs_.push (s); } diff --git a/lily/performer.cc b/lily/performer.cc index 14a4239c1f..942f6f306e 100644 --- a/lily/performer.cc +++ b/lily/performer.cc @@ -45,6 +45,6 @@ void 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); } diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc index 98712ee314..4b57352413 100644 --- a/lily/phrasing-slur-engraver.cc +++ b/lily/phrasing-slur-engraver.cc @@ -38,7 +38,7 @@ public: Phrasing_slur_engraver::Phrasing_slur_engraver () { - events_[START] =events_[STOP] = 0; + events_[START] = events_[STOP] = 0; } bool @@ -71,7 +71,7 @@ Phrasing_slur_engraver::try_music (Music *m) 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--; ) diff --git a/lily/piano-pedal-engraver.cc b/lily/piano-pedal-engraver.cc index 5f6b0503e0..4e9160c980 100644 --- a/lily/piano-pedal-engraver.cc +++ b/lily/piano-pedal-engraver.cc @@ -310,7 +310,7 @@ Piano_pedal_engraver::create_bracket_grobs (Pedal_info *p, bool mixed) { 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; } diff --git a/lily/piano-pedal-performer.cc b/lily/piano-pedal-performer.cc index cd665d6da0..63b6b3833e 100644 --- a/lily/piano-pedal-performer.cc +++ b/lily/piano-pedal-performer.cc @@ -105,7 +105,7 @@ Piano_pedal_performer::create_audio_elements () 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 (); } diff --git a/lily/pitch.cc b/lily/pitch.cc index 0815d49b8c..3504bdae6f 100644 --- a/lily/pitch.cc +++ b/lily/pitch.cc @@ -32,7 +32,7 @@ Pitch::Pitch () 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_; diff --git a/lily/property-iterator.cc b/lily/property-iterator.cc index c3c0ca7a21..521daaa245 100644 --- a/lily/property-iterator.cc +++ b/lily/property-iterator.cc @@ -25,7 +25,7 @@ Property_iterator::process (Moment m) 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) @@ -140,7 +140,7 @@ Push_property_iterator::do_quit () 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)); } diff --git a/lily/protected-scm.cc b/lily/protected-scm.cc index 18f2205e56..9e682104f9 100644 --- a/lily/protected-scm.cc +++ b/lily/protected-scm.cc @@ -47,7 +47,7 @@ Protected_scm::operator = (SCM s) Protected_scm& Protected_scm::operator = (Protected_scm const &s) { - return operator= (s.object_); + return operator = (s.object_); } Protected_scm::operator SCM () const diff --git a/lily/rest-collision-engraver.cc b/lily/rest-collision-engraver.cc index b6616cce2b..598880e98a 100644 --- a/lily/rest-collision-engraver.cc +++ b/lily/rest-collision-engraver.cc @@ -43,7 +43,7 @@ Rest_collision_engraver::process_acknowledged_grobs () 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]); } diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc index 679a942621..02d1f4e7d7 100644 --- a/lily/rest-collision.cc +++ b/lily/rest-collision.cc @@ -120,7 +120,7 @@ Rest_collision::do_shift (Grob *me) center one should be centered on the staff. */ Drul_array< Link_array > 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]); @@ -190,7 +190,7 @@ Rest_collision::do_shift (Grob *me) 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]); diff --git a/lily/rest-engraver.cc b/lily/rest-engraver.cc index 91e447613a..cecab14762 100644 --- a/lily/rest-engraver.cc +++ b/lily/rest-engraver.cc @@ -63,7 +63,7 @@ Rest_engraver::process_music () 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) { @@ -83,7 +83,7 @@ Rest_engraver::process_music () */ 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); diff --git a/lily/rhythmic-column-engraver.cc b/lily/rhythmic-column-engraver.cc index 8b4a1f7f1b..8246d8ffc3 100644 --- a/lily/rhythmic-column-engraver.cc +++ b/lily/rhythmic-column-engraver.cc @@ -65,7 +65,7 @@ Rhythmic_column_engraver::Rhythmic_column_engraver () last_spacing_ = 0; stem_ = 0; - note_column_= 0; + note_column_ = 0; dotcol_ = 0; } @@ -94,7 +94,7 @@ Rhythmic_column_engraver::process_acknowledged_grobs () } - 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]); diff --git a/lily/rod.cc b/lily/rod.cc index c1ce62177e..88baddb71e 100644 --- a/lily/rod.cc +++ b/lily/rod.cc @@ -34,7 +34,7 @@ Rod::columnize () 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); } diff --git a/lily/score-performer.cc b/lily/score-performer.cc index bf5eeb1fa1..8a681d3aa7 100644 --- a/lily/score-performer.cc +++ b/lily/score-performer.cc @@ -39,7 +39,7 @@ Score_performer::~Score_performer () void Score_performer::play_element (Audio_element * p) { - if (Audio_item * i=dynamic_cast (p)) + if (Audio_item * i = dynamic_cast (p)) { audio_column_->add_audio_item (i); } diff --git a/lily/score.cc b/lily/score.cc index 453a72a73e..d2dd56d849 100644 --- a/lily/score.cc +++ b/lily/score.cc @@ -80,7 +80,7 @@ Score::Score (Score const &s) 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_); diff --git a/lily/script-column-engraver.cc b/lily/script-column-engraver.cc index 27cdc606d2..9b0c1310ac 100644 --- a/lily/script-column-engraver.cc +++ b/lily/script-column-engraver.cc @@ -65,7 +65,7 @@ Script_column_engraver::process_acknowledged_grobs () 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 (); } diff --git a/lily/script-interface.cc b/lily/script-interface.cc index c529cd37a2..c82b30c4be 100644 --- a/lily/script-interface.cc +++ b/lily/script-interface.cc @@ -72,7 +72,7 @@ MAKE_SCHEME_CALLBACK (Script_interface, print, 1); 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) diff --git a/lily/self-aligment-interface.cc b/lily/self-aligment-interface.cc index e67a8f0d12..5035e1e616 100644 --- a/lily/self-aligment-interface.cc +++ b/lily/self-aligment-interface.cc @@ -32,7 +32,7 @@ Self_alignment_interface::aligned_on_parent (SCM element_smob, SCM axis) 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)); @@ -77,7 +77,7 @@ Self_alignment_interface::aligned_on_self (SCM element_smob, SCM axis) 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)); diff --git a/lily/separating-group-spanner.cc b/lily/separating-group-spanner.cc index 7c62e720d9..69d56aa806 100644 --- a/lily/separating-group-spanner.cc +++ b/lily/separating-group-spanner.cc @@ -56,8 +56,8 @@ Separating_group_spanner::find_rods (Item * r, SCM next, Real padding) { 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; diff --git a/lily/separating-line-group-engraver.cc b/lily/separating-line-group-engraver.cc index 9fb12d6686..54dae428db 100644 --- a/lily/separating-line-group-engraver.cc +++ b/lily/separating-line-group-engraver.cc @@ -90,7 +90,7 @@ Separating_line_group_engraver::finalize () 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" ), @@ -125,7 +125,7 @@ Separating_line_group_engraver::acknowledge_grob (Grob_info i) return ; } - bool ib =Item::is_breakable (it); + bool ib = Item::is_breakable (it); Item *&p_ref_ (ib ? break_item_ : musical_item_); diff --git a/lily/sequential-iterator.cc b/lily/sequential-iterator.cc index 370f6a8574..d822c61b86 100644 --- a/lily/sequential-iterator.cc +++ b/lily/sequential-iterator.cc @@ -154,7 +154,7 @@ Sequential_iterator::construct_children () 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_ diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc index 832cdae645..b34f3028a8 100644 --- a/lily/side-position-interface.cc +++ b/lily/side-position-interface.cc @@ -225,7 +225,7 @@ Side_position_interface::aligned_side (SCM element_smob, SCM axis) 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")); diff --git a/lily/simple-spacer.cc b/lily/simple-spacer.cc index d257874666..8e3de2cf76 100644 --- a/lily/simple-spacer.cc +++ b/lily/simple-spacer.cc @@ -108,7 +108,7 @@ Simple_spacer::add_rod (int l, int r, Real dist) 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_ ; } @@ -117,7 +117,7 @@ Real 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; } @@ -126,7 +126,7 @@ Real 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_; @@ -139,7 +139,7 @@ Real 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_; @@ -160,7 +160,7 @@ Simple_spacer::active_springs_stiffness () const 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) { @@ -178,7 +178,7 @@ void Simple_spacer::set_active_states () { /* float comparison is safe, since force is only copied. */ - for (int i= 0 ; i = force_) { @@ -191,7 +191,7 @@ Real 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; @@ -320,7 +320,7 @@ LY_DEFINE(ly_solve_spring_rod_problem, "ly:solve-spring-rod-problem", 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); @@ -390,7 +390,7 @@ Simple_spacer_wrapper::solve (Column_x_positions *positions, bool ragged) 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); @@ -487,7 +487,7 @@ Simple_spacer_wrapper::add_columns (Link_array const &icols) } 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; @@ -513,7 +513,7 @@ Simple_spacer_wrapper::add_columns (Link_array const &icols) 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)) diff --git a/lily/simultaneous-music-iterator.cc b/lily/simultaneous-music-iterator.cc index e2e3c1977b..c3294832b8 100644 --- a/lily/simultaneous-music-iterator.cc +++ b/lily/simultaneous-music-iterator.cc @@ -142,9 +142,9 @@ Simultaneous_music_iterator::run_always () const 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; } diff --git a/lily/slash-repeat-engraver.cc b/lily/slash-repeat-engraver.cc index 60d4afc2f8..850dd54195 100644 --- a/lily/slash-repeat-engraver.cc +++ b/lily/slash-repeat-engraver.cc @@ -90,7 +90,7 @@ Slash_repeat_engraver::try_music (Music * m) 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_); diff --git a/lily/slur-configuration.cc b/lily/slur-configuration.cc index 626d709a0f..fd2092952d 100644 --- a/lily/slur-configuration.cc +++ b/lily/slur-configuration.cc @@ -224,8 +224,8 @@ Slur_configuration::score_encompass (Slur_score_state const &state) { 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] @@ -274,7 +274,7 @@ Slur_configuration::score_encompass (Slur_score_state const &state) 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; diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc index ff2388f4cd..1bc7fce62f 100644 --- a/lily/slur-engraver.cc +++ b/lily/slur-engraver.cc @@ -40,7 +40,7 @@ public: Slur_engraver::Slur_engraver () { - events_[START] =events_[STOP] = 0; + events_[START] = events_[STOP] = 0; } bool @@ -72,7 +72,7 @@ Slur_engraver::set_melisma (bool m) 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--; ) diff --git a/lily/slur-performer.cc b/lily/slur-performer.cc index ea809ae5f6..a383514068 100644 --- a/lily/slur-performer.cc +++ b/lily/slur-performer.cc @@ -80,7 +80,7 @@ Slur_performer::try_music (Music *m) { start_ev_ = m; } - else if (d==STOP) + else if (d == STOP) { now_stop_ev_ = m; } diff --git a/lily/slur-scoring.cc b/lily/slur-scoring.cc index 999fd3f7dc..a44f834e1c 100644 --- a/lily/slur-scoring.cc +++ b/lily/slur-scoring.cc @@ -439,12 +439,12 @@ Slur_score_state::get_closest_index (SCM inspect_quants) const 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) diff --git a/lily/slur.cc b/lily/slur.cc index 5f42e7c688..b597ab93b7 100644 --- a/lily/slur.cc +++ b/lily/slur.cc @@ -204,7 +204,7 @@ get_default_dir (Grob*me) = 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) { diff --git a/lily/source-file.cc b/lily/source-file.cc index 674b935ec1..1253bb5f06 100644 --- a/lily/source-file.cc +++ b/lily/source-file.cc @@ -249,7 +249,7 @@ Source_file::get_line (char const* pos_str0) const if (!newline_locations_.size ()) return 1; - int lo= 0; + int lo = 0; int hi = newline_locations_.size (); if (newline_locations_[lo] > pos_str0) diff --git a/lily/source.cc b/lily/source.cc index 5d03537cdf..481bb9d7ee 100644 --- a/lily/source.cc +++ b/lily/source.cc @@ -15,7 +15,7 @@ Sources::Sources () { sourcefile_list_ = 0; - path_= 0; + path_ = 0; is_binary_ = false; } diff --git a/lily/spacing-engraver.cc b/lily/spacing-engraver.cc index a27820498b..48cb143b8d 100644 --- a/lily/spacing-engraver.cc +++ b/lily/spacing-engraver.cc @@ -127,7 +127,7 @@ Spacing_engraver::stop_translation_timestep () { 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) @@ -139,7 +139,7 @@ Spacing_engraver::stop_translation_timestep () 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 ()) diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc index a3029ed7af..505a87ede2 100644 --- a/lily/spacing-spanner.cc +++ b/lily/spacing-spanner.cc @@ -163,7 +163,7 @@ Spacing_spanner::prune_loose_columns (Grob*me,Link_array *cols, Rational s { Link_array 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))) { @@ -192,8 +192,8 @@ Spacing_spanner::prune_loose_columns (Grob*me,Link_array *cols, Rational s Set distance constraints for loose columns */ Drul_array 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 dists (0,0); @@ -264,14 +264,14 @@ Spacing_spanner::prune_loose_columns (Grob*me,Link_array *cols, Rational s void Spacing_spanner::set_explicit_neighbor_columns (Link_array 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 (unsmob_grob (scm_car (s))); @@ -292,7 +292,7 @@ Spacing_spanner::set_explicit_neighbor_columns (Link_array cols) 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); @@ -475,7 +475,7 @@ Spacing_spanner::find_shortest (Grob *me, Link_array const &cols) 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) { @@ -509,7 +509,7 @@ Spacing_spanner::do_measure (Rational global_shortest, Grob*me, { 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 (cols->elem (i)); Item * r = dynamic_cast (cols->elem (i+1)); diff --git a/lily/span-arpeggio-engraver.cc b/lily/span-arpeggio-engraver.cc index 1c6d9afe3e..7783f57c08 100644 --- a/lily/span-arpeggio-engraver.cc +++ b/lily/span-arpeggio-engraver.cc @@ -76,7 +76,7 @@ Span_arpeggio_engraver::stop_translation_timestep () 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)) diff --git a/lily/span-bar-engraver.cc b/lily/span-bar-engraver.cc index f374931cee..adeb1808c6 100644 --- a/lily/span-bar-engraver.cc +++ b/lily/span-bar-engraver.cc @@ -61,10 +61,10 @@ Span_bar_engraver::stop_translation_timestep () { 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); diff --git a/lily/span-bar.cc b/lily/span-bar.cc index 6dc63610c2..b6cb8361fc 100644 --- a/lily/span-bar.cc +++ b/lily/span-bar.cc @@ -199,11 +199,11 @@ Span_bar::evaluate_glyph (Grob*me) { type = ".|"; } - else if (type== ":|") + else if (type == ":|") { type = "|."; } - else if (type== ":|:") + else if (type == ":|:") { type = ".|."; } diff --git a/lily/span-dynamic-performer.cc b/lily/span-dynamic-performer.cc index 52afe553a4..6cbef11b47 100644 --- a/lily/span-dynamic-performer.cc +++ b/lily/span-dynamic-performer.cc @@ -147,7 +147,7 @@ Span_dynamic_performer::stop_translation_timestep () } 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_ diff --git a/lily/spanner.cc b/lily/spanner.cc index 18f470499a..134067150d 100644 --- a/lily/spanner.cc +++ b/lily/spanner.cc @@ -90,7 +90,7 @@ Spanner::do_break_processing () 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 bounds; bounds[LEFT] = break_points[i-1]; @@ -129,7 +129,7 @@ Spanner::do_break_processing () } } 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; } @@ -184,12 +184,12 @@ Spanner::set_bound (Direction d, Grob*s) 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 (this)) + if (d == LEFT && !dynamic_cast (this)) { set_parent (i, X_AXIS); } @@ -313,7 +313,7 @@ Spanner::do_derived_mark () const 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; diff --git a/lily/spring-smob.cc b/lily/spring-smob.cc index f05f02462f..ca15b2f831 100644 --- a/lily/spring-smob.cc +++ b/lily/spring-smob.cc @@ -35,6 +35,6 @@ Spring_smob::print_smob (SCM, SCM p, scm_print_state *) 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; } diff --git a/lily/staff-spacing.cc b/lily/staff-spacing.cc index 866c33dbb1..e128f9c745 100644 --- a/lily/staff-spacing.cc +++ b/lily/staff-spacing.cc @@ -33,7 +33,7 @@ Staff_spacing::next_note_correction (Grob * me, if (!g || !Note_column::has_interface (g)) return 0.0; - Item *col =dynamic_cast (g)->get_column (); + Item *col = dynamic_cast (g)->get_column (); Real max_corr = 0. >? (- g->extent (col, X_AXIS)[LEFT]); /* @@ -148,7 +148,7 @@ Staff_spacing::get_spacing_params (Grob *me, Real * space, Real * fixed) *space = 1.0; *fixed = 1.0; - Grob * separation_item= 0; + Grob * separation_item = 0; Item * me_item = dynamic_cast (me); for (SCM s = me->get_property ("left-items"); diff --git a/lily/staff-symbol.cc b/lily/staff-symbol.cc index 0cd364d81d..00974d30df 100644 --- a/lily/staff-symbol.cc +++ b/lily/staff-symbol.cc @@ -64,7 +64,7 @@ Staff_symbol::print (SCM smob) span_points[d] -= d* t/2; } - while (flip (&d) !=LEFT); + while (flip (&d) != LEFT); int l = Staff_symbol::line_count (me); @@ -76,7 +76,7 @@ Staff_symbol::print (SCM smob) 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); diff --git a/lily/stanza-number-align-engraver.cc b/lily/stanza-number-align-engraver.cc index 737a8e5435..f511cfee8d 100644 --- a/lily/stanza-number-align-engraver.cc +++ b/lily/stanza-number-align-engraver.cc @@ -46,7 +46,7 @@ Stanza_number_align_engraver::acknowledge_grob (Grob_info gi) 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]); diff --git a/lily/stem.cc b/lily/stem.cc index 69453f6cdc..5f4588d316 100644 --- a/lily/stem.cc +++ b/lily/stem.cc @@ -414,7 +414,7 @@ Stem::position_noteheads (Grob *me) 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 @@ -502,7 +502,7 @@ Stem::height (SCM smob, SCM ax) /* 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 ()); @@ -513,7 +513,7 @@ Stem::height (SCM smob, SCM ax) 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 ; @@ -896,7 +896,7 @@ Stem::calc_stem_info (Grob *me) 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); diff --git a/lily/stencil-scheme.cc b/lily/stencil-scheme.cc index c2f5f383f5..0a81950758 100644 --- a/lily/stencil-scheme.cc +++ b/lily/stencil-scheme.cc @@ -60,7 +60,7 @@ LY_DEFINE (ly_translate_stencil, "ly:stencil-translate", 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; } diff --git a/lily/system-start-delimiter-engraver.cc b/lily/system-start-delimiter-engraver.cc index 93b0f177ac..c0ac1764d1 100644 --- a/lily/system-start-delimiter-engraver.cc +++ b/lily/system-start-delimiter-engraver.cc @@ -72,7 +72,7 @@ System_start_delimiter_engraver::process_music () { 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()); diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc index d6aea8a81f..add49a7ca3 100644 --- a/lily/system-start-delimiter.cc +++ b/lily/system-start-delimiter.cc @@ -63,7 +63,7 @@ Will not fix it since I'm not sure. 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); @@ -147,7 +147,7 @@ System_start_delimiter::print (SCM smob) 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); diff --git a/lily/system.cc b/lily/system.cc index 0fad02b0c7..d2b33e8369 100644 --- a/lily/system.cc +++ b/lily/system.cc @@ -113,7 +113,7 @@ System::get_lines () 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"); @@ -216,7 +216,7 @@ set_loose_columns (System* which, Column_x_positions const *posns) 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 @@ -422,7 +422,7 @@ System::get_line () 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); diff --git a/lily/tab-note-heads-engraver.cc b/lily/tab-note-heads-engraver.cc index 68357bac1c..a5b1777f2d 100644 --- a/lily/tab-note-heads-engraver.cc +++ b/lily/tab-note-heads-engraver.cc @@ -68,7 +68,7 @@ void 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)); @@ -79,9 +79,9 @@ Tab_note_heads_engraver::process_music () 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)); diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc index d66196a655..b41248ba1c 100644 --- a/lily/text-engraver.cc +++ b/lily/text-engraver.cc @@ -46,7 +46,7 @@ Text_engraver::acknowledge_grob (Grob_info inf) { 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_); @@ -65,7 +65,7 @@ Text_engraver::acknowledge_grob (Grob_info inf) 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_); } @@ -77,7 +77,7 @@ Text_engraver::process_acknowledged_grobs () { if (texts_.size ()) return; - for (int i= 0; i < evs_.size (); i++) + for (int i = 0; i < evs_.size (); i++) { Music * r = evs_[i]; diff --git a/lily/text-spanner.cc b/lily/text-spanner.cc index 0e8ec2b4d5..82c2475cba 100644 --- a/lily/text-spanner.cc +++ b/lily/text-spanner.cc @@ -36,7 +36,7 @@ MAKE_SCHEME_CALLBACK (Text_spanner, print, 1); SCM Text_spanner::print (SCM smob) { - Grob *me= unsmob_grob (smob); + Grob *me = unsmob_grob (smob); Spanner *spanner = dynamic_cast (me); /* Ugh, must be same as Hairpin::print. */ @@ -148,7 +148,7 @@ Text_spanner::print (SCM smob) 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); } diff --git a/lily/tfm-reader.cc b/lily/tfm-reader.cc index 76c55cbc28..1edeef43c5 100644 --- a/lily/tfm-reader.cc +++ b/lily/tfm-reader.cc @@ -24,7 +24,7 @@ Tex_font_metric_reader::Tex_font_metric_reader (String name) : 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 (); diff --git a/lily/tie-column.cc b/lily/tie-column.cc index 0cbc5da9a0..16279f4f60 100644 --- a/lily/tie-column.cc +++ b/lily/tie-column.cc @@ -97,7 +97,7 @@ Tie_column::old_directions (Grob*me) 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); diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc index 4b7cee39da..21464d02af 100644 --- a/lily/tie-engraver.cc +++ b/lily/tie-engraver.cc @@ -144,7 +144,7 @@ Tie_engraver::stop_translation_timestep () 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]); } diff --git a/lily/tie.cc b/lily/tie.cc index c23b51af45..edd482501e 100644 --- a/lily/tie.cc +++ b/lily/tie.cc @@ -313,7 +313,7 @@ Tie::get_control_points (SCM smob) 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; } @@ -341,7 +341,7 @@ Tie::print (SCM smob) 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++; diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc index d5b526b665..245fceef7e 100644 --- a/lily/timing-translator.cc +++ b/lily/timing-translator.cc @@ -96,7 +96,7 @@ Timing_translator::measure_position () const 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 (); @@ -138,7 +138,7 @@ Timing_translator::start_translation_timestep () } 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) diff --git a/lily/translator-ctors.cc b/lily/translator-ctors.cc index af70427a43..988a582016 100644 --- a/lily/translator-ctors.cc +++ b/lily/translator-ctors.cc @@ -14,7 +14,7 @@ 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. " @@ -22,7 +22,7 @@ LY_DEFINE (get_all_translators,"ly:get-all-translators", 0, 0, 0, (), { 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)); } @@ -36,7 +36,7 @@ add_translator (Translator *t) 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 ()); diff --git a/lily/translator-group.cc b/lily/translator-group.cc index 4dcdca35b3..d9a6a60930 100644 --- a/lily/translator-group.cc +++ b/lily/translator-group.cc @@ -121,7 +121,7 @@ recurse_over_translators (Context * c, Translator_method ptr, Direction dir) } 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); } diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc index 137a314d3b..f074f3a68e 100644 --- a/lily/tuplet-bracket.cc +++ b/lily/tuplet-bracket.cc @@ -68,7 +68,7 @@ Tuplet_bracket::parallel_beam (Grob *me, Link_array const &cols, bool *equ Spanner*sp = dynamic_cast (me); - *equally_long= false; + *equally_long = false; if (! (b1 && (b1 == b2) && !sp->is_broken ())) return 0; @@ -98,9 +98,9 @@ MAKE_SCHEME_CALLBACK (Tuplet_bracket,print,1); SCM Tuplet_bracket::print (SCM smob) { - Grob *me= unsmob_grob (smob); + Grob *me = unsmob_grob (smob); Stencil mol; - Link_array columns= + Link_array columns = Pointer_group_interface__extract_grobs (me, (Grob*)0, "note-columns"); if (!columns.size ()) @@ -197,7 +197,7 @@ Tuplet_bracket::print (SCM smob) 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; @@ -299,7 +299,7 @@ Tuplet_bracket::make_bracket (Grob *me, // for line properties. void Tuplet_bracket::calc_position_and_height (Grob*me,Real *offset, Real * dy) { - Link_array columns= + Link_array columns = Pointer_group_interface__extract_grobs (me, (Grob*)0, "note-columns"); @@ -326,8 +326,8 @@ Tuplet_bracket::calc_position_and_height (Grob*me,Real *offset, Real * dy) 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]; @@ -368,7 +368,7 @@ Tuplet_bracket::calc_position_and_height (Grob*me,Real *offset, Real * dy) 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); @@ -387,7 +387,7 @@ Tuplet_bracket::calc_position_and_height (Grob*me,Real *offset, Real * dy) 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. @@ -412,13 +412,13 @@ SCM Tuplet_bracket::before_line_breaking (SCM smob) { Grob *me = unsmob_grob (smob); - Link_array columns= + Link_array 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); @@ -432,7 +432,7 @@ SCM Tuplet_bracket::after_line_breaking (SCM smob) { Grob * me = unsmob_grob (smob); - Link_array columns= + Link_array columns = Pointer_group_interface__extract_grobs (me, (Grob*)0, "note-columns"); if (!columns.size ()) diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc index 48f06caf97..8d783526bc 100644 --- a/lily/tuplet-engraver.cc +++ b/lily/tuplet-engraver.cc @@ -69,7 +69,7 @@ Tuplet_engraver::try_music (Music *music) 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; diff --git a/lily/unfolded-repeat-iterator.cc b/lily/unfolded-repeat-iterator.cc index 10283f5a7c..04bb800501 100644 --- a/lily/unfolded-repeat-iterator.cc +++ b/lily/unfolded-repeat-iterator.cc @@ -73,7 +73,7 @@ protected: Volta_repeat_iterator::Volta_repeat_iterator () { - done_count_ = alt_count_ = rep_count_= 0; + done_count_ = alt_count_ = rep_count_ = 0; first_time_ = true; } diff --git a/lily/vaticana-ligature-engraver.cc b/lily/vaticana-ligature-engraver.cc index 7a02f96a4f..ca1bfd6c42 100644 --- a/lily/vaticana-ligature-engraver.cc +++ b/lily/vaticana-ligature-engraver.cc @@ -348,9 +348,9 @@ void Vaticana_ligature_engraver::transform_heads (Spanner *ligature, Array 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; @@ -569,7 +569,7 @@ Vaticana_ligature_engraver::transform_heads (Spanner *ligature, Item *first_primitive = dynamic_cast (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)); diff --git a/lily/virtual-font-metric.cc b/lily/virtual-font-metric.cc index 7b8bd26d14..71de7f33ba 100644 --- a/lily/virtual-font-metric.cc +++ b/lily/virtual-font-metric.cc @@ -127,7 +127,7 @@ Virtual_font_metric::name_to_index (String glyph) const 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; diff --git a/lily/volta-bracket.cc b/lily/volta-bracket.cc index edb8e38353..46d38528fe 100644 --- a/lily/volta-bracket.cc +++ b/lily/volta-bracket.cc @@ -58,7 +58,7 @@ Volta_bracket_interface::print (SCM smob) (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 (me)->get_bound (LEFT); diff --git a/lily/volta-engraver.cc b/lily/volta-engraver.cc index 846f31fad6..c116e0e4ac 100644 --- a/lily/volta-engraver.cc +++ b/lily/volta-engraver.cc @@ -59,7 +59,7 @@ Volta_engraver::Volta_engraver () bool Volta_engraver::staff_eligible () { - SCM doit =get_property ("voltaOnThisStaff"); + SCM doit = get_property ("voltaOnThisStaff"); if (scm_is_bool (doit)) { return to_boolean (doit);