X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fstandalone.scm;h=c66988674dfbf65eb2bacaac5fa805250b1d52e8;hb=c39d188d28fdc84cef8cbaea7b8d6e2fb718c30f;hp=6596a700c09d95258a8c884c0db467ef2b97b1e0;hpb=94189ec2b8da6d7e89dc619c646a927adead9b19;p=lilypond.git

diff --git a/scm/standalone.scm b/scm/standalone.scm
index 6596a700c0..c66988674d 100644
--- a/scm/standalone.scm
+++ b/scm/standalone.scm
@@ -1,37 +1,51 @@
-;;;; standalone.scm -- implement Scheme stuff for use without LilyPond
+;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;;  source file of the GNU LilyPond music typesetter
-;;;; 
-;;;; (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
-;;;; Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; Copyright (C) 1998--2014 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;;                 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;;
+;;;; LilyPond is free software: you can redistribute it and/or modify
+;;;; it under the terms of the GNU General Public License as published by
+;;;; the Free Software Foundation, either version 3 of the License, or
+;;;; (at your option) any later version.
+;;;;
+;;;; LilyPond is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;;; GNU General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU General Public License
+;;;; along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+
+
+(use-modules (ice-9 rdelim))
 
-(define standalone (not (defined? 'ly-gulp-file)))
+(define standalone (not (defined? 'ly:gulp-file)))
 ;;(write standalone (current-error-port))
 
 (define (gulp-file name)
   (let* ((file (open-input-file name))
-	 (text (read-delimited "" file)))
+         (text (read-delimited "" file)))
     (close file)
     text))
 
 (define (scm-gulp-file name)
-  (set! %load-path 
-	(cons (string-append (getenv 'LILYPONDPREFIX) "/ly")
-	      (cons (string-append (getenv 'LILYPONDPREFIX) "/ps")
-		    %load-path)))
+  (set! %load-path
+        (cons (string-append (getenv "LILYPOND_DATADIR") "/ly")
+              (cons (string-append (getenv "LILYPOND_DATADIR") "/ps")
+                    %load-path)))
   (let ((path (%search-load-path name)))
-       (if path
-	   (gulp-file path)
-	   (gulp-file name))))
+    (if path
+        (gulp-file path)
+        (gulp-file name))))
 
 (define (scm-number->string x)
   (let ((e (inexact->exact x)))
     (string-append (if (= e x)
-		       (number->string e)
-		       (number->string x))
-		   " ")))
+                       (number->string e)
+                       (number->string x))
+                   " ")))
 
-(define ly-gulp-file scm-gulp-file)
-(define ly-number->string scm-number->string)
+(define ly:gulp-file scm-gulp-file)
+(define ly:number->string scm-number->string)
 
-(eval-string (ly-gulp-file "lily.scm"))
+(eval-string (ly:gulp-file "lily.scm"))