Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc
index c6fb7167e3f0f785e2f236b0bd9556349d348afe..d3b2e90972facbdee6b1579468aedafb9900d345 100644 (file)
--- a/lily/extender-engraver.cc
+++ b/lily/extender-engraver.cc
@@ -2,18 +2,19 @@
   extender-engraver.cc -- implement Extender_engraver
 
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2004 Glen Prideaux <glenprideaux@iname.com>,
-                  Han-Wen Nienhuys <hanwen@cs.uu.nl>,
-                  Jan Nieuwenhuizen <janneke@gnu.org>
+
+  (c) 1999--2006 Glen Prideaux <glenprideaux@iname.com>,
+  Han-Wen Nienhuys <hanwen@xs4all.nl>,
+  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "context.hh"
 #include "engraver.hh"
-#include "group-interface.hh"
+#include "international.hh"
 #include "item.hh"
 #include "lyric-extender.hh"
 #include "note-head.hh"
+#include "pointer-group-interface.hh"
 #include "warn.hh"
 
 void completize_extender (Spanner *sp);
@@ -28,14 +29,13 @@ public:
   TRANSLATOR_DECLARATIONS (Extender_engraver);
 
 protected:
-  virtual void acknowledge_grob (Grob_info);
+  DECLARE_ACKNOWLEDGER (lyric_syllable);
   virtual void finalize ();
-  virtual bool try_music (Music*);
-  virtual void stop_translation_timestep ();
-  virtual void process_music ();
+  virtual bool try_music (Music *);
+  void stop_translation_timestep ();
+  void process_music ();
 };
 
-
 Extender_engraver::Extender_engraver ()
 {
   extender_ = 0;
@@ -62,22 +62,17 @@ Extender_engraver::process_music ()
 }
 
 void
-Extender_engraver::acknowledge_grob (Grob_info i)
+Extender_engraver::acknowledge_lyric_syllable (Grob_info i)
 {
-  Item *item = dynamic_cast<Item*> (i.grob_);
+  Item *item = i.item ();
+  if (extender_)
+    extender_->set_bound (LEFT, item);
 
-  if (item
-      && item->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface")))
+  if (pending_extender_)
     {
-      if (extender_)
-       extender_->set_bound (LEFT, item);
-
-      if (pending_extender_)
-       {
-         pending_extender_->set_property ("next", item->self_scm ());
-         completize_extender (pending_extender_);
-         pending_extender_ = 0;
-       }
+      pending_extender_->set_object ("next", item->self_scm ());
+      completize_extender (pending_extender_);
+      pending_extender_ = 0;
     }
 }
 
@@ -96,14 +91,14 @@ Extender_engraver::stop_translation_timestep ()
              Pointer_group_interface::add_grob (extender_,
                                                 ly_symbol2scm ("heads"), h);
            }
-         
+
          if (pending_extender_)
            {
              Pointer_group_interface::add_grob (pending_extender_,
                                                 ly_symbol2scm ("heads"), h);
            }
        }
-      
+
       if (extender_)
        {
          pending_extender_ = extender_;
@@ -119,13 +114,9 @@ completize_extender (Spanner *sp)
 {
   if (!sp->get_bound (RIGHT))
     {
-      SCM heads = sp->get_property ("heads");
-      if (scm_is_pair (heads))
-       {
-         Item *it = dynamic_cast<Item*> (unsmob_grob (scm_car (heads)));
-         if (it)
-           sp->set_bound (RIGHT, it);
-       }
+      extract_item_set (sp, "heads", heads);
+      if (heads.size ())
+       sp->set_bound (RIGHT, heads.back ());
     }
 }
 
@@ -147,15 +138,16 @@ Extender_engraver::finalize ()
 
       if (!pending_extender_->get_bound (RIGHT))
        pending_extender_->warning (_ ("unterminated extender"));
-      pending_extender_ =0;
+      pending_extender_ = 0;
     }
 }
 
+#include "translator.icc"
 
-ENTER_DESCRIPTION (Extender_engraver,
-/* descr */       "Create lyric extenders",
-/* creats*/       "LyricExtender",
-/* accepts */     "extender-event",
-/* acks  */       "lyric-syllable-interface",
-/* reads */       "",
-/* write */       "");
+ADD_ACKNOWLEDGER (Extender_engraver, lyric_syllable);
+ADD_TRANSLATOR (Extender_engraver,
+               /* doc */ "Create lyric extenders",
+               /* create */ "LyricExtender",
+               /* accept */ "extender-event",
+               /* read */ "",
+               /* write */ "");