Merge branch 'master' into translation

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

diff --git a/input/regression/cluster.ly b/input/regression/cluster.ly
index 12809fbc2cf04dab115667aa3c15123e95019f78..8ec7e4e89811d192740ae1c142b96936d11ae2ad 100644 (file)
--- a/input/regression/cluster.ly
+++ b/input/regression/cluster.ly
@@ -1,47 +1,23 @@
-\version "1.7.4"
+
+\version "2.19.21"
 \header {
-    texidoc = "Clusters are a device to denote that a complete range of
+  texidoc = "Clusters are a device to denote that a complete range of
 notes is to be played."
 }
+  \layout { ragged-right = ##t }
+
 
-voiceI = % same as voiceII, but with ordinary notes
-       \context Voice = voiceI {
-           \notes \relative c' {
-               \stemUp
-               c4 f4
-               a4 <e4 d'4> | \break
-               < g8 a8 > < e8 a8 > a4 c1 < d4 b4 > e4 |
-               c4 a4 f4 g4 a4
-           }
-       }
-
-voiceII = % same as voiceI, but with cluster notation
-       \context Voice = voiceII {
-           \notes \relative c' {
-               \property Thread.NoteHead \set #'transparent = ##t
-               \property Voice.Stem \set #'transparent = ##t
-               \property Voice.Beam \set #'transparent = ##t
-               \property Staff.Accidental \set #'transparent = ##t
-               \property Voice.Cluster \set #'padding = #0.25
-               \property Voice.Cluster \set #'shape = #'ramp
-               c4 f4
-               \startCluster
-               a4 <e4 d'4> | \break
-               %%% do not try something like: < { g8 e8 } a4 >
-               %%% instead, do the following: < g8 a8 > < e8 a8 >
-               < g8 a8 > < e8 a8 > a4 c1 < d4 b4 > e4 |
-               c4 \stopCluster a4 f4 g4 a4
-           }
-       }
-
-\score {
-       \context PianoStaff {
-       <
-               \voiceI
-               \voiceII
-       >
-       }
-       \paper{
-               linewidth = 15.0 \cm
-       }
+fragment = \relative {
+  c'4 f4 <e d'>4
+  <g a>8 <e a> a4 c2 <d b>4 e4 
+  c4
 }
+
+<<
+  \new Staff \fragment
+  \new Staff \makeClusters \fragment
+>>
+
+
+
+