lilypond-0.0.21

diff --git a/hdr/clefitem.hh b/hdr/clefitem.hh
index f54d49306a1b5fc1cad04ad0858136e39a62e6c3..525aa0aeb042c24a253fcc72868fb2be275b5038 100644 (file)
--- a/hdr/clefitem.hh
+++ b/hdr/clefitem.hh
@@ -16,10 +16,12 @@ struct Clef_item : Item {
     bool change;
 
 
+    /****************/
+
     Clef_item();
     void read(Clef);
     void read(String);
-    void preprocess();
+    Molecule* brew_molecule()const;
 };
 
 #endif // CLEFITEM_HH

diff --git a/src/item.cc b/src/item.cc
index ba71539d301f35b5861fe00c9afa63ccddc959a2..64dcc1e1f448e0e57fe2807efc43dc4e52325937 100644 (file)
--- a/src/item.cc
+++ b/src/item.cc
@@ -1,77 +1,18 @@
-#include "pstaff.hh"
-#include "pscore.hh"
-#include "symbol.hh"
-#include "molecule.hh"
-#include "pcol.hh"
-
-void
-Item::translate(Offset O)
-{
-    offset_ += O;
-}
-
-void
-Item::postprocess()
-{
-    // default: do nothing
-}
-
-
-void
-Item::preprocess()
-{
-    // default: do nothing
-}
-
-String
-Item::TeXstring() const
-{
-    Item * me = (Item*) this;
-    output->translate(offset_);        // ugh?
-    me ->offset_ = Offset(0,0);        // URRGGH!
-    return output->TeXstring();
-}
-
-Interval
-Item::width() const
-{
-    Interval i =output->extent().x ;
-    if (!i.empty())            // float exception on DEC Alpha
-        i+=offset_.x;
-    return i;
-}
-
-Interval
-Item::height() const
-{
-    Interval i =output->extent().y;
-    return i+=offset_.y;
-}
-
-Item::~Item()
-{
-    delete output;
-}
+#include "debug.hh"
+#include "item.hh"
 
 Item::Item()
 {
     pcol_ = 0;
-    output = 0;
-    pstaff_ = 0;
 }
+
 void
 Item::print() const
 {
 #ifndef NPRINT
-    if (output)
-       output->print();
+    mtor << "item " ;
+    Staff_elem::print();
 #endif
-}
 
-Paperdef*
-Item::paper()  const
-{
-    assert(pstaff_);
-    return pstaff_->pscore_->paper_;
 }