X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-outputter.cc;h=a72ea59ccdef770d8f70c32f942a42ee4fe8a6d9;hb=926115ff42def8bc1ce767029e4f03c8072994ba;hp=e8f1d821aa49201c35a6fc5f5fb78027a7dcb082;hpb=90d3233da87b372e02690978f89b2add3863fba6;p=lilypond.git

diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index e8f1d821aa..a72ea59ccd 100644
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -37,8 +37,8 @@ using namespace std;
 #include "scm-hash.hh"
 #include "string-convert.hh"
 #include "warn.hh"
+#include "lily-imports.hh"
 
-ADD_SMOB_INIT (Paper_outputter);
 
 Paper_outputter::Paper_outputter (SCM port, const string &format)
 {
@@ -53,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 ()
@@ -63,7 +62,7 @@ Paper_outputter::~Paper_outputter ()
 
 
 SCM
-Paper_outputter::mark_smob ()
+Paper_outputter::mark_smob () const
 {
   scm_gc_mark (output_module_);
   return file_;
@@ -127,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_);
     }
 }