(recent_enough): interpret laziness

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

diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc
index bad108894a7d94d031eb26b7ec2aaef4b02bd997..80bd9bbf81eed2507083b3eefc9481bfd13c70aa 100644 (file)
--- a/lily/slur-engraver.cc
+++ b/lily/slur-engraver.cc
@@ -5,15 +5,14 @@
 */
 
 #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"
-
+#include "input.hh"
 /*
   It is possible that a slur starts and ends on the same note.  At
   least, it is for phrasing slurs: a note can be both beginning and
@@ -50,9 +49,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)
        {
@@ -61,9 +57,6 @@ Slur_engraver::try_music (Music *m)
        }
       else if (d == STOP)
        {
-         if (slurs_.is_empty ())
-           return false;
-         
          events_[STOP] = m;
          return true;
        }
@@ -84,9 +77,9 @@ Slur_engraver::acknowledge_grob (Grob_info info)
   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
     {
@@ -95,9 +88,9 @@ Slur_engraver::acknowledge_grob (Grob_info info)
          || 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)
        {
@@ -107,7 +100,7 @@ Slur_engraver::acknowledge_grob (Grob_info info)
 
          if (slur)
            {
-             e->add_offset_callback (New_slur::outside_slur_callback_proc, Y_AXIS);
+             e->add_offset_callback (Slur::outside_slur_callback_proc, Y_AXIS);
              e->set_property ("slur", slur->self_scm());
            }
        }
@@ -126,6 +119,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 ();
     }
@@ -165,6 +163,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 tie-interface",
+  /* acks  */      "note-column-interface accidental-interface fingering-interface script-interface tie-interface text-script-interface",
   /* reads */       "slurMelismaBusy doubleSlurs",
   /* write */       "");