* lily/ambitus-engraver.cc (create_ambitus): change name to

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

diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc
index c59954034229469a7ffe1cc6a14361c84e0a76f2..7d7abf2440934e6206ea40f403e576c7cf09f0fd 100644 (file)
--- a/lily/slur-engraver.cc
+++ b/lily/slur-engraver.cc
@@ -1,14 +1,15 @@
 /*
   slur-engraver.cc -- implement Slur_engraver
 
-  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "event.hh"
-#include "slur.hh"
+#include "new-slur.hh"
 #include "warn.hh"
 #include "note-column.hh"
-#include "translator-group.hh"
+#include "context.hh"
+
 #include "engraver.hh"
 #include "spanner.hh"
 
@@ -49,7 +50,7 @@ Slur_engraver::try_music (Music *ev)
       /*
        Let's not start more than one slur per moment.
       */
-      Direction d = to_dir (ev->get_mus_property ("span-direction"));
+      Direction d = to_dir (ev->get_property ("span-direction"));
       if (d == START)
        {
          if (now_mom () > last_start_)
@@ -69,9 +70,9 @@ Slur_engraver::try_music (Music *ev)
          /*
            Swallow other events.
          */
-         for (int j = new_slur_evs_.size(); j--;)
+         for (int j = new_slur_evs_.size (); j--;)
            {
-             Direction nd = to_dir (new_slur_evs_[j]->get_mus_property ("span-direction"));
+             Direction nd = to_dir (new_slur_evs_[j]->get_property ("span-direction"));
              
              if (nd == STOP)
                return true;
@@ -87,19 +88,26 @@ Slur_engraver::try_music (Music *ev)
 void
 Slur_engraver::set_melisma (bool m)
 {
-  daddy_trans_->set_property ("slurMelismaBusy", m ? SCM_BOOL_T :SCM_BOOL_F);
+  context ()->set_property ("slurMelismaBusy", m ? SCM_BOOL_T :SCM_BOOL_F);
 }
 
 void
 Slur_engraver::acknowledge_grob (Grob_info info)
 {
+  Grob *e =info.grob_;
   if (Note_column::has_interface (info.grob_))
     {
-      Grob *e =info.grob_;
       for (int i = 0; i < slur_stack_.size (); i++)
-       Slur::add_column (slur_stack_[i], e);
+       New_slur::add_column (slur_stack_[i], e);
+      for (int i = 0; i < end_slurs_.size (); i++)
+       New_slur::add_column (end_slurs_[i], e);
+    }
+  else
+    {
+      for (int i = 0; i < slur_stack_.size (); i++)
+       New_slur::add_extra_encompass (slur_stack_[i], e);
       for (int i = 0; i < end_slurs_.size (); i++)
-       Slur::add_column (end_slurs_[i], e);
+       New_slur::add_extra_encompass (end_slurs_[i], e);
     }
 }
 
@@ -129,10 +137,10 @@ Slur_engraver::process_music ()
     {
       Music* slur_ev = new_slur_evs_[i];
       // end slur: move the slur to other array
-      Direction d = to_dir (slur_ev->get_mus_property ("span-direction"));
+      Direction d = to_dir (slur_ev->get_property ("span-direction"));
       if (d== STOP)
        {
-         if (slur_stack_.empty ())
+         if (slur_stack_.is_empty ())
            /* How to shut up this warning, when Voice_devnull_engraver has
               eaten start event? */
            slur_ev->origin ()->warning (_f ("can't find start of slur"));
@@ -148,18 +156,15 @@ Slur_engraver::process_music ()
        {
          // push a new slur onto stack.
          // (use temp. array to wait for all slur STOPs)
-         Grob* slur = make_spanner ("Slur");
-         Slur::set_interface (slur); // cannot remove yet!
-
+         Grob* slur = make_spanner ("Slur", slur_ev->self_scm ());
 
-         if (Direction updown = to_dir (slur_ev->get_mus_property ("direction")))
+         if (Direction updown = to_dir (slur_ev->get_property ("direction")))
            {
-             slur->set_grob_property ("direction", gh_int2scm (updown));
+             slur->set_property ("direction", scm_int2num (updown));
            }
          
          start_slurs.push (slur);
          events_.push (slur_ev);
-         announce_grob (slur, slur_ev->self_scm ());
        }
     }
 
@@ -173,10 +178,6 @@ Slur_engraver::process_music ()
 void
 Slur_engraver::stop_translation_timestep ()
 {
-  for (int i = 0; i < end_slurs_.size (); i++)
-    {
-      typeset_grob (end_slurs_[i]);
-    }
   end_slurs_.clear ();
   new_slur_evs_.clear ();
 }
@@ -184,9 +185,9 @@ Slur_engraver::stop_translation_timestep ()
 
 
 ENTER_DESCRIPTION (Slur_engraver,
-/* descr */       "Build slurs from Slur_evs",
+/* descr */       "Build slurs grobs from slur events",
 /* creats*/       "Slur",
 /* accepts */     "slur-event",
-/* acks  */      "note-column-interface",
+/* acks  */      "note-column-interface accidental-interface fingering-interface script-interface",
 /* reads */       "slurMelismaBusy",
 /* write */       "");