X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fpaper-outputter.hh;h=73daf148b4ea19c5736f1423fbe455ebc3e19b80;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=56defcc3b211408c523780f6d487880ed8eb1cd2;hpb=c380a7abde14a60ebd6d8a6eab91ae4e13677a23;p=lilypond.git

diff --git a/lily/include/paper-outputter.hh b/lily/include/paper-outputter.hh
index 56defcc3b2..73daf148b4 100644
--- a/lily/include/paper-outputter.hh
+++ b/lily/include/paper-outputter.hh
@@ -1,59 +1,56 @@
 /*
-  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--2002 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"
 
-/**
-   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).  */
-
-class Paper_outputter
+/*
+  Glue between the backend (grobs, systems, pages) and the output file.
+  proxy for Scheme backends.
+*/
+class Paper_outputter : public Smob<Paper_outputter>
 {
-  bool verbatim_scheme_b_;
-
-  
 public:
+  SCM mark_smob ();
+  virtual ~Paper_outputter ();
+private:
+  SCM output_module_;
+  string file_name_;
+  SCM file_;
 
-  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 (Scheme_hash_table*, 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);
-  void output_scheme (SCM scm);
-
-  void write_header_field_to_file (String filename, SCM, SCM);
-  void write_header_fields_to_file (Scheme_hash_table *);
+public:
+  Paper_outputter (SCM port, const string &format);
+
+  void close ();
+  SCM dump_string (SCM);
+  SCM file () const;
+  SCM module () const;
+  SCM output_scheme (SCM scm);
+  void output_stencil (Stencil);
+  SCM scheme_to_string (SCM);
 };
 
-#endif // PAPER_OUTPUTTER_HH
+
+#endif /* PAPER_OUTPUTTER_HH */