Merge branch 'stable'

[lilypond.git] / input / regression / staccato-pos.ly

diff --git a/input/regression/staccato-pos.ly b/input/regression/staccato-pos.ly
index ec84117adcaeaf87a6b457e685a97c73209cadde..025bf892d2c895121bf0ce1a04c0e3f36973d589 100644 (file)
--- a/input/regression/staccato-pos.ly
+++ b/input/regression/staccato-pos.ly
@@ -1,19 +1,39 @@
 
+\version "2.12.0"
+
 \header{
-texidoc="
-The staccato dot (and all scripts with follow-into-staff set), must
-not be on staff lines.
-";
+
+  texidoc=" Some scripts must have quantized postions. VErtical
+ position descend monotonously for a descending scale.  The staccato
+ dot is close to the notehead. If the head is in a space, then the dot
+ is in the space next to it.  "
+
 }
-\score { 
-  \context Voice \notes\relative c {
-    
-       e''4-. f-. d-.
-       c,-. b-. c'''-. d-.
-       
+
+\layout {
+  ragged-right = ##t
+}
+
+{
+  \new Voice \relative c'' { 
+    \voiceOne
+    g8-. a-. b-. c-. 
+    a-. b-. c-. d-. 
+    b8[-. a-. g b] 
+    e,-. f-. g-. a-. 
+    e-. g-. b-. d-.
+  }
+  \context Voice {
+    \relative c' {
+      e'4-. f-. g-. d-. c-. b-.
+      \stemDown
+      e,-. d-. c-. b-. a-. g-.    
+    }
+    \relative c'' {
+      \stemUp           
+      d-> c-> b-> a-> g-> f-> e-> d->
+      d'
+      d-. c-. b-. a-. g-. f-. e-. d-. 
+    }  
   }
-  \paper {
-    linewidth=-1.0;
-  }  
-  \midi { }
 }