From: fred Date: Sun, 17 Nov 1996 23:32:15 +0000 (+0000) Subject: lilypond-0.0.10 X-Git-Tag: release/1.5.59~6804 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8e5948e0695ebd80555deeeea1d01c03418fb261;p=lilypond.git lilypond-0.0.10 --- diff --git a/hdr/key.hh b/hdr/key.hh new file mode 100644 index 0000000000..c65beea636 --- /dev/null +++ b/hdr/key.hh @@ -0,0 +1,39 @@ +/* + key.hh -- part of LilyPond + + (c) 1996 Han-Wen Nienhuys +*/ + +#ifndef KEY_HH +#define KEY_HH + +#include "vray.hh" +#include "string.hh" + +class Key { + svec accidentals; + + /****************/ + +public: + svec read(svec ); + svec oldkey_undo(svec); + + Key(); + void set(int i, int acc); + int acc(int i) { return accidentals[i]; } +}; + +struct Local_key +{ + void reset(Key); + Key& oct(int); + Local_key(); + +private: + svec octaves; +}; + +#endif // KEY_HH + + diff --git a/src/pcol.cc b/src/pcol.cc index 902f57bab2..6e3092a0e3 100644 --- a/src/pcol.cc +++ b/src/pcol.cc @@ -92,7 +92,8 @@ PCol::breakable() const return prebreak||postbreak; } -PCol::PCol(PCol *parent) { +PCol::PCol(PCol *parent) +{ daddy = parent; prebreak=0; postbreak=0; @@ -102,10 +103,8 @@ PCol::PCol(PCol *parent) { PCol::~PCol() { - - delete prebreak; - - delete postbreak; + delete prebreak; + delete postbreak; } void @@ -115,4 +114,3 @@ PCol::add( Item *i) i->pcol_ = this; used = true; } -