Imported Upstream version 2.16.0

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

diff --git a/lily/include/paper-outputter.hh b/lily/include/paper-outputter.hh
index a45d3313e8cb8c62733ff965e56a23d61360f69f..1ac0a74dfde8ee538e003305c4197458db1a3837 100644 (file)
--- a/lily/include/paper-outputter.hh
+++ b/lily/include/paper-outputter.hh
@@ -1,16 +1,27 @@
 /*
-  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--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.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 "std-vector.hh"
 #include "std-string.hh"
 #include "protected-scm.hh"
 #include "smobs.hh"
@@ -22,23 +33,25 @@
 class Paper_outputter
 {
   SCM output_module_;
-  std::string file_name_;
+  string file_name_;
   SCM file_;
 
 public:
-  DECLARE_SMOBS (Paper_outputter,);
+  DECLARE_SMOBS (Paper_outputter);
 
 public:
-  SCM file () const;
+  Paper_outputter (SCM port, string format);
+
+  void close ();
   SCM dump_string (SCM);
+  SCM file () const;
+  SCM module () const;
   void output_scheme (SCM scm);
-  Paper_outputter (SCM port, std::string format);
-  SCM scheme_to_string (SCM);
   void output_stencil (Stencil);
-  void close ();
+  SCM scheme_to_string (SCM);
 };
 
-Paper_outputter *get_paper_outputter (std::string, std::string);
+Paper_outputter *get_paper_outputter (string, string);
 DECLARE_UNSMOB (Paper_outputter, outputter);
 
 #endif /* PAPER_OUTPUTTER_HH */