patch::: 1.5.1.jcn2

[lilypond.git] / lily / score.cc

diff --git a/lily/score.cc b/lily/score.cc
index f864b58433f09b7543269905a402660ecc2beb20..ae6cf4173db1bfed7ef604a0dd868fb0ae33dcb7 100644 (file)
--- a/lily/score.cc
+++ b/lily/score.cc
@@ -26,8 +26,8 @@
   TODO: junkme.
  */
 
-Score::Score()
-  : Input()
+Score::Score ()
+  : Input ()
 {
   header_p_ = 0;
   music_ = SCM_EOL;
@@ -43,22 +43,22 @@ Score::Score (Score const &s)
   smobify_self ();
   
   Music * m =unsmob_music (s.music_);
-  music_ =  m?m->clone()->self_scm () : SCM_EOL;
-  scm_unprotect_object (music_);
+  music_ =  m?m->clone ()->self_scm () : SCM_EOL;
+  scm_gc_unprotect_object (music_);
   
   for (int i=0; i < s.def_p_arr_.size (); i++)
-    def_p_arr_.push(s.def_p_arr_[i]->clone());
+    def_p_arr_.push (s.def_p_arr_[i]->clone ());
   errorlevel_i_ = s.errorlevel_i_;
   if (s.header_p_)
        {
-         header_p_ =  (s.header_p_) ? new Scheme_hash_table (*s.header_p_): 0;
+         header_p_ = (s.header_p_) ? new Scheme_hash_table (*s.header_p_): 0;
 
-         scm_unprotect_object(header_p_->self_scm ());
+         scm_gc_unprotect_object (header_p_->self_scm ());
        }
  
 }
 
-Score::~Score()
+Score::~Score ()
 {
   
 }
@@ -69,27 +69,27 @@ Score::run_translator (Music_output_def *odef_l)
   Cpu_timer timer;
 
   
-  Global_translator * trans_p = odef_l->get_global_translator_p();
+  Global_translator * trans_p = odef_l->get_global_translator_p ();
   if (!trans_p)
     {
       programming_error ("no toplevel translator");
       return ;
     }
-  progress_indication (_("Interpreting music..."));
+  progress_indication (_ ("Interpreting music..."));
   Music * music = unsmob_music (music_);
   
   trans_p->final_mom_ = music->length_mom ();
 
 
   Music_iterator * iter = Music_iterator::static_get_iterator_p (music);
-  iter->init_translator(music, trans_p);
+  iter->init_translator (music, trans_p);
 
-  iter->construct_children();
+  iter->construct_children ();
 
-  if (! iter->ok())
+  if (! iter->ok ())
     {
       delete iter;
-      warning (_("Need music in a score"));
+      warning (_ ("Need music in a score"));
       errorlevel_i_ =1;
       return ;
     }
@@ -105,20 +105,20 @@ Score::run_translator (Music_output_def *odef_l)
       warning (_ ("Errors found/*, not processing score*/"));
     }
 
-  Music_output * output = trans_p->get_output_p();
-  scm_unprotect_object (trans_p->self_scm ());
+  Music_output * output = trans_p->get_output_p ();
+  scm_gc_unprotect_object (trans_p->self_scm ());
   
-  if(verbose_global_b)
+  if (verbose_global_b)
     progress_indication (_f ("elapsed time: %.2f seconds",  timer.read ()));
 
   if (!header_p_)
     header_p_ = new Scheme_hash_table; // ugh
   Scope bla (header_p_);
   output->header_l_ = &bla;
-  output->origin_str_ =  location_str();
+  output->origin_str_ =  location_str ();
 
   progress_indication ("\n");
-  output->process();
+  output->process ();
   delete output ;
 
   /*
@@ -126,11 +126,11 @@ Score::run_translator (Music_output_def *odef_l)
     the system.
   */
     
-  scm_gc();
+  scm_gc ();
 }
 
 void
-Score::process()
+Score::process ()
 {
   if (!unsmob_music (music_))
     return;
@@ -139,7 +139,7 @@ Score::process()
   for (int i=0; i < def_p_arr_.size (); i++)
     {
       if (no_paper_global_b 
-         && dynamic_cast<Paper_def*>(def_p_arr_[i]))
+         && dynamic_cast<Paper_def*> (def_p_arr_[i]))
        continue;
       run_translator (def_p_arr_[i]);
     }
@@ -151,17 +151,17 @@ Score::process()
 void
 Score::add_output (Music_output_def *pap_p)
 {
-  def_p_arr_.push(pap_p);
+  def_p_arr_.push (pap_p);
 }
 
-IMPLEMENT_SMOBS(Score);
-IMPLEMENT_DEFAULT_EQUAL_P(Score);
-IMPLEMENT_UNSMOB(Score, score);
+IMPLEMENT_SMOBS (Score);
+IMPLEMENT_DEFAULT_EQUAL_P (Score);
+IMPLEMENT_UNSMOB (Score, score);
 
 SCM
 Score::mark_smob (SCM s)
 {
-  Score * sc = (Score*) SCM_CELL_WORD_1(s);
+  Score * sc = (Score*) SCM_CELL_WORD_1 (s);
   if (sc->header_p_)
     scm_gc_mark (sc->header_p_->self_scm ());
   for (int i = sc->def_p_arr_.size (); i--;)