release: 1.1.15

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

diff --git a/lily/plet-engraver.cc b/lily/plet-engraver.cc
index 0693b5017d36054a040ef47684fe9e71beaeb2a9..ff855674b563b46d37457aefe58c94bb78c2ec8b 100644 (file)
--- a/lily/plet-engraver.cc
+++ b/lily/plet-engraver.cc
@@ -1,3 +1,4 @@
+#if 0
 /*
   plet-engraver.cc -- implement Plet_engraver
 
@@ -13,7 +14,7 @@
 #include "score-column.hh"
 #include "stem.hh"
 
-IMPLEMENT_IS_TYPE_B1 (Plet_engraver,Engraver);
+
 ADD_THIS_TRANSLATOR (Plet_engraver);
 
 Plet_engraver::Plet_engraver ()
@@ -44,7 +45,7 @@ Plet_engraver::acknowledge_element (Score_element_info i)
 }
 
 bool
-Plet_engraver::do_try_request (Request* req_l)
+Plet_engraver::do_try_music (Music* req_l)
 {
   /*
     UGH! This is incorrect!
@@ -53,9 +54,9 @@ Plet_engraver::do_try_request (Request* req_l)
   Beam_req* b = dynamic_cast <Beam_req *> (req_l);
   if (b)
     {
-      if (b->spantype)
+      if (b->spantype_)
         {
-          Direction d = (Direction)(((int)(b->spantype - 1)) * 2 - 1);
+          Direction d = (Direction)(((int)(b->spantype_ - 1)) * 2 - 1);
           beam_mom_drul_[d] = get_staff_info ().musical_l ()->when ();
        }
       return false;
@@ -65,11 +66,11 @@ Plet_engraver::do_try_request (Request* req_l)
   if (!p)
     return false;
 
-  if (bool (plet_spanner_p_) == bool (p->spantype == Span_req::START))
+  if (bool (plet_spanner_p_) == bool (p->spantype_ == START))
     return false;
 
   Direction d = (!plet_spanner_p_) ? LEFT : RIGHT;
-  if (span_reqs_drul_[d] && !span_reqs_drul_[d]->equal_b (req_l))
+  if (span_reqs_drul_[d] && !span_reqs_drul_[d]->equal_b (p))
     return false;
 
   span_reqs_drul_[d] = p;
@@ -128,3 +129,4 @@ Plet_engraver::do_pre_move_processing ()
   span_reqs_drul_[RIGHT] = span_reqs_drul_[LEFT] = 0;
 }
 
+#endif