patch::: 1.5.1.jcn2

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

diff --git a/lily/music-output-def.cc b/lily/music-output-def.cc
index bd8fd57ff30486b442e3c0f2e96c06a10e44825b..c37cf1178b9dee97f18c8c024bc1564df7d87cf7 100644 (file)
--- a/lily/music-output-def.cc
+++ b/lily/music-output-def.cc
@@ -3,43 +3,81 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
+#include "scm-hash.hh"
+
 #include "dictionary.hh"
 #include "scope.hh"
 #include "debug.hh"
 #include "music-output-def.hh"
 #include "global-translator.hh"
 #include "translator-def.hh"
-#include "identifier.hh"
 #include "main.hh"
+#include "file-path.hh"
 #include "lily-guile.hh"
 
+#include "ly-smobs.icc"
+
 int
-Music_output_def::get_next_default_count () const
+Music_output_def::get_next_score_count () const
 {
   return 0;
 }
 
-
-
 Music_output_def::Music_output_def ()
 {
-  scope_p_ = new Scope;
-  translator_p_dict_p_ = new Scope;
+  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_);
+
+  smobify_self ();
+  scm_gc_unprotect_object (variable_tab_->self_scm ());
+  scm_gc_unprotect_object (translator_tab_->self_scm ());  
 }
 
 Music_output_def::~Music_output_def ()
 {
-  delete scope_p_;
-  delete translator_p_dict_p_;
 }
 
 Music_output_def::Music_output_def (Music_output_def const &s)
 {
-  scope_p_ = new Scope (*s.scope_p_);
-  translator_p_dict_p_ = new Scope (*s.translator_p_dict_p_);
+  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;
+  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_);  
+}
+
+
+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 ());
+
+  return mo->scaled_fonts_;
 }
 
 void
@@ -48,18 +86,25 @@ Music_output_def::assign_translator (SCM transdef)
   Translator_def *tp = unsmob_translator_def (transdef);
   assert (tp);
 
-  String s = ly_scm2string (tp->type_name_);
+  
+  String s;
+  if (gh_string_p (tp->type_name_))
+      s =  ly_scm2string (tp->type_name_);
+
   translator_p_dict_p_->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
-{
-  String s = ly_scm2string (name);
+{  
+  if (gh_string_p (name))
+    name = scm_string_to_symbol (name);
   
   SCM val  =SCM_EOL;
-  if (translator_p_dict_p_->elem_b (s))
-    return translator_p_dict_p_->scm_elem (s);
+  translator_tab_->try_retrieve (name, &val);
   return val;
 }
 
@@ -67,28 +112,42 @@ Music_output_def::find_translator_l (SCM name) const
 Global_translator *
 Music_output_def::get_global_translator_p () 
 {
-  Translator_def * t = unsmob_translator_def (find_translator_l (gh_str02scm ("Score")));
+  SCM key = ly_symbol2scm ("Score");
+  Translator_def * t = unsmob_translator_def (find_translator_l (key));
+
   if (!t)
     error (_f ("can't find `%s' context", "Score"));
 
   Translator_group * tg = t->instantiate (this);
   
-  tg->add_processing ();
+  tg->initialize ();
   
   return dynamic_cast <Global_translator *> (tg);
 }
 
+int
+Music_output_def::print_smob (SCM s, SCM p, scm_print_state *)
+{
+  Translator_def * def = unsmob_translator_def (s);
+  scm_puts ("#<Music_output_def ", p);
+  scm_write (def->type_name_, p);
+  scm_puts (">", p);
+  return 1;
+}
 
-
+/*
+  ugh: should move into Music_output_def (complication: .midi and .tex
+  need separate counts.)  */
 String
-Music_output_def::get_default_output () const
+Music_output_def::outname_str () 
 {
-  if (safe_global_b || !scope_p_->elem_b ("output"))
-    return "";
-  SCM s =  scope_p_->scm_elem ("output");
-  
-  return gh_string_p (s) ? ly_scm2string (s) : 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 ();
+    }
+  return out;
 }
-
-
-