add Julien Rieux to contributors

[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 424bde926de4a59317e017f85546722eb38be63d..a598aeaed9bf80cc48ec1df8a34a966caa68e8b0 100644 (file)
--- a/input/regression/volta-broken-left-edge.ly
+++ b/input/regression/volta-broken-left-edge.ly
@@ -1,10 +1,12 @@
-\version "1.7.16"
+\version "2.14.0"

 
 \header {
 
 \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
 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,101 +41,85 @@ Bar 23     Perfect
 
 %}
 
 
 %}
 

-voiceB = \notes {
-    \clef bass
-     \property Staff.instrument = "Bass"
-     \property Staff.instr = "B"
-     \key f \minor 
-     \time 4/4  
-    f,2 (    f,8-)    r8   f8    e8    
-    \repeat  volta 2
-    {
-         d8.    d16    e8.    f16    f8    c8    c16    c8.    \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
-    {
-        {      
-           f,2 (    f,8-)    r8   f8    e8 
-           f,2 (    f,8-)    r8   f8    e8 
-           g1 \break   
-           f,2 (    f,8-)    r8   f8    e8 
-           f,2 (    f,8-)    r8   f8    e8 
-           g1 \break   
-       }
-        {   
-           f,2.    r8   c16    c16      | 
-       }
+    {   
+      f1      | 

     }
     }

+  }

 }
 }

-voiceC = \notes {
-    \repeat volta 2
-    {
-     bes8    bes8    c'8    c'8    a4    r8   g16    f16      |
-     d'8.    c'16    c'8.    d'16    c'8    c'8    f16    g8.    |
-     \break
-    }
-    \alternative
-    {
-        {      a2 (    a8-)    r8   a8    bes8    }
-        {      a2.    r8   g16    f16      |
-       d'8.   c'16   c'8.   d'16   c'8   c'8   c'16    c'8.    |
-        }
-    }
+voiceC =  {
+  \repeat volta 2
+  {
+    f f 
+    \break
+  }
+  \alternative
+  {
+    f
+    { f f }
+  }

 }
 }

-voiceD = \notes {
-    \repeat volta 2
-    {
-     bes8    bes8    c'8    c'8    a4    r8   g16    f16      |
-     d'8.    c'16    c'8.    d'16    c'8    c'8    f16    g8.    |
-     \break
-    }
-    \alternative
-    {
-        {      a2 \> a8    r8   a8  \!  bes8    
-       }
-        {      a2.    r8   g16    f16      |
-           d'8.   c'16   c'8.   d'16   c'8   c'8   c'16    c'8.    | \break
-           d'8.   c'16   c'8.   d'16   c'8   c'8   c'16    c'8.    |
-        }
-    }
+
+voiceD =  {
+  \repeat volta 2
+  {
+    f f 
+    \break
+  }
+  \alternative
+  {
+    {  f
+      }
+    {  f f \break f 
+      }
+  }

 }
 }

-voiceE = \notes {
-    \repeat volta 2
-    {
-     bes8    bes8    c'8    c'8    a4    r8   g16    f16      |
-     d'8.    c'16    c'8.    d'16    c'8    c'8    f16    g8.    | \break
+voiceE =  {
+  \repeat volta 2
+  {
+    f f\break
+  }
+  \alternative
+  {
+    {  
+      f
+

     }
     }

-    \alternative
-    {
-        {      
-           a2  a8    r8   a8    bes8    
-
-       }
-        {      
-           a2.    r8   g16    f16      |
-           d'8.   c'16   c'8.   d'16   c'8   c'8   c'16    c'8.    | 
-        }
+    {  
+      f f 

     }
     }

+  }

 }
 }

-\score{
-        \notes <
-
-
-       \context Staff="4"
-       {
-           \voiceB 
-           \voiceC
-           \break
-           \voiceD
-           \voiceE
-       }
-
-    >
-       \paper {
-           \translator {
-                \StaffContext 
-                \consists Instrument_name_engraver
-           }
-       }
-}
-%% new-chords-done %%
+
+<<
+
+
+  \new Staff
+  {
+    \voiceB 
+    \voiceC
+    \break
+    \voiceD
+    \voiceE
+  }
+
+>>
+
+
+