X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fpaper-outputter.hh;h=cd1a5e2c92fb4ffb34a0581f85398750c1276d28;hb=a8ac8a0a1d26f9555efb87a0d8328c14db48c48b;hp=95b8fc038abc5153be9eb73c6de1e49fd7fc8e83;hpb=5d1ddaf889233f8e5c32a118f9e843e1becca2d2;p=lilypond.git

diff --git a/lily/include/paper-outputter.hh b/lily/include/paper-outputter.hh
index 95b8fc038a..cd1a5e2c92 100644
--- a/lily/include/paper-outputter.hh
+++ b/lily/include/paper-outputter.hh
@@ -1,18 +1,28 @@
 /*
-  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--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2005 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 "std-vector.hh"
+#include "std-string.hh"
 #include "protected-scm.hh"
 #include "smobs.hh"
 
@@ -20,27 +30,27 @@
   Glue between the backend (grobs, systems, pages) and the output file.
   proxy for Scheme backends.
 */
-class Paper_outputter
+class Paper_outputter : public Smob<Paper_outputter>
 {
+public:
+  SCM mark_smob () const;
+  virtual ~Paper_outputter ();
+private:
   SCM output_module_;
-  String file_name_;
+  string file_name_;
   SCM file_;
 
-
 public:
-  DECLARE_SMOBS (Paper_outputter, );
+  Paper_outputter (SCM port, const string &format);
 
-public:
-  SCM file ();
+  void close ();
   SCM dump_string (SCM);
-  void output_scheme (SCM scm);
-  Paper_outputter (String nm, String format);
-  SCM scheme_to_string (SCM);
+  SCM file () const;
+  SCM module () const;
+  SCM output_scheme (SCM scm);
   void output_stencil (Stencil);
-  void close();
+  SCM scheme_to_string (SCM);
 };
 
-Paper_outputter *get_paper_outputter (String, String);
-DECLARE_UNSMOB (Paper_outputter, outputter);
 
 #endif /* PAPER_OUTPUTTER_HH */