lilypond-0.0.30

diff --git a/Variables.make b/Variables.make
index c53033674cc3810022852d14ac1f4aa303540627..38280146fd2dc66dea5b4c60b50de2a4453f537e 100644 (file)
--- a/Variables.make
+++ b/Variables.make
@@ -1,8 +1,12 @@
+# -*-make-*-
+
 # version info
 MAJVER=0
 MINVER=0
-PATCHLEVEL=29
+PATCHLEVEL=30
+
 include Site.make
+
 ####
 #### USER CONFIGURABLE
 ####
@@ -23,7 +27,8 @@ EXTRACXXFLAGS=-pipe -Wall -W   -Wmissing-prototypes
 # ElectricFence is a memory debugger which uses the 
 # VM hardware to trap malloc/free errors.
 #
-#EXTRALIB+=-lefence
+
+EXTRALIB= #+=-lefence
 
 ####
 #### END USER CONFIGURABLE part.
@@ -47,18 +52,13 @@ CXXVER=`$(CXX) --version`
 
 # directories
 TOPDIR  := $(shell if [ "$$PWD" != "" ]; then echo $$PWD; else pwd; fi)
+
 OBJECTDIR=objects
 HEADERDIR=hdr
 CCDIR=src
 INITDIR=init
 DEPDIR=deps
 INPUTDIR=input
-#vpath %.cc $(CCDIR)
-#vpath %.hh $(HEADERDIR)
-#vpath %.y $(CCDIR)
-#vpath %.l $(CCDIR)
-#vpath %.o $(OBJECTDIR)
-#vpath %.dep $(DEPDIR)
 
 # 
 #
@@ -71,11 +71,12 @@ obs=$(addprefix $(OBJECTDIR)/,$(cc:.cc=.o))
 ALLDEPS=$(addprefix $(DEPDIR)/,$(cc:.cc=.dep))
 STABLEOBS=$(addprefix $(OBJECTDIR)/,$(stablecc:.cc=.o)) 
 HEADERS=$(addprefix $(HEADERDIR)/,$(hdr)) 
-progdocs=$(HEADERS) $(addprefix $(CCDIR)/, $(mycc))
+progdocs=$(HEADERS) #$(CCSOURCE)
+
 #dist
 .EXPORT_ALL_VARIABLES:
 
-DOCDIR=docdir
+DOCDIR=docxx
 
 PACKAGENAME=lilypond
 DNAME=$(PACKAGENAME)-$(VERSION)

diff --git a/src/sccol.cc b/src/sccol.cc
index 14c52796de10c48ae0a58c453c99c41d4be7e6e1..2d826094da5f51b725cb62553594b150e0e47a26 100644 (file)
--- a/src/sccol.cc
+++ b/src/sccol.cc
@@ -54,6 +54,7 @@ Score_column::preprocess()
 void
 Score_column::add_duration(Moment d)
 {
+    assert(d);
     for (int i = 0; i< durations.size(); i++) {
        if (d == durations[i])
            return ;