Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/ambitus-engraver.cc b/lily/ambitus-engraver.cc
index e2471fc385f88aac300c85a020daaaf14f0248fc..f71c33b49c9c62537fd67ba4187eb6125359a4a8 100644 (file)
--- a/lily/ambitus-engraver.cc
+++ b/lily/ambitus-engraver.cc
@@ -3,18 +3,20 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2005 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2002--2006 Juergen Reuter <reuter@ipd.uka.de>
 
   Han-Wen Nienhuys <hanwen@xs4all.nl
 */
 
 #include "engraver.hh"
+
+#include "axis-group-interface.hh"
 #include "note-head.hh"
 #include "pitch-interval.hh"
+#include "pointer-group-interface.hh"
 #include "protected-scm.hh"
-#include "staff-symbol-referencer.hh"
-#include "axis-group-interface.hh"
 #include "side-position-interface.hh"
+#include "staff-symbol-referencer.hh" 
 
 #include "translator.icc"
 
@@ -22,9 +24,9 @@ class Ambitus_engraver : public Engraver
 {
 public:
   TRANSLATOR_DECLARATIONS (Ambitus_engraver);
-  PRECOMPUTED_VIRTUAL void process_music ();
+  void process_music ();
   void acknowledge_note_head (Grob_info);
-  PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
+  void stop_translation_timestep ();
   virtual void finalize ();
   virtual void derived_mark () const;
 
@@ -58,7 +60,7 @@ Ambitus_engraver::create_ambitus ()
       accidentals_[d] = make_item ("AmbitusAccidental", SCM_EOL);
       accidentals_[d]->set_parent (heads_[d], Y_AXIS);
       heads_[d]->set_object ("accidental-grob",
-                              accidentals_[d]->self_scm ());
+                            accidentals_[d]->self_scm ());
       Axis_group_interface::add_element (group_, heads_[d]);
       Axis_group_interface::add_element (group_, accidentals_[d]);
       Side_position_interface::add_support (accidentals_[d], heads_[d]);
@@ -91,9 +93,7 @@ Ambitus_engraver::process_music ()
    * be placed after the rest.
    */
   if (!ambitus_)
-    {
-      create_ambitus ();
-    }
+    create_ambitus ();
 }
 
 void
@@ -148,7 +148,7 @@ Ambitus_engraver::finalize ()
 
          int sig_alter = (handle != SCM_BOOL_F)
            ? scm_to_int (scm_cdr (handle)) : 0;
-         
+
          if (sig_alter == p.get_alteration ())
            {
              accidentals_[d]->suicide ();
@@ -158,13 +158,13 @@ Ambitus_engraver::finalize ()
            {
              SCM l = scm_list_1 (scm_from_int (p.get_alteration ()));
              accidentals_[d]->set_property ("accidentals", l);
-                       
            }
        }
       while (flip (&d) != DOWN);
 
-      ambitus_->set_object ("note-heads", scm_list_2 (heads_[DOWN]->self_scm (),
-                                                       heads_[UP]->self_scm ()));
+
+      Pointer_group_interface::add_grob (ambitus_, ly_symbol2scm ("note-heads"), heads_[DOWN]);
+      Pointer_group_interface::add_grob (ambitus_, ly_symbol2scm ("note-heads"), heads_[UP]);
     }
   else
     {
@@ -180,12 +180,10 @@ Ambitus_engraver::finalize ()
     }
 }
 
-
-ADD_ACKNOWLEDGER(Ambitus_engraver, note_head);
+ADD_ACKNOWLEDGER (Ambitus_engraver, note_head);
 ADD_TRANSLATOR (Ambitus_engraver,
-               /* descr */ "",
-               /* creats*/ "Ambitus AmbitusLine AmbitusNoteHead AmbitusAccidental",
-               /* accepts */ "",
-               /* acks  */ "",
-               /* reads */ "",
+               /* doc */ "",
+               /* create */ "Ambitus AmbitusLine AmbitusNoteHead AmbitusAccidental",
+               /* accept */ "",
+               /* read */ "",
                /* write */ "");