From: fred Date: Sat, 2 Nov 1996 01:00:51 +0000 (+0000) Subject: lilypond-0.0.6 X-Git-Tag: release/1.5.59~6958 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e09a354297441de2640e09452e9f39cb3b49c428;p=lilypond.git lilypond-0.0.6 --- diff --git a/debug.hh b/debug.hh index 200585608b..fb3a070593 100644 --- a/debug.hh +++ b/debug.hh @@ -4,20 +4,25 @@ #include #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 b48391a4b9..9ce4d2bf4e 100644 --- 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; }; +