lilypond-0.0.5

diff --git a/command.hh b/command.hh
index 6b835e964bd8e307c5583aa6c9a85bd7ff9ec1a4..3e90067075cd4c45701dc028e5efbfe863307e2f 100644 (file)
--- a/command.hh
+++ b/command.hh
@@ -1,7 +1,7 @@
 #ifndef COMMAND_HH
 #define COMMAND_HH
 #include "glob.hh"
-#include "mtime.hh"
+
 #include "vray.hh"
 #include "string.hh"
 
@@ -15,9 +15,13 @@ enum Commandcode {
 struct Command {
     Commandcode code;
 
-    Mtime when;
+    Real when;
     /// analogous to argv[]
     svec<String> args;
+    int priority;
+    
+    /****************/
+    
     Command();
     Command(Real w);
     bool isbreak()const;

diff --git a/misc.cc b/misc.cc
index 2be0f81dd67c9530007177553bd5723542aaf5dd..3a8658f4a02057a113ce44166b6e6abb0d48f056 100644 (file)
--- a/misc.cc
+++ b/misc.cc
@@ -1,6 +1,6 @@
 #include "misc.hh"
 #include "glob.hh"
-#include "mtime.hh"
+
 #include <math.h>
 
 int intlog2(int d) {
@@ -26,7 +26,7 @@ const double WHOLE_SPACE = 5.0; // should be settable from input
 
   
 Real
-duration_to_idealspace(Mtime d, Real w)
+duration_to_idealspace(Real d, Real w)
 {
     // see  Roelofs, p. 57
     return w * pow(ENGRAVERS_SPACE, log2(d));

diff --git a/proto.hh b/proto.hh
index 394f3be14b4cf840d90b9dcf0dca5e0819c1a0c7..ba93e7a52671d4e8e7248b1b0faeb414be9e5e3a 100644 (file)
--- a/proto.hh
+++ b/proto.hh
@@ -1,6 +1,13 @@
+/*
+  proto.hh -- part of LilyPond
+
+  (c) 1996 Han-Wen Nienhuys
+*/
+
+#ifndef PROTO_HH
+#define PROTO_HH
 #include "real.hh"
 
-class Parametric_symbol;
 class Line_of_score;
 class Line_of_staff;
 class PCol;
@@ -74,3 +81,10 @@ struct Identifier;
 struct Keyword;
 class Mixed_qp;
 class Paperdef;
+class Score_commands;
+class Parametric_symbol;
+
+
+
+#endif // PROTO_HH
+

diff --git a/request.hh b/request.hh
index 79846e7e6947fdd1414e6e8d6d62d48a546deb92..f2dc5f7144f2c6eb3473f965ba9f78815a4df2e2 100644 (file)
--- a/request.hh
+++ b/request.hh
@@ -4,7 +4,7 @@
 
 #include "glob.hh"
 #include "string.hh"
-#include "mtime.hh"
+
 struct Request {
     Voice_element*elt;
 #if 0
@@ -172,7 +172,7 @@ struct Slur_req : Span_req {
 
 /// helper in the hierarchy
 struct Dynamic {
-    Mtime subtime;
+    Real subtime;
 };
 /** Each dynamic is bound to one note ( a crescendo spanning multiple
     notes is thought to be made of two "dynamics": a start and a stop).

diff --git a/voice.cc b/voice.cc
index 907f229481dfab5e88c0add8af1858c8a3fa30eb..ae9342b487e1bbe48b5db86345dc19b536ea9a51 100644 (file)
--- a/voice.cc
+++ b/voice.cc
@@ -51,10 +51,10 @@ Voice_element::print() const
 #endif
 }
 
-Mtime
+Real
 Voice::last() const
 {
-    Mtime l =start;
+    Real l =start;
     for (PCursor<Voice_element*> vec(elts); vec.ok(); vec++)
        l  += vec->duration;
     return l;

diff --git a/voice.hh b/voice.hh
index 35537525ece1630ddc731472840a4bd8a5d7a941..b580972b233366fd7a479dd3e4688892c0de8853 100644 (file)
--- a/voice.hh
+++ b/voice.hh
@@ -1,18 +1,18 @@
 #ifndef VOICE_HH
 #define VOICE_HH
 
-#include "mtime.hh"
+
 #include "list.hh"
 #include "request.hh"
 
 /// class for  horizontal stuff.
 struct Voice {
     PointerList<Voice_element *> elts;
-    Mtime start;
+    Real start;
 
     /****************/
-    Mtime when(const Voice_element*)const;
-    Mtime last() const;
+    Real when(const Voice_element*)const;
+    Real last() const;
     Voice();
     void add(Voice_element*);
     void print() const;
@@ -30,7 +30,7 @@ struct Voicegroup {
 
 /// 
 struct Voice_element {
-    Mtime duration;
+    Real duration;
     const Voicegroup *group;
     const Voice *voice;
     PointerList<Request*> reqs;