partial: 0.0.38.hanjan

[lilypond.git] / hdr / inputmusic.hh

diff --git a/hdr/inputmusic.hh b/hdr/inputmusic.hh
index 5b6da2968aa7538bceae3d7e56b4c095021fe3bc..da3030f11b28dea34d9b093663b640b906957f9a 100644 (file)
--- a/hdr/inputmusic.hh
+++ b/hdr/inputmusic.hh
@@ -1,7 +1,7 @@
 /*
   inputmusic.hh -- part of LilyPond
 
-  (c) 1996 Han-Wen Nienhuys
+  (c) 1996,97 Han-Wen Nienhuys
 */
 
 #ifndef INPUTMUSIC_HH
@@ -16,21 +16,9 @@ struct Voice_list : public PointerList<Voice*> {
     void translate_time(Moment dt);
 };
 
-/// ABC for input structures
-struct Input_music {
-    virtual Voice_list convert()=0;
-    virtual Moment length()=0;
-    virtual void translate_time(Moment dt)=0;
-    virtual ~Input_music(){}
-    virtual void print() const =0;
-    // virtual void transpose(...) const =0;
-    
-    
-    virtual Input_music *clone() const = 0;
-    virtual Simple_music *simple() { return 0; }
-};
 /**
 
+  A set voices.
   Input_music is anything that can simply be regarded as/converted to
   a set of voices "cooperating" or independant. It has some basic
   characteristics that real music has too:
@@ -39,19 +27,37 @@ struct Input_music {
   - a pitch (it can be transposed)
 
   */
-
+struct Input_music {
+    virtual Voice_list convert()const=0;
+    void check_plet(Voice_element* velt_l);
+    virtual Moment length()const=0;
+    virtual void translate_time(Moment dt)=0;
+    virtual ~Input_music(){}
+    virtual void print() const =0;
+    virtual void set_default_group(String)=0;
+    virtual bool find_plet_start_bo(char c, Moment& moment_r) = 0;
+    virtual void set_plet_backwards(Moment& now_moment_r, Moment until_moment, int num_i, int den_i) = 0;
+    // virtual void transpose(...) const =0;
+    
+    
+    virtual Input_music *clone() const = 0;
+    virtual Simple_music *simple() { return 0; }
+};
 
 /// Simple music consists of one voice
 struct Simple_music : Input_music {
     Voice voice_;
 
-    /****/
+    /* *** */
     virtual Simple_music*simple() { return this; }  
     void add(Voice_element*);
-    virtual Moment length();
-    virtual Voice_list convert();
+    virtual void set_default_group(String g) { voice_.set_default_group(g); }
+    virtual Moment length()const;
+    virtual Voice_list convert()const;
     virtual void translate_time(Moment dt);
     virtual void print() const;
+    virtual bool find_plet_start_bo(char c, Moment& moment_r);
+    virtual void set_plet_backwards(Moment& now_moment_r, Moment until_moment, int num_i, int den_i);
     virtual Input_music *clone() const {
        return new Simple_music(*this);
     }
@@ -61,45 +67,55 @@ struct Simple_music : Input_music {
 /// Complex_music consists of multiple voices
 struct Complex_music : Input_music {
     IPointerList<Input_music*> elts;
-
+    /* *************** */
+    virtual void set_default_group(String g);
     void add(Input_music*);
     Complex_music();
     Complex_music(Complex_music const &);
     virtual void print() const ;
     void concatenate(Complex_music*);
+    virtual bool find_plet_start_bo(char c, Moment& moment_r);
+    virtual void set_plet_backwards(Moment& now_moment_r, Moment until_moment, int num_i, int den_i);
  
 };
 
-/// multiple stuff  after each other
+
+/**
+  A voice like list of music.
+
+  different music forms which start after each other ( concatenated,
+  stacked "horizontally )
+ 
+ */
+
 struct Music_voice : Complex_music {
  
     
-    /****************/
-    Moment length();
+    /* *************** */
+    Moment length()const;
     virtual void translate_time(Moment dt);
-    virtual Voice_list convert();
+    virtual Voice_list convert()const;
     void add_elt(Voice_element*);
     virtual Input_music *clone() const {
        return new Music_voice(*this);
     }
     virtual void print() const ;
 };
-/**
-  voice like.
 
-  different music forms which start after each other ( concatenated,
-  stacked "horizontally )
- 
- */
+/**
+  Multiple musicstuff stacked on top of each other
+  chord like :
 
-/// Multiple musicstuff stacked on top of each other
+  - different music forms which start at the same time ( stacked "vertically" )
+  
+  */
 struct Music_general_chord : Complex_music {
-    IPointerList<Input_music*> chord_;
 
-    /****************/
 
-    virtual Moment length();
-    virtual Voice_list convert();
+    /* *************** */
+
+    virtual Moment length()const;
+    virtual Voice_list convert()const;
     virtual void translate_time(Moment dt);
     void add_elt(Voice_element*);
     virtual Input_music *clone() const {
@@ -108,13 +124,17 @@ struct Music_general_chord : Complex_music {
     
     virtual void print() const ;
 };
-/**
-  chord like :
-
-  - different music forms which start at the same time ( stacked "vertically" )
-  
-  */
-
 
+struct Multi_voice_chord : Music_general_chord {
+    void set_default_group(String);
+    virtual Input_music *clone() const {
+       return new Multi_voice_chord(*this);
+    }
+};
+struct Voice_group_chord : Music_general_chord {
 
+    virtual Input_music *clone() const {
+       return new Voice_group_chord(*this);
+    }
+};
 #endif // INPUTMUSIC_HH