X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Fvolta-broken-left-edge.ly;h=a8ea6b00bf61d1e6e86e10d91050ea2d7e90f602;hb=114add97aa5136c4a3d83437fc064706d569712a;hp=7c05f96609d8b0240a8a98aed196d227a4d53df7;hpb=70048d99398924e7ca0eb481925145ec243700c5;p=lilypond.git

diff --git a/input/regression/volta-broken-left-edge.ly b/input/regression/volta-broken-left-edge.ly
index 7c05f96609..a8ea6b00bf 100644
--- a/input/regression/volta-broken-left-edge.ly
+++ b/input/regression/volta-broken-left-edge.ly
@@ -1,10 +1,12 @@
-\version "1.9.4"
+\version "2.11.51"
 
 \header {
-texidoc ="Broken volta spanners behave correctly at left edge in all cases."
+  texidoc ="Broken volta spanners behave correctly at their left edge in all cases."
 
 }
 
+\layout { ragged-right =##t }
+
 %{
 
 
@@ -17,12 +19,12 @@ I have attached a file which has several break-volta interactions.
 With the test file and unmodified 1.3.116 I see the following:
 
 Bar 3 - 1st volta spanner centered on first note - prefer it to start
-	closer to key signature (can live with this)
+closer to key signature (can live with this)
 Bar 6 - 1st volta continuation - perfect
 Bar 9 - 2nd volta spanner starts on left edge of key signature - prefer
-	it to start right of key signature
+it to start right of key signature
 Bar 12 	1st volta starts between first two slurred notes in measure -
-	this is not acceptable
+this is not acceptable
 Bar 17	like above with hairpin.
 Bar 23	like above (I had expected this to be OK)
 Bar 20	2nd volta continuation perfect
@@ -39,85 +41,85 @@ Bar 23	Perfect
 
 %}
 
-voiceB = \notes {
-    \clef bass
-     \property Staff.instrument = "Bass"
-     \property Staff.instr = "B"
-     \key f \minor 
-     \time 4/4  
-    f1
-    \repeat  volta 2
-    {
-        f1    \break
+voiceB =  {
+  \clef bass
+  \set Staff.instrumentName = "Bass"
+  \set Staff.shortInstrumentName = "B"
+  \key f \minor 
+  \time 4/4  
+  f1
+  \repeat  volta 2
+  {
+    f1    \break
+  }
+  \alternative
+  {
+    { 	
+      f1 f g \break   
+      f e d  \break   
     }
-    \alternative
-    {
-        { 	
-	  f1 f g \break   
-	  f e d  \break   
-	}
-        {   
-	    f1      | 
-	}
+    {   
+      f1      | 
     }
+  }
 }
-voiceC = \notes {
-    \repeat volta 2
-    {
-f f 
-     \break
-    }
-    \alternative
-    {
-        f
-        { f f }
-    }
+voiceC =  {
+  \repeat volta 2
+  {
+    f f 
+    \break
+  }
+  \alternative
+  {
+    f
+    { f f }
+  }
 }
 
-voiceD = \notes {
-    \repeat volta 2
-    {
-f f 
-     \break
-    }
-    \alternative
-    {
-        {	f
-	}
-        {	f f \break f 
-        }
-    }
+voiceD =  {
+  \repeat volta 2
+  {
+    f f 
+    \break
+  }
+  \alternative
+  {
+    {	f
+      }
+    {	f f \break f 
+      }
+  }
 }
-voiceE = \notes {
-    \repeat volta 2
-    {
-f f\break
+voiceE =  {
+  \repeat volta 2
+  {
+    f f\break
+  }
+  \alternative
+  {
+    {	
+      f
+
     }
-    \alternative
-    {
-        {	
-	 f
-
-	}
-        {	
-	  f f 
-        }
+    {	
+      f f 
     }
+  }
 }
-\score{
-        \notes <<
 
+<<
+
+
+  \new Staff
+  {
+    \voiceB 
+    \voiceC
+    \break
+    \voiceD
+    \voiceE
+  }
+
+>>
 
-	\new Staff
-	{
-	    \voiceB 
-	    \voiceC
-	    \break
-	    \voiceD
-	    \voiceE
-	}
 
-    >>
-	\paper { raggedright =##t }
-}