patch::: 1.3.130.jcn3

[lilypond.git] / lily / paper-def.cc

diff --git a/lily/paper-def.cc b/lily/paper-def.cc
index 063051f5956afefdd9afcd99b23720b80bf5129a..4958419c19daf6862944f291cb38d0a272f8478b 100644 (file)
--- a/lily/paper-def.cc
+++ b/lily/paper-def.cc
@@ -87,18 +87,18 @@ Paper_def::line_dimensions_int (int n) const
 
 
 
-int Paper_def::default_count_i_ = 0;
+int Paper_def::score_count_i_ = 0;
 
 int
-Paper_def::get_next_default_count () const
+Paper_def::get_next_score_count () const
 {
-  return default_count_i_ ++;
+  return score_count_i_ ++;
 }
 
 void
-Paper_def::reset_default_count()
+Paper_def::reset_score_count()
 {
-  default_count_i_ = 0;
+  score_count_i_ = 0;
 }
 
 
@@ -113,7 +113,7 @@ Paper_def::paper_outputter_p ()
   Paper_outputter * po = new Paper_outputter (outname);
   Path p = split_path (outname);
   p.ext = "";
-  po->basename_ = p.path ();
+  po->basename_ = p.str ();
   return po;
 }