parser.yy: Allow backup and reparse of some more complex arguments

[lilypond.git] / input / regression / volta-broken-left-edge.ly

diff --git a/input/regression/volta-broken-left-edge.ly b/input/regression/volta-broken-left-edge.ly
index 32da07c0a5b35b36bba217d4d42b64fdc2ec6560..a598aeaed9bf80cc48ec1df8a34a966caa68e8b0 100644 (file)
--- a/input/regression/volta-broken-left-edge.ly
+++ b/input/regression/volta-broken-left-edge.ly
@@ -1,10 +1,12 @@
-\version "2.2.0"
+\version "2.14.0"

 
 \header {
 
 \header {

-texidoc ="Broken volta spanners behave correctly at their 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
 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
 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 -
 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
 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
-     \set Staff.instrument = "Bass"
-     \set 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 }
-}