* 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 89e9d78c1eafbc1aad285c270fd75f5d01ebc23d..fcc2516c2b84ff4ca4776bcac54e24e0b8b5a2cb 100644 (file)
--- 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 5779bea9e90340277799b4e88a540f0d1108fae5..006e5560272fce6ac11b836df4cd8563f8513aaa 100644 (file)
--- 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 37dcefd8fefba6548d139e65121353418a9ae0f1..5f90e67226411bddd899f4aebe9730a2d9c8c9a3 100644 (file)
--- 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.
+")))