X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fpaper-outputter.hh;h=f1ff1a2131db81465c064b489d8b157bbb59c99b;hb=a65798c5638c4d0a3b323e3e3012a754efe6984b;hp=2c1aeb2ed986f20c51bc7b5d7587962ade37b671;hpb=ffbaef8018d42f1636c9cd47885fbc187a08f3a8;p=lilypond.git

diff --git a/lily/include/paper-outputter.hh b/lily/include/paper-outputter.hh
index 2c1aeb2ed9..f1ff1a2131 100644
--- a/lily/include/paper-outputter.hh
+++ b/lily/include/paper-outputter.hh
@@ -1,20 +1,30 @@
 /*
-  paper-outputter.hh -- declare Paper_outputter
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-*/
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
 
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #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 +33,23 @@
 class Paper_outputter
 {
   SCM output_module_;
-  String file_name_;
+  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 */