release: 1.3.3

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

diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc
index ba4fe386dfc098271c23b3d410ff66a48c703ec2..ef0744d627219e1092001232021a8c859d383043 100644 (file)
--- a/lily/chord-name-engraver.cc
+++ b/lily/chord-name-engraver.cc
@@ -3,22 +3,26 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--1999 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "chord-name-engraver.hh"
+#include "chord.hh"
 #include "musical-request.hh"
-#include "text-item.hh"
 #include "paper-def.hh"
 #include "lookup.hh"
 #include "paper-def.hh"
 #include "main.hh"
 #include "dimensions.hh"
+#include "text-item.hh"
 
 ADD_THIS_TRANSLATOR (Chord_name_engraver);
 
 Chord_name_engraver::Chord_name_engraver ()
 {
+  tonic_req_ = 0;
+  inversion_req_ = 0;
+  bass_req_ = 0;
 }
 
 void
@@ -36,6 +40,21 @@ Chord_name_engraver::do_try_music (Music* 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;
+      return true;
+    }
   return false;
 }
 
@@ -47,34 +66,28 @@ Chord_name_engraver::do_process_requests ()
   if (!pitch_arr_.size ())
     return;
 
-  Scalar style = get_property ("textstyle");
-  Scalar alignment = get_property ("textalignment");
-  Text_def* text_p = new Text_def;
-  text_p->align_dir_ = LEFT;
-  if (style.length_i ())
-    text_p->style_str_ = style;
-  if (alignment.isnum_b())
-    text_p->align_dir_= (Direction)(int)alignment;
+  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);
 
-  Musical_pitch tonic = pitch_arr_[0];
-  text_p->text_str_ = tonic.str ();
-  for (int i=1; i < pitch_arr_.size (); i++)
-    {
-      Musical_pitch p = pitch_arr_[i];
-      int trap = (p.notename_i_ - tonic.notename_i_ + 8) % 8 + 1;
-      if (((trap != 3) && (trap != 5)) || (p.accidental_i_))
-        {
-         text_p->text_str_ += to_str ((p.notename_i_ - tonic.notename_i_ + 8) % 8 + 1);
-         if (p.accidental_i_)
-           text_p->text_str_ += p.accidental_i_ < 0 ? "-" : "+";
-         if (i + 1 < pitch_arr_.size ())
-           text_p->text_str_ += "/";
-       }
-    }
+  Chord chord = to_chord (pitch_arr_, tonic_req_, inversion_req_, bass_req_, 
+    find_inversion_b);
+    
+  Text_item* item_p =  new Text_item;
+
+  /*
+   TODO:
+     - switch on property, add american (?) chordNameStyle:
+       Chord::american_str (...)
+
+  SCM chordNameStyle = get_property ("chordNameStyle", 0);
+  if (chordNameStyle == "Banter")
+    item_p->text_str_ = chord.banter_str (inversion);
+   */
 
-  Text_item* item_p =  new Text_item (text_p);
-  item_p->dir_ = DOWN;
-  item_p->fat_b_ = true;
+  item_p->text_str_ = chord.banter_str ();
+  
   text_p_arr_.push (item_p);
   announce_element (Score_element_info (item_p, 0));
 }
@@ -88,5 +101,8 @@ Chord_name_engraver::do_pre_move_processing ()
     }
   text_p_arr_.clear ();
   pitch_arr_.clear ();
+  tonic_req_ = 0;
+  inversion_req_ = 0;
+  bass_req_ = 0;
 }