* lily/stencil-scheme.cc:

[lilypond.git] / lily / music-output-def.cc

diff --git a/lily/music-output-def.cc b/lily/music-output-def.cc
index e1f86f7387e01582ee371d15e3e303b59e93a8e8..068b8594cbc8805eb74b00439a820ba4d6857861 100644 (file)
--- a/lily/music-output-def.cc
+++ b/lily/music-output-def.cc
@@ -25,9 +25,9 @@ Music_output_def::Music_output_def ()
   translator_tab_ = new Scheme_hash_table;
   scope_ = SCM_EOL;
   smobify_self ();
-  scm_gc_unprotect_object (translator_tab_->self_scm ());
 
-  scope_ =   ly_make_anonymous_module();
+  scm_gc_unprotect_object (translator_tab_->self_scm ());
+  scope_ = ly_make_anonymous_module ();
 }
 
 Music_output_def::~Music_output_def ()
@@ -37,11 +37,11 @@ Music_output_def::~Music_output_def ()
 Music_output_def::Music_output_def (Music_output_def const &s)
 {
   scope_ = SCM_EOL;
-  translator_tab_ = new Scheme_hash_table (*s.translator_tab_);
-
+  translator_tab_ = 0;
   scaled_fonts_ = SCM_EOL;
-
   smobify_self ();
+
+  translator_tab_ =   new Scheme_hash_table (*s.translator_tab_);  
   scm_gc_unprotect_object (translator_tab_->self_scm ());  
   
   scaled_fonts_ = scm_list_copy (s.scaled_fonts_);  
@@ -59,7 +59,8 @@ SCM
 Music_output_def::mark_smob (SCM m)
 {
   Music_output_def * mo = (Music_output_def*) SCM_CELL_WORD_1 (m);
-  scm_gc_mark (mo->translator_tab_->self_scm ());
+  if (mo->translator_tab_)
+    scm_gc_mark (mo->translator_tab_->self_scm ());
   scm_gc_mark (mo->scope_);
 
   return mo->scaled_fonts_;
@@ -76,12 +77,12 @@ Music_output_def::assign_translator (SCM transdef)
   String nm = ly_symbol2string (tp->get_context_name ()) + "Context";
 
 
-  scm_module_define (scope_, ly_symbol2scm (nm.to_str0()), transdef);
+  scm_module_define (scope_, ly_symbol2scm (nm.to_str0 ()), transdef);
 }
 
 /*
   find the translator for NAME. NAME must be a symbol.
- */
+*/
 SCM
 Music_output_def::find_context_def (SCM name) const
 {  
@@ -90,7 +91,6 @@ Music_output_def::find_context_def (SCM name) const
   return val;
 }
 
-
 int
 Music_output_def::print_smob (SCM s, SCM p, scm_print_state *)
 {
@@ -103,14 +103,12 @@ Music_output_def::print_smob (SCM s, SCM p, scm_print_state *)
   return 1;
 }
 
-
 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)
 {
@@ -125,50 +123,37 @@ Music_output_def::lookup_variable (SCM sym) const
   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.  "
-         )
+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);
+  SCM var = ly_module_lookup (op->scope_, sym);
+  if (SCM_VARIABLEP (var))
+    return SCM_VARIABLE_REF (var);
   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}."
-         )
+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}."
-         )
+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;