X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-name-engraver.cc;h=20752ae2f7f7b4c368af7120c2c323577b1281e7;hb=7697100194a647d04667946bcd0ba35c0554aac0;hp=e730763fcf20a843b37e8019853c1929924d0cb4;hpb=0d11cc81d96ba3cbe5d3c221aba3ee16e916c4c9;p=lilypond.git

diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc
index e730763fcf..20752ae2f7 100644
--- a/lily/chord-name-engraver.cc
+++ b/lily/chord-name-engraver.cc
@@ -3,102 +3,145 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--1999, 1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "chord-name-engraver.hh"
-#include "chord.hh"
-#include "musical-request.hh"
-#include "paper-def.hh"
-#include "lookup.hh"
-#include "paper-def.hh"
-#include "main.hh"
+#include "chord-name.hh"
+#include "context.hh"
 #include "dimensions.hh"
-#include "text-item.hh"
+#include "engraver.hh"
+#include "font-interface.hh"
+#include "item.hh"
+#include "output-def.hh"
+#include "pitch.hh"
+#include "protected-scm.hh"
+#include "stream-event.hh"
+#include "warn.hh"
 
-ADD_THIS_TRANSLATOR (Chord_name_engraver);
+#include "translator.icc"
 
-Chord_name_engraver::Chord_name_engraver ()
+class Chord_name_engraver : public Engraver
+{
+  TRANSLATOR_DECLARATIONS (Chord_name_engraver);
+protected:
+  void stop_translation_timestep ();
+  void process_music ();
+  virtual void finalize ();
+  virtual void derived_mark () const;
+  DECLARE_TRANSLATOR_LISTENER (note);
+private:
+  Item *chord_name_;
+  vector<Stream_event*> notes_;
+
+  SCM last_chord_;
+};
+
+void
+Chord_name_engraver::finalize ()
 {
-  tonic_req_ = 0;
 }
 
 void
-Chord_name_engraver::acknowledge_element (Score_element_info i)
+Chord_name_engraver::derived_mark () const
 {
-  if (Note_req* n = dynamic_cast<Note_req*> (i.req_l_))
-    pitch_arr_.push (n->pitch_);
+  scm_gc_mark (last_chord_);
 }
 
-bool
-Chord_name_engraver::do_try_music (Music* m)
+Chord_name_engraver::Chord_name_engraver ()
 {
-  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;
-    }
-  return false;
+  chord_name_ = 0;
+  last_chord_ = SCM_EOL;
 }
 
 void
-Chord_name_engraver::do_process_requests ()
+Chord_name_engraver::process_music ()
 {
-  if (text_p_arr_.size ())
-    return;
-  if (!pitch_arr_.size ())
+  if (!notes_.size ())
     return;
 
-  Chord chord (pitch_arr_);
-  Musical_pitch* inversion = 0;
-  Scalar chord_inversion = get_property ("chordInversion", 0);
-  if (chord_inversion.to_bool ())
+  SCM bass = SCM_EOL;
+  SCM inversion = SCM_EOL;
+  SCM pitches = SCM_EOL;
+
+  Stream_event *inversion_event = 0;
+  for (vsize i = 0; i < notes_.size (); i++)
     {
-      int tonic_i = tonic_req_
-	? chord.find_notename_i (tonic_req_->pitch_) : chord.find_tonic_i ();
-	
-      if (tonic_i)
+      Stream_event *n = notes_[i];
+      SCM p = n->get_property ("pitch");
+      if (!unsmob_pitch (p))
+	continue;
+
+      if (n->get_property ("inversion") == SCM_BOOL_T)
 	{
-	  inversion = &pitch_arr_[0];
-	  chord.rebuild_insert_inversion (tonic_i);
+	  inversion_event = n;
+	  inversion = p;
 	}
+      else if (n->get_property ("bass") == SCM_BOOL_T)
+	bass = p;
+      else
+	pitches = scm_cons (p, pitches);
     }
-    
-  Text_item* item_p =  new Text_item;
+
+  if (inversion_event)
+    {
+      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");
+    }
+
+  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 ());
 
   /*
-   TODO:
-     - switch on property, add american (?) chordNameStyle:
-       Chord::american_str (...)
-
-  Scalar chordNameStyle = get_property ("chordNameStyle", 0);
-  if (chordNameStyle == "Banter")
-    item_p->text_str_ = chord.banter_str (inversion);
-   */
-
-  item_p->text_str_ = chord.banter_str (inversion);
-  
-  Scalar style = get_property ("textStyle", 0);
-  if (style.length_i ())
-    item_p->style_str_ = style;
-  
-  text_p_arr_.push (item_p);
-  announce_element (Score_element_info (item_p, 0));
+    Ugh.
+  */
+  SCM chord_as_scm = scm_cons (pitches, scm_cons (bass, inversion));
+
+  chord_name_ = make_item ("ChordName", notes_[0]->self_scm ());
+  chord_name_->set_property ("text", markup);
+
+  SCM s = get_property ("chordChanges");
+  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;
 }
 
+IMPLEMENT_TRANSLATOR_LISTENER (Chord_name_engraver, note);
 void
-Chord_name_engraver::do_pre_move_processing ()
+Chord_name_engraver::listen_note (Stream_event *ev)
 {
-  for (int i=0; i < text_p_arr_.size (); i++)
-    {
-      typeset_element (text_p_arr_[i]);
-    }
-  text_p_arr_.clear ();
-  pitch_arr_.clear ();
-  tonic_req_ = 0;
+  notes_.push_back (ev);
+}
+
+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,
+		/* doc */ "Catch note-events "
+		"and generate the appropriate chordname.",
+		/* create */ "ChordName",
+		/* accept */ "note-event",
+		/* read */ "chordChanges chordNameExceptions chordNameFunction "
+		"chordNoteNamer chordRootNamer chordNameExceptions majorSevenSymbol",
+		/* write */ "");