X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-outputter.cc;h=33657d60cb6f844cb50bbc505a63021d23cb5365;hb=d544bd3103acc8175089ec6aeecd57376f2d201d;hp=5d383c9f34d5cdd2af858abf594803aa55360001;hpb=347426c0c9d2fb8e4e75216f717606f1f2124b1a;p=lilypond.git diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index 5d383c9f34..33657d60cb 100644 --- a/lily/paper-outputter.cc +++ b/lily/paper-outputter.cc @@ -1,276 +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--2000 Han-Wen Nienhuys + Copyright (C) 1997--2011 Han-Wen Nienhuys Jan Nieuwenhuizen -*/ -#include -#include -#include -#include - -#include "dimensions.hh" -#include "virtual-methods.hh" -#include "paper-outputter.hh" -#include "paper-stream.hh" -#include "molecule.hh" -#include "array.hh" -#include "string-convert.hh" -#include "debug.hh" -#include "font-metric.hh" -#include "main.hh" -#include "scope.hh" -#include "identifier.hh" -#include "lily-version.hh" -#include "paper-def.hh" -#include "file-results.hh" + 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. -/* - Ugh, this is messy. - */ + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . +*/ -Paper_outputter::Paper_outputter (Paper_stream * ps ) -{ - /* - lilypond -f scm x.ly - guile -s x.scm - */ - verbatim_scheme_b_ = output_global_ch == String ("scm"); +#include "paper-outputter.hh" - if (verbatim_scheme_b_) - { - *ps << "" - ";;; Usage: guile -s x.scm > x.tex\n" - "(primitive-load-path 'standalone.scm)\n" - ";(scm-tex-output)\n" - "(scm-ps-output)\n" - "(map (lambda (x) (display (ly-eval x))) '(\n" - ; - } +#include +#include - stream_p_ = ps; -} +using namespace std; -Paper_outputter::~Paper_outputter () -{ - if (verbatim_scheme_b_) - { - *stream_p_ << "))"; - } - delete stream_p_; -} +#include "dimensions.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 "string-convert.hh" +#include "warn.hh" +#include "ly-smobs.icc" -void -Paper_outputter::output_header () +Paper_outputter::Paper_outputter (SCM port, string format) { - if (safe_global_b) - { - gh_define ("security-paranoia", SCM_BOOL_T); - } - - SCM exp = gh_list (ly_symbol2scm ((String (output_global_ch) + "-scm").ch_C()), - ly_quote_scm (ly_symbol2scm ("all-definitions")), - SCM_UNDEFINED); - exp = scm_eval2 (exp, SCM_EOL); - scm_eval2 (exp, SCM_EOL); - - String creator; - if (no_timestamps_global_b) - creator = gnu_lilypond_str (); - else - creator = gnu_lilypond_version_str (); - - String generate; - if (no_timestamps_global_b) - generate = "."; - else - { - generate = _ (", at "); - time_t t (time (0)); - generate += ctime (&t); - generate = generate.left_str (generate.length_i () - 1); - } - - SCM args_scm = - gh_list (ly_str02scm (creator.ch_l ()), - ly_str02scm (generate.ch_l ()), SCM_UNDEFINED); + file_ = port; + output_module_ = SCM_EOL; + smobify_self (); + string module_name = "scm output-" + format; + output_module_ = scm_c_resolve_module (module_name.c_str ()); - 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. + */ + SCM proc = ly_lily_module_constant ("backend-testing"); + scm_call_1 (proc, output_module_); } - - -void -Paper_outputter::output_comment (String str) +Paper_outputter::~Paper_outputter () { - output_scheme (gh_list (ly_symbol2scm ("comment"), - ly_str02scm ((char*)str.ch_C()), - SCM_UNDEFINED) - ); } +IMPLEMENT_SMOBS (Paper_outputter); +IMPLEMENT_DEFAULT_EQUAL_P (Paper_outputter); -void -Paper_outputter::output_scheme (SCM scm) +SCM +Paper_outputter::mark_smob (SCM x) { - /* - we don't rename dump_scheme, because we might in the future want - to remember Scheme. We don't now, because it sucks up a lot of memory. - */ - dump_scheme (scm); + Paper_outputter *p = (Paper_outputter *) SCM_CELL_WORD_1 (x); + scm_gc_mark (p->output_module_); + return p->file_; } - -/* - UGH. - - Should probably change interface to do less eval ( symbol ), and more - apply (procedure, args) - */ -void -Paper_outputter::dump_scheme (SCM s) +int +Paper_outputter::print_smob (SCM /* x */, + SCM p, + scm_print_state *) { - if (verbatim_scheme_b_) - { - *stream_p_ << ly_scm2string (ly_write2scm (s)); - } - else - { - SCM result = scm_eval2 (s, SCM_EOL); - char *c=gh_scm2newstr (result, NULL); - - *stream_p_ << c; - free (c); - } + scm_puts ("#", p); + return 1; } -void -Paper_outputter::output_scope (Scope *scope, String prefix) +SCM +Paper_outputter::file () const { - SCM al = scope->to_alist (); - for (SCM s = al ; gh_pair_p (s); s = gh_cdr (s)) - { - SCM k = gh_caar (s); - SCM v = gh_cdar (s); - String s = ly_symbol2string (k); - - - if (gh_string_p (v)) - { - output_String_def (prefix + s, ly_scm2string (v)); - } - else if (scm_integer_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 file_; } -void -Paper_outputter::output_version () +SCM +Paper_outputter::dump_string (SCM scm) { - String id_str = "Lily was here"; - if (no_timestamps_global_b) - id_str += "."; - else - id_str += String (", ") + version_str (); - - output_String_def ( "lilypondtagline", id_str); - output_String_def ( "LilyPondVersion", version_str ()); + return scm_display (scm, file ()); } - - - -void -Paper_outputter::output_Real_def (String k, Real v) +SCM +Paper_outputter::scheme_to_string (SCM scm) { - - SCM scm = gh_list (ly_symbol2scm ("lily-def"), - ly_str02scm (k.ch_l ()), - ly_str02scm (to_str(v).ch_l ()), - SCM_UNDEFINED); - output_scheme (scm); + return scm_eval (scm, output_module_); } -void -Paper_outputter::output_String_def (String k, String v) +SCM +Paper_outputter::module () const { - - SCM scm = gh_list (ly_symbol2scm ("lily-def"), - ly_str02scm (k.ch_l ()), - ly_str02scm (v.ch_l ()), - SCM_UNDEFINED); - output_scheme (scm); + return output_module_; } void -Paper_outputter::output_int_def (String k, int v) +Paper_outputter::output_scheme (SCM scm) { - SCM scm = gh_list (ly_symbol2scm ("lily-def"), - ly_str02scm (k.ch_l ()), - ly_str02scm (to_str (v).ch_l ()), - SCM_UNDEFINED); - output_scheme (scm); + dump_string (scheme_to_string (scm)); } void -Paper_outputter::output_string (SCM str) +paper_outputter_dump (void *po, SCM x) { - *stream_p_ << ly_scm2string (str); + Paper_outputter *me = (Paper_outputter *) po; + me->output_scheme (x); } void -Paper_outputter::output_score_header_field (String filename, String key, String value) +Paper_outputter::output_stencil (Stencil stil) { - if (filename != "-") - filename += String (".") + key; - progress_indication (_f ("writing header field %s to %s...", - key, - filename == "-" ? String ("") : filename)); - - ostream *os = open_file_stream (filename); - *os << value; - close_file_stream (os); - progress_indication ("\n"); + interpret_stencil_expression (stil.expr (), paper_outputter_dump, + (void *) this, Offset (0, 0)); } void -Paper_outputter::output_score_header_fields (Paper_def *paper) +Paper_outputter::close () { - if (global_score_header_fields.size ()) + if (scm_port_p (file_) == SCM_BOOL_T) { - SCM fields; -#if 0 // ugh, how to reach current Score or Paper_score? - if (paper->header_l_) - fields = paper->header_l_->to_alist (); - else -#endif - fields = header_global_p->to_alist (); - String base = paper->current_output_base_; - for (int i = 0; i < global_score_header_fields.size (); i++) - { - String key = global_score_header_fields[i]; - SCM val = gh_assoc (ly_symbol2scm (key.ch_C ()), fields); - String s; - /* Only write header field to file if it exists */ - if (gh_pair_p (val)) - { - s = ly_scm2string (gh_cdr (val)); - /* Always write header field file, even if string is empty ... */ - output_score_header_field (base, key, s); - } - } + 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_); } }