lilypond-0.0.15

diff --git a/src/item.cc b/src/item.cc
index 914c924a99fca9cbe38cbcb3d9cc60896320ef55..4a8ea949d6c9a3c392e267f25639221f9b220886 100644 (file)
--- a/src/item.cc
+++ b/src/item.cc
@@ -60,8 +60,10 @@ Item::Item()
 void
 Item::print() const
 {
-    assert(output);
-    output->print();
+#ifndef NPRINT
+    if (output)
+       output->print();
+#endif
 }
 
 Paperdef*

diff --git a/src/notehead.cc b/src/notehead.cc
index 7abc0e6b8ec238f2a22700ea3e19487d0a52398b..fcbd6745ebaf48b96f7f644c6eda8bfa970195d4 100644 (file)
--- a/src/notehead.cc
+++ b/src/notehead.cc
@@ -17,8 +17,10 @@ Notehead::Notehead(int ss)
 void
 Notehead::print()const
 {
+#ifndef NPRINT
     mtor << "Head "<<balltype<<", position = "<< position << "dots " << dots;
     Item::print();
+#endif
 }
 
 void

diff --git a/src/spanner.cc b/src/spanner.cc
index d38a604302f87e3f4b04a781a7aebcac750194b6..2d34f9e477aa409c86fd6a4bfb3b70b7cd10443d 100644 (file)
--- a/src/spanner.cc
+++ b/src/spanner.cc
@@ -50,8 +50,11 @@ void
 Spanner::print()const
 {
 #ifndef NPRINT
-    mtor << "Spanner { Output ";
-    output->print();
+    mtor << "Spanner { ";
+    if (output) {
+       mtor << "Output ";
+       output->print();
+    }
     
     mtor << "}\n";
 #endif