* ly/generate-documentation.ly: update option name.

* lily/dynamic-text-spanner.cc (print): revert fix.

* lily/spacing-determine-loose-columns.cc (is_loose_column):
allow-loose-spacing property.

diff --git a/ChangeLog b/ChangeLog
index ad891d45ef6b1fb10f33cd60a89ad5ba68e8ff4c..3d4ea21842123a3294287fbdef730363dba3e7e9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-10-09  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+       * ly/generate-documentation.ly: update option name.
+
        * lily/dynamic-text-spanner.cc (print): revert fix.
 
        * scm/define-grob-interfaces.scm

diff --git a/lily/dynamic-text-spanner.cc b/lily/dynamic-text-spanner.cc
index c8c4eaa0de68d34ed77fcc750769ed3c39c90054..32ef531c14adb13494cb7a51cd96013c39b1a69a 100644 (file)
--- a/lily/dynamic-text-spanner.cc
+++ b/lily/dynamic-text-spanner.cc
@@ -84,7 +84,9 @@ Dynamic_text_spanner::print (SCM smob)
 
            FIXME: this fixed an issue, but need to have this issue in
            the issue tracker.
-           
+
+           This fix doesn't quite work: it should only do this if the
+           right bound has a trill too.
           */
 #if 0
          if (d == RIGHT && me->get_property ("style") == ly_symbol2scm ("trill"))
@@ -102,7 +104,6 @@ Dynamic_text_spanner::print (SCM smob)
     }
   while (flip (&d) != LEFT);
 
-  Stencil m;
   SCM properties = Font_interface::text_font_alist_chain (me);
   SCM edge_text = me->get_property ("edge-text");
   Drul_array<Stencil> edge;
@@ -125,6 +126,7 @@ Dynamic_text_spanner::print (SCM smob)
       while (flip (&d) != LEFT);
     }
 
+  Stencil m;
   do
     {
       Interval ext = edge[d].extent (X_AXIS);

diff --git a/ly/generate-documentation.ly b/ly/generate-documentation.ly
index ebb1ce8f7fc39482525fd04c537d190ee1a6ae3b..dbf45e6271b44ea48deed3c7bac4f956e934c00c 100644 (file)
--- a/ly/generate-documentation.ly
+++ b/ly/generate-documentation.ly
@@ -3,5 +3,5 @@
 %
 % Running LilyPond on this file generates the documentation
 %
-#(ly:set-option 'parse-protect #f)
+#(ly:set-option 'protected-scheme-parsing #f)
 #(load-from-path "documentation-generate.scm")