Doc: Usage - OOoLilyPond only works up to v4

[lilypond.git] / lily / beaming-pattern.cc

diff --git a/lily/beaming-pattern.cc b/lily/beaming-pattern.cc
index 1dcb791a8d9ca6bc836a10a1276373a4ab47c6ed..cb8c91dbece9de761ba7a5d1421e4f5e8c12987c 100644 (file)
--- a/lily/beaming-pattern.cc
+++ b/lily/beaming-pattern.cc
@@ -132,6 +132,8 @@ Beaming_pattern::beamify (Beaming_options const &options)
   if (infos_.size () <= 1)
     return;
 
+  int subdivide_beam_count = intlog2(options.base_moment_.main_part_.den())-2;
+
   unbeam_invisible_stems ();
 
   if (infos_[0].start_moment_.grace_part_)
@@ -167,9 +169,8 @@ Beaming_pattern::beamify (Beaming_options const &options)
         if (non_flag_dir)
           {
             int importance = infos_[i + 1].rhythmic_importance_;
-            int start_dur = intlog2(infos_[i+1].start_moment_.main_part_.den());
             int count = (importance < 0 && options.subdivide_beams_) 
-                        ? max(start_dur,3)-2 // 1/8 note has one beam
+                        ? subdivide_beam_count
                         : min (min (infos_[i].count (non_flag_dir),
                                         infos_[i + non_flag_dir].count (-non_flag_dir)),
                                    infos_[i - non_flag_dir].count (non_flag_dir));