patch::: 1.5.40.jcn1

[lilypond.git] / lily / include / chord.hh

diff --git a/lily/include/chord.hh b/lily/include/chord.hh
index c062efb6ac89187162776b3904c91b6c459b6b57..f9bee640a1f7b0831a0641e32f2bd42a8a5a92ff 100644 (file)
--- a/lily/include/chord.hh
+++ b/lily/include/chord.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef CHORD_HH
@@ -12,33 +12,27 @@
 #include "pitch.hh"
 
 /*
+  This is not an Item, just a collection of Chord manipulation helper
+  functions
+  
   ``chord'' is encoded:
-  (PITCHES . (INVERSION . BASS))
+ (PITCHES . (INVERSION . BASS))
 
-  Chord:: namespace...
- */
+  Chord:: namespace...  */
 class Chord
 {
 public:
-  static SCM pitches_and_requests_to_chord (SCM pitches,
-                                    SCM tonic_req,
-                                    SCM inversion_req,
-                                    SCM bass_req,
-                                    bool find_inversion_b);
   static SCM base_pitches (SCM tonic);
   static SCM transpose_pitches (SCM tonic, SCM pitches);
   static SCM lower_step (SCM tonic, SCM pitches, SCM step);
   static SCM member_notename (SCM p, SCM pitches);
-  static int step_i (Pitch tonic, Pitch p);
+  static SCM member_pitch (SCM p, SCM pitches);
   static SCM step_scm (SCM tonic, SCM p);
   static SCM missing_thirds (SCM pitches);
   static SCM to_pitches (SCM chord);
-  static SCM guess_tonic (SCM pitches);
-  static SCM rebuild_from_base (SCM pitches, SCM base);
-  static SCM rebuild_insert_inversion (SCM pitches); //, SCM tonic);
-  static SCM rebuild_with_bass (SCM pitches, SCM bass);
-  static SCM tonic_add_sub_inversion_bass_to_scm (SCM tonic, SCM add, SCM sub,
-                                           SCM inversion, SCM bass);
+  static SCM add_above_tonic (SCM pitch, SCM pitches);
+  static SCM add_below_tonic (SCM pitch, SCM pitches);
+  static SCM tonic_add_sub_to_pitches (SCM tonic, SCM add, SCM sub);
   static Simultaneous_music *get_chord (SCM tonic, SCM add, SCM sub, SCM inversion, SCM bass, SCM dur);
 };