X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-outputter.cc;h=6dff3242439bcc0c16ea0d5eabbe2fc532570f46;hb=ab6842155a003ba7d9243507594e3e973ebbb3e4;hp=584347bae9318192f19b171c8a1d51f059f2c645;hpb=1384ea3714bfd327c32d7bdbf3e194f5ab473d66;p=lilypond.git diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index 584347bae9..6dff324243 100644 --- a/lily/paper-outputter.cc +++ b/lily/paper-outputter.cc @@ -1,335 +1,145 @@ /* - 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--2014 Han-Wen Nienhuys Jan Nieuwenhuizen -*/ - -#include -#include -#include -#include - -#include "dimensions.hh" -#include "dictionary-iter.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 "lookup.hh" -#include "main.hh" -#include "scope.hh" -#include "identifier.hh" -#include "lily-version.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. -Paper_outputter::Paper_outputter () -{ - molecules_ = gh_cons (SCM_EOL, SCM_EOL); - last_cons_ = molecules_; -} + 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 . +*/ -void -Paper_outputter::output_header () -{ - if (safe_global_b) - { - gh_define ("security-paranoia", SCM_BOOL_T); - } +#include "paper-outputter.hh" - SCM exp = gh_list (ly_symbol2scm ((String (output_global_ch) + "-scm").ch_C()), - ly_quote_scm (ly_symbol2scm ("all-definitions")), - SCM_UNDEFINED); - exp = scm_eval (exp); - scm_eval (exp); - - 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); - } +#include +#include - SCM args_scm = - gh_list (ly_str02scm (creator.ch_l ()), - ly_str02scm (generate.ch_l ()), SCM_UNDEFINED); +using namespace std; +#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" - SCM scm = gh_cons (ly_symbol2scm ("header"), args_scm); - output_scheme (scm); -} +#include "ly-smobs.icc" -void -Paper_outputter::output_molecule (SCM expr, Offset o, char const *nm) +Paper_outputter::Paper_outputter (SCM port, const string &format) { -#if 0 - if (flower_dstream) - { - output_comment (nm); - } -#endif - - SCM offset_sym = ly_symbol2scm ("translate-molecule"); - SCM combine_sym = ly_symbol2scm ("combine-molecule"); -enter: - - if (!gh_pair_p (expr)) - return; - - SCM head =gh_car (expr); - if (head == offset_sym) - { - o += ly_scm2offset (gh_cadr (expr)); - expr = gh_caddr (expr); - goto enter; - } - else if (head == combine_sym) - { - output_molecule (gh_cadr (expr), o, nm); - expr = gh_caddr (expr); - goto enter; // tail recursion - } - else - { - output_scheme (gh_list (ly_symbol2scm ("placebox"), - gh_double2scm (o[X_AXIS]), - gh_double2scm (o[Y_AXIS]), - expr, - 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 ()); + + /* + 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) { - SCM c = gh_cons (scm,gh_cdr (last_cons_)); - gh_set_cdr_x(last_cons_, c); - last_cons_ = c; + Paper_outputter *p = (Paper_outputter *) SCM_CELL_WORD_1 (x); + scm_gc_mark (p->output_module_); + return p->file_; } - -void -Paper_outputter::dump_onto (Paper_stream *ps) +int +Paper_outputter::print_smob (SCM /* x */, + SCM p, + scm_print_state *) { - if (String (output_global_ch) == "scm") -#if 1 // both are fine - { - /* - default to stdin - */ - int fd = 1; - if (ofstream* of = dynamic_cast (ps->os)) - fd = of->rdbuf ()->fd (); - SCM port = scm_fdes_to_port (fd, "a", SCM_EOL); - - /* - lilypond -f scm x.ly - guile -s x.scm - */ - scm_display (gh_str02scm ( - ";;; Usage: guile -s x.scm > x.tex\n" - "(primitive-load-path 'lily.scm)\n" - "(scm-as-output)\n" - ";(scm-tex-output)\n" - ";(scm-ps-output)\n" - "(map (lambda (x) (display (eval x))) '(\n" - ), port); - - SCM newline = gh_str02scm ("\n"); - for (SCM s = gh_cdr (molecules_); gh_pair_p (s); s = gh_cdr (s)) - { - scm_write (gh_car (s), port); - scm_display (newline, port); - scm_flush (port); - } - scm_display (gh_str02scm ("))"), port); - scm_display (newline, port); - scm_flush (port); - scm_close_port (port); - } -#else - { - /* - lilypond -f scm x.ly - guile -s x.scm - */ - if (output_global_ch == String ("scm")) - *ps << "" - ";;; Usage: guile -s x.scm > x.tex\n" - "(primitive-load-path 'lily.scm)\n" - "(scm-tex-output)\n" - ";(scm-ps-output)\n" - "(map (lambda (x) (display (eval x))) '(\n" - ; - for (SCM s = gh_cdr (molecules_); gh_pair_p (s); s = gh_cdr (s)) - { - SCM result = scm_eval (scm_listify (ly_symbol2scm ("scm->string"), - ly_quote_scm (gh_car (s)), SCM_UNDEFINED)); - - *ps << ly_scm2string (result); - } - *ps << "))"; - } -#endif - - else - { - for (SCM s = gh_cdr (molecules_); gh_pair_p (s); s = gh_cdr (s)) - { - SCM result = scm_eval (gh_car (s)); - char *c=gh_scm2newstr (result, NULL); - - *ps << c; - free (c); - } - } + scm_puts ("#", p); + return 1; } -void -Paper_outputter::output_scope (Scope *scope, String prefix) +SCM +Paper_outputter::file () const { - for (Scope_iter i (*scope); i.ok (); i++) - { - if (dynamic_cast (i.val ())) - { - String val = *i.val()->access_content_String (false); - - output_String_def (prefix + i.key (), val); - } - else if(dynamic_cast (i.val ())) - { - Real val = *i.val ()->access_content_Real (false); - - output_Real_def (prefix + i.key (), val); - } - else if (dynamic_cast (i.val ())) - { - int val = *i.val ()->access_content_int (false); - - output_int_def (prefix + i.key (), val); - } - } + 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 ( "mudelatagline", id_str); - output_String_def ( "LilyPondVersion", version_str ()); + return scm_display (scm, file ()); } -void -Paper_outputter::start_line (Real height) +SCM +Paper_outputter::scheme_to_string (SCM scm) { - if (height > 50 CM) - { - programming_error ("Improbable system height"); - height = 50 CM; - } - SCM scm = gh_list (ly_symbol2scm ("start-line"), - gh_double2scm (height), - SCM_UNDEFINED); - output_scheme (scm); + return scm_eval (scm, output_module_); } -void -Paper_outputter::output_font_def (int i, String str) +SCM +Paper_outputter::module () const { - SCM scm = gh_list (ly_symbol2scm ("font-def"), - gh_int2scm (i), - ly_str02scm (str.ch_l ()), - SCM_UNDEFINED); - - output_scheme (scm); + return output_module_; } -void -Paper_outputter::output_Real_def (String k, Real v) +SCM +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); - - // gh_define (k.ch_l (), gh_double2scm (v)); + SCM str = scheme_to_string (scm); + if (scm_is_string (str)) + dump_string (str); + return str; } -void -Paper_outputter::output_String_def (String k, String v) +SCM +paper_outputter_dump (void *po, SCM x) { - - SCM scm = gh_list (ly_symbol2scm ("lily-def"), - ly_str02scm (k.ch_l ()), - ly_str02scm (v.ch_l ()), - SCM_UNDEFINED); - output_scheme (scm); - - // gh_define (k.ch_l (), ly_str02scm (v.ch_l ())); + Paper_outputter *me = (Paper_outputter *) po; + return me->output_scheme (x); } void -Paper_outputter::output_int_def (String k, int v) +Paper_outputter::output_stencil (Stencil stil) { - 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); - - // gh_define (k.ch_l (), gh_int2scm (v)); + interpret_stencil_expression (stil.expr (), paper_outputter_dump, + (void *) this, Offset (0, 0)); } - - void -Paper_outputter::stop_line () +Paper_outputter::close () { - SCM scm = gh_list (ly_symbol2scm ("stop-line"), SCM_UNDEFINED); - output_scheme (scm); -} - -void -Paper_outputter::stop_last_line () -{ - SCM scm = gh_list (ly_symbol2scm ("stop-last-line"), SCM_UNDEFINED); - output_scheme (scm); - scm = gh_list (ly_symbol2scm ("end-output"), SCM_UNDEFINED); - output_scheme (scm); + 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_); + } } - -