* scm/lily.scm (postscript->png): use ~a iso. ~s

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

diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc
index d1749c96d6a38db1f37b980936b6da63ba1f9ae4..2f1cc065e8f5b6c87e310fd01f3debb35142e61b 100644 (file)
--- a/lily/slur-engraver.cc
+++ b/lily/slur-engraver.cc
@@ -89,13 +89,16 @@ Slur_engraver::acknowledge_grob (Grob_info info)
     }
   else
     {
-      for (int i = slurs_.size (); i--; )
-       New_slur::add_extra_encompass (slurs_[i], e);
-      for (int i = end_slurs_.size (); i--; )
-       New_slur::add_extra_encompass (end_slurs_[i], e);
+      if (Tie::has_interface (e)
+         || to_boolean (e->get_property ("inside-slur")))
+       {
+         for (int i = slurs_.size (); i--; )
+           New_slur::add_extra_encompass (slurs_[i], e);
+         for (int i = end_slurs_.size (); i--; )
+           New_slur::add_extra_encompass (end_slurs_[i], e);
+       }
     }
 }
-
 void
 Slur_engraver::finalize ()
 {
@@ -147,6 +150,6 @@ ENTER_DESCRIPTION (Slur_engraver,
   /* descr */       "Build slurs grobs from slur events",
   /* creats*/       "Slur",
   /* accepts */     "slur-event",
-  /* acks  */      "note-column-interface accidental-interface fingering-interface script-interface",
+  /* acks  */      "note-column-interface accidental-interface fingering-interface script-interface tie-interface",
   /* reads */       "slurMelismaBusy doubleSlurs",
   /* write */       "");