#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"
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;
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;
}