X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbook.cc;h=c7f5dd02378372ba377320d9c1a94dec2899d17b;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=c970a964fe6ea2c7a6867c5e8cf53b66b8510470;hpb=664070d837cc4855091455892cb942cdcedeef0c;p=lilypond.git

diff --git a/lily/book.cc b/lily/book.cc
index c970a964fe..c7f5dd0237 100644
--- a/lily/book.cc
+++ b/lily/book.cc
@@ -1,125 +1,307 @@
 /*
-  book.cc -- implement Book
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-*/
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
 
-#include <stdio.h>
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
-#include "book-paper-def.hh"
-#include "ly-smobs.icc"
-#include "stencil.hh"
 #include "book.hh"
-#include "global-context.hh"
-#include "ly-module.hh"
+
+#include <cstdio>
+using namespace std;
+
 #include "main.hh"
-#include "music-iterator.hh"
-#include "output-def.hh"
-#include "music-output.hh"
 #include "music.hh"
-#include "page.hh"
-#include "paper-book.hh"
 #include "output-def.hh"
+#include "paper-book.hh"
 #include "score.hh"
+#include "text-interface.hh"
 #include "warn.hh"
+#include "performance.hh"
+#include "paper-score.hh"
+#include "page-marker.hh"
+#include "ly-module.hh"
 
 Book::Book ()
-  : Input ()
 {
-  bookpaper_ = 0;
+  paper_ = 0;
   header_ = SCM_EOL;
-  assert (!scores_.size ());
+  scores_ = SCM_EOL;
+  bookparts_ = SCM_EOL;
+  input_location_ = SCM_EOL;
   smobify_self ();
+
+  input_location_ = Input ().smobbed_copy ();
+}
+
+Book::Book (Book const &s)
+  : Smob<Book> ()
+{
+  paper_ = 0;
+  header_ = SCM_EOL;
+  scores_ = SCM_EOL;
+  bookparts_ = SCM_EOL;
+  input_location_ = SCM_EOL;
+  smobify_self ();
+
+  if (s.paper_)
+    {
+      paper_ = s.paper_->clone ();
+      paper_->unprotect ();
+    }
+
+  input_location_ = s.origin ()->smobbed_copy ();
+
+  header_ = ly_make_module (false);
+  if (ly_is_module (s.header_))
+    ly_module_copy (header_, s.header_);
+  SCM *t = &scores_;
+  for (SCM p = s.scores_; scm_is_pair (p); p = scm_cdr (p))
+    {
+      SCM entry = scm_car (p);
+
+      if (Score *newscore = unsmob<Score> (entry))
+        * t = scm_cons (newscore->clone ()->unprotect (), SCM_EOL);
+      else if (Page_marker *marker = unsmob<Page_marker> (entry))
+        * t = scm_cons (marker->clone ()->unprotect (), SCM_EOL);
+      else
+        {
+          /* This entry is a markup list */
+          *t = scm_cons (entry, SCM_EOL);
+        }
+      t = SCM_CDRLOC (*t);
+    }
+
+  t = &bookparts_;
+  for (SCM p = s.bookparts_; scm_is_pair (p); p = scm_cdr (p))
+    {
+      Book *newpart = unsmob<Book> (scm_car (p))->clone ();
+
+      *t = scm_cons (newpart->self_scm (), SCM_EOL);
+      t = SCM_CDRLOC (*t);
+      newpart->unprotect ();
+    }
+}
+
+Input *
+Book::origin () const
+{
+  return unsmob<Input> (input_location_);
 }
 
 Book::~Book ()
 {
 }
 
-IMPLEMENT_SMOBS (Book);
-IMPLEMENT_DEFAULT_EQUAL_P (Book);
 
 SCM
-Book::mark_smob (SCM s)
+Book::mark_smob () const
 {
-  Book *book = (Book*) SCM_CELL_WORD_1 (s);
-  int score_count = book->scores_.size ();
-  for (int i = 0; i < score_count; i++)
-    scm_gc_mark (book->scores_[i]->self_scm ());
-
-  if (book->bookpaper_)
-    scm_gc_mark (book->bookpaper_->self_scm ());
-  return book->header_;
+  if (paper_)
+    scm_gc_mark (paper_->self_scm ());
+  scm_gc_mark (scores_);
+  scm_gc_mark (bookparts_);
+  scm_gc_mark (input_location_);
+
+  return header_;
 }
 
