X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-output-def.cc;h=ae3a0be07fdf2049e5b5fbfbd0700391c97dc764;hb=94a1966c72301b8bd1d8bb3b8628c3f089d007cf;hp=c37cf1178b9dee97f18c8c024bc1564df7d87cf7;hpb=a78c70be8951804126d19eb74b344ae1858023e5;p=lilypond.git diff --git a/lily/music-output-def.cc b/lily/music-output-def.cc index c37cf1178b..ae3a0be07f 100644 --- a/lily/music-output-def.cc +++ b/lily/music-output-def.cc @@ -3,42 +3,30 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2004 Han-Wen Nienhuys */ #include "scm-hash.hh" -#include "dictionary.hh" -#include "scope.hh" -#include "debug.hh" +#include "warn.hh" #include "music-output-def.hh" -#include "global-translator.hh" -#include "translator-def.hh" +#include "global-context.hh" +#include "context-def.hh" #include "main.hh" #include "file-path.hh" #include "lily-guile.hh" +#include "ly-module.hh" #include "ly-smobs.icc" -int -Music_output_def::get_next_score_count () const -{ - return 0; -} - Music_output_def::Music_output_def () { - style_sheet_ = SCM_EOL; - scaled_fonts_ = SCM_EOL; - - variable_tab_ = new Scheme_hash_table; translator_tab_ = new Scheme_hash_table; - scope_p_ = new Scope (variable_tab_); - translator_p_dict_p_ = new Scope (translator_tab_); - + scope_ = SCM_EOL; smobify_self (); - scm_gc_unprotect_object (variable_tab_->self_scm ()); - scm_gc_unprotect_object (translator_tab_->self_scm ()); + + scm_gc_unprotect_object (translator_tab_->self_scm ()); + scope_ = ly_make_anonymous_module (); } Music_output_def::~Music_output_def () @@ -47,107 +35,130 @@ Music_output_def::~Music_output_def () Music_output_def::Music_output_def (Music_output_def const &s) { - variable_tab_ = new Scheme_hash_table (*s.variable_tab_); - translator_tab_ = new Scheme_hash_table (*s.translator_tab_); - - style_sheet_ = SCM_EOL; - scaled_fonts_ = SCM_EOL; + scope_ = SCM_EOL; + translator_tab_ = 0; smobify_self (); - scm_gc_unprotect_object (variable_tab_->self_scm ()); - scm_gc_unprotect_object (translator_tab_->self_scm ()); + translator_tab_ = new Scheme_hash_table (*s.translator_tab_); + scm_gc_unprotect_object (translator_tab_->self_scm ()); - scope_p_ = new Scope (variable_tab_); - translator_p_dict_p_ = new Scope (translator_tab_); - - style_sheet_ = scm_list_copy (s.style_sheet_); - scaled_fonts_ = scm_list_copy (s.scaled_fonts_); + scope_= ly_make_anonymous_module (); + if (ly_module_p (s.scope_)) + ly_import_module (scope_, s.scope_); } IMPLEMENT_SMOBS (Music_output_def); -IMPLEMENT_UNSMOB (Music_output_def,music_output_def); IMPLEMENT_DEFAULT_EQUAL_P (Music_output_def); SCM Music_output_def::mark_smob (SCM m) { Music_output_def * mo = (Music_output_def*) SCM_CELL_WORD_1 (m); - scm_gc_mark (mo->style_sheet_); - scm_gc_mark (mo->translator_tab_->self_scm ()); - scm_gc_mark (mo->variable_tab_->self_scm ()); + if (mo->translator_tab_) + scm_gc_mark (mo->translator_tab_->self_scm ()); - return mo->scaled_fonts_; + mo->derived_mark (); + + return mo->scope_; +} + +void +Music_output_def::derived_mark () +{ + } void -Music_output_def::assign_translator (SCM transdef) +Music_output_def::assign_context_def (SCM transdef) { - Translator_def *tp = unsmob_translator_def (transdef); + Context_def *tp = unsmob_context_def (transdef); assert (tp); + translator_tab_->set (tp->get_context_name (), transdef); - String s; - if (gh_string_p (tp->type_name_)) - s = ly_scm2string (tp->type_name_); + String nm = ly_symbol2string (tp->get_context_name ()) + "Context"; - translator_p_dict_p_->set (s, transdef); + + scm_module_define (scope_, ly_symbol2scm (nm.to_str0 ()), transdef); } /* - find the translator for NAME. NAME may be a string or a symbol. - */ + find the translator for NAME. NAME must be a symbol. +*/ SCM -Music_output_def::find_translator_l (SCM name) const +Music_output_def::find_context_def (SCM name) const { - if (gh_string_p (name)) - name = scm_string_to_symbol (name); - SCM val =SCM_EOL; translator_tab_->try_retrieve (name, &val); return val; } +int +Music_output_def::print_smob (SCM s, SCM p, scm_print_state *) +{ + Music_output_def * def = unsmob_music_output_def (s); + scm_puts ("#< ", p); + scm_puts (classname (def), p); + + (void)def; + scm_puts (">", p); + return 1; +} -Global_translator * -Music_output_def::get_global_translator_p () +SCM +Music_output_def::get_scmvar (String s) const { - SCM key = ly_symbol2scm ("Score"); - Translator_def * t = unsmob_translator_def (find_translator_l (key)); + return lookup_variable (ly_symbol2scm (s.to_str0 ())); +} - if (!t) - error (_f ("can't find `%s' context", "Score")); +void +Music_output_def::set_variable (SCM sym, SCM val) +{ + scm_module_define (scope_, sym, val); +} - Translator_group * tg = t->instantiate (this); - - tg->initialize (); - - return dynamic_cast (tg); +SCM +Music_output_def::lookup_variable (SCM sym) const +{ + SCM var = ly_module_lookup (scope_, sym); + + return scm_variable_ref (var); } -int -Music_output_def::print_smob (SCM s, SCM p, scm_print_state *) +LY_DEFINE (ly_paper_lookup, "ly:paper-lookup", + 2, 0,0, (SCM pap, SCM sym), + "Lookup @var{sym} in @var{pap}. " + "Return the value or @code{'()} if undefined.") { - Translator_def * def = unsmob_translator_def (s); - scm_puts ("#type_name_, p); - scm_puts (">", p); - return 1; + Music_output_def *op = unsmob_music_output_def (pap); + SCM_ASSERT_TYPE (op, pap, SCM_ARG1, __FUNCTION__, "Paper"); + SCM_ASSERT_TYPE (ly_symbol_p (sym), sym, SCM_ARG2, __FUNCTION__, "symbol"); + + SCM var = ly_module_lookup (op->scope_, sym); + if (SCM_VARIABLEP (var)) + return SCM_VARIABLE_REF (var); + else + return SCM_EOL; } -/* - ugh: should move into Music_output_def (complication: .midi and .tex - need separate counts.) */ -String -Music_output_def::outname_str () +LY_DEFINE (ly_output_def_scope, "ly:output-def-scope", + 1, 0,0, (SCM def), + "Get the variable scope inside @var{def}.") { - String out = output_name_global; - int def = get_next_score_count (); - if (def && out != "-") - { - Path p = split_path (out); - p.base += "-" + to_str (def); - out = p.str (); - } - return out; + Music_output_def *op = unsmob_music_output_def (def); + SCM_ASSERT_TYPE (op, def, SCM_ARG1, __FUNCTION__, "Output definition"); + return op->scope_; } + +LY_DEFINE (ly_output_def_clone, "ly:output-def-clone", + 1, 0, 0, (SCM def), + "Clone @var{def}.") +{ + Music_output_def *op = unsmob_music_output_def (def); + SCM_ASSERT_TYPE (op, def, SCM_ARG1, __FUNCTION__, "Output definition"); + SCM s = op->clone ()->self_scm (); + scm_gc_unprotect_object (s); + return s; +} +