lilypond-1.3.48

diff --git a/input/bugs/cm.ly b/input/bugs/cm.ly
new file mode 100644 (file)
index 0000000..02e8320
--- /dev/null
+++ b/input/bugs/cm.ly
@@ -0,0 +1,26 @@
+flauti = \notes \relative c' {
+  c1 
+  \break c
+}
+
+
+timpani = \notes \relative c' {
+  c1 c
+}
+
+
+
+\score {
+  < 
+    \context StaffGroup ="legni" < 
+      \context Staff ="flauti" \flauti
+    >
+    \context StaffGroup ="timpani" <
+    \notes { 
+       c1
+    }
+    >
+  >
+
+}
+

diff --git a/lily/misc.cc b/lily/misc.cc
index 8523cddd86e76a5e30271619b74e7b83513fc2c4..8597a8ce14636f2d0f4b3a70c8430975e384ba99 100644 (file)
--- a/lily/misc.cc
+++ b/lily/misc.cc
@@ -13,6 +13,7 @@
 int
 intlog2(int d)
 {
+  assert (d);
   int i=0;
   while (!(d&1)) 
     {

diff --git a/lily/parser.yy b/lily/parser.yy
index e5a7583522e26fb30d825678e32530e25f757cd2..3c0320699b22582313824df0bbc84026f61fe1d8 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -45,7 +45,7 @@
 bool
 is_duration_b (int t)
 {
-  return t == 1 << intlog2(t);
+  return t && t == 1 << intlog2(t);
 }