* ly/engraver-init.ly: use Hara kiri by default for

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

diff --git a/lily/music-output-def.cc b/lily/music-output-def.cc
index 10d883e24a9565e20b2c574422d3bade6b24d428..082270c0b66a2ee8df732b65dda1e6b7d69a6ca7 100644 (file)
--- a/lily/music-output-def.cc
+++ b/lily/music-output-def.cc
@@ -3,20 +3,20 @@
 
   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 "scope.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "music-output-def.hh"
 #include "global-translator.hh"
 #include "translator-def.hh"
 #include "main.hh"
 #include "file-path.hh"
 #include "lily-guile.hh"
+#include "ly-modules.hh"
 
 #include "ly-smobs.icc"
 
@@ -28,17 +28,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_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,35 +43,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 ());  
-
-  
-  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_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_;
 }
@@ -87,18 +79,18 @@ Music_output_def::assign_translator (SCM transdef)
   assert (tp);
 
   
-  String s;
+  SCM s = ly_symbol2scm ("");
   if (gh_string_p (tp->type_name_))
-      s =  ly_scm2string (tp->type_name_);
+    s = scm_string_to_symbol (tp->type_name_);
 
-  translator_p_dict_p_->set (s, transdef);
+  translator_tab_->set (s, transdef);
 }
 
 /*
   find the translator for NAME. NAME may be a string or 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);
@@ -110,10 +102,10 @@ Music_output_def::find_translator_l (SCM name) const
 
 
 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));
+  Translator_def * t = unsmob_translator_def (find_translator (key));
 
   if (!t)
     error (_f ("can't find `%s' context", "Score"));
@@ -130,7 +122,11 @@ 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);
-  //scm_write (def->type_name_, p);
+#if 0  
+  scm_write (def->type_name_, p);
+#else  
+  (void) def;
+#endif  
   scm_puts (">", p);
   return 1;
 }
@@ -139,15 +135,38 @@ Music_output_def::print_smob (SCM s, SCM p, scm_print_state *)
   ugh: should move into Music_output_def (complication: .midi and .tex
   need separate counts.)  */
 String
-Music_output_def::outname_str () 
+Music_output_def::outname_string () 
 {
   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 ();
+      p.base += "-" + to_string (def);
+      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);
+}