From: hanwen <hanwen>
Date: Wed, 22 Jun 2005 15:06:05 +0000 (+0000)
Subject: * lily/lily-parser-scheme.cc (LY_DEFINE): don't set 'parser
X-Git-Tag: release/2.5.32~2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=90d0671c40d0eacf2ea55ef3de12b6c165561ccf;p=lilypond.git

* lily/lily-parser-scheme.cc (LY_DEFINE): don't set 'parser
variable in lily module

* scm/framework-ps.scm (output-classic-framework): error message
regarding the classic framework.
---

diff --git a/ChangeLog b/ChangeLog
index 89e9d78c1e..fcc2516c2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2005-06-22  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+	* lily/lily-parser-scheme.cc (LY_DEFINE): don't set 'parser
+	variable in lily module
+
+	* scm/framework-ps.scm (output-classic-framework): error message
+	regarding the classic framework.
+
 	* Documentation/user/henle-flat-gray.png (Module): new file.
 
 	* Documentation/user/baer-flat-gray.png (Module): new file.
diff --git a/lily/lily-parser-scheme.cc b/lily/lily-parser-scheme.cc
index 5779bea9e9..006e556027 100644
--- a/lily/lily-parser-scheme.cc
+++ b/lily/lily-parser-scheme.cc
@@ -138,8 +138,6 @@ LY_DEFINE (ly_parse_string, "ly:parse-string",
   Sources sources;
   sources.set_path (&global_path);
   Lily_parser *parser = new Lily_parser (&sources);
-  scm_module_define (global_lily_module, ly_symbol2scm ("parser"),
-		     parser->self_scm ());
   parser->parse_string (ly_scm2string (ly_code));
   scm_gc_unprotect_object (parser->self_scm ());
   parser = 0;
diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index 37dcefd8fe..5f90e67226 100644
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -17,6 +17,7 @@
 	     (srfi srfi-13)
 	     (lily))
 
+
 (define framework-ps-module (current-module))
 
 ;;(define pdebug stderr)
@@ -558,3 +559,13 @@
 
 (define-public (convert-to-ps book name)
   #t)
+
+(define-public (output-classic-framework basename book scopes fields)
+
+  (ly:error (_ "\nThe PostScript backend does not support the 'classic'
+framework. Use the EPS backend instead,
+
+  lilypond -b eps <file>
+
+or remove the lilypond-book specific settings from the input.
+")))