lilypond-0.0.6

diff --git a/line.hh b/line.hh
index ec45bd577cded00100880f8e1777ca04cbefed02..3e698659e9a2f24a8ec690d572771a101c8d1e20 100644 (file)
--- a/line.hh
+++ b/line.hh
@@ -6,7 +6,7 @@
 */
 
 #include "real.hh"
-#include "list.hh"
+#include "plist.hh"
 #include "vray.hh"
 #include "glob.hh"
 #include "pstaff.hh"

diff --git a/linespace.hh b/linespace.hh
index e5b23ca7f0504a829424cd54c1a47187695de3a3..b9d850c602ceef687b3429ecd5204044fef39d6f 100644 (file)
--- a/linespace.hh
+++ b/linespace.hh
@@ -2,7 +2,7 @@
 #define PROBLEM_HH
 
 #include "glob.hh"
-#include "list.hh"
+#include "plist.hh"
 #include "vray.hh"
 #include "pcol.hh"
 #include "matrix.hh"

diff --git a/pcol.hh b/pcol.hh
index 203482b10e1b1d12ead779cbc5fa2278f8abf1a8..f28617190a968471c737389fe3da7c0557e0ace7 100644 (file)
--- a/pcol.hh
+++ b/pcol.hh
@@ -3,7 +3,7 @@
 
 #include "glob.hh"
 #include "boxes.hh"
-#include "list.hh"
+#include "plist.hh"
 #include "item.hh"
 
 /// stuff grouped vertically.

diff --git a/pstaff.hh b/pstaff.hh
index 8d17b9dd194c00d72cd0002d148dbd9eaa5fcd2b..bf33c6b4374955b5f32cefec2b76ff0e80321b4d 100644 (file)
--- a/pstaff.hh
+++ b/pstaff.hh
@@ -1,22 +1,22 @@
 #ifndef PSTAFF_HH
 #define PSTAFF_HH
 
-#include "list.hh"
+#include "plist.hh"
 #include "item.hh"
 #include "symbol.hh"
 
 /// items grouped vertically.
-class PStaff {
-
-public:
+struct PStaff {
     Parametric_symbol *stafsym;
-    virtual Symbol get_stafsym(Real width)const=0; // mayybe overkill
+    PScore * pscore_;
+    
+    virtual Symbol get_stafsym(Real width)const=0; // maybe overkill
 
     List<const Spanner*> spans;
     List<Item*> its;
 
     void add(Item*i);
-    PStaff();
+    PStaff(PScore*);
     virtual ~PStaff() {}
 };