Web-es: update News.

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

diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc
index dfce599493f08050029ea2b7c74e1d8ca4458e6a..581136791d932daff6148c2ad80d2b82366c095b 100644 (file)
--- a/lily/slur-engraver.cc
+++ b/lily/slur-engraver.cc
@@ -1,140 +1,100 @@
 /*
-  slur-engraver.cc -- implement Slur_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-*/
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-#include "event.hh"
-#include "new-slur.hh"
-#include "warn.hh"
-#include "note-column.hh"
-#include "context.hh"
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #include "engraver.hh"
-#include "spanner.hh"
 
-class Slur_engraver : public Engraver
-{
-  Drul_array<Music *> events_;
-  Music * running_slur_start_;
-  Grob * slur_;
+#include "context.hh"
+#include "directional-element-interface.hh"
+#include "international.hh"
+#include "note-column.hh"
+#include "slur.hh"
+#include "slur-proto-engraver.hh"
+#include "spanner.hh"
+#include "stream-event.hh"
+#include "warn.hh"
 
-  Moment last_start_;
+#include "translator.icc"
 
-  void set_melisma (bool);
+class Slur_engraver : public Slur_proto_engraver
+{
+  virtual void set_melisma (bool);
 
 protected:
-  virtual bool try_music (Music*);
-  virtual void acknowledge_grob (Grob_info);
-  virtual void stop_translation_timestep ();
-  virtual void finalize ();
-  virtual void process_music ();
+  DECLARE_TRANSLATOR_LISTENER (slur);
+  DECLARE_TRANSLATOR_LISTENER (note);
 
 public:
+  SCM event_symbol ();
   TRANSLATOR_DECLARATIONS (Slur_engraver);
 };
 
-Slur_engraver::Slur_engraver ()
+Slur_engraver::Slur_engraver () :
+  Slur_proto_engraver ("doubleSlurs", "Slur", "slur", "slur-event")
 {
-  events_[START] =events_[STOP] = 0;
-  slur_ = 0;
-  last_start_ = Moment (-1);
 }
 
-bool
-Slur_engraver::try_music (Music *m)
+SCM
+Slur_engraver::event_symbol ()
 {
-  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)
-       {
-         if (slur_)
-           return false;
-         
-         events_[START] = m;
-         return true;
-       }
-      else if (d == STOP)
-       {
-         if (!slur_)
-           return false;
-         
-         events_[STOP] = m;
-         return true;
-       }
-    }
-  return false;
+  // Need a string constant for memoization
+  return ly_symbol2scm ("slur-event");
 }
 
+IMPLEMENT_TRANSLATOR_LISTENER (Slur_engraver, slur);
 void
-Slur_engraver::set_melisma (bool m)
+Slur_engraver::listen_slur (Stream_event *ev)
 {
-  context ()->set_property ("slurMelismaBusy", m ? SCM_BOOL_T :SCM_BOOL_F);
+  Slur_proto_engraver::listen_slur (ev);
 }
 
+IMPLEMENT_TRANSLATOR_LISTENER (Slur_engraver, note);
 void
-Slur_engraver::acknowledge_grob (Grob_info info)
+Slur_engraver::listen_note (Stream_event *ev)
 {
-  Grob *e =info.grob_;
-  if (Note_column::has_interface (info.grob_))
-    {
-      if (slur_)
-       New_slur::add_column (slur_, e);
-    }
-  else
-    {
-      if (slur_)
-       New_slur::add_extra_encompass (slur_, e);
-    }
+  Slur_proto_engraver::listen_note (ev);
 }
 
 void
-Slur_engraver::finalize ()
-{
-  if (slur_)
-    slur_->warning (_("unterminated slur"));
-}
-
-void
-Slur_engraver::process_music ()
-{
-  if (events_[STOP] && events_[START])
-    {
-      events_[START]->origin()->warning (_ ("Cannot start and end slur on same note"));
-    }
-  
-  if (events_[START] && !slur_)
-    {
-      Music *ev = events_[START];
-      slur_ = make_spanner ("Slur", events_[START]->self_scm ());
-      if (Direction updown = to_dir (ev->get_property ("direction")))
-       slur_->set_property ("direction", scm_int2num (updown));
-    }
-
-  set_melisma (slur_ && !events_[STOP]);
-}
-
-void
-Slur_engraver::stop_translation_timestep ()
+Slur_engraver::set_melisma (bool m)
 {
-  if (events_[STOP])
-    {
-      slur_ = 0;
-    }
-  
-  events_[START] = events_[STOP] = 0;
+  context ()->set_property ("slurMelismaBusy", ly_bool2scm (m));
 }
 
-
-
-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",
-/* reads */       "slurMelismaBusy",
-/* write */       "");
+ADD_ACKNOWLEDGER (Slur_engraver, inline_accidental);
+ADD_ACKNOWLEDGER (Slur_engraver, fingering);
+ADD_ACKNOWLEDGER (Slur_engraver, note_column);
+ADD_ACKNOWLEDGER (Slur_engraver, script);
+ADD_ACKNOWLEDGER (Slur_engraver, text_script);
+ADD_ACKNOWLEDGER (Slur_engraver, dots);
+ADD_END_ACKNOWLEDGER (Slur_engraver, tie);
+ADD_ACKNOWLEDGER (Slur_engraver, tuplet_number);
+ADD_TRANSLATOR (Slur_engraver,
+                /* doc */
+                "Build slur grobs from slur events.",
+
+                /* create */
+                "Slur ",
+
+                /* read */
+                "slurMelismaBusy "
+                "doubleSlurs ",
+
+                /* write */
+                ""
+               );