(struct

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

diff --git a/input/test/rests.ly b/input/test/rests.ly
index d2601e56e8541058b41d275d659788833dee5f80..8f0add54944ecae22587136a190e7294206145f2 100644 (file)
--- a/input/test/rests.ly
+++ b/input/test/rests.ly
@@ -1,43 +1,38 @@
 
-\version "2.1.22"
+\version "2.4.0"
 \header {
     texidoc = "@cindex Rests
 
-Rests in various styles.
+Rests may be used in various styles.
 
 "
 }
 
-% 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 {
-       \set Score.timing = ##f
-       \override Staff.Rest  #'style = #'mensural
-       r\maxima^"Rest style = \#'mensural"
-       r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128
-       \bar empty \break
-
-       \override Staff.Rest  #'style = #'neo_mensural
-       r\maxima^"Rest style = \#'neo\\_mensural"
-       r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128
-       \bar empty \break
-
-       \override Staff.Rest  #'style = #'classical
-       r\maxima^"Rest style = \#'classical"
-       r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128
-       \bar empty \break
-
-       \override Staff.Rest  #'style = #'default
-       r\maxima^"Rest style = \#'default"
-       r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128
-       \break
-    }
-    \paper {
-       indent = 0.0
-       raggedright = ##t
-    }
+\layout {
+    indent = 0.0
+    raggedright = ##t
+}
+
+\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
+    
 }