From: hanwen <hanwen>
Date: Sat, 13 Jul 2002 17:46:31 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: release/1.5.71~159
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2d60862da51311eec8c5a090b342e281dd25cff6;p=lilypond.git

*** empty log message ***
---

diff --git a/ChangeLog b/ChangeLog
index 41999735ee..c55040994f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2002-07-13  Han-Wen  <hanwen@cs.uu.nl>
 
+	* lily/auto-beam-engraver.cc (create_beam_p): remember Beam
+	settings at the start of a potential auto beam.
+
 	* lily/include/sequential-iterator.hh (class Sequential_iterator):
 	bugfix: protect music list from GC.
 
diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh
index 2012c4fdb2..105c1030f0 100644
--- a/lily/include/lily-guile.hh
+++ b/lily/include/lily-guile.hh
@@ -69,6 +69,10 @@ inline SCM scm_c_make_vector  (int k, SCM val) {
 
 #endif
 
+#if GUILE_MINOR_VERSION < 7
+#define scm_gc_unregister_collectable_memory(a,b,c) scm_done_free(b)
+#define scm_gc_register_collectable_memory(a,b,c) scm_done_malloc(b)
+#endif
 
 #include "direction.hh"
 #include "flower-proto.hh"
diff --git a/scm/grob-description.scm b/scm/grob-description.scm
index 13276d505f..c32aeb71dc 100644
--- a/scm/grob-description.scm
+++ b/scm/grob-description.scm
@@ -146,7 +146,8 @@
 	(slope-limit . 0.2)
 	(flag-width-function . ,default-beam-flag-width-function)
 	(damping . 1)
-	(auto-knee-gap . 7)
+;;	(auto-knee-gap . 7)
+	
 	(font-name . "cmr10")
 	(space-function . ,Beam::space_function)
 	(meta . ((interfaces . (staff-symbol-referencer-interface beam-interface spanner-interface))))