X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-outputter.cc;h=471a36a41a4572eb1941eb83ad4a27b244cb3c26;hb=905109ea0e90efa8d9c1ba02769e458a0707cc47;hp=74cd96acc5ef763f00b2d6cf154006c188c9dedb;hpb=baf32731650d510882eeb52d02f4ca0c816c7c29;p=lilypond.git diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index 74cd96acc5..471a36a41a 100644 --- a/lily/paper-outputter.cc +++ b/lily/paper-outputter.cc @@ -1,192 +1,133 @@ /* - 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--2002 Han-Wen Nienhuys + Copyright (C) 1997--2015 Han-Wen Nienhuys Jan Nieuwenhuizen + + 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 . */ -#include -#include +#include "paper-outputter.hh" + +#include +#include + +using namespace std; #include "dimensions.hh" -#include "virtual-methods.hh" -#include "paper-outputter.hh" -#include "molecule.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 "file-results.hh" +#include "string-convert.hh" +#include "warn.hh" +#include "lily-imports.hh" -/* - Ugh, this is messy. - */ -Paper_outputter::Paper_outputter (String name) -{ - if (safe_global_b) - { - gh_define ("security-paranoia", SCM_BOOL_T); - } - - file_ = scm_open_file (scm_makfrom0str (name.to_str0 ()), - scm_makfrom0str ("w")); - - SCM exp = scm_list_n (ly_symbol2scm ("find-dumper"), - scm_makfrom0str (output_format_global.to_str0 ()), - SCM_UNDEFINED); - - output_func_ = scm_primitive_eval (exp); -} +const char * const Paper_outputter::type_p_name_ = 0; -Paper_outputter::~Paper_outputter () +Paper_outputter::Paper_outputter (SCM port, const string &format) { - -} + file_ = port; + output_module_ = SCM_EOL; + smobify_self (); + string module_name = "scm output-" + format; + output_module_ = scm_c_resolve_module (module_name.c_str ()); -void -Paper_outputter::output_header () -{ - String generate = _ (", at "); - time_t t (time (0)); - generate += ctime (&t); - generate = generate.left_string (generate.length () - 1); - /* - Make fixed length time stamps - */ - generate = generate + to_string (' ' * (120 - generate.length ())>? 0) ; - String creator = "lelie"; - - SCM args_scm = scm_list_n (scm_makfrom0str (creator.to_str0 ()), - scm_makfrom0str (generate.to_str0 ()), SCM_UNDEFINED); - - - SCM scm = gh_cons (ly_symbol2scm ("header"), args_scm); - - output_scheme (scm); + Enable errors for undefined stencil routines if + -dwarning-as-error is specified; else enable warnings. + */ + Lily::backend_testing (output_module_); } +Paper_outputter::~Paper_outputter () +{ +} -void -Paper_outputter::output_comment (String str) +SCM +Paper_outputter::mark_smob () const { - output_scheme (scm_list_n (ly_symbol2scm ("comment"), - scm_makfrom0str ((char*)str.to_str0 ()), - SCM_UNDEFINED) - ); + scm_gc_mark (output_module_); + return file_; } -void -Paper_outputter::output_scheme (SCM scm) +SCM +Paper_outputter::file () const { - gh_call2 (output_func_, scm, file_); + return file_; } -void -Paper_outputter::output_scope (Scheme_hash_table *scope, String prefix) +SCM +Paper_outputter::dump_string (SCM scm) { - SCM al = scope->to_alist (); - for (SCM s = al ; gh_pair_p (s); s = ly_cdr (s)) - { - SCM k = ly_caar (s); - SCM v = ly_cdar (s); - String s = ly_symbol2string (k); - - if (gh_string_p (v)) - { - output_String_def (prefix + s, ly_scm2string (v)); - } - else if (scm_exact_p (v) == SCM_BOOL_T) - { - output_int_def (prefix + s, gh_scm2int (v)); - } - else if (gh_number_p (v)) - { - output_Real_def (prefix + s, gh_scm2double (v)); - } - } + return scm_display (scm, file ()); } -void -Paper_outputter::output_version () +SCM +Paper_outputter::scheme_to_string (SCM scm) { - String id_string = "Lily was here"; - id_string += String_convert::pad_to (String (", ") + version_string (), 40); - - output_String_def ("lilypondtagline", id_string); - output_String_def ("LilyPondVersion", version_string ()); - output_String_def ("lilypondpaperunit", String (INTERNAL_UNIT)); + return scm_eval (scm, output_module_); } - -void -Paper_outputter::output_Real_def (String k, Real v) +SCM +Paper_outputter::module () const { - - SCM scm = scm_list_n (ly_symbol2scm ("lily-def"), - scm_makfrom0str (k.get_str0 ()), - scm_makfrom0str (to_string (v).get_str0 ()), - SCM_UNDEFINED); - output_scheme (scm); + return output_module_; } -void -Paper_outputter::output_String_def (String k, String v) +SCM +Paper_outputter::output_scheme (SCM scm) { - - SCM scm = scm_list_n (ly_symbol2scm ("lily-def"), - scm_makfrom0str (k.get_str0 ()), - scm_makfrom0str (v.get_str0 ()), - SCM_UNDEFINED); - output_scheme (scm); + SCM str = scheme_to_string (scm); + if (scm_is_string (str)) + dump_string (str); + return str; } -void -Paper_outputter::output_int_def (String k, int v) +SCM +paper_outputter_dump (void *po, SCM x) { - SCM scm = scm_list_n (ly_symbol2scm ("lily-def"), - scm_makfrom0str (k.get_str0 ()), - scm_makfrom0str (to_string (v).get_str0 ()), - SCM_UNDEFINED); - output_scheme (scm); + Paper_outputter *me = (Paper_outputter *) po; + return me->output_scheme (x); } void -Paper_outputter::write_header_field_to_file (String filename, SCM key, SCM value) +Paper_outputter::output_stencil (Stencil stil) { - output_scheme (scm_list_n (ly_symbol2scm ("header-to-file"), - scm_makfrom0str (filename.to_str0 ()), - ly_quote_scm (key), value, - SCM_UNDEFINED)); + interpret_stencil_expression (stil.expr (), paper_outputter_dump, + (void *) this, Offset (0, 0)); } void -Paper_outputter::write_header_fields_to_file (Scheme_hash_table * header) +Paper_outputter::close () { - if (dump_header_fieldnames_global.size ()) + if (ly_is_port (file_)) { - SCM fields = header->to_alist (); - for (int i = 0; i < dump_header_fieldnames_global.size (); i++) - { - String key = dump_header_fieldnames_global[i]; - SCM val = gh_assoc (ly_symbol2scm (key.to_str0 ()), fields); - String s; - /* Only write header field to file if it exists */ - if (gh_pair_p (val)) - { - s = ly_scm2string (ly_cdr (val)); - /* Always write header field file, even if string is empty ... */ - write_header_field_to_file (basename_ , ly_car (val), ly_cdr (val)); - } - } + 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_); } }