2003 -> 2004

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

diff --git a/lily/include/paper-outputter.hh b/lily/include/paper-outputter.hh
index 8758535ea8c8fce05ecc676f27d35c249e4bcc15..0f8ef616f6451e438e78827fa3d8dc6382310c21 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--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -17,22 +17,23 @@
 #include "protected-scm.hh"
 
 /**
-  Abstract interface for a Score_element to output itself.
- */
+   Interface for a Grob to output itself; The Paper_score contains a
+   pointer to a Paper_outputter, and this enables every grob to output
+   itself.
+
+   The Paper_outputter contains a reference to an output stream
+ (Paper_stream).  */
+
 class Paper_outputter
 {
-#if 0
-  Protected_scm molecules_;
-  SCM last_cons_;
-#endif
-  
   bool verbatim_scheme_b_;
-  Paper_stream * stream_p_;
 public:
-  /**
-     Assumes responsibility for deletion of P
-   */
-  Paper_outputter (Paper_stream*p);
+
+  SCM output_func_ ;
+  Protected_scm file_;
+  
+  String basename_;
+  Paper_outputter (String nm);
   ~Paper_outputter ();
   
   void dump_scheme (SCM);
@@ -40,13 +41,17 @@ public:
   void output_int_def (String k, int v);
   void output_Real_def (String k, Real v);
   void output_String_def (String k, String v);
-  void output_scope (Scope*, String prefix);
+  void output_scope (SCM, String prefix);
   void output_version ();
   void output_font_def (int i, String str);
   void output_font_switch (int i);
   void output_header ();
   void output_comment (String s);
+  void output_string (SCM s);
   void output_scheme (SCM scm);
+
+  void write_header_field_to_file (String filename, SCM, SCM);
+  void write_header_fields_to_file (SCM);
 };
 
 #endif // PAPER_OUTPUTTER_HH