lilypond-0.0.6

diff --git a/debug.hh b/debug.hh
index 200585608b7868697c75b25cb31fb2d5a8f5cd66..fb3a07059392048105261d69eae1ae65da4d1410 100644 (file)
--- a/debug.hh
+++ b/debug.hh
@@ -4,20 +4,25 @@
 #include <iostream.h>
 #include "dstream.hh"
 
+void error(String s);          // errors
 
-
+// warnings
+void warning(String s);
 #define WARN warnout << "warning: "<<__FUNCTION__ << "(): "
 extern ostream &warnout ;
-extern ostream *mlog;  
-extern ostream *nulldev;  
+
+// progress
+extern ostream *mlog;
+
+// debugging
 extern Dstream monitor; // monitor
 
 #ifdef NPRINT
-#define mtor *nulldev
+#define mtor if (0) monitor    // clever hack 
 #else
 #define mtor monitor.identify_as(__PRETTY_FUNCTION__)
 #endif
-void error(String s);
-void warning(String s);
+
+
 
 #endif

diff --git a/paper.hh b/paper.hh
index b48391a4b994a5a56a1ea07a0027aa97f5e81d4a..9ce4d2bf4e475425a7757cc573e9955669ccaa64 100644 (file)
--- a/paper.hh
+++ b/paper.hh
@@ -1,13 +1,20 @@
-
-
+#include "proto.hh"
 #include "real.hh"
 #include "string.hh"
+
 struct Paperdef {
-    Paperdef();
+    Lookup *lookup_;
     String outfile;
-    Real width;
+    Real linewidth;
     /// how much space does a whole note take (ideally?)
     Real whole_width;
-    // maybe add pointsize?
-    // symbol init?
+    
+    /****************/
+    void parse();
+    Paperdef();
+    ~Paperdef();
+    Real interline()const;
+    Real standard_height()const;
+    void print() const;
 };
+