lilypond-0.0.10

diff --git a/hdr/key.hh b/hdr/key.hh
new file mode 100644 (file)
index 0000000..c65beea
--- /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<int> accidentals;
+
+    /****************/
+
+public:
+    svec<int> read(svec<String> );
+    svec<int> oldkey_undo(svec<String>);
+
+    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<Key> octaves;
+};
+
+#endif // KEY_HH
+
+

diff --git a/src/pcol.cc b/src/pcol.cc
index 902f57bab22bdec8e40025cf5efdbaf77cf0b154..6e3092a0e334f145e20726dd97e4e4bf215b05d0 100644 (file)
--- 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;
 }
-