Merge commit 'origin' into beamlets2

[lilypond.git] / input / regression / dots.ly

diff --git a/input/regression/dots.ly b/input/regression/dots.ly
index 818d0cf0b2f710ad6db28ee867ced5a919f386a0..a82d7f4d1edbd5a31f1c86a7d17c27f0d5f559ad 100644 (file)
--- a/input/regression/dots.ly
+++ b/input/regression/dots.ly
@@ -1,31 +1,40 @@
-\version "1.3.146"
-\header{
-texidoc="
-Noteheads can have dots, and rests can too.  Augmentation dots should
-never be printed on a staff line, but rather be shifted vertically. They
-should go up, but in case of multiple parts, the down stems have down
-shifted dots.  (Wanske p. 186) In case of chords, all dots should be in
-a column.  The dots go along as rests are shifted to avoid collisions.
+\version "2.12.0" \header{
+
+
+    texidoc=" Both noteheads and rests can have dots.  
+    Augmentation dots should never be printed on a staff line,
+but rather be shifted vertically. They should go up, but in case of
+multiple parts, the down stems have down shifted dots.  In case of
+chords, all dots should be in a column.  The dots follow the shift
+of rests when avoiding collisions.
+
+The priorities to print the dots are (ranked in importance):
+
+@itemize @bullet
+@item keeping dots off staff lines,
+@item keeping dots close to their  note heads,
+@item moving dots in the direction specified by the voice,
+@item moving dots up.
+@end itemize
+
 "
 }
 
 
 
-\score { 
-  \context Voice \notes\relative c'' {
-    \time 6/8
-       d4. g,,
-       <b''4. c d e>  <f g a b>
-       <g b d> <c, g' d' a'>
-       
-       
-       \context Staff <
-               \context Voice = VA {  \stemUp   f''  <b c> r4.  }
-               \context Voice = VB {  \stemDown b, <a b> r4. }
-       >
-       
-       
-  }
-  \paper { }  
-  \midi { }
+\context Voice \relative c'' {
+  \time 6/8
+  d4. g,,
+  \stemDown
+  <b'' c d e>4.  <f g a b>
+  <f a c> <e a c> <b f' c' g'>
+  
+  
+  <<
+    { f  <b c> r4.  }\\
+    { b, <a b> r4. }
+  >>
+  
+  
 }
+