Run `make grand-replace'.

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

diff --git a/lily/include/paper-outputter.hh b/lily/include/paper-outputter.hh
index fc6a20b7124d72f8e1ecbb36ae2f6ee08779abfb..03c8879a99369e970400387e1775328ca7787d21 100644 (file)
--- a/lily/include/paper-outputter.hh
+++ b/lily/include/paper-outputter.hh
@@ -3,18 +3,17 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 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"
 
 /*
   Glue between the backend (grobs, systems, pages) and the output file.
@@ -23,24 +22,23 @@
 class Paper_outputter
 {
   SCM output_module_;
-  String filename_;
+  string file_name_;
   SCM file_;
 
-  SCM file ();
-
 public:
-  DECLARE_SMOBS (Paper_outputter,);
+  DECLARE_SMOBS (Paper_outputter);
 
 public:
+  SCM file () const;
   SCM dump_string (SCM);
   void output_scheme (SCM scm);
-  Paper_outputter (String nm, String format);
+  Paper_outputter (SCM port, string format);
   SCM scheme_to_string (SCM);
   void output_stencil (Stencil);
-  void close();
+  void close ();
 };
 
-Paper_outputter *get_paper_outputter (String, String);
+Paper_outputter *get_paper_outputter (string, string);
 DECLARE_UNSMOB (Paper_outputter, outputter);
 
 #endif /* PAPER_OUTPUTTER_HH */