release: 1.1.20

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

diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc
index 7353da47f8738ce684fef026628b0307646a2520..3165cf66607c863992c029adb4a2182d3526ae41 100644 (file)
--- a/lily/beam-engraver.cc
+++ b/lily/beam-engraver.cc
@@ -63,6 +63,20 @@ Beam_engraver::do_process_requests ()
       if (prop.isnum_b ()) 
        beam_p_->quantisation_ = (Beam::Quantisation)(int)prop;
  
+      // silly try at interstaff beam
+      // must set minVerticalAlign == maxVerticalAlign to get sane results
+      // see input/test/beam-interstaff.ly
+      prop = get_property ("minVerticalAlign", 0);
+      if (prop.isnum_b ())
+       beam_p_->vertical_align_f_ = prop;
+
+      prop = get_property ("maxVerticalAlign", 0);
+      if (prop.isnum_b ())
+       {
+         beam_p_->vertical_align_f_ += (Real)prop;
+         beam_p_->vertical_align_f_ /= (Real)2;
+       }
+
       announce_element (Score_element_info (beam_p_, reqs_drul_[START]));
     }
 }
@@ -132,6 +146,7 @@ Beam_engraver::acknowledge_element (Score_element_info info)
        if (rhythmic_req->duration_.durlog_i_<= 2)
          {
            rhythmic_req->warning (_ ("stem doesn't fit in beam"));
+           reqs_drul_[LEFT]->warning (_("beam was started here"));
            return;
          }