X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fpaper-outputter.cc;h=6aedacca91202ad7f5a05b6558ea3905d4d33ce8;hb=f073e985d3aeafd05d1eef91dcd485fa589f1d8f;hp=7ad559bb13e6d365e2c4f0cf2443327d5c202755;hpb=7c1ee9ae5133a32f00fe0d2f59b1a6e84baa0bed;p=lilypond.git

diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index 7ad559bb13..6aedacca91 100644
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -3,19 +3,21 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-                 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "paper-outputter.hh"
 
-#include <math.h>
+#include <cmath>
 #include <ctime>
 
+using namespace std;
+
 #include "dimensions.hh"
 #include "file-name.hh"
 #include "font-metric.hh"
-#include "input-smob.hh"
+#include "input.hh"
 #include "lily-version.hh"
 #include "main.hh"
 #include "output-def.hh"
@@ -27,50 +29,43 @@
 
 #include "ly-smobs.icc"
 
-Paper_outputter::Paper_outputter (String file_name, String format)
+Paper_outputter::Paper_outputter (SCM port, string format)
 {
-  file_ = SCM_EOL;
+  file_ = port;
   output_module_ = SCM_EOL;
   smobify_self ();
-  
-  file_name_ = file_name;
-  String module_name = "scm output-" + format;
-  output_module_ = scm_c_resolve_module (module_name.to_str0 ());
+
+  string module_name = "scm output-" + format;
+  output_module_ = scm_c_resolve_module (module_name.c_str ());
 }
 
 Paper_outputter::~Paper_outputter ()
 {
 }
 
-
 IMPLEMENT_SMOBS (Paper_outputter);
 IMPLEMENT_DEFAULT_EQUAL_P (Paper_outputter);
 
 SCM
 Paper_outputter::mark_smob (SCM x)
 {
-  Paper_outputter *p = (Paper_outputter*) SCM_CELL_WORD_1(x);
+  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*)
+Paper_outputter::print_smob (SCM /* x */,
+			     SCM p,
+			     scm_print_state *)
 {
-  (void) x;
   scm_puts ("#<Paper_outputter>", p);
   return 1;
 }
 
 SCM
-Paper_outputter::file ()
+Paper_outputter::file () const
 {
-  if (file_ == SCM_EOL)
-    if (file_name_ == "-")
-      file_ = scm_current_output_port();
-    else
-      file_ = scm_open_file (scm_makfrom0str (file_name_.to_str0 ()),
-			     scm_makfrom0str ("w"));
   return file_;
 }
 
@@ -95,7 +90,7 @@ Paper_outputter::output_scheme (SCM scm)
 void
 paper_outputter_dump (void *po, SCM x)
 {
-  Paper_outputter *me = (Paper_outputter*) po;
+  Paper_outputter *me = (Paper_outputter *) po;
   me->output_scheme (x);
 }
 
@@ -103,7 +98,7 @@ 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