* lily/book.cc: remove Book::to_stencil().

* lily/paper-book.cc (output): load framework module
scm_c_resolve_module().

diff --git a/lily/book.cc b/lily/book.cc
index 5159c117b4a8a11ce38cc90920d73353885b1275..e8caa730d76fcbbbd74d8e2ea5902840dd97b9f1 100644 (file)
--- a/lily/book.cc
+++ b/lily/book.cc
@@ -21,6 +21,8 @@
 #include "stencil.hh"
 #include "warn.hh"
 
+#include "ly-smobs.icc"
+
 Book::Book ()
   : Input ()
 {
@@ -34,7 +36,6 @@ Book::~Book ()
 {
 }
 
-#include "ly-smobs.icc"
 IMPLEMENT_SMOBS (Book);
 IMPLEMENT_DEFAULT_EQUAL_P (Book);
 
@@ -82,11 +83,7 @@ Book::process (String outname, Output_def *default_def)
       
       /* If the score is empty, generate no output.  Should we
         do titling?  */
-      if (systems != SCM_EOL
-         /* FIXME: can systems be SCM_UNDEFINED at all?
-            it seesm to be initialise with SCM_EOL and only gets assigned
-            non-SCM_UNDEFINED values -- jcn  */
-         && systems != SCM_UNDEFINED)
+      if (ly_c_pair_p (systems))
        {
          Score_lines sc;
          sc.lines_ = systems;
@@ -98,24 +95,3 @@ Book::process (String outname, Output_def *default_def)
   return paper_book;
 }
 
-#if 0
-/* FIXME: WIP, this is a hack.  Return first page as stencil.  */
-SCM
-Book::to_stencil (Output_def *default_def)
-{
-  Paper_book *paper_book = process ("<markup>", default_def);
-
-  SCM pages = paper_book->pages ();
-  scm_gc_unprotect_object (paper_book->self_scm ());
-
-  if (ly_c_pair_p (pages))
-    {
-      progress_indication (_f ("paper output to `%s'...", "<markup>"));
-      return ly_car (pages);
-    }
-
-  scm_gc_unprotect_object (paper_book->bookpaper_->self_scm ());
-  
-  return SCM_EOL;
-}
-#endif

diff --git a/lily/include/book.hh b/lily/include/book.hh
index 899fbb4d9d1caf32f5f10982a5dbcae4f25f45b2..2a81201e5d2ae1be4230a9b8b2dcb5edc83401eb 100644 (file)
--- a/lily/include/book.hh
+++ b/lily/include/book.hh
@@ -26,7 +26,6 @@ public:
   Book ();
 
   Paper_book* process (String, Output_def*);
-  SCM to_stencil (Output_def*);
 };
 DECLARE_UNSMOB (Book, book);