release: 0.0.7

[lilypond.git] / note.cc

diff --git a/note.cc b/note.cc
index 2307729a3cf4ed7935c35fd8c8066d6a366f7697..b897ce0e6647be29b67843c6a2e34fab8fdef257 100644 (file)
--- a/note.cc
+++ b/note.cc
@@ -32,6 +32,7 @@ parse_duration(const char *a, int &j, int &intdur, int &dots)
 }
 
 
+
 void 
 parse_pitch( const char *a, int &j, int &oct, bool & overide_acc,
             int & large, int & small)
@@ -63,8 +64,6 @@ parse_pitch( const char *a, int &j, int &oct, bool & overide_acc,
        }
 
     
-    mtor << "ov " << overide_acc;
-    
     // notename.
     String nm;
     while (isalpha(a[j])) 
@@ -78,8 +77,9 @@ parse_pitch( const char *a, int &j, int &oct, bool & overide_acc,
        }
         
 
-    lookup_notename(large,small,nm);    
-    mtor << "int "<< large <<" "<<small<<" ";    
+    lookup_notename(large,small,nm);
+    mtor << "override: " << overide_acc;    
+    mtor << "pitch "<< large <<", "<<small<<"\n";    
 }
 
 
@@ -95,18 +95,29 @@ get_note_element(String pitch, String durstr)
 
     Note_req * rq = new Note_req( v);
 
+    if (dur >= 2) {
+       Stem_req * st = new Stem_req(v, dur);
+       v->add(st);
+    }
+    
     int oct, pit, acc;
     bool forceacc;
     parse_pitch(pitch, i, oct, forceacc, pit, acc);
-
+    char nm =  pit + 'c';
+    if (nm > 'g')
+       nm += 'a' - 'h';
+    rq->name =nm;
+    
     rq->octave = oct;
     rq->accidental = acc;
     rq->forceacc = forceacc;
     rq->balltype = dur;
     rq->dots = dots;
     
+    rq->print();
 
     v->add(rq);
+
     return v;
 }
 
@@ -124,7 +135,7 @@ get_rest_element(String, String durstr)
   
     rq->balltype = dur;
     rq->dots = dots;    
-
+    rq->print();
     v->add(rq);
     return v;
 }