Imported Upstream version 2.14.2

[lilypond.git] / lily / paper-outputter.cc

diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index 5e64c895b521753e820d104eb0f08b92e2d54531..e08cbd6590ea870c2e357b16943490a45f5fa25f 100644 (file)
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -1,84 +1,142 @@
 /*
-  paper-outputter.cc -- implement Paper_outputter
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
-
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.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 <time.h>
-#include <math.h>
+#include "paper-outputter.hh"
+
+#include <cmath>
+#include <ctime>
+
+using namespace std;
 
 #include "dimensions.hh"
-#include "virtual-methods.hh"
-#include "paper-outputter.hh"
-#include "stencil.hh"
-#include "array.hh"
-#include "string-convert.hh"
-#include "warn.hh"
+#include "file-name.hh"
 #include "font-metric.hh"
+#include "input.hh"
+#include "lily-version.hh"
 #include "main.hh"
+#include "output-def.hh"
+#include "paper-book.hh"
+#include "paper-system.hh"
 #include "scm-hash.hh"
-#include "lily-version.hh"
-#include "paper-def.hh"
-#include "input-file-results.hh"
-#include "ly-modules.hh"
+#include "string-convert.hh"
+#include "warn.hh"
 
+#include "ly-smobs.icc"
 
-Paper_outputter::Paper_outputter (String name)
+Paper_outputter::Paper_outputter (SCM port, string format)
 {
-  if (safe_global_b)
-    {
-      gh_define ("security-paranoia", SCM_BOOL_T);      
-    }
-  
-  file_ = scm_open_file (scm_makfrom0str (name.to_str0 ()),
-                           scm_makfrom0str ("w"));
+  file_ = port;
+  output_module_ = SCM_EOL;
+  smobify_self ();
 
-  static SCM find_dumper;
-  if (!find_dumper)
-    find_dumper = scm_c_eval_string ("find-dumper");
+  string module_name = "scm output-" + format;
+  output_module_ = scm_c_resolve_module (module_name.c_str ());
 
-  
-  output_func_ = scm_call_1 (find_dumper,scm_makfrom0str (output_format_global.to_str0 ()));
-  output_scheme (gh_cons (ly_symbol2scm ("top-of-file"), SCM_EOL));
+  /*
+    Enable errors for undefined stencil routines if
+     -dwarning-as-error is specified; else enable warnings.
+  */
+  SCM proc = ly_lily_module_constant ("backend-testing");
+  scm_call_1 (proc, output_module_);
 }
 
 Paper_outputter::~Paper_outputter ()
 {
-  scm_close_port (file_);
-  file_ = SCM_EOL;
+}
+
+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 *)
+{
+  scm_puts ("#<Paper_outputter>", p);
+  return 1;
+}
+
+SCM
+Paper_outputter::file () const
+{
+  return file_;
+}
+
+SCM
+Paper_outputter::dump_string (SCM scm)
+{
+  return scm_display (scm, file ());
+}
+
+SCM
+Paper_outputter::scheme_to_string (SCM scm)
+{
+  return scm_eval (scm, output_module_);
+}
+
+SCM
+Paper_outputter::module () const
+{
+  return output_module_;
 }
 
 void
 Paper_outputter::output_scheme (SCM scm)
 {
-  gh_call2 (output_func_, scm, file_);
+  dump_string (scheme_to_string (scm));
 }
 
 void
-Paper_outputter::output_metadata (SCM scopes, Paper_def *paper)
+paper_outputter_dump (void *po, SCM x)
 {
-  SCM fields = SCM_EOL;
-  for (int i = dump_header_fieldnames_global.size (); i--;)
-    fields = gh_cons (ly_symbol2scm (dump_header_fieldnames_global[i].to_str0 ()),
-                                    fields);
-  
-  output_scheme (scm_list_n (ly_symbol2scm ("output-scopes"),
-                            paper->self_scm (),
-                            scm_list_n (ly_symbol2scm ("quote"),
-                                        scopes, SCM_UNDEFINED),
-                            scm_list_n (ly_symbol2scm ("quote"),
-                                        fields, SCM_UNDEFINED),
-                            scm_makfrom0str (basename_.to_str0 ()), 
-                            SCM_UNDEFINED));
+  Paper_outputter *me = (Paper_outputter *) po;
+  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
-Paper_outputter::output_music_output_def (Music_output_def* odef)
+Paper_outputter::close ()
 {
-  output_scheme (scm_list_n (ly_symbol2scm ("output-paper-def"),
-                            odef->self_scm (), SCM_UNDEFINED));
+  if (scm_port_p (file_) == SCM_BOOL_T)
+    {
+      scm_close_port (file_);
+      /*
+       Remove the "warning" definitions for missing stencil
+       expressions so that we start fresh with the next \book
+       block.  --pmccarty
+      */
+      SCM proc = ly_lily_module_constant ("remove-stencil-warnings");
+      scm_call_1 (proc, output_module_);
+    }
 }