X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-outputter.cc;h=5f02a7654923572f7e05aafc808a70495a0ceda5;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=0a28aa242eceb5cbb1afca6ba81c8d463006999c;hpb=87c76f9661ab6c7c24be704336fd207597ce5b3d;p=lilypond.git

diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index 0a28aa242e..5f02a76549 100644
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -3,57 +3,53 @@
 
   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--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include <math.h>
-#include <time.h>
+#include "paper-outputter.hh"
+
+#include <cmath>
+#include <ctime>
+
+using namespace std;
 
-#include "array.hh"
 #include "dimensions.hh"
 #include "file-name.hh"
 #include "font-metric.hh"
-#include "input-smob.hh"
-#include "lily-guile.hh"
+#include "input.hh"
 #include "lily-version.hh"
-#include "ly-module.hh"
 #include "main.hh"
 #include "output-def.hh"
 #include "paper-book.hh"
-#include "paper-outputter.hh"
 #include "paper-system.hh"
 #include "scm-hash.hh"
-#include "stencil.hh"
 #include "string-convert.hh"
 #include "warn.hh"
 
 #include "ly-smobs.icc"
 
-
-Paper_outputter::Paper_outputter (String filename, String format)
+Paper_outputter::Paper_outputter (SCM port, string format)
 {
-  file_ = SCM_EOL;
+  file_ = port;
   output_module_ = SCM_EOL;
   smobify_self ();
-  
-  filename_ = filename;
-  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_;
 }
@@ -67,14 +63,8 @@ Paper_outputter::print_smob (SCM x, SCM p, scm_print_state*)
 }
 
 SCM
-Paper_outputter::file ()
+Paper_outputter::file () const
 {
-  if (file_ == SCM_EOL)
-    if (filename_ == "-")
-      file_ = scm_current_output_port();
-    else
-      file_ = scm_open_file (scm_makfrom0str (filename_.to_str0 ()),
-			     scm_makfrom0str ("w"));
   return file_;
 }
 
@@ -99,7 +89,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);
 }
 
@@ -107,44 +97,12 @@ void
 Paper_outputter::output_stencil (Stencil stil)
 {
   interpret_stencil_expression (stil.expr (), paper_outputter_dump,
-                                (void*) this, Offset (0,0));
-}
-
-Paper_outputter *
-get_paper_outputter (String outname, String f) 
-{
-  progress_indication (_f ("Layout output to `%s'...",
-			   outname == "-" ? String ("<stdout>") : outname));
-  progress_indication ("\n");
-  return new Paper_outputter (outname, f);
-}
-
-/* FIXME: why is output_* wrapper called dump?  */
-LY_DEFINE (ly_outputter_dump_stencil, "ly:outputter-dump-stencil",
-	   2, 0, 0, (SCM outputter, SCM stencil),
-	   "Dump stencil @var{expr} onto @var{outputter}.")
-{
-  Paper_outputter *po = unsmob_outputter (outputter);
-  Stencil *st = unsmob_stencil (stencil);
-  SCM_ASSERT_TYPE (po, outputter, SCM_ARG1, __FUNCTION__, "Paper_outputter");
-  SCM_ASSERT_TYPE (st, stencil, SCM_ARG1, __FUNCTION__, "Paper_outputter");
-  po->output_stencil (*st);
-  return SCM_UNSPECIFIED;
-}
-
-LY_DEFINE (ly_outputter_dump_string, "ly:outputter-dump-string",
-	   2, 0, 0, (SCM outputter, SCM str),
-	   "Dump @var{str} onto @var{outputter}.")
-{
-  Paper_outputter *po = unsmob_outputter (outputter);
-  SCM_ASSERT_TYPE (po, outputter, SCM_ARG1, __FUNCTION__, "Paper_outputter");
-  SCM_ASSERT_TYPE (scm_is_string (str), str, SCM_ARG1, __FUNCTION__, "Paper_outputter");
-  
-  return po->dump_string (str);
+				(void *) this, Offset (0, 0));
 }
 
 void
 Paper_outputter::close ()
 {
-  scm_close_port (file_);
+  if (scm_port_p (file_) == SCM_BOOL_T)
+    scm_close_port (file_);
 }