Fix 417.

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

diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index fd22a33bf60f557ba73a4355310edda7708a57e1..fe6c2d029be69e396027b0b0d85d4f52abc96d2c 100644 (file)
--- a/lily/dynamic-engraver.cc
+++ b/lily/dynamic-engraver.cc
@@ -64,10 +64,7 @@ class Dynamic_engraver : public Engraver
   void typeset_all ();
 
   TRANSLATOR_DECLARATIONS (Dynamic_engraver);
-  DECLARE_ACKNOWLEDGER (accidental);
-  DECLARE_ACKNOWLEDGER (stem_tremolo);
   DECLARE_ACKNOWLEDGER (note_column);
-  DECLARE_ACKNOWLEDGER (slur);
   DECLARE_TRANSLATOR_LISTENER (absolute_dynamic);
   DECLARE_TRANSLATOR_LISTENER (span_dynamic);
 
@@ -179,6 +176,15 @@ Dynamic_engraver::process_music ()
            }
 
          finished_cresc_ = cresc_;
+
+         /* backwards compatibility with hairpinToBarline */
+         bool use_bar = to_boolean (get_property ("hairpinToBarline"))
+           && scm_is_string (get_property ("whichBar"))
+           && !script_ev_;
+
+         finished_cresc_->set_property ("to-barline", scm_from_bool (use_bar));
+
+         announce_end_grob (finished_cresc_, SCM_EOL);
          cresc_ = 0;
          current_cresc_ev_ = 0;
        }
@@ -262,6 +268,16 @@ Dynamic_engraver::process_music ()
                  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_)
@@ -328,25 +344,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_
@@ -390,32 +391,10 @@ Dynamic_engraver::typeset_all ()
          finished_line_spanner_->set_bound (RIGHT, ci);
          finished_line_spanner_->set_bound (LEFT, ci);
        }
-
       finished_line_spanner_ = 0;
     }
 }
 
-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)
 {
@@ -454,10 +433,7 @@ Dynamic_engraver::acknowledge_note_column (Grob_info info)
     finished_cresc_->set_bound (RIGHT, info.grob ());
 }
 
-ADD_ACKNOWLEDGER (Dynamic_engraver, accidental);
 ADD_ACKNOWLEDGER (Dynamic_engraver, note_column);
-ADD_ACKNOWLEDGER (Dynamic_engraver, slur);
-ADD_ACKNOWLEDGER (Dynamic_engraver, stem_tremolo);
 
 ADD_TRANSLATOR (Dynamic_engraver,
                /* doc */
@@ -467,6 +443,7 @@ ADD_TRANSLATOR (Dynamic_engraver,
 
                /* create */
                "DynamicLineSpanner "
+               "DynamicTextSpanner "
                "DynamicText "
                "Hairpin "
                "TextSpanner ",