lilypond-0.0.16

diff --git a/src/beam.cc b/src/beam.cc
index 6c7e6599cf8e7780b495ae1f109b64aab01774ce..c897ebfc6650eb35cc56a591c368f5a50d508772 100644 (file)
--- a/src/beam.cc
+++ b/src/beam.cc
@@ -124,6 +124,9 @@ Beam::process()
 {
     calculate();
 
+    /*
+      quick and dirty!
+      */
     for (PCursor<Stem*> i(stems); i.ok(); i++)
        i->beams_left = i->beams_right = intlog2(ABS(i->flag)) - 2;
 
@@ -192,7 +195,7 @@ Beam::stem_beams(Stem *here, Stem *next, Stem *prev)
        
     if (next){
        int rhalfs = here->beams_right - next->beams_left;
-       int rwholebeams = here->beams_right <? next->beams_left; // g++
+       int rwholebeams = here->beams_right <? next->beams_left; 
 
        Real w = next->hpos() - here->hpos();
        Atom a = paper()->lookup_->beam(sl, w + stemdx);

diff --git a/src/inputmusic.cc b/src/inputmusic.cc
index 45d00e1fb604c011be1bdb9d01bffbcf5864afa1..6d3186bf73b4373b0a16a44b6454f0c8c96482f9 100644 (file)
--- a/src/inputmusic.cc
+++ b/src/inputmusic.cc
@@ -1,7 +1,9 @@
 #include "debug.hh"
 #include "inputmusic.hh"
 #include "voice.hh"
-
+Input_music::~Input_music()
+{
+}
 Vertical_simple::Vertical_simple()
 {
     voice_ = new Voice;

diff --git a/src/slur.cc b/src/slur.cc
index 8b46ec771b9e35471682d2e665e634abd2569f9e..5d9eb0de44ba6fc95718b54aab88f76d76fa0026 100644 (file)
--- a/src/slur.cc
+++ b/src/slur.cc
@@ -85,10 +85,9 @@ Slur::brew_molecule()
     assert(left->line == right->line);
     int minp=1000, maxp=-1000; // todo
     for (int i=0; i<encompass.sz(); i++) {
-       minp = MIN(encompass[i]->position, minp);
-       maxp = MAX(encompass[i]->position, maxp);
-    }
-    
+       minp = encompass[i]->position <? minp;
+       maxp = encompass[i]->position <? maxp;
+    }    
     assert(encompass.sz()>0);  // todo
     int pos1 = encompass.last()->position;
     int pos2 = encompass[0]->position;