lilypond-0.0.28

diff --git a/src/complexwalker.cc b/src/complexwalker.cc
index f1a73e0200b02be6ffaca5faf376907aae2fa179..87e3729a072da364c3550acca35f5884320d42f8 100644 (file)
--- a/src/complexwalker.cc
+++ b/src/complexwalker.cc
@@ -205,7 +205,8 @@ Complex_walker::try_request(Request*req)
     } 
 
     if (!b)
-       WARN<< "junking request: " <<req->name() <<"\n";
+       warning("junking request: "  + String(req->name()),
+               req->defined_ch_c_l_m);
 }
 
 void

diff --git a/src/score.cc b/src/score.cc
index feb7db93e727438e65c1a1b176001a5efe5cd350..f784f30efae50bb074b93bf087fb79befacdf64c 100644 (file)
--- a/src/score.cc
+++ b/src/score.cc
@@ -5,7 +5,9 @@
 #include "staff.hh"
 #include "debug.hh"
 #include "paper.hh"
-
+#include "main.hh"
+#include "source.hh"
+#include "sourcefile.hh"
 
 void
 Score::process()
@@ -14,7 +16,7 @@ Score::process()
     
     assert (paper_p_);
     if (last() == Moment(0)) {
-       error("Need to have music in a score.");
+       warning("Need to have music in a score.", defined_ch_c_l_);
     }
     // distribute commands to disciples
     pscore_p_ = new PScore(paper_p_);
@@ -161,6 +163,7 @@ Score::Score(Paperdef*p)
     pscore_p_=0;
     paper_p_ = p;              // ?? safe?
     errorlevel_i_ = 0;
+    defined_ch_c_l_ = 0;
 }
 
 Score::~Score()
@@ -185,7 +188,10 @@ Score::output(String s)
     *mlog << "output to " << paper_p_->outfile << "...\n";
     
     Tex_stream the_output(paper_p_->outfile);
-    the_output << "% outputting Score, defined at: " << define_spot_str_ << "\n";
+    
+    the_output << "% outputting Score, defined at: " <<
+       source_global_l->
+       sourcefile_l (defined_ch_c_l_)->file_line_no_str(defined_ch_c_l_) << "\n";
     pscore_p_->output(the_output);
 }