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 fbb2e12ba8168304dafdc179625fbb30a640ac32..c37cf1178b9dee97f18c8c024bc1564df7d87cf7 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--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "scm-hash.hh"
@@ -15,12 +15,13 @@
 #include "global-translator.hh"
 #include "translator-def.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;
 }
@@ -36,8 +37,8 @@ Music_output_def::Music_output_def ()
   translator_p_dict_p_ = new Scope (translator_tab_);
 
   smobify_self ();
-  scm_unprotect_object (variable_tab_->self_scm ());
-  scm_unprotect_object (translator_tab_->self_scm ());  
+  scm_gc_unprotect_object (variable_tab_->self_scm ());
+  scm_gc_unprotect_object (translator_tab_->self_scm ());  
 }
 
 Music_output_def::~Music_output_def ()
@@ -52,8 +53,8 @@ Music_output_def::Music_output_def (Music_output_def const &s)
   style_sheet_ = SCM_EOL;
   scaled_fonts_ = SCM_EOL;
   smobify_self ();
-  scm_unprotect_object (variable_tab_->self_scm ());
-  scm_unprotect_object (translator_tab_->self_scm ());  
+  scm_gc_unprotect_object (variable_tab_->self_scm ());
+  scm_gc_unprotect_object (translator_tab_->self_scm ());  
 
   
   scope_p_ = new Scope (variable_tab_);
@@ -64,17 +65,17 @@ Music_output_def::Music_output_def (Music_output_def const &s)
 }
 
 
-IMPLEMENT_SMOBS(Music_output_def);
-IMPLEMENT_UNSMOB(Music_output_def,music_output_def);
-IMPLEMENT_DEFAULT_EQUAL_P(Music_output_def);
+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());
+  scm_gc_mark (mo->translator_tab_->self_scm ());
+  scm_gc_mark (mo->variable_tab_->self_scm ());
 
   return mo->scaled_fonts_;
 }
@@ -85,7 +86,11 @@ 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);
 }
 
@@ -120,24 +125,13 @@ Music_output_def::get_global_translator_p ()
   return dynamic_cast <Global_translator *> (tg);
 }
 
-
-
-String
-Music_output_def::get_default_output () const
-{
-  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 ("");
-}
-
-
-
 int
 Music_output_def::print_smob (SCM s, SCM p, scm_print_state *)
 {
-  scm_puts ("#<Music_output_def>", p);
+  Translator_def * def = unsmob_translator_def (s);
+  scm_puts ("#<Music_output_def ", p);
+  scm_write (def->type_name_, p);
+  scm_puts (">", p);
   return 1;
 }
 
@@ -145,17 +139,15 @@ 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::base_output_str () 
+Music_output_def::outname_str () 
 {
-  String str = get_default_output ();
-
-  if (str.empty_b ())
+  String out = output_name_global;
+  int def = get_next_score_count ();
+  if (def && out != "-")
     {
-      str = default_outname_base_global;
-      int def = get_next_default_count ();
-      if (def)
-       str += "-" + to_str (def);
+      Path p = split_path (out);
+      p.base += "-" + to_str (def);
+      out = p.str ();
     }
-  
-  return str;
+  return out;
 }