X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=scm%2Fstandalone.scm;h=5ecfe7200ab86590319e68a42c5edc74f532b1b7;hb=refs%2Fheads%2Fbugs%2F567849;hp=346c1085a8d8b0321ec657eb33c316209aa006ad;hpb=1b4f371fe85ccdf1a5e5670cf5626426bd05d82b;p=lilypond.git diff --git a/scm/standalone.scm b/scm/standalone.scm index 346c1085a8..5ecfe7200a 100644 --- a/scm/standalone.scm +++ b/scm/standalone.scm @@ -1,11 +1,25 @@ -;;;; 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--2002 Jan Nieuwenhuizen -;;;; Han-Wen Nienhuys +;;;; Copyright (C) 1998--2011 Jan Nieuwenhuizen +;;;; Han-Wen Nienhuys +;;;; +;;;; 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 . + + +(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) @@ -16,8 +30,8 @@ (define (scm-gulp-file name) (set! %load-path - (cons (string-append (getenv 'LILYPONDPREFIX) "/ly") - (cons (string-append (getenv 'LILYPONDPREFIX) "/ps") + (cons (string-append (getenv "LILYPOND_DATADIR") "/ly") + (cons (string-append (getenv "LILYPOND_DATADIR") "/ps") %load-path))) (let ((path (%search-load-path name))) (if path @@ -31,7 +45,7 @@ (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"))