* lily/paper-outputter.cc (output_expr):

[lilypond.git] / lily / input-file-results.cc

diff --git a/lily/input-file-results.cc b/lily/input-file-results.cc
index 9c9b29a3fc14125e8bcacc335a534afe5bd02dff..a70ed99376b465f6b0e868335015de8fab3aed19 100644 (file)
--- a/lily/input-file-results.cc
+++ b/lily/input-file-results.cc
@@ -30,7 +30,9 @@
 #include "source.hh"
 #include "lily-version.hh"
 #include "scm-hash.hh"
-#include "ly-modules.hh"
+#include "ly-module.hh"
+
+#include "paper-book.hh"
 
 bool store_locations_global_b;
 
@@ -41,7 +43,7 @@ bool store_locations_global_b;
 /*
   no ! suffix since it doesn't modify 1st argument.
  */
-LY_DEFINE(ly_set_point_and_click, "ly:set-point-and-click", 1, 0, 0,
+LY_DEFINE (ly_set_point_and_click, "ly:set-point-and-click", 1, 0, 0,
          (SCM what),
          "Set the options for Point-and-click source specials output. The\n"
 "argument is a symbol.  Possible options are @code{none} (no source specials),\n"
@@ -123,7 +125,7 @@ Input_file_results::~Input_file_results ()
 
   global_input_file =0;
 
-  ly_clear_anonymous_modules();
+  ly_clear_anonymous_modules ();
 }
 
 
@@ -210,17 +212,7 @@ do_one_file (char const *file)
   
   String in_file = inpath.to_string ();
   String out_file = outpath.to_string ();
-  
-#if 0
-  /* Code to debug memory leaks.  Cannot call from within .ly
-     since then we get the protects from the parser state too. */
-  static SCM proc ;
-  if (!proc)
-       proc = scm_c_eval_string ("dump-gc-protects");
-  scm_gc ();
-  scm_call_0 (proc);
-#endif
-      
+
   if (init.length () && global_path.find (init).is_empty ())
     {
       warning (_f ("can't find file: `%s'", init));
@@ -238,5 +230,12 @@ do_one_file (char const *file)
   if (!proc)
     proc = scm_c_eval_string ("dump-gc-protects");
 
+#ifdef PAGE_LAYOUT
+  Paper_book book;
+  paper_book = &book;
+#endif
   Input_file_results inp_file (init, in_file, out_file);
+#ifdef PAGE_LAYOUT
+  book.output ();
+#endif
 }