release: 1.1.15

[lilypond.git] / lily / abbreviation-beam-engraver.cc

diff --git a/lily/abbreviation-beam-engraver.cc b/lily/abbreviation-beam-engraver.cc
index 5f2b7f4b805c291aaf4501fd9e6e9a53d0eeb28b..391a101503adeb72325f7d84cc2b648b096a9146 100644 (file)
--- a/lily/abbreviation-beam-engraver.cc
+++ b/lily/abbreviation-beam-engraver.cc
@@ -32,7 +32,7 @@ Abbreviation_beam_engraver::do_try_music (Music*r)
   if (!b)
     return false;
 
-  if (bool (abeam_p_) == bool (b->spantype == Span_req::START))
+  if (bool (abeam_p_) == bool (b->spantype_ == START))
     return false;
 
   Direction d = (!abeam_p_) ? LEFT : RIGHT;
@@ -84,10 +84,7 @@ Abbreviation_beam_engraver::acknowledge_element (Score_element_info i)
 
   int type_i = span_reqs_drul_[LEFT]->type_i_;
   s->flag_i_ = intlog2 (type_i) - 2;
-  if (span_reqs_drul_[RIGHT])
-    s->beams_left_i_ = s->flag_i_;
-  else
-    s->beams_right_i_ = s->flag_i_;
+  s->beams_i_drul_[(span_reqs_drul_[RIGHT]) ? LEFT: RIGHT] = s->flag_i_;
 
   abeam_p_->multiple_i_ = s->flag_i_;
   if (s->type_i () != 1) // no abbrev gaps on half note