* lily/paper-outputter.cc (file): New method.

[lilypond.git] / lily / paper-outputter.cc

diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index 8c7e2ef5abbf624b263c3ecb5ce820be79c6dad6..bb9c3812cf8ed9138793f8a04dcc8f1efdaf3c48 100644 (file)
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -38,9 +38,6 @@ Paper_outputter::Paper_outputter (String filename, String format)
   smobify_self ();
   
   filename_ = filename;
-  file_ = scm_open_file (scm_makfrom0str (filename.to_str0 ()),
-                        scm_makfrom0str ("w"));
-
   String module_name = "scm output-" + format;
   output_module_ = scm_c_resolve_module (module_name.to_str0 ());
 }
@@ -69,10 +66,19 @@ Paper_outputter::print_smob (SCM x, SCM p, scm_print_state*)
   return 1;
 }
 
+SCM
+Paper_outputter::file ()
+{
+  if (file_ == SCM_EOL)
+    file_ = scm_open_file (scm_makfrom0str (filename_.to_str0 ()),
+                          scm_makfrom0str ("w"));
+  return file_;
+}
+
 SCM
 Paper_outputter::dump_string (SCM scm)
 {
-  return scm_display (scm, file_);
+  return scm_display (scm, file ());
 }
 
 SCM
@@ -87,23 +93,18 @@ Paper_outputter::output_scheme (SCM scm)
   dump_string (scheme_to_string (scm));
 }
 
-LY_DEFINE (ly_paper_outputter_dump, "ly:paper-outputter-dump",
-          2, 0, 0, (SCM outputter, SCM arg),
-          "Dump ARG on OUTPUTTER\n.")
+void
+paper_outputter_dump (void *po, SCM x)
 {
-  Paper_outputter *po = unsmob_outputter (outputter);
-  SCM_ASSERT_TYPE (po, outputter, SCM_ARG1, __FUNCTION__, "Paper_outputter");
-  po->output_scheme (arg);
-  return SCM_UNSPECIFIED;
+  Paper_outputter *me = (Paper_outputter*) po;
+  me->output_scheme (x);
 }
 
 void
 Paper_outputter::output_stencil (Stencil stil)
 {
-  ly_interpret_stencil (stil.expr (),
-                       ly_scheme_function ("ly:paper-outputter-dump"),
-                       self_scm (),
-                       ly_offset2scm (Offset (0, 0)));
+  interpret_stencil_expression (stil.expr (), paper_outputter_dump,
+                                (void*) this, Offset (0,0));
 }
 
 Paper_outputter *