X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-name-engraver.cc;h=bbccd04afee50aed36bd4055f133b46077bdfac9;hb=aac814e0904dde5c2d5bba5f165e61826c72b1aa;hp=c22fd18a5b73679c6673f11066dff3d65b4191bb;hpb=d9df7feb597f0632981f7d77b01f022f275db822;p=lilypond.git

diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc
index c22fd18a5b..bbccd04afe 100644
--- a/lily/chord-name-engraver.cc
+++ b/lily/chord-name-engraver.cc
@@ -3,92 +3,110 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "chord-name-engraver.hh"
+#include "engraver.hh"
 #include "chord-name.hh"
+#include "chord.hh"
 #include "musical-request.hh"
 #include "paper-def.hh"
-#include "lookup.hh"
+#include "font-interface.hh"
 #include "paper-def.hh"
 #include "main.hh"
 #include "dimensions.hh"
-#include "text-item.hh"
+#include "item.hh"
+#include "pitch.hh"
+#include "protected-scm.hh"
+
+class Chord_name_engraver : public Engraver 
+{
+  TRANSLATOR_DECLARATIONS( Chord_name_engraver);
+protected:
+  virtual void stop_translation_timestep ();
+  virtual void process_music ();
+  virtual bool try_music (Music *);
+
+private:
+  void add_note (Note_req *);
+  
+  Item* chord_name_;
+
+  Protected_scm chord_;
+  Protected_scm last_chord_;
+};
+
 
-ADD_THIS_TRANSLATOR (Chord_name_engraver);
 
 Chord_name_engraver::Chord_name_engraver ()
 {
-  chord_name_p_ = 0;
-  tonic_req_ = 0;
-  inversion_req_ = 0;
-  bass_req_ = 0;
+  chord_name_ = 0;
+  chord_ = gh_cons (SCM_EOL, gh_cons (SCM_EOL, SCM_EOL));
+  last_chord_ = chord_;
 }
 
 void
-Chord_name_engraver::acknowledge_element (Score_element_info i)
+Chord_name_engraver::add_note (Note_req* n)
 {
-  if (Note_req* n = dynamic_cast<Note_req*> (i.req_l_))
-    pitch_arr_.push (n->pitch_);
+  SCM pitches = ly_car (chord_);
+  SCM modifiers = ly_cdr (chord_);
+  SCM inversion = modifiers == SCM_EOL ? SCM_EOL : ly_car (modifiers);
+  SCM bass = modifiers == SCM_EOL ? SCM_EOL : ly_cdr (modifiers);
+  
+  if (n->get_mus_property ("inversion") == SCM_BOOL_T)
+    inversion = n->get_mus_property ("pitch");
+  else if (n->get_mus_property ("bass") == SCM_BOOL_T)
+    bass = n->get_mus_property ("pitch");
+  else
+    pitches = scm_sort_list (gh_cons (n->get_mus_property ("pitch"), pitches),
+			     Pitch::less_p_proc);
+  chord_ = gh_cons (pitches, gh_cons (inversion, bass));
 }
 
 bool
-Chord_name_engraver::do_try_music (Music* m)
+Chord_name_engraver::try_music (Music* m)
 {
   if (Note_req* n = dynamic_cast<Note_req*> (m))
     {
-      pitch_arr_.push (n->pitch_);
-      return true;
-    }
-  if (Tonic_req* t = dynamic_cast<Tonic_req*> (m))
-    {
-      tonic_req_ = t;
-      return true;
-    }
-  if (Inversion_req* i = dynamic_cast<Inversion_req*> (m))
-    {
-      inversion_req_ = i;
-      return true;
-    }
-  if (Bass_req* b = dynamic_cast<Bass_req*> (m))
-    {
-      bass_req_ = b;
+      add_note (n);
       return true;
     }
   return false;
 }
 
 void
-Chord_name_engraver::do_process_requests ()
+Chord_name_engraver::process_music ()
 {
-  if (chord_name_p_)
-    return;
-  if (!pitch_arr_.size ())
-    return;
-
-  bool find_inversion_b = false;
-  SCM chord_inversion = get_property ("chordInversion", 0);
-  if (gh_boolean_p (chord_inversion))
-    find_inversion_b = gh_scm2bool (chord_inversion);
-
-  chord_name_p_ = new Chord_name;
-  chord_name_p_->set (to_chord (pitch_arr_, tonic_req_, inversion_req_, bass_req_, find_inversion_b));
-    
-  announce_element (Score_element_info (chord_name_p_, 0));
+  if (ly_car (chord_) != SCM_EOL)
+    {
+      chord_name_ = new Item (get_property ("ChordName"));
+      chord_name_->set_grob_property ("chord", chord_);
+      announce_grob(chord_name_, SCM_EOL);
+      SCM s = get_property ("chordChanges");
+      if (to_boolean (s) && ly_car (last_chord_) != SCM_EOL
+	  	  && gh_equal_p (chord_, last_chord_))
+	chord_name_->set_grob_property ("begin-of-line-visible", SCM_BOOL_T);
+    }
 }
 
 void
-Chord_name_engraver::do_pre_move_processing ()
+Chord_name_engraver::stop_translation_timestep ()
 {
-  if (chord_name_p_)
+  if (chord_name_)
     {
-      typeset_element (chord_name_p_);
+      typeset_grob (chord_name_);
     }
-  pitch_arr_.clear ();
-  chord_name_p_ = 0;
-  tonic_req_ = 0;
-  inversion_req_ = 0;
-  bass_req_ = 0;
+  chord_name_ = 0;
+
+  if (ly_car (chord_) != SCM_EOL)
+    last_chord_ = chord_;
+  chord_ = gh_cons (SCM_EOL, gh_cons (SCM_EOL, SCM_EOL));
 }
 
+ENTER_DESCRIPTION(Chord_name_engraver,
+/* descr */       "Catch Note_req's, Tonic_reqs, Inversion_reqs, Bass_req
+and generate the appropriate chordname.",
+/* creats*/       "ChordName",
+/* acks  */       "",
+/* reads */       "chordChanges",
+/* write */       "");