* lily/include/transposed-music.hh (class Transposed_music): remove.

[lilypond.git] / lily / parse-scm.cc

diff --git a/lily/parse-scm.cc b/lily/parse-scm.cc
index cb7c7c2618050f5f36906a380b281b1e406e2c4c..878dac48b99f86836fe7a33b3428a93e11376ed0 100644 (file)
--- a/lily/parse-scm.cc
+++ b/lily/parse-scm.cc
@@ -10,7 +10,6 @@
 
 #include <cstdio>
 
-#include "ly-module.hh"
 #include "main.hh"
 #include "paper-book.hh"
 #include "source-file.hh"
@@ -22,10 +21,10 @@
 SCM
 internal_ly_parse_scm (Parse_start * ps)
 {
-  Source_file *sf =ps->start_location_.source_file_;
+  Source_file *sf = ps->start_location_.source_file_;
   SCM port = sf->get_port ();
 
-  int off = ps->start_location_.defined_str0_ - sf->to_str0 ();
+  int off = ps->start_location_.start_ - sf->to_str0 ();
   
   scm_seek (port, scm_long2num (off), scm_long2num (SEEK_SET));
   SCM from = scm_ftell (port);
@@ -41,7 +40,7 @@ internal_ly_parse_scm (Parse_start * ps)
          static SCM module = SCM_BOOL_F;
          if (module == SCM_BOOL_F)
            {
-             SCM function = ly_scheme_function ("make-safe-lilypond-module");
+             SCM function = ly_lily_module_constant ("make-safe-lilypond-module");
              module = scm_call_0 (function);
            }
          answer = scm_eval (form, module);