X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdynamic-engraver.cc;h=20e69400dba54792f65f635f53aee4db7addc82f;hb=b5e1d63092238f020afab1378596c1ba5b7a3b83;hp=1181fb15f1ff74d4926a1f27981bf28cbb0e7ede;hpb=2536405e9584f63d559653183971c0fec57ba037;p=lilypond.git

diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index 1181fb15f1..20e69400db 100644
--- a/lily/dynamic-engraver.cc
+++ b/lily/dynamic-engraver.cc
@@ -11,12 +11,8 @@
 #include "dimensions.hh"
 #include "directional-element-interface.hh"
 #include "engraver.hh"
-#include "event.hh"
-#include "group-interface.hh"
 #include "hairpin.hh"
 #include "interval.hh"
-#include "item.hh"
-#include "slur.hh"
 #include "note-column.hh"
 #include "paper-column.hh"
 #include "script-interface.hh"
@@ -45,7 +41,6 @@ class Dynamic_engraver : public Engraver
 {
   Item *script_;
   Spanner *line_spanner_;
-  Spanner *slur_;
   Spanner *cresc_;
 
   Spanner *finished_line_spanner_;
@@ -77,12 +72,11 @@ protected:
 Dynamic_engraver::Dynamic_engraver ()
 {
   script_ = 0;
-  slur_ = 0;
   finished_cresc_ = 0;
   line_spanner_ = 0;
   finished_line_spanner_ = 0;
   current_cresc_ev_ = 0;
-  cresc_ =0;
+  cresc_ = 0;
 
   script_ev_ = 0;
   accepted_spanreqs_drul_[START] = 0;
@@ -339,7 +333,7 @@ Dynamic_engraver::typeset_all ()
 	    add_bound_item (finished_line_spanner_,
 			    finished_cresc_->get_bound (RIGHT));
 	}
-      finished_cresc_ =0;
+      finished_cresc_ = 0;
     }
   
   script_ = 0;
@@ -398,7 +392,7 @@ Dynamic_engraver::acknowledge_grob (Grob_info info)
 	{
 	  SCM head = scm_last_pair (info.grob_->get_property ("note-heads"));
 	  if (scm_is_pair (head))
-	    script_->set_parent (unsmob_grob (ly_car (head)),  X_AXIS);
+	    script_->set_parent (unsmob_grob (scm_car (head)),  X_AXIS);
 	}
 
 
@@ -424,11 +418,9 @@ Dynamic_engraver::acknowledge_grob (Grob_info info)
 	  < scm_to_int (script_->get_property ("script-priority")))
 	Side_position_interface::add_support (line_spanner_, info.grob_);
     }
-  else if (Slur::has_interface (info.grob_))
-    slur_ = dynamic_cast<Spanner*> (info.grob_);
 }
 
-ENTER_DESCRIPTION (Dynamic_engraver,
+ADD_TRANSLATOR (Dynamic_engraver,
 /* descr */       
 "This engraver creates hairpins, dynamic texts, and their vertical\n"
 "alignments.  The symbols are collected onto a DynamicLineSpanner grob\n"
@@ -437,6 +429,6 @@ ENTER_DESCRIPTION (Dynamic_engraver,
 		  
 /* creats*/       "DynamicLineSpanner DynamicText Hairpin TextSpanner",
 /* accepts */     "absolute-dynamic-event crescendo-event decrescendo-event",
-/* acks  */      "note-column-interface script-interface slur-interface",
+/* acks  */      "note-column-interface script-interface",
 /* reads */       "",
 /* write */       "");