source file of the GNU LilyPond music typesetter
- (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#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 "context-def.hh"
#include "main.hh"
#include "file-path.hh"
#include "lily-guile.hh"
+#include "ly-modules.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_unprotect_object (variable_tab_->self_scm ());
- scm_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 ()
{
}
Music_output_def::Music_output_def (Music_output_def const &s)
{
- variable_tab_ = new Scheme_hash_table (*s.variable_tab_);
+ scope_ = SCM_EOL;
translator_tab_ = new Scheme_hash_table (*s.translator_tab_);
- style_sheet_ = SCM_EOL;
scaled_fonts_ = SCM_EOL;
- smobify_self ();
- scm_unprotect_object (variable_tab_->self_scm ());
- scm_unprotect_object (translator_tab_->self_scm ());
+ smobify_self ();
+ 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_copy_module_variables (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 ());
+ scm_gc_mark (mo->scope_);
return mo->scaled_fonts_;
}
void
Music_output_def::assign_translator (SCM transdef)
{
- Translator_def *tp = unsmob_translator_def (transdef);
+ Context_def *tp = unsmob_context_def (transdef);
assert (tp);
- String s = ly_scm2string (tp->type_name_);
- translator_p_dict_p_->set (s, transdef);
+ translator_tab_->set (tp->get_context_name (), transdef);
+
+ String nm = ly_symbol2string (tp->get_context_name ()) + "Context";
+
+
+ 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_translator (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;
Global_translator *
-Music_output_def::get_global_translator_p ()
+Music_output_def::get_global_translator ()
{
SCM key = ly_symbol2scm ("Score");
- Translator_def * t = unsmob_translator_def (find_translator_l (key));
+ Context_def * t = unsmob_context_def (find_translator (key));
if (!t)
error (_f ("can't find `%s' context", "Score"));
- Translator_group * tg = t->instantiate (this);
+ Translator_group * tg = t->instantiate (this, SCM_EOL);
tg->initialize ();
int
Music_output_def::print_smob (SCM s, SCM p, scm_print_state *)
{
- scm_puts ("#<Music_output_def>", p);
+ Music_output_def * def = unsmob_music_output_def (s);
+ scm_puts ("#< ", p);
+ scm_puts (classname (def), p);
+
+ (void)def;
+ scm_puts (">", p);
return 1;
}
-/*
- ugh: should move into Music_output_def (complication: .midi and .tex
- need separate counts.) */
-String
-Music_output_def::outname_str ()
+
+SCM
+Music_output_def::get_scmvar (String s) const
+{
+ return lookup_variable (ly_symbol2scm (s.to_str0 ()));
+}
+
+
+void
+Music_output_def::set_variable (SCM sym, SCM val)
+{
+ scm_module_define (scope_, sym, val);
+}
+
+SCM
+Music_output_def::lookup_variable (SCM sym) const
{
- 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;
+ SCM var = ly_module_lookup (scope_, sym);
+
+ return scm_variable_ref (var);
}
+
+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 '() if undefined. "
+ )
+{
+ Music_output_def *op = unsmob_music_output_def (pap);
+ SCM_ASSERT_TYPE (op, pap, SCM_ARG1, __FUNCTION__, "Paper");
+ SCM_ASSERT_TYPE (gh_symbol_p (sym), sym, SCM_ARG2, __FUNCTION__, "symbol");
+
+ SCM v = op->lookup_variable (sym);
+
+ if (SCM_VARIABLEP(v))
+ return SCM_VARIABLE_REF(v);
+ else
+ return SCM_EOL;
+}
+
+LY_DEFINE(ly_output_def_scope,
+ "ly:output-def-scope",
+ 1, 0,0,
+ (SCM def),
+ "Get the scope inside @var{def}."
+ )
+{
+ 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;
+}
+
projects / lilypond.git / blobdiff