From 666c278a30a3813bc7d5cb11416435882aa48e89 Mon Sep 17 00:00:00 2001 From: fred Date: Tue, 26 Mar 2002 23:21:31 +0000 Subject: [PATCH] lilypond-1.3.48 --- input/bugs/cm.ly | 26 ++++++++++++++++++++++++++ lily/misc.cc | 1 + lily/parser.yy | 2 +- 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 input/bugs/cm.ly diff --git a/input/bugs/cm.ly b/input/bugs/cm.ly new file mode 100644 index 0000000000..02e832028f --- /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 8523cddd86..8597a8ce14 100644 --- 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 e5a7583522..3c0320699b 100644 --- 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); } -- 2.39.5