lilypond-0.0.29

diff --git a/Makefile b/Makefile
index e55ebd0dc997b205de3e656c6a7192a78f15459c..10ad8c1642fd81fb2f7248f877002dc001955e5e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ include Variables.make
 
 
 $(exe): $(obs)
-       strip --strip-debug $(STABLEOBS)
+       $(STRIPDEBUG) $(STABLEOBS)
        $(CXX) -o $@ $^ $(LOADLIBES)
 
 
@@ -23,6 +23,9 @@ distclean: clean
 
 all: kompijl doc
 
+win32: # value of $(OSTYPE) on windhoos; "make $OSTYPE" if u use bash :-)
+       $(MAKE) -C . CXX=g++ 
+
 doc:
        $(MAKE) -C Documentation doc
 

diff --git a/NEWS b/NEWS
index 4592ee36f952ea45e8ba3e561363ca780418c988..932246fcb996871212198d939e562306601c19e8 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+pl 29
+       - multiplatform Makefile
+       - context errors: bugfixes
+
 pl 28
 
 Internal

diff --git a/Variables.make b/Variables.make
index f0a26c0c3d659bcb3517c7bdad91543b21ca5222..c53033674cc3810022852d14ac1f4aa303540627 100644 (file)
--- a/Variables.make
+++ b/Variables.make
@@ -1,3 +1,8 @@
+# version info
+MAJVER=0
+MINVER=0
+PATCHLEVEL=29
+include Site.make
 ####
 #### USER CONFIGURABLE
 ####
@@ -37,10 +42,6 @@ endif
 
 
 
-# version info
-MAJVER=0
-MINVER=0
-PATCHLEVEL=28
 VERSION=$(MAJVER).$(MINVER).$(PATCHLEVEL)
 CXXVER=`$(CXX) --version`
 
@@ -105,3 +106,4 @@ SUBDIRS=Documentation $(OBJECTDIR) $(CCDIR) $(HEADERDIR) $(INITDIR) $(DEPDIR) \
 depfile=deps/$(subst .o,.dep,$(notdir $@)) 
 DODEP=rm -f $(depfile); DEPENDENCIES_OUTPUT="$(depfile) $(OBJECTDIR)/$(notdir $@)"
 
+STRIPDEBUG=strip --strip-debug
\ No newline at end of file

diff --git a/configure b/configure
index e07c529a01f55c9a3d7409946ac64d3c740a09a0..6ecf9b11043ace96008bf891c461cf8f310002a2 100755 (executable)
--- a/configure
+++ b/configure
@@ -3,7 +3,7 @@
 PREFIX=${PREFIX:-.}
 echo using PREFIX=$PREFIX
 
-NEEDFLOWERVER=1.0.24
+NEEDFLOWERVER=1.0.25
 flowertar=flower-$NEEDFLOWERVER
 here=`pwd`
 cd ..
@@ -27,5 +27,5 @@ echo Compiling Library
 cd $here
 
 echo '#define LIBDIR "'$PREFIX'/"'> hdr/config.hh
-
+touch Site.make
 make -f Initial.make

diff --git a/hdr/request.hh b/hdr/request.hh
index 203fc9ab059adaf472edef0dcacb64b076daa462..44d42e5301ac57ffe40ea1c0533444d0c9f6ae12 100644 (file)
--- a/hdr/request.hh
+++ b/hdr/request.hh
@@ -96,6 +96,7 @@ struct Spacing_req :virtual Request {
     Real distance;
     Real strength;
     /****************/
+    Spacing_req();
     REQUESTMETHODS(Spacing_req, spacing);
 };
 

diff --git a/input/wohltemperirt.ly b/input/wohltemperirt.ly
index 3163a7bf3c3caa3fabf68116a72064b7d05fabb0..ae48f898cccc1abba847b31faddab1c31138b7cb 100644 (file)
--- a/input/wohltemperirt.ly
+++ b/input/wohltemperirt.ly
@@ -48,6 +48,8 @@ basstaf = staff { melodic
 
 score {
        staff { melodic
+
+               % every "music {} " in a staff has its own "voicegroup"
                music { dux }
                music { comes }
                

diff --git a/src/lookup.cc b/src/lookup.cc
index 77cf12554cf984c6e429beeb2123d5b363c3e20c..be3466e092458ed7e92ba204d29c410e1b7fd188 100644 (file)
--- a/src/lookup.cc
+++ b/src/lookup.cc
@@ -174,7 +174,11 @@ Lookup::meter(Array<Scalar> a)
 Symbol
 Lookup::stem(Real y1,Real y2)
 {
-    assert(y1 <= y2);
+    if (y1 > y2) {
+       Real t = y1;
+       y1 = y2;
+       y2 = t;
+    }
     Symbol s;
     
     s.dim.x = Interval(0,0);