lilypond-0.0.26

diff --git a/hdr/accidental.hh b/hdr/accidental.hh
index a1c5d80d30bb19267acbee01e7afdb410c12b550..d388a3f09797fba3189d6b940b31d34bbde40d1e 100644 (file)
--- a/hdr/accidental.hh
+++ b/hdr/accidental.hh
@@ -9,11 +9,12 @@
 #include "item.hh"
 
 struct Accidental : Item {
+const char * name() const;
     int type,pos; 
 
     void preprocess();
     Accidental(int type, int position);
-    void print()const;
+    void do_print()constt;
 private:
     void brew_molecule();
 };

diff --git a/src/item.cc b/src/item.cc
index 11096c95c006e305042076c207ed8999517b95b7..3ea6c0445ec85d5017bbb6d1f697dfb28a041ee1 100644 (file)
--- a/src/item.cc
+++ b/src/item.cc
@@ -1,18 +1,18 @@
 #include "debug.hh"
 #include "item.hh"
 
+NAME_METHOD(Item);
+
 Item::Item()
 {
     pcol_l_ = 0;
 }
 
 void
-Item::print() const
+Item::do_print() const
 {
 #ifndef NPRINT
-    mtor << "item " ;
-    Staff_elem::print();
+    mtor << "(unknown)";
 #endif
-
 }
 

diff --git a/src/staffelem.cc b/src/staffelem.cc
index 4be3cee0bf16f40e6a788db459f1febefdd7c64b..0ef190020378e26a362c0083c7ca4482c13676fc 100644 (file)
--- a/src/staffelem.cc
+++ b/src/staffelem.cc
@@ -3,6 +3,7 @@
 #include "pstaff.hh"
 #include "molecule.hh"
 #include "staffelem.hh"
+#include "debug.hh"
 
 String
 Staff_elem::TeXstring() const
@@ -73,11 +74,17 @@ void
 Staff_elem::print()const
 {
 #ifndef NPRINT
+    mtor << name() << "{\n";
+    do_print();
     if (output)
        output->print();
+    
+    mtor <<  "}\n";
 #endif
 }
 
+NAME_METHOD(Staff_elem);
+
 Staff_elem::Staff_elem()
 {
     calc_children = false;