From: hanwen <hanwen>
Date: Sun, 20 Jun 2004 20:39:05 +0000 (+0000)
Subject: * lily/book.cc (LY_DEFINE): new function. ly:make-book. Supercedes
X-Git-Tag: release/2.3.9^2~79
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=310819e46ec804984d79843e0a7e246bff4a74ae;p=lilypond.git

* lily/book.cc (LY_DEFINE): new function. ly:make-book. Supercedes
ly:score-bookify.

* lily/book.cc (LY_DEFINE): ly:make-book. New function.
---

diff --git a/ChangeLog b/ChangeLog
index 3afcd91c29..60ac76a11f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-06-20  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+	* lily/book.cc (LY_DEFINE): new function. ly:make-book. Supercedes
+	ly:score-bookify.
+
 	* scm/lily.scm (collect-scores-for-book): new function.
 
 	* ly/init.ly: print collected scores/musics.
diff --git a/lily/book.cc b/lily/book.cc
index f84560d3cd..6f0ac61726 100644
--- a/lily/book.cc
+++ b/lily/book.cc
@@ -87,7 +87,7 @@ Book::process (String outname, Output_def *default_def)
 	{
 	  Score_lines sc;
 	  sc.lines_ = systems;
-	  sc.header_ = header_;
+	  sc.header_ = scores_[i]->header_;
 	  paper_book->score_lines_.push (sc);
 	}
     }
@@ -98,7 +98,7 @@ Book::process (String outname, Output_def *default_def)
 LY_DEFINE(ly_make_book, "ly:make-book",
 	  2, 0, 1, (SCM bookpaper, SCM header, SCM scores),
 	  "Make a \\book of @var{bookpaper} and @var{header} (which may be #f as well)  "
-	  "containing @code{\scores}.")
+	  "containing @code{\\scores}.")
 {
   Output_def * odef = unsmob_output_def (bookpaper);
   SCM_ASSERT_TYPE (odef, bookpaper,
diff --git a/lily/score.cc b/lily/score.cc
index 133e1a987a..14fbb43a40 100644
--- a/lily/score.cc
+++ b/lily/score.cc
@@ -253,22 +253,7 @@ Score::book_rendering (String outname,
   return systems;
 }
 
-LY_DEFINE (ly_score_bookify, "ly:score-bookify",
-	   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");
-  
-  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 ();
-}
+
 
 
 LY_DEFINE (ly_score_embedded_format, "ly:score-embedded-format",
diff --git a/python/lilylib.py b/python/lilylib.py
index df6ee12a61..5652f6faff 100644
--- a/python/lilylib.py
+++ b/python/lilylib.py
@@ -129,7 +129,6 @@ def exit (i):
 	if __main__.verbose_p:
 		raise _ ('Exiting (%d)...') % i
 	else:
-		print 'ex thoto' , i 
 		sys.exit (i)
 		
 def getopt_args (opts):