X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-outputter.cc;h=6aedacca91202ad7f5a05b6558ea3905d4d33ce8;hb=b5cd9b70a0c936051e93b3e9a0ca9f03d2960714;hp=2fe344130750340af8529ca03ea905946250a9ea;hpb=93ebef660e0f1999d67b202a592111eb95690a13;p=lilypond.git

diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index 2fe3441307..6aedacca91 100644
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -3,82 +3,107 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include <time.h>
-#include <math.h>
+#include "paper-outputter.hh"
+
+#include <cmath>
+#include <ctime>
+
+using namespace std;
 
 #include "dimensions.hh"
-#include "virtual-methods.hh"
-#include "paper-outputter.hh"
-#include "stencil.hh"
-#include "array.hh"
-#include "string-convert.hh"
-#include "warn.hh"
+#include "file-name.hh"
 #include "font-metric.hh"
+#include "input.hh"
+#include "lily-version.hh"
 #include "main.hh"
+#include "output-def.hh"
+#include "paper-book.hh"
+#include "paper-system.hh"
 #include "scm-hash.hh"
-#include "lily-version.hh"
-#include "paper-def.hh"
-#include "input-file-results.hh"
-#include "ly-modules.hh"
+#include "string-convert.hh"
+#include "warn.hh"
 
+#include "ly-smobs.icc"
 
-Paper_outputter::Paper_outputter (String name)
+Paper_outputter::Paper_outputter (SCM port, string format)
 {
-  if (safe_global_b)
-    {
-      gh_define ("security-paranoia", SCM_BOOL_T);      
-    }
-  
-  file_ = scm_open_file (scm_makfrom0str (name.to_str0 ()),
-			    scm_makfrom0str ("w"));
-
-  static SCM find_dumper;
-  if (!find_dumper)
-    find_dumper = scm_c_eval_string ("find-dumper");
-
-  
-  output_func_ = scm_call_1 (find_dumper,scm_makfrom0str (output_format_global.to_str0 ()));
-  output_scheme (gh_cons (ly_symbol2scm ("top-of-file"), SCM_EOL));
+  file_ = port;
+  output_module_ = SCM_EOL;
+  smobify_self ();
+
+  string module_name = "scm output-" + format;
+  output_module_ = scm_c_resolve_module (module_name.c_str ());
 }
 
 Paper_outputter::~Paper_outputter ()
 {
-  scm_close_port (file_);
-  file_ = SCM_EOL;
+}
+
+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);
+  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
+Paper_outputter::file () const
+{
+  return file_;
+}
+
+SCM
+Paper_outputter::dump_string (SCM scm)
+{
+  return scm_display (scm, file ());
+}
+
+SCM
+Paper_outputter::scheme_to_string (SCM scm)
+{
+  return scm_eval (scm, output_module_);
 }
 
 void
 Paper_outputter::output_scheme (SCM scm)
 {
-  gh_call2 (output_func_, scm, file_);
+  dump_string (scheme_to_string (scm));
 }
 
 void
-Paper_outputter::output_metadata (SCM scopes, Paper_def *paper)
+paper_outputter_dump (void *po, SCM x)
 {
-  SCM fields = SCM_EOL;
-  for (int i = dump_header_fieldnames_global.size (); i--; )
-    fields = gh_cons (ly_symbol2scm (dump_header_fieldnames_global[i].to_str0 ()),
-				     fields);
-  
-  output_scheme (scm_list_n (ly_symbol2scm ("output-scopes"),
-			     paper->self_scm (),
-			     scm_list_n (ly_symbol2scm ("quote"),
-					 scopes, SCM_UNDEFINED),
-			     scm_list_n (ly_symbol2scm ("quote"),
-					 fields, SCM_UNDEFINED),
-			     scm_makfrom0str (basename_.to_str0 ()), 
-			     SCM_UNDEFINED));
+  Paper_outputter *me = (Paper_outputter *) po;
+  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
-Paper_outputter::output_music_output_def (Music_output_def* odef)
+Paper_outputter::close ()
 {
-  output_scheme (scm_list_n (ly_symbol2scm ("output-paper-def"),
-			     odef->self_scm (), SCM_UNDEFINED));
+  if (scm_port_p (file_) == SCM_BOOL_T)
+    scm_close_port (file_);
 }