* scm/ly-from-scheme.scm (read-lily-expression): #$( ... )

was causing an error. (was not actually commited in 2004-06-20)

* input/regression/lily-in-scheme.ly (withPaddingC): does not
breaks anymore

diff --git a/ChangeLog b/ChangeLog
index 20da753d7a322d608eeea2b12708b0e6b13850a2..500803a053336842c0d9b530b56a66e0a63d17da 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-06-26  Nicolas Sceaux  <nicolas.sceaux@free.fr>
+       
+       * scm/ly-from-scheme.scm (read-lily-expression): #$( ... )
+       was causing an error. (was not actually commited in 2004-06-20)
+
+       * input/regression/lily-in-scheme.ly (withPaddingC): does not
+       breaks anymore
+
 2004-06-24  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
        * lily/my-lily-parser.cc (parse_string): switch module too.

diff --git a/input/regression/lily-in-scheme.ly b/input/regression/lily-in-scheme.ly
index 344fc69e79649ef8f3e119619873bc47a3978f77..218f5b03784af3ab83d829d2f6d27b0e41c8c102 100644 (file)
--- a/input/regression/lily-in-scheme.ly
+++ b/input/regression/lily-in-scheme.ly
@@ -8,45 +8,39 @@ In this example, the @code{\withpaddingA}, @code{\withpaddingB} and
 @code{\withpaddingC} music functions set different kinds of padding on
 the @code{TextScript} grob.
 
-FIXME: this is broken.
 "
-    
-}
-
-
-\score{ c'4^"FIXME" }
-%{
+          
+      }
 
 \version "2.3.4"
 \paper { raggedright = ##t }
 
 withPaddingA = #(def-music-function (location padding music) (number? ly:music?)
-                   #{ \override TextScript #'padding = #$padding
-                      $music 
-                      \revert TextScript #'padding #})
-  
+                     #{ \override TextScript #'padding = #$padding
+                        $music 
+                        \revert TextScript #'padding #})
+
 withPaddingB = #(def-music-function (location padding music) (number? ly:music?)
-                   #{ \override TextScript #'padding = #$(* padding 2)
-                      $music 
-                      \revert TextScript #'padding #})
-  
+                     #{ \override TextScript #'padding = #$(* padding 2)
+                        $music 
+                        \revert TextScript #'padding #})
+
 withPaddingC = #(def-music-function (location padding music) (number? ly:music?)
-                   #{ \override TextScript #'padding = #(+ 1 $(* padding 2))
-                      $music 
-                      \revert TextScript #'padding #})
-  
-  \score {
-      \notes {
-          c'^"1"
-          \withPaddingA #2
-            { c'^"2" c'^"3"}
-          c'^"4"
-          \withPaddingB #2
-            { c'^"5" c'^"6"}
-          c'^"7"
-          \withPaddingC #2
-            { c'^"8" c'^"9"}
-          c'^"10"
-      }
-  }
-%}
+                     #{ \override TextScript #'padding = #(+ 1 $(* padding 2))
+                        $music 
+                        \revert TextScript #'padding #})
+
+\score {
+    \notes {
+        c'^"1"
+        \withPaddingA #2
+        { c'^"2" c'^"3"}
+        c'^"4"
+        \withPaddingB #2
+        { c'^"5" c'^"6"}
+        c'^"7"
+        \withPaddingC #2
+        { c'^"8" c'^"9"}
+        c'^"10"
+    }
+}

diff --git a/scm/ly-from-scheme.scm b/scm/ly-from-scheme.scm
index 43e6269c6e476e013e951e44ebc97956b2ee225c..0b0d25dd53b2d6bc57c7701b394228f0ee74c1ad 100644 (file)
--- a/scm/ly-from-scheme.scm
+++ b/scm/ly-from-scheme.scm
@@ -71,7 +71,10 @@ character."
                              (display (read-char port) out))  ;; pop the second $
                             ;; a #scheme expression
                             ((char=? c #\#)
-                             (format out "#~a" (remove-dollars! (read port))))
+                             (let ((expr (read port)))
+                               (format out "#~a" (if (eq? '$ expr)
+                                                     (create-binding! (read port))
+                                                     (remove-dollars! expr)))))
                             ;; other caracters
                             (else
                              (display c out))))))))