X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspacing-spanner.cc;h=2b9da0b80262071741f2b2fe9b19fa81c3fc4d91;hb=b605f2b518e0108d31e65b384f1a58dc5821938f;hp=2992c88593e7e397864e212c5356e990f168abcd;hpb=2c22efe5a46a37065b10c3f51c5d7db00d07d318;p=lilypond.git diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc index 2992c88593..2b9da0b802 100644 --- a/lily/spacing-spanner.cc +++ b/lily/spacing-spanner.cc @@ -23,16 +23,14 @@ #include "staff-spacing.hh" #include "spacing-interface.hh" - Rational -Spacing_spanner::effective_shortest_duration (Grob *me, Link_array const &all) +Spacing_spanner::effective_shortest_duration (Grob *me, + Link_array const &all) { SCM preset_shortest = me->get_property ("common-shortest-duration"); Rational global_shortest; if (unsmob_moment (preset_shortest)) - { - global_shortest = unsmob_moment (preset_shortest)->main_part_; - } + global_shortest = unsmob_moment (preset_shortest)->main_part_; else { global_shortest = Spacing_spanner::find_shortest (me, all); @@ -249,9 +247,7 @@ Spacing_spanner::musical_column_spacing (Grob *me, Real compound_fixed_note_space = 0.0; if (options->stretch_uniformly_) - { - compound_note_space = base_note_space; - } + compound_note_space = base_note_space; else { int wish_count = 0; @@ -414,9 +410,7 @@ Spacing_spanner::breakable_column_spacing (Grob *me, Item *l, Item *r, } if (options->stretch_uniformly_ && l->break_status_dir () != RIGHT) - { - compound_fixed = 0.0; - } + compound_fixed = 0.0; assert (!isinf (compound_space)); compound_space = max (compound_space, compound_fixed); @@ -445,8 +439,13 @@ ADD_INTERFACE (Spacing_spanner, "spacing-spanner-interface", "head width) A 16th note is followed by 0.5 note head width. The\n" "quarter note is followed by 3 NHW, the half by 4 NHW, etc.\n", - "grace-space-factor spacing-increment base-shortest-duration strict-note-spacing " - "shortest-duration-space common-shortest-duration uniform-stretching " + "grace-space-factor " + "spacing-increment " + "base-shortest-duration " + "strict-note-spacing " + "shortest-duration-space " + "common-shortest-duration " + "uniform-stretching " "packed-spacing " );