From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Mon, 9 Oct 2006 14:14:42 +0000 (+0000)
Subject: * ly/generate-documentation.ly: update option name.
X-Git-Tag: release/2.10.0-2~209
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=90ced3531757339332d576f0a956db526cd4fd82;p=lilypond.git

* 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 ad891d45ef..3d4ea21842 100644
--- 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 c8c4eaa0de..32ef531c14 100644
--- 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 ebb1ce8f7f..dbf45e6271 100644
--- 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")