patch::: 1.3.136.jcn3

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

diff --git a/lily/music-output-def.cc b/lily/music-output-def.cc
index bf46b4645cbed94e3fa1f305189ff2f8d3418262..eb58cec14ce650bbfe0e80a5762b8dd679135fca 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"
@@ -21,7 +21,7 @@
 #include "ly-smobs.icc"
 
 int
-Music_output_def::get_next_default_count () const
+Music_output_def::get_next_score_count () const
 {
   return 0;
 }
@@ -65,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_;
 }
@@ -134,13 +134,13 @@ Music_output_def::print_smob (SCM s, SCM p, scm_print_state *)
 String
 Music_output_def::outname_str () 
 {
-  String out = outname_global;
-  int def = get_next_default_count ();
-  if (def)
+  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.path ();
+      out = p.str ();
     }
   return out;
 }