lilypond-0.0.42

diff --git a/NEWS b/NEWS
index d62e32a4d2d2f900728de1020059ec3c1741430e..c4e313d9b958ad92731ce8ae1266e5078b495e5e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,22 @@
+pl 41.hwn3
+       - struct Lexer_prefs
+       - parser bug
+       - make uninstall
+
+pl 41.hwn2
+       - make file rehack
+       - spec update
+       - make install
+       - detect TeX directory
+
+pl 41.hwn1
+       - cygnus configure,
+       - updated versioning 
+       - install.pod
+  
+pl 41.jn1
+Bugfix
+       - doze compile
 pl 41
        - release
 pl 40.3

diff --git a/bin/cpgento b/bin/cpgento
index 2bb4da29af4409aa94a3d5b707bd29bc8283326c..74f77787db2c3a6854075f1f95a327512bb34593 100755 (executable)
--- a/bin/cpgento
+++ b/bin/cpgento
@@ -19,9 +19,9 @@ genlily="out/parser.hh out/parser.cc out/lexer.cc"
 echo generating $genlily ...
 $MAKE -C lily $genlily
 
-genm2m="out/midi-parser.hh out/midi-parser.cc out/midi-lexer.cc"
-echo generating $genm2m ...
-$MAKE -C m2m $genm2m
+genmi2mu="out/midi-parser.hh out/midi-parser.cc out/midi-lexer.cc"
+echo generating $genmi2mu ...
+$MAKE -C mi2mu $genmi2mu
 
 lilydir=`pwd | sed "s/.*\///"`
 todir=$1/$lilydir
@@ -41,7 +41,7 @@ cpto() {
 }
 
 cpto lily "$genlily"
-cpto m2m "$genm2m"
+cpto mi2mu "$genmi2mu"
 
 # if you cannot gen the above, you-ll probably want:
 flexlexerh=/usr/include/FlexLexer.h

diff --git a/flower/test/stringtest.cc b/flower/test/stringtest.cc
index 5b4ace1b2f515c7df89f5733348f0c8f27966078..adf545b172acd8bdb7ee6cc3090309016c159c47 100644 (file)
--- a/flower/test/stringtest.cc
+++ b/flower/test/stringtest.cc
@@ -72,12 +72,12 @@ kutenpeer()
     }
     str = "blonde haren";
     cout << str<<endl;
-    cout << "mid(2,6)="<<str.mid_str(2,3)<<endl;
-    cout << "nomid(2,6)="<<str.nomid_str(2,3)<<endl;
+    cout << "mid(2,6)="<<str.mid_str(2,6)<<endl;
+    cout << "nomid(2,6)="<<str.nomid_str(2,6)<<endl;
 }
 
 bool
-test_empty_bo( String str )
+test_empty_b( String str )
 {
     cout << "`" << str << "' is ";
 
@@ -103,16 +103,17 @@ main()
     str += " daar";
     cout << str << endl;
 
-    str = String( "Hallo" ) + " daaR" + '!';
+//    str = String( "Hallo" ) + " daaR" + '!'; // no go on doze-s gcc2.7.2?
+    str = String( "Hallo" ) + " daaR" + "!";
     cout << str << endl;
 
     cout << "up: " << str.upper_str() << " down: " << str.lower_str()<<endl;
     
-    if ( test_empty_bo( str ) )
+    if ( test_empty_b( str ) )
        return 1;
     
     String fn = "";
-    if ( !test_empty_bo( fn ) )
+    if ( !test_empty_b( fn ) )
        return 1;
     
     fn = "";

diff --git a/lily/include/text-item.hh b/lily/include/text-item.hh
index d5ff7405e16d5a642ecf7ec52b98e5e0bdd32c7e..ba81fce47497de81ae4b8acd3cce6445f587c016 100644 (file)
--- a/lily/include/text-item.hh
+++ b/lily/include/text-item.hh
@@ -30,6 +30,7 @@ public:
     void do_pre_processing();
     Text_item(Text_def*,int);
     Text_item(Text_req*,int);
+    ~Text_item();
 };
 
 

diff --git a/make/Variables.make b/make/Variables.make
index fbfb76cfa4439fccbc86c1ed4c00e40c527ed108..3c74750c92573be8a0f448b0d4e0174305c4f475 100644 (file)
--- a/make/Variables.make
+++ b/make/Variables.make
@@ -2,7 +2,8 @@
 # project  LilyPond -- the musical typesetter
 # title           generic variables
 # file    make/Variables.make
-# abstract do not change this file; edit settings in User.make
+# abstract do not change this file for site-wide extensions;
+# please edit settings in User.make 
 #
 # Copyright (c) 1997 by    
 #      Jan Nieuwenhuizen <jan@digicash.com>
@@ -12,11 +13,17 @@
 #
 include ./$(depth)/.version
 #
+include ./$(depth)/make/out/Configure_variables.make
+
+ifeq (0,${MAKELEVEL})
+MAKE:=$(MAKE) --no-builtin-rules
+endif
+
 
 # directory names:
 #
 outdir = out# "objects" won-t do, used for libs and deps as well
-bindir = ./$(depth)/bin
+lily_bindir = ./$(depth)/bin
 distdir = ./$(depth)/$(DIST_NAME)
 module-distdir = ./$(depth)/$(MODULE_DIST_NAME)
 depdir = $(outdir)
@@ -39,24 +46,11 @@ include-flower = ./$(depth)/flower/lib/include
 #
 include ./$(depth)/make/User.make
 #
