X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-outputter.cc;h=a72ea59ccdef770d8f70c32f942a42ee4fe8a6d9;hb=8e2eaf4959bec63a1128a444591a540f4f1e2937;hp=e08cbd6590ea870c2e357b16943490a45f5fa25f;hpb=1c846b2c2348b4e0ca4a3c2e8fb267047ba2d203;p=lilypond.git

diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index e08cbd6590..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--2011 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,10 +37,10 @@ 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, string format)
+Paper_outputter::Paper_outputter (SCM port, const string &format)
 {
   file_ = port;
   output_module_ = SCM_EOL;
@@ -53,32 +53,19 @@ Paper_outputter::Paper_outputter (SCM port, 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
@@ -105,38 +92,40 @@ Paper_outputter::module () const
   return output_module_;
 }
 
-void
+SCM
 Paper_outputter::output_scheme (SCM scm)
 {
-  dump_string (scheme_to_string (scm));
+  SCM str = scheme_to_string (scm);
+  if (scm_is_string (str))
+    dump_string (str);
+  return str;
 }
 
-void
+SCM
 paper_outputter_dump (void *po, SCM x)
 {
   Paper_outputter *me = (Paper_outputter *) po;
-  me->output_scheme (x);
+  return me->output_scheme (x);
 }
 
 void
 Paper_outputter::output_stencil (Stencil stil)
 {
   interpret_stencil_expression (stil.expr (), paper_outputter_dump,
-				(void *) this, Offset (0, 0));
+                                (void *) this, Offset (0, 0));
 }
 
 void
 Paper_outputter::close ()
 {
-  if (scm_port_p (file_) == SCM_BOOL_T)
+  if (ly_is_port (file_))
     {
       scm_close_port (file_);
       /*
-	Remove the "warning" definitions for missing stencil
-	expressions so that we start fresh with the next \book
-	block.  --pmccarty
+        Remove the "warning" definitions for missing stencil
+        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_);
     }
 }