* lily/hairpin.cc: lengthen hairpin if space is available.

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

diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index 76dc123384b75fca2f8a6a088bdb1dae986efb1d..71dfcce857cadd90f9e1be69bd26eb58b92d7110 100644 (file)
--- a/lily/dynamic-engraver.cc
+++ b/lily/dynamic-engraver.cc
@@ -16,7 +16,7 @@
 #include "hairpin.hh"
 #include "interval.hh"
 #include "item.hh"
-#include "new-slur.hh"
+#include "slur.hh"
 #include "note-column.hh"
 #include "paper-column.hh"
 #include "script-interface.hh"
@@ -223,9 +223,19 @@ Dynamic_engraver::process_music ()
            start_type = "crescendo";
          
          SCM s = get_property ((start_type + "Spanner").to_str0 ());
-         if (!ly_c_symbol_p (s) || s == ly_symbol2scm ("hairpin"))
+         if (!scm_is_symbol (s) || s == ly_symbol2scm ("hairpin"))
            {
              cresc_  = make_spanner ("Hairpin", accepted_spanreqs_drul_[START]->self_scm ());
+             if (finished_cresc_)
+               {
+                 Pointer_group_interface::add_grob (finished_cresc_,
+                                                    ly_symbol2scm ("adjacent-hairpins"),
+                                                    cresc_);
+                 
+                 Pointer_group_interface::add_grob (cresc_,
+                                                    ly_symbol2scm ("adjacent-hairpins"),
+                                                    finished_cresc_);
+               }
              cresc_->set_property ("grow-direction",
                                    scm_int2num ((start_type == "crescendo")
                                                 ? BIGGER : SMALLER));
@@ -248,7 +258,7 @@ Dynamic_engraver::process_music ()
              /*
                FIXME: use get_markup () to check type.
              */
-             if (ly_c_string_p (s) || ly_c_pair_p (s))
+             if (scm_is_string (s) || ly_c_pair_p (s))
                {
                  cresc_->set_property ("edge-text",
                                        scm_cons (s, scm_makfrom0str ("")));
@@ -313,27 +323,6 @@ Dynamic_engraver::finalize ()
 void
 Dynamic_engraver::typeset_all ()
 {
-  /* Simplistic slur collision handling.  This fixes simple collisions
-     like
-     
-         a\p( b)
-
-     which are unacceptable, but it most probably breaks for more
-     interesting cases.  Maybe make a new colission engraver.  */
-  if (finished_line_spanner_
-      && slur_
-      && get_slur_dir (slur_) == get_grob_direction (finished_line_spanner_)
-      && !intersection (slur_->spanned_rank_iv (),
-                       finished_line_spanner_->spanned_rank_iv ()).is_empty ())
-    {
-      Real ss = Staff_symbol_referencer::staff_space (finished_line_spanner_);
-      Real pad = robust_scm2double (finished_line_spanner_
-                                   ->get_property ("padding"), 0);
-      /* FIXME: 1ss padding hardcoded */
-      finished_line_spanner_->set_property ("padding",
-                                           scm_make_real (pad + ss));
-    }
-
   if (finished_cresc_)
     {
       if (!finished_cresc_->get_bound (RIGHT))
@@ -417,12 +406,12 @@ Dynamic_engraver::acknowledge_grob (Grob_info info)
 
        DynamicText doesn't really have a script-priority field.
        */
-      if (ly_c_number_p (p)
-         && ly_scm2int (p)
-         < ly_scm2int (script_->get_property ("script-priority")))
+      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_);
     }
-  else if (New_slur::has_interface (info.grob_))
+  else if (Slur::has_interface (info.grob_))
     slur_ = dynamic_cast<Spanner*> (info.grob_);
 }
 
@@ -435,6 +424,6 @@ ENTER_DESCRIPTION (Dynamic_engraver,
                  
 /* creats*/       "DynamicLineSpanner DynamicText Hairpin TextSpanner",
 /* accepts */     "absolute-dynamic-event crescendo-event decrescendo-event",
-/* acks  */      "note-column-interface script-interface new-slur-interface",
+/* acks  */      "note-column-interface script-interface slur-interface",
 /* reads */       "",
 /* write */       "");