2003 -> 2004

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

diff --git a/lily/music-output-def.cc b/lily/music-output-def.cc
index 1f834889f4a537ca6eabe3d44cd61d1f364f767e..ff392eaeeb7bec65fd475d373852880df6c3ac59 100644 (file)
--- a/lily/music-output-def.cc
+++ b/lily/music-output-def.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "scm-hash.hh"
@@ -11,7 +11,7 @@
 #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"
@@ -19,12 +19,6 @@
 
 #include "ly-smobs.icc"
 
-int
-Music_output_def::get_next_score_count () const
-{
-  return 0;
-}
-
 Music_output_def::Music_output_def ()
 {
   scaled_fonts_ = SCM_EOL;
@@ -36,6 +30,8 @@ Music_output_def::Music_output_def ()
   scope_ =   ly_make_anonymous_module();
 }
 
+
+
 Music_output_def::~Music_output_def ()
 {
 }
@@ -74,10 +70,15 @@ Music_output_def::mark_smob (SCM m)
 void
 Music_output_def::assign_translator (SCM transdef)
 {
-  Translator_def *tp = unsmob_translator_def (transdef);
+  Context_def *tp = unsmob_context_def (transdef);
   assert (tp);
 
-  translator_tab_->set (tp->type_name_, 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);
 }
 
 /*
@@ -96,12 +97,12 @@ Global_translator *
 Music_output_def::get_global_translator () 
 {
   SCM key = ly_symbol2scm ("Score");
-  Translator_def * t = unsmob_translator_def (find_translator (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 ();
   
@@ -112,30 +113,14 @@ int
 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_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_string () 
-{
-  String out = output_name_global;
-  int def = get_next_score_count ();
-  if (def && out != "-")
-    {
-      Path p = split_path (out);
-      p.base += "-" + to_string (def);
-      out = p.to_string ();
-    }
-  return out;
-}
-
-
 
 SCM
 Music_output_def::get_scmvar (String s) const
@@ -158,7 +143,6 @@ Music_output_def::lookup_variable (SCM sym) const
   return scm_variable_ref (var);
 }
 
-
 LY_DEFINE(ly_paper_lookup,
          "ly:paper-lookup",
          2, 0,0,
@@ -178,3 +162,33 @@ LY_DEFINE(ly_paper_lookup,
   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;
+}
+