X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fpaper-outputter.cc;h=57efb2fb35be2c547ab963c8ab0726ee62c296b0;hb=6dc515376e07af1160edd46b61c0fd235c65db7d;hp=d22f151e1c321245d45f688822f4b76d1ecd8daa;hpb=71fb71437fc91cef2c41d9ee17856ea1031cfb10;p=lilypond.git diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index d22f151e1c..57efb2fb35 100644 --- a/lily/paper-outputter.cc +++ b/lily/paper-outputter.cc @@ -1,364 +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--1999 Han-Wen Nienhuys + Copyright (C) 1997--2012 Han-Wen Nienhuys Jan Nieuwenhuizen -*/ -#include -#include + 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. -#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" -#include "atom.hh" + 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. -// urg -static SCM port = 0; + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . +*/ -Paper_outputter::Paper_outputter (Paper_stream *s) -{ - port = 0; - outstream_l_ = s; - output_header (); -} +#include "paper-outputter.hh" -Paper_outputter::~Paper_outputter () -{ - SCM scm = gh_list (ly_symbol ("end-output"), SCM_UNDEFINED); - output_scheme (scm); +#include +#include - if (String (output_global_ch) == "scm") - { -#if 1 - scm_display (gh_str02scm (")))\n"), port); - scm_fflush (port); -#else - *outstream_l_->os << ")"; -#endif - } -} +using namespace std; -void -Paper_outputter::output_header () -{ - if (safe_global_b) - { - ly_set_scm ("security-paranoia", SCM_BOOL_T); - // gh_eval_str ("(set! security-paranoia #t)"); - } - String s = String ("(eval (") + output_global_ch + "-scm 'all-definitions))"; - gh_eval_str (s.ch_C ()); - - 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 = ".\n"; - else - { - generate = _ (", at "); - time_t t (time (0)); - generate += ctime (&t); - //urg - } - - SCM args_scm = - gh_list (gh_str02scm (creator.ch_l ()), - gh_str02scm (generate.ch_l ()), SCM_UNDEFINED); - -#ifndef NPRINT - DOUT << "output_header\n"; - if (check_debug && !monitor->silent_b ("Guile")) - { - gh_display (args_scm); gh_newline (); - } -#endif +#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 (header_scm_sym, args_scm); - output_scheme (scm); -} +#include "ly-smobs.icc" -void -Paper_outputter::output_molecule (Molecule const*m, Offset o, char const *nm) +Paper_outputter::Paper_outputter (SCM port, string format) { - if (check_debug) - *outstream_l_ << String ("\n%start: ") << nm << "\n"; - - - if (check_debug) - { - output_comment (nm); - } - -#ifdef ATOM_SMOB - for (SCM ptr = m->atom_list_; ptr != SCM_EOL; ptr = SCM_CDR(ptr)) - { - Atom *i = Atom::atom_l (SCM_CAR(ptr)); -#else - for (Cons *ptr = m->atom_list_; ptr; ptr = ptr->next_) - { - Atom * i = ptr->car_; -#endif - Offset a_off = i->off_; - a_off += o; - - if (!i->func_) - continue; - - if (a_off.length () > 100 CM) - { - warning (_f("Improbable offset for object type `%s\'", nm)); - Axis a =X_AXIS; - while (a < NO_AXES) - { - if (abs(a_off[a]) > 50 CM) - a_off[a] = 50 CM; - incr (a); - } - } - - if (i->font_) - { - output_scheme (gh_list (ly_symbol ("select-font"), - gh_str02scm (symbol_to_string (i->font_).ch_C()), - SCM_UNDEFINED)); - } - - SCM box_scm - = gh_list (placebox_scm_sym, - gh_double2scm (a_off.x ()), - gh_double2scm (a_off.y ()), - SCM(i->func_), - SCM_UNDEFINED); - - output_scheme (box_scm); - } + 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 () { - if (String (output_global_ch) == "scm") - { - *outstream_l_ << "; " << str << '\n'; - } - else - { - *outstream_l_ << "% " << str << "\n"; - } } +IMPLEMENT_SMOBS (Paper_outputter); +IMPLEMENT_DEFAULT_EQUAL_P (Paper_outputter); -void -Paper_outputter::output_scheme (SCM scm) +SCM +Paper_outputter::mark_smob (SCM x) { - if (String (output_global_ch) == "scm") - { -#if 1 - /* - we'd rather use C++ i/o iso Guile's, but how? - and: they can't be mixed (or synchronised) easily? - */ - - // urg - if (!port) - { - int fd = 1; - ofstream * of = dynamic_cast (outstream_l_->os); - if (of) - fd = of->rdbuf()->fd(); - FILE *file = fdopen (fd, "a"); - port = scm_standard_stream_to_port (file, "a", ""); - scm_display (gh_str02scm ( - "(primitive-load-path 'lily.scm)\n" - "(eval (tex-scm 'all-definitions))\n" - ";(eval (ps-scm 'all-definitions))\n" - "(display (map (lambda (x) (string-append (eval x) \"%\\n\")) '(\n" - ), port); - } - - scm_write (scm, port); - // duh - scm_display (gh_str02scm ("\n"), port); - scm_fflush (port); -#else - static bool first = true; - if (first) - { - *outstream_l_->os << "" - "(primitive-load-path 'lily.scm)\n" - "(eval (tex-scm 'all-definitions))\n" - ";(eval (ps-scm 'all-definitions))\n" - "(display (map (lambda (x) (string-append (eval x) \"\\n\")) '(\n" - ; - } - - /* - why doesn't this work? - - ERROR: In procedure gh_scm2newstr: - ERROR: Wrong type argument in position 3: - (header "GNU LilyPond 1.1.49.jcn1" ", at Tue Jun 22 20:58:17 1999") - - or: - - ERROR: In procedure symbol->string: - ERROR: Wrong type argument in position 1: - (header "GNU LilyPond 1.1.49.jcn2" ", at Wed Jun 23 18:42:14 1999") - - eg, two ways to print '(foo bar)' - - SCM scm = gh_list (ly_symbol ("foo"), gh_str2scm ("bar"), SCM_UNDEFINED); - scm_write (scm, port); - puts (gh_xxx2newstr (scm, 0)); - */ - - char* p; - //p = gh_scm2newstr (scm, 0); - //p = gh_symbol2newstr (scm, 0); - //p = gh_scm2newstr (scm_symbol_to_string (scm), 0); - //p = gh_symbol2newstr (scm_symbol_to_string (scm), 0); - //*outstream_l_->os << p << endl; - *outstream_l_->os << symbol_to_string (scm) << endl; -#endif - } - else - { - SCM result = scm_eval (scm); - char *c=gh_scm2newstr (result, NULL); - - *outstream_l_ << c; - free (c); - } + Paper_outputter *p = (Paper_outputter *) SCM_CELL_WORD_1 (x); + scm_gc_mark (p->output_module_); + return p->file_; } -void -Paper_outputter::output_scope (Scope *scope, String prefix) +int +Paper_outputter::print_smob (SCM /* x */, + SCM p, + scm_print_state *) { - 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); - } - } + scm_puts ("#", p); + return 1; } -void -Paper_outputter::output_version () +SCM +Paper_outputter::file () const { - 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 file_; } -void -Paper_outputter::start_line (Real height) +SCM +Paper_outputter::dump_string (SCM scm) { - SCM scm = gh_list (ly_symbol ("start-line"), - gh_double2scm (height), - SCM_UNDEFINED); - output_scheme (scm); + return scm_display (scm, file ()); } -void -Paper_outputter::output_font_def (int i, String str) +SCM +Paper_outputter::scheme_to_string (SCM scm) { - SCM scm = gh_list (ly_symbol ("font-def"), - gh_int2scm (i), - gh_str02scm (str.ch_l ()), - SCM_UNDEFINED); - - output_scheme (scm); + return scm_eval (scm, output_module_); } -void -Paper_outputter::output_Real_def (String k, Real v) +SCM +Paper_outputter::module () const { - - SCM scm = gh_list (ly_symbol ("lily-def"), - gh_str02scm (k.ch_l ()), - gh_str02scm (to_str(v).ch_l ()), - SCM_UNDEFINED); - output_scheme (scm); - - gh_define (k.ch_l (), gh_double2scm (v)); + return output_module_; } void -Paper_outputter::output_String_def (String k, String v) +Paper_outputter::output_scheme (SCM scm) { - - SCM scm = gh_list (ly_symbol ("lily-def"), - gh_str02scm (k.ch_l ()), - gh_str02scm (v.ch_l ()), - SCM_UNDEFINED); - output_scheme (scm); - - gh_define (k.ch_l (), gh_str02scm (v.ch_l ())); + dump_string (scheme_to_string (scm)); } void -Paper_outputter::output_int_def (String k, int v) +paper_outputter_dump (void *po, SCM x) { - SCM scm = gh_list (ly_symbol ("lily-def"), - gh_str02scm (k.ch_l ()), - gh_str02scm (to_str (v).ch_l ()), - SCM_UNDEFINED); - output_scheme (scm); - - gh_define (k.ch_l (), gh_int2scm (v)); + Paper_outputter *me = (Paper_outputter *) po; + me->output_scheme (x); } - - void -Paper_outputter::stop_line () +Paper_outputter::output_stencil (Stencil stil) { - SCM scm = gh_list (ly_symbol ("stop-line"), SCM_UNDEFINED); - output_scheme (scm); + interpret_stencil_expression (stil.expr (), paper_outputter_dump, + (void *) this, Offset (0, 0)); } void -Paper_outputter::stop_last_line () +Paper_outputter::close () { - SCM scm = gh_list (ly_symbol ("stop-last-line"), 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_); + } }