X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore.cc;h=3a7d5a408a382a281aa342416d53b9307346f8ea;hb=8fc0065379238f46977a22a90559a25833b5a75b;hp=da9c2d1da155c0fe206f45f8154f4319c1c35d34;hpb=cc288cebe296287d2f99c517869f96c646677f37;p=lilypond.git

diff --git a/lily/score.cc b/lily/score.cc
index da9c2d1da1..3a7d5a408a 100644
--- a/lily/score.cc
+++ b/lily/score.cc
@@ -3,142 +3,343 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include <iostream.h>
+#include <stdio.h>
 
-#include "score.hh"
-#include "debug.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 "lily-parser.hh"
+#include "book.hh"
 #include "cpu-timer.hh"
+#include "global-context.hh"
+#include "ly-module.hh"
+#include "ly-smobs.icc"
 #include "main.hh"
-#include "paper-def.hh"
+#include "music-iterator.hh"
+#include "output-def.hh"
+#include "music-output.hh"
+#include "music.hh"
+#include "paper-book.hh"
+#include "output-def.hh"
+#include "paper-score.hh"
+#include "scm-hash.hh"
+#include "score.hh"
+#include "warn.hh"
 
+Score::Score ()
+  : Input ()
+{
+  header_ = SCM_EOL;
+  music_ = SCM_EOL;
+  error_found_ = false;
+  smobify_self ();
+}
 
-Score::Score()
-  : Input()
+Score::~Score ()
 {
-  header_p_ = 0;
-  music_p_ = 0;
-  errorlevel_i_ = 0;
 }
 
-Score::Score (Score const &s)
-  : Input (s)
+IMPLEMENT_SMOBS (Score);
+IMPLEMENT_DEFAULT_EQUAL_P (Score);
+IMPLEMENT_TYPE_P (Score, "ly:score?");
+
+SCM
+Score::mark_smob (SCM 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;
+  Score *sc = (Score*) SCM_CELL_WORD_1 (s);
+  if (sc->header_)
+    scm_gc_mark (sc->header_);
+  for (int i = sc->defs_.size (); i--;)
+    scm_gc_mark (sc->defs_[i]->self_scm ());
+  return sc->music_;
 }
 
-Score::~Score()
+int
+Score::print_smob (SCM , SCM p, scm_print_state*)
 {
-  delete header_p_;
-  junk_pointer_array (def_p_arr_);
-  delete music_p_;
+  scm_puts ("#<Score>", p);
+
+  return 1;
 }
 
-void
-Score::run_translator (Music_output_def *odef_l)
+Score::Score (Score const &s)
+  : Input (s)
 {
-  Cpu_timer timer;
+  music_ = SCM_EOL;
+  error_found_ = s.error_found_;
+  
+  /* FIXME: 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_);
   
-  Global_translator * trans_p = odef_l->get_global_translator_p();
-  if (!trans_p)
-    {
-      non_fatal_error (_("no toplevel translator"));
-      return ;
-    }
-  progress_indication ("\n" + _("Interpreting music..."));
-  trans_p->final_mom_ = music_p_->length_mom ();
+  for (int i = 0; i < s.defs_.size (); i++)
+    defs_.push (s.defs_[i]->clone ());
 
+  header_ = ly_make_anonymous_module (false);
+  if (ly_c_module_p (s.header_))
+    ly_import_module (header_, s.header_);
+}
 
-  Music_iterator * iter = Music_iterator::static_get_iterator_p (music_p_);
-  iter->init_translator(music_p_, trans_p);
 
-  iter->construct_children();
+LY_DEFINE (ly_run_translator, "ly:run-translator", 
+	   2, 0, 0, (SCM mus, SCM output_def),
+	   "Process @var{mus} according to @var{output_def}. "
+	   "An interpretation context is set up, "
+	   "and @var{mus} is interpreted with it.  "
+	   "The context is returned in its final state.")
+{
+  Output_def *odef = unsmob_output_def (output_def);
+  Music *music = unsmob_music (mus);
 
-  if (! iter->ok())
+  if (!music
+      || !music->get_length ().to_bool ())
+    {
+      warning (_ ("Need music in a score"));
+      return SCM_BOOL_F;
+    }
+  
+  SCM_ASSERT_TYPE (music, mus, SCM_ARG1, __FUNCTION__, "Music");
+  SCM_ASSERT_TYPE (odef, output_def, SCM_ARG2, __FUNCTION__, "Output definition");
+  
+  Cpu_timer timer;
+  
+  Global_context *trans = new Global_context (odef, music->get_length ());
+  
+  if (!trans)
     {
-      delete iter;
-      warning (_("Need music in a score"));
-      errorlevel_i_ =1;
-      return ;
+      programming_error ("no toplevel translator");
+      return SCM_BOOL_F;
     }
+  progress_indication (_ ("Interpreting music... "));
+  
+  SCM protected_iter = Music_iterator::get_static_get_iterator (music);
+  Music_iterator * iter = unsmob_iterator (protected_iter);
+  iter->init_translator (music, trans);
 
-  trans_p->start ();
-  trans_p->run_iterator_on_me (iter);
-  delete iter;
-  trans_p->finish ();
+  iter->construct_children ();
 
-  if (errorlevel_i_)
+  if (!iter->ok ())
     {
-      // should we? hampers debugging.
-      warning (_ ("Errors found/*, not processing score*/"));
+      warning (_ ("Need music in a score"));
+      /* todo: should throw exception. */
+      return SCM_BOOL_F;
     }
 
