Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / lily / lily-parser.cc

diff --git a/lily/lily-parser.cc b/lily/lily-parser.cc
index 04b15622bfc7c20cca5e0470378aa728aaae0ce0..13d62ebc5c762eb68873bace69250e14687026dd 100644 (file)
--- a/lily/lily-parser.cc
+++ b/lily/lily-parser.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
@@ -15,15 +15,16 @@
 #include "international.hh"
 #include "lily-lexer.hh"
 #include "lily-version.hh"
-#include "lilypond-key.hh"
+#include "ly-module.hh"
 #include "main.hh"
 #include "output-def.hh"
 #include "paper-book.hh"
 #include "parser.hh"
 #include "score.hh"
-#include "source.hh"
+#include "sources.hh"
 #include "text-metrics.hh"
 #include "warn.hh"
+#include "program-option.hh"
 
 #include "ly-smobs.icc"
 
@@ -86,12 +87,11 @@ Lily_parser::print_smob (SCM s, SCM port, scm_print_state*)
 void
 Lily_parser::parse_file (string init, string name, string out_name)
 {
-  if (output_backend_global == "tex")
+  if (get_output_backend_name () == "tex")
     try_load_text_metrics (out_name);
 
   // TODO: use $parser 
-  lexer_->set_identifier (ly_symbol2scm ("parser"),
-                         self_scm ());
+  lexer_->set_identifier (ly_symbol2scm ("parser"), self_scm ());
   output_basename_ = out_name;
 
   lexer_->main_input_name_ = name;
@@ -251,5 +251,6 @@ get_header (Lily_parser *parser)
 SCM 
 Lily_parser::make_scope () const
 {
-  return ly_make_anonymous_module (be_safe_global);
+  SCM module = ly_make_anonymous_module (be_safe_global);
+  return module;    
 }