Python thinkos

[lilypond.git] / lily / paper-outputter.cc

diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index 17231564b8555774d6be312d1e4c7d67af9a639d..e7e48c2fb3c0c9ae03b34269567817027e4d3bd8 100644 (file)
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -3,50 +3,106 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "paper-outputter.hh"
-#include "paper-stream.hh"
-#include "paper-def.hh"
-#include "molecule.hh"
-#include "atom.hh"
-#include "array.hh"
-#include "string-convert.hh"
-#include "debug.hh"
-#include "lookup.hh"
+
+#include <cmath>
+#include <ctime>
+
+using namespace std;
+
+#include "dimensions.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 "string-convert.hh"
+#include "warn.hh"
 
-Paper_outputter::Paper_outputter (Paper_stream *s)
+#include "ly-smobs.icc"
+
+Paper_outputter::Paper_outputter (SCM port, string format)
 {
-  outstream_l_ = s;
+  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 ()
 {
 }
 
+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*)
+{
+  (void) x;
+  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)
+{
+  dump_string (scheme_to_string (scm));
+}
+
 void
-Paper_outputter::output_molecule (Molecule const*m, Offset o, char const *nm, String s)
-{
-  if (check_debug)
-    *outstream_l_ << String ("\n%start: ") << nm << "\n";
-
-  for (PCursor <Atom*> i (m->atoms_); i.ok (); i++)
-    {
-      Offset a_off = i->offset ();
-      a_off += o;
-
-      switch_to_font (i->font_);
-
-      Array<String> a;
-      String r;
-  
-      a.push (global_paper_l->dimension_str (a_off.y()));
-      a.push (global_paper_l->dimension_str (a_off.x()));
-      a.push (i->str_);
-      r += global_lookup_l->substitute_args (s, a);
-      *outstream_l_ << r;
-    }
+paper_outputter_dump (void *po, SCM x)
+{
+  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::close ()
+{
+  if (scm_port_p (file_) == SCM_BOOL_T)
+    scm_close_port (file_);
 }