-  Music_output * output = trans_p->get_output_p();
-  delete trans_p;
-  progress_indication (_f ("elapsed time: %.2f seconds",  timer.read ()));
+  trans->run_iterator_on_me (iter);
+  iter->quit ();
+  scm_remember_upto_here_1 (protected_iter);
+  trans->finish ();
+
+  if (verbose_global_b)
+    progress_indication (_f ("elapsed time: %.2f seconds",  timer.read ()));
+  
+  return scm_gc_unprotect_object (trans->self_scm ());
+}
 
-  output->header_l_ = header_p_;
-  output->origin_str_ =  location_str();
+LY_DEFINE (ly_format_output, "ly:format-output",
+	   2, 0, 0, (SCM context, SCM outname),
+	   "Given a Score context in its final state,"
+           "process it and return the (rendered) result.")
+{
+  Global_context *g = dynamic_cast<Global_context*> (unsmob_context (context));
+  SCM_ASSERT_TYPE (g, context, SCM_ARG1, __FUNCTION__, "Global context");
+  SCM_ASSERT_TYPE (scm_is_string (outname), outname, SCM_ARG2, __FUNCTION__, "output filename");
 
+  Music_output *output = g->get_output ();
   progress_indication ("\n");
-  output->process();
-  delete output ;
-
-  /*
-    force GC. At this point, GUILE may give back mallocated area to
-    the system.
-  */
-    
-  scm_gc();
+  /* ugh, midi still wants outname  */
+  return output->process (ly_scm2string (outname));
 }
 
 void
-Score::process()
+default_rendering (SCM music, SCM outdef,
+		   SCM book_outputdef,
+		   SCM header, SCM outname)
 {
-  if (!music_p_)
-    return;
+  SCM scaled_def = outdef;
+  SCM scaled_bookdef = book_outputdef;
+  
+  Output_def *bpd = unsmob_output_def (book_outputdef);
 
-  print();
-  for (int i=0; i < def_p_arr_.size (); i++)
+  /* ugh.  */
+  if (bpd->c_variable ("is-bookpaper") == SCM_BOOL_T)
     {
-      if (no_paper_global_b 
-	  && dynamic_cast<Paper_def*>(def_p_arr_[i]))
-	continue;
-      run_translator (def_p_arr_[i]);
+      Real scale = scm_to_double (bpd->c_variable ("outputscale"));
+      
+      Output_def *def = scale_output_def (unsmob_output_def (outdef), scale);
+      scaled_def = def->self_scm ();
+
+      scaled_bookdef = scale_output_def (bpd, scale)->self_scm ();
+      unsmob_output_def (scaled_def)->parent_
+	= unsmob_output_def (scaled_bookdef);
+      
+      scm_gc_unprotect_object (scaled_bookdef);
+      scm_gc_unprotect_object (scaled_def);
     }
+  
+  SCM context = ly_run_translator (music, scaled_def);
+  if (Global_context *g = dynamic_cast<Global_context*>
+      (unsmob_context (context)))
+    {
+      SCM systems = ly_format_output (context, outname);
+      Music_output *output = g->get_output ();
+      if (systems != SCM_UNDEFINED)
+	{
+	  /* ugh, this is strange, Paper_book without a Book object. */
+	  Paper_book *paper_book = new Paper_book ();
+	  paper_book->header_ = header;
+	  paper_book->bookpaper_ = unsmob_output_def (scaled_bookdef);
+	  
+	  Score_systems sc;
+	  sc.systems_ = systems;
+	  sc.header_ = header;
+
+	  paper_book->score_systems_.push (sc);
+	  
+	  paper_book->classic_output (ly_scm2string (outname));
+	  scm_gc_unprotect_object (paper_book->self_scm ());
+	}
+      delete output;
+    }
+
+  scm_remember_upto_here_1 (scaled_def);
+  scm_remember_upto_here_1 (scaled_bookdef);
 }
 
