X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-outputter.cc;h=a72ea59ccdef770d8f70c32f942a42ee4fe8a6d9;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=252f98cc5642ba70fef9d29fbda437c746ed45f0;hpb=e24df7c27635dc996c466295eacf2981bddccaf7;p=lilypond.git

diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index 252f98cc56..a72ea59ccd 100644
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -1,21 +1,34 @@
 /*
-  paper-outputter.cc -- implement 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>
+  Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-                 Jan Nieuwenhuizen <janneke@gnu.org>
+  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/>.
 */
 
 #include "paper-outputter.hh"
 
-#include <math.h>
+#include <cmath>
 #include <ctime>
 
+using namespace std;
+
 #include "dimensions.hh"
 #include "file-name.hh"
 #include "font-metric.hh"
-#include "input-smob.hh"
+#include "input.hh"
 #include "lily-version.hh"
 #include "main.hh"
 #include "output-def.hh"
@@ -24,18 +37,23 @@
 #include "scm-hash.hh"
 #include "string-convert.hh"
 #include "warn.hh"
+#include "lily-imports.hh"
 
-#include "ly-smobs.icc"
 
-Paper_outputter::Paper_outputter (String file_name, String format)
+Paper_outputter::Paper_outputter (SCM port, const string &format)
 {
-  file_ = SCM_EOL;
+  file_ = port;
   output_module_ = SCM_EOL;
   smobify_self ();
-  
-  file_name_ = file_name;
-  String module_name = "scm output-" + format;
-  output_module_ = scm_c_resolve_module (module_name.to_str0 ());
+
+  string module_name = "scm output-" + format;
+  output_module_ = scm_c_resolve_module (module_name.c_str ());
+
+  /*
+    Enable errors for undefined stencil routines if
+     -dwarning-as-error is specified; else enable warnings.
+  */
+  Lily::backend_testing (output_module_);
 }
 
 Paper_outputter::~Paper_outputter ()
@@ -43,34 +61,16 @@ Paper_outputter::~Paper_outputter ()
 }
 
 
-IMPLEMENT_SMOBS (Paper_outputter);
-IMPLEMENT_DEFAULT_EQUAL_P (Paper_outputter);
-
 SCM
-Paper_outputter::mark_smob (SCM x)
-{
-  Paper_outputter *p = (Paper_outputter*) SCM_CELL_WORD_1(x);
-  scm_gc_mark (p->output_module_);
-  return p->file_;
-}
-
-int
-Paper_outputter::print_smob (SCM x, SCM p, scm_print_state*)
+Paper_outputter::mark_smob () const
 {
-  (void) x;
-  scm_puts ("#<Paper_outputter>", p);
-  return 1;
+  scm_gc_mark (output_module_);
+  return file_;
 }
 
 SCM
-Paper_outputter::file ()
+Paper_outputter::file () const
 {
-  if (file_ == SCM_EOL)
-    if (file_name_ == "-")
-      file_ = scm_current_output_port();
-    else
-      file_ = scm_open_file (scm_makfrom0str (file_name_.to_str0 ()),
-			     scm_makfrom0str ("w"));
   return file_;
 }
 
@@ -86,29 +86,46 @@ Paper_outputter::scheme_to_string (SCM scm)
   return scm_eval (scm, output_module_);
 }
 
-void
+SCM
+Paper_outputter::module () const
+{
+  return output_module_;
+}
+
+SCM
 Paper_outputter::output_scheme (SCM scm)
 {
-  dump_string (scheme_to_string (scm));
+  SCM str = scheme_to_string (scm);
+  if (scm_is_string (str))
+    dump_string (str);
+  return str;
 }
 
-void
+SCM
 paper_outputter_dump (void *po, SCM x)
 {
-  Paper_outputter *me = (Paper_outputter*) po;
-  me->output_scheme (x);
+  Paper_outputter *me = (Paper_outputter *) po;
+  return me->output_scheme (x);
 }
 
 void
 Paper_outputter::output_stencil (Stencil stil)
 {
   interpret_stencil_expression (stil.expr (), paper_outputter_dump,
-                                (void*) this, Offset (0,0));
+                                (void *) this, Offset (0, 0));
 }
 
 void
 Paper_outputter::close ()
 {
-  if (scm_port_p (file_) == SCM_BOOL_T)
-    scm_close_port (file_);
+  if (ly_is_port (file_))
+    {
+      scm_close_port (file_);
+      /*
+        Remove the "warning" definitions for missing stencil
+        expressions so that we start fresh with the next \book
+        block.  --pmccarty
+      */
+      Lily::remove_stencil_warnings (output_module_);
+    }
 }