lilypond-1.3.66

diff --git a/input/test/font-body.ly b/input/test/font-body.ly
index 9349d53ab4b24b6f0e57880baf6dbbdd5bc84bd5..6b5258632498613bf421fd3596b8724f013bfd54 100644 (file)
--- a/input/test/font-body.ly
+++ b/input/test/font-body.ly
@@ -43,7 +43,7 @@ c\longa*1/4 c\breve*1/2 c1 c2 c4 c8
                        \property Voice . noteHeadStyle = #'cross
                                                 f4^"4"
                                                  g4^"5"
-                       \property Voice . noteHeadStyle = ""
+                       \property Voice . noteHeadStyle = ##f
                        % Music to the Martians!
                        < bes4^"6" e_"7" c_"8" >
                        a^"0"_"9"

diff --git a/lily/spanner.cc b/lily/spanner.cc
index 806365bc8edf7cd77102ac618e9948f9018e13fa..db4b05d1180f5a37171bd0f3a72a32b22ccc974a 100644 (file)
--- a/lily/spanner.cc
+++ b/lily/spanner.cc
@@ -52,9 +52,6 @@ Spanner::do_break_processing ()
 
   if  (left == right)
     {
-      /*
-       FIXME: this is broken.
-       */
       /*
        If we have a spanner spanning one column, we must break it
        anyway because it might provide a parent for another item.  */
@@ -62,7 +59,9 @@ Spanner::do_break_processing ()
       do
        {
          Item* bound = left->find_prebroken_piece (d);
-         if (bound->line_l ())
+         if (!bound)
+           programming_error ("no broken bound");
+         else if (bound->line_l ())
            {
              Spanner * span_p = dynamic_cast<Spanner*>( clone ());
              span_p->set_bound (LEFT, bound);