* input/regression/new-part-combine-solo.ly: more cases.

[lilypond.git] / lily / note-heads-engraver.cc

diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc
index 9d19e641d52443343e62874ab0d98372dccad23b..bd8b1c8a86810d6223bfb2750561d4fbc2ebfd0b 100644 (file)
--- a/lily/note-heads-engraver.cc
+++ b/lily/note-heads-engraver.cc
@@ -1,7 +1,7 @@
 /*
   head-grav.cc -- part of GNU LilyPond
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #include <ctype.h>
 
@@ -18,6 +18,7 @@
 /**
   make balls and rests
  */
+
 class Note_heads_engraver : public Engraver
 {
   Link_array<Item> notes_;
@@ -29,19 +30,14 @@ public:
   TRANSLATOR_DECLARATIONS(Note_heads_engraver);
 
 protected:
-  virtual void start_translation_timestep ();
   virtual bool try_music (Music *req) ;
   virtual void process_music ();
 
   virtual void stop_translation_timestep ();
-
-private:
-  bool in_ligature;
 };
 
 Note_heads_engraver::Note_heads_engraver()
 {
-  in_ligature = 0;
 }
 
 bool
@@ -54,19 +50,8 @@ Note_heads_engraver::try_music (Music *m)
     }
   else if (m->is_mus_type ("busy-playing-event"))
     return note_reqs_.size ();
-  else if (m->is_mus_type ("abort-event"))
-    {
-      in_ligature = 0;
-    }
-  else if (m->is_mus_type ("ligature-event"))
-    {
-      /*
-       Urg ; this is not protocol. We should accept and return
-       true, or ignore.
-      */
-      in_ligature = (to_dir (m->get_mus_property("span-direction")) == START);
-      return false;
-    }
+  else if (m->is_mus_type ("start-playing-event"))
+    return note_reqs_.size ();
   
   return false;
 }
@@ -77,8 +62,7 @@ Note_heads_engraver::process_music ()
 {
   for (int i=0; i < note_reqs_.size (); i++)
     {
-      Item *note =
-       new Item (get_property ((in_ligature) ? "LigatureHead" : "NoteHead"));
+      Item *note = make_item ("NoteHead");
 
       Music * req = note_reqs_[i];
       
@@ -88,11 +72,11 @@ Note_heads_engraver::process_music ()
 
       if (dur.dot_count ())
        {
-         Item * d = new Item (get_property ("Dots"));
+         Item * d = make_item ("Dots");
          Rhythmic_head::set_dots (note, d);
          
          if (dur.dot_count ()
-             != gh_scm2int (d->get_grob_property ("dot-count")))
+             != robust_scm2int (d->get_grob_property ("dot-count"), 0))
            d->set_grob_property ("dot-count", gh_int2scm (dur.dot_count ()));
 
          d->set_parent (note, Y_AXIS);
@@ -130,15 +114,11 @@ Note_heads_engraver::stop_translation_timestep ()
   note_reqs_.clear ();
 }
 
-void
-Note_heads_engraver::start_translation_timestep ()
-{
-}
 
 
 ENTER_DESCRIPTION(Note_heads_engraver,
-/* descr */       "Generate noteheads (also serves a double functions: makes ligatures.",
-/* creats*/       "NoteHead LigatureHead Dots",
+/* descr */       "Generate noteheads.",
+/* creats*/       "NoteHead Dots",
 /* accepts */     "note-event busy-playing-event ligature-event abort-event",
 /* acks  */      "",
 /* reads */       "centralCPosition",