*** empty log message ***

[lilypond.git] / lily / score.cc

diff --git a/lily/score.cc b/lily/score.cc
index 3eda39de7005a371e4a37056c4f2b642c0afba1a..d4fd65187530713c97ae2877d1c05ebecb9c8b71 100644 (file)
--- a/lily/score.cc
+++ b/lily/score.cc
@@ -3,131 +3,174 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
+#include <stdio.h>
+
+#include "ly-smobs.icc"
+
 #include "score.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "music-output-def.hh"
 #include "music-output.hh"
-#include "source.hh"
-#include "source-file.hh"
 #include "music-iterator.hh"
 #include "music.hh"
 #include "global-translator.hh"
-#include "scope.hh"
+#include "scm-hash.hh"
 #include "cpu-timer.hh"
 #include "main.hh"
 #include "paper-def.hh"
+#include "ly-modules.hh"
+
 
 
-Score::Score()
-    : Input()
+/*
+  TODO: junkme.
+ */
+Score::Score ()
+  : Input ()
 {
-  header_p_ = 0;
-  music_p_ = 0;
-  errorlevel_i_ = 0;
+  input_file_ = 0;
+  header_ = SCM_EOL;
+  music_ = SCM_EOL;
+  errorlevel_ = 0;
+
+  smobify_self ();
 }
 
+/*
+  store point & click locations.
+  Global to save some time. (Sue us!)
+ */
+bool store_locations_global_b;
+
 Score::Score (Score const &s)
   : Input (s)
 {
-  music_p_ = (s.music_p_) ? s.music_p_->clone() : 0;
-  for (int i=0; i < s.def_p_arr_.size (); i++)
-    def_p_arr_.push(s.def_p_arr_[i]->clone());
-  errorlevel_i_ = s.errorlevel_i_;
-  header_p_ =  (s.header_p_) ? new Scope (*s.header_p_): 0;
+  music_ = SCM_EOL;
+  header_ = 0;
+  smobify_self ();
+
+  Music * m =unsmob_music (s.music_);
+  music_ =  m?m->clone ()->self_scm () : SCM_EOL;
+  scm_gc_unprotect_object (music_);
+  
+  for (int i=0; i < s.defs_.size (); i++)
+    defs_.push (s.defs_[i]->clone ());
+  errorlevel_ = s.errorlevel_;
+
+  header_ = ly_make_anonymous_module ();
+  if (ly_module_p (s.header_))
+    ly_copy_module_variables (header_, s.header_);
 }
 
-Score::~Score()
+Score::~Score ()
 {
-  delete header_p_;
-  junk_pointer_array (def_p_arr_);
-  delete music_p_;
+  
 }
 
+
+
 void
-Score::run_translator (Music_output_def *odef_l)
+Score::run_translator (Music_output_def *odef)
 {
-  Cpu_timer timer;
-  Global_translator * trans_p = odef_l->get_global_translator_p();
-  if (!trans_p)
+   Cpu_timer timer;
+  Global_translator * trans = odef->get_global_translator ();
+  if (!trans)
     {
-      non_fatal_error (_("no toplevel translator"));
+      programming_error ("no toplevel translator");
       return ;
     }
-  progress_indication ("\n" + _("Interpreting music..."));
-  trans_p->final_mom_ = music_p_->length_mom ();
-
-
-  Music_iterator * iter = Music_iterator::static_get_iterator_p (music_p_);
-  iter->init_translator(music_p_, trans_p);
+  progress_indication (_ ("Interpreting music..."));
+  Music * music = unsmob_music (music_);
+  
+  trans->final_mom_ = music->get_length ();
+  SCM protected_iter =  Music_iterator::get_static_get_iterator (music);
+  Music_iterator * iter = unsmob_iterator (protected_iter);
+  iter->init_translator (music, trans);
 
-  iter->construct_children();
+  iter->construct_children ();
 
-  if (! iter->ok())
+  if (! iter->ok ())
     {
-      delete iter;
-      warning (_("Need music in a score"));
-      errorlevel_i_ =1;
+      warning (_ ("Need music in a score"));
+      errorlevel_ =1;
       return ;
     }
 
-  trans_p->start ();
-  trans_p->run_iterator_on_me (iter);
-  delete iter;
-  trans_p->finish ();
+  trans->start ();
+  trans->run_iterator_on_me (iter);
+  iter->quit();
+  scm_remember_upto_here_1 (protected_iter);
+  trans->finish ();
 
-  if (errorlevel_i_)
+  if (errorlevel_)
     {
       // should we? hampers debugging.
       warning (_ ("Errors found/*, not processing score*/"));
     }
 
-  Music_output * output = trans_p->get_output_p();
-  delete trans_p;
-  progress_indication (_f ("elapsed time: %.2f seconds",  timer.read ()));
+  Music_output * output = trans->get_output ();
+  scm_gc_unprotect_object (trans->self_scm ());
+  
+  if (verbose_global_b)
+    progress_indication (_f ("elapsed time: %.2f seconds",  timer.read ()));
 
-  output->header_l_ = header_p_;
-  output->origin_str_ =  location_str();
+  if (!header_)
+    header_ = ly_make_anonymous_module(); // ug.h
+
+  output->header_ = header_;
+  output->origin_string_ =  location_string ();
 
   progress_indication ("\n");
-  output->process();
+  output->process ();
+  
   delete output ;
 }
 
 void
-Score::process()
+Score::process ()
 {
-  if (!music_p_)
+  if (!unsmob_music (music_))
     return;
 
-  print();
-  for (int i=0; i < def_p_arr_.size (); i++)
+  for (int i=0; i < defs_.size (); i++)
     {
       if (no_paper_global_b 
-         && dynamic_cast<Paper_def*>(def_p_arr_[i]))
+         && dynamic_cast<Paper_def*> (defs_[i]))
        continue;
-      run_translator (def_p_arr_[i]);
+      run_translator (defs_[i]);
     }
 }
 
 
-
 void
-Score::print() const
+Score::add_output (Music_output_def *pap)
 {
-#ifndef NPRINT
-  DEBUG_OUT << "score {\n";
-  music_p_ -> print ();
-  for (int i=0; i < def_p_arr_.size (); i++)
-    def_p_arr_[i]->print();
-  DEBUG_OUT << "}\n";
-#endif
+  defs_.push (pap);
 }
 
-void
-Score::add_output (Music_output_def *pap_p)
+IMPLEMENT_SMOBS (Score);
+IMPLEMENT_DEFAULT_EQUAL_P (Score);
+
+
+SCM
+Score::mark_smob (SCM s)
 {
-  def_p_arr_.push(pap_p);
+  Score * sc = (Score*) SCM_CELL_WORD_1 (s);
+
+  scm_gc_mark (sc->header_);
+  for (int i = sc->defs_.size (); i--;)
+    scm_gc_mark (sc->defs_[i]->self_scm ());
+  
+  return sc->music_;
+}
+
+int
+Score::print_smob (SCM , SCM p, scm_print_state*)
+{
+  scm_puts ("#<Score>", p);
+
+  return 1;
 }