+/*
+Format score, return systems. OUTNAME is still passed to create a midi
+file.
 
+PAPERBOOK should be scaled already.
 
-void
-Score::print() const
+*/
+SCM
+Score::book_rendering (String outname,
+		       Output_def *paperbook,
+		       Output_def *default_def)
 {
-#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
+  if (error_found_)
+    return SCM_EOL;
+   
+  SCM scaled_bookdef = SCM_EOL;
+  Real scale = 1.0;
+
+  if (paperbook && paperbook->c_variable ("is-bookpaper") == SCM_BOOL_T)
+    scale = scm_to_double (paperbook->c_variable ("outputscale"));
+  
+  SCM out = scm_makfrom0str (outname.to_str0 ());
+  SCM systems = SCM_EOL;
+  int outdef_count = defs_.size ();
+  for (int i = 0; !i || i < outdef_count; i++)
+    {
+      Output_def *def = outdef_count ? defs_[i] : default_def;
+      SCM scaled= SCM_EOL;
+      if (def->c_variable ("is-paper") == SCM_BOOL_T)
+	{
+	  def = scale_output_def (def, scale);
+	  def->parent_ = paperbook;
+	  scaled = def->self_scm ();
+	  scm_gc_unprotect_object (scaled);
+	}
+
+      /* TODO: fix or junk --no-paper.  */
+      SCM context = ly_run_translator (music_, def->self_scm ());
+      if (dynamic_cast<Global_context*> (unsmob_context (context)))
+	{
+	  SCM s = ly_format_output (context, out);
+	  if (s != SCM_UNDEFINED)
+	    systems = s;
+	}
+
+      scm_remember_upto_here_1 (scaled);
+    }
+  
+  scm_remember_upto_here_1 (scaled_bookdef);
+  return systems;
+}
+
+
+
+
+LY_DEFINE (ly_score_embedded_format, "ly:score-embedded-format",
+	   2, 0, 0, (SCM score, SCM paper),
+	   "Run @var{score} through @var{paper}, an output definition, "
+	   "scaled to correct outputscale already, "
+	   "return a list of paper-lines.")
+{
+  Score * sc = unsmob_score (score);
+  Output_def *od = unsmob_output_def (paper);
+
+  if (sc->error_found_)
+    {
+      return SCM_EOL;
+    }
+  
+  SCM_ASSERT_TYPE (sc, score, SCM_ARG1, __FUNCTION__, "Score");
+  SCM_ASSERT_TYPE (od, paper, SCM_ARG2, __FUNCTION__, "Output_def");
+
+  Output_def * score_def  = 0;
+
+  /* UGR, FIXME, these are default \paper blocks once again.  They
+     suck. */
+  for (int i = 0; !score_def && i < sc->defs_.size (); i++)
+    if (sc->defs_[i]->c_variable ("is-paper") == SCM_BOOL_T)
+      score_def = sc->defs_[i];
+
+  if (!score_def)
+    return scm_c_make_vector (0, SCM_EOL);
+      
+  score_def = score_def->clone ();
+  SCM prot = score_def->self_scm ();
+  scm_gc_unprotect_object (prot);
+
+  /* TODO: SCORE_DEF should be scaled according to OD->parent_ or OD
+     itself. */
+  score_def->parent_ = od;
+  
+  SCM context = ly_run_translator (sc->get_music (), score_def->self_scm ());
+  SCM lines = ly_format_output (context, scm_makfrom0str ("<embedded>"));
+  
+  scm_remember_upto_here_1 (prot);
+  return lines;
 }
 
 void
-Score::add_output (Music_output_def *pap_p)
+Score::set_music (SCM music, SCM parser)
+{
+  /* URG? */
+  SCM check_funcs = ly_scheme_function ("toplevel-music-functions");
+  for (; scm_is_pair (check_funcs); check_funcs = scm_cdr (check_funcs))
+    music = scm_call_2 (scm_car (check_funcs), music, parser);
+
+  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 (_("Error found in this music expression. Ignoring it"));
+      
+      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::get_music () const
 {
-  def_p_arr_.push(pap_p);
+  return music_;
 }