From: Han-Wen Nienhuys Date: Fri, 4 Feb 2005 12:35:34 +0000 (+0000) Subject: * scm/music-functions.scm (has-request-chord): don't use X-Git-Tag: release/2.5.14~175 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5d1ddaf889233f8e5c32a118f9e843e1becca2d2;p=lilypond.git * scm/music-functions.scm (has-request-chord): don't use ly:music-name anywhere. Fixes <<\\>> notation. * lily/pango-font.cc (pango_item_string_stencil): bugfix: don't crash if psname is null. * lily/pango-font.cc (physical_font_tab): new member. Store PSname -> font_filename mapping. --- diff --git a/ChangeLog b/ChangeLog index b077af4a87..35bade0afc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2005-02-04 Han-Wen Nienhuys + * lily/*: add space after , + * scm/music-functions.scm (has-request-chord): don't use ly:music-name anywhere. Fixes <<\\>> notation. diff --git a/lily/accidental-placement.cc b/lily/accidental-placement.cc index d73981ede1..540e32feaa 100644 --- a/lily/accidental-placement.cc +++ b/lily/accidental-placement.cc @@ -21,7 +21,7 @@ #include "note-collision.hh" #include "accidental-interface.hh" -MAKE_SCHEME_CALLBACK (Accidental_placement,alignment_callback, 2); +MAKE_SCHEME_CALLBACK (Accidental_placement, alignment_callback, 2); SCM Accidental_placement::alignment_callback (SCM s, SCM ) { @@ -382,7 +382,7 @@ Accidental_placement::position_accidentals (Grob * me) head_ape-> left_skyline_ = head_skyline; head_ape->offset_ = 0.0; - Real padding = robust_scm2double (me->get_property ("padding"),0.2); + Real padding = robust_scm2double (me->get_property ("padding"), 0.2); Array left_skyline = head_ape->left_skyline_; heighten_skyline (&left_skyline, diff --git a/lily/accidental.cc b/lily/accidental.cc index ead6669ac3..a0f4136a45 100644 --- a/lily/accidental.cc +++ b/lily/accidental.cc @@ -28,14 +28,14 @@ parenthesize (Grob*me, Stencil m) Stencil open = Font_interface::get_default_font (me)->find_by_name ("accidentals.leftparen"); Stencil close = Font_interface::get_default_font (me)->find_by_name ("accidentals.rightparen"); - m.add_at_edge (X_AXIS, LEFT, Stencil (open), 0,0); - m.add_at_edge (X_AXIS, RIGHT, Stencil (close), 0,0); + m.add_at_edge (X_AXIS, LEFT, Stencil (open), 0, 0); + m.add_at_edge (X_AXIS, RIGHT, Stencil (close), 0, 0); return m; } -MAKE_SCHEME_CALLBACK (Accidental_interface,after_line_breaking,1); +MAKE_SCHEME_CALLBACK (Accidental_interface, after_line_breaking, 1); SCM Accidental_interface::after_line_breaking (SCM smob) { @@ -164,7 +164,7 @@ Accidental_interface::get_fontcharname (String style, int alteration) return style + to_string (alteration); } -MAKE_SCHEME_CALLBACK (Accidental_interface,print,1); +MAKE_SCHEME_CALLBACK (Accidental_interface, print, 1); SCM Accidental_interface::print (SCM smob) { @@ -224,7 +224,7 @@ Accidental_interface::print (SCM smob) } else { - mol.add_at_edge (X_AXIS, RIGHT, acc, 0.1,0); + mol.add_at_edge (X_AXIS, RIGHT, acc, 0.1, 0); } } diff --git a/lily/afm.cc b/lily/afm.cc index 5d391dab93..cfa8aadeb1 100644 --- a/lily/afm.cc +++ b/lily/afm.cc @@ -76,7 +76,7 @@ Adobe_font_metric::find_char_metric (String nm) const int Adobe_font_metric::name_to_index (String name) const { - std::map::const_iterator ai = name_to_metric_dict_.find (name); + std::map::const_iterator ai = name_to_metric_dict_.find (name); if (ai == name_to_metric_dict_.end ()) return -1; return (*ai).second; diff --git a/lily/align-interface.cc b/lily/align-interface.cc index 1c23c32355..c805b2b1f6 100644 --- a/lily/align-interface.cc +++ b/lily/align-interface.cc @@ -13,7 +13,7 @@ #include "hara-kiri-group-spanner.hh" #include "output-def.hh" -MAKE_SCHEME_CALLBACK (Align_interface,alignment_callback,2); +MAKE_SCHEME_CALLBACK (Align_interface, alignment_callback, 2); SCM Align_interface::alignment_callback (SCM element_smob, SCM axis) { @@ -27,7 +27,7 @@ Align_interface::alignment_callback (SCM element_smob, SCM axis) return scm_make_real (0.0); } -MAKE_SCHEME_CALLBACK (Align_interface,fixed_distance_alignment_callback,2); +MAKE_SCHEME_CALLBACK (Align_interface, fixed_distance_alignment_callback, 2); SCM Align_interface::fixed_distance_alignment_callback (SCM element_smob, SCM axis) { @@ -55,7 +55,7 @@ Align_interface::align_to_fixed_distance (Grob *me , Axis a) if (!stacking_dir) stacking_dir = DOWN; - Real dy = robust_scm2double (me->get_property ("forced-distance"),0.0); + Real dy = robust_scm2double (me->get_property ("forced-distance"), 0.0); Link_array elems = Pointer_group_interface__extract_grobs (me, (Grob*) 0, "elements"); @@ -93,7 +93,7 @@ Align_interface::align_to_fixed_distance (Grob *me , Axis a) } /* - TODO: support self-alignment-{Y,X} + TODO: support self-alignment-{Y, X} */ for (int i = 0; i < translates.size (); i++) { @@ -230,16 +230,16 @@ Align_interface::axis (Grob*me) } void -Align_interface::add_element (Grob*me,Grob* s, SCM cb) +Align_interface::add_element (Grob*me, Grob* s, SCM cb) { s->add_offset_callback (cb, Align_interface::axis (me)); Axis_group_interface::add_element (me, s); } void -Align_interface::set_axis (Grob*me,Axis a) +Align_interface::set_axis (Grob*me, Axis a) { - Axis_group_interface::set_axes (me, a,a); + Axis_group_interface::set_axes (me, a, a); } diff --git a/lily/ambitus-engraver.cc b/lily/ambitus-engraver.cc index 94d004ba4b..20193234a6 100644 --- a/lily/ambitus-engraver.cc +++ b/lily/ambitus-engraver.cc @@ -48,8 +48,8 @@ Ambitus_engraver::derived_mark () const void Ambitus_engraver::create_ambitus () { - ambitus_ = make_item ("AmbitusLine",SCM_EOL); - group_ = make_item ("Ambitus",SCM_EOL); + ambitus_ = make_item ("AmbitusLine", SCM_EOL); + group_ = make_item ("Ambitus", SCM_EOL); Direction d = DOWN; do { diff --git a/lily/ambitus.cc b/lily/ambitus.cc index b86b6886f8..7f8cf43fcf 100644 --- a/lily/ambitus.cc +++ b/lily/ambitus.cc @@ -17,7 +17,7 @@ #include "lookup.hh" #include "group-interface.hh" -MAKE_SCHEME_CALLBACK (Ambitus,print,1); +MAKE_SCHEME_CALLBACK (Ambitus, print, 1); SCM Ambitus::print (SCM smob) { @@ -30,7 +30,7 @@ Ambitus::print (SCM smob) && heads.size() > 1) { Grob *common - = common_refpoint_of_array (heads.slice (0,2), me, Y_AXIS); + = common_refpoint_of_array (heads.slice (0, 2), me, Y_AXIS); Grob *minh = heads[0]; Grob *maxh = heads[1]; @@ -52,7 +52,7 @@ Ambitus::print (SCM smob) Real linethickness = me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness")) * robust_scm2double (me->get_property ("thickness"), 1.0); Real blotdiameter = me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter")); - Interval x_extent = 0.5 * linethickness *Interval (-1,1); + Interval x_extent = 0.5 * linethickness *Interval (-1, 1); Interval y_extent = Interval (pmin, pmax); Box line_box (x_extent, y_extent); diff --git a/lily/arpeggio-engraver.cc b/lily/arpeggio-engraver.cc index d71064c7c6..d6667e098d 100644 --- a/lily/arpeggio-engraver.cc +++ b/lily/arpeggio-engraver.cc @@ -80,7 +80,7 @@ Arpeggio_engraver::process_music () { if (arpeggio_req_) { - arpeggio_ = make_item ("Arpeggio",arpeggio_req_->self_scm ()); + arpeggio_ = make_item ("Arpeggio", arpeggio_req_->self_scm ()); } } diff --git a/lily/arpeggio.cc b/lily/arpeggio.cc index b9922ae757..3ecd571675 100644 --- a/lily/arpeggio.cc +++ b/lily/arpeggio.cc @@ -84,11 +84,11 @@ Arpeggio::print (SCM smob) 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); + mol.add_at_edge (Y_AXIS, UP, squiggle, 0.0, 0); mol.translate_axis (heads[LEFT], Y_AXIS); if (dir) - mol.add_at_edge (Y_AXIS, dir,arrow, 0,0); + mol.add_at_edge (Y_AXIS, dir, arrow, 0, 0); return mol.smobbed_copy () ; } @@ -137,7 +137,7 @@ Arpeggio::brew_chord_bracket (SCM smob) We have to do a callback, because print () triggers a vertical alignment if it is cross-staff. */ -MAKE_SCHEME_CALLBACK (Arpeggio, width_callback,2); +MAKE_SCHEME_CALLBACK (Arpeggio, width_callback, 2); SCM Arpeggio::width_callback (SCM smob, SCM axis) { diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc index d8e59dda54..4845e7a2ec 100644 --- a/lily/auto-beam-engraver.cc +++ b/lily/auto-beam-engraver.cc @@ -153,12 +153,12 @@ Auto_beam_engraver::test_moment (Direction dir, Moment test_mom) else function = scm_list_n (ly_symbol2scm ("end"), SCM_UNDEFINED); - Moment beat_length (1,4); + Moment beat_length (1, 4); if (Moment * m = unsmob_moment (get_property ("beatLength"))) { beat_length = *m; } - Moment measure_length (1,1); + Moment measure_length (1, 1); int num = 4; if (Moment* m = unsmob_moment (get_property ("measureLength"))) { @@ -316,7 +316,7 @@ Auto_beam_engraver::begin_beam () beam_start_location_ = robust_scm2moment (get_property ("measurePosition"), Moment(0)); subdivide_beams_ = ly_scm2bool (get_property ("subdivideBeams")); - beat_length_ = robust_scm2moment (get_property ("beatLength"), Moment(1,4)); + beat_length_ = robust_scm2moment (get_property ("beatLength"), Moment(1, 4)); } void diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc index b3d7896443..ee20505c4e 100644 --- a/lily/axis-group-engraver.cc +++ b/lily/axis-group-engraver.cc @@ -45,7 +45,7 @@ Axis_group_engraver::process_music () { staffline_ = get_spanner (); Grob * it = unsmob_grob (get_property ("currentCommandColumn")); - staffline_->set_bound (LEFT,it); + staffline_->set_bound (LEFT, it); } } @@ -81,7 +81,7 @@ Axis_group_engraver::finalize () Grob * it = unsmob_grob (get_property ("currentCommandColumn")); - staffline_->set_bound (RIGHT,it); + staffline_->set_bound (RIGHT, it); staffline_ = 0; } diff --git a/lily/axis-group-interface.cc b/lily/axis-group-interface.cc index bc1ae41ef6..5dcf4604e2 100644 --- a/lily/axis-group-interface.cc +++ b/lily/axis-group-interface.cc @@ -11,7 +11,7 @@ #include "hara-kiri-group-spanner.hh" void -Axis_group_interface::add_element (Grob*me,Grob *e) +Axis_group_interface::add_element (Grob*me, Grob *e) { for (SCM ax = me->get_property ("axes"); ax != SCM_EOL ; ax = scm_cdr (ax)) { @@ -32,7 +32,7 @@ Axis_group_interface::add_element (Grob*me,Grob *e) } bool -Axis_group_interface::has_axis (Grob*me,Axis a) +Axis_group_interface::has_axis (Grob*me, Axis a) { /* urg. FIXME, check for Hara_kiri_group_spanner shouldn't be necessary? @@ -55,7 +55,7 @@ Axis_group_interface::relative_group_extent (Axis a, Grob *common, SCM elts) return r; } -MAKE_SCHEME_CALLBACK (Axis_group_interface,group_extent_callback,2); +MAKE_SCHEME_CALLBACK (Axis_group_interface, group_extent_callback, 2); SCM Axis_group_interface::group_extent_callback (SCM element_smob, SCM scm_axis) { @@ -72,7 +72,7 @@ Axis_group_interface::group_extent_callback (SCM element_smob, SCM scm_axis) } void -Axis_group_interface::set_axes (Grob*me,Axis a1, Axis a2) +Axis_group_interface::set_axes (Grob*me, Axis a1, Axis a2) { SCM sa1= scm_int2num (a1); SCM sa2 = scm_int2num (a2); @@ -98,9 +98,9 @@ Axis_group_interface::set_axes (Grob*me,Axis a1, Axis a2) why so convoluted ? (fixme/documentme?) */ if (me->has_extent_callback (Grob::stencil_extent_proc, a1)) - me->set_extent (Axis_group_interface::group_extent_callback_proc,a1); + me->set_extent (Axis_group_interface::group_extent_callback_proc, a1); if (me->has_extent_callback (Grob::stencil_extent_proc, a2)) - me->set_extent (Axis_group_interface::group_extent_callback_proc,a2); + me->set_extent (Axis_group_interface::group_extent_callback_proc, a2); } Link_array diff --git a/lily/balloon.cc b/lily/balloon.cc index 683474f644..5215453558 100644 --- a/lily/balloon.cc +++ b/lily/balloon.cc @@ -83,7 +83,7 @@ Balloon_interface::print (SCM smob) return fr.smobbed_copy (); } -ADD_INTERFACE (Balloon_interface,"text-balloon-interface", +ADD_INTERFACE (Balloon_interface, "text-balloon-interface", "A collection of routines to put text balloons around an object.", "balloon-padding balloon-text-props balloon-text-offset balloon-text balloon-original-callback"); diff --git a/lily/bar-line.cc b/lily/bar-line.cc index 4d62f62968..de9c1a2a94 100644 --- a/lily/bar-line.cc +++ b/lily/bar-line.cc @@ -17,7 +17,7 @@ #include "all-font-metrics.hh" #include "staff-symbol-referencer.hh" -MAKE_SCHEME_CALLBACK (Bar_line,print,1); +MAKE_SCHEME_CALLBACK (Bar_line, print, 1); SCM Bar_line::print (SCM smob) @@ -66,9 +66,9 @@ Bar_line::compound_barline (Grob*me, String str, Real h) ? 1 : (staff_space < 2 ? 2 : .5) ) * staff_space; Stencil colon (dot); - colon.translate_axis (dist,Y_AXIS); + colon.translate_axis (dist, Y_AXIS); colon.add_stencil (dot); - colon.translate_axis (-dist/2,Y_AXIS); + colon.translate_axis (-dist/2, Y_AXIS); Stencil m; if (str == "||:") @@ -85,7 +85,7 @@ Bar_line::compound_barline (Grob*me, String str, Real h) else if (str == "|." || (h == 0 && str == ":|")) { m.add_at_edge (X_AXIS, LEFT, thick, 0, 0); - m.add_at_edge (X_AXIS, LEFT, thin, kern,0 ); + m.add_at_edge (X_AXIS, LEFT, thin, kern, 0 ); } else if (str == ".|" || (h == 0 && str == "|:")) { @@ -134,7 +134,7 @@ Bar_line::compound_barline (Grob*me, String str, Real h) Real y = (- (c-1.0) / 2 + 0.5 + i * staff_space); Stencil d (dot); - d. translate_axis (y,Y_AXIS); + d. translate_axis (y, Y_AXIS); m.add_stencil (d); } } @@ -148,10 +148,10 @@ Bar_line::simple_barline (Grob *me, { Real blot = me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter")); - return Lookup::round_filled_box (Box (Interval (0,w), Interval (-h/2, h/2)), blot); + return Lookup::round_filled_box (Box (Interval (0, w), Interval (-h/2, h/2)), blot); } -MAKE_SCHEME_CALLBACK (Bar_line,before_line_breaking ,1); +MAKE_SCHEME_CALLBACK (Bar_line, before_line_breaking , 1); SCM Bar_line::before_line_breaking (SCM smob) @@ -184,7 +184,7 @@ Bar_line::before_line_breaking (SCM smob) -MAKE_SCHEME_CALLBACK (Bar_line,get_staff_bar_size,1); +MAKE_SCHEME_CALLBACK (Bar_line, get_staff_bar_size, 1); SCM Bar_line::get_staff_bar_size (SCM smob) { @@ -216,7 +216,7 @@ ADD_INTERFACE (Bar_line, "bar-line-interface", "Print a special bar symbol. It replaces the \n" "regular bar symbol with a special\n" "symbol. The argument @var{bartype} is a string which specifies the\n" -"kind of bar to print. Options are @code{:|},\n" +"kind of bar to print. Options are @code{:|}, \n" "@code{|:}, @code{:|:},\n" "@code{||}, @code{|.},\n" "@code{.|}, and @code{.|.}. \n" diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc index 902ac33977..6ef193e2eb 100644 --- a/lily/bar-number-engraver.cc +++ b/lily/bar-number-engraver.cc @@ -43,7 +43,7 @@ Bar_number_engraver::process_music () if (scm_is_string (wb)) { - Moment mp (robust_scm2moment (get_property ("measurePosition"),Moment (0))); + Moment mp (robust_scm2moment (get_property ("measurePosition"), Moment (0))); if (mp.main_part_ == Rational (0)) { SCM bn = get_property ("currentBarNumber"); @@ -103,7 +103,7 @@ Bar_number_engraver::create_items () return; text_ = make_item ("BarNumber", SCM_EOL); - Side_position_interface::set_axis (text_,Y_AXIS); + Side_position_interface::set_axis (text_, Y_AXIS); } ADD_TRANSLATOR (Bar_number_engraver, diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc index 995360c744..adf8871c7e 100644 --- a/lily/beam-engraver.cc +++ b/lily/beam-engraver.cc @@ -179,7 +179,7 @@ Beam_engraver::start_translation_timestep () set_melisma (true); subdivide_beams_ = to_boolean (get_property ("subdivideBeams")); - beat_length_ = robust_scm2moment (get_property ("beatLength"), Moment (1,4)); + beat_length_ = robust_scm2moment (get_property ("beatLength"), Moment (1, 4)); } } diff --git a/lily/beam-performer.cc b/lily/beam-performer.cc index 186c891bb0..d8ba6b240d 100644 --- a/lily/beam-performer.cc +++ b/lily/beam-performer.cc @@ -86,6 +86,6 @@ Beam_performer::try_music (Music *m) return false; } -ADD_TRANSLATOR (Beam_performer,"","", - "beam-event","","",""); +ADD_TRANSLATOR (Beam_performer, "", "", + "beam-event", "", "", ""); diff --git a/lily/beam-quanting.cc b/lily/beam-quanting.cc index f358065b8d..54cee073b9 100644 --- a/lily/beam-quanting.cc +++ b/lily/beam-quanting.cc @@ -143,7 +143,7 @@ Beam::quanting (SCM smob) Array base_lengths; Array stem_xposns; - Drul_array dirs_found (0,0); + Drul_array dirs_found (0, 0); Grob *common[2]; for (int a = 2; a--;) common[a] = common_refpoint_of_array (stems, me, Axis (a)); @@ -174,7 +174,7 @@ Beam::quanting (SCM smob) && s != lvs && s != fvs; base_lengths.push (calc_stem_y (me, s, common, xl, xr, - Interval (0,0), f) / ss); + Interval (0, 0), f) / ss); stem_xposns.push (s->relative_coordinate (common[X_AXIS], X_AXIS)); } @@ -233,7 +233,7 @@ Beam::quanting (SCM smob) qscores[i].demerits += d; #if DEBUG_QUANTING - qscores[i].score_card_ += to_string ("S%.2f",d); + qscores[i].score_card_ += to_string ("S%.2f", d); #endif } @@ -431,8 +431,8 @@ Beam::score_forbidden_quants (Real yl, Real yr, Direction ldir, Direction rdir) { Real dy = yr - yl; - Drul_array y (yl,yr); - Drul_array dirs (ldir,rdir); + Drul_array y (yl, yr); + Drul_array dirs (ldir, rdir); Real extra_demerit = SECONDARY_BEAM_DEMERIT / (beam_counts[LEFT] >? beam_counts[RIGHT]); @@ -449,7 +449,7 @@ Beam::score_forbidden_quants (Real yl, Real yr, /* The 2.2 factor is to provide a little leniency for borderline cases. If we do 2.0, then the upper outer line - will be in the gap of the (2,sit) quant, leading to a + will be in the gap of the (2, sit) quant, leading to a false demerit. */ Real gap1 = y[d] - stem_dir * ((j-1) * beam_translation + thickness / 2 - slt/2.2 ); diff --git a/lily/beam.cc b/lily/beam.cc index 61e27d7ce3..33672e4608 100644 --- a/lily/beam.cc +++ b/lily/beam.cc @@ -333,7 +333,7 @@ Beam::print (SCM grob) if (!is_number_pair (posns)) { programming_error ("No beam posns"); - pos = Interval (0,0); + pos = Interval (0, 0); } else pos = ly_scm2realdrul (posns); @@ -907,7 +907,7 @@ Beam::least_squares (SCM smob) dy = slope * dx; - set_minimum_dy (me,&dy); + set_minimum_dy (me, &dy); me->set_property ("least-squares-dy", scm_make_real (dy)); pos = Interval (y, (y+dy)); } diff --git a/lily/beaming-info.cc b/lily/beaming-info.cc index 824b432eef..7a43c1b709 100644 --- a/lily/beaming-info.cc +++ b/lily/beaming-info.cc @@ -27,7 +27,7 @@ const int infinity_i = INT_MAX; // guh. const int at_beat = 1<<15; int -Beaming_info_list::best_splitpoint_index (Moment &beat_length,bool subdivide) const +Beaming_info_list::best_splitpoint_index (Moment &beat_length, bool subdivide) const { int minden = infinity_i; int minidx = -1; @@ -62,22 +62,22 @@ Beaming_info_list::beam_extend_count (Direction d) const } void -Beaming_info_list::beamify (Moment &beat_length,bool subdivide) +Beaming_info_list::beamify (Moment &beat_length, bool subdivide) { if (infos_.size () <= 1) return; Drul_array splits; - int m = best_splitpoint_index (beat_length,subdivide); + int m = best_splitpoint_index (beat_length, subdivide); bool split = subdivide && (m & at_beat); m = m & ~at_beat; - splits[LEFT].infos_ = infos_.slice (0,m); + splits[LEFT].infos_ = infos_.slice (0, m); splits[RIGHT].infos_ = infos_.slice (m, infos_.size ()); Direction d = LEFT; do { - splits[d].beamify (beat_length,subdivide); + splits[d].beamify (beat_length, subdivide); } while (flip (&d) != LEFT); diff --git a/lily/bezier.cc b/lily/bezier.cc index f2dc0db9c8..7a5c60a382 100644 --- a/lily/bezier.cc +++ b/lily/bezier.cc @@ -93,7 +93,7 @@ Bezier::curve_point (Real t)const for (int j = 0 ; j < 4; j++) { o += control_[j] * binomial_coefficient (3, j) - * pow (t,j) * pow (1-t, 3-j); + * pow (t, j) * pow (1-t, 3-j); tj *= t; if (1-t) @@ -125,7 +125,7 @@ Bezier::polynomial (Axis a)const } /** - Remove all numbers outside [0,1] from SOL + Remove all numbers outside [0, 1] from SOL */ Array filter_solutions (Array sol) @@ -182,7 +182,7 @@ Bezier::extent (Axis a)const for (int i = sols.size (); i--;) { Offset o (curve_point (sols[i])); - iv.unite (Interval (o[a],o[a])); + iv.unite (Interval (o[a], o[a])); } return iv; } diff --git a/lily/break-align-engraver.cc b/lily/break-align-engraver.cc index 25cdc4a326..90f84359dd 100644 --- a/lily/break-align-engraver.cc +++ b/lily/break-align-engraver.cc @@ -20,7 +20,7 @@ class Break_align_engraver : public Engraver SCM column_alist_; Item *left_edge_; - void add_to_group (SCM,Item*); + void add_to_group (SCM, Item*); protected: virtual void acknowledge_grob (Grob_info i); virtual void stop_translation_timestep (); @@ -35,7 +35,7 @@ void Break_align_engraver::add_column (SCM smob) { Grob * e = unsmob_grob (smob); - Break_align_interface::add_element (align_,e); + Break_align_interface::add_element (align_, e); } diff --git a/lily/breathing-sign.cc b/lily/breathing-sign.cc index cfe6f8d269..ff34cc6113 100644 --- a/lily/breathing-sign.cc +++ b/lily/breathing-sign.cc @@ -36,7 +36,7 @@ Gregorian chant divisio minima. (Actually, this was the original breathing sign by Michael. -- jr) */ -MAKE_SCHEME_CALLBACK (Breathing_sign,divisio_minima,1); +MAKE_SCHEME_CALLBACK (Breathing_sign, divisio_minima, 1); SCM Breathing_sign::divisio_minima (SCM smob) { @@ -69,7 +69,7 @@ Breathing_sign::divisio_minima (SCM smob) /* Gregorian chant divisio maior. */ -MAKE_SCHEME_CALLBACK (Breathing_sign,divisio_maior,1); +MAKE_SCHEME_CALLBACK (Breathing_sign, divisio_maior, 1); SCM Breathing_sign::divisio_maior (SCM smob) { @@ -109,7 +109,7 @@ Breathing_sign::divisio_maior (SCM smob) /* Gregorian chant divisio maxima. */ -MAKE_SCHEME_CALLBACK (Breathing_sign,divisio_maxima,1); +MAKE_SCHEME_CALLBACK (Breathing_sign, divisio_maxima, 1); SCM Breathing_sign::divisio_maxima (SCM smob) { @@ -139,7 +139,7 @@ Breathing_sign::divisio_maxima (SCM smob) /* Gregorian chant finalis. */ -MAKE_SCHEME_CALLBACK (Breathing_sign,finalis,1); +MAKE_SCHEME_CALLBACK (Breathing_sign, finalis, 1); SCM Breathing_sign::finalis (SCM smob) { @@ -170,7 +170,7 @@ Breathing_sign::finalis (SCM smob) return line1.smobbed_copy (); } -MAKE_SCHEME_CALLBACK (Breathing_sign,offset_callback,2); +MAKE_SCHEME_CALLBACK (Breathing_sign, offset_callback, 2); SCM Breathing_sign::offset_callback (SCM element_smob, SCM) { diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc index e02b8116d3..af854701de 100644 --- a/lily/chord-name-engraver.cc +++ b/lily/chord-name-engraver.cc @@ -96,7 +96,7 @@ Chord_name_engraver::process_music () { Pitch *p = unsmob_pitch (inversion_event->get_property ("pitch")); int octavation = scm_to_int (oct); - Pitch orig = p->transposed (Pitch (-octavation, 0,0)); + Pitch orig = p->transposed (Pitch (-octavation, 0, 0)); pitches = scm_cons (orig.smobbed_copy (), pitches); } @@ -115,7 +115,7 @@ Chord_name_engraver::process_music () */ SCM chord_as_scm = scm_cons (pitches, scm_cons (bass, inversion)); - chord_name_ = make_item ("ChordName",notes_[0]->self_scm ()); + chord_name_ = make_item ("ChordName", notes_[0]->self_scm ()); chord_name_->set_property ("text", markup); SCM s = get_property ("chordChanges"); diff --git a/lily/chord-tremolo-iterator.cc b/lily/chord-tremolo-iterator.cc index fc8691d010..05425a7ab1 100644 --- a/lily/chord-tremolo-iterator.cc +++ b/lily/chord-tremolo-iterator.cc @@ -51,7 +51,7 @@ void Chord_tremolo_iterator::derived_substitute (Context *f, Context *t) { if (child_iter_) - child_iter_->substitute_outlet (f,t); + child_iter_->substitute_outlet (f, t); } void diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc index 68bf689446..0bdb8443c1 100644 --- a/lily/clef-engraver.cc +++ b/lily/clef-engraver.cc @@ -109,7 +109,7 @@ Clef_engraver::create_clef () g->set_property ("text", scm_list_n (ly_lily_module_constant ("vcenter-markup"), txt, SCM_UNDEFINED)); - Side_position_interface::add_support (g,clef_); + Side_position_interface::add_support (g, clef_); g->set_parent (clef_, Y_AXIS); g->set_parent (clef_, X_AXIS); diff --git a/lily/cluster.cc b/lily/cluster.cc index c95e7f222e..aec236de96 100644 --- a/lily/cluster.cc +++ b/lily/cluster.cc @@ -124,7 +124,7 @@ brew_cluster_piece (Grob *me, Array bottom_points, Array top_poi return out; } -MAKE_SCHEME_CALLBACK (Cluster,print,1); +MAKE_SCHEME_CALLBACK (Cluster, print, 1); SCM Cluster::print (SCM smob) { @@ -193,8 +193,8 @@ Cluster::print (SCM smob) Interval v = col->extent (next_commony, Y_AXIS); Real x = right_bound->relative_coordinate (commonx, X_AXIS) - left_coord; - bottom_points.insert (Offset (x, v[DOWN]),0); - top_points.insert (Offset (x, v[UP]),0); + bottom_points.insert (Offset (x, v[DOWN]), 0); + top_points.insert (Offset (x, v[UP]), 0); } } } @@ -207,7 +207,7 @@ Cluster::print (SCM smob) return out.smobbed_copy (); } -ADD_INTERFACE (Cluster,"cluster-interface", +ADD_INTERFACE (Cluster, "cluster-interface", "A graphically drawn musical cluster. " "\n\n" "@code{padding} adds to the vertical extent of the shape (top and " @@ -227,13 +227,13 @@ public: static bool has_interface (Grob *); }; -MAKE_SCHEME_CALLBACK (Cluster_beacon,height,2); +MAKE_SCHEME_CALLBACK (Cluster_beacon, height, 2); SCM Cluster_beacon::height (SCM g, SCM) { Grob *me = unsmob_grob (g); Interval v = robust_scm2interval (me->get_property ("positions"), - Interval (0,0)); + Interval (0, 0)); return ly_interval2scm (Staff_symbol_referencer::staff_space (me) * 0.5 * v); } diff --git a/lily/collision-engraver.cc b/lily/collision-engraver.cc index d3eba9978d..24456265db 100644 --- a/lily/collision-engraver.cc +++ b/lily/collision-engraver.cc @@ -38,7 +38,7 @@ Collision_engraver::process_acknowledged_grobs () } for (int i = 0; i< note_columns_.size (); i++) - Note_collision_interface::add_column (col_,note_columns_[i]); + Note_collision_interface::add_column (col_, note_columns_[i]); } void diff --git a/lily/completion-note-heads-engraver.cc b/lily/completion-note-heads-engraver.cc index 92d8fdb13d..9d17deaf62 100644 --- a/lily/completion-note-heads-engraver.cc +++ b/lily/completion-note-heads-engraver.cc @@ -88,10 +88,10 @@ Completion_heads_engraver::try_music (Music *m) if (now_mom ().grace_part_) { musiclen.grace_part_ = musiclen.main_part_ ; - musiclen.main_part_ = Rational (0,1); + musiclen.main_part_ = Rational (0, 1); } note_end_mom_ = note_end_mom_ >? (now + musiclen); - do_nothing_until_ = Rational (0,0); + do_nothing_until_ = Rational (0, 0); return true; } @@ -115,7 +115,7 @@ Completion_heads_engraver::next_barline_moment ( ) if (!e || !l) { programming_error ("No timing props set?"); - return Moment (1,1); + return Moment (1, 1); } return (*l - *e); @@ -126,7 +126,7 @@ Completion_heads_engraver::find_nearest_duration (Rational length) { int log_limit = 6; - Duration d (0,0); + Duration d (0, 0); /* this could surely be done more efficient. Left to the reader as an @@ -215,7 +215,7 @@ Completion_heads_engraver::process_music () { req = scratch_note_reqs_[i]; SCM pits = note_reqs_[i]->get_property ("pitch"); - req->set_property ("pitch",pits); + req->set_property ("pitch", pits); } req->set_property ("duration", note_dur.smobbed_copy ()); @@ -274,7 +274,7 @@ Completion_heads_engraver::process_music () if (orig && now_mom ().grace_part_ ) { - left_to_do_ = Rational (0,0); + left_to_do_ = Rational (0, 0); } } diff --git a/lily/context-def.cc b/lily/context-def.cc index b4b032b507..0fc4cdfc29 100644 --- a/lily/context-def.cc +++ b/lily/context-def.cc @@ -189,7 +189,7 @@ Context_def::path_to_acceptable_context (SCM type_sym, Output_def *odef) const = g->path_to_acceptable_context (type_sym, odef); if (result.size () && result.size () < best_depth) { - result.insert (g,0); + result.insert (g, 0); best_result = result; /* this following line was added in 1.9.3, but hsould've been diff --git a/lily/context-specced-music-iterator.cc b/lily/context-specced-music-iterator.cc index 1442f47c93..6fc2b4b5be 100644 --- a/lily/context-specced-music-iterator.cc +++ b/lily/context-specced-music-iterator.cc @@ -14,7 +14,7 @@ class Context_specced_music_iterator : public Music_wrapper_iterator { public: - DECLARE_SCHEME_CALLBACK (constructor,()); + DECLARE_SCHEME_CALLBACK (constructor, ()); virtual void construct_children (); }; diff --git a/lily/context.cc b/lily/context.cc index 642515e2a4..f8d84f2d41 100644 --- a/lily/context.cc +++ b/lily/context.cc @@ -525,7 +525,7 @@ Context::mark_smob (SCM sm) IMPLEMENT_SMOBS (Context); IMPLEMENT_DEFAULT_EQUAL_P (Context); -IMPLEMENT_TYPE_P (Context,"ly:context?"); +IMPLEMENT_TYPE_P (Context, "ly:context?"); bool Context::try_music (Music* m) diff --git a/lily/custos.cc b/lily/custos.cc index 3f74954be9..d45974f9e2 100644 --- a/lily/custos.cc +++ b/lily/custos.cc @@ -25,7 +25,7 @@ #include "item.hh" #include "font-interface.hh" -MAKE_SCHEME_CALLBACK (Custos,print,1); +MAKE_SCHEME_CALLBACK (Custos, print, 1); SCM Custos::print (SCM smob) { diff --git a/lily/dot-column.cc b/lily/dot-column.cc index 349d6a7c2a..f30c544b81 100644 --- a/lily/dot-column.cc +++ b/lily/dot-column.cc @@ -24,7 +24,7 @@ TODO: let Dot_column communicate with stem via Note_column. */ -MAKE_SCHEME_CALLBACK (Dot_column,force_shift_callback,2); +MAKE_SCHEME_CALLBACK (Dot_column, force_shift_callback, 2); SCM Dot_column::force_shift_callback (SCM element_smob, SCM axis) { @@ -42,7 +42,7 @@ Dot_column::force_shift_callback (SCM element_smob, SCM axis) return scm_make_real (0.0); } -MAKE_SCHEME_CALLBACK (Dot_column,side_position, 2); +MAKE_SCHEME_CALLBACK (Dot_column, side_position, 2); SCM Dot_column::side_position (SCM element_smob, SCM axis) { @@ -299,7 +299,7 @@ Dot_column::add_head (Grob * me, Grob *rh) Grob * d = unsmob_grob (rh->get_property ("dot")); if (d) { - Side_position_interface::add_support (me,rh); + Side_position_interface::add_support (me, rh); Pointer_group_interface::add_grob (me, ly_symbol2scm ("dots"), d); d->add_offset_callback (Dot_column::force_shift_callback_proc , Y_AXIS); diff --git a/lily/dots.cc b/lily/dots.cc index 9b00c390dc..cb5bfdd487 100644 --- a/lily/dots.cc +++ b/lily/dots.cc @@ -15,7 +15,7 @@ #include "staff-symbol-referencer.hh" #include "directional-element-interface.hh" -MAKE_SCHEME_CALLBACK (Dots,print,1); +MAKE_SCHEME_CALLBACK (Dots, print, 1); SCM Dots::print (SCM d) { @@ -37,12 +37,12 @@ Dots::print (SCM d) /* TODO: this should be handled by side-position padding. */ - mol = Lookup::blank (Box (Interval (0,0), - Interval (0,0))); + mol = Lookup::blank (Box (Interval (0, 0), + Interval (0, 0))); for (int i = scm_to_int (c); i--;) { - d.translate_axis (2*dw,X_AXIS); + d.translate_axis (2*dw, X_AXIS); mol.add_at_edge (X_AXIS, RIGHT, d, dw, 0); } } diff --git a/lily/drum-note-performer.cc b/lily/drum-note-performer.cc index c29f293196..d1b38e4b77 100644 --- a/lily/drum-note-performer.cc +++ b/lily/drum-note-performer.cc @@ -110,8 +110,8 @@ Drum_note_performer::try_music (Music* ev) } ADD_TRANSLATOR (Drum_note_performer, - "Play drum notes.","", - "note-event busy-playing-event","","",""); + "Play drum notes.", "", + "note-event busy-playing-event", "", "", ""); Drum_note_performer::Drum_note_performer () { diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc index a4bf12129a..45c9c355c5 100644 --- a/lily/dynamic-engraver.cc +++ b/lily/dynamic-engraver.cc @@ -384,8 +384,8 @@ Dynamic_engraver::acknowledge_grob (Grob_info info) /* Don't refill killed spanner */ && line_spanner_->is_live ()) { - Side_position_interface::add_support (line_spanner_,info.grob_); - add_bound_item (line_spanner_,dynamic_cast (info.grob_)); + Side_position_interface::add_support (line_spanner_, info.grob_); + add_bound_item (line_spanner_, dynamic_cast (info.grob_)); } if (script_ && !script_->get_parent (X_AXIS)) diff --git a/lily/dynamic-text-spanner.cc b/lily/dynamic-text-spanner.cc index 40bd71aa0c..70d2bf4466 100644 --- a/lily/dynamic-text-spanner.cc +++ b/lily/dynamic-text-spanner.cc @@ -88,7 +88,7 @@ Dynamic_text_spanner::print (SCM smob) Interval ext = b->extent (common, X_AXIS); span_points[d] = -d * pad - + robust_relative_extent (b,common, X_AXIS) + + robust_relative_extent (b, common, X_AXIS) .linear_combination (encl); } } diff --git a/lily/event.cc b/lily/event.cc index 6a9c05782b..bdadc3283c 100644 --- a/lily/event.cc +++ b/lily/event.cc @@ -9,7 +9,7 @@ #include "event.hh" #include "warn.hh" -MAKE_SCHEME_CALLBACK(Event,length_callback,1); +MAKE_SCHEME_CALLBACK(Event, length_callback, 1); SCM Event::length_callback (SCM m) { diff --git a/lily/fingering-engraver.cc b/lily/fingering-engraver.cc index 2a1cd6e652..4fd86d8ab7 100644 --- a/lily/fingering-engraver.cc +++ b/lily/fingering-engraver.cc @@ -57,7 +57,7 @@ Fingering_engraver::acknowledge_grob (Grob_info inf) for (int i = 0; i < fingerings_.size (); i++) { Grob*t = fingerings_[i]; - Side_position_interface::add_support (t,inf.grob_); + Side_position_interface::add_support (t, inf.grob_); if (!t->get_parent (X_AXIS)) t->set_parent (inf.grob_, X_AXIS); } diff --git a/lily/folded-repeat-iterator.cc b/lily/folded-repeat-iterator.cc index 9779f438a8..62459136eb 100644 --- a/lily/folded-repeat-iterator.cc +++ b/lily/folded-repeat-iterator.cc @@ -143,9 +143,9 @@ void Folded_repeat_iterator::derived_substitute (Context *f, Context *t) { if (main_iter_) - main_iter_->substitute_outlet (f,t); + main_iter_->substitute_outlet (f, t); if (alternative_iter_) - alternative_iter_->substitute_outlet (f,t); + alternative_iter_->substitute_outlet (f, t); } IMPLEMENT_CTOR_CALLBACK (Folded_repeat_iterator); diff --git a/lily/font-metric.cc b/lily/font-metric.cc index 2f96b4c488..73743ab5b2 100644 --- a/lily/font-metric.cc +++ b/lily/font-metric.cc @@ -201,6 +201,6 @@ Font_metric::text_stencil (String str) const Box Font_metric::text_dimension (String) const { - return Box (Interval (0,0), Interval (0,0)); + return Box (Interval (0, 0), Interval (0, 0)); } diff --git a/lily/function-documentation.cc b/lily/function-documentation.cc index 579426b65a..891c9180ca 100644 --- a/lily/function-documentation.cc +++ b/lily/function-documentation.cc @@ -36,7 +36,7 @@ void ly_add_function_documentation (SCM func, LY_DEFINE (ly_get_all_function_documentation, "ly:get-all-function-documentation", - 0,0,0, (), + 0, 0, 0, (), "Get a hash table with all lilypond Scheme extension functions.") { return doc_hash_table; diff --git a/lily/grace-music.cc b/lily/grace-music.cc index 2dcfda4e0b..82f0206547 100644 --- a/lily/grace-music.cc +++ b/lily/grace-music.cc @@ -16,7 +16,7 @@ public: DECLARE_SCHEME_CALLBACK(start_callback, (SCM)); }; -MAKE_SCHEME_CALLBACK(Grace_music,start_callback,1); +MAKE_SCHEME_CALLBACK(Grace_music, start_callback, 1); SCM Grace_music::start_callback (SCM m) { diff --git a/lily/grob-interface-scheme.cc b/lily/grob-interface-scheme.cc index 6b12dafe05..a06e3f1f85 100644 --- a/lily/grob-interface-scheme.cc +++ b/lily/grob-interface-scheme.cc @@ -13,7 +13,7 @@ Protected_scm all_ifaces; -LY_DEFINE (ly_add_interface, "ly:add-interface", 3,0,0, (SCM a, SCM b, SCM c), +LY_DEFINE (ly_add_interface, "ly:add-interface", 3, 0, 0, (SCM a, SCM b, SCM c), "Add an interface description.") { SCM_ASSERT_TYPE (scm_is_symbol (a), a, SCM_ARG1, __FUNCTION__, "symbol"); @@ -31,7 +31,7 @@ LY_DEFINE (ly_add_interface, "ly:add-interface", 3,0,0, (SCM a, SCM b, SCM c), LY_DEFINE (ly_all_grob_interfaces, "ly:all-grob-interfaces", - 0,0,0, (), + 0, 0, 0, (), "Get a hash table with all interface descriptions.") { return all_ifaces; diff --git a/lily/grob-interface.cc b/lily/grob-interface.cc index 75d5b0c821..7e16410163 100644 --- a/lily/grob-interface.cc +++ b/lily/grob-interface.cc @@ -20,7 +20,7 @@ void add_interface (const char * symbol, SCM d = scm_makfrom0str (descr); SCM l = parse_symbol_list (vars); - ly_add_interface (s,d,l); + ly_add_interface (s, d, l); } diff --git a/lily/grob-pitch-tuple.cc b/lily/grob-pitch-tuple.cc index c8663a2b84..501938f741 100644 --- a/lily/grob-pitch-tuple.cc +++ b/lily/grob-pitch-tuple.cc @@ -13,7 +13,7 @@ source file of the GNU LilyPond music typesetter int compare (Grob_pitch_tuple const &a, Grob_pitch_tuple const &b) { - return Grob_pitch_tuple::time_compare (a,b); + return Grob_pitch_tuple::time_compare (a, b); } diff --git a/lily/grob-pq-engraver.cc b/lily/grob-pq-engraver.cc index e76e35ce67..fdf547984a 100644 --- a/lily/grob-pq-engraver.cc +++ b/lily/grob-pq-engraver.cc @@ -34,7 +34,7 @@ Grob_pq_engraver::initialize () } LY_DEFINE (ly_grob_pq_less_p, "ly:grob-pq-less?", - 2, 0 ,0, (SCM a, SCM b), + 2, 0 , 0, (SCM a, SCM b), "Compare 2 grob priority queue entries. Internal") { if (Moment::compare (*unsmob_moment (scm_car (a)), @@ -117,10 +117,10 @@ ADD_TRANSLATOR (Grob_pq_engraver, /* descr */ "Administrate when certain grobs (eg. note heads) stop playing; this \ engraver is a sort-of a failure, since it doesn't handle all sorts of \ borderline cases very well. \ -", \ +", \ -/* creats*/ "", \ -/* accepts */ "", \ -/* acks */ "grob-interface", \ -/* reads */ "busyGrobs", \ +/* creats*/ "", \ +/* accepts */ "", \ +/* acks */ "grob-interface", \ +/* reads */ "busyGrobs", \ /* write */ "busyGrobs"); diff --git a/lily/grob-property.cc b/lily/grob-property.cc index bfe2eb5aa4..d912621dac 100644 --- a/lily/grob-property.cc +++ b/lily/grob-property.cc @@ -31,7 +31,7 @@ Grob::get_property_alist_chain (SCM def) const /* This special add_thing routine is slightly more efficient than - set_prop (name,cons (thing, get_prop (name))) + set_prop (name, cons (thing, get_prop (name))) since it can reuse the handle returned by scm_assq (). */ diff --git a/lily/grob-scheme.cc b/lily/grob-scheme.cc index f74dbdac53..309f086dac 100644 --- a/lily/grob-scheme.cc +++ b/lily/grob-scheme.cc @@ -222,7 +222,7 @@ LY_DEFINE (ly_item_break_dir, "ly:item-break-dir", LY_DEFINE(ly_grob_key, "ly:grob-key", - 1,0,0, + 1, 0, 0, (SCM grob), "Return the object-key for @var{grob}." ) diff --git a/lily/grob.cc b/lily/grob.cc index 3809b0d513..a85266d427 100644 --- a/lily/grob.cc +++ b/lily/grob.cc @@ -36,7 +36,7 @@ Grob::clone (int count) const /* TODO: - - remove dynamic_cast and put this code into respective + - remove dynamic_cast and put this code into respective subclass. */ #define HASH_SIZE 3 @@ -238,7 +238,7 @@ Grob::get_uncached_stencil () const { SCM expr = scm_list_3 (ly_symbol2scm ("grob-cause"), self_scm(), m->expr ()); - stil = Stencil (m->extent_box (),expr). smobbed_copy (); + stil = Stencil (m->extent_box (), expr). smobbed_copy (); } } @@ -535,7 +535,7 @@ Grob::set_parent (Grob *g, Axis a) dim_cache_[a].parent_ = g; } -MAKE_SCHEME_CALLBACK (Grob,fixup_refpoint,1); +MAKE_SCHEME_CALLBACK (Grob, fixup_refpoint, 1); SCM Grob::fixup_refpoint (SCM smob) { diff --git a/lily/hairpin.cc b/lily/hairpin.cc index 96b43c57e3..5e7aa98720 100644 --- a/lily/hairpin.cc +++ b/lily/hairpin.cc @@ -57,7 +57,7 @@ Hairpin::print (SCM smob) if (broken [d]) { if (d == LEFT) - x_points[d] = b->extent (common,X_AXIS)[RIGHT] ; + x_points[d] = b->extent (common, X_AXIS)[RIGHT] ; } else { diff --git a/lily/hara-kiri-group-spanner.cc b/lily/hara-kiri-group-spanner.cc index 22cdef3615..e5e778b9d2 100644 --- a/lily/hara-kiri-group-spanner.cc +++ b/lily/hara-kiri-group-spanner.cc @@ -14,7 +14,7 @@ #include "warn.hh" #include "item.hh" -MAKE_SCHEME_CALLBACK (Hara_kiri_group_spanner,y_extent,2); +MAKE_SCHEME_CALLBACK (Hara_kiri_group_spanner, y_extent, 2); SCM Hara_kiri_group_spanner::y_extent (SCM element_smob, SCM scm_axis) { @@ -58,7 +58,7 @@ Hara_kiri_group_spanner::consider_suicide (Grob*me) We can't rely on offsets and dimensions of elements in a hara-kiri group. Use a callback to make sure that hara-kiri has been done before asking for offsets. */ -MAKE_SCHEME_CALLBACK (Hara_kiri_group_spanner,force_hara_kiri_callback,2); +MAKE_SCHEME_CALLBACK (Hara_kiri_group_spanner, force_hara_kiri_callback, 2); SCM Hara_kiri_group_spanner::force_hara_kiri_callback (SCM element_smob, SCM axis) { @@ -70,7 +70,7 @@ Hara_kiri_group_spanner::force_hara_kiri_callback (SCM element_smob, SCM axis) } -MAKE_SCHEME_CALLBACK (Hara_kiri_group_spanner,force_hara_kiri_in_parent_callback,2); +MAKE_SCHEME_CALLBACK (Hara_kiri_group_spanner, force_hara_kiri_in_parent_callback, 2); SCM Hara_kiri_group_spanner::force_hara_kiri_in_parent_callback (SCM element_smob, SCM axis) { @@ -93,14 +93,14 @@ Hara_kiri_group_spanner::add_element (Grob * me, Grob *e) void -Hara_kiri_group_spanner::add_interesting_item (Grob* me,Grob* n) +Hara_kiri_group_spanner::add_interesting_item (Grob* me, Grob* n) { me->add_dependency (n); - Pointer_group_interface::add_grob (me, ly_symbol2scm ("items-worth-living"),n); + Pointer_group_interface::add_grob (me, ly_symbol2scm ("items-worth-living"), n); } -ADD_INTERFACE (Hara_kiri_group_spanner,"hara-kiri-group-interface", +ADD_INTERFACE (Hara_kiri_group_spanner, "hara-kiri-group-interface", "A group spanner that keeps track of interesting items. If it " "doesn't contain any after linebreaking, then it " "will remove itself and all its children." diff --git a/lily/horizontal-bracket.cc b/lily/horizontal-bracket.cc index 16c08f8720..ed5eac5deb 100644 --- a/lily/horizontal-bracket.cc +++ b/lily/horizontal-bracket.cc @@ -36,7 +36,7 @@ Horizontal_bracket::print (SCM smob) { Grob * me = unsmob_grob (smob); Spanner *sp = dynamic_cast (me); - Link_array gs = Pointer_group_interface__extract_grobs (me,(Grob*)0, "columns"); + Link_array gs = Pointer_group_interface__extract_grobs (me, (Grob*)0, "columns"); if (!gs.size ()) { @@ -45,7 +45,7 @@ Horizontal_bracket::print (SCM smob) } Grob * cx = common_refpoint_of_array (gs, me, X_AXIS); cx = cx->common_refpoint (sp->get_bound (LEFT), X_AXIS); - cx = cx->common_refpoint (sp->get_bound (RIGHT),X_AXIS); + cx = cx->common_refpoint (sp->get_bound (RIGHT), X_AXIS); Interval ext = gs.top ()->extent (cx, X_AXIS); ext.unite (gs[0]->extent (cx, X_AXIS)); @@ -55,10 +55,10 @@ Horizontal_bracket::print (SCM smob) Drul_array flare = robust_scm2interval (me->get_property ("bracket-flare"), - Interval (0,0)); + Interval (0, 0)); Drul_array shorten = robust_scm2interval (me->get_property ("shorten-pair"), - Interval (0,0)); + Interval (0, 0)); Interval empty; Stencil b @@ -70,7 +70,7 @@ Horizontal_bracket::print (SCM smob) return b.smobbed_copy (); } -ADD_INTERFACE (Horizontal_bracket,"horizontal-bracket-interface", +ADD_INTERFACE (Horizontal_bracket, "horizontal-bracket-interface", "A horizontal bracket encompassing notes.", "columns bracket-flare shorten-pair edge-height"); diff --git a/lily/include/accidental-interface.hh b/lily/include/accidental-interface.hh index beeda174d0..236e177078 100644 --- a/lily/include/accidental-interface.hh +++ b/lily/include/accidental-interface.hh @@ -23,7 +23,7 @@ public: static bool has_interface (Grob*); static String get_fontcharname(String style, int alteration); - static Array Accidental_interface::accurate_boxes (Grob *me,Grob**common); + static Array Accidental_interface::accurate_boxes (Grob *me, Grob**common); }; diff --git a/lily/include/accidental-placement.hh b/lily/include/accidental-placement.hh index 910fa8ccf7..a288aeb391 100644 --- a/lily/include/accidental-placement.hh +++ b/lily/include/accidental-placement.hh @@ -16,7 +16,7 @@ class Accidental_placement { public: DECLARE_SCHEME_CALLBACK (alignment_callback, (SCM element, SCM axis)); - static void add_accidental (Grob *,Grob* ); + static void add_accidental (Grob *, Grob* ); static Interval get_relevant_accidental_extent (Grob *me, Item *item_col, diff --git a/lily/include/afm.hh b/lily/include/afm.hh index 31bc1d31ed..adafed8d6d 100644 --- a/lily/include/afm.hh +++ b/lily/include/afm.hh @@ -41,7 +41,7 @@ protected: AFM_CharMetricInfo const *find_ascii_metric (int) const; Array ascii_to_metric_idx_; - std::map name_to_metric_dict_; + std::map name_to_metric_dict_; Adobe_font_metric (AFM_Font_info*); }; diff --git a/lily/include/align-interface.hh b/lily/include/align-interface.hh index 3a64c2d719..279c1b6a3d 100644 --- a/lily/include/align-interface.hh +++ b/lily/include/align-interface.hh @@ -16,12 +16,12 @@ struct Align_interface { DECLARE_SCHEME_CALLBACK (alignment_callback, (SCM element, SCM axis)); DECLARE_SCHEME_CALLBACK (fixed_distance_alignment_callback, (SCM element, SCM axis)); - static void align_to_fixed_distance (Grob*,Axis a); - static void align_elements_to_extents (Grob*,Axis a); - static void set_axis (Grob*,Axis); + static void align_to_fixed_distance (Grob*, Axis a); + static void align_elements_to_extents (Grob*, Axis a); + static void set_axis (Grob*, Axis); static Axis axis (Grob*) ; - static void add_element (Grob*,Grob*, SCM callback); - static int get_count (Grob*,Grob*); + static void add_element (Grob*, Grob*, SCM callback); + static int get_count (Grob*, Grob*); static bool has_interface (Grob*); }; diff --git a/lily/include/arpeggio.hh b/lily/include/arpeggio.hh index 8e49478ad5..2eb368bba8 100644 --- a/lily/include/arpeggio.hh +++ b/lily/include/arpeggio.hh @@ -17,7 +17,7 @@ class Arpeggio public: DECLARE_SCHEME_CALLBACK (print, (SCM)); DECLARE_SCHEME_CALLBACK (brew_chord_bracket, (SCM)); - DECLARE_SCHEME_CALLBACK (width_callback, (SCM,SCM)); + DECLARE_SCHEME_CALLBACK (width_callback, (SCM, SCM)); static bool has_interface (Grob*); }; diff --git a/lily/include/axis-group-interface.hh b/lily/include/axis-group-interface.hh index 023441b895..aee7739017 100644 --- a/lily/include/axis-group-interface.hh +++ b/lily/include/axis-group-interface.hh @@ -21,8 +21,8 @@ struct Axis_group_interface static Interval relative_group_extent (Axis, Grob * common, SCM list); static void add_element (Grob* me, Grob*); - static void set_axes (Grob*,Axis,Axis); - static bool has_axis (Grob*,Axis); + static void set_axes (Grob*, Axis, Axis); + static bool has_axis (Grob*, Axis); static Link_array get_children (Grob*); static bool has_interface (Grob*); diff --git a/lily/include/beam.hh b/lily/include/beam.hh index f275cb3099..94c4a64fd1 100644 --- a/lily/include/beam.hh +++ b/lily/include/beam.hh @@ -24,9 +24,9 @@ public: static bool has_interface (Grob*); DECLARE_SCHEME_CALLBACK (rest_collision_callback, (SCM element, SCM axis)); Beam (SCM); - static void add_stem (Grob*,Grob*); + static void add_stem (Grob*, Grob*); static bool is_knee (Grob*); - static void set_beaming (Grob*,Beaming_info_list *); + static void set_beaming (Grob*, Beaming_info_list *); static void set_stemlens (Grob*); static int get_beam_count (Grob*me); static void position_beam (Grob* me); diff --git a/lily/include/beaming.hh b/lily/include/beaming.hh index 3c2477eb3a..44b7df2a59 100644 --- a/lily/include/beaming.hh +++ b/lily/include/beaming.hh @@ -32,8 +32,8 @@ struct Beaming_info_list Array infos_; int beam_extend_count (Direction) const; - int best_splitpoint_index (Moment &beat_length,bool subdivide) const; - void beamify (Moment &beat_length,bool subdivide); + int best_splitpoint_index (Moment &beat_length, bool subdivide) const; + void beamify (Moment &beat_length, bool subdivide); void add_stem (Moment d, int beams); }; diff --git a/lily/include/bezier.hh b/lily/include/bezier.hh index 0b6e1f2283..4b449c6b42 100644 --- a/lily/include/bezier.hh +++ b/lily/include/bezier.hh @@ -19,7 +19,7 @@ class Bezier { public: void assert_sanity () const; - void scale (Real x,Real y); + void scale (Real x, Real y); void reverse (); void rotate (Real); void translate (Offset); diff --git a/lily/include/dimension-cache-callback.hh b/lily/include/dimension-cache-callback.hh index a649ef057c..ff9ea00c60 100644 --- a/lily/include/dimension-cache-callback.hh +++ b/lily/include/dimension-cache-callback.hh @@ -12,8 +12,8 @@ #include "axes.hh" -typedef Interval (*Dim_cache_callback) (Grob *,Axis); -typedef Real (*Offset_callback) (Grob *,Axis); +typedef Interval (*Dim_cache_callback) (Grob *, Axis); +typedef Real (*Offset_callback) (Grob *, Axis); #endif /* DIMENSION_CACHE_CALLBACK_HH */ diff --git a/lily/include/dot-column.hh b/lily/include/dot-column.hh index 994d89c0c2..81a373edf2 100644 --- a/lily/include/dot-column.hh +++ b/lily/include/dot-column.hh @@ -20,12 +20,12 @@ class Grob; class Dot_column // interface { public: - static int compare (Grob * const&,Grob * const&); + static int compare (Grob * const&, Grob * const&); static void add_head (Grob * dotcol, Grob* rh ); static bool has_interface (Grob*); - DECLARE_SCHEME_CALLBACK (force_shift_callback, (SCM ,SCM)); - DECLARE_SCHEME_CALLBACK (side_position, (SCM ,SCM)); + DECLARE_SCHEME_CALLBACK (force_shift_callback, (SCM , SCM)); + DECLARE_SCHEME_CALLBACK (side_position, (SCM , SCM)); static SCM do_shifts (Grob*); }; #endif // DOT_COLUMN_HH diff --git a/lily/include/duration.hh b/lily/include/duration.hh index 258c03ba9f..931fdab7c9 100644 --- a/lily/include/duration.hh +++ b/lily/include/duration.hh @@ -31,7 +31,7 @@ public: static int compare (Duration const&, Duration const&); DECLARE_SCHEME_CALLBACK (less_p, (SCM a, SCM b)); - DECLARE_SIMPLE_SMOBS (Duration,); + DECLARE_SIMPLE_SMOBS (Duration, ); private: /// Logarithm of the base duration. diff --git a/lily/include/engraver.hh b/lily/include/engraver.hh index 7d8c034173..9b89eea5f1 100644 --- a/lily/include/engraver.hh +++ b/lily/include/engraver.hh @@ -52,8 +52,8 @@ public: TRANSLATOR_DECLARATIONS(Engraver); }; -#define make_item(x,cause) make_item_from_properties (this, ly_symbol2scm (x), cause, x) -#define make_spanner(x,cause) make_spanner_from_properties (this, ly_symbol2scm (x), cause, x) +#define make_item(x, cause) make_item_from_properties (this, ly_symbol2scm (x), cause, x) +#define make_spanner(x, cause) make_spanner_from_properties (this, ly_symbol2scm (x), cause, x) Item* make_item_from_properties (Engraver * tg, SCM x, SCM cause, const char *name); Spanner* make_spanner_from_properties (Engraver * tg, SCM x, SCM cause, const char*name); diff --git a/lily/include/event.hh b/lily/include/event.hh index 6a5aa406d3..4f981fb01a 100644 --- a/lily/include/event.hh +++ b/lily/include/event.hh @@ -22,7 +22,7 @@ class Event : public Music public: Event (SCM); VIRTUAL_COPY_CONSTRUCTOR (Music, Event); - DECLARE_SCHEME_CALLBACK(length_callback,(SCM)); + DECLARE_SCHEME_CALLBACK(length_callback, (SCM)); }; diff --git a/lily/include/font-metric.hh b/lily/include/font-metric.hh index 6e1fe30e3c..c94fa2bb98 100644 --- a/lily/include/font-metric.hh +++ b/lily/include/font-metric.hh @@ -38,7 +38,7 @@ public: virtual Stencil get_ascii_char_stencil (int k) const; virtual SCM sub_fonts () const; virtual SCM font_file_name () const; - DECLARE_SMOBS (Font_metric,); + DECLARE_SMOBS (Font_metric, ); private: /* No copying, no implicit copy constructor. */ diff --git a/lily/include/global-ctor.hh b/lily/include/global-ctor.hh index 01835c6197..ed56a38edf 100644 --- a/lily/include/global-ctor.hh +++ b/lily/include/global-ctor.hh @@ -11,7 +11,7 @@ #define GLOBAL_CTOR_HH -#define ADD_GLOBAL_CTOR_WITHNAME(y,x)\ +#define ADD_GLOBAL_CTOR_WITHNAME(y, x)\ class Global_ctor_ ## y \ {\ public: \ @@ -21,7 +21,7 @@ public: \ } _ ## y ## _ctor_init; \ -#define ADD_GLOBAL_CTOR(x) ADD_GLOBAL_CTOR_WITHNAME (x,x); +#define ADD_GLOBAL_CTOR(x) ADD_GLOBAL_CTOR_WITHNAME (x, x); typedef void (* Global_ctor ) (); diff --git a/lily/include/gourlay-breaking.hh b/lily/include/gourlay-breaking.hh index 9aacd484f5..c35174cdc0 100644 --- a/lily/include/gourlay-breaking.hh +++ b/lily/include/gourlay-breaking.hh @@ -19,6 +19,6 @@ struct Gourlay_breaking : public Break_algorithm { Array do_solve () const; Gourlay_breaking (); - Real combine_demerits (Column_x_positions const&,Column_x_positions const&) const; + Real combine_demerits (Column_x_positions const&, Column_x_positions const&) const; }; #endif // GOURLAY_BREAKING_HH diff --git a/lily/include/grob-interface.hh b/lily/include/grob-interface.hh index 69f27976d1..3f4bcfdbe1 100644 --- a/lily/include/grob-interface.hh +++ b/lily/include/grob-interface.hh @@ -14,13 +14,13 @@ -#define ADD_INTERFACE(cl,a,b,c) \ +#define ADD_INTERFACE(cl, a, b, c) \ bool cl::has_interface(Grob*me)\ {\ return me->internal_has_interface (ly_symbol2scm (a));\ }\ void cl ## _init_ifaces() {\ - add_interface(a,b,c);\ + add_interface(a, b, c);\ }\ ADD_SCM_INIT_FUNC(cl ## ifaces, cl ## _init_ifaces);\ diff --git a/lily/include/grob.hh b/lily/include/grob.hh index 612aa8d36d..15ca5933af 100644 --- a/lily/include/grob.hh +++ b/lily/include/grob.hh @@ -18,11 +18,11 @@ 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. - POSTCALCED, // after spacing calcs done + PRECALCED, // calcs before spacing done + POSTCALCING, // busy calculating. This is used to trap cyclic deps. + POSTCALCED, // after spacing calcs done }; typedef void (Grob::*Grob_method_pointer) (void); @@ -78,7 +78,7 @@ public: void add_to_list_property (SCM, SCM); SCM get_property_alist_chain (SCM) const; - static SCM ly_grob_set_property (SCM, SCM,SCM); + static SCM ly_grob_set_property (SCM, SCM, SCM); static SCM ly_grob_property (SCM, SCM); void warning (String) const; diff --git a/lily/include/guile-compatibility.hh b/lily/include/guile-compatibility.hh index fc66c1c9f7..d61d50e351 100644 --- a/lily/include/guile-compatibility.hh +++ b/lily/include/guile-compatibility.hh @@ -56,7 +56,7 @@ inline bool ly_c_symbol_p (SCM x) { return SCM_SYMBOLP (x); } inline bool ly_c_boolean_p (SCM x) { return SCM_BOOLP (x); } #define scm_is_bool(x) ly_c_boolean_p(x) inline bool ly_c_eq_p (SCM x, SCM y) { return SCM_EQ_P (x, y); } -#define scm_is_eq(x,y) (SCM_EQ_P ((x), (y))) +#define scm_is_eq(x, y) (SCM_EQ_P ((x), (y))) #define scm_c_string_length(x) SCM_STRING_LENGTH (x) #define scm_is_pair(x) (SCM_CONSP (x)) diff --git a/lily/include/hara-kiri-group-spanner.hh b/lily/include/hara-kiri-group-spanner.hh index 041b97374f..efaf83f65b 100644 --- a/lily/include/hara-kiri-group-spanner.hh +++ b/lily/include/hara-kiri-group-spanner.hh @@ -16,9 +16,9 @@ class Hara_kiri_group_spanner { public: - DECLARE_SCHEME_CALLBACK (force_hara_kiri_callback, (SCM ,SCM)); + DECLARE_SCHEME_CALLBACK (force_hara_kiri_callback, (SCM , SCM)); DECLARE_SCHEME_CALLBACK (y_extent, (SCM smob, SCM axis)); - DECLARE_SCHEME_CALLBACK (force_hara_kiri_in_parent_callback, (SCM ,SCM)); + DECLARE_SCHEME_CALLBACK (force_hara_kiri_in_parent_callback, (SCM , SCM)); static void add_element (Grob *me, Grob *e); static bool has_interface (Grob*); static void consider_suicide (Grob*me); diff --git a/lily/include/lily-guile-macros.hh b/lily/include/lily-guile-macros.hh index 526d1ec226..221bcef76c 100644 --- a/lily/include/lily-guile-macros.hh +++ b/lily/include/lily-guile-macros.hh @@ -125,7 +125,7 @@ SCM FNAME ## _proc; \ void \ INITPREFIX ## init () \ { \ - FNAME ## _proc = scm_c_define_gsubr (PRIMNAME,REQ, OPT, VAR, \ + FNAME ## _proc = scm_c_define_gsubr (PRIMNAME, REQ, OPT, VAR, \ (Scheme_function_unknown) FNAME); \ ly_add_function_documentation (FNAME ## _proc, PRIMNAME, #ARGLIST, \ DOCSTRING); \ diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh index 01c6646a06..b71535aa1d 100644 --- a/lily/include/lily-guile.hh +++ b/lily/include/lily-guile.hh @@ -141,8 +141,8 @@ typedef SCM (*Scheme_function_unknown) (); #if __GNUC__ > 2 || __GNUC_MINOR__ >= 96 typedef SCM (*Scheme_function_0) (); typedef SCM (*Scheme_function_1) (SCM); -typedef SCM (*Scheme_function_2) (SCM,SCM); -typedef SCM (*Scheme_function_3) (SCM,SCM, SCM); +typedef SCM (*Scheme_function_2) (SCM, SCM); +typedef SCM (*Scheme_function_3) (SCM, SCM, SCM); #else typedef SCM (*Scheme_function_0) (...); typedef SCM (*Scheme_function_1) (...); diff --git a/lily/include/lily-lexer.hh b/lily/include/lily-lexer.hh index a767f1dcbc..fbc06b6367 100644 --- a/lily/include/lily-lexer.hh +++ b/lily/include/lily-lexer.hh @@ -21,7 +21,7 @@ void set_lexer (); class Lily_lexer : public Includable_lexer { - DECLARE_SMOBS(Lily_lexer,); + DECLARE_SMOBS(Lily_lexer, ); public: SCM scopes_; @@ -57,7 +57,7 @@ public: void add_lexed_char (int); void prepare_for_next_token (); - int try_special_identifiers (SCM* ,SCM); + int try_special_identifiers (SCM* , SCM); Input here_input () const; void add_scope (SCM); diff --git a/lily/include/lilypond-key.hh b/lily/include/lilypond-key.hh index 2fd514e487..24d0a3f36b 100644 --- a/lily/include/lilypond-key.hh +++ b/lily/include/lilypond-key.hh @@ -1,5 +1,5 @@ /* - lilypond-key.hh -- declare Lilypond_{grob,context}_key + lilypond-key.hh -- declare Lilypond_{grob, context}_key source file of the GNU LilyPond music typesetter diff --git a/lily/include/moment.hh b/lily/include/moment.hh index aebad456e0..953a89a008 100644 --- a/lily/include/moment.hh +++ b/lily/include/moment.hh @@ -19,7 +19,7 @@ */ class Moment { - DECLARE_SIMPLE_SMOBS (Moment,); + DECLARE_SIMPLE_SMOBS (Moment, ); public: Moment (); Moment (int m); @@ -56,8 +56,8 @@ IMPLEMENT_ARITHMETIC_OPERATOR (Moment, / ); IMPLEMENT_ARITHMETIC_OPERATOR (Moment, * ); -DECLARE_UNSMOB(Moment,moment); -int compare (Moment const&,Moment const&); +DECLARE_UNSMOB(Moment, moment); +int compare (Moment const&, Moment const&); INSTANTIATE_COMPARE (Moment const&, Moment::compare); Moment robust_scm2moment (SCM, Moment); diff --git a/lily/include/multi-measure-rest.hh b/lily/include/multi-measure-rest.hh index dc3955abd2..e277539be1 100644 --- a/lily/include/multi-measure-rest.hh +++ b/lily/include/multi-measure-rest.hh @@ -19,13 +19,13 @@ public: static bool has_interface (Grob*); DECLARE_SCHEME_CALLBACK (print, (SCM )); DECLARE_SCHEME_CALLBACK (percent, (SCM)); - static void add_column (Grob*,Item*); + static void add_column (Grob*, Item*); DECLARE_SCHEME_CALLBACK (set_spacing_rods, (SCM )); DECLARE_SCHEME_CALLBACK (centered_stencil, (SCM )); - static Stencil big_rest (Grob*,Real); - static Stencil symbol_stencil (Grob*,Real); - static Stencil church_rest (Grob*, Font_metric*, int,Real); + static Stencil big_rest (Grob*, Real); + static Stencil symbol_stencil (Grob*, Real); + static Stencil church_rest (Grob*, Font_metric*, int, Real); }; #endif /* MULTI_MEASURE_REST_HH */ diff --git a/lily/include/music-iterator.hh b/lily/include/music-iterator.hh index 4e54e49045..cc5da19c39 100644 --- a/lily/include/music-iterator.hh +++ b/lily/include/music-iterator.hh @@ -55,7 +55,7 @@ protected: Moment music_length_; Moment start_mom_; - DECLARE_SMOBS (Music_iterator,dummy); + DECLARE_SMOBS (Music_iterator, dummy); Music_iterator (Music_iterator const&); public: @@ -118,9 +118,9 @@ private: bool is_child_context (Context *me, Context *child); #define IMPLEMENT_CTOR_CALLBACK(Class) \ -LY_DEFINE_MEMBER_FUNCTION(Class,constructor, #Class "::constructor",\ - 0,0,0,\ - (),\ +LY_DEFINE_MEMBER_FUNCTION(Class, constructor, #Class "::constructor", \ + 0, 0, 0, \ + (), \ "")\ { \ SCM val = (new Class)->self_scm(); \ diff --git a/lily/include/music-sequence.hh b/lily/include/music-sequence.hh index f96d45aba9..28d99eb022 100644 --- a/lily/include/music-sequence.hh +++ b/lily/include/music-sequence.hh @@ -31,7 +31,7 @@ public: }; SCM ly_transpose_key_alist (SCM l, SCM pit); -Pitch music_list_to_relative (SCM l,Pitch p, bool ret_first); +Pitch music_list_to_relative (SCM l, Pitch p, bool ret_first); void transpose_music_list (SCM , Pitch); void compress_music_list (SCM, Moment); diff --git a/lily/include/music-wrapper.hh b/lily/include/music-wrapper.hh index 68f9d9a8d0..0d41c41d28 100644 --- a/lily/include/music-wrapper.hh +++ b/lily/include/music-wrapper.hh @@ -24,7 +24,7 @@ class Music_wrapper : public Music public: Music_wrapper (SCM); VIRTUAL_COPY_CONSTRUCTOR (Music, Music_wrapper); - DECLARE_SCHEME_CALLBACK(length_callback,(SCM)); + DECLARE_SCHEME_CALLBACK(length_callback, (SCM)); DECLARE_SCHEME_CALLBACK(start_callback, (SCM)); Music *element () const; diff --git a/lily/include/music.hh b/lily/include/music.hh index b080f7eb93..12db78facd 100644 --- a/lily/include/music.hh +++ b/lily/include/music.hh @@ -32,7 +32,7 @@ public: bool internal_is_music_type (SCM) const; int duration_log () const; - DECLARE_SCHEME_CALLBACK(relative_callback,(SCM,SCM)); + DECLARE_SCHEME_CALLBACK(relative_callback, (SCM, SCM)); Pitch to_relative_octave (Pitch); Pitch generic_to_relative_octave (Pitch); String name () const; @@ -47,7 +47,7 @@ public: void compress (Moment factor); protected: - DECLARE_SMOBS (Music,); + DECLARE_SMOBS (Music, ); SCM immutable_property_alist_; SCM mutable_property_alist_; protected: @@ -57,7 +57,7 @@ protected: }; DECLARE_TYPE_P(Music); -DECLARE_UNSMOB(Music,music); +DECLARE_UNSMOB(Music, music); Music *make_music_by_name (SCM sym); SCM ly_music_deep_copy (SCM); diff --git a/lily/include/note-collision.hh b/lily/include/note-collision.hh index 6602376ad7..82329d6328 100644 --- a/lily/include/note-collision.hh +++ b/lily/include/note-collision.hh @@ -34,7 +34,7 @@ public: static Drul_array< Link_array > get_clash_groups (Grob *me); DECLARE_SCHEME_CALLBACK (force_shift_callback, (SCM element, SCM axis)); static void do_shifts (Grob*); - static void add_column (Grob*me,Grob*ncol); + static void add_column (Grob*me, Grob*ncol); static bool has_interface(Grob*); }; #endif // COLLISION_HH diff --git a/lily/include/note-column.hh b/lily/include/note-column.hh index de5d5f7c24..32eec6af31 100644 --- a/lily/include/note-column.hh +++ b/lily/include/note-column.hh @@ -26,12 +26,12 @@ public: static Grob * accidentals (Grob*me); static Slice head_positions_interval (Grob* me); static Direction static_dir (Grob*); - static void translate_rests (Grob*me,int dy); + static void translate_rests (Grob*me, int dy); static Grob *first_head (Grob*me); static Grob *get_rest (Grob*me); - static void set_stem (Grob*me,Grob*); - static void set_dotcol (Grob*me,Grob*); - static void add_head (Grob*me,Grob*); + static void set_stem (Grob*me, Grob*); + static void set_dotcol (Grob*me, Grob*); + static void add_head (Grob*me, Grob*); static bool has_rests (Grob*me); static bool has_interface (Grob*); diff --git a/lily/include/note-head.hh b/lily/include/note-head.hh index 89d5667983..0033f7866e 100644 --- a/lily/include/note-head.hh +++ b/lily/include/note-head.hh @@ -21,7 +21,7 @@ class Note_head public: DECLARE_SCHEME_CALLBACK (print, (SCM )); DECLARE_SCHEME_CALLBACK (brew_ez_stencil, (SCM)); - DECLARE_SCHEME_CALLBACK (extent, (SCM,SCM)); + DECLARE_SCHEME_CALLBACK (extent, (SCM, SCM)); static bool has_interface (Grob*); static Real stem_attachment_coordinate (Grob *, Axis a); static int get_balltype (Grob*) ; diff --git a/lily/include/object-key-dumper.hh b/lily/include/object-key-dumper.hh index 0f259ff13c..5ee61408e9 100644 --- a/lily/include/object-key-dumper.hh +++ b/lily/include/object-key-dumper.hh @@ -27,7 +27,7 @@ class Object_key_dumper SCM key_serial (int); SCM serialize_key (Object_key const *); - DECLARE_SMOBS (Object_key_dumper,); + DECLARE_SMOBS (Object_key_dumper, ); public: Object_key_dumper (); SCM get_file_contents () const; diff --git a/lily/include/object-key-undumper.hh b/lily/include/object-key-undumper.hh index ce24609e9c..95af156eec 100644 --- a/lily/include/object-key-undumper.hh +++ b/lily/include/object-key-undumper.hh @@ -17,7 +17,7 @@ typedef std::map Int_to_key_map; struct Object_key_undumper { - DECLARE_SMOBS(Object_key_undumper,); + DECLARE_SMOBS(Object_key_undumper, ); Int_to_key_map keys_; public: void parse_contents (SCM); diff --git a/lily/include/object-key.hh b/lily/include/object-key.hh index d43a25a8e7..755b72f122 100644 --- a/lily/include/object-key.hh +++ b/lily/include/object-key.hh @@ -21,7 +21,7 @@ */ class Object_key { - DECLARE_SMOBS(Object_key,); + DECLARE_SMOBS(Object_key, ); protected: Object_key(); diff --git a/lily/include/output-def.hh b/lily/include/output-def.hh index b5c60c0c59..2b0a0aadbc 100644 --- a/lily/include/output-def.hh +++ b/lily/include/output-def.hh @@ -40,7 +40,7 @@ class Output_def { public: VIRTUAL_COPY_CONSTRUCTOR (Output_def, Output_def); - DECLARE_SMOBS (Output_def,); + DECLARE_SMOBS (Output_def, ); public: SCM scope_; Output_def * parent_; diff --git a/lily/include/paper-outputter.hh b/lily/include/paper-outputter.hh index ef2e300bf8..95b8fc038a 100644 --- a/lily/include/paper-outputter.hh +++ b/lily/include/paper-outputter.hh @@ -28,7 +28,7 @@ class Paper_outputter public: - DECLARE_SMOBS (Paper_outputter,); + DECLARE_SMOBS (Paper_outputter, ); public: SCM file (); diff --git a/lily/include/percent-repeat-item.hh b/lily/include/percent-repeat-item.hh index ec63aca5c9..6d6cf637c5 100644 --- a/lily/include/percent-repeat-item.hh +++ b/lily/include/percent-repeat-item.hh @@ -18,7 +18,7 @@ public: static bool has_interface (Grob*); DECLARE_SCHEME_CALLBACK (beat_slash, (SCM )); DECLARE_SCHEME_CALLBACK (double_percent, (SCM )); - static Stencil x_percent (Grob*,int,Real,Real ); + static Stencil x_percent (Grob*, int, Real, Real ); static Stencil brew_slash (Grob*); }; diff --git a/lily/include/pitch.hh b/lily/include/pitch.hh index fc02ef4fa0..8be2dc3404 100644 --- a/lily/include/pitch.hh +++ b/lily/include/pitch.hh @@ -48,13 +48,13 @@ public: int get_notename () const; int get_alteration () const; - Pitch (int octave, int notename,int accidental); + Pitch (int octave, int notename, int accidental); Pitch (); Pitch transposed (Pitch) const; Pitch to_relative_octave (Pitch) const; - static int compare (Pitch const&,Pitch const&); + static int compare (Pitch const&, Pitch const&); int steps () const; int semitone_pitch () const; @@ -62,7 +62,7 @@ public: String to_string () const; DECLARE_SCHEME_CALLBACK (less_p, (SCM a, SCM b)); - DECLARE_SIMPLE_SMOBS (Pitch,); + DECLARE_SIMPLE_SMOBS (Pitch, ); }; enum { @@ -79,7 +79,7 @@ enum { SCM ly_pitch_diff (SCM pitch, SCM root); SCM ly_pitch_transpose (SCM p, SCM delta); -DECLARE_UNSMOB(Pitch,pitch); +DECLARE_UNSMOB(Pitch, pitch); INSTANTIATE_COMPARE (Pitch, Pitch::compare); diff --git a/lily/include/repeated-music.hh b/lily/include/repeated-music.hh index 05ef3e58c7..ce702fa2af 100644 --- a/lily/include/repeated-music.hh +++ b/lily/include/repeated-music.hh @@ -54,7 +54,7 @@ public: /* How often do we repeat? */ static int repeat_count (Music*); - DECLARE_SCHEME_CALLBACK(relative_callback,(SCM,SCM)); + DECLARE_SCHEME_CALLBACK(relative_callback, (SCM, SCM)); static Moment body_get_length (Music*); static Moment alternatives_get_length (Music *, bool fold); diff --git a/lily/include/rest-collision.hh b/lily/include/rest-collision.hh index 7171c0ceb6..3da35e3764 100644 --- a/lily/include/rest-collision.hh +++ b/lily/include/rest-collision.hh @@ -19,7 +19,7 @@ class Rest_collision { public: - static void add_column (Grob*me,Grob*); + static void add_column (Grob*me, Grob*); static bool has_interface (Grob*); DECLARE_SCHEME_CALLBACK (force_shift_callback, (SCM element, SCM axis)); diff --git a/lily/include/rest.hh b/lily/include/rest.hh index 3e7c4e8e4f..9513d8c82a 100644 --- a/lily/include/rest.hh +++ b/lily/include/rest.hh @@ -21,8 +21,8 @@ public: static bool has_interface (Grob*); static String glyph_name (Grob*, int, String, bool); static SCM brew_internal_stencil (SCM, bool); - DECLARE_SCHEME_CALLBACK (extent_callback, (SCM,SCM)); - DECLARE_SCHEME_CALLBACK (polyphonic_offset_callback, (SCM,SCM)); + DECLARE_SCHEME_CALLBACK (extent_callback, (SCM, SCM)); + DECLARE_SCHEME_CALLBACK (polyphonic_offset_callback, (SCM, SCM)); DECLARE_SCHEME_CALLBACK (print, (SCM )); }; #endif // REST_HH diff --git a/lily/include/rhythmic-head.hh b/lily/include/rhythmic-head.hh index f50cccb12d..12cbf575a0 100644 --- a/lily/include/rhythmic-head.hh +++ b/lily/include/rhythmic-head.hh @@ -17,7 +17,7 @@ class Rhythmic_head { public: static int duration_log (Grob*); - static void set_dots (Grob*,Item *); + static void set_dots (Grob*, Item *); static Item * get_stem (Grob*) ; static Item * get_dots (Grob*) ; static int dot_count (Grob*) ; diff --git a/lily/include/score-engraver.hh b/lily/include/score-engraver.hh index af67e0bebd..0f8deada9c 100644 --- a/lily/include/score-engraver.hh +++ b/lily/include/score-engraver.hh @@ -25,7 +25,7 @@ class Score_engraver : public virtual Score_translator, Paper_score * pscore_; void make_columns (); - void set_columns (Paper_column*,Paper_column*); + void set_columns (Paper_column*, Paper_column*); void typeset_all (); protected: /* Score_translator */ diff --git a/lily/include/separation-item.hh b/lily/include/separation-item.hh index dce3d940cd..5573e13368 100644 --- a/lily/include/separation-item.hh +++ b/lily/include/separation-item.hh @@ -16,12 +16,12 @@ struct Separation_item { static bool has_interface (Grob*); - static Interval conditional_width (Grob*,Grob*) ; + static Interval conditional_width (Grob*, Grob*) ; static Interval width (Grob*) ; static Interval relative_width (Grob*, Grob*) ; - static Grob*extremal_break_aligned_grob (Grob*,Direction, Interval*); - static void add_item (Grob*,Item*); - static void add_conditional_item (Grob*,Grob*); + static Grob*extremal_break_aligned_grob (Grob*, Direction, Interval*); + static void add_item (Grob*, Item*); + static void add_conditional_item (Grob*, Grob*); }; #endif /* SINGLE_MALT_GROUPING_ITEM_HH */ diff --git a/lily/include/side-position-interface.hh b/lily/include/side-position-interface.hh index 5ebebc36b6..5bf8c02f82 100644 --- a/lily/include/side-position-interface.hh +++ b/lily/include/side-position-interface.hh @@ -32,7 +32,7 @@ public: static Axis get_axis (Grob*) ; static void set_axis (Grob*, Axis) ; static bool has_interface (Grob*) ; - static void add_support (Grob*,Grob*); + static void add_support (Grob*, Grob*); static void add_staff_support (Grob*); static Direction get_direction (Grob*); }; diff --git a/lily/include/slur.hh b/lily/include/slur.hh index 776ea422fd..242251c1b8 100644 --- a/lily/include/slur.hh +++ b/lily/include/slur.hh @@ -19,8 +19,8 @@ public: static void add_extra_encompass (Grob *me, Grob *col); DECLARE_SCHEME_CALLBACK (print, (SCM)); DECLARE_SCHEME_CALLBACK (after_line_breaking, (SCM)); - DECLARE_SCHEME_CALLBACK (height, (SCM,SCM)); - DECLARE_SCHEME_CALLBACK (outside_slur_callback, (SCM,SCM)); + DECLARE_SCHEME_CALLBACK (height, (SCM, SCM)); + DECLARE_SCHEME_CALLBACK (outside_slur_callback, (SCM, SCM)); static bool has_interface (Grob *); static Bezier get_curve (Grob*me); }; diff --git a/lily/include/smobs.hh b/lily/include/smobs.hh index e90231e7b5..b091bc3800 100644 --- a/lily/include/smobs.hh +++ b/lily/include/smobs.hh @@ -28,7 +28,7 @@ SCM smobbed_copy (). Simple smobs are created by adding the - DECLARE_SIMPLE_SMOBS(Classname,) to the declaration + DECLARE_SIMPLE_SMOBS(Classname, ) to the declaration 2. Complex smobs are objects that have an identity. These objects carry this identity in the form of a self_scm () method, which is a @@ -59,7 +59,7 @@ list = scm_cons (p->self_scm (), list); scm_gc_unprotect_object (p->self_scm ()); - Complex smobs are made with DECLARE_SMOBS (Classname,) in the class + Complex smobs are made with DECLARE_SMOBS (Classname, ) in the class declaration. CALLING INTERFACE @@ -115,7 +115,7 @@ public: \ private: -#define DECLARE_SMOBS(CL,dummy) \ +#define DECLARE_SMOBS(CL, dummy) \ DECLARE_BASE_SMOBS (CL) \ protected:\ virtual ~CL ();\ @@ -127,7 +127,7 @@ public: \ SCM self_scm () const { return self_scm_; } \ private: -#define DECLARE_UNSMOB(CL,name) \ +#define DECLARE_UNSMOB(CL, name) \ inline CL * \ unsmob_ ## name (SCM s) \ { \ diff --git a/lily/include/spaceable-grob.hh b/lily/include/spaceable-grob.hh index 87df8ec723..a338921710 100644 --- a/lily/include/spaceable-grob.hh +++ b/lily/include/spaceable-grob.hh @@ -17,7 +17,7 @@ struct Spaceable_grob { /// set a minimum distance static void add_rod (Grob*me, Grob * to, Real distance); - static void add_spring (Grob*me,Grob * to, Real dist, Real strength); + static void add_spring (Grob*me, Grob * to, Real dist, Real strength); static bool has_interface (Grob*); static void remove_interface (Grob*); static SCM get_minimum_distances (Grob*); diff --git a/lily/include/span-bar.hh b/lily/include/span-bar.hh index ac9c005f73..4b3f0b3d24 100644 --- a/lily/include/span-bar.hh +++ b/lily/include/span-bar.hh @@ -24,7 +24,7 @@ public: static bool has_interface (Grob*); static Interval get_spanned_interval (Grob*); - static void add_bar (Grob*,Grob*); + static void add_bar (Grob*, Grob*); static void evaluate_glyph (Grob*); static void evaluate_empty (Grob*); DECLARE_SCHEME_CALLBACK (width_callback, (SCM smob, SCM axis)); diff --git a/lily/include/spanner.hh b/lily/include/spanner.hh index f526858101..e7745cb528 100644 --- a/lily/include/spanner.hh +++ b/lily/include/spanner.hh @@ -52,7 +52,7 @@ public: void do_break (); Real spanner_length () const; - static int compare (Spanner * const &,Spanner * const &); + static int compare (Spanner * const &, Spanner * const &); virtual Grob* find_broken_piece (System*) const; virtual SCM do_derived_mark () const; static bool has_interface (Grob*); diff --git a/lily/include/spring.hh b/lily/include/spring.hh index 7a5c890b83..58b72feb0e 100644 --- a/lily/include/spring.hh +++ b/lily/include/spring.hh @@ -20,7 +20,7 @@ struct Spring_smob bool expand_only_b_; Real strength_; - DECLARE_SIMPLE_SMOBS(Spring_smob,dummy); + DECLARE_SIMPLE_SMOBS(Spring_smob, dummy); public: Spring_smob(); }; diff --git a/lily/include/staff-spacing.hh b/lily/include/staff-spacing.hh index 01888d7f04..1c90670de8 100644 --- a/lily/include/staff-spacing.hh +++ b/lily/include/staff-spacing.hh @@ -18,7 +18,7 @@ public: static Real next_notes_correction (Grob*, Grob*); static Real next_note_correction (Grob*, Grob*, Interval); static bool has_interface (Grob*); - static void get_spacing_params (Grob*,Real*,Real*); + static void get_spacing_params (Grob*, Real*, Real*); static Interval bar_y_positions (Grob*); }; diff --git a/lily/include/staff-symbol-referencer.hh b/lily/include/staff-symbol-referencer.hh index 9b5b74e0e9..6b5ec9e8c3 100644 --- a/lily/include/staff-symbol-referencer.hh +++ b/lily/include/staff-symbol-referencer.hh @@ -23,7 +23,7 @@ class Staff_symbol_referencer public: static bool has_interface (Grob*); static bool ugly_hack (Grob*); - static void set_position (Grob*,Real); + static void set_position (Grob*, Real); DECLARE_SCHEME_CALLBACK (callback, (SCM element, SCM axis)); /** @@ -34,13 +34,13 @@ public: static Real staff_space (Grob*); static Grob *get_staff_symbol (Grob*); static bool on_staffline (Grob*); - static bool on_staffline (Grob*,int); + static bool on_staffline (Grob*, int); static int line_count (Grob*); static Real get_position (Grob*); static Real staff_radius (Grob*); static int get_rounded_position (Grob*); }; -int compare_position (Grob *const&,Grob *const&); +int compare_position (Grob *const&, Grob *const&); #endif /* STAFF_SYMBOL_REFERENCER_HH */ diff --git a/lily/include/stem-tremolo.hh b/lily/include/stem-tremolo.hh index dd9a21a4d5..8c68e3b823 100644 --- a/lily/include/stem-tremolo.hh +++ b/lily/include/stem-tremolo.hh @@ -20,7 +20,7 @@ public: static bool has_interface (Grob*); DECLARE_SCHEME_CALLBACK (dim_callback, (SCM smob, SCM axis)); DECLARE_SCHEME_CALLBACK (print, (SCM )); - DECLARE_SCHEME_CALLBACK (height, (SCM,SCM)); + DECLARE_SCHEME_CALLBACK (height, (SCM, SCM)); static Stencil raw_stencil (Grob*); }; diff --git a/lily/include/stem.hh b/lily/include/stem.hh index bb2faea228..1c0616d2ae 100644 --- a/lily/include/stem.hh +++ b/lily/include/stem.hh @@ -27,7 +27,7 @@ public: static Stem_info get_stem_info (Grob *); static Real chord_start_y (Grob *); static Direction get_direction (Grob *); - static void set_stemend (Grob *,Real); + static void set_stemend (Grob *, Real); static Direction get_default_dir (Grob *); static Slice Stem::beam_multiplicity (Grob *); static Real thickness (Grob*); diff --git a/lily/include/stencil.hh b/lily/include/stencil.hh index 47abea6937..23621ecf8f 100644 --- a/lily/include/stencil.hh +++ b/lily/include/stencil.hh @@ -41,7 +41,7 @@ * Empty stencils have empty dimensions. If add_at_edge is used to init the stencil, we assume that - DIMENSIONS = (Interval (0,0),Interval (0,0) + DIMENSIONS = (Interval (0, 0), Interval (0, 0) */ class Stencil { @@ -56,7 +56,7 @@ class Stencil Box dim_; SCM expr_; - DECLARE_SIMPLE_SMOBS (Stencil,); + DECLARE_SIMPLE_SMOBS (Stencil, ); public: Stencil (Box, SCM s); Stencil (); @@ -65,7 +65,7 @@ public: SCM expr () const; /** - Set dimensions to empty, or to (Interval (0,0),Interval (0,0) */ + Set dimensions to empty, or to (Interval (0, 0), Interval (0, 0) */ void set_empty (bool); Stencil moved_to_edge (Axis a, Direction d, const Stencil &m, Real padding, Real minimum) const; @@ -75,19 +75,19 @@ public: void add_stencil (Stencil const &m); void translate (Offset); void align_to (Axis a, Real x); - void translate_axis (Real,Axis); + void translate_axis (Real, Axis); Interval extent (Axis) const; Box extent_box () const; bool is_empty () const; static SCM ly_get_stencil_extent (SCM mol, SCM axis); - static SCM ly_set_stencil_extent_x (SCM,SCM,SCM); - static SCM ly_stencil_combined_at_edge (SCM,SCM,SCM,SCM,SCM); + static SCM ly_set_stencil_extent_x (SCM, SCM, SCM); + static SCM ly_stencil_combined_at_edge (SCM, SCM, SCM, SCM, SCM); }; -DECLARE_UNSMOB(Stencil,stencil); +DECLARE_UNSMOB(Stencil, stencil); SCM fontify_atom (Font_metric const*, SCM atom); void interpret_stencil_expression (SCM expr, diff --git a/lily/include/system-start-delimiter.hh b/lily/include/system-start-delimiter.hh index 3626ffff2c..dfa2c60a57 100644 --- a/lily/include/system-start-delimiter.hh +++ b/lily/include/system-start-delimiter.hh @@ -25,9 +25,9 @@ public: static bool has_interface (Grob*); DECLARE_SCHEME_CALLBACK (after_line_breaking, (SCM )); static void try_collapse (Grob*); - static Stencil staff_bracket (Grob*,Real) ; - static Stencil staff_brace (Grob*,Real) ; - static Stencil simple_bar (Grob*,Real) ; + static Stencil staff_bracket (Grob*, Real) ; + static Stencil staff_brace (Grob*, Real) ; + static Stencil simple_bar (Grob*, Real) ; }; #endif /* SYSTEM_START_DELIMITER_HH */ diff --git a/lily/include/tie-column.hh b/lily/include/tie-column.hh index bbc4ef6ebe..530c845fb9 100644 --- a/lily/include/tie-column.hh +++ b/lily/include/tie-column.hh @@ -18,7 +18,7 @@ class Tie_column { public: static bool has_interface (Grob*); - static void add_tie (Grob*me,Grob*); + static void add_tie (Grob*me, Grob*); DECLARE_SCHEME_CALLBACK (after_line_breaking, (SCM)); static void set_directions (Grob*me); static void old_directions (Grob*me); diff --git a/lily/include/tie.hh b/lily/include/tie.hh index afebbc2285..21a8100703 100644 --- a/lily/include/tie.hh +++ b/lily/include/tie.hh @@ -17,11 +17,11 @@ class Tie { public: - static void set_head (Grob*,Direction, Grob*head); + static void set_head (Grob*, Direction, Grob*head); static void set_interface (Grob*); static bool has_interface (Grob*); static void set_direction (Grob*); - static Grob * head (Grob*,Direction) ; + static Grob * head (Grob*, Direction) ; static Real get_position (Grob*) ; DECLARE_SCHEME_CALLBACK (print, (SCM )); static Direction get_default_dir (Grob*) ; diff --git a/lily/include/time-signature.hh b/lily/include/time-signature.hh index 8780f6d932..449d1ece1e 100644 --- a/lily/include/time-signature.hh +++ b/lily/include/time-signature.hh @@ -20,8 +20,8 @@ struct Time_signature { static bool has_interface (Grob*); - static Stencil special_time_signature (Grob*,SCM,int,int) ; - static Stencil numbered_time_signature (Grob*,int, int); + static Stencil special_time_signature (Grob*, SCM, int, int) ; + static Stencil numbered_time_signature (Grob*, int, int); DECLARE_SCHEME_CALLBACK (print, (SCM )); }; #endif // METER_HH diff --git a/lily/include/translator.hh b/lily/include/translator.hh index ae3647d98d..f7dcdf8e7f 100644 --- a/lily/include/translator.hh +++ b/lily/include/translator.hh @@ -94,30 +94,30 @@ ADD_GLOBAL_CTOR (_ ## T ## _adder); -#define ADD_TRANSLATOR(classname,desc,grobs,accepted,acked,read,write) \ +#define ADD_TRANSLATOR(classname, desc, grobs, accepted, acked, read, write) \ 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 ())), \ + /* 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; \ @@ -128,5 +128,5 @@ classname::static_translator_description () const \ void add_translator (Translator*trans); Translator*get_translator (SCM s); -DECLARE_UNSMOB(Translator,translator); +DECLARE_UNSMOB(Translator, translator); #endif // TRANSLATOR_HH diff --git a/lily/include/tuplet-bracket.hh b/lily/include/tuplet-bracket.hh index b0ae760f7c..ebedc328e0 100644 --- a/lily/include/tuplet-bracket.hh +++ b/lily/include/tuplet-bracket.hh @@ -18,10 +18,10 @@ public: DECLARE_SCHEME_CALLBACK (print, (SCM )); static bool has_interface (Grob*); - static void add_column (Grob*me,Item*); - static void add_beam (Grob*me,Grob*); + static void add_column (Grob*me, Item*); + static void add_beam (Grob*me, Grob*); static Grob *parallel_beam (Grob *me, Link_array const&cols, bool *equally_long); - static void calc_position_and_height (Grob*,Real*,Real *dy); + static void calc_position_and_height (Grob*, Real*, Real *dy); static Stencil make_bracket (Grob *me, Axis protusion_axis, Offset dz, Drul_array height, Interval gap, Drul_array widen, diff --git a/lily/include/tweak-registration.hh b/lily/include/tweak-registration.hh index f0aa5f2c8c..540336f915 100644 --- a/lily/include/tweak-registration.hh +++ b/lily/include/tweak-registration.hh @@ -22,7 +22,7 @@ class Tweak_registry Tweak_map tweaks_; Object_key_undumper *undumper_; - DECLARE_SMOBS(Tweak_registry,); + DECLARE_SMOBS(Tweak_registry, ); public: Object_key_undumper *undumper() const; diff --git a/lily/include/type-swallow-translator.hh b/lily/include/type-swallow-translator.hh index 410169bff6..55a520d91a 100644 --- a/lily/include/type-swallow-translator.hh +++ b/lily/include/type-swallow-translator.hh @@ -31,12 +31,12 @@ struct TYPE ## _swallow_translator : public Type_swallow_translator { \ TYPE ## _swallow_translator :: TYPE ## _swallow_translator() {\ swallow_string_ = #TYPE; \ } \ -ADD_TRANSLATOR(TYPE ## _swallow_translator, \ - "Swallow events of " #TYPE " type.", \ - "", \ - "general-music",\ - "", \ - "", \ +ADD_TRANSLATOR(TYPE ## _swallow_translator, \ + "Swallow events of " #TYPE " type.", \ + "", \ + "general-music", \ + "", \ + "", \ ""); #endif // TYPESWALLOW_GRAV_HH diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc index e9425c48df..531eb9b346 100644 --- a/lily/key-engraver.cc +++ b/lily/key-engraver.cc @@ -73,7 +73,7 @@ Key_engraver::create_key (bool def) && !scm_is_eq (last, key)) { cancellation_ = make_item ("KeyCancellation", key_ev_ ? key_ev_->self_scm () : SCM_EOL); - cancellation_->set_property ("old-accidentals",last); + cancellation_->set_property ("old-accidentals", last); cancellation_->set_property ("c0-position", get_property ("middleCPosition")); @@ -85,7 +85,7 @@ Key_engraver::create_key (bool def) { SCM vis = get_property ("explicitKeySignatureVisibility"); if (ly_c_procedure_p (vis)) - item_->set_property ("break-visibility",vis); + item_->set_property ("break-visibility", vis); } } @@ -186,7 +186,7 @@ Key_engraver::initialize () context ()->set_property ("keySignature", SCM_EOL); context ()->set_property ("lastKeySignature", SCM_EOL); - Pitch p (0,0,0); + Pitch p (0, 0, 0); context ()->set_property ("tonic", p.smobbed_copy ()); } diff --git a/lily/key-performer.cc b/lily/key-performer.cc index 887c68488d..e96c713ca2 100644 --- a/lily/key-performer.cc +++ b/lily/key-performer.cc @@ -95,6 +95,6 @@ Key_performer::try_music (Music* ev) } ADD_TRANSLATOR (Key_performer, - "","", + "", "", "key-change-event", - "","",""); + "", "", ""); diff --git a/lily/key-signature-interface.cc b/lily/key-signature-interface.cc index 4cf2fc6bb3..8c4ca9134a 100644 --- a/lily/key-signature-interface.cc +++ b/lily/key-signature-interface.cc @@ -26,7 +26,7 @@ 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 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 */ /* @@ -88,7 +88,7 @@ alteration_pos (SCM what, int alter, int c0p) TODO - space the `natural' signs wider */ -MAKE_SCHEME_CALLBACK (Key_signature_interface,print,1); +MAKE_SCHEME_CALLBACK (Key_signature_interface, print, 1); SCM Key_signature_interface::print (SCM smob) { diff --git a/lily/kpath-scheme.cc b/lily/kpath-scheme.cc index 8275c8b203..8990660d02 100644 --- a/lily/kpath-scheme.cc +++ b/lily/kpath-scheme.cc @@ -47,7 +47,7 @@ extern "C" { LY_DEFINE (ly_find_file, "ly:find-file", 1, 0, 0, (SCM name), - "Return the absolute file name of @var{name}," + "Return the absolute file name of @var{name}, " "or @code{#f} if not found.") { SCM_ASSERT_TYPE (scm_is_string (name), name, SCM_ARG1, __FUNCTION__, "string"); @@ -62,7 +62,7 @@ LY_DEFINE (ly_find_file, "ly:find-file", LY_DEFINE (ly_kpathsea_find_file, "ly:kpathsea-find-file", 1, 0, 0, (SCM name), - "Return the absolute file name of @var{name}," + "Return the absolute file name of @var{name}, " "or @code{#f} if not found.") { SCM_ASSERT_TYPE (scm_is_string (name), name, SCM_ARG1, __FUNCTION__, "string"); diff --git a/lily/ledger-line-engraver.cc b/lily/ledger-line-engraver.cc index 3cb3050d86..dec122307b 100644 --- a/lily/ledger-line-engraver.cc +++ b/lily/ledger-line-engraver.cc @@ -44,7 +44,7 @@ void Ledger_line_engraver::finalize () { if (span_) - span_->set_bound (RIGHT,unsmob_grob (get_property ("currentCommandColumn"))); + span_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn"))); } diff --git a/lily/ledger-line-spanner.cc b/lily/ledger-line-spanner.cc index 5fe66f6b15..07d42d9043 100644 --- a/lily/ledger-line-spanner.cc +++ b/lily/ledger-line-spanner.cc @@ -99,7 +99,7 @@ typedef std::map > Ledger_requests; TODO: ledger share a lot of info. Lots of room to optimize away common use of objects/variables. */ -MAKE_SCHEME_CALLBACK (Ledger_line_spanner,print,1); +MAKE_SCHEME_CALLBACK (Ledger_line_spanner, print, 1); SCM Ledger_line_spanner::print (SCM smob) { @@ -219,7 +219,7 @@ Ledger_line_spanner::print (SCM smob) Interval accidental_size = g->extent (common[X_AXIS], X_AXIS); Real d = linear_combination (Drul_array (accidental_size[RIGHT], - head_size[LEFT]), + head_size[LEFT]), 0.0); left_shorten = (-ledger_size[LEFT] + d) >? 0 ; diff --git a/lily/lily-lexer.cc b/lily/lily-lexer.cc index bee0901b74..bc748f1f2d 100644 --- a/lily/lily-lexer.cc +++ b/lily/lily-lexer.cc @@ -39,8 +39,8 @@ static Keyword_ent the_key_tab[] = { {"drummode", DRUMMODE}, {"drums", DRUMS}, {"description", DESCRIPTION}, - {"figures",FIGURES}, - {"figuremode",FIGUREMODE}, + {"figures", FIGURES}, + {"figuremode", FIGUREMODE}, {"grobdescriptions", GROBDESCRIPTIONS}, {"header", HEADER}, {"key", KEY}, diff --git a/lily/lily-parser-scheme.cc b/lily/lily-parser-scheme.cc index cc328a1225..32f4405beb 100644 --- a/lily/lily-parser-scheme.cc +++ b/lily/lily-parser-scheme.cc @@ -30,7 +30,7 @@ bool store_locations_global; LY_DEFINE (ly_set_point_and_click, "ly:set-point-and-click", 1, 0, 0, (SCM what), "Set the options for Point-and-click source specials output. The\n" -"argument is a symbol. Possible options are @code{none} (no source specials),\n" +"argument is a symbol. Possible options are @code{none} (no source specials), \n" "@code{line} and @code{line-column}") { /* UGH. */ diff --git a/lily/lilypond-key.cc b/lily/lilypond-key.cc index ab6f99dc24..e641090375 100644 --- a/lily/lilypond-key.cc +++ b/lily/lilypond-key.cc @@ -1,5 +1,5 @@ /* - lilypond-key.cc -- implement Lilypond_{grob,context}_key + lilypond-key.cc -- implement Lilypond_{grob, context}_key source file of the GNU LilyPond music typesetter diff --git a/lily/line-interface.cc b/lily/line-interface.cc index 58b8e378e3..ae458e4d36 100644 --- a/lily/line-interface.cc +++ b/lily/line-interface.cc @@ -30,7 +30,7 @@ Line_interface::make_dashed_line (Real thick, Offset from, Offset to, SCM_UNDEFINED); Box box; - box.add_point (Offset (0,0)); + box.add_point (Offset (0, 0)); box.add_point (to - from); box[X_AXIS].widen (thick/2); @@ -66,7 +66,7 @@ Stencil Line_interface::line (Grob *me, Offset from, Offset to) { Real thick = Staff_symbol_referencer::line_thickness (me) - * robust_scm2double (me->get_property ("thickness"),1); + * robust_scm2double (me->get_property ("thickness"), 1); SCM type = me->get_property ("style"); @@ -95,7 +95,7 @@ Line_interface::line (Grob *me, Offset from, Offset to) } ADD_INTERFACE (Line_interface, "line-interface", - "Generic line objects. Any object using lines supports this. Normally," + "Generic line objects. Any object using lines supports this. Normally, " "you get a straight line. If @code{dash-period} is defined, a dashed line is " "produced; the length of the dashes is tuned with " "@code{dash-fraction}. If the latter is set to 0, a dotted line is " diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc index 1359f31810..fe5dd3e127 100644 --- a/lily/line-spanner.cc +++ b/lily/line-spanner.cc @@ -47,7 +47,7 @@ zigzag_stencil (Grob *me, scm_make_real (dy), SCM_UNDEFINED); Box b; - b.add_point (Offset (0,0)); + b.add_point (Offset (0, 0)); b.add_point (dz); b[X_AXIS].widen (thick/2); b[Y_AXIS].widen (thick/2); @@ -123,7 +123,7 @@ Line_spanner::line_stencil (Grob *me, Stencil mol; do - mol.add_at_edge (X_AXIS, RIGHT, m, 0,0); + mol.add_at_edge (X_AXIS, RIGHT, m, 0, 0); while (m.extent (X_AXIS).length () && mol.extent (X_AXIS).length () + m.extent (X_AXIS).length () < dz[X_AXIS]); @@ -282,7 +282,7 @@ Line_spanner::print (SCM smob) ofxy = dxy * (off/dxy.length ()); dxy -= 2*ofxy; - Stencil line = line_stencil (me, Offset (0,0),dxy); + Stencil line = line_stencil (me, Offset (0, 0), dxy); line.translate_axis (bound[LEFT]->extent (bound[LEFT], X_AXIS).length ()/2, X_AXIS); line.translate (ofxy - my_off + his_off); diff --git a/lily/lookup.cc b/lily/lookup.cc index e7dd788ec8..da0ccde182 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 * | / * |/ * @@ -91,7 +91,7 @@ Lookup::dashed_slur (Bezier b, Real thick, Real dash) ly_quote_scm (l), SCM_UNDEFINED)); - Box box (Interval (0,0),Interval (0,0)); + Box box (Interval (0, 0), Interval (0, 0)); return Stencil (box, at); } @@ -109,7 +109,7 @@ Lookup::horizontal_line (Interval w, Real th) Box box ; box[X_AXIS] = w; - box[Y_AXIS] = Interval (-th/2,th/2); + box[Y_AXIS] = Interval (-th/2, th/2); return Stencil (box, at); } @@ -126,12 +126,12 @@ Lookup::filled_box (Box b) { SCM at = (scm_list_n (ly_symbol2scm ("filledbox"), scm_make_real (-b[X_AXIS][LEFT]), - scm_make_real (b[X_AXIS][RIGHT]), + scm_make_real (b[X_AXIS][RIGHT]), scm_make_real (-b[Y_AXIS][DOWN]), - scm_make_real (b[Y_AXIS][UP]), + scm_make_real (b[Y_AXIS][UP]), SCM_UNDEFINED)); - return Stencil (b,at); + return Stencil (b, at); } /* @@ -155,7 +155,7 @@ Lookup::filled_box (Box b) * | | | | | * | | | * x\_____/______________\_____/|_____v - * |(0,0) | + * |(0, 0) | * | | * | | * |<-------------------------->| @@ -181,7 +181,7 @@ Lookup::round_filled_box (Box b, Real blotdiameter) scm_make_real (blotdiameter), SCM_UNDEFINED)); - return Stencil (b,at); + return Stencil (b, at); } @@ -678,7 +678,7 @@ Lookup::bracket (Axis a, Interval iv, Real thick, Real protude, Real blot) b[other] = oi; m.add_stencil (round_filled_box (b, blot)); b[a] = Interval (iv[DOWN], iv[DOWN] + thick); - m.add_stencil (round_filled_box (b,blot)); + m.add_stencil (round_filled_box (b, blot)); return m; } diff --git a/lily/lyric-combine-music-iterator.cc b/lily/lyric-combine-music-iterator.cc index 56f2b0c579..d053fa1859 100644 --- a/lily/lyric-combine-music-iterator.cc +++ b/lily/lyric-combine-music-iterator.cc @@ -28,7 +28,7 @@ protected: virtual bool ok () const; virtual void derived_mark () const; - virtual void derived_substitute (Context *,Context *) ; + virtual void derived_substitute (Context *, Context *) ; private: bool get_busy_status ()const ; bool melisma_busy (); @@ -99,12 +99,12 @@ Lyric_combine_music_iterator::derived_mark ()const } void -Lyric_combine_music_iterator::derived_substitute (Context *f,Context * t) +Lyric_combine_music_iterator::derived_substitute (Context *f, Context * t) { if (music_iter_) - music_iter_->substitute_outlet (f,t); + music_iter_->substitute_outlet (f, t); if (lyric_iter_) - lyric_iter_->substitute_outlet (f,t); + lyric_iter_->substitute_outlet (f, t); } Music* diff --git a/lily/lyric-combine-music.cc b/lily/lyric-combine-music.cc index 2775f7acab..a7766abbef 100644 --- a/lily/lyric-combine-music.cc +++ b/lily/lyric-combine-music.cc @@ -13,11 +13,11 @@ struct Lyric_combine_music { public: - DECLARE_SCHEME_CALLBACK(length_callback,(SCM)); + DECLARE_SCHEME_CALLBACK(length_callback, (SCM)); }; -MAKE_SCHEME_CALLBACK(Lyric_combine_music,length_callback,1); +MAKE_SCHEME_CALLBACK(Lyric_combine_music, length_callback, 1); SCM Lyric_combine_music::length_callback (SCM m) { diff --git a/lily/lyric-extender.cc b/lily/lyric-extender.cc index b7ef26d0e0..700fbf40cd 100644 --- a/lily/lyric-extender.cc +++ b/lily/lyric-extender.cc @@ -85,7 +85,7 @@ Lyric_extender::print (SCM smob) } -ADD_INTERFACE (Lyric_extender,"lyric-extender-interface", +ADD_INTERFACE (Lyric_extender, "lyric-extender-interface", "The extender is a simple line at the baseline of the lyric " "that helps show the length of a melissima (tied/slurred note).", "next thickness heads"); diff --git a/lily/lyric-hyphen.cc b/lily/lyric-hyphen.cc index 5cc8d26b0c..f98d5c446f 100644 --- a/lily/lyric-hyphen.cc +++ b/lily/lyric-hyphen.cc @@ -15,7 +15,7 @@ #include "paper-column.hh" #include "moment.hh" -MAKE_SCHEME_CALLBACK (Hyphen_spanner,print,1) +MAKE_SCHEME_CALLBACK (Hyphen_spanner, print, 1) SCM Hyphen_spanner::print (SCM smob) { @@ -70,7 +70,7 @@ Hyphen_spanner::print (SCM smob) space_left = space_left >? 0.0; - Box b (Interval (0, dl), Interval (h,h+th)); + Box b (Interval (0, dl), Interval (h, h+th)); Stencil dash_mol (Lookup::round_filled_box (b, 0.8 * lt)); Stencil total; @@ -86,7 +86,7 @@ Hyphen_spanner::print (SCM smob) } -MAKE_SCHEME_CALLBACK (Hyphen_spanner,set_spacing_rods,1); +MAKE_SCHEME_CALLBACK (Hyphen_spanner, set_spacing_rods, 1); SCM Hyphen_spanner::set_spacing_rods (SCM smob) { diff --git a/lily/lyric-performer.cc b/lily/lyric-performer.cc index 45aeb42374..82e9ff6fdd 100644 --- a/lily/lyric-performer.cc +++ b/lily/lyric-performer.cc @@ -70,4 +70,4 @@ Lyric_performer::try_music (Music* req) return false; } -ADD_TRANSLATOR (Lyric_performer,"","","lyric-event","","",""); +ADD_TRANSLATOR (Lyric_performer, "", "", "lyric-event", "", "", ""); diff --git a/lily/main.cc b/lily/main.cc index 514d266d07..cbab023671 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -144,7 +144,7 @@ static Long_option_init options_static[] = {0, "version", 'v', _i ("print version number")}, {0, "verbose", 'V', _i ("be verbose")}, {0, "warranty", 'w', _i ("show warranty and copyright")}, - {0,0,0,0} + {0, 0, 0, 0} }; static void @@ -337,7 +337,7 @@ static void add_output_format (String format) { if (output_format_global != "") - output_format_global += ","; + output_format_global += ", "; output_format_global += format; } diff --git a/lily/measure-grouping-spanner.cc b/lily/measure-grouping-spanner.cc index 1c9e03fbdf..bc420d22a1 100644 --- a/lily/measure-grouping-spanner.cc +++ b/lily/measure-grouping-spanner.cc @@ -54,7 +54,7 @@ Measure_grouping::print (SCM grob) return m.smobbed_copy (); } -ADD_INTERFACE (Measure_grouping,"measure-grouping-interface", +ADD_INTERFACE (Measure_grouping, "measure-grouping-interface", "This object indicates groups of beats. " "Valid choices for @code{style} are @code{bracket} and @code{triangle}.", "thickness style height"); diff --git a/lily/modified-font-metric.cc b/lily/modified-font-metric.cc index 918701ecc6..79ff5ea2f1 100644 --- a/lily/modified-font-metric.cc +++ b/lily/modified-font-metric.cc @@ -207,7 +207,7 @@ Modified_font_metric::text_dimension (String text) const if (ydims.is_empty ()) ydims = Interval (0, 0); - b = Box(Interval(0,w), ydims); + b = Box(Interval(0, w), ydims); return b; } diff --git a/lily/moment-scheme.cc b/lily/moment-scheme.cc index 45754aba54..454e60fa30 100644 --- a/lily/moment-scheme.cc +++ b/lily/moment-scheme.cc @@ -17,7 +17,7 @@ LY_DEFINE (ly_make_moment, "ly:make-moment", "\n" "\n" "Moment is a point in musical time. " - "It is consists of a pair of rationals (@var{m},@var{g}), " + "It is consists of a pair of rationals (@var{m}, @var{g}), " "where @var{m} is the timing for the main\n" "notes, and @var{g} the timing for grace notes. " "In absence of grace notes, @var{g} is zero.\n") @@ -54,7 +54,7 @@ LY_DEFINE (ly_add_moment, "ly:add-moment", return (*ma + *mb).smobbed_copy (); } -LY_DEFINE (ly_mul_moment,"ly:mul-moment", +LY_DEFINE (ly_mul_moment, "ly:mul-moment", 2, 0, 0, (SCM a, SCM b), "Multiply two moments.") { @@ -65,7 +65,7 @@ LY_DEFINE (ly_mul_moment,"ly:mul-moment", return (*ma * *mb).smobbed_copy (); } -LY_DEFINE (ly_div_moment,"ly:div-moment", +LY_DEFINE (ly_div_moment, "ly:div-moment", 2, 0, 0, (SCM a, SCM b), "Divide two moments.") { @@ -76,7 +76,7 @@ LY_DEFINE (ly_div_moment,"ly:div-moment", return (*ma / *mb).smobbed_copy (); } -LY_DEFINE (ly_moment_main_numerator,"ly:moment-main-numerator", +LY_DEFINE (ly_moment_main_numerator, "ly:moment-main-numerator", 1, 0, 0, (SCM mom), "Extract numerator from main timing.") { @@ -86,7 +86,7 @@ LY_DEFINE (ly_moment_main_numerator,"ly:moment-main-numerator", return scm_from_int (ma->main_part_.numerator ()); } -LY_DEFINE (ly_moment_main_denominator,"ly:moment-main-denominator", +LY_DEFINE (ly_moment_main_denominator, "ly:moment-main-denominator", 1, 0, 0, (SCM mom), "Extract denominator from main timing.") { @@ -96,7 +96,7 @@ LY_DEFINE (ly_moment_main_denominator,"ly:moment-main-denominator", return scm_from_int (ma->main_part_.denominator ()); } -LY_DEFINE (ly_moment_less_p,"ly:momentself_scm () ); SCM t = e->get_property ("text"); SCM dir = e->get_property ("direction"); - sp->set_property ("text",t); + sp->set_property ("text", t); if (is_direction (dir)) - sp->set_property ("direction",dir); + sp->set_property ("direction", dir); numbers_.push (sp); } diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc index b8f7448e36..0d95c82f8a 100644 --- a/lily/multi-measure-rest.cc +++ b/lily/multi-measure-rest.cc @@ -22,7 +22,7 @@ #include "lookup.hh" #include "separation-item.hh" -MAKE_SCHEME_CALLBACK (Multi_measure_rest,percent,1); +MAKE_SCHEME_CALLBACK (Multi_measure_rest, percent, 1); SCM Multi_measure_rest::percent (SCM smob) { @@ -58,13 +58,13 @@ Multi_measure_rest::percent (SCM smob) */ x_off += sp_iv.length ()/ 2; - r.translate_axis (x_off,X_AXIS); + r.translate_axis (x_off, X_AXIS); return r.smobbed_copy (); } -MAKE_SCHEME_CALLBACK (Multi_measure_rest,print,1); +MAKE_SCHEME_CALLBACK (Multi_measure_rest, print, 1); SCM Multi_measure_rest::print (SCM smob) { @@ -312,10 +312,10 @@ Multi_measure_rest::set_spacing_rods (SCM smob) Item *lb = li->find_prebroken_piece (RIGHT); Item *rb = ri->find_prebroken_piece (LEFT); - Item *combinations[4][2] = {{li,ri}, - {lb,ri}, - {li,rb}, - {lb,rb}}; + Item *combinations[4][2] = {{li, ri}, + {lb, ri}, + {li, rb}, + {lb, rb}}; Real sym_width = symbol_stencil (me, 0.0).extent (X_AXIS).length (); @@ -343,7 +343,7 @@ Multi_measure_rest::set_spacing_rods (SCM smob) return SCM_UNSPECIFIED; } -ADD_INTERFACE (Multi_measure_rest,"multi-measure-rest-interface", +ADD_INTERFACE (Multi_measure_rest, "multi-measure-rest-interface", "A rest that spans a whole number of measures.", "expand-limit measure-count hair-thickness thick-thickness use-breve-rest minimum-length"); diff --git a/lily/music-constructor.cc b/lily/music-constructor.cc index 2f2f5bd01b..587070354b 100644 --- a/lily/music-constructor.cc +++ b/lily/music-constructor.cc @@ -14,7 +14,7 @@ #include "warn.hh" -static std::map *ctors_map_; +static std::map *ctors_map_; void add_music_ctor (String s, Music_ctor c) diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc index 6e15c4b167..58e8597905 100644 --- a/lily/music-iterator.cc +++ b/lily/music-iterator.cc @@ -131,11 +131,11 @@ Music_iterator::substitute_outlet (Context *f, Context *t) { if (get_outlet () == f) set_context (t); - derived_substitute (f,t); + derived_substitute (f, t); } void -Music_iterator::derived_substitute (Context *,Context *) +Music_iterator::derived_substitute (Context *, Context *) { } diff --git a/lily/music-scheme.cc b/lily/music-scheme.cc index 2d1b935352..dc01ff7e4c 100644 --- a/lily/music-scheme.cc +++ b/lily/music-scheme.cc @@ -55,7 +55,7 @@ LY_DEFINE (ly_music_name, "ly:music-name", "Return the name of @var{music}.") { Music *m = unsmob_music (mus); - SCM_ASSERT_TYPE (m, mus, SCM_ARG1, __FUNCTION__ ,"music"); + SCM_ASSERT_TYPE (m, mus, SCM_ARG1, __FUNCTION__ , "music"); char const *nm = classname (m); return scm_makfrom0str (nm); @@ -91,7 +91,7 @@ LY_DEFINE (ly_music_mutable_properties, "ly:music-mutable-properties", return m->get_property_alist (true); } -LY_DEFINE (ly_music_list_p,"ly:music-list?", +LY_DEFINE (ly_music_list_p, "ly:music-list?", 1, 0, 0, (SCM lst), "Type predicate: return true if @var{lst} is a list " "of music objects.") @@ -155,7 +155,7 @@ LY_DEFINE (ly_music_compress, "ly:music-compress", return sc->self_scm (); } -LY_DEFINE (ly_music_duration_length, "ly:music-duration-length", 1, 0,0, +LY_DEFINE (ly_music_duration_length, "ly:music-duration-length", 1, 0, 0, (SCM mus), "Extract the duration field from @var{mus}, and return the length.") { @@ -177,7 +177,7 @@ LY_DEFINE (ly_music_duration_length, "ly:music-duration-length", 1, 0,0, } -LY_DEFINE (ly_music_duration_compress, "ly:music-duration-compress", 2, 0,0, +LY_DEFINE (ly_music_duration_compress, "ly:music-duration-compress", 2, 0, 0, (SCM mus, SCM fact), "Compress @var{mus} by factor @var{fact}, which is a @code{Moment}.") { diff --git a/lily/music-sequence.cc b/lily/music-sequence.cc index 3c28145c21..f81a2069ad 100644 --- a/lily/music-sequence.cc +++ b/lily/music-sequence.cc @@ -56,7 +56,7 @@ Music_sequence::maximum_length (SCM l) return dur; } -MAKE_SCHEME_CALLBACK(Music_sequence,maximum_length_callback,1); +MAKE_SCHEME_CALLBACK(Music_sequence, maximum_length_callback, 1); SCM Music_sequence::maximum_length_callback (SCM m) { @@ -64,7 +64,7 @@ Music_sequence::maximum_length_callback (SCM m) return maximum_length (me->get_property ("elements")).smobbed_copy(); } -MAKE_SCHEME_CALLBACK(Music_sequence,cumulative_length_callback,1); +MAKE_SCHEME_CALLBACK(Music_sequence, cumulative_length_callback, 1); SCM Music_sequence::cumulative_length_callback (SCM m) { @@ -73,7 +73,7 @@ Music_sequence::cumulative_length_callback (SCM m) } -MAKE_SCHEME_CALLBACK(Music_sequence,minimum_start_callback,1); +MAKE_SCHEME_CALLBACK(Music_sequence, minimum_start_callback, 1); SCM Music_sequence::minimum_start_callback (SCM m) { @@ -81,7 +81,7 @@ Music_sequence::minimum_start_callback (SCM m) return minimum_start (me->get_property ("elements")).smobbed_copy(); } -MAKE_SCHEME_CALLBACK(Music_sequence,first_start_callback,1); +MAKE_SCHEME_CALLBACK(Music_sequence, first_start_callback, 1); SCM Music_sequence::first_start_callback (SCM m) { @@ -90,7 +90,7 @@ Music_sequence::first_start_callback (SCM m) } Pitch -music_list_to_relative (SCM l,Pitch p, bool ret_first) +music_list_to_relative (SCM l, Pitch p, bool ret_first) { Pitch first = p; int count = 0; @@ -168,7 +168,7 @@ Music_sequence::simultaneous_relative_callback (SCM music, SCM pitch) } -MAKE_SCHEME_CALLBACK(Music_sequence,event_chord_relative_callback,2); +MAKE_SCHEME_CALLBACK(Music_sequence, event_chord_relative_callback, 2); SCM Music_sequence::event_chord_relative_callback (SCM music, SCM pitch) { diff --git a/lily/music-wrapper-iterator.cc b/lily/music-wrapper-iterator.cc index ce0a6a3126..1db36ee580 100644 --- a/lily/music-wrapper-iterator.cc +++ b/lily/music-wrapper-iterator.cc @@ -30,10 +30,10 @@ Music_wrapper_iterator::derived_mark () const } void -Music_wrapper_iterator::derived_substitute (Context *f,Context *t) +Music_wrapper_iterator::derived_substitute (Context *f, Context *t) { if (child_iter_) - child_iter_->substitute_outlet (f,t); + child_iter_->substitute_outlet (f, t); } void diff --git a/lily/music-wrapper.cc b/lily/music-wrapper.cc index 55296be907..65c42eac6e 100644 --- a/lily/music-wrapper.cc +++ b/lily/music-wrapper.cc @@ -18,7 +18,7 @@ Music_wrapper::Music_wrapper (SCM x) start_callback_ = length_callback_proc; } -MAKE_SCHEME_CALLBACK(Music_wrapper,start_callback,1); +MAKE_SCHEME_CALLBACK(Music_wrapper, start_callback, 1); SCM Music_wrapper::start_callback (SCM m) { @@ -27,7 +27,7 @@ Music_wrapper::start_callback (SCM m) return elt->start_mom ().smobbed_copy (); } -MAKE_SCHEME_CALLBACK(Music_wrapper,length_callback,1); +MAKE_SCHEME_CALLBACK(Music_wrapper, length_callback, 1); SCM Music_wrapper::length_callback (SCM m) { diff --git a/lily/music.cc b/lily/music.cc index fb1982b7a0..d57a36bb1d 100644 --- a/lily/music.cc +++ b/lily/music.cc @@ -146,13 +146,13 @@ Music::print_smob (SCM s, SCM p, scm_print_state*) if (scm_is_symbol (nm) || scm_is_string (nm)) scm_display (nm, p); else - scm_puts (classname (m),p); + scm_puts (classname (m), p); /* Printing properties takes a lot of time, especially during backtraces. For inspecting, it is better to explicitly use an inspection function. */ - scm_puts (">",p); + scm_puts (">", p); return 1; } diff --git a/lily/new-fingering-engraver.cc b/lily/new-fingering-engraver.cc index dd2e724d85..1988cb4e2f 100644 --- a/lily/new-fingering-engraver.cc +++ b/lily/new-fingering-engraver.cc @@ -51,8 +51,8 @@ public: protected: virtual void stop_translation_timestep (); virtual void acknowledge_grob (Grob_info); - void add_fingering (Grob*, Music*,Music*); - void add_script (Grob*, Music*,Music*); + void add_fingering (Grob*, Music*, Music*); + void add_script (Grob*, Music*, Music*); void position_scripts (); }; @@ -219,7 +219,7 @@ New_fingering_engraver::position_scripts () else if (up_p && down_p) { int center = fingerings_.size () / 2; - down.concat (fingerings_.slice (0,center)); + down.concat (fingerings_.slice (0, center)); up.concat (fingerings_.slice (center, fingerings_.size ())); } else if (up_p) diff --git a/lily/new-lyric-combine-music-iterator.cc b/lily/new-lyric-combine-music-iterator.cc index 0ee78d3be8..105d78ef75 100644 --- a/lily/new-lyric-combine-music-iterator.cc +++ b/lily/new-lyric-combine-music-iterator.cc @@ -26,7 +26,7 @@ protected: virtual bool run_always ()const; virtual bool ok () const; virtual void derived_mark () const; - virtual void derived_substitute (Context *,Context *); + virtual void derived_substitute (Context *, Context *); private: bool start_new_syllable () ; void find_voice (); @@ -127,7 +127,7 @@ void New_lyric_combine_music_iterator::derived_substitute (Context *f, Context *t) { if (lyric_iter_) - lyric_iter_->substitute_outlet (f,t); + lyric_iter_->substitute_outlet (f, t); if (lyrics_context_ && lyrics_context_ == f) lyrics_context_ = t; if (music_context_ && music_context_ == f) diff --git a/lily/note-collision.cc b/lily/note-collision.cc index f70f2c1f2b..d2d806eca1 100644 --- a/lily/note-collision.cc +++ b/lily/note-collision.cc @@ -20,7 +20,7 @@ #include "side-position-interface.hh" #include "dot-column.hh" -MAKE_SCHEME_CALLBACK (Note_collision_interface,force_shift_callback,2); +MAKE_SCHEME_CALLBACK (Note_collision_interface, force_shift_callback, 2); SCM Note_collision_interface::force_shift_callback (SCM element_smob, SCM axis) @@ -309,7 +309,7 @@ Note_collision_interface::do_shifts (Grob* me) if (cg[d].size ()) { Grob *h = cg[d][0]; - wid = Note_column::first_head (h)->extent (h,X_AXIS).length () ; + wid = Note_column::first_head (h)->extent (h, X_AXIS).length () ; } } while (flip (&d) != UP); @@ -496,7 +496,7 @@ Note_collision_interface::forced_shift (Grob *me) } void -Note_collision_interface::add_column (Grob*me,Grob* ncol) +Note_collision_interface::add_column (Grob*me, Grob* ncol) { ncol->add_offset_callback (Note_collision_interface::force_shift_callback_proc, X_AXIS); Axis_group_interface::add_element (me, ncol); diff --git a/lily/note-column.cc b/lily/note-column.cc index 1f448db2e5..160c996d90 100644 --- a/lily/note-column.cc +++ b/lily/note-column.cc @@ -61,7 +61,7 @@ Note_column::head_positions_interval (Grob *me) Grob *se = unsmob_grob (scm_car (h)); int j = Staff_symbol_referencer::get_rounded_position (se); - iv.unite (Slice (j,j)); + iv.unite (Slice (j, j)); } return iv; } @@ -81,7 +81,7 @@ Note_column::dir (Grob* me) void -Note_column::set_stem (Grob*me,Grob * stem) +Note_column::set_stem (Grob*me, Grob * stem) { me->set_property ("stem", stem->self_scm ()); me->add_dependency (stem); @@ -96,7 +96,7 @@ Note_column::get_rest (Grob*me) } void -Note_column::add_head (Grob*me,Grob *h) +Note_column::add_head (Grob*me, Grob *h) { bool both = false; if (Rest::has_interface (h)) @@ -110,7 +110,7 @@ Note_column::add_head (Grob*me,Grob *h) { if (unsmob_grob (me->get_property ("rest"))) both = true; - Pointer_group_interface::add_grob (me, ly_symbol2scm ("note-heads"),h); + Pointer_group_interface::add_grob (me, ly_symbol2scm ("note-heads"), h); } if (both) @@ -135,7 +135,7 @@ Note_column::translate_rests (Grob*me, int dy) void -Note_column::set_dotcol (Grob*me,Grob *d) +Note_column::set_dotcol (Grob*me, Grob *d) { Axis_group_interface::add_element (me, d); } @@ -179,7 +179,7 @@ Note_column::accidentals (Grob *me) -ADD_INTERFACE (Note_column,"note-column-interface", +ADD_INTERFACE (Note_column, "note-column-interface", "Stem and noteheads combined", "arpeggio note-heads rest-collision rest horizontal-shift stem accidentals force-hshift"); diff --git a/lily/note-head.cc b/lily/note-head.cc index 09dda23c52..a2521a75ff 100644 --- a/lily/note-head.cc +++ b/lily/note-head.cc @@ -76,7 +76,7 @@ internal_print (Grob *me, String * font_char) } -MAKE_SCHEME_CALLBACK (Note_head,print,1); +MAKE_SCHEME_CALLBACK (Note_head, print, 1); SCM Note_head::print (SCM smob) { @@ -87,7 +87,7 @@ Note_head::print (SCM smob) } -MAKE_SCHEME_CALLBACK (Note_head,brew_ez_stencil,1); +MAKE_SCHEME_CALLBACK (Note_head, brew_ez_stencil, 1); SCM Note_head::brew_ez_stencil (SCM smob) { @@ -160,7 +160,7 @@ Note_head::stem_attachment_coordinate (Grob *me, Axis a) result = (a == X_AXIS) ? scm_car (result) : scm_cdr (result); - return robust_scm2double (result,0); + return robust_scm2double (result, 0); } int @@ -170,7 +170,7 @@ Note_head::get_balltype (Grob*me) return scm_is_number (s) ? scm_to_int (s) stem_dirs (CENTER,CENTER); + Drul_array stem_dirs (CENTER, CENTER); Drul_array stem_posns; Drul_array head_posns; Drul_array props (me->get_property ("left-items"), me->get_property ("right-items")); - Drul_array beams_drul (0,0); - Drul_array stems_drul (0,0); + Drul_array beams_drul (0, 0); + Drul_array stems_drul (0, 0); stem_dirs[LEFT] = stem_dirs[RIGHT] = CENTER; Interval intersect; @@ -448,7 +448,7 @@ Note_spacing::stem_dir_correction (Grob*me, Item * rcolumn, -ADD_INTERFACE (Note_spacing,"note-spacing-interface", +ADD_INTERFACE (Note_spacing, "note-spacing-interface", "This object calculates spacing wishes for individual voices.", "left-items right-items stem-spacing-correction knee-spacing-correction"); diff --git a/lily/object-key-dumper-scheme.cc b/lily/object-key-dumper-scheme.cc index 2e1a9a93f0..082c213418 100644 --- a/lily/object-key-dumper-scheme.cc +++ b/lily/object-key-dumper-scheme.cc @@ -12,7 +12,7 @@ #include "moment.hh" LY_DEFINE(ly_make_dumper, "ly:make-dumper", - 0,0,0, + 0, 0, 0, (), "Create a key dumper. " ) @@ -24,7 +24,7 @@ LY_DEFINE(ly_make_dumper, "ly:make-dumper", } LY_DEFINE(ly_dumper_definitions, "ly:dumper-definitions", - 1,0,0, + 1, 0, 0, (SCM dumper), "Return list of key definitions. " ) @@ -35,7 +35,7 @@ LY_DEFINE(ly_dumper_definitions, "ly:dumper-definitions", } LY_DEFINE(ly_dumper_key_serial, "ly:dumper-key-serial", - 2,0,0, + 2, 0, 0, (SCM dumper, SCM key), "Return the key serial number @var{key}. " ) diff --git a/lily/object-key-undumper-scheme.cc b/lily/object-key-undumper-scheme.cc index b20f94c0ef..da75e151ca 100644 --- a/lily/object-key-undumper-scheme.cc +++ b/lily/object-key-undumper-scheme.cc @@ -10,7 +10,7 @@ #include "object-key-undumper.hh" LY_DEFINE(ly_undumper_read_keys, "ly:undumper-read-keys", - 2,0,0, + 2, 0, 0, (SCM undumper, SCM keys), "Read serialized @var{keys} into @var{undumper}." ) @@ -23,7 +23,7 @@ LY_DEFINE(ly_undumper_read_keys, "ly:undumper-read-keys", } LY_DEFINE(ly_make_undumper, "ly:make-undumper", - 0, 0,0, + 0, 0, 0, (), "Create a key undumper. " ) @@ -36,7 +36,7 @@ LY_DEFINE(ly_make_undumper, "ly:make-undumper", LY_DEFINE(ly_undumper_lookup, "ly:undumper-lookup", - 2,0,0, + 2, 0, 0, (SCM undumper, SCM serial), "Return the object key for number @var{serial}. " ) diff --git a/lily/object-key.cc b/lily/object-key.cc index cec33785df..d9da3624ac 100644 --- a/lily/object-key.cc +++ b/lily/object-key.cc @@ -112,7 +112,7 @@ static Object_dumper_table_entry undumpers[] = { {GENERAL_KEY, Lilypond_general_key::from_scheme}, {GROB_KEY, Lilypond_grob_key::from_scheme}, {CONTEXT_KEY, Lilypond_context_key::from_scheme}, - {KEY_COUNT,0}, + {KEY_COUNT, 0}, }; Object_key * diff --git a/lily/ottava-bracket.cc b/lily/ottava-bracket.cc index 4f8ec86790..25de958243 100644 --- a/lily/ottava-bracket.cc +++ b/lily/ottava-bracket.cc @@ -76,7 +76,7 @@ Ottava_bracket::print (SCM smob) Drul_array shorten = robust_scm2interval (me->get_property ("shorten-pair"), - Interval (0,0)); + Interval (0, 0)); /* @@ -138,7 +138,7 @@ Ottava_bracket::print (SCM smob) Drul_array flare = robust_scm2interval (me->get_property ("bracket-flare"), - Interval (0,0)); + Interval (0, 0)); @@ -172,7 +172,7 @@ Ottava_bracket::print (SCM smob) */ b = Stencil (Box (b.extent (X_AXIS), - Interval (0.1,0.1)), + Interval (0.1, 0.1)), b.expr ()); b.translate_axis (bracket_span_points[LEFT], X_AXIS); diff --git a/lily/pango-select-scheme.cc b/lily/pango-select-scheme.cc index 7c755e05f0..52ead4644f 100644 --- a/lily/pango-select-scheme.cc +++ b/lily/pango-select-scheme.cc @@ -4,7 +4,7 @@ #include "pango-font.hh" LY_DEFINE(ly_make_pango_description_string, "ly:make-pango-description-string", - 2,0,0, (SCM chain, SCM size), + 2, 0, 0, (SCM chain, SCM size), "Make a PangoFontDescription string for the property alist @var{chain} at size @var{size}.") { SCM_ASSERT_TYPE(scm_is_number (size), size, SCM_ARG1, __FUNCTION__, "number"); diff --git a/lily/paper-column.cc b/lily/paper-column.cc index 2397da3799..8cf2a108f2 100644 --- a/lily/paper-column.cc +++ b/lily/paper-column.cc @@ -118,7 +118,7 @@ Paper_column::is_used (Grob*me) Print a vertical line and the rank number, to aid debugging. */ -MAKE_SCHEME_CALLBACK (Paper_column,print,1); +MAKE_SCHEME_CALLBACK (Paper_column, print, 1); SCM Paper_column::print (SCM p) { @@ -148,7 +148,7 @@ Paper_column::print (SCM p) THIS IS BROKEN KLUDGE. WE SHOULD INVENT SOMETHING BETTER. */ -MAKE_SCHEME_CALLBACK (Paper_column,before_line_breaking,1); +MAKE_SCHEME_CALLBACK (Paper_column, before_line_breaking, 1); SCM Paper_column::before_line_breaking (SCM grob) { diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index 252f98cc56..d74b0606b7 100644 --- a/lily/paper-outputter.cc +++ b/lily/paper-outputter.cc @@ -103,7 +103,7 @@ void Paper_outputter::output_stencil (Stencil stil) { interpret_stencil_expression (stil.expr (), paper_outputter_dump, - (void*) this, Offset (0,0)); + (void*) this, Offset (0, 0)); } void diff --git a/lily/paper-system.cc b/lily/paper-system.cc index 7b0226d2be..9c70473c40 100644 --- a/lily/paper-system.cc +++ b/lily/paper-system.cc @@ -25,7 +25,7 @@ Paper_system::Paper_system (Stencil s, bool is_title) break_before_penalty_ = 0; smobify_self (); stencil_ = s; - staff_refpoints_ = Interval(0,0); + staff_refpoints_ = Interval(0, 0); } Paper_system::~Paper_system () diff --git a/lily/part-combine-engraver.cc b/lily/part-combine-engraver.cc index 2cce5f2c77..2712a2a150 100644 --- a/lily/part-combine-engraver.cc +++ b/lily/part-combine-engraver.cc @@ -99,6 +99,6 @@ ADD_TRANSLATOR (Part_combine_engraver, /* creats*/ "CombineTextScript", /* accepts */ "part-combine-event", /* acks */ "multi-measure-rest-interface " -"slur-interface stem-interface note-head-interface" -,/* reads */ "printPartCombineTexts", +"slur-interface stem-interface note-head-interface", +/* reads */ "printPartCombineTexts", /* write */ ""); diff --git a/lily/part-combine-iterator.cc b/lily/part-combine-iterator.cc index 4886c91fc4..5555d17e49 100644 --- a/lily/part-combine-iterator.cc +++ b/lily/part-combine-iterator.cc @@ -124,7 +124,7 @@ Part_combine_iterator::derived_substitute (Context *f, Context *t) { if (first_iter_) - first_iter_->substitute_outlet (f,t); + first_iter_->substitute_outlet (f, t); } @@ -205,7 +205,7 @@ void Part_combine_iterator::substitute_both (Context * to1, Context * to2) { - Context *tos[] = {to1,to2}; + Context *tos[] = {to1, to2}; Music_iterator *mis[] = {first_iter_, second_iter_}; Interpretation_context_handle *hs[] = { &null_, @@ -320,7 +320,7 @@ Part_combine_iterator::construct_children () Context *tr = get_outlet ()->find_create_context (ly_symbol2scm ("Voice"), - "shared",props); + "shared", props); shared_.set_context (tr); @@ -331,7 +331,7 @@ Part_combine_iterator::construct_children () Context *solo_tr = get_outlet ()->find_create_context (ly_symbol2scm ("Voice"), - "solo",props); + "solo", props); solo_ .set_context (solo_tr); diff --git a/lily/percent-repeat-item.cc b/lily/percent-repeat-item.cc index a04765fd3d..79eca6117a 100644 --- a/lily/percent-repeat-item.cc +++ b/lily/percent-repeat-item.cc @@ -42,20 +42,20 @@ Percent_repeat_item_interface::x_percent (Grob *me, int count, for (int i = count; i--;) { - m.add_at_edge (X_AXIS, RIGHT, s, -slash_neg_kern,0); + m.add_at_edge (X_AXIS, RIGHT, s, -slash_neg_kern, 0); } Stencil d1 = Font_interface::get_default_font (me)->find_by_name ("dots.dot"); Stencil d2 = d1; d1.translate_axis (0.5, Y_AXIS ); d2.translate_axis (-0.5, Y_AXIS); - m.add_at_edge (X_AXIS, LEFT, d1, -dot_neg_kern,0); - m.add_at_edge (X_AXIS, RIGHT, d2, -dot_neg_kern,0); + m.add_at_edge (X_AXIS, LEFT, d1, -dot_neg_kern, 0); + m.add_at_edge (X_AXIS, RIGHT, d2, -dot_neg_kern, 0); return m; } -MAKE_SCHEME_CALLBACK (Percent_repeat_item_interface,double_percent,1); +MAKE_SCHEME_CALLBACK (Percent_repeat_item_interface, double_percent, 1); SCM Percent_repeat_item_interface::double_percent (SCM grob) { @@ -65,7 +65,7 @@ Percent_repeat_item_interface::double_percent (SCM grob) return m.smobbed_copy (); } -MAKE_SCHEME_CALLBACK (Percent_repeat_item_interface,beat_slash,1); +MAKE_SCHEME_CALLBACK (Percent_repeat_item_interface, beat_slash, 1); SCM Percent_repeat_item_interface::beat_slash (SCM grob) { @@ -75,7 +75,7 @@ Percent_repeat_item_interface::beat_slash (SCM grob) return m.smobbed_copy (); } -ADD_INTERFACE (Percent_repeat_item_interface,"percent-repeat-interface", +ADD_INTERFACE (Percent_repeat_item_interface, "percent-repeat-interface", "Repeats that look like percent signs", "slope thickness"); diff --git a/lily/percent-repeat-iterator.cc b/lily/percent-repeat-iterator.cc index e07d7176f7..25e1b0fbb3 100644 --- a/lily/percent-repeat-iterator.cc +++ b/lily/percent-repeat-iterator.cc @@ -87,8 +87,8 @@ Percent_repeat_iterator::derived_mark ()const } void -Percent_repeat_iterator::derived_substitute (Context *f,Context *t ) +Percent_repeat_iterator::derived_substitute (Context *f, Context *t ) { if (child_iter_) - child_iter_->substitute_outlet (f,t); + child_iter_->substitute_outlet (f, t); } diff --git a/lily/pfb.cc b/lily/pfb.cc index 9406f53c93..e35bc01b2f 100644 --- a/lily/pfb.cc +++ b/lily/pfb.cc @@ -69,7 +69,7 @@ pfb2pfa (Byte const * pfb, int length) } LY_DEFINE(ly_pfb_to_pfa, "ly:pfb->pfa", - 1,0,0, (SCM pfb_path), + 1, 0, 0, (SCM pfb_path), "Convert the contents of a PFB file to PFA." ) { diff --git a/lily/piano-pedal-bracket.cc b/lily/piano-pedal-bracket.cc index 8e617fb6b5..d7ce3da803 100644 --- a/lily/piano-pedal-bracket.cc +++ b/lily/piano-pedal-bracket.cc @@ -14,25 +14,25 @@ source file of the GNU LilyPond music typesetter struct Piano_pedal_bracket { - DECLARE_SCHEME_CALLBACK (print,(SCM)); + DECLARE_SCHEME_CALLBACK (print, (SCM)); static bool has_interface (Grob*); }; -MAKE_SCHEME_CALLBACK (Piano_pedal_bracket,print,1); +MAKE_SCHEME_CALLBACK (Piano_pedal_bracket, print, 1); SCM Piano_pedal_bracket::print (SCM smob) { Spanner *me = dynamic_cast (unsmob_grob (smob)); Spanner *orig = dynamic_cast (me->original_); - Drul_array broken (false,false); + Drul_array broken (false, false); Drul_array height = robust_scm2drul - (me->get_property ("edge-height"), Interval (0,0)); + (me->get_property ("edge-height"), Interval (0, 0)); Drul_array shorten = robust_scm2drul - (me->get_property ("shorten-pair"), Interval (0,0)); + (me->get_property ("shorten-pair"), Interval (0, 0)); Drul_array flare = robust_scm2drul - (me->get_property ("bracket-flare"), Interval (0,0)); + (me->get_property ("bracket-flare"), Interval (0, 0)); Grob *common = me->get_bound (LEFT) ->common_refpoint (me->get_bound (RIGHT), X_AXIS); @@ -41,7 +41,7 @@ Piano_pedal_bracket::print (SCM smob) if (textbit) common = common->common_refpoint (textbit, X_AXIS); - Interval span_points (0,0); + Interval span_points (0, 0); Direction d = LEFT; do { @@ -93,7 +93,7 @@ Piano_pedal_bracket::print (SCM smob) -ADD_INTERFACE (Piano_pedal_bracket,"piano-pedal-bracket-interface", +ADD_INTERFACE (Piano_pedal_bracket, "piano-pedal-bracket-interface", "The bracket of the piano pedal. It can be tuned through the regular " "bracket properties.", "bound-padding edge-height shorten-pair bracket-flare pedal-text"); diff --git a/lily/piano-pedal-engraver.cc b/lily/piano-pedal-engraver.cc index 9adee1134d..fa8e6d160f 100644 --- a/lily/piano-pedal-engraver.cc +++ b/lily/piano-pedal-engraver.cc @@ -140,12 +140,12 @@ Piano_pedal_engraver::acknowledge_grob (Grob_info info) if (p->line_spanner_) { Side_position_interface::add_support (p->line_spanner_, info.grob_); - add_bound_item (p->line_spanner_,info.grob_); + add_bound_item (p->line_spanner_, info.grob_); } if (p->bracket_) - add_bound_item (p->bracket_,info.grob_); + add_bound_item (p->bracket_, info.grob_); if (p->finished_bracket_) - add_bound_item (p->finished_bracket_,info.grob_); + add_bound_item (p->finished_bracket_, info.grob_); } } } @@ -356,7 +356,7 @@ Piano_pedal_engraver::create_bracket_grobs (Pedal_info *p, bool mixed) if (!p->finished_bracket_) { SCM flare = p->bracket_->get_property ("bracket-flare"); - p->bracket_->set_property ("bracket-flare", scm_cons (scm_make_real (0),scm_cdr (flare))); + p->bracket_->set_property ("bracket-flare", scm_cons (scm_make_real (0), scm_cdr (flare))); } diff --git a/lily/piano-pedal-performer.cc b/lily/piano-pedal-performer.cc index 294e5df1ce..e5c8a70129 100644 --- a/lily/piano-pedal-performer.cc +++ b/lily/piano-pedal-performer.cc @@ -140,6 +140,6 @@ Piano_pedal_performer::try_music (Music* r) return false; } -ADD_TRANSLATOR (Piano_pedal_performer, "","", +ADD_TRANSLATOR (Piano_pedal_performer, "", "", "pedal-event", - "","","" ); + "", "", "" ); diff --git a/lily/pitch-interval.cc b/lily/pitch-interval.cc index 069c86b784..ed8e0530de 100644 --- a/lily/pitch-interval.cc +++ b/lily/pitch-interval.cc @@ -20,8 +20,8 @@ Pitch_interval::Pitch_interval (Pitch p1, Pitch p2) Pitch_interval::Pitch_interval () { - elem_ref(LEFT) = Pitch (100,0,0); - elem_ref(RIGHT) = Pitch (-100,0,0); + elem_ref(LEFT) = Pitch (100, 0, 0); + elem_ref(RIGHT) = Pitch (-100, 0, 0); } diff --git a/lily/pitch-scheme.cc b/lily/pitch-scheme.cc index 934118c0a8..9784bac703 100644 --- a/lily/pitch-scheme.cc +++ b/lily/pitch-scheme.cc @@ -116,7 +116,7 @@ LY_DEFINE (ly_pitch_less_p, "ly:pitchget_property ("elements"); } -MAKE_SCHEME_CALLBACK(Repeated_music,relative_callback, 2); +MAKE_SCHEME_CALLBACK(Repeated_music, relative_callback, 2); SCM Repeated_music::relative_callback (SCM music, SCM pitch) { @@ -107,7 +107,7 @@ Repeated_music::body_get_length (Music *me) } -MAKE_SCHEME_CALLBACK (Repeated_music,unfolded_music_length, 1); +MAKE_SCHEME_CALLBACK (Repeated_music, unfolded_music_length, 1); SCM Repeated_music::unfolded_music_length (SCM m) @@ -118,7 +118,7 @@ Repeated_music::unfolded_music_length (SCM m) return l.smobbed_copy (); } -MAKE_SCHEME_CALLBACK (Repeated_music,folded_music_length, 1); +MAKE_SCHEME_CALLBACK (Repeated_music, folded_music_length, 1); SCM Repeated_music::folded_music_length (SCM m) { @@ -134,7 +134,7 @@ Repeated_music::repeat_count (Music *me) return scm_to_int (me->get_property ("repeat-count")); } -MAKE_SCHEME_CALLBACK (Repeated_music,volta_music_length, 1); +MAKE_SCHEME_CALLBACK (Repeated_music, volta_music_length, 1); SCM Repeated_music::volta_music_length (SCM m) { @@ -143,7 +143,7 @@ Repeated_music::volta_music_length (SCM m) return l.smobbed_copy (); } -MAKE_SCHEME_CALLBACK (Repeated_music,minimum_start, 1); +MAKE_SCHEME_CALLBACK (Repeated_music, minimum_start, 1); SCM Repeated_music::minimum_start (SCM m) { @@ -158,7 +158,7 @@ Repeated_music::minimum_start (SCM m) } } -MAKE_SCHEME_CALLBACK (Repeated_music,first_start, 1); +MAKE_SCHEME_CALLBACK (Repeated_music, first_start, 1); SCM Repeated_music::first_start (SCM m) { diff --git a/lily/rest-collision-engraver.cc b/lily/rest-collision-engraver.cc index 7de87e7d6a..28f8002305 100644 --- a/lily/rest-collision-engraver.cc +++ b/lily/rest-collision-engraver.cc @@ -44,7 +44,7 @@ Rest_collision_engraver::process_acknowledged_grobs () for (int i = 0; i < note_columns_.size (); i++) - Rest_collision::add_column (rest_collision_,note_columns_[i]); + Rest_collision::add_column (rest_collision_, note_columns_[i]); } void diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc index b2cf2824ec..81c477f4ba 100644 --- a/lily/rest-collision.cc +++ b/lily/rest-collision.cc @@ -21,7 +21,7 @@ #include "duration.hh" #include "directional-element-interface.hh" -MAKE_SCHEME_CALLBACK (Rest_collision,force_shift_callback,2); +MAKE_SCHEME_CALLBACK (Rest_collision, force_shift_callback, 2); SCM Rest_collision::force_shift_callback (SCM element_smob, SCM axis) { @@ -45,7 +45,7 @@ Rest_collision::force_shift_callback (SCM element_smob, SCM axis) void -Rest_collision::add_column (Grob*me,Grob *p) +Rest_collision::add_column (Grob*me, Grob *p) { me->add_dependency (p); Pointer_group_interface::add_grob (me, ly_symbol2scm ("elements"), p); @@ -174,7 +174,7 @@ Rest_collision::do_shift (Grob *me) Real diff = d * ((last_y - y) /staff_space); if (diff > 0) - Note_column::translate_rests (ordered_rests[d][i],d * (int) ceil (diff) * 2); + Note_column::translate_rests (ordered_rests[d][i], d * (int) ceil (diff) * 2); } } while (flip (&d) != LEFT); } @@ -232,13 +232,13 @@ Rest_collision::do_shift (Grob *me) if (discrete_dist < stafflines+1) discrete_dist = int (ceil (discrete_dist / 2.0)* 2.0); - Note_column::translate_rests (rcol,dir * discrete_dist); + Note_column::translate_rests (rcol, dir * discrete_dist); } return SCM_UNSPECIFIED; } -ADD_INTERFACE (Rest_collision,"rest-collision-interface", +ADD_INTERFACE (Rest_collision, "rest-collision-interface", "Move around ordinary rests (not multi-measure-rests) to avoid " "conflicts.", "minimum-distance positioning-done elements"); diff --git a/lily/rest.cc b/lily/rest.cc index baab83f5af..80062cfca2 100644 --- a/lily/rest.cc +++ b/lily/rest.cc @@ -17,7 +17,7 @@ #include "directional-element-interface.hh" // -> offset callback -MAKE_SCHEME_CALLBACK (Rest,after_line_breaking,1); +MAKE_SCHEME_CALLBACK (Rest, after_line_breaking, 1); SCM Rest::after_line_breaking (SCM smob) { @@ -113,7 +113,7 @@ Rest::glyph_name (Grob *me, int balltype, String style, bool try_ledgers) } -MAKE_SCHEME_CALLBACK (Rest,print,1); +MAKE_SCHEME_CALLBACK (Rest, print, 1); SCM Rest::brew_internal_stencil (SCM smob, bool ledgered) @@ -145,7 +145,7 @@ Rest::print (SCM smob) { return brew_internal_stencil (smob, true); } -MAKE_SCHEME_CALLBACK (Rest,extent_callback,2); +MAKE_SCHEME_CALLBACK (Rest, extent_callback, 2); /* We need the callback. The real stencil has ledgers depending on Y-position. The Y-position is known only after line breaking. */ @@ -166,7 +166,7 @@ Rest::extent_callback (SCM smob, SCM ax) return ly_interval2scm (unsmob_stencil (m)->extent (a)); } -MAKE_SCHEME_CALLBACK (Rest,polyphonic_offset_callback,2); +MAKE_SCHEME_CALLBACK (Rest, polyphonic_offset_callback, 2); SCM Rest::polyphonic_offset_callback (SCM smob, SCM) { @@ -181,7 +181,7 @@ Rest::polyphonic_offset_callback (SCM smob, SCM) return scm_make_real (off); } -ADD_INTERFACE (Rest,"rest-interface", +ADD_INTERFACE (Rest, "rest-interface", "A rest symbol.", "style direction minimum-distance"); diff --git a/lily/rhythmic-column-engraver.cc b/lily/rhythmic-column-engraver.cc index 37c83d58c6..84708dade1 100644 --- a/lily/rhythmic-column-engraver.cc +++ b/lily/rhythmic-column-engraver.cc @@ -77,7 +77,7 @@ Rhythmic_column_engraver::process_acknowledged_grobs () { if (!note_column_) { - note_column_ = make_item ("NoteColumn",rheads_[0]->self_scm ()); + note_column_ = make_item ("NoteColumn", rheads_[0]->self_scm ()); spacing_ = make_item ("NoteSpacing", SCM_EOL); spacing_->set_property ("left-items", scm_cons (note_column_->self_scm (), SCM_EOL)); diff --git a/lily/rhythmic-head.cc b/lily/rhythmic-head.cc index 876820589b..d9abe90010 100644 --- a/lily/rhythmic-head.cc +++ b/lily/rhythmic-head.cc @@ -36,7 +36,7 @@ Rhythmic_head::dot_count (Grob*me) } void -Rhythmic_head::set_dots (Grob*me,Item *dot) +Rhythmic_head::set_dots (Grob*me, Item *dot) { me->set_property ("dot", dot->self_scm ()); } @@ -48,7 +48,7 @@ Rhythmic_head::duration_log (Grob*me) return scm_is_number (s) ? scm_to_int (s) : 0; } -ADD_INTERFACE (Rhythmic_head,"rhythmic-head-interface", +ADD_INTERFACE (Rhythmic_head, "rhythmic-head-interface", "Note head or rest", "dot stem duration-log"); diff --git a/lily/scm-hash.cc b/lily/scm-hash.cc index 65699b1b6c..18b6edcd8e 100644 --- a/lily/scm-hash.cc +++ b/lily/scm-hash.cc @@ -79,7 +79,7 @@ Scheme_hash_table::print_smob (SCM s, SCM p, scm_print_state*) sprintf (str, "#hash_tab_, p); - scm_puts ("> ",p); + scm_puts ("> ", p); return 1; } diff --git a/lily/scm-option.cc b/lily/scm-option.cc index 229733d295..7e6dbccaf9 100644 --- a/lily/scm-option.cc +++ b/lily/scm-option.cc @@ -74,10 +74,10 @@ LY_DEFINE (ly_option_usage, "ly:option-usage", 0, 0, 0, (SCM), /* Add these as well: -@item -T,--no-timestamps +@item -T, --no-timestamps don't timestamp the output -@item -t,--test +@item -t, --test Switch on any experimental features. Not for general public use. */ diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc index 87f349be13..1afa849ebd 100644 --- a/lily/script-engraver.cc +++ b/lily/script-engraver.cc @@ -199,7 +199,7 @@ Script_engraver::acknowledge_grob (Grob_info info) e->set_parent (info.grob_, Y_AXIS); e->add_dependency (info.grob_); } - Side_position_interface::add_support (e,info.grob_); + Side_position_interface::add_support (e, info.grob_); } } else if (Note_column::has_interface (info.grob_)) diff --git a/lily/script-interface.cc b/lily/script-interface.cc index 502844304b..2c37d1a555 100644 --- a/lily/script-interface.cc +++ b/lily/script-interface.cc @@ -88,7 +88,7 @@ struct Text_script static bool has_interface (Grob*); }; -ADD_INTERFACE (Text_script,"text-script-interface", +ADD_INTERFACE (Text_script, "text-script-interface", "An object that is put above or below a note", "add-stem-support slur script-priority inside-slur"); diff --git a/lily/separating-group-spanner.cc b/lily/separating-group-spanner.cc index ce9cb89db4..05c5264b1d 100644 --- a/lily/separating-group-spanner.cc +++ b/lily/separating-group-spanner.cc @@ -73,7 +73,7 @@ Separating_group_spanner::find_rods (Item * r, SCM next, Real padding) } } -MAKE_SCHEME_CALLBACK (Separating_group_spanner,set_spacing_rods,1); +MAKE_SCHEME_CALLBACK (Separating_group_spanner, set_spacing_rods, 1); SCM Separating_group_spanner::set_spacing_rods (SCM smob) { @@ -107,7 +107,7 @@ Separating_group_spanner::set_spacing_rods (SCM smob) } void -Separating_group_spanner::add_spacing_unit (Grob* me ,Item*i) +Separating_group_spanner::add_spacing_unit (Grob* me , Item*i) { Pointer_group_interface::add_grob (me, ly_symbol2scm ("elements"), i); me->add_dependency (i); @@ -117,7 +117,7 @@ Separating_group_spanner::add_spacing_unit (Grob* me ,Item*i) -ADD_INTERFACE (Separating_group_spanner,"separation-spanner-interface", +ADD_INTERFACE (Separating_group_spanner, "separation-spanner-interface", "A spanner that calculates spacing constraints (\"rods\") " "using the @code{separation-item-interface} grobs in @code{elements}.", "elements padding"); diff --git a/lily/separating-line-group-engraver.cc b/lily/separating-line-group-engraver.cc index 84a98be9e9..c0793a2f9f 100644 --- a/lily/separating-line-group-engraver.cc +++ b/lily/separating-line-group-engraver.cc @@ -168,7 +168,7 @@ Separating_line_group_engraver::acknowledge_grob (Grob_info i) if (Accidental_placement::has_interface (it)) Separation_item::add_conditional_item (p_ref_, it); else - Separation_item::add_item (p_ref_,it); + Separation_item::add_item (p_ref_, it); } void diff --git a/lily/separation-item.cc b/lily/separation-item.cc index 5dce52645d..f2a86ffd12 100644 --- a/lily/separation-item.cc +++ b/lily/separation-item.cc @@ -15,10 +15,10 @@ #include "accidental-placement.hh" void -Separation_item::add_item (Grob*s,Item* i) +Separation_item::add_item (Grob*s, Item* i) { assert (i); - Pointer_group_interface::add_grob (s, ly_symbol2scm ("elements"),i); + Pointer_group_interface::add_grob (s, ly_symbol2scm ("elements"), i); s->add_dependency (i); } @@ -167,7 +167,7 @@ Separation_item::extremal_break_aligned_grob (Grob *separation_item, Direction d -ADD_INTERFACE (Separation_item,"separation-item-interface", +ADD_INTERFACE (Separation_item, "separation-item-interface", "Item that computes widths to generate spacing rods. " "This is done in concert with @ref{separation-spanner-interface}." diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc index 823de3aa4a..e79aad880b 100644 --- a/lily/side-position-interface.cc +++ b/lily/side-position-interface.cc @@ -52,7 +52,7 @@ Side_position_interface::get_direction (Grob*me) } -MAKE_SCHEME_CALLBACK (Side_position_interface,aligned_on_support_extents, 2); +MAKE_SCHEME_CALLBACK (Side_position_interface, aligned_on_support_extents, 2); SCM Side_position_interface::aligned_on_support_extents (SCM element_smob, SCM axis) { @@ -92,7 +92,7 @@ Side_position_interface::general_side_position (Grob *me, Axis a, bool use_exten else { Real x = e->relative_coordinate (common, a); - dim.unite (Interval (x,x)); + dim.unite (Interval (x, x)); } } @@ -128,7 +128,7 @@ Side_position_interface::general_side_position (Grob *me, Axis a, bool use_exten /* Cut & paste (ugh.) */ -MAKE_SCHEME_CALLBACK (Side_position_interface,aligned_on_support_refpoints,2); +MAKE_SCHEME_CALLBACK (Side_position_interface, aligned_on_support_refpoints, 2); SCM Side_position_interface::aligned_on_support_refpoints (SCM smob, SCM axis) { @@ -156,7 +156,7 @@ directed_round (Real f, Direction d) Only rounds when we're inside the staff, as determined by Staff_symbol_referencer::staff_radius () */ -MAKE_SCHEME_CALLBACK (Side_position_interface,quantised_position,2); +MAKE_SCHEME_CALLBACK (Side_position_interface, quantised_position, 2); SCM Side_position_interface::quantised_position (SCM element_smob, SCM) { @@ -174,7 +174,7 @@ Side_position_interface::quantised_position (SCM element_smob, SCM) Grob *head = me->get_parent (X_AXIS); - if (Staff_symbol_referencer::on_staffline (me,ip) + if (Staff_symbol_referencer::on_staffline (me, ip) && ((abs (ip) <= rad) || (Note_head::has_interface (head) && sign (Staff_symbol_referencer::get_position (head)) @@ -193,7 +193,7 @@ Side_position_interface::quantised_position (SCM element_smob, SCM) /* Position next to support, taking into account my own dimensions and padding. */ -MAKE_SCHEME_CALLBACK (Side_position_interface,aligned_side,2); +MAKE_SCHEME_CALLBACK (Side_position_interface, aligned_side, 2); SCM Side_position_interface::aligned_side (SCM element_smob, SCM axis) { @@ -202,7 +202,7 @@ Side_position_interface::aligned_side (SCM element_smob, SCM axis) Direction d = Side_position_interface::get_direction (me); - Real o = scm_to_double (aligned_on_support_extents (element_smob,axis)); + Real o = scm_to_double (aligned_on_support_extents (element_smob, axis)); Interval iv = me->extent (me, a); @@ -258,7 +258,7 @@ Side_position_interface::get_axis (Grob*me) } -ADD_INTERFACE (Side_position_interface,"side-position-interface", +ADD_INTERFACE (Side_position_interface, "side-position-interface", "Position a victim object (this one) next to other objects (the " "support). The property @code{direction} signifies where to put the " "victim object relative to the support (left or right, up or down?)\n\n " diff --git a/lily/simple-spacer.cc b/lily/simple-spacer.cc index 516e00ebc9..0ca1fbe1b6 100644 --- a/lily/simple-spacer.cc +++ b/lily/simple-spacer.cc @@ -84,7 +84,7 @@ Simple_spacer::add_rod (int l, int r, Real dist) return; } - Real c = range_stiffness (l,r); + Real c = range_stiffness (l, r); if (isinf (c)) { /* @@ -102,7 +102,7 @@ Simple_spacer::add_rod (int l, int r, Real dist) return; } - Real d = range_ideal_len (l,r); + Real d = range_ideal_len (l, r); Real block_stretch = dist - d; Real block_force = c * block_stretch; diff --git a/lily/simultaneous-music-iterator.cc b/lily/simultaneous-music-iterator.cc index 5123dca51f..4b1336a80b 100644 --- a/lily/simultaneous-music-iterator.cc +++ b/lily/simultaneous-music-iterator.cc @@ -26,10 +26,10 @@ Simultaneous_music_iterator::derived_mark () const } void -Simultaneous_music_iterator::derived_substitute (Context *f,Context *t) +Simultaneous_music_iterator::derived_substitute (Context *f, Context *t) { for (SCM s = children_list_; scm_is_pair (s); s = scm_cdr (s)) - unsmob_iterator (scm_car (s))-> substitute_outlet (f,t); + unsmob_iterator (scm_car (s))-> substitute_outlet (f, t); } void diff --git a/lily/slash-repeat-engraver.cc b/lily/slash-repeat-engraver.cc index c7bf2117a4..f6b3e8f1a9 100644 --- a/lily/slash-repeat-engraver.cc +++ b/lily/slash-repeat-engraver.cc @@ -78,7 +78,7 @@ Slash_repeat_engraver::try_music (Music * m) Moment meas_len = robust_scm2moment (m->get_property ("measureLength"), Moment (0)); if (body_length_ < meas_len && meas_len.main_part_.mod_rat (body_length_.main_part_) - == Moment (Rational (0,0))) + == Moment (Rational (0, 0))) { repeat_ = m; } diff --git a/lily/slur-configuration.cc b/lily/slur-configuration.cc index a191870c03..9040d7a827 100644 --- a/lily/slur-configuration.cc +++ b/lily/slur-configuration.cc @@ -26,7 +26,7 @@ Bezier avoid_staff_line (Slur_score_state const &state, Bezier bez) { - Offset horiz (1,0); + Offset horiz (1, 0); Array ts = bez.solve_derivative (horiz); /* TODO: handle case of broken slur. */ diff --git a/lily/slur-performer.cc b/lily/slur-performer.cc index 4797041d4d..1c0b9f9ebf 100644 --- a/lily/slur-performer.cc +++ b/lily/slur-performer.cc @@ -89,6 +89,6 @@ Slur_performer::try_music (Music *m) return false; } -ADD_TRANSLATOR (Slur_performer,"","", - "slur-event","","",""); +ADD_TRANSLATOR (Slur_performer, "", "", + "slur-event", "", "", ""); diff --git a/lily/slur.cc b/lily/slur.cc index b83fa400aa..3057fc2c37 100644 --- a/lily/slur.cc +++ b/lily/slur.cc @@ -46,7 +46,7 @@ Slur::height (SCM smob, SCM ax) /* Ugh should have dash-length + dash-period */ -MAKE_SCHEME_CALLBACK (Slur, print,1); +MAKE_SCHEME_CALLBACK (Slur, print, 1); SCM Slur::print (SCM smob) { @@ -216,7 +216,7 @@ get_default_dir (Grob*me) } -MAKE_SCHEME_CALLBACK (Slur, after_line_breaking,1); +MAKE_SCHEME_CALLBACK (Slur, after_line_breaking, 1); SCM Slur::after_line_breaking (SCM smob) { diff --git a/lily/source-file.cc b/lily/source-file.cc index 4f181e1c9b..6957cc19c0 100644 --- a/lily/source-file.cc +++ b/lily/source-file.cc @@ -156,7 +156,7 @@ Slice Source_file::line_slice (char const* pos_str0) const { if (!contains (pos_str0)) - return Slice (0,0); + return Slice (0, 0); char const* data_str0 = to_str0 (); char const * eof_C_ = data_str0 + length (); diff --git a/lily/spaceable-grob.cc b/lily/spaceable-grob.cc index 825d3b0550..4661d55120 100644 --- a/lily/spaceable-grob.cc +++ b/lily/spaceable-grob.cc @@ -101,7 +101,7 @@ Spaceable_grob::remove_interface (Grob*me) -ADD_INTERFACE (Spaceable_grob,"spaceable-grob-interface", +ADD_INTERFACE (Spaceable_grob, "spaceable-grob-interface", "A layout object that takes part in the spacing problem. " , "measure-length spacing-wishes penalty minimum-distances ideal-distances " diff --git a/lily/spacing-engraver.cc b/lily/spacing-engraver.cc index b02dc4ff62..7a554e4d8f 100644 --- a/lily/spacing-engraver.cc +++ b/lily/spacing-engraver.cc @@ -57,7 +57,7 @@ protected: inline int compare (Rhythmic_tuple const &a, Rhythmic_tuple const &b) { - return Rhythmic_tuple::time_compare (a,b); + return Rhythmic_tuple::time_compare (a, b); } int diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc index f58717b768..37abb9961d 100644 --- a/lily/spacing-spanner.cc +++ b/lily/spacing-spanner.cc @@ -40,18 +40,18 @@ public: Real * fixed, Real * space, Moment); - static Real default_bar_spacing (Grob*,Grob*,Grob*,Moment); - static Real note_spacing (Grob*,Grob*,Grob*,Moment, bool*); - static Real get_duration_space (Grob*,Moment dur, Rational shortest, bool*); + static Real default_bar_spacing (Grob*, Grob*, Grob*, Moment); + static Real note_spacing (Grob*, Grob*, Grob*, Moment, bool*); + static Real get_duration_space (Grob*, Moment dur, Rational shortest, bool*); static Rational find_shortest (Grob *, Link_array const &); static void breakable_column_spacing (Grob*, Item* l, Item *r, Moment); static void find_loose_columns () {} - static void prune_loose_columns (Grob*,Link_array *cols, Rational); + static void prune_loose_columns (Grob*, Link_array *cols, Rational); static void find_loose_columns (Link_array cols); static void set_explicit_neighbor_columns (Link_array cols); static void set_implicit_neighbor_columns (Link_array cols); - static void do_measure (Rational, Grob*me,Link_array *cols); - static void musical_column_spacing (Grob*,Item*,Item*, Real, Rational); + static void do_measure (Rational, Grob*me, Link_array *cols); + static void musical_column_spacing (Grob*, Item*, Item*, Real, Rational); DECLARE_SCHEME_CALLBACK (set_springs, (SCM )); static bool has_interface (Grob*); }; @@ -159,7 +159,7 @@ loose_column (Grob *l, Grob *c, Grob *r) between. */ void -Spacing_spanner::prune_loose_columns (Grob*me,Link_array *cols, Rational shortest) +Spacing_spanner::prune_loose_columns (Grob*me, Link_array *cols, Rational shortest) { Link_array newcols; Real increment = robust_scm2double (me->get_property ("spacing-increment"), 1.2); @@ -195,7 +195,7 @@ Spacing_spanner::prune_loose_columns (Grob*me,Link_array *cols, Rational s next_door[LEFT] = cols->elem (i - 1); next_door[RIGHT] = cols->elem (i + 1); Direction d = LEFT; - Drul_array dists (0,0); + Drul_array dists (0, 0); do { @@ -360,7 +360,7 @@ Spacing_spanner::set_implicit_neighbor_columns (Link_array cols) } -MAKE_SCHEME_CALLBACK (Spacing_spanner, set_springs,1); +MAKE_SCHEME_CALLBACK (Spacing_spanner, set_springs, 1); SCM Spacing_spanner::set_springs (SCM smob) { @@ -487,7 +487,7 @@ Spacing_spanner::find_shortest (Grob *me, Link_array const &cols) } SCM bsd = me->get_property ("base-shortest-duration"); - Rational d = Rational (1,8); + Rational d = Rational (1, 8); if (Moment *m = unsmob_moment (bsd)) d = m->main_part_; @@ -532,7 +532,7 @@ Spacing_spanner::do_measure (Rational global_shortest, Grob*me, Item *rb = r->find_prebroken_piece (LEFT); if (lb) - breakable_column_spacing (me, lb,r, global_shortest); + breakable_column_spacing (me, lb, r, global_shortest); if (rb) breakable_column_spacing (me, l, rb, global_shortest); @@ -666,7 +666,7 @@ Spacing_spanner::standard_breakable_column_spacing (Grob * me, Item*l, Item*r, { *fixed = 0.0; Direction d = LEFT; - Drul_array cols (l,r); + Drul_array cols (l, r); do { @@ -699,7 +699,7 @@ Spacing_spanner::standard_breakable_column_spacing (Grob * me, Item*l, Item*r, { Moment dt = Paper_column::when_mom (r) - Paper_column::when_mom (l); - if (dt == Moment (0,0)) + if (dt == Moment (0, 0)) { /* In this case, Staff_spacing should handle the job, @@ -720,7 +720,7 @@ Spacing_spanner::standard_breakable_column_spacing (Grob * me, Item*l, Item*r, Read hints from L and generate springs. */ void -Spacing_spanner::breakable_column_spacing (Grob*me, Item* l, Item *r,Moment shortest) +Spacing_spanner::breakable_column_spacing (Grob*me, Item* l, Item *r, Moment shortest) { Real compound_fixed = 0.0; Real compound_space = 0.0; @@ -728,7 +728,7 @@ Spacing_spanner::breakable_column_spacing (Grob*me, Item* l, Item *r,Moment shor Moment dt = Paper_column::when_mom (r) - Paper_column::when_mom (l); - if (dt == Moment (0,0)) + if (dt == Moment (0, 0)) { for (SCM s = l->get_property ("spacing-wishes"); scm_is_pair (s); s = scm_cdr (s)) @@ -836,7 +836,7 @@ Spacing_spanner::get_duration_space (Grob*me, Moment d, Rational shortest, bool else { /* - John S. Gourlay. ``Spacing a Line of Music,'' Technical + John S. Gourlay. ``Spacing a Line of Music, '' Technical Report OSU-CISRC-10/87-TR35, Department of Computer and Information Science, The Ohio State University, 1987. */ @@ -923,7 +923,7 @@ Spacing_spanner::note_spacing (Grob*me, Grob *lc, Grob *rc, -ADD_INTERFACE (Spacing_spanner,"spacing-spanner-interface", +ADD_INTERFACE (Spacing_spanner, "spacing-spanner-interface", "The space taken by a note is dependent on its duration. Doubling a\n" "duration adds spacing-increment to the space. The most common shortest\n" "note gets @code{shortest-duration-space}. Notes that are even shorter are\n" diff --git a/lily/span-bar-engraver.cc b/lily/span-bar-engraver.cc index d45a1aaf3b..c69bb2a2e3 100644 --- a/lily/span-bar-engraver.cc +++ b/lily/span-bar-engraver.cc @@ -62,7 +62,7 @@ Span_bar_engraver::stop_translation_timestep () if (spanbar_) { for (int i = 0; i < bars_.size () ; i++) - Span_bar::add_bar (spanbar_,bars_[i]); + Span_bar::add_bar (spanbar_, bars_[i]); SCM vissym = ly_symbol2scm ("break-visibility"); SCM vis = bars_[0]->internal_get_property (vissym); diff --git a/lily/span-bar.cc b/lily/span-bar.cc index 2946ad1ce2..052808adb9 100644 --- a/lily/span-bar.cc +++ b/lily/span-bar.cc @@ -24,7 +24,7 @@ Span_bar::add_bar (Grob*me, Grob*b) me->add_dependency (b); } -MAKE_SCHEME_CALLBACK (Span_bar,print,1); +MAKE_SCHEME_CALLBACK (Span_bar, print, 1); /* Limitations/Bugs: @@ -108,7 +108,7 @@ Span_bar::print (SCM smobbed_me) return span_bar_mol.smobbed_copy (); } -MAKE_SCHEME_CALLBACK (Span_bar,width_callback,2); +MAKE_SCHEME_CALLBACK (Span_bar, width_callback, 2); SCM Span_bar::width_callback (SCM element_smob, SCM scm_axis) { @@ -125,7 +125,7 @@ Span_bar::width_callback (SCM element_smob, SCM scm_axis) return ly_interval2scm (m.extent (X_AXIS)); } -MAKE_SCHEME_CALLBACK (Span_bar,before_line_breaking,1); +MAKE_SCHEME_CALLBACK (Span_bar, before_line_breaking, 1); SCM Span_bar::before_line_breaking (SCM smob) { @@ -139,7 +139,7 @@ Span_bar::before_line_breaking (SCM smob) return SCM_UNSPECIFIED; } -MAKE_SCHEME_CALLBACK (Span_bar,center_on_spanned_callback,2); +MAKE_SCHEME_CALLBACK (Span_bar, center_on_spanned_callback, 2); SCM Span_bar::center_on_spanned_callback (SCM element_smob, SCM axis) @@ -149,7 +149,7 @@ Span_bar::center_on_spanned_callback (SCM element_smob, SCM axis) assert (a == Y_AXIS); Interval i (get_spanned_interval (me)); - /* Bar_line::print delivers a barline of y-extent (-h/2,h/2), so + /* Bar_line::print delivers a barline of y-extent (-h/2, h/2), so we have to translate ourselves to be in the center of the interval that we span. */ if (i.is_empty ()) @@ -222,7 +222,7 @@ Span_bar::get_spanned_interval (Grob*me) } -MAKE_SCHEME_CALLBACK (Span_bar,get_bar_size,1); +MAKE_SCHEME_CALLBACK (Span_bar, get_bar_size, 1); SCM Span_bar::get_bar_size (SCM smob) { @@ -239,7 +239,7 @@ Span_bar::get_bar_size (SCM smob) -ADD_INTERFACE (Span_bar,"span-bar-interface", +ADD_INTERFACE (Span_bar, "span-bar-interface", "A bar line that spanned between other barlines. This interface is " " used for bar lines that connect different staves.", "elements"); diff --git a/lily/spanner.cc b/lily/spanner.cc index 45cc53831f..0e4c9e04c0 100644 --- a/lily/spanner.cc +++ b/lily/spanner.cc @@ -84,9 +84,9 @@ Spanner::do_break_processing () } else { - Link_array break_points = pscore_->system_->broken_col_range (left,right); + Link_array break_points = pscore_->system_->broken_col_range (left, right); - break_points.insert (left,0); + break_points.insert (left, 0); break_points.push (right); for (int i =1; i < break_points.size (); i++) @@ -109,8 +109,8 @@ Spanner::do_break_processing () } Spanner *span = dynamic_cast (clone (broken_intos_.size ())); - span->set_bound (LEFT,bounds[LEFT]); - span->set_bound (RIGHT,bounds[RIGHT]); + span->set_bound (LEFT, bounds[LEFT]); + span->set_bound (RIGHT, bounds[RIGHT]); if (!bounds[LEFT]->get_system () @@ -145,7 +145,7 @@ Spanner::set_my_columns () do { if (!spanned_drul_[i]->get_system ()) - set_bound (i,spanned_drul_[i]->find_prebroken_piece ((Direction) -i)); + set_bound (i, spanned_drul_[i]->find_prebroken_piece ((Direction) -i)); } while (flip (&i) != LEFT); } @@ -335,7 +335,7 @@ add_bound_item (Spanner* sp, Grob*it) } -MAKE_SCHEME_CALLBACK (Spanner,set_spacing_rods,1); +MAKE_SCHEME_CALLBACK (Spanner, set_spacing_rods, 1); SCM Spanner::set_spacing_rods (SCM smob) { diff --git a/lily/staff-spacing.cc b/lily/staff-spacing.cc index 7e4118072a..7e1db27b06 100644 --- a/lily/staff-spacing.cc +++ b/lily/staff-spacing.cc @@ -105,7 +105,7 @@ Staff_spacing::bar_y_positions (Grob *bar_grob) if (glyph_string.left_string (1) == "|" || glyph_string.left_string (1) == ".") { SCM sz = Bar_line::get_staff_bar_size (bar_grob->self_scm ()); - bar_size = Interval (-1,1); + bar_size = Interval (-1, 1); bar_size *= robust_scm2double (sz, 1) / Staff_symbol_referencer::staff_space (bar_grob); } @@ -241,7 +241,7 @@ Staff_spacing::get_spacing_params (Grob *me, Real * space, Real * fixed) } -ADD_INTERFACE (Staff_spacing,"staff-spacing-interface", +ADD_INTERFACE (Staff_spacing, "staff-spacing-interface", "This object calculates spacing details from a " " breakable symbol (left) to another object. For example, it takes care " " of optical spacing from a bar lines to a note.", diff --git a/lily/staff-symbol-engraver.cc b/lily/staff-symbol-engraver.cc index 8245bbf8e5..d9d9fb5743 100644 --- a/lily/staff-symbol-engraver.cc +++ b/lily/staff-symbol-engraver.cc @@ -59,7 +59,7 @@ Staff_symbol_engraver::finalize () { if (span_) { - span_->set_bound (RIGHT,unsmob_grob (get_property ("currentCommandColumn"))); + span_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn"))); } span_ = 0; } diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc index 20c0b50b1b..376fea6b5d 100644 --- a/lily/staff-symbol-referencer.cc +++ b/lily/staff-symbol-referencer.cc @@ -94,7 +94,7 @@ Staff_symbol_referencer::get_rounded_position (Grob*me) } LY_DEFINE (ly_grob_staff_position, "ly:grob-staff-position", - 1, 0,0, (SCM sg), + 1, 0, 0, (SCM sg), "Return the Y-position of @var{sg} relative to the staff.") { Grob *g = unsmob_grob (sg); @@ -110,7 +110,7 @@ LY_DEFINE (ly_grob_staff_position, "ly:grob-staff-position", /* should use offset callback! */ -MAKE_SCHEME_CALLBACK (Staff_symbol_referencer,callback,2); +MAKE_SCHEME_CALLBACK (Staff_symbol_referencer, callback, 2); SCM Staff_symbol_referencer::callback (SCM element_smob, SCM) { @@ -169,7 +169,7 @@ compare_position (Grob *const &a, Grob *const &b) - Staff_symbol_referencer::get_position ((Grob*) b)); } -ADD_INTERFACE (Staff_symbol_referencer,"staff-symbol-referencer-interface", +ADD_INTERFACE (Staff_symbol_referencer, "staff-symbol-referencer-interface", "An object whose Y position is meant relative to a staff " "symbol. " "These usually have @code{Staff_symbol_referencer::callback} " diff --git a/lily/staff-symbol.cc b/lily/staff-symbol.cc index cae5c6fedd..c1634ac4fe 100644 --- a/lily/staff-symbol.cc +++ b/lily/staff-symbol.cc @@ -16,7 +16,7 @@ #include "staff-symbol-referencer.hh" #include "spanner.hh" -MAKE_SCHEME_CALLBACK (Staff_symbol,print,1); +MAKE_SCHEME_CALLBACK (Staff_symbol, print, 1); SCM Staff_symbol::print (SCM smob) @@ -26,7 +26,7 @@ Staff_symbol::print (SCM smob) Grob * common = sp->get_bound (LEFT)->common_refpoint (sp->get_bound (RIGHT), X_AXIS); - Interval span_points (0,0); + Interval span_points (0, 0); /* @@ -125,7 +125,7 @@ Staff_symbol::get_ledger_line_thickness (Grob * me) } -ADD_INTERFACE (Staff_symbol,"staff-symbol-interface", +ADD_INTERFACE (Staff_symbol, "staff-symbol-interface", "This spanner draws the lines of a staff. " "A staff symbol definines a vertical unit, the staff space. " "Quantities that go by a half staff space are called positions " diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc index 9af7b217b2..b0378a3349 100644 --- a/lily/stem-engraver.cc +++ b/lily/stem-engraver.cc @@ -141,13 +141,13 @@ Stem_engraver::stop_translation_timestep () SCM prop = get_property ("stemLeftBeamCount"); if (scm_is_number (prop)) { - Stem::set_beaming (stem_,scm_to_int (prop),LEFT); + Stem::set_beaming (stem_, scm_to_int (prop), LEFT); context ()->unset_property (ly_symbol2scm ("stemLeftBeamCount")); } prop = get_property ("stemRightBeamCount"); if (scm_is_number (prop)) { - Stem::set_beaming (stem_,scm_to_int (prop), RIGHT); + Stem::set_beaming (stem_, scm_to_int (prop), RIGHT); context ()->unset_property (ly_symbol2scm ("stemRightBeamCount")); } stem_ = 0; diff --git a/lily/stem-tremolo.cc b/lily/stem-tremolo.cc index bfbe13e9df..508a0949e2 100644 --- a/lily/stem-tremolo.cc +++ b/lily/stem-tremolo.cc @@ -72,8 +72,8 @@ Stem_tremolo::raw_stencil (Grob *me) dydx = 0.25; Real ss = Staff_symbol_referencer::staff_space (me); - Real thick = robust_scm2double (me->get_property ("beam-thickness"),1); - Real width = robust_scm2double (me->get_property ("beam-width"),1); + Real thick = robust_scm2double (me->get_property ("beam-thickness"), 1); + Real width = robust_scm2double (me->get_property ("beam-width"), 1); Real blot = me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter")); width *= ss; @@ -108,7 +108,7 @@ Stem_tremolo::raw_stencil (Grob *me) return mol; } -MAKE_SCHEME_CALLBACK (Stem_tremolo,print,1); +MAKE_SCHEME_CALLBACK (Stem_tremolo, print, 1); SCM Stem_tremolo::print (SCM grob) { @@ -173,6 +173,6 @@ Stem_tremolo::print (SCM grob) -ADD_INTERFACE (Stem_tremolo,"stem-tremolo-interface", +ADD_INTERFACE (Stem_tremolo, "stem-tremolo-interface", "A beam slashing a stem to indicate a tremolo.", "stem beam-width beam-thickness flag-count"); diff --git a/lily/stem.cc b/lily/stem.cc index 7597fde71f..b4de3c1ce5 100644 --- a/lily/stem.cc +++ b/lily/stem.cc @@ -300,7 +300,7 @@ Stem::get_default_stem_end_position (Grob *me) SCM sshorten = me->get_property ("stem-shorten"); SCM scm_shorten = scm_is_pair (sshorten) ? robust_list_ref ((duration_log (me) - 2) >? 0, sshorten): SCM_EOL; - Real shorten = 2* robust_scm2double (scm_shorten,0); + Real shorten = 2* robust_scm2double (scm_shorten, 0); /* On boundary: shorten only half */ if (abs (head_positions (me)[dir]) <= 1) @@ -467,7 +467,7 @@ Stem::position_noteheads (Grob *me) } } -MAKE_SCHEME_CALLBACK (Stem,before_line_breaking,1); +MAKE_SCHEME_CALLBACK (Stem, before_line_breaking, 1); SCM Stem::before_line_breaking (SCM smob) { @@ -596,7 +596,7 @@ Stem::flag (Grob *me) return flag; } -MAKE_SCHEME_CALLBACK (Stem,width_callback,2); +MAKE_SCHEME_CALLBACK (Stem, width_callback, 2); SCM Stem::width_callback (SCM e, SCM ax) { @@ -612,7 +612,7 @@ Stem::width_callback (SCM e, SCM ax) } else if (unsmob_grob (me->get_property ("beam")) || abs (duration_log (me)) <= 2) { - r = Interval (-1,1); + r = Interval (-1, 1); r *= thickness (me)/2; } else @@ -678,14 +678,14 @@ Stem::print (SCM smob) + stemlet_length) / half_space; } - Interval stem_y (y1 ? y1); + Interval stem_y (y1 ? y1); if (Grob *hed = support_head (me)) { /* must not take ledgers into account. */ - Interval head_height = hed->extent (hed,Y_AXIS); + Interval head_height = hed->extent (hed, Y_AXIS); Real y_attach = Note_head::stem_attachment_coordinate (hed, Y_AXIS); y_attach = head_height.linear_combination (y_attach); @@ -806,7 +806,7 @@ Stem::calc_stem_info (Grob *me) /* Simple standard stem length */ SCM lengths = me->get_property ("beamed-lengths"); Real ideal_length = - scm_to_double (robust_list_ref (beam_count - 1,lengths)) + scm_to_double (robust_list_ref (beam_count - 1, lengths)) * staff_space /* stem only extends to center of beam diff --git a/lily/stencil-scheme.cc b/lily/stencil-scheme.cc index e44cd8234d..263d06ae52 100644 --- a/lily/stencil-scheme.cc +++ b/lily/stencil-scheme.cc @@ -309,7 +309,7 @@ LY_DEFINE (ly_interpret_stencil_expression, "ly:interpret-stencil-expression", -LY_DEFINE (ly_bracket ,"ly:bracket", +LY_DEFINE (ly_bracket , "ly:bracket", 4, 0, 0, (SCM a, SCM iv, SCM t, SCM p), "Make a bracket in direction @var{a}. The extent of the bracket is " @@ -330,7 +330,7 @@ LY_DEFINE (ly_bracket ,"ly:bracket", -LY_DEFINE (ly_filled_box ,"ly:round-filled-box", +LY_DEFINE (ly_filled_box , "ly:round-filled-box", 3, 0, 0, (SCM xext, SCM yext, SCM blot), "Make a @code{Stencil} " diff --git a/lily/stencil.cc b/lily/stencil.cc index ac4b566576..acdfd93bfa 100644 --- a/lily/stencil.cc +++ b/lily/stencil.cc @@ -109,7 +109,7 @@ Stencil::translate (Offset o) void Stencil::translate_axis (Real x, Axis a) { - Offset o (0,0); + Offset o (0, 0); o[a] = x; translate (o); } @@ -133,8 +133,8 @@ Stencil::set_empty (bool e) } else { - dim_[X_AXIS] = Interval (0,0); - dim_[Y_AXIS] = Interval (0,0); + dim_[X_AXIS] = Interval (0, 0); + dim_[Y_AXIS] = Interval (0, 0); } } @@ -172,7 +172,7 @@ Stencil::moved_to_edge (Axis a, Direction d, Stencil const &s, + d * padding; Stencil toadd (s); - toadd.translate_axis (offset,a); + toadd.translate_axis (offset, a); if (minimum > 0 && d * (-origin ()[a] + toadd.origin ()[a]) < minimum) toadd.translate_axis ( -toadd.origin ()[a] @@ -273,7 +273,7 @@ find_expression_fonts (SCM expr) fl.fonts_ = SCM_EOL; interpret_stencil_expression (expr, &find_font_function, - (void*) &fl, Offset (0,0)); + (void*) &fl, Offset (0, 0)); return fl.fonts_; } diff --git a/lily/sustain-pedal.cc b/lily/sustain-pedal.cc index eab9a16ac1..6b45591de4 100644 --- a/lily/sustain-pedal.cc +++ b/lily/sustain-pedal.cc @@ -37,7 +37,7 @@ public: }; -MAKE_SCHEME_CALLBACK (Sustain_pedal,print,1); +MAKE_SCHEME_CALLBACK (Sustain_pedal, print, 1); SCM Sustain_pedal::print (SCM smob) { diff --git a/lily/system-start-delimiter-engraver.cc b/lily/system-start-delimiter-engraver.cc index 5276c7f667..7e8adb3d7c 100644 --- a/lily/system-start-delimiter-engraver.cc +++ b/lily/system-start-delimiter-engraver.cc @@ -35,7 +35,7 @@ System_start_delimiter_engraver::acknowledge_grob (Grob_info inf) if (Staff_symbol::has_interface (inf.grob_)) { /* - don't add as Axis_group_interface::add_element (delim_,), + don't add as Axis_group_interface::add_element (delim_, ), because that would set the parent as well */ Pointer_group_interface::add_grob (delim_, ly_symbol2scm ("elements"), inf.grob_); @@ -91,7 +91,7 @@ System_start_delimiter_engraver::finalize () } ADD_TRANSLATOR (System_start_delimiter_engraver, -/* descr */ "Creates a system start delimiter (ie. SystemStart@{Bar,Brace,Bracket@} spanner", +/* descr */ "Creates a system start delimiter (ie. SystemStart@{Bar, Brace, Bracket@} spanner", /* creats*/ "SystemStartBar SystemStartBrace SystemStartBracket", /* accepts */ "", /* acks */ "system-start-delimiter-interface staff-symbol-interface", diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc index d6c4bd77ea..5b776120bf 100644 --- a/lily/system-start-delimiter.cc +++ b/lily/system-start-delimiter.cc @@ -20,7 +20,7 @@ #include "lookup.hh" Stencil -System_start_delimiter::staff_bracket (Grob*me,Real height) +System_start_delimiter::staff_bracket (Grob*me, Real height) { Real arc_height = scm_to_double (me->get_property ("arch-height")) ; @@ -61,22 +61,22 @@ Will not fix it since I'm not sure. Stencil -System_start_delimiter::simple_bar (Grob*me,Real h) +System_start_delimiter::simple_bar (Grob*me, Real h) { 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)), + return Lookup::round_filled_box (Box (Interval (0, w), Interval (-h/2, h/2)), lt); } -MAKE_SCHEME_CALLBACK (System_start_delimiter,after_line_breaking,1); +MAKE_SCHEME_CALLBACK (System_start_delimiter, after_line_breaking, 1); SCM System_start_delimiter::after_line_breaking (SCM smob) { Grob * me = unsmob_grob (smob); SCM gl = me->get_property ("glyph"); - if (ly_c_equal_p (gl,scm_makfrom0str ("bar-line"))) + if (ly_c_equal_p (gl, scm_makfrom0str ("bar-line"))) { int count = 0; @@ -196,7 +196,7 @@ System_start_delimiter::staff_brace (Grob *me, Real y) } -ADD_INTERFACE (System_start_delimiter,"system-start-delimiter-interface", +ADD_INTERFACE (System_start_delimiter, "system-start-delimiter-interface", "The brace, bracket or bar in front of the system. " "It is implemented as a spanner." , diff --git a/lily/system.cc b/lily/system.cc index ea2c7c75dc..68fcc8cdc4 100644 --- a/lily/system.cc +++ b/lily/system.cc @@ -250,8 +250,8 @@ System::break_into_pieces (Array const &breaking) Link_array c (breaking[i].cols_); pscore_->typeset_line (system); - system->set_bound (LEFT,c[0]); - system->set_bound (RIGHT,c.top ()); + system->set_bound (LEFT, c[0]); + system->set_bound (RIGHT, c.top ()); for (int j = 0; j < c.size (); j++) { c[j]->translate_axis (breaking[i].config_[j], X_AXIS); @@ -405,7 +405,7 @@ System::get_line () Interval x (extent (this, X_AXIS)); Interval y (extent (this, Y_AXIS)); - Stencil sys_stencil (Box (x,y), + Stencil sys_stencil (Box (x, y), scm_cons (ly_symbol2scm ("combine-stencil"), exprs)); @@ -480,7 +480,7 @@ System::columns () const return acs; } -ADD_INTERFACE (System,"system-interface", +ADD_INTERFACE (System, "system-interface", "This is the toplevel object: each object in a score " "ultimately has a System object as its X and Y parent. ", "all-elements spaceable-staves columns") diff --git a/lily/tab-note-heads-engraver.cc b/lily/tab-note-heads-engraver.cc index 96b1efb3f3..4a4bfdd7eb 100644 --- a/lily/tab-note-heads-engraver.cc +++ b/lily/tab-note-heads-engraver.cc @@ -137,7 +137,7 @@ Tab_note_heads_engraver::process_music () while (!string_found) { int fret = unsmob_pitch (scm_pitch)->semitone_pitch () - - scm_to_int (scm_list_ref (stringTunings,scm_int2num (tab_string-1))); + - scm_to_int (scm_list_ref (stringTunings, scm_int2num (tab_string-1))); if (fretget_parent (Y_AXIS) && Tie_column::has_interface (s->get_parent (Y_AXIS))) @@ -30,8 +30,8 @@ Tie_column::add_tie (Grob*me,Grob *s) if (!Pointer_group_interface::count (me, ly_symbol2scm ("ties"))) { - dynamic_cast (me)->set_bound (LEFT, Tie::head (s,LEFT)); - dynamic_cast (me)->set_bound (RIGHT, Tie::head (s,RIGHT)); + dynamic_cast (me)->set_bound (LEFT, Tie::head (s, LEFT)); + dynamic_cast (me)->set_bound (RIGHT, Tie::head (s, RIGHT)); } s->set_parent (me, Y_AXIS); Pointer_group_interface::add_grob (me, ly_symbol2scm ("ties"), s); @@ -88,7 +88,7 @@ Tie_column::old_directions (Grob*me) if (ties.size () == 1) { Grob * t = ties[0]; - set_grob_direction (t,Tie::get_default_dir (t)); + set_grob_direction (t, Tie::get_default_dir (t)); return; } @@ -152,7 +152,7 @@ Tie_column::werner_directions (Grob *me) Grob * t = ties[0]; if (t->is_live () && !get_grob_direction (t)) - set_grob_direction (t,Tie::get_default_dir (t)); + set_grob_direction (t, Tie::get_default_dir (t)); return ; } @@ -188,7 +188,7 @@ Tie_column::werner_directions (Grob *me) } -MAKE_SCHEME_CALLBACK (Tie_column,after_line_breaking,1); +MAKE_SCHEME_CALLBACK (Tie_column, after_line_breaking, 1); SCM Tie_column::after_line_breaking (SCM smob) { @@ -198,7 +198,7 @@ Tie_column::after_line_breaking (SCM smob) -ADD_INTERFACE (Tie_column,"tie-column-interface", +ADD_INTERFACE (Tie_column, "tie-column-interface", "Object that sets directions of multiple ties in a tied chord", "direction"); diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc index 6e8e9d9f8b..e0649feb2d 100644 --- a/lily/tie-engraver.cc +++ b/lily/tie-engraver.cc @@ -126,7 +126,7 @@ Tie_engraver::acknowledge_grob (Grob_info i) if (tie_column_) for (int i = ties_.size (); i--;) - Tie_column::add_tie (tie_column_,ties_ [i]); + Tie_column::add_tie (tie_column_, ties_ [i]); } } @@ -167,15 +167,15 @@ Tie_engraver::stop_translation_timestep () void Tie_engraver::typeset_tie (Grob *her) { - if (! (Tie::head (her,LEFT) && Tie::head (her,RIGHT))) + if (! (Tie::head (her, LEFT) && Tie::head (her, RIGHT))) warning (_ ("lonely tie")); Direction d = LEFT; Drul_array new_head_drul; - new_head_drul[LEFT] = Tie::head (her,LEFT); - new_head_drul[RIGHT] = Tie::head (her,RIGHT); + new_head_drul[LEFT] = Tie::head (her, LEFT); + new_head_drul[RIGHT] = Tie::head (her, RIGHT); do { - if (!Tie::head (her,d)) + if (!Tie::head (her, d)) new_head_drul[d] = Tie::head (her, (Direction)-d); } while (flip (&d) != LEFT); diff --git a/lily/tie.cc b/lily/tie.cc index 2bae72cbcb..c2610d6f6f 100644 --- a/lily/tie.cc +++ b/lily/tie.cc @@ -38,9 +38,9 @@ void -Tie::set_head (Grob*me,Direction d, Grob * h) +Tie::set_head (Grob*me, Direction d, Grob * h) { - assert (!head (me,d)); + assert (!head (me, d)); index_set_cell (me->get_property ("head-pair"), d, h->self_scm ()); dynamic_cast (me)->set_bound (d, h); @@ -68,8 +68,8 @@ Tie::head (Grob*me, Direction d) Real Tie::get_position (Grob*me) { - Direction d = head (me,LEFT) ? LEFT:RIGHT; - return Staff_symbol_referencer::get_position (head (me,d)); + Direction d = head (me, LEFT) ? LEFT:RIGHT; + return Staff_symbol_referencer::get_position (head (me, d)); } @@ -87,8 +87,8 @@ Tie::get_position (Grob*me) Direction Tie::get_default_dir (Grob*me) { - Item * sl = head (me,LEFT) ? Rhythmic_head::get_stem (head (me,LEFT)) :0; - Item * sr = head (me,RIGHT) ? Rhythmic_head::get_stem (head (me,RIGHT)) :0; + Item * sl = head (me, LEFT) ? Rhythmic_head::get_stem (head (me, LEFT)) :0; + Item * sr = head (me, RIGHT) ? Rhythmic_head::get_stem (head (me, RIGHT)) :0; if (sl && sr) { if (get_grob_direction (sl) == UP @@ -128,9 +128,9 @@ Tie::get_control_points (SCM smob) { Spanner*me = unsmob_spanner (smob); Direction headdir = CENTER; - if (head (me,LEFT)) + if (head (me, LEFT)) headdir = LEFT; - else if (head (me,RIGHT)) + else if (head (me, RIGHT)) headdir = RIGHT; else { @@ -182,7 +182,7 @@ Tie::get_control_points (SCM smob) if (Note_head::has_interface (l) && Note_head::has_interface (r)) { width = - + r->extent (commonx,X_AXIS)[LEFT] + + r->extent (commonx, X_AXIS)[LEFT] - l->extent (commonx, X_AXIS)[RIGHT] -2 * x_gap_f; } @@ -204,10 +204,10 @@ Tie::get_control_points (SCM smob) SCM details = me->get_property ("details"); SCM lim // groetjes aan de chirurgendochter. - = scm_assq (ly_symbol2scm ("height-limit"),details); + = scm_assq (ly_symbol2scm ("height-limit"), details); Real h_inf = scm_to_double (scm_cdr (lim)) * staff_space; - Real r_0 = scm_to_double (scm_cdr (scm_assq (ly_symbol2scm ("ratio"),details))); + Real r_0 = scm_to_double (scm_cdr (scm_assq (ly_symbol2scm ("ratio"), details))); Bezier b = slur_shape (width, h_inf, r_0); @@ -242,7 +242,7 @@ Tie::get_control_points (SCM smob) todo: tie / stem collision */ - b = slur_shape (width,h_inf, r_0); + b = slur_shape (width, h_inf, r_0); b.scale (1, dir); b.translate (Offset (left_x, ypos)); @@ -256,7 +256,7 @@ Tie::get_control_points (SCM smob) TODO: doesn't work when on staff with even number of lines. */ - Array horizontal (b.solve_derivative (Offset (1,0))); + Array horizontal (b.solve_derivative (Offset (1, 0))); if (horizontal.size ()) { /* @@ -319,7 +319,7 @@ Tie::get_control_points (SCM smob) } -MAKE_SCHEME_CALLBACK (Tie,print,1); +MAKE_SCHEME_CALLBACK (Tie, print, 1); SCM Tie::print (SCM smob) { @@ -354,7 +354,7 @@ Tie::print (SCM smob) -ADD_INTERFACE (Tie,"tie-interface", +ADD_INTERFACE (Tie, "tie-interface", "A tie connecting two noteheads.\n" , "y-offset staffline-clearance control-points head-pair details thickness x-gap direction minimum-length"); diff --git a/lily/time-signature-engraver.cc b/lily/time-signature-engraver.cc index aa2d276557..e217fd9003 100644 --- a/lily/time-signature-engraver.cc +++ b/lily/time-signature-engraver.cc @@ -60,8 +60,8 @@ Time_signature_engraver::process_music () last_time_fraction_ = fr; - time_signature_ = make_item ("TimeSignature",SCM_EOL); - time_signature_->set_property ("fraction",fr); + time_signature_ = make_item ("TimeSignature", SCM_EOL); + time_signature_->set_property ("fraction", fr); } } diff --git a/lily/time-signature-performer.cc b/lily/time-signature-performer.cc index 130c989dad..3b499d5ddd 100644 --- a/lily/time-signature-performer.cc +++ b/lily/time-signature-performer.cc @@ -48,7 +48,7 @@ Time_signature_performer::create_audio_elements () int b = scm_to_int (scm_car (fr)); int o = scm_to_int (scm_cdr (fr)); - audio_ = new Audio_time_signature (b,o); + audio_ = new Audio_time_signature (b, o); Audio_element_info info (audio_, 0); announce_element (info); @@ -65,4 +65,4 @@ Time_signature_performer::stop_translation_timestep () } } -ADD_TRANSLATOR (Time_signature_performer,"","","","","",""); +ADD_TRANSLATOR (Time_signature_performer, "", "", "", "", "", ""); diff --git a/lily/time-signature.cc b/lily/time-signature.cc index d9fdd30b92..93717f10e2 100644 --- a/lily/time-signature.cc +++ b/lily/time-signature.cc @@ -44,7 +44,7 @@ Time_signature::print (SCM smob) else if (scm_is_symbol (st)) m = special_time_signature (me, st, n, d); else - m = numbered_time_signature (me, n,d); + m = numbered_time_signature (me, n, d); if (Staff_symbol_referencer::line_count (me) % 2 == 0) m.translate_axis (Staff_symbol_referencer::staff_space (me) / 2 , Y_AXIS); @@ -88,7 +88,7 @@ Time_signature::special_time_signature (Grob *me, SCM scm_style, int n, int d) } Stencil -Time_signature::numbered_time_signature (Grob*me,int num, int den) +Time_signature::numbered_time_signature (Grob*me, int num, int den) { SCM chain = me->get_property_alist_chain (Font_interface::text_font_alist_chain (me)); chain = scm_cons (scm_list_1 (scm_cons (ly_symbol2scm ("font-encoding"), @@ -109,7 +109,7 @@ Time_signature::numbered_time_signature (Grob*me,int num, int den) if (den) { m.add_at_edge (Y_AXIS, UP, n, 0.0, 0); - m.add_at_edge (Y_AXIS, DOWN, d, 0.0,0); + m.add_at_edge (Y_AXIS, DOWN, d, 0.0, 0); } else { diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc index f5a57d158d..16c7b6d2bb 100644 --- a/lily/timing-translator.cc +++ b/lily/timing-translator.cc @@ -59,7 +59,7 @@ Timing_translator::initialize () context. */ context ()->set_property ("measureLength", Moment (Rational (1)).smobbed_copy ()); - context ()->set_property ("beatLength", Moment (Rational (1,4)).smobbed_copy ()); + context ()->set_property ("beatLength", Moment (Rational (1, 4)).smobbed_copy ()); } Rational @@ -156,4 +156,4 @@ ADD_TRANSLATOR (Timing_translator, "@code{Timing} to its containing context." , - "","","","",""); + "", "", "", "", ""); diff --git a/lily/translator-ctors.cc b/lily/translator-ctors.cc index 9660015046..c580060457 100644 --- a/lily/translator-ctors.cc +++ b/lily/translator-ctors.cc @@ -16,7 +16,7 @@ Scheme_hash_table *global_translator_dict = 0; -LY_DEFINE (get_all_translators,"ly:get-all-translators", 0, 0, 0, (), +LY_DEFINE (get_all_translators, "ly:get-all-translators", 0, 0, 0, (), "Return a list of all translator objects that may be instantiated. " ) { diff --git a/lily/translator-scheme.cc b/lily/translator-scheme.cc index ed5503a62e..edd659db80 100644 --- a/lily/translator-scheme.cc +++ b/lily/translator-scheme.cc @@ -22,7 +22,7 @@ LY_DEFINE (ly_translator_name, "ly:translator-name", } LY_DEFINE (ly_translator_description, "ly:translator-description", - 1,0,0, (SCM me), + 1, 0, 0, (SCM me), "Return an alist of properties of translator @var{me}.") { Translator *tr = unsmob_translator (me); diff --git a/lily/translator.cc b/lily/translator.cc index 16f36f0ddb..af72ca083a 100644 --- a/lily/translator.cc +++ b/lily/translator.cc @@ -156,7 +156,7 @@ Translator::static_translator_description ()const IMPLEMENT_SMOBS (Translator); IMPLEMENT_DEFAULT_EQUAL_P (Translator); -IMPLEMENT_TYPE_P (Translator,"ly:translator?"); +IMPLEMENT_TYPE_P (Translator, "ly:translator?"); bool Translator::must_be_last () const diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc index 3f987e9ca0..380a5f4363 100644 --- a/lily/tuplet-bracket.cc +++ b/lily/tuplet-bracket.cc @@ -101,7 +101,7 @@ Tuplet_bracket::parallel_beam (Grob *me, Link_array const &cols, bool *equ follow beam precisely for determining tuplet number location. */ -MAKE_SCHEME_CALLBACK (Tuplet_bracket,print,1); +MAKE_SCHEME_CALLBACK (Tuplet_bracket, print, 1); SCM Tuplet_bracket::print (SCM smob) { @@ -153,7 +153,7 @@ Tuplet_bracket::print (SCM smob) else if (numb == ly_symbol2scm ("if-no-beam")) number_visibility = !par_beam; - Grob * commonx = columns[0]->common_refpoint (columns.top (),X_AXIS); + Grob * commonx = columns[0]->common_refpoint (columns.top (), X_AXIS); /* Tuplet brackets are normally not broken, but we shouldn't crash if @@ -239,7 +239,7 @@ Tuplet_bracket::print (SCM smob) } mol.translate_axis (ly, Y_AXIS); - mol.translate_axis (x0 - sp->get_bound (LEFT)->relative_coordinate (commonx,X_AXIS),X_AXIS); + mol.translate_axis (x0 - sp->get_bound (LEFT)->relative_coordinate (commonx, X_AXIS), X_AXIS); return mol.smobbed_copy (); } @@ -250,7 +250,7 @@ Tuplet_bracket::print (SCM smob) brackets. */ Stencil -Tuplet_bracket::make_bracket (Grob *me, // for line properties. +Tuplet_bracket::make_bracket (Grob *me, // for line properties. Axis protusion_axis, Offset dz, Drul_array height, @@ -258,7 +258,7 @@ Tuplet_bracket::make_bracket (Grob *me, // for line properties. Drul_array flare, Drul_array shorten) { - Drul_array corners (Offset (0,0), dz); + Drul_array corners (Offset (0, 0), dz); Real length = dz.length (); Drul_array gap_corners; @@ -275,7 +275,7 @@ Tuplet_bracket::make_bracket (Grob *me, // for line properties. if (gap.is_empty()) - gap = Interval (0,0); + gap = Interval (0, 0); do { gap_corners[d] = (dz * 0.5) + gap[d] / length * dz; } while (flip (&d) != LEFT); @@ -413,7 +413,7 @@ Tuplet_bracket::calc_position_and_height (Grob*me, Real *offset, Real * dy) /* We depend on the beams if there are any. */ -MAKE_SCHEME_CALLBACK (Tuplet_bracket,before_line_breaking,1); +MAKE_SCHEME_CALLBACK (Tuplet_bracket, before_line_breaking, 1); SCM Tuplet_bracket::before_line_breaking (SCM smob) { @@ -432,7 +432,7 @@ Tuplet_bracket::before_line_breaking (SCM smob) return SCM_UNSPECIFIED; } -MAKE_SCHEME_CALLBACK (Tuplet_bracket,after_line_breaking,1); +MAKE_SCHEME_CALLBACK (Tuplet_bracket, after_line_breaking, 1); SCM Tuplet_bracket::after_line_breaking (SCM smob) @@ -470,7 +470,7 @@ Tuplet_bracket::after_line_breaking (SCM smob) if (!par_beam || get_grob_direction (par_beam) != dir) { - calc_position_and_height (me,&offset,&dy); + calc_position_and_height (me, &offset, &dy); } else { @@ -517,7 +517,7 @@ Tuplet_bracket::after_line_breaking (SCM smob) Direction Tuplet_bracket::get_default_dir (Grob*me) { - Drul_array dirs (0,0); + Drul_array dirs (0, 0); for (SCM s = me->get_property ("note-columns"); scm_is_pair (s); s = scm_cdr (s)) { Grob * nc = unsmob_grob (scm_car (s)); diff --git a/lily/tweak-registration-scheme.cc b/lily/tweak-registration-scheme.cc index 1e3f05b9c6..da5ca742c1 100644 --- a/lily/tweak-registration-scheme.cc +++ b/lily/tweak-registration-scheme.cc @@ -13,7 +13,7 @@ #include "object-key-undumper.hh" LY_DEFINE(ly_clear_tweak_registry, "ly:tweak-clear-registry", - 0,0,0,(), + 0, 0, 0, (), "Clear global tweak registry" ) { @@ -22,7 +22,7 @@ LY_DEFINE(ly_clear_tweak_registry, "ly:tweak-clear-registry", } LY_DEFINE(ly_insert_tweak, "ly:insert-tweak", - 2,0,0, + 2, 0, 0, (SCM grob, SCM tweak), "add new tweak for grob." ) @@ -39,7 +39,7 @@ LY_DEFINE(ly_insert_tweak, "ly:insert-tweak", LY_DEFINE(ly_tweak_read_keys, "ly:tweak-define-keys", - 1,0,0,(SCM keys), + 1, 0, 0, (SCM keys), "Read keys" ) { @@ -49,7 +49,7 @@ LY_DEFINE(ly_tweak_read_keys, "ly:tweak-define-keys", LY_DEFINE(ly_all_tweaks, "ly:all-tweaks", - 0,0,0,(), + 0, 0, 0, (), "all tweaks" ) { @@ -58,7 +58,7 @@ LY_DEFINE(ly_all_tweaks, "ly:all-tweaks", LY_DEFINE(ly_tweak_read_tweaks, "ly:tweak-define-tweaks", - 1,0,0,(SCM tweaks), + 1, 0, 0, (SCM tweaks), "Read tweaks" ) { diff --git a/lily/vaticana-ligature.cc b/lily/vaticana-ligature.cc index c92f02219d..f44c5627a5 100644 --- a/lily/vaticana-ligature.cc +++ b/lily/vaticana-ligature.cc @@ -240,7 +240,7 @@ vaticana_brew_primitive (Grob *me) Real staff_space = Staff_symbol_referencer::staff_space (me); Real flexa_width = robust_scm2double ( me->get_property ("flexa-width"), 2) *staff_space; out = - Lookup::blank (Box (Interval (0, 0.5*flexa_width), Interval (0,0))); + Lookup::blank (Box (Interval (0, 0.5*flexa_width), Interval (0, 0))); } else if (!String::compare (glyph_name, "flexa")) { diff --git a/lily/vertical-align-engraver.cc b/lily/vertical-align-engraver.cc index b4a94f95d7..fd2a65bec7 100644 --- a/lily/vertical-align-engraver.cc +++ b/lily/vertical-align-engraver.cc @@ -36,7 +36,7 @@ Vertical_align_engraver::process_music () if (!valign_) { valign_ = make_spanner ("VerticalAlignment", SCM_EOL); - valign_->set_bound (LEFT,unsmob_grob (get_property ("currentCommandColumn"))); + valign_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn"))); } } @@ -45,7 +45,7 @@ Vertical_align_engraver::finalize () { if (valign_) { - valign_->set_bound (RIGHT,unsmob_grob (get_property ("currentCommandColumn"))); + valign_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn"))); valign_ = 0; } } @@ -64,7 +64,7 @@ Vertical_align_engraver::acknowledge_grob (Grob_info i) { if (qualifies (i)) { - Align_interface::add_element (valign_,i.grob_, get_property ("verticalAlignmentChildCallback")); + Align_interface::add_element (valign_, i.grob_, get_property ("verticalAlignmentChildCallback")); } } diff --git a/lily/volta-bracket.cc b/lily/volta-bracket.cc index be6e491869..3ef1ae9508 100644 --- a/lily/volta-bracket.cc +++ b/lily/volta-bracket.cc @@ -30,7 +30,7 @@ */ -MAKE_SCHEME_CALLBACK (Volta_bracket_interface,print,1); +MAKE_SCHEME_CALLBACK (Volta_bracket_interface, print, 1); SCM Volta_bracket_interface::print (SCM smob) { @@ -55,8 +55,8 @@ Volta_bracket_interface::print (SCM smob) const char* cs = str.to_str0 (); no_vertical_end |= - (strcmp (cs,":|")!= 0 && strcmp (cs,"|:")!= 0 && strcmp (cs,"|.")!= 0 - && strcmp (cs,":|:")!= 0 && strcmp (cs,".|")!= 0); + (strcmp (cs, ":|")!= 0 && strcmp (cs, "|:")!= 0 && strcmp (cs, "|.")!= 0 + && strcmp (cs, ":|:")!= 0 && strcmp (cs, ".|")!= 0); Output_def * layout = me->get_layout (); Real half_space = 0.5; @@ -83,14 +83,14 @@ Volta_bracket_interface::print (SCM smob) Real w = dynamic_cast (me)->spanner_length () - left - half_space; Real h = robust_scm2double (me->get_property ("height"), 1); - Stencil start,end ; + Stencil start, end ; if (!no_vertical_start) - start = Line_interface::line (me, Offset (0,0), Offset (0, h)); + start = Line_interface::line (me, Offset (0, 0), Offset (0, h)); if (!no_vertical_end) - end = Line_interface::line (me, Offset (w, 0), Offset (w,h)); + end = Line_interface::line (me, Offset (w, 0), Offset (w, h)); - Stencil mol = Line_interface::line (me, Offset (0, h), Offset (w,h)); + Stencil mol = Line_interface::line (me, Offset (0, h), Offset (w, h)); mol.add_stencil (start); mol.add_stencil (end); @@ -113,17 +113,17 @@ void Volta_bracket_interface::add_bar (Grob *me, Item* b) { Pointer_group_interface::add_grob (me, ly_symbol2scm ("bars"), b); - Side_position_interface::add_support (me,b); + Side_position_interface::add_support (me, b); add_bound_item (dynamic_cast (me), b); } void Volta_bracket_interface::add_column (Grob*me, Grob* c) { - Side_position_interface::add_support (me,c); + Side_position_interface::add_support (me, c); } -ADD_INTERFACE (Volta_bracket_interface,"volta-bracket-interface", +ADD_INTERFACE (Volta_bracket_interface, "volta-bracket-interface", "Volta bracket with number", "bars thickness height"); diff --git a/lily/volta-engraver.cc b/lily/volta-engraver.cc index 161f353697..41757b4ef2 100644 --- a/lily/volta-engraver.cc +++ b/lily/volta-engraver.cc @@ -181,7 +181,7 @@ Volta_engraver::acknowledge_grob (Grob_info i) if (Note_column::has_interface (item)) { if (volta_span_) - Volta_bracket_interface::add_column (volta_span_,item); + Volta_bracket_interface::add_column (volta_span_, item); } if (Bar_line::has_interface (item)) { diff --git a/scm/music-functions.scm b/scm/music-functions.scm index 1d0d9d312b..b96bcbfe89 100644 --- a/scm/music-functions.scm +++ b/scm/music-functions.scm @@ -418,8 +418,6 @@ of beat groupings " (let ((es (ly:music-property m 'elements)) (e (ly:music-property m 'element))) - (display (ly:music-property m 'name)) - (if (pair? es) (set! (ly:music-property m 'elements) (map voicify-music es))) (if (ly:music? e)