* lily/SConscript:

* SConstruct: Update.

diff --git a/SConstruct b/SConstruct
index 56e6785f452c5f7c5620ac78c8e85b1858a33510..48250ccb16cc87a3ad69957f0d5124118703ed7a 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -202,10 +202,10 @@ env.Alias ('config', config_cache)
 
 cachedir = os.path.join (outdir, 'build-cache')
 
-if not os.path.exists(cachedir):
-       os.makedirs(cachedir)
+if not os.path.exists (cachedir):
+       os.makedirs (cachedir)
 
-CacheDir (os.path.join (outdir, 'build-cache'))
+CacheDir (cachedir)
 
 # No need to set $LILYPONDPREFIX to run lily, but cannot install...
 if env['debugging'] and not 'install' in COMMAND_LINE_TARGETS:

diff --git a/scm/lily-library.scm b/scm/lily-library.scm
index 277d0f7a7cb3530969baaf5d8b754f3f97b86fdf..39a9ab693bfd54ee49a14f08e26ccc9e3864d6a6 100644 (file)
--- a/scm/lily-library.scm
+++ b/scm/lily-library.scm
@@ -43,7 +43,7 @@
 
 ;; parser stuff.
 (define-public (print-music-as-book parser music)
-  (let* ((head  (ly:parser-lookup parser '$globalheader))
+  (let* ((head (ly:parser-lookup parser '$globalheader))
         (book (ly:make-book (ly:parser-lookup parser $defaultpaper)
                             head score)))
     (ly:parser-print-book parser book)))
@@ -55,15 +55,16 @@
     (ly:parser-print-book parser book)))
 
 (define-public (print-score parser score)
-  (let* ((head  (ly:parser-lookup parser '$globalheader))
+  (let* ((head (ly:parser-lookup parser '$globalheader))
         (book (ly:make-book (ly:parser-lookup parser $defaultpaper)
                             head score)))
     (ly:parser-print-score parser book)))
                
 (define-public (collect-scores-for-book  parser score)
-  (let* ((oldval (ly:parser-lookup parser 'toplevel-scores)))
-    (ly:parser-define parser 'toplevel-scores (cons score oldval))))
-
+  (ly:parser-define
+   parser 'toplevel-scores
+   (cons score (ly:parser-lookup parser 'toplevel-scores))))
+    
 (define-public (collect-music-for-book parser music)
   (collect-scores-for-book parser (ly:music-scorify music parser)))