X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdynamic-engraver.cc;h=18ebeda94301a50fa6bf962f50da52b6dd633a09;hb=4d246c3598feaa9918d01faf4bb6614e60a5cbcf;hp=50cde13ea3b2833a26c290a5851e09570c70eb65;hpb=f246d4ebb4d5d60a7143e3a1705ca720a24a1e7d;p=lilypond.git

diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index 50cde13ea3..18ebeda943 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--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "axis-group-interface.hh"
@@ -23,6 +23,8 @@
 #include "staff-symbol-referencer.hh"
 #include "stream-event.hh"
 #include "warn.hh"
+#include "spanner.hh"
+#include "text-interface.hh"
 
 #include "translator.icc"
 
@@ -62,11 +64,7 @@ class Dynamic_engraver : public Engraver
   void typeset_all ();
 
   TRANSLATOR_DECLARATIONS (Dynamic_engraver);
-  DECLARE_ACKNOWLEDGER (accidental);
-  DECLARE_ACKNOWLEDGER (script);
-  DECLARE_ACKNOWLEDGER (stem_tremolo);
   DECLARE_ACKNOWLEDGER (note_column);
-  DECLARE_ACKNOWLEDGER (slur);
   DECLARE_TRANSLATOR_LISTENER (absolute_dynamic);
   DECLARE_TRANSLATOR_LISTENER (span_dynamic);
 
@@ -183,7 +181,7 @@ Dynamic_engraver::process_music ()
 	}
       else if (accepted_spanevents_drul_[STOP])
 	{
-	  accepted_spanevents_drul_[STOP]->origin ()->warning (_ ("can't find start of (de)crescendo"));
+	  accepted_spanevents_drul_[STOP]->origin ()->warning (_ ("cannot find start of (de)crescendo"));
 	  stop_ev = 0;
 	}
     }
@@ -255,16 +253,22 @@ Dynamic_engraver::process_music ()
 	      context ()->set_property ((start_type
 					 + "Spanner").c_str (), SCM_EOL);
 	      s = get_property ((start_type + "Text").c_str ());
-	      /*
-		FIXME: use get_markup () to check type.
-	      */
-	      if (scm_is_string (s) || scm_is_pair (s))
+	      if (Text_interface::is_markup (s))
 		{
-		  cresc_->set_property ("edge-text",
-					scm_cons (s, scm_makfrom0str ("")));
+		  cresc_->set_property ("text", s);
 		  context ()->set_property ((start_type + "Text").c_str (),
 					    SCM_EOL);
 		}
+
+	      if (script_)
+		{
+		  set_nested_property (cresc_,
+				       scm_list_3 (ly_symbol2scm ("bound-details"),
+						   ly_symbol2scm ("left"),
+						   ly_symbol2scm ("attach-dir")
+						   ),
+				       scm_from_int (RIGHT));
+		}
 	    }
 
 	  if (script_)
@@ -339,10 +343,18 @@ Dynamic_engraver::typeset_all ()
       if (!finished_cresc_->get_bound (RIGHT)
 	  || use_bar)
 	{
-	  Grob *column_bound = unsmob_grob (use_bar
-					    ? get_property ("currentCommandColumn")
-					    : get_property ("currentMusicalColumn"));
-	    
+	  	  
+	  Grob *column_bound = 0;
+	  if (use_bar)
+	    {
+	      column_bound = unsmob_grob (get_property ("breakableSeparationItem"));
+	    }
+	  
+	  if (!column_bound)
+	    column_bound = unsmob_grob (use_bar
+					? get_property ("currentCommandColumn")
+					: get_property ("currentMusicalColumn"));
+	  
 	  finished_cresc_->set_bound (RIGHT, script_
 				      ? script_
 				      : column_bound);
@@ -390,31 +402,6 @@ Dynamic_engraver::typeset_all ()
     }
 }
 
-
-void
-Dynamic_engraver::acknowledge_accidental (Grob_info info)
-{
-  if (line_spanner_)
-    Side_position_interface::add_support (line_spanner_, info.grob ());
-}
-
-
-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)
 {
@@ -453,30 +440,7 @@ Dynamic_engraver::acknowledge_note_column (Grob_info info)
     finished_cresc_->set_bound (RIGHT, info.grob ());
 }
 
-void
-Dynamic_engraver::acknowledge_script (Grob_info info)
-{
-  if (!line_spanner_ || !script_)
-    return;
-
-  SCM p = info.grob ()->get_property ("script-priority");
-
-  /*
-    UGH.
-
-    DynamicText doesn't really have a script-priority field.
-  */
-  if (scm_is_number (p)
-      && scm_to_int (p)
-      < scm_to_int (script_->get_property ("script-priority")))
-    Side_position_interface::add_support (line_spanner_, info.grob ());
-}
-
-ADD_ACKNOWLEDGER (Dynamic_engraver, accidental);
-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,
 		/* doc */