use SCM module in stead of

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

diff --git a/lily/include/paper-outputter.hh b/lily/include/paper-outputter.hh
index a4149faa92568aca13723d1989b8a8529b3365d5..c36b38a53d5b3f118add57108b035fd92ef47a42 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--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -22,13 +22,18 @@
    itself.
 
    The Paper_outputter contains a reference to an output stream
-   (Paper_stream).  */
+ (Paper_stream).  */
 
 class Paper_outputter
 {
   bool verbatim_scheme_b_;
-  Paper_stream * stream_p_;
+
+  
 public:
+
+  SCM output_func_ ;
+  Protected_scm file_;
+  
   String basename_;
   Paper_outputter (String nm);
   ~Paper_outputter ();
@@ -38,7 +43,7 @@ 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);
@@ -47,8 +52,8 @@ public:
   void output_string (SCM s);
   void output_scheme (SCM scm);
 
-  static void write_header_field_to_file (String filename, String key, String value);
-  void write_header_fields_to_file (Scope *);
+  void write_header_field_to_file (String filename, SCM, SCM);
+  void write_header_fields_to_file (SCM);
 };
 
 #endif // PAPER_OUTPUTTER_HH