release: 1.3.56

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

diff --git a/lily/include/paper-outputter.hh b/lily/include/paper-outputter.hh
index 1b62555d0379d9838e84a308b3667976f0416940..8758535ea8c8fce05ecc676f27d35c249e4bcc15 100644 (file)
--- a/lily/include/paper-outputter.hh
+++ b/lily/include/paper-outputter.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -14,15 +14,28 @@
 #include "array.hh"
 #include "string.hh"
 #include "lily-guile.hh"
+#include "protected-scm.hh"
 
 /**
   Abstract interface for a Score_element to output itself.
  */
 class Paper_outputter
 {
+#if 0
+  Protected_scm molecules_;
+  SCM last_cons_;
+#endif
+  
+  bool verbatim_scheme_b_;
+  Paper_stream * stream_p_;
 public:
-  Paper_outputter (Paper_stream *);
+  /**
+     Assumes responsibility for deletion of P
+   */
+  Paper_outputter (Paper_stream*p);
   ~Paper_outputter ();
+  
+  void dump_scheme (SCM);
 
   void output_int_def (String k, int v);
   void output_Real_def (String k, Real v);
@@ -32,14 +45,8 @@ public:
   void output_font_def (int i, String str);
   void output_font_switch (int i);
   void output_header ();
-  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 switch_to_font (String fontname);
-
-  Paper_stream* outstream_l_;
 };
 
 #endif // PAPER_OUTPUTTER_HH