-int
-Book::print_smob (SCM, SCM p, scm_print_state*)
+void
+Book::add_score (SCM s)
 {
-  scm_puts ("#<Book>", p);
-  return 1;
+  scores_ = scm_cons (s, scores_);
 }
 
 void
-Book::process (String outname, Output_def *default_def, SCM header)
+Book::set_parent (Book *parent)
 {
-  Paper_book *paper_book = new Paper_book ();
-  paper_book->bookpaper_ = bookpaper_;
-  int score_count = scores_.size ();
-  for (int i = 0; i < score_count; i++)
+  if (!paper_)
     {
-      Output_def *paper = 0;
-      SCM systems = scores_[i]->book_rendering (outname,
-						bookpaper_,
-						default_def, &paper);
-      if (systems != SCM_UNDEFINED)
-	{
-	  Score_lines sc;
-	  sc.paper_ = paper;
-	  sc.lines_ = systems;
-	  sc.header_ = header;
-
-	  paper_book->score_lines_.push (sc);
-	}
+      paper_ = new Output_def ();
+      paper_->unprotect ();
+    }
+  paper_->parent_ = parent->paper_;
+  /* Copy the header block of the parent */
+  if (ly_is_module (parent->header_))
+    {
+      SCM tmp_header = ly_make_module (false);
+      ly_module_copy (tmp_header, parent->header_);
+      if (ly_is_module (header_))
+        ly_module_copy (tmp_header, header_);
+      header_ = tmp_header;
     }
-  paper_book->output (outname);
-  scm_gc_unprotect_object (paper_book->self_scm ());
 }
 
