release: 1.1.43

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

diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc
index 1fd4be94400790128ef2e0c732cac49f97da6ecc..3a74ab95cbcecab75d9b6a3256642c5b2cd58907 100644 (file)
--- a/lily/auto-beam-engraver.cc
+++ b/lily/auto-beam-engraver.cc
@@ -173,22 +173,12 @@ Auto_beam_engraver::create_beam_p ()
   /* urg, copied from Beam_engraver */
   Scalar prop = get_property ("beamslopedamping", 0);
   if (prop.isnum_b ()) 
-    beam_p->damping_i_ = prop;
+    beam_p->set_elt_property (damping_scm_sym, gh_int2scm( prop));
 
   prop = get_property ("beamquantisation", 0);
   if (prop.isnum_b ()) 
     beam_p->quantisation_ = (Beam::Quantisation)(int)prop;
  
-  // 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_drul_[MIN] = prop;
-
-  prop = get_property ("maxVerticalAlign", 0);
-  if (prop.isnum_b ())
-    beam_p->vertical_align_drul_[MAX] = prop;
-
   announce_element (Score_element_info (beam_p, 0));
   return beam_p;
 }
@@ -196,10 +186,8 @@ Auto_beam_engraver::create_beam_p ()
 void
 Auto_beam_engraver::end_beam ()
 {
-  DOUT << String ("ending autobeam at: ") + now_mom ().str () + "\n";
   if (stem_l_arr_p_->size () < 2)
     {
-      DOUT << "junking autombeam: less than two stems\n";
       junk_beam ();
     }
   else
@@ -246,7 +234,6 @@ Auto_beam_engraver::do_removal_processing ()
   typeset_beam ();
   if (stem_l_arr_p_ && stem_l_arr_p_->size ())
     {
-      DOUT << "Unfinished beam\n";
       junk_beam ();
     }
 }
@@ -258,7 +245,6 @@ Auto_beam_engraver::acknowledge_element (Score_element_info info)
     {
       if (stem_l_arr_p_)
        {
-         DOUT << "junking autobeam: beam encountered\n";
          junk_beam ();
        }
     }
@@ -266,7 +252,6 @@ Auto_beam_engraver::acknowledge_element (Score_element_info info)
     {
       if (stem_l_arr_p_)
        {
-         DOUT << "junking autobeam: bar encountered\n";
          junk_beam ();
        }
     }
@@ -279,7 +264,6 @@ Auto_beam_engraver::acknowledge_element (Score_element_info info)
 
       if (dynamic_cast<Rest *> (info.elem_l_))
        {
-         DOUT << "junking autobeam: rest encountered\n";
          end_beam ();
          return;
        }
@@ -290,7 +274,6 @@ Auto_beam_engraver::acknowledge_element (Score_element_info info)
 
       if (stem_l->beam_l_)
        {
-         DOUT << "junking autobeam: beamed stem encountered\n";
          junk_beam ();
          return;
        }
@@ -302,7 +285,6 @@ Auto_beam_engraver::acknowledge_element (Score_element_info info)
        */
       if (rhythmic_req->duration_.durlog_i_ <= 2)
        {
-         DOUT << "ending autobeam: stem doesn't fit in beam\n";
          end_beam ();
          return;
        }
@@ -310,7 +292,6 @@ Auto_beam_engraver::acknowledge_element (Score_element_info info)
       Moment start = get_staff_info().time_C_->whole_in_measure_;
       if (!grouping_p_->child_fit_b (start))
        {
-         DOUT << "ending autobeam: stem doesn't fit in group\n";
          end_beam ();
        }
       else
@@ -360,13 +341,10 @@ Auto_beam_engraver::process_acknowledged ()
       if ((extend_mom_ < now)
          || ((extend_mom_ == now) && (last_add_mom_ != now )))
        {
-         DOUT << String ("junking autobeam: no stem added since: ")
-           + last_add_mom_.str () + "\n";
          end_beam ();
        }
       else if (!stem_l_arr_p_->size ())
        {
-         DOUT << "junking started autobeam: no stems\n";
          junk_beam ();
        }
     }