X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-outputter.cc;h=a72ea59ccdef770d8f70c32f942a42ee4fe8a6d9;hb=2bbacb364aa29041af9cbbbd32cfad2e8e387cb3;hp=6dff3242439bcc0c16ea0d5eabbe2fc532570f46;hpb=e24fb7cc5671aea95211d4a0c56f28fb6fe8720e;p=lilypond.git

diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index 6dff324243..a72ea59ccd 100644
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -37,8 +37,8 @@ using namespace std;
 #include "scm-hash.hh"
 #include "string-convert.hh"
 #include "warn.hh"
+#include "lily-imports.hh"
 
-#include "ly-smobs.icc"
 
 Paper_outputter::Paper_outputter (SCM port, const string &format)
 {
@@ -53,32 +53,19 @@ 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 ()
 {
 }
 
-IMPLEMENT_SMOBS (Paper_outputter);
-IMPLEMENT_DEFAULT_EQUAL_P (Paper_outputter);
 
 SCM
-Paper_outputter::mark_smob (SCM x)
+Paper_outputter::mark_smob () const
 {
-  Paper_outputter *p = (Paper_outputter *) SCM_CELL_WORD_1 (x);
-  scm_gc_mark (p->output_module_);
-  return p->file_;
-}
-
-int
-Paper_outputter::print_smob (SCM /* x */,
-                             SCM p,
-                             scm_print_state *)
-{
-  scm_puts ("#<Paper_outputter>", p);
-  return 1;
+  scm_gc_mark (output_module_);
+  return file_;
 }
 
 SCM
@@ -131,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_);
       /*
@@ -139,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_);
     }
 }