From: Neil Puttock <n.puttock@gmail.com>
Date: Sun, 17 Aug 2008 17:36:32 +0000 (+0100)
Subject: Merge branch 'release/2.11.56-1'
X-Git-Tag: release/2.11.57-1~44^2~5
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c9d3519a9000da2ee8a5bc8a0afbd7f582b7c9a4;hp=c116b83fce5aab6a3c7307ad55910fc13584ad10;p=lilypond.git

Merge branch 'release/2.11.56-1'
---

diff --git a/VERSION b/VERSION
index 832beec806..581effe746 100644
--- 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 a53fb372b4..df78a94fe3 100644
--- 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 daa88bd03f..379eb8f6a7 100644
--- 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
index 0000000000..85bc4e81c6
--- /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 c8b7ff0731..353c015b8c 100644
--- 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 2a08c4f002..a448f34ba1 100644
--- 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-);"