* python/convertrules.py (conv): warning on \tempo{}

[lilypond.git] / lily / script-engraver.cc

diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc
index 6baa67bfc05d8d20536fc4b18d88afe63499780d..7c05131a85f2164381d2c317cdeaa85ac91875c5 100644 (file)
--- a/lily/script-engraver.cc
+++ b/lily/script-engraver.cc
@@ -3,25 +3,30 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
+#include "engraver.hh"
+
 #include "context.hh"
 #include "directional-element-interface.hh"
-#include "engraver.hh"
-#include "slur.hh"
+#include "international.hh"
 #include "note-column.hh"
 #include "paper-column.hh"
 #include "rhythmic-head.hh"
 #include "script-interface.hh"
 #include "side-position-interface.hh"
+#include "slur.hh"
 #include "staff-symbol-referencer.hh"
 #include "stem.hh"
+#include "stream-event.hh"
 #include "warn.hh"
 
+#include "translator.icc"
+
 struct Script_tuple
 {
-  Music *event_;
+  Stream_event *event_;
   Grob *script_;
   Script_tuple ()
   {
@@ -32,14 +37,14 @@ struct Script_tuple
 
 class Script_engraver : public Engraver
 {
-  Array<Script_tuple> scripts_;
+  vector<Script_tuple> scripts_;
   Spanner *slur_;
 
 protected:
-  virtual bool try_music (Music *);
   void stop_translation_timestep ();
   void process_music ();
 
+  DECLARE_TRANSLATOR_LISTENER (articulation);
   DECLARE_ACKNOWLEDGER (slur);
   DECLARE_ACKNOWLEDGER (rhythmic_head);
   DECLARE_ACKNOWLEDGER (stem);
@@ -55,25 +60,21 @@ Script_engraver::Script_engraver ()
   slur_ = 0;
 }
 
-bool
-Script_engraver::try_music (Music *m)
+IMPLEMENT_TRANSLATOR_LISTENER (Script_engraver, articulation);
+void
+Script_engraver::listen_articulation (Stream_event *ev)
 {
-  if (m->is_mus_type ("articulation-event"))
-    {
-      /* Discard double articulations for part-combining.  */
-      int script_count = scripts_.size ();
-      for (int i = 0; i < script_count; i++)
-       if (ly_is_equal (scripts_[i].event_
-                        ->get_property ("articulation-type"),
-                        m->get_property ("articulation-type")))
-         return true;
-
-      Script_tuple t;
-      t.event_ = m;
-      scripts_.push (t);
-      return true;
-    }
-  return false;
+  /* Discard double articulations for part-combining.  */
+  int script_count = scripts_.size ();
+  for (int i = 0; i < script_count; i++)
+    if (ly_is_equal (scripts_[i].event_
+                    ->get_property ("articulation-type"),
+                    ev->get_property ("articulation-type")))
+      return;
+
+  Script_tuple t;
+  t.event_ = ev;
+  scripts_.push_back (t);
 }
 
 void
@@ -132,7 +133,8 @@ void make_script_from_event (Grob *p,  Context *tg,
        }
 
       SCM preset = p->get_property_data (sym);
-      if (scm_call_1 (type, preset) == SCM_BOOL_F)
+      if (val == SCM_EOL
+         || scm_call_1 (type, preset) == SCM_BOOL_F)
        p->internal_set_property (sym, val);
     }
 
@@ -148,19 +150,19 @@ void make_script_from_event (Grob *p,  Context *tg,
 void
 Script_engraver::process_music ()
 {
-  for (int i = 0; i < scripts_.size (); i++)
+  for (vsize i = 0; i < scripts_.size (); i++)
     {
-      Music *music = scripts_[i].event_;
+      Stream_event *ev = scripts_[i].event_;
 
-      Grob *p = make_item ("Script", music->self_scm ());
+      Grob *p = make_item ("Script", ev->self_scm ());
 
       make_script_from_event (p, context (),
-                             music->get_property ("articulation-type"),
+                             ev->get_property ("articulation-type"),
                              i);
 
       scripts_[i].script_ = p;
 
-      SCM force_dir = music->get_property ("direction");
+      SCM force_dir = ev->get_property ("direction");
       if (is_direction (force_dir) && to_dir (force_dir))
        p->set_property ("direction", force_dir);
     }
@@ -196,9 +198,9 @@ Script_engraver::acknowledge_stem_tremolo (Grob_info info)
 void
 Script_engraver::acknowledge_rhythmic_head (Grob_info info)
 {
-  if (info.music_cause ())
+  if (info.event_cause ())
     {
-      for (int i = 0; i < scripts_.size (); i++)
+      for (vsize i = 0; i < scripts_.size (); i++)
        {
          Grob *e = scripts_[i].script_;
 
@@ -221,7 +223,7 @@ Script_engraver::acknowledge_note_column (Grob_info info)
 
      As the note head to put it on is not known now, postpone this
      decision to Script_interface::calc_direction ().  */
-  for (int i = 0; i < scripts_.size (); i++)
+  for (vsize i = 0; i < scripts_.size (); i++)
     {
       Grob *e = scripts_[i].script_;
 
@@ -243,8 +245,6 @@ Script_engraver::stop_translation_timestep ()
   scripts_.clear ();
 }
 
-#include "translator.icc"
-
 ADD_ACKNOWLEDGER (Script_engraver, slur);
 ADD_ACKNOWLEDGER (Script_engraver, rhythmic_head);
 ADD_ACKNOWLEDGER (Script_engraver, stem);