X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-name-engraver.cc;h=73b3251b8fb137a9406ed226d84599c63f61600b;hb=9602a6de93da3d612b7833fdd56168c3c8d19df1;hp=c22fd18a5b73679c6673f11066dff3d65b4191bb;hpb=dfc51cf4a38b7b3497d357acc7b80283ae74262d;p=lilypond.git

diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc
index c22fd18a5b..73b3251b8f 100644
--- a/lily/chord-name-engraver.cc
+++ b/lily/chord-name-engraver.cc
@@ -3,92 +3,158 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2005 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "chord-name-engraver.hh"
+#include "engraver.hh"
 #include "chord-name.hh"
-#include "musical-request.hh"
-#include "paper-def.hh"
-#include "lookup.hh"
-#include "paper-def.hh"
-#include "main.hh"
+#include "output-def.hh"
+#include "font-interface.hh"
+#include "output-def.hh"
 #include "dimensions.hh"
-#include "text-item.hh"
+#include "item.hh"
+#include "protected-scm.hh"
+#include "context.hh"
+#include "warn.hh"
 
-ADD_THIS_TRANSLATOR (Chord_name_engraver);
+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 *);
+  virtual void finalize ();
+  virtual void derived_mark () const;
+private:
+  void add_note (Music *);
+
+  Item *chord_name_;
+  Link_array<Music> notes_;
+
+  SCM last_chord_;
+};
+
+void
+Chord_name_engraver::finalize ()
+{
+}
+
+void
+Chord_name_engraver::derived_mark () const
+{
+  scm_gc_mark (last_chord_);
+}
 
 Chord_name_engraver::Chord_name_engraver ()
 {
-  chord_name_p_ = 0;
-  tonic_req_ = 0;
-  inversion_req_ = 0;
-  bass_req_ = 0;
+  chord_name_ = 0;
+  last_chord_ = SCM_EOL;
 }
 
 void
-Chord_name_engraver::acknowledge_element (Score_element_info i)
+Chord_name_engraver::add_note (Music *n)
 {
-  if (Note_req* n = dynamic_cast<Note_req*> (i.req_l_))
-    pitch_arr_.push (n->pitch_);
+  notes_.push (n);
 }
 
-bool
-Chord_name_engraver::do_try_music (Music* m)
+void
+Chord_name_engraver::process_music ()
 {
-  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))
+  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++)
     {
-      inversion_req_ = i;
-      return true;
+      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;
+	  inversion = p;
+	}
+      else if (n->get_property ("bass") == SCM_BOOL_T)
+	bass = p;
+      else
+	pitches = scm_cons (p, pitches);
     }
-  if (Bass_req* b = dynamic_cast<Bass_req*> (m))
+
+  if (inversion_event)
     {
-      bass_req_ = b;
-      return true;
+      SCM oct = inversion_event->get_property ("octavation");
+      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);
+	}
+      else
+	programming_error ("Inversion does not have original pitch.");
     }
-  return false;
-}
 
-void
-Chord_name_engraver::do_process_requests ()
-{
-  if (chord_name_p_)
-    return;
-  if (!pitch_arr_.size ())
-    return;
+  pitches = scm_sort_list (pitches, Pitch::less_p_proc);
+
+  SCM name_proc = get_property ("chordNameFunction");
+  SCM markup = scm_call_4 (name_proc, pitches, bass, inversion,
+			   context ()->self_scm ());
+
+  /*
+    Ugh.
+  */
+  SCM chord_as_scm = scm_cons (pitches, scm_cons (bass, inversion));
 
-  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_ = make_item ("ChordName", notes_[0]->self_scm ());
+  chord_name_->set_property ("text", markup);
 
-  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));
+  SCM s = get_property ("chordChanges");
+  if (to_boolean (s) && scm_is_pair (last_chord_)
+      && ly_c_equal_p (chord_as_scm, last_chord_))
+    chord_name_->set_property ("begin-of-line-visible", SCM_BOOL_T);
+
+  last_chord_ = chord_as_scm;
 }
 
-void
-Chord_name_engraver::do_pre_move_processing ()
+bool
+Chord_name_engraver::try_music (Music *m)
 {
-  if (chord_name_p_)
+  /*
+    hmm. Should check?
+  */
+  if (m->is_mus_type ("note-event"))
     {
-      typeset_element (chord_name_p_);
+      add_note (m);
+      return true;
     }
-  pitch_arr_.clear ();
-  chord_name_p_ = 0;
-  tonic_req_ = 0;
-  inversion_req_ = 0;
-  bass_req_ = 0;
+  return false;
 }
 
+void
+Chord_name_engraver::stop_translation_timestep ()
+{
+  chord_name_ = 0;
+  notes_.clear ();
+}
+
+/*
+  The READs description is not strictly accurate:
+  which properties are read depend on the chord naming function active.
+*/
+ADD_TRANSLATOR (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 */ "");