Merge branch 'cvs-head' of http://lilypond.org/vc/lilypond into master-hanwen

Conflicts:

	.gitignore
	scm/lily.scm

diff --git a/ChangeLog b/ChangeLog
index 709756e77674c561cac4ecb40652df187325ec97..e598f311faffc29dc71f2aea31a944917338a17c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,84 @@
+2006-11-03  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+       * *: The Joy of Merging.
+
+       * buildscripts/git-update-changelog.py: 
+       sort commits, and use .git-commits-done file.
+
+       * GNUmakefile.in: 
+       * elisp/GNUmakefile: 
+       dist emacs patches too.
+
+2006-11-02  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+       * scm/autochange.scm: 
+       autochange thinko.
+
+       * lily/context-def.cc: 
+       * lily/include/parse-scm.hh: 
+       * lily/include/smobs.hh: 
+       * lily/parse-scm.cc: 
+       * lily/prob.cc: 
+       * lily/program-option.cc: 
+       * scm/lily.scm: 
+       implement and use ASSERT_LIVE_IS_ALLOWED()
+
+       * ly/music-functions-init.ly: 
+       * scm/autochange.scm: 
+       set-part-combine fix for autochange.
+
+       * lily/include/lily-lexer.hh: 
+       * lily/include/lily-parser.hh: 
+       * lily/lily-lexer.cc: 
+       * lily/lily-parser-scheme.cc: 
+       * lily/lily-parser.cc: 
+       clear lexer scopes after parsing file. Plugs pseudo memory leak
+
+       * ly/declarations-init.ly: 
+       * ly/music-functions-init.ly: 
+       * scm/part-combiner.scm: 
+       Remove set-part-combine-listener. This plugs a memory leak.
+
+       * .gitignore: 
+       more ignores.
+
+       * mf/GNUmakefile: 
+       don't delete .scale.pfa; the FF script may not have read themyet. Fixes brace OTF bug
+
+       * .gitignore: 
+       ignore gcstat files.
+
+       * lily/part-combine-iterator.cc: 
+       don't allocate part combine events statically. Plugs small leak.
+
+       * lily/lily-parser-scheme.cc: 
+       plug memleak in case of failed files.
+
+       * lily/include/source.hh: 
+       * lily/source.cc: 
+       clean up Sources
+
+       * lily/lexer.ll: 
+       hi-bit ascii is also counted as alpha chars. This allows unicodeidentifiers, and fixes premature stop at accented char. (#134)
+
+       * lily/include/program-option.hh: 
+       * lily/program-option.cc: 
+       get_program_option() function
+
+       * ly/titling-init.ly: 
+       change naming: print-page-number becomescreate-page-number-stencil. This avoids nameclash withprint-page-number boolean, and fixes page number printing.
+
+       * lily/include/translator.hh: 
+       * lily/include/translator.icc: 
+       * lily/translator.cc: 
+       minor cleanups
+
+       * lily/figured-bass-engraver.cc: 
+       don't use ASSIGN_EVENT_ONCE for Figured_bass_engraver. Fixes #128.
+
+       * stepmake/stepmake/compile-vars.make: 
+       don't do -fPIC for mingw. Suppresses warning about unnecessary -fPIC
+
 2006-11-01  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
        * python/midi.c: 

diff --git a/autogen.sh b/autogen.sh
index 6db6ec12e21470bacff2e0ec09d4d312f9e3e217..d5033d9ec7cf87471371e4230a4f1df7641ad86a 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,4 +1,7 @@
 #!/bin/sh
+# WARNING WARNING WARNING
+# do not edit! this is autogen.sh, generated from /home/lilydev/src/lilypond/stepmake/autogen.sh
+#!/bin/sh
 # Run this to generate configure and initial GNUmakefiles
 
 srcdir=`dirname $0`
@@ -50,8 +53,6 @@ do
 done
 
 #conf_flags="--enable-maintainer-mode --enable-compile-warnings" #--enable-iso-c
-#conf_flags="--with-ncsb-dir=/usr/share/fonts/default/Type1/"
-
 if test -n "$NOCONFIGURE"; then
     echo Skipping configure process.
     exit 0

diff --git a/scm/lily.scm b/scm/lily.scm
index 72e2956467c4a7d292cdbaa3deedd21e97d2102e..e7d6e8d0ce2226554a9bc05a5b201c32cd8c5cdf 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -20,14 +20,12 @@
              (anti-alias-factor 1 "render at higher resolution and scale down result\nto prevent jaggies in PNG")
              (check-internal-types #f "check every property assignment for types")
              (clip-systems #f "Generate cut-out snippets of a score")
-             (debug-gc #f
-                       "dump memory debugging statistics")
-             (debug-gc-assert-parsed-dead #f
-                       "for memory debugging: ensure that all refs to parsed objects are dead.")
-             
+             (debug-gc #f "dump memory debugging statistics")
+             (debug-gc-assert-parsed-dead
+              #f "for memory debugging: ensure that all refs to parsed objects are dead.")
+             (debug-lexer #f "debug the flex lexer")
              (debug-midi #f "generate human readable MIDI")
              (debug-parser #f "debug the bison parser")
-             (debug-lexer #f "debug the flex lexer")
              (delete-intermediate-files #f
                                         "delete unusable PostScript files")
              (dump-signatures #f "dump output signatures of each system")