Merge branch 'stable-2.10' of /home/lilydev/vc/gub/downloads/lilypond into master...

diff --git a/.gitignore b/.gitignore
index 489d0c4e13b96581723991aa0b38a360098d5cb0..c50567def176ac2621cdf51de8129c004677d877 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,6 @@ gcstat*.scm
 *.afm
 *.orig
 *.rej
+*-systems.texi
+*-systems.tex
+*-midi.ly

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 58197ab20a9247b03adbd1ed27051352fac58090..aa4adcb0b92e8f9f89bd9d633a44a875a1255345 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -34,8 +34,10 @@ include $(depth)/make/stepmake.make
 
 local-dist: dist-toplevel-txt-files make-dist-version
 
-make-dist-version:
-       echo $(TOPLEVEL_VERSION) > $(outdir)/VERSION
+default: $(outdir)/VERSION
+
+$(outdir)/VERSION: $(config_make)
+       echo $(TOPLEVEL_VERSION) > $@
 
 dist-toplevel-txt-files:
        -mkdir -p $(distdir)

diff --git a/lily/spanner.cc b/lily/spanner.cc
index 1dcae55298d3130077a06fa24bcf5e74368940e5..955ba76ef3ad08b0b3bfe032f02385c17c8dab98 100644 (file)
--- a/lily/spanner.cc
+++ b/lily/spanner.cc
@@ -251,11 +251,12 @@ Spanner::broken_neighbor (Direction d) const
     return 0;
 
   vsize k = broken_spanner_index (this);
+  Spanner *orig = dynamic_cast<Spanner*> (original_);
   int j = int (k) + d;
-  if (j < 0 || vsize (j) >= broken_intos_.size ())
+  if (j < 0 || vsize (j) >= orig->broken_intos_.size ())
     return 0;
 
-  return broken_intos_[j];
+  return orig->broken_intos_[j];
 }
 
 int