release: 1.3.6

[lilypond.git] / lily / include / paper-outputter.hh

diff --git a/lily/include/paper-outputter.hh b/lily/include/paper-outputter.hh
index f5c103d0a7da23a2cc5f51444bb54578690c2a63..5a17fb60f9ce37a9d08154dc12c9471a5c130c9d 100644 (file)
--- a/lily/include/paper-outputter.hh
+++ b/lily/include/paper-outputter.hh
@@ -14,6 +14,7 @@
 #include "array.hh"
 #include "string.hh"
 #include "lily-guile.hh"
+#include "protected-scm.hh"
 
 #ifdef __powerpc__
 #include "protected-scm.hh"
@@ -25,8 +26,12 @@
 class Paper_outputter
 {
 public:
-  Paper_outputter (Paper_stream *);
-  ~Paper_outputter ();
+  Protected_scm molecules_;
+  SCM last_cons_;
+  Paper_outputter ();
+
+  void dump_onto (Paper_stream *);
+
 
   void output_int_def (String k, int v);
   void output_Real_def (String k, Real v);
@@ -39,12 +44,10 @@ public:
   void output_molecule (Molecule const *, Offset, char const *);
   void output_comment (String s);
   void output_scheme (SCM scm);
+
   void start_line (Real height);
   void stop_line ();
   void stop_last_line ();
-  void switch_to_font (String fontname);
-
-  Paper_stream* outstream_l_;
 };
 
 #endif // PAPER_OUTPUTTER_HH