acknowledge repeat slash as rhythmic event. Fixes spacing of slashes,

[lilypond.git] / lily / score.cc

diff --git a/lily/score.cc b/lily/score.cc
index 99ec51880a3672e5741447a5ff66864544cc1f73..52a48538b8d8d3cf2630bc77fcfbd66b7cc27aea 100644 (file)
--- a/lily/score.cc
+++ b/lily/score.cc
@@ -28,13 +28,23 @@ using namespace std;
 
 #include "ly-smobs.icc"
 
+Input *
+Score::origin () const
+{
+  return unsmob_input (input_location_);
+}
+
+
 Score::Score ()
-  : Input ()
 {
   header_ = SCM_EOL;
   music_ = SCM_EOL;
+  input_location_ = SCM_EOL;
+
   error_found_ = false;
+
   smobify_self ();
+  input_location_ = make_input (Input ());
 }
 
 Score::~Score ()
@@ -53,6 +63,8 @@ Score::mark_smob (SCM s)
   scm_gc_mark (sc->header_);
   for (vsize i = sc->defs_.size (); i--;)
     scm_gc_mark (sc->defs_[i]->self_scm ());
+
+  scm_gc_mark (sc->input_location_);
   return sc->music_;
 }
 
@@ -65,12 +77,14 @@ Score::print_smob (SCM, SCM p, scm_print_state*)
 }
 
 Score::Score (Score const &s)
-  : Input (s)
 {
   header_ = SCM_EOL;
   music_ = SCM_EOL;
+  input_location_ = SCM_EOL;
   error_found_ = s.error_found_;
+
   smobify_self ();
+  input_location_ = make_input (*s.origin ()); 
 
   Music *m = unsmob_music (s.music_);
   if (m)