X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdynamic-engraver.cc;h=04bae193165c877a8bcaaf33095873c08ebb65a2;hb=75eebcb49e52d296b1da3e1074e0825d2c780db4;hp=fc5c2ebefc3bb6704a59b3a950a351a4e0e4d67c;hpb=83ed05cef3bfcbd69f4148e8ee0669ca0664e214;p=lilypond.git

diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index fc5c2ebefc..04bae19316 100644
--- a/lily/dynamic-engraver.cc
+++ b/lily/dynamic-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "axis-group-interface.hh"
@@ -60,15 +60,16 @@ class Dynamic_engraver : public Engraver
   void typeset_all ();
 
   TRANSLATOR_DECLARATIONS (Dynamic_engraver);
-  DECLARE_ACKNOWLEDGER(script);
-  DECLARE_ACKNOWLEDGER(note_column);
-
+  DECLARE_ACKNOWLEDGER (script);
+  DECLARE_ACKNOWLEDGER (stem_tremolo);
+  DECLARE_ACKNOWLEDGER (note_column);
+  DECLARE_ACKNOWLEDGER (slur);
 
 protected:
   virtual void finalize ();
   virtual bool try_music (Music *event);
-  PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
-  PRECOMPUTED_VIRTUAL void process_music ();
+  void stop_translation_timestep ();
+  void process_music ();
 };
 
 Dynamic_engraver::Dynamic_engraver ()
@@ -118,7 +119,6 @@ Dynamic_engraver::process_music ()
 	{
 	  Music *rq = accepted_spanevents_drul_[START];
 	  line_spanner_ = make_spanner ("DynamicLineSpanner", rq ? rq->self_scm () : SCM_EOL);
-
 	  if (script_ev_)
 	    rq = script_ev_;
 	}
@@ -145,6 +145,8 @@ Dynamic_engraver::process_music ()
 
       if (Direction d = to_dir (script_ev_->get_property ("direction")))
 	set_grob_direction (line_spanner_, d);
+      else if (Direction d = to_dir (line_spanner_->get_property ("direction")))
+	set_grob_direction (script_, d);
 
       Axis_group_interface::add_element (line_spanner_, script_);
     }
@@ -168,7 +170,7 @@ Dynamic_engraver::process_music ()
 	      cresc_->set_bound (RIGHT, script_);
 	      add_bound_item (line_spanner_, script_);
 	    }
-	  
+
 	  finished_cresc_ = cresc_;
 	  cresc_ = 0;
 	  current_cresc_ev_ = 0;
@@ -228,8 +230,8 @@ Dynamic_engraver::process_music ()
 						     finished_cresc_);
 		}
 	      cresc_->set_property ("grow-direction",
-				    scm_int2num ((start_type == "crescendo")
-						 ? BIGGER : SMALLER));
+				    scm_from_int ((start_type == "crescendo")
+						  ? BIGGER : SMALLER));
 	    }
 
 	  /*
@@ -276,7 +278,7 @@ Dynamic_engraver::stop_translation_timestep ()
       finished_line_spanner_ = line_spanner_;
       line_spanner_ = 0;
     }
-  
+
   typeset_all ();
 
   if (cresc_ && !cresc_->get_bound (LEFT))
@@ -369,6 +371,23 @@ Dynamic_engraver::typeset_all ()
     }
 }
 
+
+void
+Dynamic_engraver::acknowledge_stem_tremolo (Grob_info info)
+{
+  if (line_spanner_)
+    Side_position_interface::add_support (line_spanner_, info.grob ());
+}
+
+
+void
+Dynamic_engraver::acknowledge_slur (Grob_info info)
+{
+  if (line_spanner_)
+    Side_position_interface::add_support (line_spanner_, info.grob ());
+}
+
+
 void
 Dynamic_engraver::acknowledge_note_column (Grob_info info)
 {
@@ -386,13 +405,11 @@ Dynamic_engraver::acknowledge_note_column (Grob_info info)
   if (script_ && !script_->get_parent (X_AXIS))
     {
       extract_grob_set (info.grob (), "note-heads", heads);
-      if (heads.size())
+      if (heads.size ())
 	{
 	  Grob *head = heads[0];
 	  script_->set_parent (head, X_AXIS);
-	  script_->add_offset_callback (Self_alignment_interface::centered_on_parent_proc,
-					X_AXIS);
-
+	  Self_alignment_interface::set_center_parent (script_, X_AXIS);
 	}
     }
 
@@ -406,9 +423,7 @@ Dynamic_engraver::acknowledge_note_column (Grob_info info)
     }
 
   if (finished_cresc_ && !finished_cresc_->get_bound (RIGHT))
-    {
-      finished_cresc_->set_bound (RIGHT, info.grob ());
-    }
+    finished_cresc_->set_bound (RIGHT, info.grob ());
 }
 
 void
@@ -430,18 +445,18 @@ Dynamic_engraver::acknowledge_script (Grob_info info)
     Side_position_interface::add_support (line_spanner_, info.grob ());
 }
 
-
-ADD_ACKNOWLEDGER(Dynamic_engraver,script);
-ADD_ACKNOWLEDGER(Dynamic_engraver,note_column);
+ADD_ACKNOWLEDGER (Dynamic_engraver, script);
+ADD_ACKNOWLEDGER (Dynamic_engraver, note_column);
+ADD_ACKNOWLEDGER (Dynamic_engraver, slur);
+ADD_ACKNOWLEDGER (Dynamic_engraver, stem_tremolo);
 
 ADD_TRANSLATOR (Dynamic_engraver,
-		/* descr */
+		/* doc */
 		"This engraver creates hairpins, dynamic texts, and their vertical\n"
 		"alignments.  The symbols are collected onto a DynamicLineSpanner grob\n"
 		"which takes care of vertical positioning.  ",
 
-		/* creats*/ "DynamicLineSpanner DynamicText Hairpin TextSpanner",
-		/* accepts */ "absolute-dynamic-event crescendo-event decrescendo-event",
-		/* acks  */ "note-column-interface script-interface",
-		/* reads */ "",
+		/* create */ "DynamicLineSpanner DynamicText Hairpin TextSpanner",
+		/* accept */ "absolute-dynamic-event crescendo-event decrescendo-event",
+		/* read */ "",
 		/* write */ "");