lilypond-0.0.4

diff --git a/item.hh b/item.hh
index 28b6b5604c6ddbdac05dd46d8fbf3ed4c8d1fdd4..6a3a9880d77418767c83f0e2ceef2ea3c6d52ea4 100644 (file)
--- a/item.hh
+++ b/item.hh
@@ -9,7 +9,7 @@
 /// a symbol which is attached between two columns.
 struct Spanner {
     const PCol *left, *right;
-    Stretchable_symbol *strets;
+    Parametric_symbol *strets;
     PStaff * pstaff_;
     ///      clone a piece of  this spanner.
     Spanner *broken_at(const PCol *c1, const PCol *c2) const; 
@@ -33,7 +33,7 @@ struct Item {
     virtual Interval width() const;    
     virtual Interval height() const;
     const PCol * col;
-    Output *output;
+    Molecule *output;
     
     PStaff *pstaff_;
     /** needed for knowing at which staff to output this item

diff --git a/proto.hh b/proto.hh
index 0721e19fd46959af4c61dc41779641b140306f29..394f3be14b4cf840d90b9dcf0dca5e0819c1a0c7 100644 (file)
--- a/proto.hh
+++ b/proto.hh
@@ -1,7 +1,6 @@
 #include "real.hh"
 
-class Vector;
-class Matrix;
+class Parametric_symbol;
 class Line_of_score;
 class Line_of_staff;
 class PCol;
@@ -46,6 +45,7 @@ struct Note_req;
 struct Lyric_req;
 struct Script_req;
 struct Rest_req;
+struct Rhythmic_req;
 struct Chord;
 struct Stem_req;
 struct Span_req;
@@ -73,4 +73,4 @@ struct Tex_stream;
 struct Identifier;
 struct Keyword;
 class Mixed_qp;
-typedef  Mixed_qp Optimisation_problem;
+class Paperdef;