X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frest-engraver.cc;h=8902e3591121c0adfc98a969c7af5da6e6eae4b1;hb=b872748c6aa8bb721ced458691b38ac2fac5dfc8;hp=cecab147623723bc1fb374ea134aabceb8970e15;hpb=332da9f4d25f9f63a3222efc87fae06b0c7abbdd;p=lilypond.git

diff --git a/lily/rest-engraver.cc b/lily/rest-engraver.cc
index cecab14762..8902e35911 100644
--- a/lily/rest-engraver.cc
+++ b/lily/rest-engraver.cc
@@ -1,39 +1,54 @@
 /*
-  rest-grav.cc -- implement Rest_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  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 "item.hh"
-#include "staff-symbol-referencer.hh"
+#include "engraver.hh"
+
 #include "dots.hh"
+#include "duration.hh"
+#include "item.hh"
+#include "pitch.hh"
 #include "rhythmic-head.hh"
-#include "engraver.hh"
+#include "staff-symbol-referencer.hh"
+#include "stream-event.hh"
+
+#include "translator.icc"
 
 class Rest_engraver : public Engraver
 {
-  Music *rest_req_;
-  Item * dot_;
-  Grob* rest_;
+  Stream_event *rest_event_;
+  Item *dot_;
+  Grob *rest_;
 protected:
-  virtual bool try_music (Music *);
-  virtual void stop_translation_timestep ();
-  virtual void start_translation_timestep ();
-  virtual void process_music ();
-
+  void start_translation_timestep ();
+  void process_music ();
+  void listen_rest (Stream_event *);
 public:
   TRANSLATOR_DECLARATIONS (Rest_engraver);
 };
 
-
 /*
   Should merge with Note_head_engraver
- */
-Rest_engraver::Rest_engraver ()
+*/
+Rest_engraver::Rest_engraver (Context *c)
+  : Engraver (c)
 {
-  rest_req_ = 0;
+  rest_event_ = 0;
   rest_ = 0;
   dot_ = 0;
 }
@@ -41,12 +56,7 @@ Rest_engraver::Rest_engraver ()
 void
 Rest_engraver::start_translation_timestep ()
 {
-  rest_req_ = 0;
-}
-
-void
-Rest_engraver::stop_translation_timestep ()
-{
+  rest_event_ = 0;
   rest_ = 0;
   dot_ = 0;
 }
@@ -54,61 +64,45 @@ Rest_engraver::stop_translation_timestep ()
 void
 Rest_engraver::process_music ()
 {
-  if (rest_req_ && !rest_) 
+  if (rest_event_ && !rest_)
     {
-      rest_ = make_item ("Rest", rest_req_->self_scm ());
-
-      int durlog  = unsmob_duration (rest_req_->get_property ("duration"))-> duration_log ();
-      
-      rest_->set_property ("duration-log",
-				  scm_int2num (durlog));
-
-      int dots = unsmob_duration (rest_req_->get_property ("duration"))->dot_count ();
-      
-      if (dots)
-	{
-	  dot_ = make_item ("Dots", SCM_EOL);
-
-	  Rhythmic_head::set_dots (rest_, dot_);
-	  dot_->set_parent (rest_, Y_AXIS);
-	  dot_->set_property ("dot-count", scm_int2num (dots));
-	  
-	}
-
-      Pitch *p = unsmob_pitch (rest_req_->get_property ("pitch"));
-
-      /*
-	This is ridiculous -- rests don't have pitch, but we act as if
-	our nose is bleeding.
-       */
+      rest_ = make_item ("Rest", rest_event_->self_scm ());
+      Pitch *p = unsmob<Pitch> (rest_event_->get_property ("pitch"));
+
       if (p)
-	{
-	  int pos = p->steps ();
-	  SCM c0 = get_property ("middleCPosition");
-	  if (scm_is_number (c0))
-	    pos += scm_to_int (c0);
-	  
-	  rest_->set_property ("staff-position", scm_int2num (pos));
-	}
-      
+        {
+          int pos = p->steps ();
+          SCM c0 = get_property ("middleCPosition");
+          if (scm_is_number (c0))
+            pos += scm_to_int (c0);
+
+          rest_->set_property ("staff-position", scm_from_int (pos));
+        }
     }
 }
 
-bool
-Rest_engraver::try_music (Music *m)
+void
+Rest_engraver::listen_rest (Stream_event *ev)
 {
-  if (m->is_mus_type ("rest-event"))
-    {
-      rest_req_ = m;
-      return true;
-    }
-  return false;
+  ASSIGN_EVENT_ONCE (rest_event_, ev);
 }
 
-ENTER_DESCRIPTION (Rest_engraver,
-/* descr */       "",
-/* creats*/       "Rest Dots",
-/* accepts */     "rest-event",
-/* acks  */      "",
-/* reads */       "middleCPosition",
-/* write */       "");
+void
+Rest_engraver::boot ()
+{
+  ADD_LISTENER (Rest_engraver, rest);
+}
+
+ADD_TRANSLATOR (Rest_engraver,
+                /* doc */
+                "Engrave rests.",
+
+                /* create */
+                "Rest ",
+
+                /* read */
+                "middleCPosition ",
+
+                /* write */
+                ""
+               );