(move_away_from_staffline): new function.

(get_base_attachments): move away attachment point for breaks
similar to attachment points on slurs (staffline collision, and
half a space of padding)

diff --git a/ChangeLog b/ChangeLog
index 48fd5c832562cc362090ee2e59bc76d45a27c476..af20b74b3576fa2676f3e38e8d58f969e60cdd48 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-10-10  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * lily/phrasing-slur-engraver.cc (acknowledge_grob): do something
+       with normal slurs too.
+
        * lily/slur-scoring.cc (move_away_from_staffline): new function.
        (get_base_attachments): move away attachment point for breaks
        similar to attachment points on slurs (staffline collision, and

diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index 7ccabdc2acf0b1096a26ffef484e9ec23e5ee1c6..d9bdf7e94e5bb7a67ab9f784c2c591ae770dba51 100644 (file)
--- a/lily/dynamic-engraver.cc
+++ b/lily/dynamic-engraver.cc
@@ -16,7 +16,6 @@
 #include "hairpin.hh"
 #include "interval.hh"
 #include "item.hh"
-#include "slur.hh"
 #include "note-column.hh"
 #include "paper-column.hh"
 #include "script-interface.hh"
@@ -45,7 +44,6 @@ class Dynamic_engraver : public Engraver
 {
   Item *script_;
   Spanner *line_spanner_;
-  Spanner *slur_;
   Spanner *cresc_;
 
   Spanner *finished_line_spanner_;
@@ -77,7 +75,6 @@ protected:
 Dynamic_engraver::Dynamic_engraver ()
 {
   script_ = 0;
-  slur_ = 0;
   finished_cresc_ = 0;
   line_spanner_ = 0;
   finished_line_spanner_ = 0;
@@ -424,8 +421,6 @@ Dynamic_engraver::acknowledge_grob (Grob_info info)
          < scm_to_int (script_->get_property ("script-priority")))
        Side_position_interface::add_support (line_spanner_, info.grob_);
     }
-  else if (Slur::has_interface (info.grob_))
-    slur_ = dynamic_cast<Spanner*> (info.grob_);
 }
 
 ENTER_DESCRIPTION (Dynamic_engraver,
@@ -437,6 +432,6 @@ ENTER_DESCRIPTION (Dynamic_engraver,
                  
 /* creats*/       "DynamicLineSpanner DynamicText Hairpin TextSpanner",
 /* accepts */     "absolute-dynamic-event crescendo-event decrescendo-event",
-/* acks  */      "note-column-interface script-interface slur-interface",
+/* acks  */      "note-column-interface script-interface",
 /* reads */       "",
 /* write */       "");

diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc
index 5b608f1fcb8dba46d7d64c0ba4823005f41bafc4..5f11aaa48608776f5899d527c7ce7cd93522190a 100644 (file)
--- a/lily/phrasing-slur-engraver.cc
+++ b/lily/phrasing-slur-engraver.cc
@@ -87,6 +87,7 @@ Phrasing_slur_engraver::acknowledge_grob (Grob_info info)
       */
       SCM inside = e->get_property ("inside-slur");
       if (Tie::has_interface (e)
+         || Slur::has_interface (e)
          || to_boolean (inside))
        {
          for (int i = slurs_.size (); i--; )