lilypond-0.0.8

diff --git a/misc.hh b/misc.hh
index 03211132422c00eddc55230c7c4db1c51b9f3933..64c8ca4102c1606fb91513938c895473bbbd9d08 100644 (file)
--- a/misc.hh
+++ b/misc.hh
@@ -1,7 +1,7 @@
 #ifndef MISC_HH
 #define MISC_HH
-#include "real.hh"
-int intlog2(int d);
-Real duration_to_idealspace(Real d,Real w);
+
+
+
 
 #endif

diff --git a/paper.hh b/paper.hh
index e96d9b089fdde78e6b72793e0ba0bea94ee9d1a4..ffe4f795a86d83cf7ff173d3b33b119fcbfac31e 100644 (file)
--- a/paper.hh
+++ b/paper.hh
@@ -8,6 +8,9 @@ struct Paperdef {
     Real linewidth;
     /// how much space does a whole note take (ideally?)
     Real whole_width;
+
+    // ideal = geometric_ ^ log2(duration)
+    Real geometric_;
     
     /****************/
     void parse();
@@ -17,5 +20,6 @@ struct Paperdef {
     Real standard_height()const;
     Real note_width() const;
     void print() const;
+    Real duration_to_dist(Real);
 };