release: 0.1.39

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

diff --git a/lily/beam-grav.cc b/lily/beam-grav.cc
index ffa1cda9e2958eb7b6945e6e628da17f7c40ebc1..2d931e150fd1a8481c41a2357ffd7fc7b56c68d9 100644 (file)
--- a/lily/beam-grav.cc
+++ b/lily/beam-grav.cc
@@ -50,39 +50,37 @@ Beam_engraver::do_try_request(Request*r)
 void
 Beam_engraver::do_process_requests()
 {
-  if ( !beam_p_ && span_reqs_drul_[LEFT]) {
-    current_grouping_p_ = new Rhythmic_grouping;
-    beam_p_ = new Beam;
-    if (span_reqs_drul_[LEFT]->nplet)
-      {
-       plet_spanner_p_ = new Text_spanner();
-       Text_def *defp = new Text_def;
-       plet_spanner_p_->set_support (beam_p_);
-
-       // ugh
-       plet_spanner_p_->set_bounds (LEFT, get_staff_info ().command_pcol_l ());
+  if ( !beam_p_ && span_reqs_drul_[LEFT])
+    {
+      current_grouping_p_ = new Rhythmic_grouping;
+      beam_p_ = new Beam;
+      if (span_reqs_drul_[LEFT]->nplet)
+       {
+         plet_spanner_p_ = new Text_spanner;
+         Text_def *defp = new Text_def;
+         plet_spanner_p_->set_support (beam_p_);
        
-       defp->align_i_ = 0;
-       defp->text_str_ = span_reqs_drul_[LEFT]->nplet;
-       defp->style_str_="italic";
-       plet_spanner_p_->spec_p_  = defp;
-       announce_element (Score_elem_info(plet_spanner_p_,0));
-      }
+         defp->align_i_ = 0;
+         defp->text_str_ = span_reqs_drul_[LEFT]->nplet;
+         defp->style_str_="italic";
+         plet_spanner_p_->spec_p_  = defp;
+         announce_element (Score_elem_info(plet_spanner_p_,0));
+       }
 
       Scalar prop = get_property ("beamslopedamping");
       if (prop.isnum_b ()) 
-      {
-       beam_p_->damping_i_ = prop;
-      }
+       {
+         beam_p_->damping_i_ = prop;
+       }
 
       prop = get_property ("beamquantisaton");
       if (prop.isnum_b ()) 
-      {
-       beam_p_->quantisation_ = (Beam::Quantise)(int)prop;
-      }
+       {
+         beam_p_->quantisation_ = (Beam::Quantise)(int)prop;
+       }
      
-    announce_element (Score_elem_info (beam_p_, span_reqs_drul_[LEFT]));
-  }
+      announce_element (Score_elem_info (beam_p_, span_reqs_drul_[LEFT]));
+    }
 }
 
 void