partial: 0.0.39-1.jcn

[lilypond.git] / src / notehead.cc

diff --git a/src/notehead.cc b/src/notehead.cc
index f6521a58fed326c2032ff5d17cdfd8b0b7b8cf52..722b231e6837fa123c54f2a6383910cfac3401bb 100644 (file)
--- a/src/notehead.cc
+++ b/src/notehead.cc
@@ -2,9 +2,11 @@
 #include "notehead.hh"
 #include "dimen.hh" 
 #include "debug.hh"
-#include "paper.hh"
+#include "paper-def.hh"
 #include "lookup.hh"
 #include "molecule.hh"
+#include "musicalrequest.hh"
+
 
 
 Notehead::Notehead(int ss)
@@ -18,26 +20,32 @@ Notehead::Notehead(int ss)
 }
 
 void
-Notehead::print()const
+Notehead::set_rhythmic(Rhythmic_req*r_req_l)
+{
+    balltype = r_req_l->balltype;
+    dots = r_req_l->dots;
+}
+    
+void
+Notehead::do_print()const
 {
 #ifndef NPRINT
-    mtor << "Head "<< balltype << ", position = "<< position
+    mtor << "balltype "<< balltype << ", position = "<< position
         << "dots " << dots;
-    Item::print();
 #endif
 }
 
 
 int
-Notehead::compare(Notehead*&a, Notehead*&b)
+Notehead::compare(Notehead *const  &a, Notehead * const &b)
 {
     return a->position - b->position;
 }
 
 Molecule*
-Notehead::brew_molecule() const return out;
+Notehead::brew_molecule_p() const return out;
 {
-    Paperdef *p = paper();
+    Paper_def *p = paper();
 
     Real dy = p->internote();
     Symbol s = p->lookup_p_->ball(balltype);
@@ -64,7 +72,6 @@ Notehead::brew_molecule() const return out;
        out->add(sm);       
     }
     
-
     out->translate(Offset(0,dy*position));
 }