X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frest-engraver.cc;h=e35db13f17523a255a115119074ccbe5b359aacb;hb=4125ec67dfe6024f8f02bbbb7540d4597d5a3a32;hp=96f34bfe961eab776a46db7a0f52970f130870f4;hpb=fdfd147f1233eef6ea8b176290221b5a4ec38868;p=lilypond.git

diff --git a/lily/rest-engraver.cc b/lily/rest-engraver.cc
index 96f34bfe96..e35db13f17 100644
--- a/lily/rest-engraver.cc
+++ b/lily/rest-engraver.cc
@@ -1,86 +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--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c)  1997--2000 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 "staff-symbol-referencer.hh"
-#include "rest-engraver.hh"
-#include "musical-request.hh"
+
+#include "engraver.hh"
+
 #include "dots.hh"
-#include "rest.hh"
+#include "duration.hh"
+#include "item.hh"
+#include "pitch.hh"
+#include "rhythmic-head.hh"
+#include "staff-symbol-referencer.hh"
+#include "stream-event.hh"
+
+#include "translator.icc"
+
+class Rest_engraver : public Engraver
+{
+  Stream_event *rest_event_;
+  Item *dot_;
+  Grob *rest_;
+protected:
+  void start_translation_timestep ();
+  void process_music ();
+  DECLARE_TRANSLATOR_LISTENER (rest);
+public:
+  TRANSLATOR_DECLARATIONS (Rest_engraver);
+};
 
 /*
   Should merge with Note_head_engraver
- */
+*/
 Rest_engraver::Rest_engraver ()
 {
-  rest_req_l_ =0;
-  rest_p_ =0;
-  dot_p_ =0;
+  rest_event_ = 0;
+  rest_ = 0;
+  dot_ = 0;
 }
 
 void
-Rest_engraver::do_post_move_processing ()
+Rest_engraver::start_translation_timestep ()
 {
-  rest_req_l_ =0;
+  rest_event_ = 0;
+  rest_ = 0;
+  dot_ = 0;
 }
 
 void
-Rest_engraver::do_pre_move_processing ()
+Rest_engraver::process_music ()
 {
-  if (rest_p_)
-    {
-      typeset_element (rest_p_);
-      rest_p_ =0;
-    }
-  if (dot_p_)
+  if (rest_event_ && !rest_)
     {
-      typeset_element (dot_p_);
-      dot_p_ =0;
-    }    
-}
+      rest_ = make_item ("Rest", rest_event_->self_scm ());
+      Pitch *p = unsmob_pitch (rest_event_->get_property ("pitch"));
 
-void
-Rest_engraver::do_process_music ()
-{
-  if (rest_req_l_ && !rest_p_) 
-    {
-      rest_p_ = new Rest (get_property ("basicRestProperties"));
-      Staff_symbol_referencer_interface si (rest_p_);
-      si.set_interface ();
-      
-      rest_p_->set_elt_property ("duration-log",
-				 gh_int2scm (rest_req_l_->duration_.durlog_i_)); 
-      
-      if (rest_req_l_->duration_.dots_i_)
+      if (p)
 	{
-	  dot_p_ = new Item (get_property ("basicDotsProperties"));
-
-	  Staff_symbol_referencer_interface si (dot_p_);
-	  si.set_interface ();
-	  
-	  rest_p_->add_dots (dot_p_);
-	  dot_p_->set_elt_property ("dot-count",
-				    gh_int2scm (rest_req_l_->duration_.dots_i_));
-	  announce_element (Score_element_info (dot_p_,0));
-	}
+	  int pos = p->steps ();
+	  SCM c0 = get_property ("middleCPosition");
+	  if (scm_is_number (c0))
+	    pos += scm_to_int (c0);
 
-      announce_element (Score_element_info (rest_p_, rest_req_l_));
+	  rest_->set_property ("staff-position", scm_from_int (pos));
+	}
     }
 }
 
-bool
-Rest_engraver::do_try_music (Music *req)
+IMPLEMENT_TRANSLATOR_LISTENER (Rest_engraver, rest);
+void
+Rest_engraver::listen_rest (Stream_event *ev)
 {
-  if (Rest_req *r = dynamic_cast <Rest_req *> (req))
-    {
-      rest_req_l_ = r;
-      return true;
-    }  
-  return false;
+  ASSIGN_EVENT_ONCE (rest_event_, ev);
 }
 
+ADD_TRANSLATOR (Rest_engraver,
+		/* doc */
+		"Engrave rests.",
+
+		/* create */
+		"Rest ",
+
+		/* read */
+		"middleCPosition ",
 
-ADD_THIS_TRANSLATOR(Rest_engraver);
+		/* write */
+		""
+		);