-/* FIXME: WIP, this is a hack.  Return first page as stencil.  */
-SCM
-Book::to_stencil (Output_def *default_def, SCM header)
+/* Before an explicit \bookpart is encountered, scores are added to the book.
+ * But once a bookpart is added, the previous scores shall be collected into
+ * a new bookpart.
+ */
+void
+Book::add_scores_to_bookpart ()
 {
+  if (scm_is_pair (scores_))
+    {
+      /* If scores have been added to this book, add them to a child
+       * book part */
+      Book *part = new Book;
+      part->set_parent (this);
+      part->scores_ = scores_;
+      bookparts_ = scm_cons (part->self_scm (), bookparts_);
+      part->unprotect ();
+      scores_ = SCM_EOL;
+    }
+}
+
+void
+Book::add_bookpart (SCM b)
+{
+  add_scores_to_bookpart ();
+  Book *part = unsmob<Book> (b);
+  part->set_parent (this);
+  bookparts_ = scm_cons (b, bookparts_);
+}
+
+bool
+Book::error_found ()
+{
+  for (SCM s = scores_; scm_is_pair (s); s = scm_cdr (s))
+    if (Score *score = unsmob<Score> (scm_car (s)))
+      if (score->error_found_)
+        return true;
+
+  for (SCM part = bookparts_; scm_is_pair (part); part = scm_cdr (part))
+    if (Book *bookpart = unsmob<Book> (scm_car (part)))
+      if (bookpart->error_found ())
+        return true;
+
+  return false;
+}
+
+Paper_book *
+Book::process (Output_def *default_paper,
+               Output_def *default_layout)
+{
+  return process (default_paper, default_layout, 0);
+}
+
+void
+Book::process_bookparts (Paper_book *output_paper_book, Output_def *paper, Output_def *layout)
+{
+  add_scores_to_bookpart ();
+  for (SCM p = scm_reverse (bookparts_); scm_is_pair (p); p = scm_cdr (p))
+    {
+      if (Book *book = unsmob<Book> (scm_car (p)))
+        {
+          Paper_book *paper_book_part = book->process (paper, layout, output_paper_book);
+          if (paper_book_part)
+            {
+              output_paper_book->add_bookpart (paper_book_part->self_scm ());
+              paper_book_part->unprotect ();
+            }
+        }
+    }
+  /* In a Paper_book, bookparts are stored in straight order */
+  output_paper_book->bookparts_ = scm_reverse_x (output_paper_book->bookparts_, SCM_EOL);
+}
+
+void
+Book::process_score (SCM s, Paper_book *output_paper_book, Output_def *layout)
+{
+  if (Score *score = unsmob<Score> (scm_car (s)))
+    {
+      SCM outputs = score
+                    ->book_rendering (output_paper_book->paper_, layout);
+
+      while (scm_is_pair (outputs))
+        {
+          Music_output *output = unsmob<Music_output> (scm_car (outputs));
+
+          if (Performance *perf = dynamic_cast<Performance *> (output))
+            {
+              output_paper_book->add_performance (perf->self_scm ());
+              // Associate the performance with a \header block (if there is
+              // one in effect in the scope of the current score), to make the
+              // header metadata accessible when outputting the performance.
+              if (ly_is_module (score->get_header ()))
+                perf->set_header (score->get_header ());
+              else if (ly_is_module (output_paper_book->header_))
+                perf->set_header (output_paper_book->header_);
+              else if (ly_is_module (output_paper_book->header_0_))
+                perf->set_header (output_paper_book->header_0_);
+            }
+          else if (Paper_score *pscore = dynamic_cast<Paper_score *> (output))
+            {
+              if (ly_is_module (score->get_header ()))
+                output_paper_book->add_score (score->get_header ());
+              output_paper_book->add_score (pscore->self_scm ());
+            }
+
+          outputs = scm_cdr (outputs);
+        }
+    }
+  else if (Text_interface::is_markup_list (scm_car (s))
+           || unsmob<Page_marker> (scm_car (s)))
+    output_paper_book->add_score (scm_car (s));
+  else
+    assert (0);
+
+}
+
+/* Concatenate all score or book part outputs into a Paper_book
+ */
+Paper_book *
+Book::process (Output_def *default_paper,
+               Output_def *default_layout,
+               Paper_book *parent_part)
+{
+  Output_def *paper = paper_ ? paper_ : default_paper;
+
+  /* If top book, recursively check score errors */
+  if (!parent_part && error_found ())
+    return 0;
+
+  if (!paper)
+    return 0;
+
   Paper_book *paper_book = new Paper_book ();
-  paper_book->bookpaper_ = bookpaper_;
-  int score_count = scores_.size ();
-  for (int i = 0; i < score_count; i++)
+  Real scale = scm_to_double (paper->c_variable ("output-scale"));
+  Output_def *scaled_bookdef = scale_output_def (paper, scale);
+  paper_book->paper_ = scaled_bookdef;
+  if (parent_part)
     {
-      Output_def *paper = 0;
-      SCM systems = scores_[i]->book_rendering ("<markup>",
-						bookpaper_,
-						default_def,
-						&paper);
-      if (systems != SCM_UNDEFINED)
-	{
-	  Score_lines sc;
-	  sc.paper_ = paper;
-	  sc.lines_ = systems;
-	  sc.header_ =header;
-
-	  paper_book->score_lines_.push (sc);
-
-	  // wtf: code dup.
-	}
+      paper_book->parent_ = parent_part;
+      paper_book->paper_->parent_ = parent_part->paper_;
     }
+  paper_book->header_ = header_;
+  scaled_bookdef->unprotect ();
 
-  SCM pages = paper_book->pages ();
-  paper_book = 0;
-  if (pages != SCM_EOL)
+  if (scm_is_pair (bookparts_))
+    {
+      /* Process children book parts */
+      process_bookparts (paper_book, paper, default_layout);
+    }
+  else
     {
-      progress_indication (_f ("paper output to `%s'...", "<markup>"));
-      return (unsmob_page (ly_car (pages)))->to_stencil ().smobbed_copy ();
+      paper_book->paper_->normalize ();
+      /* Process scores */
+      /* Render in order of parsing.  */
+      for (SCM s = scm_reverse (scores_); scm_is_pair (s); s = scm_cdr (s))
+        {
+          process_score (s, paper_book, default_layout);
+        }
     }
-  return SCM_EOL;
+
+  return paper_book;
 }