lilypond-0.0.11

diff --git a/src/voice.cc b/src/voice.cc
index c713822a4b26c5eb21dae28a58f7d3186ee014c7..fbdb207aab283334bfd75b2ffdaff12e59e2590b 100644 (file)
--- a/src/voice.cc
+++ b/src/voice.cc
@@ -15,14 +15,14 @@ Voice::Voice()
 void
 Voice::add(Voice_element*v)
 {
+    v->voice_ = this;
     elts.bottom().add(v);
 }
 
 void
 Voice::print() const
 {
-        #ifndef NPRINT
-
+#ifndef NPRINT
     mtor << "start: "<< start<<eol;
     for (PCursor<Voice_element*> vec(elts); vec.ok(); vec++)
        vec->print();
@@ -63,7 +63,7 @@ Voice_element::add(Request*r)
 
 Voice_element::Voice_element()
 {
-    voice = 0;
+    voice_ = 0;
     group = 0;
     duration = 0.0;
 }
@@ -71,7 +71,7 @@ Voice_element::Voice_element()
 Voice_element::Voice_element(Voice_element const&src)
 {
     duration=src.duration;
-    voice=src.voice;
+    voice_=src.voice_;
     IPointerList__copy(Request*, reqs, src.reqs, clone());
     group=src.group;
     assert(!granted_items.size() && !granted_spanners.size());

diff --git a/src/warn.cc b/src/warn.cc
index 426173ee0c2d63a95b3440f54ae21ca68c484804..6d35d8cad6377d06a9ecf2b3c4ed61dc5e30c6a2 100644 (file)
--- a/src/warn.cc
+++ b/src/warn.cc
@@ -4,15 +4,17 @@
 
 
 
-void warning(String s)
+void
+warning(String s)
 {
     WARN << s;
 }
 
 
-void error(String s)
+void
+error(String s)
 {
-    cerr << "\n" << s << "\nexiting..\n";
+    cerr << "\nerror: " << s << "\n";
     exit(1);
 }