release: 0.0.7

[lilypond.git] / item.hh

diff --git a/item.hh b/item.hh
index 15a8e88724a54800b78ccd9c66b136048da7a70e..cf3d11c31347dac6f4fbe9f4cb22ec9061e3454c 100644 (file)
--- a/item.hh
+++ b/item.hh
@@ -6,42 +6,27 @@
 #include "string.hh"
 #include "tex.hh"
 
-/// a symbol which is attached between two columns.
-struct Spanner {
-    const PCol *left, *right;
-    Stretchable_symbol *strets;
-    PStaff * pstaff_;
-    ///      clone a piece of  this spanner.
-    Spanner *broken_at(const PCol *c1, const PCol *c2) const; 
-    /**
- 
-    PRE
-    c1 >= start, c2  <= stop
-    */
-    String TeXstring () const ;
-    Spanner();
-};
-/** Spanner should know about the items which it should consider:
-    e.g. slurs should be steep enough to "enclose" all those items. This
-    is absolutely necessary for beams, since they have to adjust the
-    length of stems of notes they encompass.
-
-    */
     
-/// a fixed size element of the score
+/// a horizontally fixed size element of the score
 struct Item {
-    virtual Interval width() const;    
-
     const PCol * col;
-    Output *output;
+    Molecule *output;
     
     PStaff *pstaff_;
     /** needed for knowing at which staff to output this item
     */
+
+    /****************/
+
+    virtual Interval width() const;    
+    virtual Interval height() const;
     String TeXstring () const ;
     Item();
+    void print()const;
+    virtual ~Item();
 };
 /** An item must be part of a Column
 */
 
+
 #endif