Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / chord-name-engraver.cc

diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc
index 0291aef631c688b8744fa384ab9ec9cd3be59563..963c3033f22e67ecaf6b0a0c46ca73dd45cc2d63 100644 (file)
--- a/lily/chord-name-engraver.cc
+++ b/lily/chord-name-engraver.cc
@@ -3,41 +3,38 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "engraver.hh"
 #include "chord-name.hh"
-#include "event.hh"
 #include "output-def.hh"
 #include "font-interface.hh"
 #include "output-def.hh"
 #include "dimensions.hh"
 #include "item.hh"
-#include "pitch.hh"
 #include "protected-scm.hh"
 #include "context.hh"
 #include "warn.hh"
+#include "pitch.hh"
 
-class Chord_name_engraver : public Engraver 
+class Chord_name_engraver : public Engraver
 {
-  TRANSLATOR_DECLARATIONS ( Chord_name_engraver);
+  TRANSLATOR_DECLARATIONS (Chord_name_engraver);
 protected:
-  virtual void stop_translation_timestep ();
-  virtual void process_music ();
+  void stop_translation_timestep ();
+  void process_music ();
   virtual bool try_music (Music *);
   virtual void finalize ();
   virtual void derived_mark () const;
 private:
   void add_note (Music *);
-  
-  Item* chord_name_;
-  Link_array<Music> notes_;
-  
-  SCM last_chord_;
-};
 
+  Item *chord_name_;
+  vector<Music*> notes_;
 
+  SCM last_chord_;
+};
 
 void
 Chord_name_engraver::finalize ()
@@ -45,7 +42,7 @@ Chord_name_engraver::finalize ()
 }
 
 void
-Chord_name_engraver::derived_mark() const
+Chord_name_engraver::derived_mark () const
 {
   scm_gc_mark (last_chord_);
 }
@@ -57,29 +54,29 @@ Chord_name_engraver::Chord_name_engraver ()
 }
 
 void
-Chord_name_engraver::add_note (Music * n)
+Chord_name_engraver::add_note (Music *n)
 {
-  notes_.push (n);
+  notes_.push_back (n);
 }
 
 void
 Chord_name_engraver::process_music ()
 {
-  if (!notes_.size () )
+  if (!notes_.size ())
     return;
-  
+
   SCM bass = SCM_EOL;
   SCM inversion = SCM_EOL;
   SCM pitches = SCM_EOL;
 
-  Music* inversion_event = 0;
-  for (int i =0 ; i < notes_.size (); i++)
+  Music *inversion_event = 0;
+  for (vsize i = 0; i < notes_.size (); i++)
     {
       Music *n = notes_[i];
       SCM p = n->get_property ("pitch");
       if (!unsmob_pitch (p))
        continue;
-      
+
       if (n->get_property ("inversion") == SCM_BOOL_T)
        {
          inversion_event = n;
@@ -97,13 +94,13 @@ Chord_name_engraver::process_music ()
       if (scm_is_number (oct))
        {
          Pitch *p = unsmob_pitch (inversion_event->get_property ("pitch"));
-         int octavation =  scm_to_int (oct);
-         Pitch orig = p->transposed (Pitch (-octavation, 0,0));
-         
-         pitches= scm_cons (orig.smobbed_copy (), pitches);
+         int octavation = scm_to_int (oct);
+         Pitch orig = p->transposed (Pitch (-octavation, 0, 0));
+
+         pitches = scm_cons (orig.smobbed_copy (), pitches);
        }
       else
-       programming_error ("Inversion does not have original pitch.");
+       programming_error ("inversion does not have original pitch");
     }
 
   pitches = scm_sort_list (pitches, Pitch::less_p_proc);
@@ -113,27 +110,27 @@ Chord_name_engraver::process_music ()
                           context ()->self_scm ());
 
   /*
-    Ugh. 
-   */
+    Ugh.
+  */
   SCM chord_as_scm = scm_cons (pitches, scm_cons (bass, inversion));
-  
-  chord_name_ = make_item ("ChordName",notes_[0]->self_scm ());
+
+  chord_name_ = make_item ("ChordName", notes_[0]->self_scm ());
   chord_name_->set_property ("text", markup);
 
   SCM s = get_property ("chordChanges");
-  if (to_boolean (s) && ly_c_pair_p (last_chord_) 
-      && ly_c_equal_p (chord_as_scm, last_chord_))
+  if (to_boolean (s) && scm_is_pair (last_chord_)
+      && ly_is_equal (chord_as_scm, last_chord_))
     chord_name_->set_property ("begin-of-line-visible", SCM_BOOL_T);
 
   last_chord_ = chord_as_scm;
 }
 
 bool
-Chord_name_engraver::try_music (Music* m)
+Chord_name_engraver::try_music (Music *m)
 {
   /*
-    hmm. Should check? 
-   */
+    hmm. Should check?
+  */
   if (m->is_mus_type ("note-event"))
     {
       add_note (m);
@@ -153,12 +150,13 @@ Chord_name_engraver::stop_translation_timestep ()
   The READs description is not strictly accurate:
   which properties are read depend on the chord naming function active.
 */
-ENTER_DESCRIPTION (Chord_name_engraver,
-/* descr */       "Catch note-events "
-"and generate the appropriate chordname.",
-/* creats*/       "ChordName",
-/* accepts */     "note-event",
-/* acks  */      "",
-/* reads */       "chordChanges chordNameExceptions chordNameFunction "
-"chordNoteNamer chordRootNamer chordNameExceptions majorSevenSymbol",
-/* write */       "");
+#include "translator.icc"
+
+ADD_TRANSLATOR (Chord_name_engraver,
+               /* doc */ "Catch note-events "
+               "and generate the appropriate chordname.",
+               /* create */ "ChordName",
+               /* accept */ "note-event",
+               /* read */ "chordChanges chordNameExceptions chordNameFunction "
+               "chordNoteNamer chordRootNamer chordNameExceptions majorSevenSymbol",
+               /* write */ "");