X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fpaper-outputter.hh;h=44c8b1bf57019a28ef58cf522e96248e299146b1;hb=a276a19dc6bd57832db3107f2f2cbb04cb4677b6;hp=bccde18b7fc8f692b6393f29288285531ebc9525;hpb=d9b43b93f2c885409bafdb157138158f65cc49aa;p=lilypond.git

diff --git a/lily/include/paper-outputter.hh b/lily/include/paper-outputter.hh
index bccde18b7f..44c8b1bf57 100644
--- a/lily/include/paper-outputter.hh
+++ b/lily/include/paper-outputter.hh
@@ -3,57 +3,42 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
 #ifndef PAPER_OUTPUTTER_HH
 #define PAPER_OUTPUTTER_HH
 
 #include "lily-proto.hh"
-#include "array.hh"
-#include "string.hh"
-#include "lily-guile.hh"
+#include "std-vector.hh"
+#include "std-string.hh"
 #include "protected-scm.hh"
+#include "smobs.hh"
 
-/**
-   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).  */
-
+/*
+  Glue between the backend (grobs, systems, pages) and the output file.
+  proxy for Scheme backends.
+*/
 class Paper_outputter
 {
-  bool verbatim_scheme_b_;
+  SCM output_module_;
+  string file_name_;
+  SCM file_;
 
-  
 public:
+  DECLARE_SMOBS (Paper_outputter);
 
-  SCM output_func_ ;
-  Protected_scm file_;
-  
-  String basename_;
-  Paper_outputter (String nm);
-  ~Paper_outputter ();
-  
-  void dump_scheme (SCM);
-
-  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_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);
+public:
+  SCM file () const;
+  SCM dump_string (SCM);
   void output_scheme (SCM scm);
-
-  void write_header_field_to_file (String filename, SCM, SCM);
-  void write_header_fields_to_file (Scope *);
+  Paper_outputter (SCM port, string format);
+  SCM scheme_to_string (SCM);
+  void output_stencil (Stencil);
+  void close ();
 };
 
-#endif // PAPER_OUTPUTTER_HH
+Paper_outputter *get_paper_outputter (string, string);
+DECLARE_UNSMOB (Paper_outputter, outputter);
+
+#endif /* PAPER_OUTPUTTER_HH */