Merge branch 'master' into lilypond/translation

diff --git a/Documentation/web/news-front.itexi b/Documentation/web/news-front.itexi
index 96fb4b3f14163592b9eb6060b9504bd7e2eecf40..28e131b789e808b91b2e6f12f53f84314b9d3e32 100644 (file)
--- a/Documentation/web/news-front.itexi
+++ b/Documentation/web/news-front.itexi
@@ -8,6 +8,20 @@
 
 @c used for news about the upcoming release; see CG 10.2
 
+@newsItem
+@subsubheading LilyPond 2.15.13 released!  @emph{September 27, 2011}
+
+We are happy to announce the release of LilyPond 2.15.13.  This
+release contains the usual number of bugfixes.
+
+It is strongly recommended that normal users do @strong{not} use
+this release, and instead use the stable 2.14 version.  Please
+note that due to a few Critical bugs, this is not the next release
+candidate.
+
+@newsEnd
+
+
 @newsItem
 @subsubheading Release candidate 2 cancelled @emph{Sep 23, 2011}
 

diff --git a/VERSION b/VERSION
index 39deb85e8c75d241b0a4bf76c54a29953e828445..b66f174127774a199e37e83369f01140ecd96ee0 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,7 +1,7 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=15
-PATCH_LEVEL=13
+PATCH_LEVEL=14
 MY_PATCH_LEVEL=
 VERSION_STABLE=2.14.2
-VERSION_DEVEL=2.15.12
+VERSION_DEVEL=2.15.13

diff --git a/input/regression/bar-number-check-warning.ly b/input/regression/bar-number-check-warning.ly
new file mode 100644 (file)
index 0000000..a394dea
--- /dev/null
+++ b/input/regression/bar-number-check-warning.ly
@@ -0,0 +1,18 @@
+\version "2.14.0"
+#(ly:set-option 'warning-as-error #f)
+
+\header {
+
+texidoc="Bar numbers check may be inserted to check whether the current
+bar number is correct.
+"
+
+}
+
+\relative c'' {
+  c1 | 
+  \barNumberCheck #2 % OK
+  c1 |
+  \barNumberCheck #15 % Warning
+  c1
+}

diff --git a/input/regression/instrument-switch-invalid-warning.ly b/input/regression/instrument-switch-invalid-warning.ly
new file mode 100644 (file)
index 0000000..038dbcb
--- /dev/null
+++ b/input/regression/instrument-switch-invalid-warning.ly
@@ -0,0 +1,14 @@
+\version "2.14.0"
+#(ly:set-option 'warning-as-error #f)
+
+\header {
+  texidoc = "The @code{switchInstrument} music function prints a warning if
+the given instrument definition does not exist."
+}
+
+\relative
+{
+  c4
+  \instrumentSwitch "bassClar"
+  c
+}