? lily/out
? lily/out-www
? lily/include/out
? lily/include/out-www
Index: lily/music.cc
===================================================================
RCS file: /sources/lilypond/lilypond/lily/music.cc,v
retrieving revision 1.155
diff -u -r1.155 music.cc
--- lily/music.cc	2 Aug 2006 21:41:15 -0000	1.155
+++ lily/music.cc	8 Aug 2006 08:33:52 -0000
@@ -270,7 +270,8 @@
   SCM class_name = ly_symbol2scm (out);
 
   // catch mistakes.
-  assert (internal_is_music_type (class_name));
+  if (!internal_is_music_type (class_name))
+    warning (_f ("this should be music: %s", out));
 
   Stream_event *e = new Stream_event (class_name, mutable_property_alist_);
   Moment length = get_length ();
Index: lily/spacing-loose-columns.cc
===================================================================
RCS file: /sources/lilypond/lilypond/lily/spacing-loose-columns.cc,v
retrieving revision 1.18
diff -u -r1.18 spacing-loose-columns.cc
--- lily/spacing-loose-columns.cc	4 Aug 2006 15:07:10 -0000	1.18
+++ lily/spacing-loose-columns.cc	8 Aug 2006 08:33:52 -0000
@@ -13,6 +13,7 @@
 #include "staff-spacing.hh"
 #include "note-spacing.hh"
 #include "spacing-spanner.hh"
+#include "warn.hh"
 
 #include "moment.hh"
 
@@ -86,7 +87,13 @@
 	    {
 	      spacing = grace_spacing;
 	    }
-	  
+
+	  if (!spacing)
+	    {
+	      programming_error ("clique-col has no spacing");
+	      continue;
+	    }
+
 	  Spacing_options options;
 	  options.init_from_grob (spacing);