*** empty log message ***

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

diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc
index 2f1cc065e8f5b6c87e310fd01f3debb35142e61b..48565f5ee13e954a854b4ea9f34487248aa02cc2 100644 (file)
--- a/lily/slur-engraver.cc
+++ b/lily/slur-engraver.cc
@@ -1,17 +1,16 @@
 /*
   slur-engraver.cc -- implement Slur_engraver
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "event.hh"
-#include "new-slur.hh"
-#include "warn.hh"
+#include "slur.hh"
 #include "note-column.hh"
 #include "context.hh"
 #include "directional-element-interface.hh"
 #include "engraver.hh"
 #include "spanner.hh"
+#include "tie.hh"
 
 /*
   It is possible that a slur starts and ends on the same note.  At
@@ -41,7 +40,7 @@ public:
 
 Slur_engraver::Slur_engraver ()
 {
-  events_[START] =events_[STOP] = 0;
+  events_[START] = events_[STOP] = 0;
 }
 
 bool
@@ -49,9 +48,6 @@ Slur_engraver::try_music (Music *m)
 {
   if (m->is_mus_type ("slur-event"))
     {
-      /*
-       Let's not start more than one slur per moment.
-      */
       Direction d = to_dir (m->get_property ("span-direction"));
       if (d == START)
        {
@@ -60,9 +56,6 @@ Slur_engraver::try_music (Music *m)
        }
       else if (d == STOP)
        {
-         if (slurs_.is_empty ())
-           return false;
-         
          events_[STOP] = m;
          return true;
        }
@@ -79,26 +72,40 @@ Slur_engraver::set_melisma (bool m)
 void
 Slur_engraver::acknowledge_grob (Grob_info info)
 {
-  Grob *e =info.grob_;
+  Grob *e = info.grob_;
   if (Note_column::has_interface (info.grob_))
     {
       for (int i = slurs_.size (); i--; )
-       New_slur::add_column (slurs_[i], e);
+       Slur::add_column (slurs_[i], e);
       for (int i = end_slurs_.size (); i-- ; )
-       New_slur::add_column (end_slurs_[i], e);
+       Slur::add_column (end_slurs_[i], e);
     }
   else
     {
+      SCM inside = e->get_property ("inside-slur");
       if (Tie::has_interface (e)
-         || to_boolean (e->get_property ("inside-slur")))
+         || to_boolean (inside))
        {
          for (int i = slurs_.size (); i--; )
-           New_slur::add_extra_encompass (slurs_[i], e);
+           Slur::add_extra_encompass (slurs_[i], e);
          for (int i = end_slurs_.size (); i--; )
-           New_slur::add_extra_encompass (end_slurs_[i], e);
+           Slur::add_extra_encompass (end_slurs_[i], e);
+       }
+      else if (inside == SCM_BOOL_F)
+       {
+         Grob *slur = slurs_.size()?slurs_[0] : 0;
+         slur =  (end_slurs_.size () && !slur)
+           ? end_slurs_[0] : slur;
+
+         if (slur)
+           {
+             e->add_offset_callback (Slur::outside_slur_callback_proc, Y_AXIS);
+             e->set_property ("slur", slur->self_scm());
+           }
        }
     }
 }
+
 void
 Slur_engraver::finalize ()
 {
@@ -111,6 +118,11 @@ Slur_engraver::process_music ()
 {
   if (events_[STOP])
     {
+      if (slurs_.size() == 0)
+       {
+         events_[STOP]->origin()->warning (_ ("No slur to end"));
+       }
+      
       end_slurs_ = slurs_;
       slurs_.clear ();
     }
@@ -146,10 +158,10 @@ Slur_engraver::stop_translation_timestep ()
   events_[START] = events_[STOP] = 0;
 }
 
-ENTER_DESCRIPTION (Slur_engraver,
+ADD_TRANSLATOR (Slur_engraver,
   /* descr */       "Build slurs grobs from slur events",
   /* creats*/       "Slur",
   /* accepts */     "slur-event",
-  /* acks  */      "note-column-interface accidental-interface fingering-interface script-interface tie-interface",
+  /* acks  */      "note-column-interface accidental-interface fingering-interface script-interface tie-interface text-script-interface",
   /* reads */       "slurMelismaBusy doubleSlurs",
   /* write */       "");