-
-ifdef PROFILEFLAG
-       DEFINES+=$(OPTIFLAG) $(PROFILEFLAG)
-       EXTRA_LIBES+=-pg
-endif
-
-ifndef DEBUGFLAG
-       DEFINES+=$(OPTIFLAG)
-else
-       DEFINES+=$(DEBUGFLAG)
-endif
-
-# build no:
 #
 # need to be defined in local Makefiles:
-# build = ./$(depth)/lily/.build
+# build = ./$(depth)/lily/$(outdir)/.build ######## UGR!
 BUILD = $(shell cat $(build))
-INCREASE_BUILD = @echo `expr \`cat $(build)\` + 1` > .b; mv .b $(build)
+INCREASE_BUILD = echo `expr \`cat $(build)\` + 1` > .b; mv .b $(build)
 #
 
 # the version:
@@ -65,10 +59,6 @@ VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(PATCH_LEVEL)$(MY_PATCH_LEVEL)
 TOPLEVEL_VERSION=$(TOPLEVEL_MAJOR_VERSION).$(TOPLEVEL_MINOR_VERSION).$(TOPLEVEL_PATCH_LEVEL)$(TOPLEVEL_MY_PATCH_LEVEL)
 #
 
-# compiler version:
-#
-CXXVER=`$(CXX) --version`
-#
 
 # module and top level dist:
 #
@@ -100,27 +90,17 @@ DUMMYDEPS=\
 # clean file lists:
 #
 ERROR_LOG = 2> /dev/null
-allexe = $(bindir)/lilypond $(bindir)/mi2mu
-allcc = $(shell find -name "*.cc" $(ERROR_LOG))
-allobs = $(shell find $(outdir) -name "*.o" $(ERROR_LOG))
-allibs = $(shell find $(libdir) -name "*.lib" $(ERROR_LOG))
-alldeps = $(shell find $(outdir) -name "*.dep" $(ERROR_LOG))
-allout = $(shell find . -name "$(outdir)" $(ERROR_LOG))
-allgen = $(shell find . -name $(genout) -o -name .build $(ERROR_LOG))
-#
-
-# config stuff:
-#
-# cannot let targets depend upon (out)directory -> will always be out of date!
-genout = .GENERATE
-flower-config = $(flowerout)/flower-config.hh
-lily-config = $(libout)/config.hh
-#
+SILENT_LOG = >& /dev/null
+allexe = $(lily_bindir)/lilypond $(lily_bindir)/mi2mu
+allcc := $(shell $(FIND) -name "*.cc" $(ERROR_LOG))
+allobs := $(shell $(FIND) $(outdir) -name "*.o" $(ERROR_LOG))
+allibs := $(shell $(FIND) $(libdir) -name "*.lib" $(ERROR_LOG))
+alldeps := $(shell $(FIND) $(outdir) -name "*.dep" $(ERROR_LOG))
 
 # version stuff:
 #
-flower-version = $(flowerout)/fversion.hh
 lily-version = $(lilyout)/version.hh
+flower-version = $(flowerout)/version.hh
 mi2mu-version = $(mi2muout)/version.hh
 #
 
@@ -146,7 +126,7 @@ LOADLIBES = $(EXTRA_LIBES) $(CUSTOMLIBES) -lg++
 AR = ar
 AR_COMMAND = $(AR) $(ARFLAGS) $@
 #
-
+RANLIB_COMMAND=$(RANLIB) $@
 # compiler:
 #
 # "CC = $(CC)"
@@ -167,8 +147,8 @@ DODEP=rm -f $(depfile); DEPENDENCIES_OUTPUT="$(depfile) $(outdir)/$(notdir $@)"
 
 # utils:
 #
-FLEX = flex
-BISON = bison
+#FLEX = flex
+#BISON = bison
 #
 
 # generic target names:

diff --git a/mi2mu/.version b/mi2mu/.version
index a1f2c4cba620aecd198b67a6578d94a13a57a968..94361e906ec64ab26c34a076b0a53ffee70ba9a4 100644 (file)
--- a/mi2mu/.version
+++ b/mi2mu/.version
@@ -2,5 +2,5 @@ MAJOR_VERSION = 0
 MINOR_VERSION = 0
 PATCH_LEVEL = 12
 # use to send patches, always empty for released version:
-MY_PATCH_LEVEL = # include separator: "-1" or ".a"
+MY_PATCH_LEVEL = .1# include separator: "-1" or ".a"
 #

diff --git a/mi2mu/lily-stream.cc b/mi2mu/lily-stream.cc
index da6890aa9756bdbd6ab7aeaa37653ff880dddc23..2ac5bc778d7989a521de10c9364ba44b79380aa0 100644 (file)
--- a/mi2mu/lily-stream.cc
+++ b/mi2mu/lily-stream.cc
@@ -50,7 +50,7 @@ Lily_stream::operator <<( String str )
                                if ( column_i_ > 8 * indent_i_ ) {
                                        newline();
                                        if ( comment_mode_bo_ && ( str[ 0 ] != '%' ) )
-                                               str = '%' + str;
+                                               str = "%" + str;
                                        continue;
                                }
                                else { // cannot break neatly...
@@ -100,7 +100,7 @@ Lily_stream::check_comment( String str )
 void
 Lily_stream::header()
 {
-       *os_p_ << "% Creator: " << version_str() << "\n";
+       *os_p_ << "% Creator: " << mi2mu_version_str() << "\n";
        *os_p_ << "% Automatically generated, at ";
        time_t t( time( 0 ) );
        *os_p_ << ctime( &t );