X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore.cc;h=3f00330e61336c875aa3c97d618157468e2befd7;hb=a7ebff8ea16f393543046c2a3d3984bf1a7e8313;hp=f864b58433f09b7543269905a402660ecc2beb20;hpb=9f34e35c3cb97d2a1f0c7838590a574095fbee2e;p=lilypond.git

diff --git a/lily/score.cc b/lily/score.cc
index f864b58433..3f00330e61 100644
--- a/lily/score.cc
+++ b/lily/score.cc
@@ -3,177 +3,248 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "ly-smobs.icc"
-
-#include "scm-hash.hh"
 #include "score.hh"
-#include "debug.hh"
-#include "music-output-def.hh"
-#include "music-output.hh"
-#include "music-iterator.hh"
-#include "music.hh"
-#include "global-translator.hh"
-#include "scope.hh"
+
+#include <cstdio>
+
+using namespace std;
+
+#include "book.hh"
 #include "cpu-timer.hh"
+#include "global-context.hh"
+#include "international.hh"
+#include "lily-parser.hh"
+#include "lilypond-key.hh"
 #include "main.hh"
-#include "paper-def.hh"
+#include "music.hh"
+#include "music.hh"
+#include "output-def.hh"
+#include "paper-book.hh"
+#include "paper-score.hh"
+#include "warn.hh"
 
+#include "ly-smobs.icc"
+
+Input *
+Score::origin () const
+{
+  return unsmob_input (input_location_);
+}
 
-/*
-  TODO: junkme.
- */
 
-Score::Score()
-  : Input()
+Score::Score ()
 {
-  header_p_ = 0;
+  header_ = SCM_EOL;
   music_ = SCM_EOL;
-  errorlevel_i_ = 0;
+  error_found_ = false;
+  input_location_ = SCM_EOL;
   smobify_self ();
+  input_location_ = make_input (Input ());
 }
 
-Score::Score (Score const &s)
-  : Input (s)
+Score::~Score ()
 {
-  music_ = SCM_EOL;
-  header_p_ = 0;
-  smobify_self ();
-  
-  Music * m =unsmob_music (s.music_);
-  music_ =  m?m->clone()->self_scm () : SCM_EOL;
-  scm_unprotect_object (music_);
-  
-  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_;
-  if (s.header_p_)
- 	{
-	  header_p_ =  (s.header_p_) ? new Scheme_hash_table (*s.header_p_): 0;
-
-	  scm_unprotect_object(header_p_->self_scm ());
-	}
- 
 }
 
-Score::~Score()
+IMPLEMENT_SMOBS (Score);
+IMPLEMENT_DEFAULT_EQUAL_P (Score);
+IMPLEMENT_TYPE_P (Score, "ly:score?");
+
+SCM
+Score::mark_smob (SCM s)
+{
+  Score *sc = (Score *) SCM_CELL_WORD_1 (s);
+
+  scm_gc_mark (sc->header_);
+  for (vsize i = sc->defs_.size (); i--;)
+    scm_gc_mark (sc->defs_[i]->self_scm ());
+
+  scm_gc_mark (sc->input_location_);
+  return sc->music_;
+}
+
+int
+Score::print_smob (SCM, SCM p, scm_print_state*)
 {
-  
+  scm_puts ("#<Score>", p);
+
+  return 1;
 }
 
-void
-Score::run_translator (Music_output_def *odef_l)
+Score::Score (Score const &s)
 {
-  Cpu_timer timer;
+  header_ = SCM_EOL;
+  music_ = SCM_EOL;
+  error_found_ = s.error_found_;
+  input_location_ = SCM_EOL;
+  smobify_self ();
+  input_location_ = make_input (*s.origin ()); 
 
-  
-  Global_translator * trans_p = odef_l->get_global_translator_p();
-  if (!trans_p)
+  Music *m = unsmob_music (s.music_);
+  if (m)
     {
-      programming_error ("no toplevel translator");
-      return ;
+      Music *mclone = m->clone ();
+      music_ = mclone->unprotect ();
     }
-  progress_indication (_("Interpreting music..."));
-  Music * music = unsmob_music (music_);
-  
-  trans_p->final_mom_ = music->length_mom ();
+  else
+    music_ = SCM_EOL;
 
+  for (vsize i = 0, n = s.defs_.size (); i < n; i++)
+    {
+      Output_def *copy = s.defs_[i]->clone ();
+      defs_.push_back (copy);
+      copy->unprotect ();
+    }
+  header_ = ly_make_anonymous_module (false);
+  if (ly_is_module (s.header_))
+    ly_module_copy (header_, s.header_);
+}
 
