X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Frest-engraver.cc;h=928e4d7d95bc6833e8b61c0e7b4809a01071d6aa;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=96d169824977ec21640044ad00d5141a359f9bc1;hpb=a6ee9dcd388111e842064a8d46ab06c4897a00d2;p=lilypond.git

diff --git a/lily/rest-engraver.cc b/lily/rest-engraver.cc
index 96d1698249..928e4d7d95 100644
--- a/lily/rest-engraver.cc
+++ b/lily/rest-engraver.cc
@@ -1,127 +1,102 @@
 /*
-  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--2002 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 "musical-request.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
 {
-  Rest_req *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 ();
+  DECLARE_TRANSLATOR_LISTENER (rest);
 public:
-  TRANSLATOR_DECLARATIONS(Rest_engraver);
+  TRANSLATOR_DECLARATIONS (Rest_engraver);
 };
 
-
 /*
   Should merge with Note_head_engraver
- */
+*/
 Rest_engraver::Rest_engraver ()
 {
-  rest_req_ =0;
-  rest_ =0;
-  dot_ =0;
+  rest_event_ = 0;
+  rest_ = 0;
+  dot_ = 0;
 }
 
 void
 Rest_engraver::start_translation_timestep ()
 {
-  rest_req_ =0;
-}
-
-void
-Rest_engraver::stop_translation_timestep ()
-{
-  if (rest_)
-    {
-      typeset_grob (rest_);
-      rest_ =0;
-    }
-  if (dot_)
-    {
-      typeset_grob (dot_);
-      dot_ =0;
-    }    
+  rest_event_ = 0;
+  rest_ = 0;
+  dot_ = 0;
 }
 
 void
 Rest_engraver::process_music ()
 {
-  if (rest_req_ && !rest_) 
+  if (rest_event_ && !rest_)
     {
-      rest_ = new Item (get_property ("Rest"));
-
+      rest_ = make_item ("Rest", rest_event_->self_scm ());
+      Pitch *p = Pitch::unsmob (rest_event_->get_property ("pitch"));
 
-      
-      int durlog  = unsmob_duration (rest_req_->get_mus_property ("duration"))-> duration_log ();
-      
-      rest_->set_grob_property ("duration-log",
-				  gh_int2scm (durlog));
-
-      int dots =unsmob_duration (rest_req_->get_mus_property ("duration"))->dot_count ();
-      
-      if (dots)
-	{
-	  dot_ = new Item (get_property ("Dots"));
-
-	  Rhythmic_head::set_dots (rest_, dot_);
-	  dot_->set_parent (rest_, Y_AXIS);
-	  dot_->set_grob_property ("dot-count", gh_int2scm (dots));
-	  announce_grob (dot_, SCM_EOL);
-	}
-
-      Pitch *p = unsmob_pitch (rest_req_->get_mus_property ("pitch"));
-
-      /*
-	This is ridiculous -- rests don't have pitch, but we act as if
-	our nose is bleeding.
-       */
       if (p)
-	{
-	  int pos= p->steps ();
-	  SCM c0 = get_property ("centralCPosition");
-	  if (gh_number_p (c0))
-	    pos += gh_scm2int (c0);
-	  
-	  rest_->set_grob_property ("staff-position", gh_int2scm (pos));
-	}
-      
-      announce_grob(rest_, rest_req_->self_scm());
+        {
+          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)
+IMPLEMENT_TRANSLATOR_LISTENER (Rest_engraver, rest);
+void
+Rest_engraver::listen_rest (Stream_event *ev)
 {
-  if (Rest_req *r = dynamic_cast <Rest_req *> (m))
-    {
-      rest_req_ = r;
-      return true;
-    }  
-  return false;
+  ASSIGN_EVENT_ONCE (rest_event_, ev);
 }
 
+ADD_TRANSLATOR (Rest_engraver,
+                /* doc */
+                "Engrave rests.",
+
+                /* create */
+                "Rest ",
 
+                /* read */
+                "middleCPosition ",
 
-ENTER_DESCRIPTION(Rest_engraver,
-/* descr */       "",
-/* creats*/       "Rest Dots",
-/* acks  */       "",
-/* reads */       "centralCPosition",
-/* write */       "");
+                /* write */
+                ""
+               );