X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frest-engraver.cc;h=402f412d2a516ae10e1d53e22c7a95445f156856;hb=bfc7fdae57842d561568d1516337ce60e9aa8be0;hp=40cba4eb9102d4d3a7a1559b87518d887d76fa62;hpb=ce9845392e4e22ae9c5f6ec1da914eb301f1892c;p=lilypond.git

diff --git a/lily/rest-engraver.cc b/lily/rest-engraver.cc
index 40cba4eb91..402f412d2a 100644
--- a/lily/rest-engraver.cc
+++ b/lily/rest-engraver.cc
@@ -1,106 +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--2012 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 "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_l_;
-  Item * dot_p_;
-  Score_element* rest_p_;
+  Stream_event *rest_event_;
+  Item *dot_;
+  Grob *rest_;
 protected:
-  virtual bool do_try_music (Music *);
-  virtual void do_pre_move_processing ();
-  virtual void do_post_move_processing ();
-  virtual void do_process_music ();
+  void start_translation_timestep ();
+  void process_music ();
+  DECLARE_TRANSLATOR_LISTENER (rest);
 public:
-  
-  VIRTUAL_COPY_CONS(Translator);
-  Rest_engraver ();
+  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_)
+  if (rest_event_ && !rest_)
     {
-      typeset_element (rest_p_);
-      rest_p_ =0;
+      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_from_int (pos));
+        }
     }
-  if (dot_p_)
-    {
-      typeset_element (dot_p_);
-      dot_p_ =0;
-    }    
 }
 
+IMPLEMENT_TRANSLATOR_LISTENER (Rest_engraver, rest);
 void
-Rest_engraver::do_process_music ()
+Rest_engraver::listen_rest (Stream_event *ev)
 {
-  if (rest_req_l_ && !rest_p_) 
-    {
-      rest_p_ = new Item (get_property ("basicRestProperties"));
-      Rhythmic_head::set_interface (rest_p_);
-      Staff_symbol_referencer::set_interface (rest_p_);
-
-      
-      rest_p_->set_elt_property ("duration-log",
-				 gh_int2scm (rest_req_l_->duration_.durlog_i_)); 
-      
-      if (rest_req_l_->duration_.dots_i_)
-	{
-	  dot_p_ = new Item (get_property ("basicDotsProperties"));
-
-	  Staff_symbol_referencer::set_interface (dot_p_);
-	  Rhythmic_head::set_dots (rest_p_, dot_p_);
-	  dot_p_->set_parent (rest_p_, Y_AXIS);
-	  dot_p_->add_offset_callback (Dots::quantised_position_callback, Y_AXIS);
-	  dot_p_->set_elt_property ("dot-count",
-				    gh_int2scm (rest_req_l_->duration_.dots_i_));
-	  announce_element (dot_p_,0);
-	}
-
-      announce_element (rest_p_, rest_req_l_);
-    }
+  ASSIGN_EVENT_ONCE (rest_event_, ev);
 }
 
-bool
-Rest_engraver::do_try_music (Music *m)
-{
-  if (Rest_req *r = dynamic_cast <Rest_req *> (m))
-    {
-      rest_req_l_ = r;
-      return true;
-    }  
-  return false;
-}
+ADD_TRANSLATOR (Rest_engraver,
+                /* doc */
+                "Engrave rests.",
+
+                /* create */
+                "Rest ",
 
+                /* read */
+                "middleCPosition ",
 
-ADD_THIS_TRANSLATOR(Rest_engraver);
+                /* write */
+                ""
+               );