-  Music_iterator * iter = Music_iterator::static_get_iterator_p (music);
-  iter->init_translator(music, trans_p);
+void
+default_rendering (SCM music, SCM outdef,
+		   SCM book_outputdef,
+		   SCM header,
+		   SCM outname,
+		   SCM key)
+{
+  SCM scaled_def = outdef;
+  SCM scaled_bookdef = book_outputdef;
 
-  iter->construct_children();
+  Output_def *bpd = unsmob_output_def (book_outputdef);
 
-  if (! iter->ok())
+  /* ugh.  */
+  if (bpd->c_variable ("is-paper") == SCM_BOOL_T)
     {
-      delete iter;
-      warning (_("Need music in a score"));
-      errorlevel_i_ =1;
-      return ;
+      Real scale = scm_to_double (bpd->c_variable ("output-scale"));
+
+      Output_def *def = scale_output_def (unsmob_output_def (outdef), scale);
+      Output_def *bdef = scale_output_def (bpd, scale);
+      def->parent_ = bdef;
+
+      scaled_def = def->self_scm ();
+      scaled_bookdef = bdef->self_scm ();
+
+      def->unprotect ();
+      bdef->unprotect ();
     }
 
-  trans_p->start ();
-  trans_p->run_iterator_on_me (iter);
-  delete iter;
-  trans_p->finish ();
+  SCM context = ly_run_translator (music, scaled_def, key);
+  
+  SCM output_as_scm = ly_format_output (context);
+  Music_output *output = unsmob_music_output (output_as_scm);
 
-  if (errorlevel_i_)
+  if (Paper_score *pscore = dynamic_cast<Paper_score *> (output))
     {
-      // should we? hampers debugging.
-      warning (_ ("Errors found/*, not processing score*/"));
+      /* ugh, this is strange, Paper_book without a Book object. */
+      Paper_book *paper_book = new Paper_book ();
+      paper_book->header_ = header;
+      paper_book->paper_ = unsmob_output_def (scaled_bookdef);
+
+      if (ly_is_module (header))
+	paper_book->add_score (header);
+
+      paper_book->add_score (pscore->self_scm ());
+      paper_book->classic_output (outname);
+      paper_book->unprotect ();
     }
 
-  Music_output * output = trans_p->get_output_p();
-  scm_unprotect_object (trans_p->self_scm ());
-  
-  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();
-
-  progress_indication ("\n");
-  output->process();
-  delete output ;
-
-  /*
-    force GC. At this point, GUILE may give back mallocated area to
-    the system.
-  */
-    
-  scm_gc();
+  scm_remember_upto_here_1 (scaled_def);
+  scm_remember_upto_here_1 (output_as_scm);
+  scm_remember_upto_here_1 (scaled_bookdef);
 }
 
-void
-Score::process()
+/*
+  Format score, return list of Music_output objects.
+
+  LAYOUTBOOK should be scaled already.
+*/
+SCM
+Score::book_rendering (Output_def *layoutbook,
+		       Output_def *default_def,
+		       Object_key *book_key)
 {
-  if (!unsmob_music (music_))
-    return;
+  if (error_found_)
+    return SCM_EOL;
+
+  SCM scaled_bookdef = SCM_EOL;
+  Real scale = 1.0;
+
+  if (layoutbook && layoutbook->c_variable ("is-paper") == SCM_BOOL_T)
+    scale = scm_to_double (layoutbook->c_variable ("output-scale"));
 
+  SCM outputs = SCM_EOL;
+  SCM *tail = &outputs;
 
-  for (int i=0; i < def_p_arr_.size (); i++)
+  int outdef_count = defs_.size ();
+
+  Object_key *key = new Lilypond_general_key (book_key, user_key_, 0);
+  SCM scm_key = key->unprotect ();
+
+  for (int i = 0; !i || i < outdef_count; i++)
     {
-      if (no_paper_global_b 
-	  && dynamic_cast<Paper_def*>(def_p_arr_[i]))
-	continue;
-      run_translator (def_p_arr_[i]);
-    }
-}
+      Output_def *def = outdef_count ? defs_[i] : default_def;
+      SCM scaled = SCM_EOL;
+
+      if (def->c_variable ("is-layout") == SCM_BOOL_T)
+	{
+	  def = scale_output_def (def, scale);
+	  def->parent_ = layoutbook;
 
+	  scaled = def->unprotect ();
+	}
+
+      /* TODO: fix or junk --no-layout.  */
+      SCM context = ly_run_translator (music_, def->self_scm (), scm_key);
+      if (dynamic_cast<Global_context *> (unsmob_context (context)))
+	{
+	  SCM s = ly_format_output (context);
+
+	  *tail = scm_cons (s, SCM_EOL);
+	  tail = SCM_CDRLOC (*tail);
+	}
 
+      scm_remember_upto_here_1 (scaled);
+    }
 
+  scm_remember_upto_here_1 (scm_key);
+  scm_remember_upto_here_1 (scaled_bookdef);
+  return outputs;
+}
 
 void
-Score::add_output (Music_output_def *pap_p)
+Score::set_music (SCM music)
 {
-  def_p_arr_.push(pap_p);
-}
+  if (unsmob_music (music_))
+    {
+      unsmob_music (music)->origin ()->error (_ ("already have music in score"));
+      unsmob_music (music_)->origin ()->error (_ ("this is the previous music"));
+    }
+  Music *m = unsmob_music (music);
+  if (m && to_boolean (m->get_property ("error-found")))
+    {
+      m->origin ()->error (_ ("errors found, ignoring music expression"));
 
-IMPLEMENT_SMOBS(Score);
-IMPLEMENT_DEFAULT_EQUAL_P(Score);
-IMPLEMENT_UNSMOB(Score, score);
+      this->error_found_ = this->error_found_
+	|| to_boolean (m->get_property ("error-found"));
+    }
+
+  if (this->error_found_)
+    this->music_ = SCM_EOL;
+  else
+    this->music_ = music;
+}
 
 SCM
-Score::mark_smob (SCM s)
+Score::get_music () const
 {
-  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--;)
-    scm_gc_mark (sc->def_p_arr_[i]->self_scm ());
-  
-  return sc->music_;
+  return music_;
 }
 
-int
-Score::print_smob (SCM s, SCM p, scm_print_state*)
+void
+Score::add_output_def (Output_def *def)
 {
-  scm_puts ("#<Score>", p);
-
-  return 1;
+  defs_.push_back (def);
 }