From: fred Date: Sun, 24 Mar 2002 19:28:40 +0000 (+0000) Subject: lilypond-0.0.26 X-Git-Tag: release/1.5.59~5566 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=33f86e0f15ff7c2ac0996e8c40e36309c4ae0205;p=lilypond.git lilypond-0.0.26 --- diff --git a/hdr/accidental.hh b/hdr/accidental.hh index a1c5d80d30..d388a3f097 100644 --- 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 11096c95c0..3ea6c0445e 100644 --- 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 4be3cee0bf..0ef1900203 100644 --- 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;