Merge branch 'master' into dev/texi2html

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

diff --git a/input/regression/grace.ly b/input/regression/grace.ly
index 716171dcd7bccb687f984bb7ca4e216a64312396..408c8fdc05ccfa205f924211361c91963f0313af 100644 (file)
--- a/input/regression/grace.ly
+++ b/input/regression/grace.ly
@@ -1,36 +1,30 @@
 
-\version "1.9.8"
+\version "2.11.51"
 
 \header{
-texidoc="
-Grace notes are typeset as an encapsulated piece of music. You can
-have beams, notes, chords, stems etc. within a @code{\grace} section.
-Slurs that start within a grace section, but aren't ended are attached
-to the next normal note.  Grace notes have zero duration.  If there
-are tuplets, the grace notes won't be under the brace.  Grace notes
-can have accidentals, but they are (currently) spaced at a fixed
-distance.  Grace notes (of course) come before the accidentals of the
-main note.  Grace notes can also be positioned after the main note.
-
-Grace notes without beams should have a slash, if @code{flagStyle} is
-not set.  Main note scripts don't end up on the grace note.
+
+  texidoc=" You can have beams, notes, chords, stems etc. within a
+@code{\grace} section.  If there are tuplets, the grace notes will not
+be under the brace.  
+
+Main note scripts do not end up on the grace note. 
 
 "
 }
 
-\score {\notes \context Voice = VA \relative c'' {
-       \grace b8 c4\fermata
-       \grace {  c32[ cis32] } gis4
-       \grace {  cis32[ dis32] } e4
-       \grace {  c32[ d] }\times 2/3 {  c8[ c c] }
-        \grace {  b32[ ( c32] }   c4)
-       \grace  <c d>16  c8[ c8]
-%      \grace  c16  c8[ c8]
-        %% broken?
-       %%\grace  { \property Grace.graceAlignPosition = \right c16} c4
-       c4 \grace  { c16 } c4
-}
-\paper {raggedright = ##t}
-\midi{ }
+\layout {ragged-right = ##t}
+
+\new Voice \relative c'' {
+  \grace b8 c4\fermata
+  \grace {  c32[ cis32] } gis4
+  \grace {  cis32[ dis32] } e4
+  \grace {  c32[ d] }\times 2/3 {  c8[ c c] }
+  \grace {  b32[ ( c32] }   c4)
+  \grace  <c d>16  c8[ c8]
+                               %       \grace  c16  c8[ c8]
+  %% broken?
+  %%\grace  { \set Grace.graceAlignPosition = \right c16} c4
+  c4 \grace  { c16 } c4
 }
 
+