X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fuser%2Fcheatsheet.itely;h=f97a38c262193bae149a17e177938998b231908b;hb=d92e5bf29f6a1f28dc8aa706eb69aee346c08c09;hp=9af26d928d76fce43b36cbe1ccadd83184a9f749;hpb=3db08de4502e30616808fc348b054d32822e5cc4;p=lilypond.git

diff --git a/Documentation/user/cheatsheet.itely b/Documentation/user/cheatsheet.itely
index 9af26d928d..f97a38c262 100644
--- a/Documentation/user/cheatsheet.itely
+++ b/Documentation/user/cheatsheet.itely
@@ -13,33 +13,31 @@
 @item @code{1 2 8 16}
 @tab durations 
 @tab
-@lilypond[relative 1, notime]
-\property Staff.autoBeaming = ##f
-\property Staff.Clef = \turnOff
+@lilypond[relative=2,notime]
+\set Staff.autoBeaming = ##f
+\set Staff.Clef = \turnOff
 c1 c2 c8 c16
 @end lilypond
 
-@item @code{. ..}
+@item @code{c4. c4..}
 @tab augmentation dots
 @tab
-@lilypond[relative 1, notime]
-\property Staff.Clef = \turnOff
+@lilypond[relative=2,notime]
+\set Staff.Clef = \turnOff
 c4. c4..  
 @end lilypond
 
 @item @code{c d e f g a b }
 @tab scale 
 @tab
-@lilypond[relative 1, notime]
-\property Staff.Clef = \turnOff
+@lilypond[relative=1,notime]
 c d e f g a b
 @end lilypond
 
 @item @code{fis bes}
 @tab alteration 
 @tab
-@lilypond[relative 1, notime]
-\property Staff.Clef = \turnOff
+@lilypond[relative=1,notime]
 fis bes
 @end lilypond
 
@@ -57,7 +55,7 @@ s4_" "
 @tab time signature
 @tab
 @lilypond
-\property Staff.Clef \set #'transparent = ##t 
+\override Staff.Clef   #'transparent = ##t 
 \time 3/4
 s4_" "
 \time 4/4
@@ -68,18 +66,17 @@ s16_" "
 @item @code{r4 r8}
 @tab rest 
 @tab
-@lilypond[relative 1, notime]
-\property Staff.Clef = \turnOff
+@lilypond[relative=2,notime]
+\set Staff.Clef = \turnOff
 r4 r8
 @end lilypond
 
-@item @code{~}
+@item @code{d ~ d}
 @tab tie
 @tab
-@lilypond[relative 1, notime]
-\property Score.timing = ##f
-\property Staff.autoBeaming = ##f
-\property Staff.Clef = \turnOff
+@lilypond[relative=2,notime]
+\set Score.timing = ##f
+\set Staff.autoBeaming = ##f
 d ~ d
 @end lilypond
 
