*** empty log message ***

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

diff --git a/lily/music-output-def.cc b/lily/music-output-def.cc
index 4381e4f2ba4f9c93435345f8429a376a1c954796..1f834889f4a537ca6eabe3d44cd61d1f364f767e 100644 (file)
--- a/lily/music-output-def.cc
+++ b/lily/music-output-def.cc
@@ -3,12 +3,11 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "scm-hash.hh"
 
-#include "dictionary.hh"
 #include "warn.hh"
 #include "music-output-def.hh"
 #include "global-translator.hh"
@@ -16,6 +15,7 @@
 #include "main.hh"
 #include "file-path.hh"
 #include "lily-guile.hh"
+#include "ly-modules.hh"
 
 #include "ly-smobs.icc"
 
@@ -27,15 +27,13 @@ Music_output_def::get_next_score_count () const
 
 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_ = 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 ()
@@ -44,32 +42,31 @@ 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_gc_unprotect_object (variable_tab_->self_scm ());
   scm_gc_unprotect_object (translator_tab_->self_scm ());  
   
-  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_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_;
 }
@@ -80,23 +77,15 @@ Music_output_def::assign_translator (SCM transdef)
   Translator_def *tp = unsmob_translator_def (transdef);
   assert (tp);
 
-  
-  SCM s = ly_symbol2scm ("");
-  if (gh_string_p (tp->type_name_))
-    s = scm_string_to_symbol (tp->type_name_);
-
-  translator_tab_->set (s, transdef);
+  translator_tab_->set (tp->type_name_, 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 (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;
@@ -124,11 +113,7 @@ Music_output_def::print_smob (SCM s, SCM p, scm_print_state *)
 {
   Music_output_def * def = unsmob_music_output_def (s);
   scm_puts ("#<Music_output_def ", p);
-#if 0  
-  scm_write (def->type_name_, p);
-#else  
-  (void) def;
-#endif  
+  (void)def;
   scm_puts (">", p);
   return 1;
 }
@@ -145,7 +130,51 @@ Music_output_def::outname_string ()
     {
       Path p = split_path (out);
       p.base += "-" + to_string (def);
-      out = p.string ();
+      out = p.to_string ();
     }
   return out;
 }
+
+
+
+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
+{
+  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;
+}