diff options
| author | Urs Liska <ul@openlilylib.org> | 2015-12-28 15:58:09 +0100 |
|---|---|---|
| committer | Urs Liska <ul@openlilylib.org> | 2015-12-28 15:58:09 +0100 |
| commit | 73d4697d0b91c1743e2d3dc31e1c4e87ce03da7b (patch) | |
| tree | c306c3525bf090a3ba8782f8086198b4c13025e1 | |
| parent | c8a49d69fa78ca3e6b0ce5feec76dcbd2e64b64d (diff) | |
4704: Partially revert 0382ed88: "Adjust beam subdivision"
0382ed88 erroneously reverted behaviour implemented in
issue 4355, commit 8fa2d858.
This commit reverts to the behaviour after issue 4355.
| -rw-r--r-- | lily/beaming-pattern.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lily/beaming-pattern.cc b/lily/beaming-pattern.cc index a501c6ad37..135438e063 100644 --- a/lily/beaming-pattern.cc +++ b/lily/beaming-pattern.cc @@ -132,8 +132,6 @@ 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_) @@ -169,8 +167,9 @@ 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_) - ? subdivide_beam_count + ? max(start_dur,3)-2 // 1/8 note has one beam : 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)); |