* lily/ly-module.cc (LY_DEFINE): bugfix.

[lilypond.git] / lily / score.cc

diff --git a/lily/score.cc b/lily/score.cc
index a917614b265f4bccc9729cb32c9ff76b47dbfdba..7757b6a37d5bec7ae773893733116e4e6e27b7e0 100644 (file)
--- a/lily/score.cc
+++ b/lily/score.cc
@@ -9,17 +9,18 @@
 #include <stdio.h>
 
 #include "book.hh"
+
 #include "cpu-timer.hh"
 #include "global-context.hh"
 #include "ly-module.hh"
 #include "ly-smobs.icc"
 #include "main.hh"
 #include "music-iterator.hh"
-#include "music-output-def.hh"
+#include "output-def.hh"
 #include "music-output.hh"
 #include "music.hh"
 #include "paper-book.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "paper-score.hh"
 #include "scm-hash.hh"
 #include "score.hh"
@@ -86,8 +87,8 @@ Score::Score (Score const &s)
   for (int i = 0; i < s.defs_.size (); i++)
     defs_.push (s.defs_[i]->clone ());
 
-  header_ = ly_make_anonymous_module (safe_global_b);
-  if (is_module (s.header_))
+  header_ = ly_make_anonymous_module (false);
+  if (ly_c_module_p (s.header_))
     ly_import_module (header_, s.header_);
 }
 
@@ -98,7 +99,7 @@ LY_DEFINE (ly_run_translator, "ly:run-translator",
           "and @var{mus} is interpreted with it.  "
           "The context is returned in its final state.")
 {
-  Music_output_def *odef = unsmob_music_output_def (output_def);
+  Output_def *odef = unsmob_output_def (output_def);
   Music *music = unsmob_music (mus);
 
   SCM_ASSERT_TYPE (music, mus, SCM_ARG1, __FUNCTION__, "Music");
@@ -155,9 +156,33 @@ LY_DEFINE (ly_format_output, "ly:format-output",
 }
 
 void
-default_rendering (SCM music, SCM outdef, SCM header, SCM outname)
+default_rendering (SCM music, SCM outdef,
+                  SCM book_outputdef,
+                  SCM header, SCM outname)
 {
-  SCM context = ly_run_translator (music, outdef);
+  SCM scaled_def = outdef;
+  SCM scaled_bookdef = book_outputdef;
+  
+  Output_def *bpd = unsmob_output_def (book_outputdef);
+
+  /*
+    ugh.
+   */
+  if (bpd->c_variable ("is-bookpaper") == SCM_BOOL_T)
+    {
+      Real scale = ly_scm2double (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)))
@@ -166,60 +191,93 @@ default_rendering (SCM music, SCM outdef, SCM header, SCM 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_score *ps = dynamic_cast<Paper_score*> (output);
-         paper_book->papers_.push (ps->paper_);
-         paper_book->scores_.push (systems);
-         paper_book->headers_.push (header);
+
+         paper_book->bookpaper_ = unsmob_output_def (scaled_bookdef);
+         
+         Score_lines sc;
+         sc.lines_ = systems;
+         sc.header_ = header;
+
+         paper_book->score_lines_.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);
 }
 
+/*
+  PAPERBOOK should be scaled already.
+ */
 SCM
-Score::book_rendering (String outname, Music_output_def *default_def,
-                      Paper_def **paper)
+Score::book_rendering (String outname,
+                      Output_def *paperbook,
+                      Output_def *default_def)
 {
+  SCM scaled_bookdef = SCM_EOL;
+  Real scale = 1.0;
+
+  if (paperbook && paperbook->c_variable ("is-bookpaper") == SCM_BOOL_T)
+    {
+      scale = ly_scm2double (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++)
     {
-      Music_output_def *def = outdef_count ? defs_[i] : default_def;
-      if (!(no_paper_global_b && dynamic_cast<Paper_def*> (def)))
+      Output_def *def = outdef_count ? defs_[i] : default_def;
+      SCM scaled= SCM_EOL;
+      if (def->c_variable ("is-paper") == SCM_BOOL_T)
        {
-         SCM context = ly_run_translator (music_, def->self_scm ());
-         if (Global_context *g = dynamic_cast<Global_context*>
-             (unsmob_context (context)))
+         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)
            {
-             SCM s = ly_format_output (context, out);
-             if (s != SCM_UNDEFINED)
-               {
-                 systems = s;
-                 /* Ugh. */
-                 Music_output *output = g->get_output ();
-                 if (Paper_score *ps = dynamic_cast<Paper_score*> (output))
-                   *paper = ps->paper_;
-               }
+             systems = s;
            }
        }
+
+      scm_remember_upto_here_1 (scaled);
     }
+  
+  scm_remember_upto_here_1 (scaled_bookdef);
   return systems;
 }
 
 LY_DEFINE (ly_score_bookify, "ly:score-bookify",
-          1, 0, 0,
-          (SCM score_smob),
-          "Return SCORE encapsulated in a BOOK.")
+          2, 0, 0,
+          (SCM score_smob, SCM header),
+          "Return @var{score_smob} encapsulated in a Book object. Set "
+          "@var{header} as book level header.")
 {
   SCM_ASSERT_TYPE (unsmob_score (score_smob), score_smob, SCM_ARG1, __FUNCTION__, "score_smob");
   
   Score *score = unsmob_score (score_smob);
   Book *book = new Book;
   book->scores_.push (score);
+  book->header_ = header;
   scm_gc_unprotect_object (book->self_scm ());
   return book->self_scm ();
 }