Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / pitched-trill-engraver.cc

diff --git a/lily/pitched-trill-engraver.cc b/lily/pitched-trill-engraver.cc
index 4651a4cc0dfb683ffaad7b47428695d931cb5de1..84e391e231b301647120a5a9da73d00ef34d46d7 100644 (file)
--- a/lily/pitched-trill-engraver.cc
+++ b/lily/pitched-trill-engraver.cc
@@ -3,44 +3,43 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
-
+  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
 
 #include "dots.hh"
-#include "group-interface.hh"
+#include "pointer-group-interface.hh"
 #include "axis-group-interface.hh"
 #include "context.hh"
 #include "note-head.hh"
 #include "item.hh"
 #include "side-position-interface.hh"
-#include "pitch.hh"            
+#include "pitch.hh"
 #include "warn.hh"
 
 class Pitched_trill_engraver : public Engraver
 {
-
 public:
-  TRANSLATOR_DECLARATIONS(Pitched_trill_engraver);
-  
+  TRANSLATOR_DECLARATIONS (Pitched_trill_engraver);
+
 protected:
-  virtual void acknowledge_grob (Grob_info);
-  virtual void process_music ();
-  virtual bool try_music (Music*);
-  virtual void stop_translation_timestep ();
+  DECLARE_ACKNOWLEDGER (note_head);
+  DECLARE_ACKNOWLEDGER (dots);
+  DECLARE_ACKNOWLEDGER (text_spanner);
+  void process_music ();
+  void stop_translation_timestep ();
+
 private:
   Item *trill_head_;
   Item *trill_group_;
   Item *trill_accidental_;
 
-  Link_array<Grob> heads_;
+  vector<Grob*> heads_;
 
   void make_trill (Music *);
 };
 
-
 Pitched_trill_engraver::Pitched_trill_engraver ()
 {
   trill_head_ = 0;
@@ -49,44 +48,47 @@ Pitched_trill_engraver::Pitched_trill_engraver ()
 }
 
 void
-Pitched_trill_engraver::acknowledge_grob (Grob_info info)
+Pitched_trill_engraver::acknowledge_dots (Grob_info info)
 {
-  Music *mus = info.music_cause ();
+  heads_.push_back (info.grob ());
+}
+void
+Pitched_trill_engraver::acknowledge_note_head (Grob_info info)
+{
+  heads_.push_back (info.grob ());
+}
 
-  if (Note_head::has_interface (info.grob ())
-      || Dots::has_interface (info.grob ()))
-    {
-      heads_.push (info.grob ());
-    }
-  else if (mus
-          && mus->is_mus_type ("trill-span-event")
-          && to_dir (mus->get_property ("span-direction")) == START
-          && unsmob_pitch (mus->get_property ("trill-pitch")))
-    {
-      make_trill (mus);
-    }
+void
+Pitched_trill_engraver::acknowledge_text_spanner (Grob_info info)
+{
+  Music *mus = info.music_cause ();
+  if (mus
+      && mus->is_mus_type ("trill-span-event")
+      && to_dir (mus->get_property ("span-direction")) == START
+      && unsmob_pitch (mus->get_property ("pitch")))
+    make_trill (mus);
 }
 
 void
 Pitched_trill_engraver::make_trill (Music *mus)
 {
-  SCM scm_pitch = mus->get_property ("trill-pitch");
-  Pitch * p = unsmob_pitch (scm_pitch);
+  SCM scm_pitch = mus->get_property ("pitch");
+  Pitch *p = unsmob_pitch (scm_pitch);
 
   SCM keysig = get_property ("localKeySignature");
 
-  SCM key = scm_cons (scm_int2num (p->get_octave ()),
-                     scm_int2num (p->get_notename ()));
+  SCM key = scm_cons (scm_from_int (p->get_octave ()),
+                     scm_from_int (p->get_notename ()));
 
   SCM handle = scm_assoc (key, keysig);
-  bool print_acc =
-    (handle == SCM_BOOL_F)
+  bool print_acc
+    = (handle == SCM_BOOL_F)
     || p->get_alteration () == 0;
 
   if (trill_head_)
     {
       programming_error ("already have a trill head.");
-      trill_head_ = 0; 
+      trill_head_ = 0;
     }
 
   trill_head_ = make_item ("TrillPitchHead", mus->self_scm ());
@@ -97,10 +99,10 @@ Pitched_trill_engraver::make_trill (Music *mus)
   trill_head_->set_property ("staff-position",
                             scm_from_int (unsmob_pitch (scm_pitch)->steps ()
                                           + c0));
-  
-  trill_group_ = make_item ("TrillPitchGroup", mus->self_scm());
 
-  Axis_group_interface::add_element (trill_group_,  trill_head_);
+  trill_group_ = make_item ("TrillPitchGroup", mus->self_scm ());
+
+  Axis_group_interface::add_element (trill_group_, trill_head_);
 
   if (print_acc)
     {
@@ -109,7 +111,7 @@ Pitched_trill_engraver::make_trill (Music *mus)
       // fixme: naming -> alterations
       trill_accidental_->set_property ("accidentals", scm_list_1 (scm_from_int (p->get_alteration ())));
       Side_position_interface::add_support (trill_accidental_, trill_head_);
-      trill_head_->set_property ("accidental-grob", trill_accidental_->self_scm ());
+      trill_head_->set_object ("accidental-grob", trill_accidental_->self_scm ());
       trill_group_->set_parent (trill_head_, Y_AXIS);
       Axis_group_interface::add_element (trill_group_, trill_accidental_);
       trill_accidental_->set_parent (trill_head_, Y_AXIS);
@@ -120,11 +122,9 @@ void
 Pitched_trill_engraver::stop_translation_timestep ()
 {
   if (trill_group_)
-    for (int i = 0; i < heads_.size (); i++)
-      {
-       Side_position_interface::add_support (trill_group_, heads_[i]);
-      }
-  
+    for (vsize i = 0; i < heads_.size (); i++)
+      Side_position_interface::add_support (trill_group_, heads_[i]);
+
   heads_.clear ();
   trill_head_ = 0;
   trill_group_ = 0;
@@ -136,16 +136,19 @@ Pitched_trill_engraver::process_music ()
 {
 }
 
-bool
-Pitched_trill_engraver::try_music (Music *)
-{
-  return false;
-}
+
+#include "translator.icc"
+
+ADD_ACKNOWLEDGER (Pitched_trill_engraver, note_head);
+ADD_ACKNOWLEDGER (Pitched_trill_engraver, dots);
+ADD_ACKNOWLEDGER (Pitched_trill_engraver, text_spanner);
 
 ADD_TRANSLATOR (Pitched_trill_engraver,
-               /* descr */ "Print the bracketed notehead after a notehead with trill.",
-               /* creats*/ "TrillPitchHead TrillPitchAccidental TrillPitchGroup",
-               /* accepts */ "",
-               /* acks  */ "script-interface text-spanner-interface dots-interface note-head-interface",
-               /* reads */ "",
+               /* doc */ "Print the bracketed notehead after a notehead with trill.",
+               /* create */
+               "TrillPitchHead "
+               "TrillPitchAccidental "
+               "TrillPitchGroup",
+               /* accept */ "",
+               /* read */ "",
                /* write */ "");