add breakableSeparationItem to extra encompass for slurs. This fixes

slur/clef slur/key collisions etc. Should fix #49

diff --git a/.gitignore b/.gitignore
index 849b7705d32664877b3db16daac26ef943cc9874..6a3858d251ab98ebf9b47c645f5f6ce4d12f5a7f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ TAGS
 tags
 .gdbinit
 ?.ly
+*.midi

diff --git a/Documentation/topdocs/NEWS.tely b/Documentation/topdocs/NEWS.tely
index 33f35100550540614b8b2d77bee225580c12adb2..c8ee8888d594526ce74a543ee0c07ec5cfb3ef6b 100644 (file)
--- a/Documentation/topdocs/NEWS.tely
+++ b/Documentation/topdocs/NEWS.tely
@@ -66,6 +66,12 @@ which scares away people.
 
 @end ignore
 
+@item Slurs now avoid clefs and key changes.
+ 
+@lilypond[fragment,ragged-right]
+\new Staff { \clef bass c^( \clef "G" g') } 
+@end lilypond
+
 @item The @code{FretBoards} context will generate guitar frettings
 automatically,
 

diff --git a/input/regression/slur-clef.ly b/input/regression/slur-clef.ly
new file mode 100644 (file)
index 0000000..0b87883
--- /dev/null
+++ b/input/regression/slur-clef.ly
@@ -0,0 +1,6 @@
+\paper {
+  ragged-right = ##t
+  }
+\version "2.9.27"
+
+\new Staff { \clef bass c^( \clef "G" g') } 

diff --git a/lily/separating-group-spanner.cc b/lily/separating-group-spanner.cc
index 5ef9038dfbc3859c1377da7368c658b4db08b855..14e457b6ef047a3caf2bb245d44210e44aa79b18 100644 (file)
--- a/lily/separating-group-spanner.cc
+++ b/lily/separating-group-spanner.cc
@@ -115,4 +115,4 @@ ADD_INTERFACE (Separating_group_spanner, "separation-spanner-interface",
 
               /* properties */
               "elements "
-              "padding");
+              "padding ");

diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc
index c203d4602dfec69dddb918fd1ce79b91ba0f65d3..864ea7747363dd13e982b0fb0439f0457279954f 100644 (file)
--- a/lily/slur-engraver.cc
+++ b/lily/slur-engraver.cc
@@ -196,6 +196,17 @@ Slur_engraver::process_music ()
 void
 Slur_engraver::stop_translation_timestep ()
 {
+  if (Grob *g = unsmob_grob (get_property ("breakableSeparationItem")))
+    {
+      for (vsize i = 0; i < end_slurs_.size (); i++)
+       Slur::add_extra_encompass (end_slurs_[i], g);
+
+      if (!events_[START])
+       for (vsize i = 0; i < slurs_.size (); i++)
+         Slur::add_extra_encompass (slurs_[i], g);
+    }
+  
+  
   for (vsize i = 0; i < end_slurs_.size (); i++)
     announce_end_grob (end_slurs_[i], SCM_EOL);
   end_slurs_.clear ();
@@ -213,5 +224,8 @@ ADD_ACKNOWLEDGER (Slur_engraver, tuplet_number);
 ADD_TRANSLATOR (Slur_engraver,
                /* doc */ "Build slur grobs from slur events",
                /* create */ "Slur",
-               /* read */ "slurMelismaBusy doubleSlurs",
+               /* read */
+               "slurMelismaBusy "
+               "doubleSlurs ",
+
                /* write */ "");

diff --git a/lily/slur-scoring.cc b/lily/slur-scoring.cc
index 6371082b077676783487be3943a13b874407c919..6b4b5699111b9abbecd1d8a4808cdcddf8ee8c42 100644 (file)
--- a/lily/slur-scoring.cc
+++ b/lily/slur-scoring.cc
@@ -529,6 +529,7 @@ Slur_score_state::get_base_attachments () const
            x = robust_relative_extent (extremes_[d].bound_, common_[X_AXIS], X_AXIS)[d];
          else
            x = slur_->get_broken_left_end_align ();
+
          Grob *col = (d == LEFT) ? columns_[0] : columns_.back ();
 
          if (extremes_[-d].bound_ != col)

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index a1d205c09e977dd79099346422c7147eca4bd43e..37277a762ac70a8fec386f0144aaa2f5d5cd4692 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -1351,6 +1351,7 @@
 
     (SeparationItem
      . (
+       (avoid-slur . inside)
        (X-extent . ,ly:axis-group-interface::width)
        (Y-extent . ,ly:axis-group-interface::height)
        (meta . ((class . Item)