From ce029bf611234b4ab53d6e7c79d4efe9258fd71a Mon Sep 17 00:00:00 2001 From: Urs Liska Date: Thu, 31 Dec 2015 14:59:41 +0100 Subject: [PATCH] Fix whitespace errors introduced in issue 4704 Commits for this issue introduced whitespace errors, these should be fixed here: 73d4697d 29022d7b 9b8b5c2e 4b994f8a 706d7978 --- Documentation/snippets/new/subdividing-beams.ly | 6 +++--- input/regression/beam-subdivide-quarter-notes.ly | 4 ++-- input/regression/beam-subdivide-shortened-beam.ly | 6 +++--- input/regression/beam-subdivide-trailing-stem.ly | 2 +- input/regression/beam-subdivision.ly | 4 ++-- lily/beaming-pattern.cc | 14 +++++++------- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Documentation/snippets/new/subdividing-beams.ly b/Documentation/snippets/new/subdividing-beams.ly index 94cdccf724..0030c5a1cb 100644 --- a/Documentation/snippets/new/subdividing-beams.ly +++ b/Documentation/snippets/new/subdividing-beams.ly @@ -10,7 +10,7 @@ entire groups of notes. This behavior can be modified to subdivide the beams into sub-groups by setting the property @code{subdivideBeams}. When set, multiple beams will be subdivided at intervals defined by the current value of @code{baseMoment} by reducing the multiple beams to -the number of beams that indicates the metric value of the subdivision. +the number of beams that indicates the metric value of the subdivision. If the group following the division is shorter than the current metric value (usually because the beam is incomplete) the number of beams reflects the longest possible subdivision group. However, if there is @@ -40,12 +40,12 @@ changed to match the new @code{baseMoment}: \set baseMoment = #(ly:make-moment 1/16) \set beatStructure = #'(4 4 4 4) c32[ c c c c c c c] - + % Shorten beam by 1/32 \set baseMoment = #(ly:make-moment 1/8) \set beatStructure = #'(2 2 2 2) c32[ c c c c c c] r32 - + % Shorten beam by 3/32 \set baseMoment = #(ly:make-moment 1/8) \set beatStructure = #'(2 2 2 2) diff --git a/input/regression/beam-subdivide-quarter-notes.ly b/input/regression/beam-subdivide-quarter-notes.ly index a69dcf0390..29599835f9 100644 --- a/input/regression/beam-subdivide-quarter-notes.ly +++ b/input/regression/beam-subdivide-quarter-notes.ly @@ -1,10 +1,10 @@ \version "2.19.32" \header { - + doctitle = "Beam subdivide over quarter notes" - texidoc = "Beam count at subdivisions should match the location + texidoc = "Beam count at subdivisions should match the location of the current subdivision. However, if the groups are equal or longer than quarter notes, one beam should always be left." diff --git a/input/regression/beam-subdivide-shortened-beam.ly b/input/regression/beam-subdivide-shortened-beam.ly index 665d837442..fb15a75ebe 100644 --- a/input/regression/beam-subdivide-shortened-beam.ly +++ b/input/regression/beam-subdivide-shortened-beam.ly @@ -1,10 +1,10 @@ \version "2.19.34" \header { - + doctitle = "Beam subdivide with incomplete remainder" - texidoc = "Beam count at subdivisions should match the count corresponding + texidoc = "Beam count at subdivisions should match the count corresponding to the location of the current subdivision. However, if the remainder of the beam is shorter than that the beam count should be adopted accordingly." @@ -19,7 +19,7 @@ beam is shorter than that the beam count should be adopted accordingly." \time 1/4 \set subdivideBeams = ##t \set baseMoment = #(ly:make-moment 1/32) - c64 ^\markup "Full beam (1/32 division)" [ c c c c c c c c c c c c c c c ] + c64 ^\markup "Full beam (1/32 division)" [ c c c c c c c c c c c c c c c ] c64 ^\markup "Shortened by 1/32" [ c c c c c c c c c c c c c ] r32 c64 ^\markup "Shortened by 3/32" [ c c c c c c c c c ] r16. \set baseMoment = #(ly:make-moment 1/16) diff --git a/input/regression/beam-subdivide-trailing-stem.ly b/input/regression/beam-subdivide-trailing-stem.ly index de6d6bd1d2..c09dad4eb9 100644 --- a/input/regression/beam-subdivide-trailing-stem.ly +++ b/input/regression/beam-subdivide-trailing-stem.ly @@ -1,7 +1,7 @@ \version "2.19.34" \header { - + doctitle = "Beam subdivide over quarter notes" texidoc = "If in a subdivided beam one single stem follows a subdivision diff --git a/input/regression/beam-subdivision.ly b/input/regression/beam-subdivision.ly index e7dd0a7b73..c88eab152c 100644 --- a/input/regression/beam-subdivision.ly +++ b/input/regression/beam-subdivision.ly @@ -1,6 +1,6 @@ \header { - texidoc = "Beam count at subdivisions should match the location + texidoc = "Beam count at subdivisions should match the location of the current subdivision." } @@ -10,7 +10,7 @@ of the current subdivision." ragged-right = ##t } -{ +{ \set subdivideBeams = ##t \set baseMoment = #(ly:make-moment 1 4) c''32[^\markup{"baseMoment 1/4"} c'' c'' c'' c'' c'' c'' c''] diff --git a/lily/beaming-pattern.cc b/lily/beaming-pattern.cc index a889990525..46a46a5d2e 100644 --- a/lily/beaming-pattern.cc +++ b/lily/beaming-pattern.cc @@ -166,17 +166,17 @@ Beaming_pattern::beamify (Beaming_options const &options) Direction non_flag_dir = -flag_directions[i]; if (non_flag_dir) { - int count = - (infos_[i + 1].rhythmic_importance_ < 0 && + int count = + (infos_[i + 1].rhythmic_importance_ < 0 && options.subdivide_beams_) - // we're left of a subdivision + // we're left of a subdivision ? (i != infos_.size () - 2) - // respect the beam count for shortened beams ... + // respect the beam count for shortened beams ... ? max (beam_count_for_rhythmic_position (i + 1), beam_count_for_length (remaining_length (i + 1))) // ... except if there's only one trailing stem : beam_count_for_rhythmic_position (i + 1) - + // we're at any other stem : min (min (infos_[i].count (non_flag_dir), infos_[i + non_flag_dir].count (-non_flag_dir)), @@ -184,7 +184,7 @@ Beaming_pattern::beamify (Beaming_options const &options) // Ensure at least one beam is left, even for groups longer than 1/8 count = max (count, 1); - + infos_[i].beam_count_drul_[non_flag_dir] = count; } } @@ -386,7 +386,7 @@ Beaming_pattern::beam_count_for_rhythmic_position (int idx) const return intlog2(infos_[idx].start_moment_.main_part_.den()) - 2; } -int +int Beaming_pattern::beam_count_for_length (Moment len) const { return intlog2(len.main_part_.den()) - 2 - intlog2(len.main_part_.num()); -- 2.39.2