@@ -95,133 +92,124 @@ s4
 @item @var{note}@code{'}
 @tab raise octave
 @tab
-@lilypond[relative 1, notime]
-\property Score.timing = ##f
-\property Staff.autoBeaming = ##f
-\property Staff.Clef = \turnOff
+@lilypond[relative=2,notime]
+\set Score.timing = ##f
+\set Staff.autoBeaming = ##f
 a a'
 @end lilypond
 
 @item @var{note}@code{,}
 @tab lower octave
 @tab
-@lilypond[relative 1, notime]
-\property Score.timing = ##f
-\property Staff.autoBeaming = ##f
-\property Staff.Clef = \turnOff
+@lilypond[relative=2,notime]
+\set Score.timing = ##f
+\set Staff.autoBeaming = ##f
 c c,
 @end lilypond
 
 
-@item @code{-( -)}
+@item @code{c( d e)}
 @tab slur
 @tab
-@lilypond[fragment, relative 1]
-\property Score.timing = ##f
-\property Staff.TimeSignature = \turnOff
-\property Staff.autoBeaming = ##f
-\property Staff.Clef = \turnOff
-c-( d e-)
+@lilypond[fragment,relative=2]
+\set Score.timing = ##f
+\set Staff.TimeSignature = \turnOff
+\set Staff.autoBeaming = ##f
+c( d e)
 @end lilypond
 
 
-@item @code{-\( -\)}
+@item @code{c\( c( d) e\)}
 @tab phrasing slur
 @tab
-@lilypond[fragment, relative 1]
-\property Score.timing = ##f
-\property Staff.TimeSignature = \turnOff
-\property Staff.autoBeaming = ##f
-\property Staff.Clef = \turnOff
-c-\(  c-( d-) e-\)
+@lilypond[fragment,relative=2]
+\set Score.timing = ##f
+\set Staff.TimeSignature = \turnOff
+\set Staff.autoBeaming = ##f
+c\(  c( d) e\)
 @end lilypond
 
 
-@item @code{-[ -]}
+@item @code{a8[ b]}
 @tab beam
 @tab
-@lilypond[fragment, relative 1]
-\property Score.timing = ##f
-\property Staff.TimeSignature = \turnOff
-\property Staff.autoBeaming = ##f
-\property Staff.Clef = \turnOff
+@lilypond[fragment,relative=2]
+\set Score.timing = ##f
+\set Staff.TimeSignature = \turnOff
+\set Staff.autoBeaming = ##f
 a8-[ b-]
 @end lilypond
 
 
-@item @code{< \context Staff ... >}
-@tab more staffs
+@item @code{<< \new Staff ... >>}
+@tab more staves
 @tab
 @lilypond[fragment]
-< \context Staff = SA { c'1 }
-  \context Staff = SB { c'1 } >
+<< \new Staff { c'1 }
+  \new Staff { c'1 } >>
 @end lilypond
 
   
-@item @code{-> -.}
+@item @code{c-> c-.}
 @tab articulations
 @tab
-@lilypond[fragment, relative 1]
-\property Staff.TimeSignature = \turnOff
-\property Staff.Clef = \turnOff
+@lilypond[fragment,relative=2]
+\set Staff.TimeSignature = \turnOff
 c-> c-.
 @end lilypond
 
 
-@item @code{-\mf -\sfz}
+@item @code{c\mf c\sfz}
 @tab dynamics
 @tab
-@lilypond[fragment, relative 1]
-\property Staff.TimeSignature = \turnOff
-\property Staff.Clef = \turnOff
-c-\mf c-\sfz
+@lilypond[fragment,relative=2]
+\set Staff.TimeSignature = \turnOff
+c\mf c\sfz
 @end lilypond
 
 
-@item @code{-\< -\!}
+@item @code{a\< b\!}
 @tab crescendo
 @tab
-@lilypond[fragment, relative 1]
-\property Score.timing = ##f
-\property Staff.TimeSignature = \turnOff
-\property Staff.autoBeaming = ##f
-\property Staff.Clef = \turnOff
+@lilypond[fragment,relative=2]
+\set Score.timing = ##f
+\set Staff.TimeSignature = \turnOff
+\set Staff.autoBeaming = ##f
 a\< a \!a
 @end lilypond
 
-@item @code{-\> -\!}
+@item @code{a\> b\!}
 @tab decrescendo
 @tab
-@lilypond[fragment, relative 1]
-\property Score.timing = ##f
-\property Staff.TimeSignature = \turnOff
-\property Staff.autoBeaming = ##f
-\property Staff.Clef = \turnOff
-a-\> a a-\!
+@lilypond[fragment,relative=2]
+\set Score.timing = ##f
+\set Staff.TimeSignature = \turnOff
+\set Staff.autoBeaming = ##f
+a\> a a\!
 @end lilypond
 
 
-@item @code{<< >>}
+@item @code{< >}
 @tab chord
 @tab
-@lilypond[fragment, relative 1]
-<<c e>> 
+@lilypond[fragment,relative=2]
+<c e> 
 @end lilypond
 
 
 @item @code{\partial 8}
 @tab upstep
 @tab
-@lilypond[fragment,relative 1]
+@lilypond[fragment,relative=2]
   \partial 8
   f8 c2 d e
-@end lilypond 
+@end lilypond
 
 
-@item @code{\times 2/3}
+@item @code{\times 2/3 @{f g a@}}
 @tab triplets
 @tab
-@lilypond[relative 1,fragment]
+@lilypond[relative=1,fragment]
   \times 2/3 { f8 g a }
 @end lilypond
 
@@ -229,45 +217,51 @@ a-\> a a-\!
 @item @code{\grace}
 @tab grace notes
 @tab
-@lilypond[relative 1,fragment]
+@lilypond[relative=2,fragment]
 \context Voice {  \grace b16 c4 }
 @end lilypond
 
-@item @code{\lyrics @{ @dots{} @}}
+@item @code{\lyrics @{ twinkle @}}
 @tab entering lyrics
 @tab
 
-@item @code{\context Lyrics}
+
+@item @code{\new Lyrics}
 @tab printing lyrics
 @tab
+twinkle
+@lilypond[fragment]
+\lyrics \new Lyrics { twinkle }
+@end lilypond
 
 @item @code{twin -- kle}
 @tab lyric hyphen 
 @tab
-@lilypond[fragment,relative 1]
-\addlyrics \notes { g'4 g }
-  \context Lyrics \lyrics {  twin -- kle }
-@end lilypond 
+@lilypond[fragment,relative=2]
+ << \notes { g'4 g }
+    \lyricsto "" \new Lyrics \lyrics {  twin -- kle }
+    >> 
+@end lilypond
 
 @item @code{\chords @{ c:dim f:maj7 @}}
 @tab chords 
 @tab
-@lilypond[fragment,relative 1]
+@lilypond[fragment,relative=2]
   \chords { c:dim f:maj7 }
-@end lilypond 
+@end lilypond
 
 @item @code{\context ChordNames}
 @tab printing chord names 
 @tab
-@lilypond[fragment,relative 1]
+@lilypond[fragment,relative=2]
   \context ChordNames \chords { c:dim f:maj7 }
-@end lilypond 
+@end lilypond
 
-@item @code{< @dots{} \\ @dots{} >}
+@item @code{<<@{e f@} \\@{c d@}>>}
 @tab polyphony
 @tab
-@lilypond[fragment,relative 1]
- < c \\ g' >
+@lilypond[fragment,relative=2]
+\context Staff <<{e f} \\ {c d}>>
 @end lilypond