X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdynamic-engraver.cc;h=94057f0bde25ebe7ca50288758c73233d4c4f003;hb=9c4b0d53715d94ee923729eb40416ea90f71516c;hp=7a5b5762789ef6f6d144d5f9f18031cbf53fb325;hpb=1d3e2b0d973503e7ff7a18717e059ff826d30f1b;p=lilypond.git

diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index 7a5b576278..94057f0bde 100644
--- a/lily/dynamic-engraver.cc
+++ b/lily/dynamic-engraver.cc
@@ -8,6 +8,7 @@
 
 #include "axis-group-interface.hh"
 #include "context.hh"
+#include "engraver.hh"
 #include "dimensions.hh"
 #include "directional-element-interface.hh"
 #include "engraver.hh"
@@ -176,6 +177,7 @@ Dynamic_engraver::process_music ()
 	    }
 
 	  finished_cresc_ = cresc_;
+	  announce_end_grob (finished_cresc_, SCM_EOL);
 	  cresc_ = 0;
 	  current_cresc_ev_ = 0;
 	}
@@ -252,7 +254,7 @@ Dynamic_engraver::process_music ()
 	      cresc_->set_property ("style", s);
 	      context ()->set_property ((start_type
 					 + "Spanner").c_str (), SCM_EOL);
-	      s = get_property ((start_type + "Text").c_str ());
+ 	      s = get_property ((start_type + "Text").c_str ());
 	      if (Text_interface::is_markup (s))
 		{
 		  cresc_->set_property ("text", s);
@@ -263,9 +265,9 @@ Dynamic_engraver::process_music ()
 	      if (script_)
 		{
 		  set_nested_property (cresc_,
-				       scm_list_3 (ly_symbol2scm ("attach-dir"),
+				       scm_list_3 (ly_symbol2scm ("bound-details"),
 						   ly_symbol2scm ("left"),
-						   ly_symbol2scm ("bound-details")
+						   ly_symbol2scm ("attach-dir")
 						   ),
 				       scm_from_int (RIGHT));
 		}
@@ -276,7 +278,6 @@ Dynamic_engraver::process_music ()
 	      cresc_->set_bound (LEFT, script_);
 	      add_bound_item (line_spanner_, cresc_->get_bound (LEFT));
 	    }
-
 	  Axis_group_interface::add_element (line_spanner_, cresc_);
 	}
     }
@@ -335,25 +336,10 @@ Dynamic_engraver::typeset_all ()
 {
   if (finished_cresc_)
     {
-      bool use_bar = to_boolean (get_property ("hairpinToBarline"))
-	&& scm_is_string (get_property ("whichBar"))
-	&& !script_ev_;
-			  
-      
-      if (!finished_cresc_->get_bound (RIGHT)
-	  || use_bar)
+      if (!finished_cresc_->get_bound (RIGHT))
 	{
 	  	  
-	  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"));
+	  Grob *column_bound = unsmob_grob (get_property ("currentMusicalColumn"));
 	  
 	  finished_cresc_->set_bound (RIGHT, script_
 				      ? script_
@@ -397,7 +383,6 @@ Dynamic_engraver::typeset_all ()
 	  finished_line_spanner_->set_bound (RIGHT, ci);
 	  finished_line_spanner_->set_bound (LEFT, ci);
 	}
-
       finished_line_spanner_ = 0;
     }
 }
@@ -444,15 +429,21 @@ ADD_ACKNOWLEDGER (Dynamic_engraver, note_column);
 
 ADD_TRANSLATOR (Dynamic_engraver,
 		/* 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.  ",
+		"Create hairpins, dynamic texts, and their vertical"
+		" alignments.  The symbols are collected onto a"
+		" @code{DynamicLineSpanner} grob which takes care of vertical"
+		" positioning.",
 
 		/* create */
 		"DynamicLineSpanner "
+		"DynamicTextSpanner "
 		"DynamicText "
 		"Hairpin "
 		"TextSpanner ",
 
-		/* read */ "",
-		/* write */ "");
+		/* read */
+		"",
+
+		/* write */
+		""
+		);