Merge branch 'release/2.11.56-1'

diff --git a/VERSION b/VERSION
index 832beec80674bf9eb8f091ae81487ca39d45daf2..581effe7462d24bd0168f3227be43b00a4e49d40 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=11
-PATCH_LEVEL=55
+PATCH_LEVEL=56
 MY_PATCH_LEVEL=
 

diff --git a/input/manual/display-predefined-fretboards.ly b/input/manual/display-predefined-fretboards.ly
index a53fb372b4a73b74a2dc99b1a89959dda24855f3..df78a94fe3824b0ba5515f5aa40e606bd9465096 100644 (file)
--- a/input/manual/display-predefined-fretboards.ly
+++ b/input/manual/display-predefined-fretboards.ly
@@ -1,4 +1,6 @@
 \include "predefined-guitar-fretboards.ly"
+\version "2.11.56"
+
 
 mychords = \chordmode {c1 c:m c:aug c:dim c:7 c:maj7 c:m7 \break }
 

diff --git a/input/regression/predefined-fretboards.ly b/input/regression/predefined-fretboards.ly
index daa88bd03fc7be54ce9d7e3588ca7405b36cff6c..379eb8f6a77fc35c65ccdabb0e5ef630d6ab2702 100644 (file)
--- a/input/regression/predefined-fretboards.ly
+++ b/input/regression/predefined-fretboards.ly
@@ -1,4 +1,5 @@
 % add a chord shape
+\version "2.11.56"
 
 \addChordShape #'bes #"x;1-1-(;3-2;3-3;3-4;1-1-);"
 

diff --git a/input/regression/staff-online-symbol-absence.ly b/input/regression/staff-online-symbol-absence.ly
new file mode 100644 (file)
index 0000000..85bc4e8
--- /dev/null
+++ b/input/regression/staff-online-symbol-absence.ly
@@ -0,0 +1,16 @@
+\version "2.11.55"
+\header {
+
+  texidoc = "Symbols that need on-staffline info (like dots and ties)
+  continue to work in absence of a staff-symbol."
+
+}
+
+\new Staff \with {
+  \remove Staff_symbol_engraver
+}
+\relative c' {
+  \time 5/8
+  f4 ~ f4 
+  f4 f4.
+}

diff --git a/ly/predefined-fretboards-init.ly b/ly/predefined-fretboards-init.ly
index c8b7ff073146d47b562c8ceca88effa8e8a53b45..353c015b8c8bb4f203e957bf35aca03e560f01d5 100644 (file)
--- a/ly/predefined-fretboards-init.ly
+++ b/ly/predefined-fretboards-init.ly
@@ -4,6 +4,8 @@
 %%%%
 %%%% (c) 2008 Carl D. Sorensen <c_sorensen@byu.edu>
 
+\version "2.11.56"
+
 %%%%% define storage structures
 
 % base-chord-shapes is an alist of chord shapes

diff --git a/ly/predefined-guitar-fretboards.ly b/ly/predefined-guitar-fretboards.ly
index 2a08c4f0022907d9a777da9dac7251ee0fae58cd..a448f34ba159003dcac7c246074e11faec8b7bea 100644 (file)
--- a/ly/predefined-guitar-fretboards.ly
+++ b/ly/predefined-guitar-fretboards.ly
@@ -6,6 +6,8 @@
 
 %%%  Add basic chordshapes
 
+\version "2.11.56"
+
 \addChordShape #'f #"1-1-(;3-3;3-4;2-2;1-1;1-1-);"
 \addChordShape #'f:m #"1-1-(;3-3;3-4;1-1;1-1;1-1-);"
 \addChordShape #'f:7 #"1-1-(;3-3;1-1;2-2;1-1;1-1-);"