Fix whitespace errors introduced in issue 4704

Commits for this issue introduced whitespace errors,
these should be fixed here:

73d4697d
29022d7b
9b8b5c2e
4b994f8a
706d7978

diff --git a/Documentation/snippets/new/subdividing-beams.ly b/Documentation/snippets/new/subdividing-beams.ly
index 94cdccf72412cee66917aaa241b609b8f0cee752..0030c5a1cb3f866f1f3348f3943e5d52bbbc9063 100644 (file)
--- 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 a69dcf039046ff7a4606305ffdedae3685e3b5ad..29599835f9f9788da5cc0b60f043d59a8ec51e31 100644 (file)
--- 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 665d837442e8aeb76d3720c89472eb7686abc92c..fb15a75ebe895b5333aa93ba5ff128fed20cda52 100644 (file)
--- 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 de6d6bd1d28690e9f8bcef9f2f1abac8b9a04247..c09dad4eb9a879a5d03d5683c5a2ff75c3fd50b5 100644 (file)
--- 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 e7dd0a7b73a4b4a698fd4c7dc04f167e483d10ae..c88eab152c79468f1215b03d4be23cea2c126cd2 100644 (file)
--- 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 a8899905252317ec33db0e5bccde330fec7ee7c4..46a46a5d2ea529aa4c1e09836413f4ee0b708d05 100644 (file)
--- 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());