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 456acd1a9e023109c88139e1a66b270a4f3f3323..b508860efa2acd19c93dba40c2d338fe39a9de48 100644 (file)
--- a/lily/lily-parser.cc
+++ b/lily/lily-parser.cc
@@ -23,6 +23,7 @@
 #include "sources.hh"
 #include "text-metrics.hh"
 #include "warn.hh"
+#include "program-option.hh"
 
 #include "ly-smobs.icc"
 
@@ -85,12 +86,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;