Merge branch 'master' of ssh+git://gpercival@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / input / test / rests.ly

diff --git a/input/test/rests.ly b/input/test/rests.ly
index b2211b9c3456b381b489a8919d96b992e0ec8522..852c0ea93b901bb82d274a67f0aed1b71fe1ea6a 100644 (file)
--- a/input/test/rests.ly
+++ b/input/test/rests.ly
@@ -1,45 +1,38 @@
-\version "1.7.18"
+
+\version "2.10.0"
 \header {
-    texidoc = "rests in various styles."
+    texidoc = "@cindex Rests
+
+Rests may be used in various styles.
+
+"
+}
+
+\layout {
+    indent = 0.0
+    ragged-right = ##t
 }
 
-% FIXME: Currently, this file produces "warning: flag `d-3' not found"
-% errors (and similar for "d7") from Stem::flag().  This is should not
-% happen, since there are no notes/stems in this example.
-
-\score { 
-    \context Staff \notes\relative c {
-       \property Staff.Rest \set #'style = #'mensural
-       r\maxima^"Rest style = \#'mensural"
-       r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128 
-       \break
-
-       \property Staff.Rest \set #'style = #'neo_mensural
-       r\maxima^"Rest style = \#'neo\\_mensural"
-       r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128 
-       \break
-
-       \property Staff.Rest \set #'style = #'classical
-       r\maxima^"Rest style = \#'classical"
-       r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128 
-       \break
-
-       \property Staff.Rest \set #'style = #'default
-       r\maxima^"Rest style = \#'default"
-       r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128 
-       \break
-    }
-    \paper {
-       \translator {
-           \StaffContext
-           %%%% FIXME: The following looks good, but produces
-           %%%% lots of warnings:
-           % \remove Bar_engraver
-       }
-       \translator {
-           \ScoreContext
-           \remove Bar_number_engraver
-       }
-    }
+\context Staff \relative c {
+    \set Score.timing = ##f
+    \override Staff.Rest  #'style = #'mensural
+    r\maxima^\markup \typewriter { mensural }
+    r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128
+    \bar "" 
+
+    \override Staff.Rest  #'style = #'neomensural
+    r\maxima^\markup \typewriter { neomensural }
+    r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128
+    \bar "" 
+
+    \override Staff.Rest  #'style = #'classical
+    r\maxima^\markup \typewriter { classical }
+    r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128
+    \bar ""
+    
+    \override Staff.Rest  #'style = #'default
+    r\maxima^\markup \typewriter { default }
+    r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128
+    
 }
-%% new-chords-done %%
+