X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-outputter.cc;h=a72ea59ccdef770d8f70c32f942a42ee4fe8a6d9;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=5ba03e95c78ee2e9a26477d5e30513f62ce038f5;hpb=d2762a4f1add2bb04d6fc34d3c7ae03eeb7d500f;p=lilypond.git

diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index 5ba03e95c7..a72ea59ccd 100644
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -37,6 +37,7 @@ using namespace std;
 #include "scm-hash.hh"
 #include "string-convert.hh"
 #include "warn.hh"
+#include "lily-imports.hh"
 
 
 Paper_outputter::Paper_outputter (SCM port, const string &format)
@@ -52,8 +53,7 @@ Paper_outputter::Paper_outputter (SCM port, const string &format)
     Enable errors for undefined stencil routines if
      -dwarning-as-error is specified; else enable warnings.
   */
-  SCM proc = ly_lily_module_constant ("backend-testing");
-  scm_call_1 (proc, output_module_);
+  Lily::backend_testing (output_module_);
 }
 
 Paper_outputter::~Paper_outputter ()
@@ -62,7 +62,7 @@ Paper_outputter::~Paper_outputter ()
 
 
 SCM
-Paper_outputter::mark_smob ()
+Paper_outputter::mark_smob () const
 {
   scm_gc_mark (output_module_);
   return file_;
@@ -118,7 +118,7 @@ Paper_outputter::output_stencil (Stencil stil)
 void
 Paper_outputter::close ()
 {
-  if (scm_port_p (file_) == SCM_BOOL_T)
+  if (ly_is_port (file_))
     {
       scm_close_port (file_);
       /*
@@ -126,7 +126,6 @@ Paper_outputter::close ()
         expressions so that we start fresh with the next \book
         block.  --pmccarty
       */
-      SCM proc = ly_lily_module_constant ("remove-stencil-warnings");
-      scm_call_1 (proc, output_module_);
+      Lily::remove_stencil_warnings (output_module_);
     }
 }