lilypond-0.0.4

diff --git a/main.hh b/main.hh
index 264ac3aa78b32ac71123807cb4391b99a8f41a5e..58928f51421fe72af6211faabf5d07e2cf68ab98 100644 (file)
--- a/main.hh
+++ b/main.hh
@@ -1,8 +1,11 @@
 #ifndef MAIN_HH
 #define MAIN_HH
 #include "proto.hh"
+
 void debug_init();
 void do_scores();
 void add_score(Score * s);
 void set_default_output(String s);
+const char *get_version();
+
 #endif

diff --git a/misc.cc b/misc.cc
index effab35896fee3a3cfbb8a0a006e2d958ec847b4..2be0f81dd67c9530007177553bd5723542aaf5dd 100644 (file)
--- a/misc.cc
+++ b/misc.cc
@@ -26,10 +26,10 @@ const double WHOLE_SPACE = 5.0; // should be settable from input
 
   
 Real
-duration_to_idealspace(Mtime d)
+duration_to_idealspace(Mtime d, Real w)
 {
     // see  Roelofs, p. 57
-    return WHOLE_SPACE * pow(ENGRAVERS_SPACE, log2(d));
+    return w * pow(ENGRAVERS_SPACE, log2(d));
 }
 
 

diff --git a/misc.hh b/misc.hh
index fb8889f55193300f66ce85d32273ebad2bdd3591..a22304267f6075a197df16657007ea1d7adc641e 100644 (file)
--- a/misc.hh
+++ b/misc.hh
@@ -1,8 +1,7 @@
 #ifndef MISC_HH
 #define MISC_HH
 #include "mtime.hh"
-int intlog2(int d);    
-Real duration_to_idealspace(Mtime d);
-class String;
-const char *get_version();
+int intlog2(int d);
+Real duration_to_idealspace(Mtime d,Real w);
+
 #endif

diff --git a/paper.cc b/paper.cc
new file mode 100644 (file)
index 0000000..5afee7d
--- /dev/null
+++ b/paper.cc
@@ -0,0 +1,8 @@
+#include "paper.hh"
+#include "dimen.hh"
+
+Paperdef::Paperdef()
+{
+    width = convert_dimen(15,"cm");            // in cm for now
+    whole_width= convert_dimen(5,"cm");
+}

diff --git a/paper.hh b/paper.hh
new file mode 100644 (file)
index 0000000..b48391a
--- /dev/null
+++ b/paper.hh
@@ -0,0 +1,13 @@
+
+
+#include "real.hh"
+#include "string.hh"
+struct Paperdef {
+    Paperdef();
+    String outfile;
+    Real width;
+    /// how much space does a whole note take (ideally?)
+    Real whole_width;
+    // maybe add pointsize?
+    // symbol init?
+};